Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

214 files changed, 3673 insertions, 4820 deletions

diff --git a/launcher/ui/ColorCache.cpp b/launcher/ui/ColorCache.cpp
index ef268dd2..f941a609 100644
--- a/launcher/ui/ColorCache.cpp
+++ b/launcher/ui/ColorCache.cpp
@@ -1,13 +1,11 @@
 #include "ColorCache.h"
 
-
 /**
  * Blend the color with the front color, adapting to the back color
  */
 QColor ColorCache::blend(QColor color)
 {
-    if (Rainbow::luma(m_front) > Rainbow::luma(m_back))
-    {
+    if (Rainbow::luma(m_front) > Rainbow::luma(m_back)) {
         // for dark color schemes, produce a fitting color first
         color = Rainbow::tint(m_front, color, 0.5);
     }
@@ -27,8 +25,7 @@ QColor ColorCache::blendBackground(QColor color)
 void ColorCache::recolorAll()
 {
     auto iter = m_colors.begin();
-    while(iter != m_colors.end())
-    {
+    while (iter != m_colors.end()) {
         iter->front = blend(iter->original);
         iter->back = blendBackground(iter->original);
     }
diff --git a/launcher/ui/ColorCache.h b/launcher/ui/ColorCache.h
index a840664d..1cf292c1 100644
--- a/launcher/ui/ColorCache.h
+++ b/launcher/ui/ColorCache.h
@@ -1,12 +1,11 @@
 #pragma once
-#include <QtGui/QColor>
-#include <rainbow.h>
 #include <MessageLevel.h>
+#include <rainbow.h>
 #include <QMap>
+#include <QtGui/QColor>
 
-class ColorCache
-{
-public:
+class ColorCache {
+   public:
     ColorCache(QColor front, QColor back, qreal bias)
     {
         m_front = front;
@@ -14,15 +13,11 @@ public:
         m_bias = bias;
     };
 
-    void addColor(int key, QColor color)
-    {
-        m_colors[key] = {color, blend(color), blendBackground(color)};
-    }
+    void addColor(int key, QColor color) { m_colors[key] = { color, blend(color), blendBackground(color) }; }
 
     void setForeground(QColor front)
     {
-        if(m_front != front)
-        {
+        if (m_front != front) {
             m_front = front;
             recolorAll();
         }
@@ -30,8 +25,7 @@ public:
 
     void setBackground(QColor back)
     {
-        if(m_back != back)
-        {
+        if (m_back != back) {
             m_back = back;
             recolorAll();
         }
@@ -40,8 +34,7 @@ public:
     QColor getFront(int key)
     {
         auto iter = m_colors.find(key);
-        if(iter == m_colors.end())
-        {
+        if (iter == m_colors.end()) {
             return QColor();
         }
         return (*iter).front;
@@ -50,8 +43,7 @@ public:
     QColor getBack(int key)
     {
         auto iter = m_colors.find(key);
-        if(iter == m_colors.end())
-        {
+        if (iter == m_colors.end()) {
             return QColor();
         }
         return (*iter).back;
@@ -67,29 +59,26 @@ public:
      */
     QColor blendBackground(QColor color);
 
-protected:
+   protected:
     void recolorAll();
 
-protected:
-    struct ColorEntry
-    {
+   protected:
+    struct ColorEntry {
         QColor original;
         QColor front;
         QColor back;
     };
 
-protected:
+   protected:
     qreal m_bias;
     QColor m_front;
     QColor m_back;
     QMap<int, ColorEntry> m_colors;
 };
 
-class LogColorCache : public ColorCache
-{
-public:
-    LogColorCache(QColor front, QColor back)
-        : ColorCache(front, back, 1.0)
+class LogColorCache : public ColorCache {
+   public:
+    LogColorCache(QColor front, QColor back) : ColorCache(front, back, 1.0)
     {
         addColor((int)MessageLevel::Launcher, QColor("purple"));
         addColor((int)MessageLevel::Debug, QColor("green"));
@@ -101,8 +90,7 @@ public:
 
     QColor getFront(MessageLevel::Enum level)
     {
-        if(!m_colors.contains((int) level))
-        {
+        if (!m_colors.contains((int)level)) {
             return ColorCache::getFront((int)MessageLevel::Message);
         }
         return ColorCache::getFront((int)level);
@@ -110,8 +98,7 @@ public:
 
     QColor getBack(MessageLevel::Enum level)
     {
-        if(level == MessageLevel::Fatal)
-        {
+        if (level == MessageLevel::Fatal) {
             return QColor(Qt::black);
         }
         return QColor(Qt::transparent);
diff --git a/launcher/ui/GuiUtil.cpp b/launcher/ui/GuiUtil.cpp
index 930e088a..584a3471 100644
--- a/launcher/ui/GuiUtil.cpp
+++ b/launcher/ui/GuiUtil.cpp
@@ -37,21 +37,21 @@
 
 #include "GuiUtil.h"
 
-#include <QClipboard>
 #include <QApplication>
+#include <QClipboard>
 #include <QFileDialog>
 #include <QStandardPaths>
 
-#include "ui/dialogs/ProgressDialog.h"
-#include "ui/dialogs/CustomMessageBox.h"
 #include "net/PasteUpload.h"
+#include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/ProgressDialog.h"
 
-#include "Application.h"
-#include <settings/SettingsObject.h>
-#include <DesktopServices.h>
 #include <BuildConfig.h>
+#include <DesktopServices.h>
+#include <settings/SettingsObject.h>
+#include "Application.h"
 
-std::optional<QString> GuiUtil::uploadPaste(const QString &name, 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());
@@ -64,8 +64,7 @@ std::optional<QString> GuiUtil::uploadPaste(const QString &name, const QString &
         else
             baseUrl = pasteCustomAPIBaseSetting;
 
-        if (baseUrl.isValid())
-        {
+        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"
@@ -82,41 +81,38 @@ std::optional<QString> GuiUtil::uploadPaste(const QString &name, const QString &
     std::unique_ptr<PasteUpload> paste(new PasteUpload(parentWidget, text, pasteCustomAPIBaseSetting, pasteTypeSetting));
 
     dialog.execWithTask(paste.get());
-    if (!paste->wasSuccessful())
-    {
-        CustomMessageBox::selectable(
-            parentWidget,
-            QObject::tr("Upload failed"),
-            paste->failReason(),
-            QMessageBox::Critical
-        )->exec();
+    if (!paste->wasSuccessful()) {
+        CustomMessageBox::selectable(parentWidget, QObject::tr("Upload failed"), paste->failReason(), QMessageBox::Critical)->exec();
         return QString();
-    }
-    else
-    {
+    } else {
         const QString link = paste->pasteLink();
         setClipboardText(link);
         CustomMessageBox::selectable(
             parentWidget, QObject::tr("Upload finished"),
             QObject::tr("The <a href=\"%1\">link to the uploaded log</a> has been placed in your clipboard.").arg(link),
-            QMessageBox::Information)->exec();
+            QMessageBox::Information)
+            ->exec();
         return link;
     }
 }
 
-void GuiUtil::setClipboardText(const QString &text)
+void GuiUtil::setClipboardText(const QString& text)
 {
     QApplication::clipboard()->setText(text);
 }
 
-static QStringList BrowseForFileInternal(QString context, QString caption, QString filter, QString defaultPath, QWidget *parentWidget, bool single)
+static QStringList BrowseForFileInternal(QString context,
+                                         QString caption,
+                                         QString filter,
+                                         QString defaultPath,
+                                         QWidget* parentWidget,
+                                         bool single)
 {
     static QMap<QString, QString> savedPaths;
 
     QFileDialog w(parentWidget, caption);
     QSet<QString> locations;
-    auto f = [&](QStandardPaths::StandardLocation l)
-    {
+    auto f = [&](QStandardPaths::StandardLocation l) {
         QString location = QStandardPaths::writableLocation(l);
         QFileInfo finfo(location);
         if (!finfo.exists()) {
@@ -129,8 +125,7 @@ static QStringList BrowseForFileInternal(QString context, QString caption, QStri
     f(QStandardPaths::DownloadLocation);
     f(QStandardPaths::HomeLocation);
     QList<QUrl> urls;
-    for (auto location : locations)
-    {
+    for (auto location : locations) {
         urls.append(QUrl::fromLocalFile(location));
     }
     urls.append(QUrl::fromLocalFile(defaultPath));
@@ -140,27 +135,21 @@ static QStringList BrowseForFileInternal(QString context, QString caption, QStri
     w.setNameFilter(filter);
 
     QString pathToOpen;
-    if(savedPaths.contains(context))
-    {
+    if (savedPaths.contains(context)) {
         pathToOpen = savedPaths[context];
-    }
-    else
-    {
+    } else {
         pathToOpen = defaultPath;
     }
-    if(!pathToOpen.isEmpty())
-    {
+    if (!pathToOpen.isEmpty()) {
         QFileInfo finfo(pathToOpen);
-        if(finfo.exists() && finfo.isDir())
-        {
+        if (finfo.exists() && finfo.isDir()) {
             w.setDirectory(finfo.absoluteFilePath());
         }
     }
 
     w.setSidebarUrls(urls);
 
-    if (w.exec())
-    {
+    if (w.exec()) {
         savedPaths[context] = w.directory().absolutePath();
         return w.selectedFiles();
     }
@@ -168,18 +157,16 @@ static QStringList BrowseForFileInternal(QString context, QString caption, QStri
     return {};
 }
 
-QString GuiUtil::BrowseForFile(QString context, QString caption, QString filter, QString defaultPath, QWidget *parentWidget)
+QString GuiUtil::BrowseForFile(QString context, QString caption, QString filter, QString defaultPath, QWidget* parentWidget)
 {
     auto resultList = BrowseForFileInternal(context, caption, filter, defaultPath, parentWidget, true);
-    if(resultList.size())
-    {
+    if (resultList.size()) {
         return resultList[0];
     }
     return QString();
 }
 
-
-QStringList GuiUtil::BrowseForFiles(QString context, QString caption, QString filter, QString defaultPath, QWidget *parentWidget)
+QStringList GuiUtil::BrowseForFiles(QString context, QString caption, QString filter, QString defaultPath, QWidget* parentWidget)
 {
     return BrowseForFileInternal(context, caption, filter, defaultPath, parentWidget, false);
 }
diff --git a/launcher/ui/GuiUtil.h b/launcher/ui/GuiUtil.h
index 96ebd9a2..8d384d3f 100644
--- a/launcher/ui/GuiUtil.h
+++ b/launcher/ui/GuiUtil.h
@@ -3,10 +3,9 @@
 #include <QWidget>
 #include <optional>
 
-namespace GuiUtil
-{
-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);
-}
+namespace GuiUtil {
+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);
+}  // namespace GuiUtil
diff --git a/launcher/ui/InstanceWindow.cpp b/launcher/ui/InstanceWindow.cpp
index d784a40f..7025cb79 100644
--- a/launcher/ui/InstanceWindow.cpp
+++ b/launcher/ui/InstanceWindow.cpp
@@ -37,12 +37,12 @@
 #include "InstanceWindow.h"
 #include "Application.h"
 
-#include <QScrollBar>
-#include <QMessageBox>
-#include <QHBoxLayout>
-#include <QPushButton>
 #include <qlayoutitem.h>
 #include <QCloseEvent>
+#include <QHBoxLayout>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QScrollBar>
 
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui/dialogs/ProgressDialog.h"
@@ -52,8 +52,7 @@
 
 #include "icons/IconList.h"
 
-InstanceWindow::InstanceWindow(InstancePtr instance, QWidget *parent)
-    : QMainWindow(parent), m_instance(instance)
+InstanceWindow::InstanceWindow(InstancePtr instance, QWidget* parent) : QMainWindow(parent), m_instance(instance)
 {
     setAttribute(Qt::WA_DeleteOnClose);
 
@@ -144,8 +143,7 @@ InstanceWindow::InstanceWindow(InstancePtr instance, QWidget *parent)
 
 void InstanceWindow::on_instanceStatusChanged(BaseInstance::Status, BaseInstance::Status newStatus)
 {
-    if(newStatus == BaseInstance::Status::Gone)
-    {
+    if (newStatus == BaseInstance::Status::Gone) {
         m_doNotSave = true;
         close();
     }
@@ -153,25 +151,20 @@ void InstanceWindow::on_instanceStatusChanged(BaseInstance::Status, BaseInstance
 
 void InstanceWindow::updateLaunchButtons()
 {
-    if(m_instance->isRunning())
-    {
+    if (m_instance->isRunning()) {
         m_launchOfflineButton->setEnabled(false);
         m_launchDemoButton->setEnabled(false);
         m_killButton->setText(tr("Kill"));
         m_killButton->setObjectName("killButton");
         m_killButton->setToolTip(tr("Kill the running instance"));
-    }
-    else if(!m_instance->canLaunch())
-    {
+    } else if (!m_instance->canLaunch()) {
         m_launchOfflineButton->setEnabled(false);
         m_launchDemoButton->setEnabled(false);
         m_killButton->setText(tr("Launch"));
         m_killButton->setObjectName("launchButton");
         m_killButton->setToolTip(tr("Launch the instance"));
         m_killButton->setEnabled(false);
-    }
-    else
-    {
+    } else {
         m_launchOfflineButton->setEnabled(true);
 
         // Disable demo-mode if not available.
@@ -208,7 +201,7 @@ void InstanceWindow::runningStateChanged(bool running)
 {
     updateLaunchButtons();
     m_container->refreshContainer();
-    if(running) {
+    if (running) {
         selectPage("log");
     }
 }
@@ -218,16 +211,14 @@ void InstanceWindow::on_closeButton_clicked()
     close();
 }
 
-void InstanceWindow::closeEvent(QCloseEvent *event)
+void InstanceWindow::closeEvent(QCloseEvent* event)
 {
     bool proceed = true;
-    if(!m_doNotSave)
-    {
+    if (!m_doNotSave) {
         proceed &= m_container->prepareToClose();
     }
 
-    if(!proceed)
-    {
+    if (!proceed) {
         return;
     }
 
@@ -244,12 +235,9 @@ bool InstanceWindow::saveAll()
 
 void InstanceWindow::on_btnKillMinecraft_clicked()
 {
-    if(m_instance->isRunning())
-    {
+    if (m_instance->isRunning()) {
         APPLICATION->kill(m_instance);
-    }
-    else
-    {
+    } else {
         APPLICATION->launch(m_instance, true, false, nullptr);
     }
 }
@@ -274,14 +262,11 @@ void InstanceWindow::refreshContainer()
     m_container->refreshContainer();
 }
 
-InstanceWindow::~InstanceWindow()
-{
-}
+InstanceWindow::~InstanceWindow() {}
 
 bool InstanceWindow::requestClose()
 {
-    if(m_container->prepareToClose())
-    {
+    if (m_container->prepareToClose()) {
         close();
         return true;
     }
diff --git a/launcher/ui/InstanceWindow.h b/launcher/ui/InstanceWindow.h
index 582cff13..70f206f2 100644
--- a/launcher/ui/InstanceWindow.h
+++ b/launcher/ui/InstanceWindow.h
@@ -48,12 +48,11 @@
 
 class QPushButton;
 class PageContainer;
-class InstanceWindow : public QMainWindow, public BasePageContainer
-{
+class InstanceWindow : public QMainWindow, public BasePageContainer {
     Q_OBJECT
 
-public:
-    explicit InstanceWindow(InstancePtr proc, QWidget *parent = 0);
+   public:
+    explicit InstanceWindow(InstancePtr proc, QWidget* parent = 0);
     virtual ~InstanceWindow();
 
     bool selectPage(QString pageId) override;
@@ -68,11 +67,10 @@ public:
     // request closing the window (from a page)
     bool requestClose() override;
 
-signals:
+   signals:
     void isClosing();
 
-private
-slots:
+   private slots:
     void on_closeButton_clicked();
     void on_btnKillMinecraft_clicked();
     void on_btnLaunchMinecraftOffline_clicked();
@@ -82,19 +80,19 @@ slots:
     void runningStateChanged(bool running);
     void on_instanceStatusChanged(BaseInstance::Status, BaseInstance::Status newStatus);
 
-protected:
-    void closeEvent(QCloseEvent *) override;
+   protected:
+    void closeEvent(QCloseEvent*) override;
 
-private:
+   private:
     void updateLaunchButtons();
 
-private:
+   private:
     shared_qobject_ptr<LaunchTask> m_proc;
     InstancePtr m_instance;
     bool m_doNotSave = false;
-    PageContainer *m_container = nullptr;
-    QPushButton *m_closeButton = nullptr;
-    QPushButton *m_killButton = nullptr;
-    QPushButton *m_launchOfflineButton = nullptr;
-    QPushButton *m_launchDemoButton = nullptr;
+    PageContainer* m_container = nullptr;
+    QPushButton* m_closeButton = nullptr;
+    QPushButton* m_killButton = nullptr;
+    QPushButton* m_launchOfflineButton = nullptr;
+    QPushButton* m_launchDemoButton = nullptr;
 };
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 8300fe29..7d414877 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -519,9 +519,9 @@ void MainWindow::showInstanceContextMenu(const QPoint& pos)
         QAction* actionCreateInstance = new QAction(tr("Create instance"), this);
         actionCreateInstance->setToolTip(ui->actionAddInstance->toolTip());
         if (!group.isNull()) {
-            QVariantMap data;
-            data["group"] = group;
-            actionCreateInstance->setData(data);
+            QVariantMap instance_action_data;
+            instance_action_data["group"] = group;
+            actionCreateInstance->setData(instance_action_data);
         }
 
         connect(actionCreateInstance, SIGNAL(triggered(bool)), SLOT(on_actionAddInstance_triggered()));
@@ -531,9 +531,9 @@ void MainWindow::showInstanceContextMenu(const QPoint& pos)
         actions.append(actionCreateInstance);
         if (!group.isNull()) {
             QAction* actionDeleteGroup = new QAction(tr("Delete group '%1'").arg(group), this);
-            QVariantMap data;
-            data["group"] = group;
-            actionDeleteGroup->setData(data);
+            QVariantMap delete_group_action_data;
+            delete_group_action_data["group"] = group;
+            actionDeleteGroup->setData(delete_group_action_data);
             connect(actionDeleteGroup, SIGNAL(triggered(bool)), SLOT(deleteGroup()));
             actions.append(actionDeleteGroup);
         }
@@ -631,7 +631,7 @@ void MainWindow::updateThemeMenu()
         themeMenu = new QMenu(this);
     }
 
-    auto themes = APPLICATION->getValidApplicationThemes();
+    auto themes = APPLICATION->themeManager()->getValidApplicationThemes();
 
     QActionGroup* themesGroup = new QActionGroup(this);
 
@@ -645,7 +645,7 @@ void MainWindow::updateThemeMenu()
         themeAction->setActionGroup(themesGroup);
 
         connect(themeAction, &QAction::triggered, [theme]() {
-            APPLICATION->setApplicationTheme(theme->id());
+            APPLICATION->themeManager()->setApplicationTheme(theme->id());
             APPLICATION->settings()->set("ApplicationTheme", theme->id());
         });
     }
@@ -748,9 +748,9 @@ void MainWindow::changeActiveAccount()
     if (sAction->data().type() != QVariant::Type::Int)
         return;
 
-    QVariant data = sAction->data();
+    QVariant action_data = sAction->data();
     bool valid = false;
-    int index = data.toInt(&valid);
+    int index = action_data.toInt(&valid);
     if (!valid) {
         index = -1;
     }
@@ -1148,9 +1148,9 @@ void MainWindow::on_actionChangeInstIcon_triggered()
 void MainWindow::iconUpdated(QString icon)
 {
     if (icon == m_currentInstIcon) {
-        auto icon = APPLICATION->icons()->getIcon(m_currentInstIcon);
-        ui->actionChangeInstIcon->setIcon(icon);
-        changeIconButton->setIcon(icon);
+        auto new_icon = APPLICATION->icons()->getIcon(m_currentInstIcon);
+        ui->actionChangeInstIcon->setIcon(new_icon);
+        changeIconButton->setIcon(new_icon);
     }
 }
 
@@ -1221,26 +1221,40 @@ void MainWindow::undoTrashInstance()
     ui->actionUndoTrashInstance->setEnabled(APPLICATION->instances()->trashedSomething());
 }
 
+void MainWindow::on_actionViewLauncherRootFolder_triggered()
+{
+    DesktopServices::openDirectory(".");
+}
+
 void MainWindow::on_actionViewInstanceFolder_triggered()
 {
     QString str = APPLICATION->settings()->get("InstanceDir").toString();
     DesktopServices::openDirectory(str);
 }
 
-void MainWindow::on_actionViewLauncherRootFolder_triggered()
+void MainWindow::on_actionViewCentralModsFolder_triggered()
 {
-    const QString dataPath = QDir::currentPath();
-    DesktopServices::openDirectory(dataPath);
+    DesktopServices::openDirectory(APPLICATION->settings()->get("CentralModsDir").toString(), true);
 }
 
-void MainWindow::refreshInstances()
+void MainWindow::on_actionViewIconThemeFolder_triggered()
 {
-    APPLICATION->instances()->loadList();
+    DesktopServices::openDirectory(APPLICATION->themeManager()->getIconThemesFolder().path());
 }
 
-void MainWindow::on_actionViewCentralModsFolder_triggered()
+void MainWindow::on_actionViewWidgetThemeFolder_triggered()
 {
-    DesktopServices::openDirectory(APPLICATION->settings()->get("CentralModsDir").toString(), true);
+    DesktopServices::openDirectory(APPLICATION->themeManager()->getApplicationThemesFolder().path());
+}
+
+void MainWindow::on_actionViewCatPackFolder_triggered()
+{
+    DesktopServices::openDirectory(APPLICATION->themeManager()->getCatPacksFolder().path());
+}
+
+void MainWindow::refreshInstances()
+{
+    APPLICATION->instances()->loadList();
 }
 
 void MainWindow::checkForUpdates()
@@ -1677,7 +1691,7 @@ void MainWindow::startTask(Task* task)
     task->start();
 }
 
-void MainWindow::instanceChanged(const QModelIndex& current, const QModelIndex& previous)
+void MainWindow::instanceChanged(const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
 {
     if (!current.isValid()) {
         APPLICATION->settings()->set("SelectedInstance", QString());
@@ -1812,7 +1826,7 @@ void MainWindow::setInstanceActionsEnabled(bool enabled)
     ui->actionCreateInstanceShortcut->setEnabled(enabled);
 }
 
-void MainWindow::refreshCurrentInstance(bool running)
+void MainWindow::refreshCurrentInstance([[maybe_unused]] bool running)
 {
     auto current = view->selectionModel()->currentIndex();
     instanceChanged(current, current);
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index 7fab3fe3..9fd72d25 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -63,34 +63,32 @@ class KonamiCode;
 class InstanceTask;
 class LabeledToolButton;
 
-namespace Ui
-{
+namespace Ui {
 class MainWindow;
 }
-class MainWindow : public QMainWindow
-{
+class MainWindow : public QMainWindow {
     Q_OBJECT
 
-public:
-    explicit MainWindow(QWidget *parent = 0);
+   public:
+    explicit MainWindow(QWidget* parent = 0);
     ~MainWindow();
 
-    bool eventFilter(QObject *obj, QEvent *ev) override;
-    void closeEvent(QCloseEvent *event) override;
-    void changeEvent(QEvent * event) override;
+    bool eventFilter(QObject* obj, QEvent* ev) override;
+    void closeEvent(QCloseEvent* event) override;
+    void changeEvent(QEvent* event) override;
 
     void checkInstancePathForProblems();
 
     void updatesAllowedChanged(bool allowed);
 
     void processURLs(QList<QUrl> urls);
-signals:
+   signals:
     void isClosing();
 
-protected:
-    QMenu * createPopupMenu() override;
+   protected:
+    QMenu* createPopupMenu() override;
 
-private slots:
+   private slots:
     void onCatToggled(bool);
 
     void onCatChanged(int);
@@ -111,16 +109,19 @@ private slots:
 
     void on_actionChangeInstIcon_triggered();
 
+    void on_actionViewLauncherRootFolder_triggered();
+
     void on_actionViewInstanceFolder_triggered();
+    void on_actionViewCentralModsFolder_triggered();
 
-    void on_actionViewLauncherRootFolder_triggered();
+    void on_actionViewIconThemeFolder_triggered();
+    void on_actionViewWidgetThemeFolder_triggered();
+    void on_actionViewCatPackFolder_triggered();
 
     void on_actionViewSelectedInstFolder_triggered();
 
     void refreshInstances();
 
-    void on_actionViewCentralModsFolder_triggered();
-
     void checkForUpdates();
 
     void on_actionSettings_triggered();
@@ -131,9 +132,9 @@ private slots:
 
     void on_actionClearMetadata_triggered();
 
-    #ifdef Q_OS_MAC
+#ifdef Q_OS_MAC
     void on_actionAddToPATH_triggered();
-    #endif
+#endif
 
     void on_actionOpenWiki_triggered();
 
@@ -154,7 +155,10 @@ private slots:
     void deleteGroup();
     void undoTrashInstance();
 
-    inline void on_actionExportInstance_triggered() { on_actionExportInstanceZip_triggered(); }
+    inline void on_actionExportInstance_triggered()
+    {
+        on_actionExportInstanceZip_triggered();
+    }
     void on_actionExportInstanceZip_triggered();
     void on_actionExportInstanceMrPack_triggered();
     void on_actionExportInstanceFlamePack_triggered();
@@ -173,7 +177,7 @@ private slots:
      */
     void iconUpdated(QString);
 
-    void showInstanceContextMenu(const QPoint &);
+    void showInstanceContextMenu(const QPoint&);
 
     void updateMainToolBar();
 
@@ -183,15 +187,15 @@ private slots:
 
     void instanceActivated(QModelIndex);
 
-    void instanceChanged(const QModelIndex &current, const QModelIndex &previous);
+    void instanceChanged(const QModelIndex& current, const QModelIndex& previous);
 
     void instanceSelectRequest(QString id);
 
-    void instanceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+    void instanceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
     void selectionBad();
 
-    void startTask(Task *task);
+    void startTask(Task* task);
 
     void defaultAccountChanged();
 
@@ -201,7 +205,6 @@ private slots:
 
     void updateNewsLabel();
 
-
     void konamiTriggered();
 
     void globalSettingsClosed();
@@ -209,38 +212,38 @@ private slots:
     void lockToolbars(bool);
 
 #ifndef Q_OS_MAC
-    void keyReleaseEvent(QKeyEvent *event) override;
+    void keyReleaseEvent(QKeyEvent* event) override;
 #endif
 
     void refreshCurrentInstance(bool running);
 
-private:
+   private:
     void retranslateUi();
 
     void addInstance(const QString& url = QString(), const QMap<QString, QString>& extra_info = {});
     void activateInstance(InstancePtr instance);
     void setCatBackground(bool enabled);
     void updateInstanceToolIcon(QString new_icon);
-    void setSelectedInstanceById(const QString &id);
+    void setSelectedInstanceById(const QString& id);
     void updateStatusCenter();
     void setInstanceActionsEnabled(bool enabled);
 
-    void runModalTask(Task *task);
-    void instanceFromInstanceTask(InstanceTask *task);
+    void runModalTask(Task* task);
+    void instanceFromInstanceTask(InstanceTask* task);
     void finalizeInstance(InstancePtr inst);
 
-private:
-    Ui::MainWindow *ui;
+   private:
+    Ui::MainWindow* ui;
     // these are managed by Qt's memory management model!
-    InstanceView *view = nullptr;
-    InstanceProxyModel *proxymodel = nullptr;
-    QToolButton *newsLabel = nullptr;
-    QLabel *m_statusLeft = nullptr;
-    QLabel *m_statusCenter = nullptr;
-    LabeledToolButton *changeIconButton = nullptr;
-    LabeledToolButton *renameButton = nullptr;
-    QToolButton *helpMenuButton = nullptr;
-    KonamiCode * secretEventFilter = nullptr;
+    InstanceView* view = nullptr;
+    InstanceProxyModel* proxymodel = nullptr;
+    QToolButton* newsLabel = nullptr;
+    QLabel* m_statusLeft = nullptr;
+    QLabel* m_statusCenter = nullptr;
+    LabeledToolButton* changeIconButton = nullptr;
+    LabeledToolButton* renameButton = nullptr;
+    QToolButton* helpMenuButton = nullptr;
+    KonamiCode* secretEventFilter = nullptr;
 
     std::shared_ptr<Setting> instanceToolbarSetting = nullptr;
 
@@ -250,5 +253,5 @@ private:
     QString m_currentInstIcon;
 
     // managed by the application object
-    Task *m_versionLoadTask = nullptr;
+    Task* m_versionLoadTask = nullptr;
 };
diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui
index e4421d40..6ef32099 100644
--- a/launcher/ui/MainWindow.ui
+++ b/launcher/ui/MainWindow.ui
@@ -186,9 +186,14 @@
     <property name="toolTipsVisible">
      <bool>true</bool>
     </property>
-    <addaction name="actionViewInstanceFolder"/>
     <addaction name="actionViewLauncherRootFolder"/>
+    <addaction name="separator"/>
+    <addaction name="actionViewInstanceFolder"/>
     <addaction name="actionViewCentralModsFolder"/>
+    <addaction name="separator"/>
+    <addaction name="actionViewIconThemeFolder"/>
+    <addaction name="actionViewWidgetThemeFolder"/>
+    <addaction name="actionViewCatPackFolder"/>
    </widget>
    <widget class="QMenu" name="accountsMenu">
     <property name="title">
@@ -465,7 +470,8 @@
   </action>
   <action name="actionExportInstanceZip">
    <property name="icon">
-    <iconset theme="launcher"/>
+    <iconset theme="launcher">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Prism Launcher (zip)</string>
@@ -473,7 +479,8 @@
   </action>
   <action name="actionExportInstanceMrPack">
    <property name="icon">
-    <iconset theme="modrinth"/>
+    <iconset theme="modrinth">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Modrinth (mrpack)</string>
@@ -481,15 +488,17 @@
   </action>
   <action name="actionExportInstanceFlamePack">
    <property name="icon">
-    <iconset theme="flame"/>
+    <iconset theme="flame">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>CurseForge (zip)</string>  
+    <string>CurseForge (zip)</string>
    </property>
   </action>
   <action name="actionExportInstanceToModList">
    <property name="icon">
-    <iconset theme="new"/>
+    <iconset theme="new">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Mod List</string>
@@ -552,7 +561,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>&amp;View Instance Folder</string>
+    <string>View &amp;Instance Folder</string>
    </property>
    <property name="toolTip">
     <string>Open the instance folder in a file browser.</string>
@@ -564,7 +573,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>&amp;View Launcher Root Folder</string>
+    <string>View Launcher &amp;Root Folder</string>
    </property>
    <property name="toolTip">
     <string>Open the launcher's root folder in a file browser.</string>
@@ -719,6 +728,38 @@
     <string>Open the %1 wiki</string>
    </property>
   </action>
+  <action name="actionViewWidgetThemeFolder">
+   <property name="icon">
+    <iconset theme="viewfolder">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>View &amp;Widget Themes Folder</string>
+   </property>
+   <property name="toolTip">
+    <string>View Widget Theme Folder</string>
+   </property>
+  </action>
+  <action name="actionViewIconThemeFolder">
+   <property name="icon">
+    <iconset theme="viewfolder">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>View I&amp;con Theme Folder</string>
+   </property>
+   <property name="toolTip">
+    <string>View Icon Theme Folder</string>
+   </property>
+  </action>
+  <action name="actionViewCatPackFolder">
+   <property name="icon">
+    <iconset theme="viewfolder"/>
+   </property>
+   <property name="text">
+    <string>View Cat Packs Folder</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index b1734eff..3c6f6ef1 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -34,26 +34,28 @@
  */
 
 #include "AboutDialog.h"
-#include "BuildConfig.h"
-#include "ui_AboutDialog.h"
 #include <QIcon>
 #include "Application.h"
 #include "BuildConfig.h"
 #include "Markdown.h"
+#include "ui_AboutDialog.h"
 
 #include <net/NetJob.h>
 #include <qobject.h>
 
 namespace {
-QString getLink(QString link, QString name) {
+QString getLink(QString link, QString name)
+{
     return QString("&lt;<a href='%1'>%2</a>&gt;").arg(link).arg(name);
 }
 
-QString getWebsite(QString link) {
+QString getWebsite(QString link)
+{
     return getLink(link, QObject::tr("Website"));
 }
 
-QString getGitHub(QString username) {
+QString getGitHub(QString username)
+{
     return getLink("https://github.com/" + username, "GitHub");
 }
 
@@ -70,19 +72,19 @@ QString getCreditsHtml()
 
     //: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Developers"
     stream << "<h3>" << QObject::tr("%1 Developers", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n";
-    stream << QString("<p>Sefa Eyeoglu (Scrumplex) %1</p>\n")   .arg(getWebsite("https://scrumplex.net"));
-    stream << QString("<p>d-513 %1</p>\n")                      .arg(getGitHub("d-513"));
-    stream << QString("<p>txtsd %1</p>\n")                      .arg(getWebsite("https://ihavea.quest"));
-    stream << QString("<p>timoreo %1</p>\n")                    .arg(getGitHub("timoreo22"));
-    stream << QString("<p>Ezekiel Smith (ZekeSmith) %1</p>\n")  .arg(getGitHub("ZekeSmith"));
-    stream << QString("<p>cozyGalvinism %1</p>\n")              .arg(getGitHub("cozyGalvinism"));
-    stream << QString("<p>DioEgizio %1</p>\n")                  .arg(getGitHub("DioEgizio"));
-    stream << QString("<p>flowln %1</p>\n")                     .arg(getGitHub("flowln"));
-    stream << QString("<p>ViRb3 %1</p>\n")                      .arg(getGitHub("ViRb3"));
-    stream << QString("<p>Rachel Powers (Ryex) %1</p>\n")       .arg(getGitHub("Ryex"));
-    stream << QString("<p>TayouVR %1</p>\n")                    .arg(getGitHub("TayouVR"));
-    stream << QString("<p>TheKodeToad %1</p>\n")                .arg(getGitHub("TheKodeToad"));
-    stream << QString("<p>getchoo %1</p>\n")                    .arg(getGitHub("getchoo"));
+    stream << QString("<p>Sefa Eyeoglu (Scrumplex) %1</p>\n").arg(getWebsite("https://scrumplex.net"));
+    stream << QString("<p>d-513 %1</p>\n").arg(getGitHub("d-513"));
+    stream << QString("<p>txtsd %1</p>\n").arg(getWebsite("https://ihavea.quest"));
+    stream << QString("<p>timoreo %1</p>\n").arg(getGitHub("timoreo22"));
+    stream << QString("<p>Ezekiel Smith (ZekeSmith) %1</p>\n").arg(getGitHub("ZekeSmith"));
+    stream << QString("<p>cozyGalvinism %1</p>\n").arg(getGitHub("cozyGalvinism"));
+    stream << QString("<p>DioEgizio %1</p>\n").arg(getGitHub("DioEgizio"));
+    stream << QString("<p>flowln %1</p>\n").arg(getGitHub("flowln"));
+    stream << QString("<p>ViRb3 %1</p>\n").arg(getGitHub("ViRb3"));
+    stream << QString("<p>Rachel Powers (Ryex) %1</p>\n").arg(getGitHub("Ryex"));
+    stream << QString("<p>TayouVR %1</p>\n").arg(getGitHub("TayouVR"));
+    stream << QString("<p>TheKodeToad %1</p>\n").arg(getGitHub("TheKodeToad"));
+    stream << QString("<p>getchoo %1</p>\n").arg(getGitHub("getchoo"));
     stream << "<br />\n";
 
     // TODO: possibly retrieve from git history at build time?
@@ -96,20 +98,21 @@ QString getCreditsHtml()
     stream << "<br />\n";
 
     stream << "<h3>" << QObject::tr("With thanks to", "About Credits") << "</h3>\n";
-    stream << QString("<p>Boba %1</p>\n")           .arg(getWebsite("https://bobaonline.neocities.org/"));
-    stream << QString("<p>Davi Rafael %1</p>\n")    .arg(getWebsite("https://auti.one/"));
-    stream << QString("<p>Fulmine %1</p>\n")        .arg(getWebsite("https://www.fulmine.xyz/"));
-    stream << QString("<p>ely %1</p>\n")            .arg(getGitHub("elyrodso"));
-    stream << QString("<p>gon sawa %1</p>\n")       .arg(getGitHub("gonsawa"));
+    stream << QString("<p>Boba %1</p>\n").arg(getWebsite("https://bobaonline.neocities.org/"));
+    stream << QString("<p>Davi Rafael %1</p>\n").arg(getWebsite("https://auti.one/"));
+    stream << QString("<p>Fulmine %1</p>\n").arg(getWebsite("https://www.fulmine.xyz/"));
+    stream << QString("<p>ely %1</p>\n").arg(getGitHub("elyrodso"));
+    stream << QString("<p>gon sawa %1</p>\n").arg(getGitHub("gonsawa"));
     stream << QString("<p>Pankakes</p>\n");
-    stream << QString("<p>tobimori %1</p>\n")       .arg(getGitHub("tobimori"));
+    stream << QString("<p>tobimori %1</p>\n").arg(getGitHub("tobimori"));
     stream << "<p>Orochimarufan &lt;<a href='mailto:orochimarufan.x3@gmail.com'>orochimarufan.x3@gmail.com</a>&gt;</p>\n";
     stream << "<p>TakSuyu &lt;<a href='mailto:taksuyu@gmail.com'>taksuyu@gmail.com</a>&gt;</p>\n";
     stream << "<p>Kilobyte &lt;<a href='mailto:stiepen22@gmx.de'>stiepen22@gmx.de</a>&gt;</p>\n";
     stream << "<p>Rootbear75 &lt;<a href='https://twitter.com/rootbear75'>@rootbear75</a>&gt;</p>\n";
     stream << "<p>Zeker Zhayard &lt;<a href='https://twitter.com/zeker_zhayard'>@Zeker_Zhayard</a>&gt;</p>\n";
     stream << "<p>Everyone who helped establish our branding!</p>\n";
-    stream << "<p>And everyone else who <a href='https://github.com/PrismLauncher/PrismLauncher/graphs/contributors'>contributed</a>!</p>\n";
+    stream
+        << "<p>And everyone else who <a href='https://github.com/PrismLauncher/PrismLauncher/graphs/contributors'>contributed</a>!</p>\n";
     stream << "<br />\n";
 
     stream << "</center>\n";
@@ -124,9 +127,9 @@ QString getLicenseHtml()
     return output;
 }
 
-}
+}  // namespace
 
-AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDialog)
+AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog)
 {
     ui->setupUi(this);
 
@@ -148,7 +151,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
     ui->versionLabel->setText(BuildConfig.printableVersionString());
 
     if (!BuildConfig.BUILD_PLATFORM.isEmpty())
-        ui->platformLabel->setText(tr("Platform") +": " + BuildConfig.BUILD_PLATFORM);
+        ui->platformLabel->setText(tr("Platform") + ": " + BuildConfig.BUILD_PLATFORM);
     else
         ui->platformLabel->setVisible(false);
 
@@ -163,7 +166,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
         ui->buildDateLabel->setVisible(false);
 
     if (!BuildConfig.VERSION_CHANNEL.isEmpty())
-        ui->channelLabel->setText(tr("Channel") +": " + BuildConfig.VERSION_CHANNEL);
+        ui->channelLabel->setText(tr("Channel") + ": " + BuildConfig.VERSION_CHANNEL);
     else
         ui->channelLabel->setVisible(false);
 
diff --git a/launcher/ui/dialogs/AboutDialog.h b/launcher/ui/dialogs/AboutDialog.h
index 814fd98c..356f005e 100644
--- a/launcher/ui/dialogs/AboutDialog.h
+++ b/launcher/ui/dialogs/AboutDialog.h
@@ -15,26 +15,23 @@
 
 #pragma once
 
-#include <QDialog>
 #include <net/NetJob.h>
+#include <QDialog>
 
-namespace Ui
-{
+namespace Ui {
 class AboutDialog;
 }
 
-class AboutDialog : public QDialog
-{
+class AboutDialog : public QDialog {
     Q_OBJECT
 
-public:
-    explicit AboutDialog(QWidget *parent = 0);
+   public:
+    explicit AboutDialog(QWidget* parent = 0);
     ~AboutDialog();
 
-private:
-    Ui::AboutDialog *ui;
+   private:
+    Ui::AboutDialog* ui;
 
     NetJob::Ptr netJob;
     QByteArray dataSink;
 };
-
diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index fdfae597..727c0614 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -313,7 +313,7 @@ bool BlockedModsDialog::checkValidPath(QString path)
     // efectivly compare two strings ignoring all separators and case
     auto laxCompare = [](QString fsfilename, QString metadataFilename) {
         // allowed character seperators
-        QList<QChar> allowedSeperators = { '-', '+', '.' , '_'};
+        QList<QChar> allowedSeperators = { '-', '+', '.', '_' };
 
         // copy in lowercase
         auto fsName = fsfilename.toLower();
diff --git a/launcher/ui/dialogs/CopyInstanceDialog.cpp b/launcher/ui/dialogs/CopyInstanceDialog.cpp
index d75bb5fe..8b2f5bb8 100644
--- a/launcher/ui/dialogs/CopyInstanceDialog.cpp
+++ b/launcher/ui/dialogs/CopyInstanceDialog.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -107,8 +107,8 @@ CopyInstanceDialog::CopyInstanceDialog(InstancePtr original, QWidget* parent)
 
 #if defined(Q_OS_WIN)
     ui->symbolicLinksCheckbox->setIcon(style()->standardIcon(QStyle::SP_VistaShield));
-    ui->symbolicLinksCheckbox->setToolTip(tr("Use symbolic links instead of copying files.") +
-                                          "\n" + tr("On Windows, symbolic links may require admin permission to create."));
+    ui->symbolicLinksCheckbox->setToolTip(tr("Use symbolic links instead of copying files.") + "\n" +
+                                          tr("On Windows, symbolic links may require admin permission to create."));
 #endif
 
     updateLinkOptions();
@@ -220,7 +220,7 @@ void CopyInstanceDialog::on_iconButton_clicked()
     }
 }
 
-void CopyInstanceDialog::on_instNameTextBox_textChanged(const QString& arg1)
+void CopyInstanceDialog::on_instNameTextBox_textChanged([[maybe_unused]] const QString& arg1)
 {
     updateDialogState();
 }
diff --git a/launcher/ui/dialogs/CustomMessageBox.cpp b/launcher/ui/dialogs/CustomMessageBox.cpp
index 19029f68..1af47a44 100644
--- a/launcher/ui/dialogs/CustomMessageBox.cpp
+++ b/launcher/ui/dialogs/CustomMessageBox.cpp
@@ -15,13 +15,15 @@
 
 #include "CustomMessageBox.h"
 
-namespace CustomMessageBox
-{
-QMessageBox *selectable(QWidget *parent, const QString &title, const QString &text,
-                        QMessageBox::Icon icon, QMessageBox::StandardButtons buttons,
+namespace CustomMessageBox {
+QMessageBox* selectable(QWidget* parent,
+                        const QString& title,
+                        const QString& text,
+                        QMessageBox::Icon icon,
+                        QMessageBox::StandardButtons buttons,
                         QMessageBox::StandardButton defaultButton)
 {
-    QMessageBox *messageBox = new QMessageBox(parent);
+    QMessageBox* messageBox = new QMessageBox(parent);
     messageBox->setWindowTitle(title);
     messageBox->setText(text);
     messageBox->setStandardButtons(buttons);
@@ -32,4 +34,4 @@ QMessageBox *selectable(QWidget *parent, const QString &title, const QString &te
 
     return messageBox;
 }
-}
+}  // namespace CustomMessageBox
diff --git a/launcher/ui/dialogs/CustomMessageBox.h b/launcher/ui/dialogs/CustomMessageBox.h
index 712c6518..a9bc6a24 100644
--- a/launcher/ui/dialogs/CustomMessageBox.h
+++ b/launcher/ui/dialogs/CustomMessageBox.h
@@ -17,9 +17,10 @@
 
 #include <QMessageBox>
 
-namespace CustomMessageBox
-{
-QMessageBox *selectable(QWidget *parent, const QString &title, const QString &text,
+namespace CustomMessageBox {
+QMessageBox* selectable(QWidget* parent,
+                        const QString& title,
+                        const QString& text,
                         QMessageBox::Icon icon = QMessageBox::NoIcon,
                         QMessageBox::StandardButtons buttons = QMessageBox::Ok,
                         QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
diff --git a/launcher/ui/dialogs/EditAccountDialog.cpp b/launcher/ui/dialogs/EditAccountDialog.cpp
index 002c064b..58036fd8 100644
--- a/launcher/ui/dialogs/EditAccountDialog.cpp
+++ b/launcher/ui/dialogs/EditAccountDialog.cpp
@@ -14,12 +14,11 @@
  */
 
 #include "EditAccountDialog.h"
-#include "ui_EditAccountDialog.h"
 #include <DesktopServices.h>
 #include <QUrl>
+#include "ui_EditAccountDialog.h"
 
-EditAccountDialog::EditAccountDialog(const QString &text, QWidget *parent, int flags)
-    : QDialog(parent), ui(new Ui::EditAccountDialog)
+EditAccountDialog::EditAccountDialog(const QString& text, QWidget* parent, int flags) : QDialog(parent), ui(new Ui::EditAccountDialog)
 {
     ui->setupUi(this);
 
@@ -35,12 +34,12 @@ EditAccountDialog::~EditAccountDialog()
     delete ui;
 }
 
-void EditAccountDialog::on_label_linkActivated(const QString &link)
+void EditAccountDialog::on_label_linkActivated(const QString& link)
 {
     DesktopServices::openUrl(QUrl(link));
 }
 
-void EditAccountDialog::setUsername(const QString & user) const
+void EditAccountDialog::setUsername(const QString& user) const
 {
     ui->userTextBox->setText(user);
 }
@@ -50,7 +49,7 @@ QString EditAccountDialog::username() const
     return ui->userTextBox->text();
 }
 
-void EditAccountDialog::setPassword(const QString & pass) const
+void EditAccountDialog::setPassword(const QString& pass) const
 {
     ui->passTextBox->setText(pass);
 }
diff --git a/launcher/ui/dialogs/EditAccountDialog.h b/launcher/ui/dialogs/EditAccountDialog.h
index 6b5eb4aa..7a9ccba7 100644
--- a/launcher/ui/dialogs/EditAccountDialog.h
+++ b/launcher/ui/dialogs/EditAccountDialog.h
@@ -17,28 +17,24 @@
 
 #include <QDialog>
 
-namespace Ui
-{
+namespace Ui {
 class EditAccountDialog;
 }
 
-class EditAccountDialog : public QDialog
-{
+class EditAccountDialog : public QDialog {
     Q_OBJECT
 
-public:
-    explicit EditAccountDialog(const QString &text = "", QWidget *parent = 0,
-                               int flags = UsernameField | PasswordField);
+   public:
+    explicit EditAccountDialog(const QString& text = "", QWidget* parent = 0, int flags = UsernameField | PasswordField);
     ~EditAccountDialog();
 
-    void setUsername(const QString & user) const;
-    void setPassword(const QString & pass) const;
+    void setUsername(const QString& user) const;
+    void setPassword(const QString& pass) const;
 
     QString username() const;
     QString password() const;
 
-    enum Flags
-    {
+    enum Flags {
         NoFlags = 0,
 
         //! Specifies that the dialog should have a username field.
@@ -48,9 +44,9 @@ public:
         PasswordField,
     };
 
-private slots:
-  void on_label_linkActivated(const QString &link);
+   private slots:
+    void on_label_linkActivated(const QString& link);
 
-private:
-    Ui::EditAccountDialog *ui;
+   private:
+    Ui::EditAccountDialog* ui;
 };
diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp
index d6a503cc..703736d6 100644
--- a/launcher/ui/dialogs/ExportInstanceDialog.cpp
+++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp
@@ -195,8 +195,8 @@ void ExportInstanceDialog::loadPackIgnore()
     if (!ignoreFile.open(QIODevice::ReadOnly)) {
         return;
     }
-    auto data = ignoreFile.readAll();
-    auto string = QString::fromUtf8(data);
+    auto ignoreData = ignoreFile.readAll();
+    auto string = QString::fromUtf8(ignoreData);
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     proxyModel->setBlockedPaths(string.split('\n', Qt::SkipEmptyParts));
 #else
@@ -206,10 +206,10 @@ void ExportInstanceDialog::loadPackIgnore()
 
 void ExportInstanceDialog::savePackIgnore()
 {
-    auto data = proxyModel->blockedPaths().toStringList().join('\n').toUtf8();
+    auto ignoreData = proxyModel->blockedPaths().toStringList().join('\n').toUtf8();
     auto filename = ignoreFileName();
     try {
-        FS::write(filename, data);
+        FS::write(filename, ignoreData);
     } catch (const Exception& e) {
         qWarning() << e.cause();
     }
diff --git a/launcher/ui/dialogs/IconPickerDialog.cpp b/launcher/ui/dialogs/IconPickerDialog.cpp
index 5131686a..faad3ce7 100644
--- a/launcher/ui/dialogs/IconPickerDialog.cpp
+++ b/launcher/ui/dialogs/IconPickerDialog.cpp
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
+#include <QFileDialog>
 #include <QKeyEvent>
 #include <QPushButton>
-#include <QFileDialog>
 
 #include "Application.h"
 
@@ -24,12 +24,11 @@
 
 #include "ui/instanceview/InstanceDelegate.h"
 
+#include <DesktopServices.h>
 #include "icons/IconList.h"
 #include "icons/IconUtils.h"
-#include <DesktopServices.h>
 
-IconPickerDialog::IconPickerDialog(QWidget *parent)
-    : QDialog(parent), ui(new Ui::IconPickerDialog)
+IconPickerDialog::IconPickerDialog(QWidget* parent) : QDialog(parent), ui(new Ui::IconPickerDialog)
 {
     ui->setupUi(this);
     setWindowModality(Qt::WindowModal);
@@ -69,31 +68,30 @@ IconPickerDialog::IconPickerDialog(QWidget *parent)
 
     connect(contentsWidget, SIGNAL(doubleClicked(QModelIndex)), SLOT(activated(QModelIndex)));
 
-    connect(contentsWidget->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SLOT(selectionChanged(QItemSelection, QItemSelection)));
+    connect(contentsWidget->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+            SLOT(selectionChanged(QItemSelection, QItemSelection)));
 
     auto buttonFolder = ui->buttonBox->addButton(tr("Open Folder"), QDialogButtonBox::ResetRole);
     connect(buttonFolder, &QPushButton::clicked, this, &IconPickerDialog::openFolder);
 }
 
-bool IconPickerDialog::eventFilter(QObject *obj, QEvent *evt)
+bool IconPickerDialog::eventFilter(QObject* obj, QEvent* evt)
 {
     if (obj != ui->iconView)
         return QDialog::eventFilter(obj, evt);
-    if (evt->type() != QEvent::KeyPress)
-    {
+    if (evt->type() != QEvent::KeyPress) {
         return QDialog::eventFilter(obj, evt);
     }
-    QKeyEvent *keyEvent = static_cast<QKeyEvent *>(evt);
-    switch (keyEvent->key())
-    {
-    case Qt::Key_Delete:
-        removeSelectedIcon();
-        return true;
-    case Qt::Key_Plus:
-        addNewIcon();
-        return true;
-    default:
-        break;
+    QKeyEvent* keyEvent = static_cast<QKeyEvent*>(evt);
+    switch (keyEvent->key()) {
+        case Qt::Key_Delete:
+            removeSelectedIcon();
+            return true;
+        case Qt::Key_Plus:
+            addNewIcon();
+            return true;
+        default:
+            break;
     }
     return QDialog::eventFilter(obj, evt);
 }
@@ -142,8 +140,7 @@ int IconPickerDialog::execWithSelection(QString selection)
 
     int index_nr = list->getIconIndex(selection);
     auto model_index = list->index(index_nr);
-    contentsWidget->selectionModel()->select(
-        model_index, QItemSelectionModel::Current | QItemSelectionModel::Select);
+    contentsWidget->selectionModel()->select(model_index, QItemSelectionModel::Current | QItemSelectionModel::Select);
 
     QMetaObject::invokeMethod(this, "delayed_scroll", Qt::QueuedConnection, Q_ARG(QModelIndex, model_index));
     return QDialog::exec();
diff --git a/launcher/ui/dialogs/IconPickerDialog.h b/launcher/ui/dialogs/IconPickerDialog.h
index c93f565f..37e53dcc 100644
--- a/launcher/ui/dialogs/IconPickerDialog.h
+++ b/launcher/ui/dialogs/IconPickerDialog.h
@@ -17,30 +17,27 @@
 #include <QDialog>
 #include <QItemSelection>
 
-namespace Ui
-{
+namespace Ui {
 class IconPickerDialog;
 }
 
-class IconPickerDialog : public QDialog
-{
+class IconPickerDialog : public QDialog {
     Q_OBJECT
 
-public:
-    explicit IconPickerDialog(QWidget *parent = 0);
+   public:
+    explicit IconPickerDialog(QWidget* parent = 0);
     ~IconPickerDialog();
     int execWithSelection(QString selection);
     QString selectedIconKey;
 
-protected:
-    virtual bool eventFilter(QObject *, QEvent *);
+   protected:
+    virtual bool eventFilter(QObject*, QEvent*);
 
-private:
-    Ui::IconPickerDialog *ui;
-    QPushButton *buttonRemove;
+   private:
+    Ui::IconPickerDialog* ui;
+    QPushButton* buttonRemove;
 
-private
-slots:
+   private slots:
     void selectionChanged(QItemSelection, QItemSelection);
     void activated(QModelIndex);
     void delayed_scroll(QModelIndex);
diff --git a/launcher/ui/dialogs/ImportResourceDialog.h b/launcher/ui/dialogs/ImportResourceDialog.h
index 5f2f7a92..bbde1ba7 100644
--- a/launcher/ui/dialogs/ImportResourceDialog.h
+++ b/launcher/ui/dialogs/ImportResourceDialog.h
@@ -17,7 +17,7 @@ class ImportResourceDialog : public QDialog {
     explicit ImportResourceDialog(QString file_path, PackedResourceType type, QWidget* parent = nullptr);
     ~ImportResourceDialog() override;
     QString selectedInstanceKey;
-    
+
    private:
     Ui::ImportResourceDialog* ui;
     PackedResourceType m_resource_type;
diff --git a/launcher/ui/dialogs/LoginDialog.cpp b/launcher/ui/dialogs/LoginDialog.cpp
index 30394b72..7296a13e 100644
--- a/launcher/ui/dialogs/LoginDialog.cpp
+++ b/launcher/ui/dialogs/LoginDialog.cpp
@@ -20,7 +20,7 @@
 
 #include <QtWidgets/QPushButton>
 
-LoginDialog::LoginDialog(QWidget *parent) : QDialog(parent), ui(new Ui::LoginDialog)
+LoginDialog::LoginDialog(QWidget* parent) : QDialog(parent), ui(new Ui::LoginDialog)
 {
     ui->setupUi(this);
     ui->progressBar->setVisible(false);
@@ -59,27 +59,24 @@ void LoginDialog::setUserInputsEnabled(bool enable)
 }
 
 // Enable the OK button only when both textboxes contain something.
-void LoginDialog::on_userTextBox_textEdited(const QString &newText)
+void LoginDialog::on_userTextBox_textEdited(const QString& newText)
 {
-    ui->buttonBox->button(QDialogButtonBox::Ok)
-        ->setEnabled(!newText.isEmpty() && !ui->passTextBox->text().isEmpty());
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!newText.isEmpty() && !ui->passTextBox->text().isEmpty());
 }
-void LoginDialog::on_passTextBox_textEdited(const QString &newText)
+void LoginDialog::on_passTextBox_textEdited(const QString& newText)
 {
-    ui->buttonBox->button(QDialogButtonBox::Ok)
-        ->setEnabled(!newText.isEmpty() && !ui->userTextBox->text().isEmpty());
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!newText.isEmpty() && !ui->userTextBox->text().isEmpty());
 }
 
-void LoginDialog::onTaskFailed(const QString &reason)
+void LoginDialog::onTaskFailed(const QString& reason)
 {
     // Set message
     auto lines = reason.split('\n');
     QString processed;
-    for(auto line: lines) {
-        if(line.size()) {
+    for (auto line : lines) {
+        if (line.size()) {
             processed += "<font color='red'>" + line + "</font><br />";
-        }
-        else {
+        } else {
             processed += "<br />";
         }
     }
@@ -95,7 +92,7 @@ void LoginDialog::onTaskSucceeded()
     QDialog::accept();
 }
 
-void LoginDialog::onTaskStatus(const QString &status)
+void LoginDialog::onTaskStatus(const QString& status)
 {
     ui->label->setText(status);
 }
@@ -107,12 +104,11 @@ void LoginDialog::onTaskProgress(qint64 current, qint64 total)
 }
 
 // Public interface
-MinecraftAccountPtr LoginDialog::newAccount(QWidget *parent, QString msg)
+MinecraftAccountPtr LoginDialog::newAccount(QWidget* parent, QString msg)
 {
     LoginDialog dlg(parent);
     dlg.ui->label->setText(msg);
-    if (dlg.exec() == QDialog::Accepted)
-    {
+    if (dlg.exec() == QDialog::Accepted) {
         return dlg.m_account;
     }
     return nullptr;
diff --git a/launcher/ui/dialogs/LoginDialog.h b/launcher/ui/dialogs/LoginDialog.h
index f8101ff5..601b5fa7 100644
--- a/launcher/ui/dialogs/LoginDialog.h
+++ b/launcher/ui/dialogs/LoginDialog.h
@@ -15,45 +15,42 @@
 
 #pragma once
 
-#include <QtWidgets/QDialog>
 #include <QtCore/QEventLoop>
+#include <QtWidgets/QDialog>
 
 #include "minecraft/auth/MinecraftAccount.h"
 #include "tasks/Task.h"
 
-namespace Ui
-{
+namespace Ui {
 class LoginDialog;
 }
 
-class LoginDialog : public QDialog
-{
+class LoginDialog : public QDialog {
     Q_OBJECT
 
-public:
+   public:
     ~LoginDialog();
 
-    static MinecraftAccountPtr newAccount(QWidget *parent, QString message);
+    static MinecraftAccountPtr newAccount(QWidget* parent, QString message);
 
-private:
-    explicit LoginDialog(QWidget *parent = 0);
+   private:
+    explicit LoginDialog(QWidget* parent = 0);
 
     void setUserInputsEnabled(bool enable);
 
-protected
-slots:
+   protected slots:
     void accept();
 
-    void onTaskFailed(const QString &reason);
+    void onTaskFailed(const QString& reason);
     void onTaskSucceeded();
-    void onTaskStatus(const QString &status);
+    void onTaskStatus(const QString& status);
     void onTaskProgress(qint64 current, qint64 total);
 
-    void on_userTextBox_textEdited(const QString &newText);
-    void on_passTextBox_textEdited(const QString &newText);
+    void on_userTextBox_textEdited(const QString& newText);
+    void on_passTextBox_textEdited(const QString& newText);
 
-private:
-    Ui::LoginDialog *ui;
+   private:
+    Ui::LoginDialog* ui;
     MinecraftAccountPtr m_account;
     Task::Ptr m_loginTask;
 };
diff --git a/launcher/ui/dialogs/MSALoginDialog.cpp b/launcher/ui/dialogs/MSALoginDialog.cpp
index be49babb..74fff9fd 100644
--- a/launcher/ui/dialogs/MSALoginDialog.cpp
+++ b/launcher/ui/dialogs/MSALoginDialog.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -39,12 +39,12 @@
 #include "DesktopServices.h"
 #include "minecraft/auth/AccountTask.h"
 
-#include <QtWidgets/QPushButton>
-#include <QUrl>
 #include <QApplication>
 #include <QClipboard>
+#include <QUrl>
+#include <QtWidgets/QPushButton>
 
-MSALoginDialog::MSALoginDialog(QWidget *parent) : QDialog(parent), ui(new Ui::MSALoginDialog)
+MSALoginDialog::MSALoginDialog(QWidget* parent) : QDialog(parent), ui(new Ui::MSALoginDialog)
 {
     ui->setupUi(this);
     ui->progressBar->setVisible(false);
@@ -55,7 +55,8 @@ MSALoginDialog::MSALoginDialog(QWidget *parent) : QDialog(parent), ui(new Ui::MS
     connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 }
 
-int MSALoginDialog::exec() {
+int MSALoginDialog::exec()
+{
     setUserInputsEnabled(false);
     ui->progressBar->setVisible(true);
 
@@ -74,24 +75,24 @@ int MSALoginDialog::exec() {
     return QDialog::exec();
 }
 
-
 MSALoginDialog::~MSALoginDialog()
 {
     delete ui;
 }
 
-void MSALoginDialog::externalLoginTick() {
+void MSALoginDialog::externalLoginTick()
+{
     m_externalLoginElapsed++;
     ui->progressBar->setValue(m_externalLoginElapsed);
     ui->progressBar->repaint();
 
-    if(m_externalLoginElapsed >= m_externalLoginTimeout) {
+    if (m_externalLoginElapsed >= m_externalLoginTimeout) {
         m_externalLoginTimer.stop();
     }
 }
 
-
-void MSALoginDialog::showVerificationUriAndCode(const QUrl& uri, const QString& code, int expiresIn) {
+void MSALoginDialog::showVerificationUriAndCode(const QUrl& uri, const QString& code, int expiresIn)
+{
     m_externalLoginElapsed = 0;
     m_externalLoginTimeout = expiresIn;
 
@@ -104,7 +105,8 @@ void MSALoginDialog::showVerificationUriAndCode(const QUrl& uri, const QString&
 
     QString urlString = uri.toString();
     QString linkString = QString("<a href=\"%1\">%2</a>").arg(urlString, urlString);
-    ui->label->setText(tr("<p>Please open up %1 in a browser and put in the code <b>%2</b> to proceed with login.</p>").arg(linkString, code));
+    ui->label->setText(
+        tr("<p>Please open up %1 in a browser and put in the code <b>%2</b> to proceed with login.</p>").arg(linkString, code));
     ui->actionButton->setVisible(true);
     connect(ui->actionButton, &QPushButton::clicked, [=]() {
         DesktopServices::openUrl(uri);
@@ -113,7 +115,8 @@ void MSALoginDialog::showVerificationUriAndCode(const QUrl& uri, const QString&
     });
 }
 
-void MSALoginDialog::hideVerificationUriAndCode() {
+void MSALoginDialog::hideVerificationUriAndCode()
+{
     m_externalLoginTimer.stop();
     ui->actionButton->setVisible(false);
 }
@@ -123,16 +126,15 @@ void MSALoginDialog::setUserInputsEnabled(bool enable)
     ui->buttonBox->setEnabled(enable);
 }
 
-void MSALoginDialog::onTaskFailed(const QString &reason)
+void MSALoginDialog::onTaskFailed(const QString& reason)
 {
     // Set message
     auto lines = reason.split('\n');
     QString processed;
-    for(auto line: lines) {
-        if(line.size()) {
+    for (auto line : lines) {
+        if (line.size()) {
             processed += "<font color='red'>" + line + "</font><br />";
-        }
-        else {
+        } else {
             processed += "<br />";
         }
     }
@@ -149,7 +151,7 @@ void MSALoginDialog::onTaskSucceeded()
     QDialog::accept();
 }
 
-void MSALoginDialog::onTaskStatus(const QString &status)
+void MSALoginDialog::onTaskStatus(const QString& status)
 {
     ui->label->setText(status);
 }
@@ -161,12 +163,11 @@ void MSALoginDialog::onTaskProgress(qint64 current, qint64 total)
 }
 
 // Public interface
-MinecraftAccountPtr MSALoginDialog::newAccount(QWidget *parent, QString msg)
+MinecraftAccountPtr MSALoginDialog::newAccount(QWidget* parent, QString msg)
 {
     MSALoginDialog dlg(parent);
     dlg.ui->label->setText(msg);
-    if (dlg.exec() == QDialog::Accepted)
-    {
+    if (dlg.exec() == QDialog::Accepted) {
         return dlg.m_account;
     }
     return nullptr;
diff --git a/launcher/ui/dialogs/MSALoginDialog.h b/launcher/ui/dialogs/MSALoginDialog.h
index 4cf146ab..03e276bc 100644
--- a/launcher/ui/dialogs/MSALoginDialog.h
+++ b/launcher/ui/dialogs/MSALoginDialog.h
@@ -15,49 +15,45 @@
 
 #pragma once
 
-#include <QtWidgets/QDialog>
-#include <QtCore/QEventLoop>
 #include <QTimer>
+#include <QtCore/QEventLoop>
+#include <QtWidgets/QDialog>
 
 #include "minecraft/auth/MinecraftAccount.h"
 
-namespace Ui
-{
+namespace Ui {
 class MSALoginDialog;
 }
 
-class MSALoginDialog : public QDialog
-{
+class MSALoginDialog : public QDialog {
     Q_OBJECT
 
-public:
+   public:
     ~MSALoginDialog();
 
-    static MinecraftAccountPtr newAccount(QWidget *parent, QString message);
+    static MinecraftAccountPtr newAccount(QWidget* parent, QString message);
     int exec() override;
 
-private:
-    explicit MSALoginDialog(QWidget *parent = 0);
+   private:
+    explicit MSALoginDialog(QWidget* parent = 0);
 
     void setUserInputsEnabled(bool enable);
 
-protected
-slots:
-    void onTaskFailed(const QString &reason);
+   protected slots:
+    void onTaskFailed(const QString& reason);
     void onTaskSucceeded();
-    void onTaskStatus(const QString &status);
+    void onTaskStatus(const QString& status);
     void onTaskProgress(qint64 current, qint64 total);
-    void showVerificationUriAndCode(const QUrl &uri, const QString &code, int expiresIn);
+    void showVerificationUriAndCode(const QUrl& uri, const QString& code, int expiresIn);
     void hideVerificationUriAndCode();
 
     void externalLoginTick();
 
-private:
-    Ui::MSALoginDialog *ui;
+   private:
+    Ui::MSALoginDialog* ui;
     MinecraftAccountPtr m_account;
     shared_qobject_ptr<AccountTask> m_loginTask;
     QTimer m_externalLoginTimer;
     int m_externalLoginElapsed = 0;
     int m_externalLoginTimeout = 0;
 };
-
diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index 8618b924..0af1ec59 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -89,15 +89,17 @@ void ModUpdateDialog::checkCandidates()
 
     if (!m_modrinth_to_update.empty()) {
         m_modrinth_check_task.reset(new ModrinthCheckUpdate(m_modrinth_to_update, versions, loaders, m_mod_model));
-        connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this,
-                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({mod, reason, recover_url}); });
+        connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this, [this](Mod* mod, QString reason, QUrl recover_url) {
+            m_failed_check_update.append({ mod, reason, recover_url });
+        });
         check_task.addTask(m_modrinth_check_task);
     }
 
     if (!m_flame_to_update.empty()) {
         m_flame_check_task.reset(new FlameCheckUpdate(m_flame_to_update, versions, loaders, m_mod_model));
-        connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this,
-                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({mod, reason, recover_url}); });
+        connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this, [this](Mod* mod, QString reason, QUrl recover_url) {
+            m_failed_check_update.append({ mod, reason, recover_url });
+        });
         check_task.addTask(m_flame_check_task);
     }
 
@@ -162,7 +164,7 @@ void ModUpdateDialog::checkCandidates()
             if (!recover_url.isEmpty())
                 //: %1 is the link to download it manually
                 text += tr("Possible solution: Getting the latest version manually:<br>%1<br>")
-                    .arg(QString("<a href='%1'>%1</a>").arg(recover_url.toString()));
+                            .arg(QString("<a href='%1'>%1</a>").arg(recover_url.toString()));
             text += "<br>";
         }
 
@@ -342,7 +344,7 @@ void ModUpdateDialog::onMetadataFailed(Mod* mod, bool try_others, ModPlatform::R
     } else {
         QString reason{ tr("Couldn't find a valid version on the selected mod provider(s)") };
 
-        m_failed_metadata.append({mod, reason});
+        m_failed_metadata.append({ mod, reason });
     }
 }
 
diff --git a/launcher/ui/dialogs/ModUpdateDialog.h b/launcher/ui/dialogs/ModUpdateDialog.h
index 1a92f613..12dddf5e 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.h
+++ b/launcher/ui/dialogs/ModUpdateDialog.h
@@ -36,7 +36,9 @@ class ModUpdateDialog final : public ReviewMessageBox {
 
    private slots:
     void onMetadataEnsured(Mod*);
-    void onMetadataFailed(Mod*, bool try_others = false, ModPlatform::ResourceProvider first_choice = ModPlatform::ResourceProvider::MODRINTH);
+    void onMetadataFailed(Mod*,
+                          bool try_others = false,
+                          ModPlatform::ResourceProvider first_choice = ModPlatform::ResourceProvider::MODRINTH);
 
    private:
     QWidget* m_parent;
diff --git a/launcher/ui/dialogs/NewComponentDialog.cpp b/launcher/ui/dialogs/NewComponentDialog.cpp
index ea790e8c..b47b85ff 100644
--- a/launcher/ui/dialogs/NewComponentDialog.cpp
+++ b/launcher/ui/dialogs/NewComponentDialog.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -33,28 +33,28 @@
  *      limitations under the License.
  */
 
-#include "Application.h"
 #include "NewComponentDialog.h"
+#include "Application.h"
 #include "ui_NewComponentDialog.h"
 
 #include <BaseVersion.h>
+#include <InstanceList.h>
 #include <icons/IconList.h>
 #include <tasks/Task.h>
-#include <InstanceList.h>
 
-#include "VersionSelectDialog.h"
-#include "ProgressDialog.h"
 #include "IconPickerDialog.h"
+#include "ProgressDialog.h"
+#include "VersionSelectDialog.h"
 
+#include <QFileDialog>
 #include <QLayout>
 #include <QPushButton>
-#include <QFileDialog>
 #include <QValidator>
 
 #include <meta/Index.h>
 #include <meta/VersionList.h>
 
-NewComponentDialog::NewComponentDialog(const QString & initialName, const QString & initialUid, QWidget *parent)
+NewComponentDialog::NewComponentDialog(const QString& initialName, const QString& initialUid, QWidget* parent)
     : QDialog(parent), ui(new Ui::NewComponentDialog)
 {
     ui->setupUi(this);
@@ -81,12 +81,9 @@ void NewComponentDialog::updateDialogState()
 {
     auto protoUid = ui->nameTextBox->text().toLower();
     protoUid.remove(QRegularExpression("[^a-z]"));
-    if(protoUid.isEmpty())
-    {
+    if (protoUid.isEmpty()) {
         ui->uidTextBox->setPlaceholderText(originalPlaceholderText);
-    }
-    else
-    {
+    } else {
         QString suggestedUid = "org.multimc.custom." + protoUid;
         ui->uidTextBox->setPlaceholderText(suggestedUid);
     }
@@ -97,8 +94,7 @@ void NewComponentDialog::updateDialogState()
 QString NewComponentDialog::name() const
 {
     auto result = ui->nameTextBox->text();
-    if(result.size())
-    {
+    if (result.size()) {
         return result.trimmed();
     }
     return QString();
@@ -107,13 +103,11 @@ QString NewComponentDialog::name() const
 QString NewComponentDialog::uid() const
 {
     auto result = ui->uidTextBox->text();
-    if(result.size())
-    {
+    if (result.size()) {
         return result.trimmed();
     }
     result = ui->uidTextBox->placeholderText();
-    if(result.size() && result != originalPlaceholderText)
-    {
+    if (result.size() && result != originalPlaceholderText) {
         return result.trimmed();
     }
     return QString();
diff --git a/launcher/ui/dialogs/NewComponentDialog.h b/launcher/ui/dialogs/NewComponentDialog.h
index 8c790beb..4fb68ff2 100644
--- a/launcher/ui/dialogs/NewComponentDialog.h
+++ b/launcher/ui/dialogs/NewComponentDialog.h
@@ -20,28 +20,26 @@
 #include <QString>
 #include <QStringList>
 
-namespace Ui
-{
+namespace Ui {
 class NewComponentDialog;
 }
 
-class NewComponentDialog : public QDialog
-{
+class NewComponentDialog : public QDialog {
     Q_OBJECT
 
-public:
-    explicit NewComponentDialog(const QString & initialName = QString(), const QString & initialUid = QString(), QWidget *parent = 0);
+   public:
+    explicit NewComponentDialog(const QString& initialName = QString(), const QString& initialUid = QString(), QWidget* parent = 0);
     virtual ~NewComponentDialog();
     void setBlacklist(QStringList badUids);
 
     QString name() const;
     QString uid() const;
 
-private slots:
+   private slots:
     void updateDialogState();
 
-private:
-    Ui::NewComponentDialog *ui;
+   private:
+    Ui::NewComponentDialog* ui;
 
     QString originalPlaceholderText;
     QStringList uidBlacklist;
diff --git a/launcher/ui/dialogs/NewInstanceDialog.cpp b/launcher/ui/dialogs/NewInstanceDialog.cpp
index 935f095e..9613c6b0 100644
--- a/launcher/ui/dialogs/NewInstanceDialog.cpp
+++ b/launcher/ui/dialogs/NewInstanceDialog.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -89,15 +89,14 @@ NewInstanceDialog::NewInstanceDialog(const QString& initialGroup,
     groupList.push_front("");
     ui->groupBox->addItems(groupList);
     int index = groupList.indexOf(initialGroup);
-    if(index == -1)
-    {
+    if (index == -1) {
         index = 0;
     }
     ui->groupBox->setCurrentIndex(index);
     ui->groupBox->lineEdit()->setPlaceholderText(tr("No group"));
 
-
-    // NOTE: m_buttons must be initialized before PageContainer, because it indirectly accesses m_buttons through setSuggestedPack! Do not move this below.
+    // 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, {}, this);
@@ -124,8 +123,7 @@ NewInstanceDialog::NewInstanceDialog(const QString& initialGroup,
     HelpButton->setAutoDefault(false);
     connect(HelpButton, &QPushButton::clicked, m_container, &PageContainer::help);
 
-    if(!url.isEmpty())
-    {
+    if (!url.isEmpty()) {
         QUrl actualUrl(url);
         m_container->selectPage("import");
         importPage->setUrl(url);
@@ -158,9 +156,9 @@ void NewInstanceDialog::accept()
     QDialog::accept();
 }
 
-QList<BasePage *> NewInstanceDialog::getPages()
+QList<BasePage*> NewInstanceDialog::getPages()
 {
-    QList<BasePage *> pages;
+    QList<BasePage*> pages;
 
     importPage = new ImportPage(this);
 
@@ -219,17 +217,17 @@ void NewInstanceDialog::setSuggestedPack(const QString& name, QString version, I
     m_buttons->button(QDialogButtonBox::Ok)->setEnabled(allowOK);
 }
 
-void NewInstanceDialog::setSuggestedIconFromFile(const QString &path, const QString &name)
+void NewInstanceDialog::setSuggestedIconFromFile(const QString& path, const QString& name)
 {
     importIcon = true;
     importIconPath = path;
     importIconName = name;
 
-    //Hmm, for some reason they can be to small
+    // Hmm, for some reason they can be to small
     ui->iconButton->setIcon(QIcon(path));
 }
 
-void NewInstanceDialog::setSuggestedIcon(const QString &key)
+void NewInstanceDialog::setSuggestedIcon(const QString& key)
 {
     auto icon = APPLICATION->icons()->getIcon(key);
     importIcon = false;
@@ -237,9 +235,9 @@ void NewInstanceDialog::setSuggestedIcon(const QString &key)
     ui->iconButton->setIcon(icon);
 }
 
-InstanceTask * NewInstanceDialog::extractTask()
+InstanceTask* NewInstanceDialog::extractTask()
 {
-    InstanceTask * extracted = creationTask.get();
+    InstanceTask* extracted = creationTask.get();
     creationTask.release();
 
     InstanceName inst_name(ui->instNameTextBox->placeholderText().trimmed(), importVersion);
@@ -255,8 +253,7 @@ void NewInstanceDialog::updateDialogState()
 {
     auto allowOK = creationTask && !instName().isEmpty();
     auto OkButton = m_buttons->button(QDialogButtonBox::Ok);
-    if(OkButton->isEnabled() != allowOK)
-    {
+    if (OkButton->isEnabled() != allowOK) {
         OkButton->setEnabled(allowOK);
     }
 }
@@ -264,13 +261,11 @@ void NewInstanceDialog::updateDialogState()
 QString NewInstanceDialog::instName() const
 {
     auto result = ui->instNameTextBox->text().trimmed();
-    if(result.size())
-    {
+    if (result.size()) {
         return result;
     }
     result = ui->instNameTextBox->placeholderText().trimmed();
-    if(result.size())
-    {
+    if (result.size()) {
         return result;
     }
     return QString();
@@ -298,7 +293,7 @@ void NewInstanceDialog::on_iconButton_clicked()
     }
 }
 
-void NewInstanceDialog::on_instNameTextBox_textChanged(const QString& arg1)
+void NewInstanceDialog::on_instNameTextBox_textChanged([[maybe_unused]] const QString& arg1)
 {
     updateDialogState();
 }
diff --git a/launcher/ui/dialogs/NewInstanceDialog.h b/launcher/ui/dialogs/NewInstanceDialog.h
index 6a6ad89e..92357956 100644
--- a/launcher/ui/dialogs/NewInstanceDialog.h
+++ b/launcher/ui/dialogs/NewInstanceDialog.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/launcher/ui/dialogs/OfflineLoginDialog.cpp b/launcher/ui/dialogs/OfflineLoginDialog.cpp
index a69537ab..137620be 100644
--- a/launcher/ui/dialogs/OfflineLoginDialog.cpp
+++ b/launcher/ui/dialogs/OfflineLoginDialog.cpp
@@ -5,7 +5,7 @@
 
 #include <QtWidgets/QPushButton>
 
-OfflineLoginDialog::OfflineLoginDialog(QWidget *parent) : QDialog(parent), ui(new Ui::OfflineLoginDialog)
+OfflineLoginDialog::OfflineLoginDialog(QWidget* parent) : QDialog(parent), ui(new Ui::OfflineLoginDialog)
 {
     ui->setupUi(this);
     ui->progressBar->setVisible(false);
@@ -52,22 +52,20 @@ void OfflineLoginDialog::on_allowLongUsernames_stateChanged(int value)
 }
 
 // Enable the OK button only when the textbox contains something.
-void OfflineLoginDialog::on_userTextBox_textEdited(const QString &newText)
+void OfflineLoginDialog::on_userTextBox_textEdited(const QString& newText)
 {
-    ui->buttonBox->button(QDialogButtonBox::Ok)
-        ->setEnabled(!newText.isEmpty());
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!newText.isEmpty());
 }
 
-void OfflineLoginDialog::onTaskFailed(const QString &reason)
+void OfflineLoginDialog::onTaskFailed(const QString& reason)
 {
     // Set message
     auto lines = reason.split('\n');
     QString processed;
-    for(auto line: lines) {
-        if(line.size()) {
+    for (auto line : lines) {
+        if (line.size()) {
             processed += "<font color='red'>" + line + "</font><br />";
-        }
-        else {
+        } else {
             processed += "<br />";
         }
     }
@@ -83,7 +81,7 @@ void OfflineLoginDialog::onTaskSucceeded()
     QDialog::accept();
 }
 
-void OfflineLoginDialog::onTaskStatus(const QString &status)
+void OfflineLoginDialog::onTaskStatus(const QString& status)
 {
     ui->label->setText(status);
 }
@@ -95,12 +93,11 @@ void OfflineLoginDialog::onTaskProgress(qint64 current, qint64 total)
 }
 
 // Public interface
-MinecraftAccountPtr OfflineLoginDialog::newAccount(QWidget *parent, QString msg)
+MinecraftAccountPtr OfflineLoginDialog::newAccount(QWidget* parent, QString msg)
 {
     OfflineLoginDialog dlg(parent);
     dlg.ui->label->setText(msg);
-    if (dlg.exec() == QDialog::Accepted)
-    {
+    if (dlg.exec() == QDialog::Accepted) {
         return dlg.m_account;
     }
     return nullptr;
diff --git a/launcher/ui/dialogs/OfflineLoginDialog.h b/launcher/ui/dialogs/OfflineLoginDialog.h
index fdb3d91f..a50024a6 100644
--- a/launcher/ui/dialogs/OfflineLoginDialog.h
+++ b/launcher/ui/dialogs/OfflineLoginDialog.h
@@ -1,44 +1,41 @@
 #pragma once
 
-#include <QtWidgets/QDialog>
 #include <QtCore/QEventLoop>
+#include <QtWidgets/QDialog>
 
 #include "minecraft/auth/MinecraftAccount.h"
 #include "tasks/Task.h"
 
-namespace Ui
-{
+namespace Ui {
 class OfflineLoginDialog;
 }
 
-class OfflineLoginDialog : public QDialog
-{
+class OfflineLoginDialog : public QDialog {
     Q_OBJECT
 
-public:
+   public:
     ~OfflineLoginDialog();
 
-    static MinecraftAccountPtr newAccount(QWidget *parent, QString message);
+    static MinecraftAccountPtr newAccount(QWidget* parent, QString message);
 
-private:
-    explicit OfflineLoginDialog(QWidget *parent = 0);
+   private:
+    explicit OfflineLoginDialog(QWidget* parent = 0);
 
     void setUserInputsEnabled(bool enable);
 
-protected
-slots:
+   protected slots:
     void accept();
 
-    void onTaskFailed(const QString &reason);
+    void onTaskFailed(const QString& reason);
     void onTaskSucceeded();
-    void onTaskStatus(const QString &status);
+    void onTaskStatus(const QString& status);
     void onTaskProgress(qint64 current, qint64 total);
 
-    void on_userTextBox_textEdited(const QString &newText);
+    void on_userTextBox_textEdited(const QString& newText);
     void on_allowLongUsernames_stateChanged(int value);
 
-private:
-    Ui::OfflineLoginDialog *ui;
+   private:
+    Ui::OfflineLoginDialog* ui;
     MinecraftAccountPtr m_account;
     Task::Ptr m_loginTask;
 };
diff --git a/launcher/ui/dialogs/ProfileSelectDialog.cpp b/launcher/ui/dialogs/ProfileSelectDialog.cpp
index 7882cf45..a62238bd 100644
--- a/launcher/ui/dialogs/ProfileSelectDialog.cpp
+++ b/launcher/ui/dialogs/ProfileSelectDialog.cpp
@@ -16,43 +16,38 @@
 #include "ProfileSelectDialog.h"
 #include "ui_ProfileSelectDialog.h"
 
-#include <QItemSelectionModel>
 #include <QDebug>
+#include <QItemSelectionModel>
 
-#include "SkinUtils.h"
 #include "Application.h"
+#include "SkinUtils.h"
 
 #include "ui/dialogs/ProgressDialog.h"
 
-ProfileSelectDialog::ProfileSelectDialog(const QString &message, int flags, QWidget *parent)
+ProfileSelectDialog::ProfileSelectDialog(const QString& message, int flags, QWidget* parent)
     : QDialog(parent), ui(new Ui::ProfileSelectDialog)
 {
     ui->setupUi(this);
 
     m_accounts = APPLICATION->accounts();
     auto view = ui->listView;
-    //view->setModel(m_accounts.get());
-    //view->hideColumn(AccountList::ActiveColumn);
+    // view->setModel(m_accounts.get());
+    // view->hideColumn(AccountList::ActiveColumn);
     view->setColumnCount(1);
     view->setRootIsDecorated(false);
     // FIXME: use a real model, not this
-    if(QTreeWidgetItem* header = view->headerItem())
-    {
+    if (QTreeWidgetItem* header = view->headerItem()) {
         header->setText(0, tr("Name"));
-    }
-    else
-    {
+    } else {
         view->setHeaderLabel(tr("Name"));
     }
-    QList <QTreeWidgetItem *> items;
-    for (int i = 0; i < m_accounts->count(); i++)
-    {
+    QList<QTreeWidgetItem*> items;
+    for (int i = 0; i < m_accounts->count(); i++) {
         MinecraftAccountPtr account = m_accounts->at(i);
         QString profileLabel;
-        if(account->isInUse()) {
+        if (account->isInUse()) {
             profileLabel = tr("%1 (in use)").arg(account->profileName());
-        }
-        else {
+        } else {
             profileLabel = account->profileName();
         }
         auto item = new QTreeWidgetItem(view);
@@ -101,8 +96,7 @@ bool ProfileSelectDialog::useAsInstDefaullt() const
 void ProfileSelectDialog::on_buttonBox_accepted()
 {
     QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-    if (selection.size() > 0)
-    {
+    if (selection.size() > 0) {
         QModelIndex selected = selection.first();
         m_selected = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
     }
diff --git a/launcher/ui/dialogs/ProfileSelectDialog.h b/launcher/ui/dialogs/ProfileSelectDialog.h
index 38aa4249..e56ba052 100644
--- a/launcher/ui/dialogs/ProfileSelectDialog.h
+++ b/launcher/ui/dialogs/ProfileSelectDialog.h
@@ -21,17 +21,14 @@
 
 #include "minecraft/auth/AccountList.h"
 
-namespace Ui
-{
+namespace Ui {
 class ProfileSelectDialog;
 }
 
-class ProfileSelectDialog : public QDialog
-{
+class ProfileSelectDialog : public QDialog {
     Q_OBJECT
-public:
-    enum Flags
-    {
+   public:
+    enum Flags {
         NoFlags = 0,
 
         /*!
@@ -52,7 +49,7 @@ public:
      * Constructs a new account select dialog with the given parent and message.
      * The message will be shown at the top of the dialog. It is an empty string by default.
      */
-    explicit ProfileSelectDialog(const QString& message="", int flags=0, QWidget *parent = 0);
+    explicit ProfileSelectDialog(const QString& message = "", int flags = 0, QWidget* parent = 0);
     ~ProfileSelectDialog();
 
     /*!
@@ -73,18 +70,17 @@ public:
      */
     bool useAsInstDefaullt() const;
 
-public
-slots:
+   public slots:
     void on_buttonBox_accepted();
 
     void on_buttonBox_rejected();
 
-protected:
+   protected:
     shared_qobject_ptr<AccountList> m_accounts;
 
     //! The account that was selected when the user clicked OK.
     MinecraftAccountPtr m_selected;
 
-private:
-    Ui::ProfileSelectDialog *ui;
+   private:
+    Ui::ProfileSelectDialog* ui;
 };
diff --git a/launcher/ui/dialogs/ProfileSetupDialog.cpp b/launcher/ui/dialogs/ProfileSetupDialog.cpp
index 64c0b924..4b0c5b76 100644
--- a/launcher/ui/dialogs/ProfileSetupDialog.cpp
+++ b/launcher/ui/dialogs/ProfileSetupDialog.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -36,11 +36,11 @@
 #include "ProfileSetupDialog.h"
 #include "ui_ProfileSetupDialog.h"
 
-#include <QPushButton>
 #include <QAction>
-#include <QRegularExpressionValidator>
-#include <QJsonDocument>
 #include <QDebug>
+#include <QJsonDocument>
+#include <QPushButton>
+#include <QRegularExpressionValidator>
 
 #include "ui/dialogs/ProgressDialog.h"
 
@@ -48,8 +48,7 @@
 #include "minecraft/auth/AuthRequest.h"
 #include "minecraft/auth/Parsers.h"
 
-
-ProfileSetupDialog::ProfileSetupDialog(MinecraftAccountPtr accountToSetup, QWidget *parent)
+ProfileSetupDialog::ProfileSetupDialog(MinecraftAccountPtr accountToSetup, QWidget* parent)
     : QDialog(parent), m_accountToSetup(accountToSetup), ui(new Ui::ProfileSetupDialog)
 {
     ui->setupUi(this);
@@ -91,13 +90,11 @@ void ProfileSetupDialog::setNameStatus(ProfileSetupDialog::NameStatus status, QS
 {
     nameStatus = status;
     auto okButton = ui->buttonBox->button(QDialogButtonBox::Ok);
-    switch(nameStatus)
-    {
+    switch (nameStatus) {
         case NameStatus::Available: {
             validityAction->setIcon(goodIcon);
             okButton->setEnabled(true);
-        }
-        break;
+        } break;
         case NameStatus::NotSet:
         case NameStatus::Pending:
             validityAction->setIcon(yellowIcon);
@@ -109,43 +106,44 @@ void ProfileSetupDialog::setNameStatus(ProfileSetupDialog::NameStatus status, QS
             okButton->setEnabled(false);
             break;
     }
-    if(!errorString.isEmpty()) {
+    if (!errorString.isEmpty()) {
         ui->errorLabel->setText(errorString);
         ui->errorLabel->setVisible(true);
-    }
-    else {
+    } else {
         ui->errorLabel->setVisible(false);
     }
 }
 
 void ProfileSetupDialog::nameEdited(const QString& name)
 {
-    if(!ui->nameEdit->hasAcceptableInput()) {
+    if (!ui->nameEdit->hasAcceptableInput()) {
         setNameStatus(NameStatus::NotSet, tr("Name is too short - must be between 3 and 16 characters long."));
         return;
     }
     scheduleCheck(name);
 }
 
-void ProfileSetupDialog::scheduleCheck(const QString& name) {
+void ProfileSetupDialog::scheduleCheck(const QString& name)
+{
     queuedCheck = name;
     setNameStatus(NameStatus::Pending);
     checkStartTimer.start(1000);
 }
 
-void ProfileSetupDialog::startCheck() {
-    if(isChecking) {
+void ProfileSetupDialog::startCheck()
+{
+    if (isChecking) {
         return;
     }
-    if(queuedCheck.isNull()) {
+    if (queuedCheck.isNull()) {
         return;
     }
     checkName(queuedCheck);
 }
 
-
-void ProfileSetupDialog::checkName(const QString &name) {
-    if(isChecking) {
+void ProfileSetupDialog::checkName(const QString& name)
+{
+    if (isChecking) {
         return;
     }
 
@@ -160,44 +158,40 @@ void ProfileSetupDialog::checkName(const QString &name) {
     request.setRawHeader("Accept", "application/json");
     request.setRawHeader("Authorization", QString("Bearer %1").arg(token).toUtf8());
 
-    AuthRequest *requestor = new AuthRequest(this);
+    AuthRequest* requestor = new AuthRequest(this);
     connect(requestor, &AuthRequest::finished, this, &ProfileSetupDialog::checkFinished);
     requestor->get(request);
 }
 
-void ProfileSetupDialog::checkFinished(
-    QNetworkReply::NetworkError error,
-    QByteArray data,
-    QList<QNetworkReply::RawHeaderPair> headers
-) {
-    auto requestor = qobject_cast<AuthRequest *>(QObject::sender());
+void ProfileSetupDialog::checkFinished(QNetworkReply::NetworkError error,
+                                       QByteArray profileData,
+                                       [[maybe_unused]] QList<QNetworkReply::RawHeaderPair> headers)
+{
+    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
     requestor->deleteLater();
 
-    if(error == QNetworkReply::NoError) {
-        auto doc = QJsonDocument::fromJson(data);
+    if (error == QNetworkReply::NoError) {
+        auto doc = QJsonDocument::fromJson(profileData);
         auto root = doc.object();
         auto statusValue = root.value("status").toString("INVALID");
-        if(statusValue == "AVAILABLE") {
+        if (statusValue == "AVAILABLE") {
             setNameStatus(NameStatus::Available);
-        }
-        else if (statusValue == "DUPLICATE") {
+        } else if (statusValue == "DUPLICATE") {
             setNameStatus(NameStatus::Exists, tr("Minecraft profile with name %1 already exists.").arg(currentCheck));
-        }
-        else if (statusValue == "NOT_ALLOWED") {
+        } else if (statusValue == "NOT_ALLOWED") {
             setNameStatus(NameStatus::Exists, tr("The name %1 is not allowed.").arg(currentCheck));
-        }
-        else {
+        } else {
             setNameStatus(NameStatus::Error, tr("Unhandled profile name status: %1").arg(statusValue));
         }
-    }
-    else {
+    } else {
         setNameStatus(NameStatus::Error, tr("Failed to check name availability."));
     }
     isChecking = false;
 }
 
-void ProfileSetupDialog::setupProfile(const QString &profileName) {
-    if(isWorking) {
+void ProfileSetupDialog::setupProfile(const QString& profileName)
+{
+    if (isWorking) {
         return;
     }
 
@@ -210,11 +204,11 @@ void ProfileSetupDialog::setupProfile(const QString &profileName) {
     request.setRawHeader("Authorization", QString("Bearer %1").arg(token).toUtf8());
 
     QString payloadTemplate("{\"profileName\":\"%1\"}");
-    auto data = payloadTemplate.arg(profileName).toUtf8();
+    auto profileData = payloadTemplate.arg(profileName).toUtf8();
 
-    AuthRequest *requestor = new AuthRequest(this);
+    AuthRequest* requestor = new AuthRequest(this);
     connect(requestor, &AuthRequest::finished, this, &ProfileSetupDialog::setupProfileFinished);
-    requestor->post(request, data);
+    requestor->post(request, profileData);
     isWorking = true;
 
     auto button = ui->buttonBox->button(QDialogButtonBox::Cancel);
@@ -223,8 +217,9 @@ void ProfileSetupDialog::setupProfile(const QString &profileName) {
 
 namespace {
 
-struct MojangError{
-    static MojangError fromJSON(QByteArray data) {
+struct MojangError {
+    static MojangError fromJSON(QByteArray data)
+    {
         MojangError out;
         out.error = QString::fromUtf8(data);
         auto doc = QJsonDocument::fromJson(data, &out.parseError);
@@ -247,26 +242,24 @@ struct MojangError{
     QString errorMessage;
 };
 
-}
+}  // namespace
 
-void ProfileSetupDialog::setupProfileFinished(
-    QNetworkReply::NetworkError error,
-    QByteArray data,
-    QList<QNetworkReply::RawHeaderPair> headers
-) {
-    auto requestor = qobject_cast<AuthRequest *>(QObject::sender());
+void ProfileSetupDialog::setupProfileFinished(QNetworkReply::NetworkError error,
+                                              QByteArray errorData,
+                                              [[maybe_unused]] QList<QNetworkReply::RawHeaderPair> headers)
+{
+    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
     requestor->deleteLater();
 
     isWorking = false;
-    if(error == QNetworkReply::NoError) {
+    if (error == QNetworkReply::NoError) {
         /*
          * data contains the profile in the response
          * ... we could parse it and update the account, but let's just return back to the normal login flow instead...
          */
         accept();
-    }
-    else {
-        auto parsedError = MojangError::fromJSON(data);
+    } else {
+        auto parsedError = MojangError::fromJSON(errorData);
         ui->errorLabel->setVisible(true);
         ui->errorLabel->setText(tr("The server returned the following error:") + "\n\n" + parsedError.errorMessage);
         qDebug() << parsedError.rawError;
diff --git a/launcher/ui/dialogs/ProfileSetupDialog.h b/launcher/ui/dialogs/ProfileSetupDialog.h
index 6f413ebd..09f8124e 100644
--- a/launcher/ui/dialogs/ProfileSetupDialog.h
+++ b/launcher/ui/dialogs/ProfileSetupDialog.h
@@ -17,65 +17,48 @@
 
 #include <QDialog>
 #include <QIcon>
-#include <QTimer>
 #include <QNetworkReply>
+#include <QTimer>
 
-#include <memory>
 #include <minecraft/auth/MinecraftAccount.h>
+#include <memory>
 
-namespace Ui
-{
+namespace Ui {
 class ProfileSetupDialog;
 }
 
-class ProfileSetupDialog : public QDialog
-{
+class ProfileSetupDialog : public QDialog {
     Q_OBJECT
-public:
-
-    explicit ProfileSetupDialog(MinecraftAccountPtr accountToSetup, QWidget *parent = 0);
+   public:
+    explicit ProfileSetupDialog(MinecraftAccountPtr accountToSetup, QWidget* parent = 0);
     ~ProfileSetupDialog();
 
-    enum class NameStatus
-    {
-        NotSet,
-        Pending,
-        Available,
-        Exists,
-        Error
-    } nameStatus = NameStatus::NotSet;
+    enum class NameStatus { NotSet, Pending, Available, Exists, Error } nameStatus = NameStatus::NotSet;
 
-private slots:
+   private slots:
     void on_buttonBox_accepted();
     void on_buttonBox_rejected();
 
-    void nameEdited(const QString &name);
-    void checkFinished(
-        QNetworkReply::NetworkError error,
-        QByteArray data,
-        QList<QNetworkReply::RawHeaderPair> headers
-    );
+    void nameEdited(const QString& name);
+    void checkFinished(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers);
     void startCheck();
 
-    void setupProfileFinished(
-        QNetworkReply::NetworkError error,
-        QByteArray data,
-        QList<QNetworkReply::RawHeaderPair> headers
-    );
-protected:
-    void scheduleCheck(const QString &name);
-    void checkName(const QString &name);
+    void setupProfileFinished(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers);
+
+   protected:
+    void scheduleCheck(const QString& name);
+    void checkName(const QString& name);
     void setNameStatus(NameStatus status, QString errorString);
 
-    void setupProfile(const QString & profileName);
+    void setupProfile(const QString& profileName);
 
-private:
+   private:
     MinecraftAccountPtr m_accountToSetup;
-    Ui::ProfileSetupDialog *ui;
+    Ui::ProfileSetupDialog* ui;
     QIcon goodIcon;
     QIcon yellowIcon;
     QIcon badIcon;
-    QAction * validityAction = nullptr;
+    QAction* validityAction = nullptr;
 
     QString queuedCheck;
 
@@ -85,4 +68,3 @@ private:
 
     QTimer checkStartTimer;
 };
-
diff --git a/launcher/ui/dialogs/ProgressDialog.cpp b/launcher/ui/dialogs/ProgressDialog.cpp
index 4243e291..0ca3a1bd 100644
--- a/launcher/ui/dialogs/ProgressDialog.cpp
+++ b/launcher/ui/dialogs/ProgressDialog.cpp
@@ -37,18 +37,17 @@
 #include <QPoint>
 #include "ui_ProgressDialog.h"
 
-#include <limits>
 #include <QDebug>
 #include <QKeyEvent>
+#include <limits>
 
 #include "tasks/Task.h"
 
 #include "ui/widgets/SubTaskProgressBar.h"
 
-
 // map a value in a numeric range of an arbitrary type to between 0 and INT_MAX
 // for getting the best precision out of the qt progress bar
-template<typename T, std::enable_if_t<std::is_arithmetic_v<T>, bool> = true>
+template <typename T, std::enable_if_t<std::is_arithmetic_v<T>, bool> = true>
 std::tuple<int, int> map_int_zero_max(T current, T range_max, T range_min)
 {
     int int_max = std::numeric_limits<int>::max();
@@ -57,10 +56,9 @@ std::tuple<int, int> map_int_zero_max(T current, T range_max, T range_min)
     double percentage = static_cast<double>(current - range_min) / static_cast<double>(type_range);
     int mapped_current = percentage * int_max;
 
-    return {mapped_current, int_max};
+    return { mapped_current, int_max };
 }
 
-
 ProgressDialog::ProgressDialog(QWidget* parent) : QDialog(parent), ui(new Ui::ProgressDialog)
 {
     ui->setupUi(this);
@@ -87,7 +85,7 @@ void ProgressDialog::on_skipButton_clicked(bool checked)
 {
     Q_UNUSED(checked);
     if (ui->skipButton->isEnabled())  // prevent other triggers from aborting
-        task->abort();
+        m_task->abort();
 }
 
 ProgressDialog::~ProgressDialog()
@@ -96,7 +94,7 @@ ProgressDialog::~ProgressDialog()
 }
 
 void ProgressDialog::updateSize(bool recenterParent)
-{   
+{
     QSize lastSize = this->size();
     QPoint lastPos = this->pos();
     int minHeight = ui->globalStatusDetailsLabel->minimumSize().height() + (ui->verticalLayout->spacing() * 2);
@@ -118,28 +116,25 @@ void ProgressDialog::updateSize(bool recenterParent)
         auto newX = std::max(0, parent->x() + ((parent->width() - newSize.width()) / 2));
         auto newY = std::max(0, parent->y() + ((parent->height() - newSize.height()) / 2));
         this->move(newX, newY);
-    }
-    else if (lastSize != newSize)
-    {
+    } else if (lastSize != newSize) {
         // center on old position after resize
-        QSize sizeDiff = lastSize - newSize; // last size was smaller, the results should be negative
+        QSize sizeDiff = lastSize - newSize;  // last size was smaller, the results should be negative
         auto newX = std::max(0, lastPos.x() + (sizeDiff.width() / 2));
         auto newY = std::max(0, lastPos.y() + (sizeDiff.height() / 2));
         this->move(newX, newY);
     }
-
 }
 
 int ProgressDialog::execWithTask(Task* task)
 {
-    this->task = task;
+    this->m_task = task;
 
     if (!task) {
         qDebug() << "Programmer error: Progress dialog created with null task.";
         return QDialog::DialogCode::Accepted;
     }
 
-    QDialog::DialogCode result {};
+    QDialog::DialogCode result{};
     if (handleImmediateResult(result)) {
         return result;
     }
@@ -184,8 +179,8 @@ int ProgressDialog::execWithTask(std::unique_ptr<Task>& task)
 
 bool ProgressDialog::handleImmediateResult(QDialog::DialogCode& result)
 {
-    if (task->isFinished()) {
-        if (task->wasSuccessful()) {
+    if (m_task->isFinished()) {
+        if (m_task->wasSuccessful()) {
             result = QDialog::Accepted;
         } else {
             result = QDialog::Rejected;
@@ -197,12 +192,12 @@ bool ProgressDialog::handleImmediateResult(QDialog::DialogCode& result)
 
 Task* ProgressDialog::getTask()
 {
-    return task;
+    return m_task;
 }
 
 void ProgressDialog::onTaskStarted() {}
 
-void ProgressDialog::onTaskFailed(QString failure)
+void ProgressDialog::onTaskFailed([[maybe_unused]] QString failure)
 {
     reject();
     hide();
@@ -214,11 +209,11 @@ void ProgressDialog::onTaskSucceeded()
     hide();
 }
 
-void ProgressDialog::changeStatus(const QString& status)
+void ProgressDialog::changeStatus([[maybe_unused]] const QString& status)
 {
-    ui->globalStatusLabel->setText(task->getStatus());
+    ui->globalStatusLabel->setText(m_task->getStatus());
     ui->globalStatusLabel->adjustSize();
-    ui->globalStatusDetailsLabel->setText(task->getDetails());
+    ui->globalStatusDetailsLabel->setText(m_task->getDetails());
     ui->globalStatusDetailsLabel->adjustSize();
 
     updateSize();
@@ -234,16 +229,15 @@ void ProgressDialog::addTaskProgress(TaskStepProgress const& progress)
 void ProgressDialog::changeStepProgress(TaskStepProgress const& task_progress)
 {
     m_is_multi_step = true;
-    if(ui->taskProgressScrollArea->isHidden()) {
+    if (ui->taskProgressScrollArea->isHidden()) {
         ui->taskProgressScrollArea->setHidden(false);
         updateSize();
     }
-    
+
     if (!taskProgress.contains(task_progress.uid))
         addTaskProgress(task_progress);
     auto task_bar = taskProgress.value(task_progress.uid);
 
-
     auto const [mapped_current, mapped_total] = map_int_zero_max<qint64>(task_progress.current, task_progress.total, 0);
     if (task_progress.total <= 0) {
         task_bar->setRange(0, 0);
@@ -258,14 +252,12 @@ void ProgressDialog::changeStepProgress(TaskStepProgress const& task_progress)
     if (task_progress.isDone()) {
         task_bar->setVisible(false);
     }
-
 }
 
 void ProgressDialog::changeProgress(qint64 current, qint64 total)
 {
     ui->globalProgressBar->setMaximum(total);
     ui->globalProgressBar->setValue(current);
-
 }
 
 void ProgressDialog::keyPressEvent(QKeyEvent* e)
@@ -287,7 +279,7 @@ void ProgressDialog::keyPressEvent(QKeyEvent* e)
 
 void ProgressDialog::closeEvent(QCloseEvent* e)
 {
-    if (task && task->isRunning()) {
+    if (m_task && m_task->isRunning()) {
         e->ignore();
     } else {
         QDialog::closeEvent(e);
diff --git a/launcher/ui/dialogs/ProgressDialog.h b/launcher/ui/dialogs/ProgressDialog.h
index f062be08..15eadf4e 100644
--- a/launcher/ui/dialogs/ProgressDialog.h
+++ b/launcher/ui/dialogs/ProgressDialog.h
@@ -33,13 +33,12 @@
  *      limitations under the License.
  */
 
-
 #pragma once
 
 #include <QDialog>
-#include <memory>
 #include <QHash>
 #include <QUuid>
+#include <memory>
 
 #include "QObjectPtr.h"
 #include "tasks/Task.h"
@@ -49,60 +48,52 @@
 class Task;
 class SequentialTask;
 
-namespace Ui
-{
+namespace Ui {
 class ProgressDialog;
 }
 
-class ProgressDialog : public QDialog
-{
+class ProgressDialog : public QDialog {
     Q_OBJECT
 
-public:
-    explicit ProgressDialog(QWidget *parent = 0);
+   public:
+    explicit ProgressDialog(QWidget* parent = 0);
     ~ProgressDialog();
 
     void updateSize(bool recenterParent = false);
 
     int execWithTask(Task* task);
-    int execWithTask(std::unique_ptr<Task> &&task);
-    int execWithTask(std::unique_ptr<Task> &task);
+    int execWithTask(std::unique_ptr<Task>&& task);
+    int execWithTask(std::unique_ptr<Task>& task);
 
     void setSkipButton(bool present, QString label = QString());
 
-    Task *getTask();
+    Task* getTask();
 
-public
-slots:
+   public slots:
     void onTaskStarted();
     void onTaskFailed(QString failure);
     void onTaskSucceeded();
 
-    void changeStatus(const QString &status);
+    void changeStatus(const QString& status);
     void changeProgress(qint64 current, qint64 total);
     void changeStepProgress(TaskStepProgress const& task_progress);
 
-
-private
-slots:
+   private slots:
     void on_skipButton_clicked(bool checked);
 
-protected:
-    virtual void keyPressEvent(QKeyEvent *e);
-    virtual void closeEvent(QCloseEvent *e);
+   protected:
+    virtual void keyPressEvent(QKeyEvent* e);
+    virtual void closeEvent(QCloseEvent* e);
 
-private:
-    bool handleImmediateResult(QDialog::DialogCode &result);
+   private:
+    bool handleImmediateResult(QDialog::DialogCode& result);
     void addTaskProgress(TaskStepProgress const& progress);
 
-private:
-    Ui::ProgressDialog *ui;
+   private:
+    Ui::ProgressDialog* ui;
 
-    Task *task;
+    Task* m_task;
 
     bool m_is_multi_step = false;
     QHash<QUuid, SubTaskProgressBar*> taskProgress;
-
-
 };
-
diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.cpp b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
index c243ce28..4b82c0c5 100644
--- a/launcher/ui/dialogs/ResourceDownloadDialog.cpp
+++ b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
@@ -300,7 +300,7 @@ GetModDependenciesTask::Ptr ModDownloadDialog::getModDependenciesTask()
         return makeShared<GetModDependenciesTask>(this, m_instance, model, selectedVers);
     }
     return nullptr;
-};
+}
 
 ResourcePackDownloadDialog::ResourcePackDownloadDialog(QWidget* parent,
                                                        const std::shared_ptr<ResourcePackFolderModel>& resource_packs,
diff --git a/launcher/ui/dialogs/ReviewMessageBox.cpp b/launcher/ui/dialogs/ReviewMessageBox.cpp
index 7b33765f..78c2542f 100644
--- a/launcher/ui/dialogs/ReviewMessageBox.cpp
+++ b/launcher/ui/dialogs/ReviewMessageBox.cpp
@@ -5,7 +5,7 @@
 
 #include <QPushButton>
 
-ReviewMessageBox::ReviewMessageBox(QWidget* parent, QString const& title, QString const& icon)
+ReviewMessageBox::ReviewMessageBox(QWidget* parent, [[maybe_unused]] QString const& title, [[maybe_unused]] QString const& icon)
     : QDialog(parent), ui(new Ui::ReviewMessageBox)
 {
     ui->setupUi(this);
diff --git a/launcher/ui/dialogs/ScrollMessageBox.cpp b/launcher/ui/dialogs/ScrollMessageBox.cpp
index afdc4bae..c04d8784 100644
--- a/launcher/ui/dialogs/ScrollMessageBox.cpp
+++ b/launcher/ui/dialogs/ScrollMessageBox.cpp
@@ -1,15 +1,16 @@
 #include "ScrollMessageBox.h"
 #include "ui_ScrollMessageBox.h"
 
-
-ScrollMessageBox::ScrollMessageBox(QWidget *parent, const QString &title, const QString &text, const QString &body) :
-        QDialog(parent), ui(new Ui::ScrollMessageBox) {
+ScrollMessageBox::ScrollMessageBox(QWidget* parent, const QString& title, const QString& text, const QString& body)
+    : QDialog(parent), ui(new Ui::ScrollMessageBox)
+{
     ui->setupUi(this);
     this->setWindowTitle(title);
     ui->label->setText(text);
     ui->textBrowser->setText(body);
 }
 
-ScrollMessageBox::~ScrollMessageBox() {
+ScrollMessageBox::~ScrollMessageBox()
+{
     delete ui;
 }
diff --git a/launcher/ui/dialogs/ScrollMessageBox.h b/launcher/ui/dialogs/ScrollMessageBox.h
index 84aa253a..8fd6769c 100644
--- a/launcher/ui/dialogs/ScrollMessageBox.h
+++ b/launcher/ui/dialogs/ScrollMessageBox.h
@@ -2,19 +2,20 @@
 
 #include <QDialog>
 
-
 QT_BEGIN_NAMESPACE
-namespace Ui { class ScrollMessageBox; }
+namespace Ui {
+class ScrollMessageBox;
+}
 QT_END_NAMESPACE
 
 class ScrollMessageBox : public QDialog {
-Q_OBJECT
+    Q_OBJECT
 
-public:
-    ScrollMessageBox(QWidget *parent, const QString &title, const QString &text, const QString &body);
+   public:
+    ScrollMessageBox(QWidget* parent, const QString& title, const QString& text, const QString& body);
 
     ~ScrollMessageBox() override;
 
-private:
-    Ui::ScrollMessageBox *ui;
+   private:
+    Ui::ScrollMessageBox* ui;
 };
diff --git a/launcher/ui/dialogs/SkinUploadDialog.cpp b/launcher/ui/dialogs/SkinUploadDialog.cpp
index 8180ac1f..5b3ebfa2 100644
--- a/launcher/ui/dialogs/SkinUploadDialog.cpp
+++ b/launcher/ui/dialogs/SkinUploadDialog.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -33,20 +33,20 @@
  *      limitations under the License.
  */
 
-#include <QFileInfo>
 #include <QFileDialog>
+#include <QFileInfo>
 #include <QPainter>
 
 #include <FileSystem.h>
 
-#include <minecraft/services/SkinUpload.h>
 #include <minecraft/services/CapeChange.h>
+#include <minecraft/services/SkinUpload.h>
 #include <tasks/SequentialTask.h>
 
+#include "CustomMessageBox.h"
+#include "ProgressDialog.h"
 #include "SkinUploadDialog.h"
 #include "ui_SkinUploadDialog.h"
-#include "ProgressDialog.h"
-#include "CustomMessageBox.h"
 
 void SkinUploadDialog::on_buttonBox_rejected()
 {
@@ -64,71 +64,51 @@ void SkinUploadDialog::on_buttonBox_accepted()
         QRegularExpression urlPrefixMatcher(QRegularExpression::anchoredPattern("^([a-z]+)://.+$"));
         bool isLocalFile = false;
         // it has an URL prefix -> it is an URL
-        if(urlPrefixMatcher.match(input).hasMatch())
-        {
+        if (urlPrefixMatcher.match(input).hasMatch()) {
             QUrl fileURL = input;
-            if(fileURL.isValid())
-            {
+            if (fileURL.isValid()) {
                 // local?
-                if(fileURL.isLocalFile())
-                {
+                if (fileURL.isLocalFile()) {
                     isLocalFile = true;
                     fileName = fileURL.toLocalFile();
-                }
-                else
-                {
-                    CustomMessageBox::selectable(
-                        this,
-                        tr("Skin Upload"),
-                        tr("Using remote URLs for setting skins is not implemented yet."),
-                        QMessageBox::Warning
-                        )->exec();
+                } else {
+                    CustomMessageBox::selectable(this, tr("Skin Upload"), tr("Using remote URLs for setting skins is not implemented yet."),
+                                                 QMessageBox::Warning)
+                        ->exec();
                     close();
                     return;
                 }
-            }
-            else
-            {
-                CustomMessageBox::selectable(
-                    this,
-                    tr("Skin Upload"),
-                    tr("You cannot use an invalid URL for uploading skins."),
-                    QMessageBox::Warning
-                    )->exec();
+            } else {
+                CustomMessageBox::selectable(this, tr("Skin Upload"), tr("You cannot use an invalid URL for uploading skins."),
+                                             QMessageBox::Warning)
+                    ->exec();
                 close();
                 return;
             }
-        }
-        else
-        {
+        } else {
             // just assume it's a path then
             isLocalFile = true;
             fileName = ui->skinPathTextBox->text();
         }
-        if (isLocalFile && !QFile::exists(fileName))
-        {
+        if (isLocalFile && !QFile::exists(fileName)) {
             CustomMessageBox::selectable(this, tr("Skin Upload"), tr("Skin file does not exist!"), QMessageBox::Warning)->exec();
             close();
             return;
         }
         SkinUpload::Model model = SkinUpload::STEVE;
-        if (ui->steveBtn->isChecked())
-        {
+        if (ui->steveBtn->isChecked()) {
             model = SkinUpload::STEVE;
-        }
-        else if (ui->alexBtn->isChecked())
-        {
+        } else if (ui->alexBtn->isChecked()) {
             model = SkinUpload::ALEX;
         }
         skinUpload.addTask(shared_qobject_ptr<SkinUpload>(new SkinUpload(this, m_acct->accessToken(), FS::read(fileName), model)));
     }
 
     auto selectedCape = ui->capeCombo->currentData().toString();
-    if(selectedCape != m_acct->accountData()->minecraftProfile.currentCape) {
+    if (selectedCape != m_acct->accountData()->minecraftProfile.currentCape) {
         skinUpload.addTask(shared_qobject_ptr<CapeChange>(new CapeChange(this, m_acct->accessToken(), selectedCape)));
     }
-    if (prog.execWithTask(&skinUpload) != QDialog::Accepted)
-    {
+    if (prog.execWithTask(&skinUpload) != QDialog::Accepted) {
         CustomMessageBox::selectable(this, tr("Skin Upload"), tr("Failed to upload skin!"), QMessageBox::Warning)->exec();
         close();
         return;
@@ -141,45 +121,43 @@ void SkinUploadDialog::on_skinBrowseBtn_clicked()
 {
     auto filter = QMimeDatabase().mimeTypeForName("image/png").filterString();
     QString raw_path = QFileDialog::getOpenFileName(this, tr("Select Skin Texture"), QString(), filter);
-    if (raw_path.isEmpty() || !QFileInfo::exists(raw_path))
-    {
+    if (raw_path.isEmpty() || !QFileInfo::exists(raw_path)) {
         return;
     }
     QString cooked_path = FS::NormalizePath(raw_path);
     ui->skinPathTextBox->setText(cooked_path);
 }
 
-SkinUploadDialog::SkinUploadDialog(MinecraftAccountPtr acct, QWidget *parent)
-    :QDialog(parent), m_acct(acct), ui(new Ui::SkinUploadDialog)
+SkinUploadDialog::SkinUploadDialog(MinecraftAccountPtr acct, QWidget* parent) : QDialog(parent), m_acct(acct), ui(new Ui::SkinUploadDialog)
 {
     ui->setupUi(this);
 
     // FIXME: add a model for this, download/refresh the capes on demand
-    auto &data = *acct->accountData();
+    auto& accountData = *acct->accountData();
     int index = 0;
     ui->capeCombo->addItem(tr("No Cape"), QVariant());
-    auto currentCape = data.minecraftProfile.currentCape;
-    if(currentCape.isEmpty()) {
+    auto currentCape = accountData.minecraftProfile.currentCape;
+    if (currentCape.isEmpty()) {
         ui->capeCombo->setCurrentIndex(index);
     }
 
-    for(auto & cape: data.minecraftProfile.capes) {
+    for (auto& cape : accountData.minecraftProfile.capes) {
         index++;
-        if(cape.data.size()) {
+        if (cape.data.size()) {
             QPixmap capeImage;
-            if(capeImage.loadFromData(cape.data, "PNG")) {
+            if (capeImage.loadFromData(cape.data, "PNG")) {
                 QPixmap preview = QPixmap(10, 16);
                 QPainter painter(&preview);
                 painter.drawPixmap(0, 0, capeImage.copy(1, 1, 10, 16));
                 ui->capeCombo->addItem(capeImage, cape.alias, cape.id);
-                if(currentCape == cape.id) {
+                if (currentCape == cape.id) {
                     ui->capeCombo->setCurrentIndex(index);
                 }
                 continue;
             }
         }
         ui->capeCombo->addItem(cape.alias, cape.id);
-        if(currentCape == cape.id) {
+        if (currentCape == cape.id) {
             ui->capeCombo->setCurrentIndex(index);
         }
     }
diff --git a/launcher/ui/dialogs/SkinUploadDialog.h b/launcher/ui/dialogs/SkinUploadDialog.h
index 84d17dc6..81d6140c 100644
--- a/launcher/ui/dialogs/SkinUploadDialog.h
+++ b/launcher/ui/dialogs/SkinUploadDialog.h
@@ -1,29 +1,28 @@
 #pragma once
 
-#include <QDialog>
 #include <minecraft/auth/MinecraftAccount.h>
+#include <QDialog>
 
-namespace Ui
-{
-    class SkinUploadDialog;
+namespace Ui {
+class SkinUploadDialog;
 }
 
 class SkinUploadDialog : public QDialog {
     Q_OBJECT
-public:
-    explicit SkinUploadDialog(MinecraftAccountPtr acct, QWidget *parent = 0);
-    virtual ~SkinUploadDialog() {};
+   public:
+    explicit SkinUploadDialog(MinecraftAccountPtr acct, QWidget* parent = 0);
+    virtual ~SkinUploadDialog(){};
 
-public slots:
+   public slots:
     void on_buttonBox_accepted();
 
     void on_buttonBox_rejected();
 
     void on_skinBrowseBtn_clicked();
 
-protected:
+   protected:
     MinecraftAccountPtr m_acct;
 
-private:
-    Ui::SkinUploadDialog *ui;
+   private:
+    Ui::SkinUploadDialog* ui;
 };
diff --git a/launcher/ui/dialogs/VersionSelectDialog.cpp b/launcher/ui/dialogs/VersionSelectDialog.cpp
index 9fa3c90f..c61d1057 100644
--- a/launcher/ui/dialogs/VersionSelectDialog.cpp
+++ b/launcher/ui/dialogs/VersionSelectDialog.cpp
@@ -35,20 +35,19 @@
 
 #include "VersionSelectDialog.h"
 
+#include <QDebug>
 #include <QtWidgets/QButtonGroup>
 #include <QtWidgets/QDialogButtonBox>
 #include <QtWidgets/QHBoxLayout>
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QVBoxLayout>
-#include <QDebug>
 
 #include "ui/widgets/VersionSelectWidget.h"
 
 #include "BaseVersion.h"
 #include "BaseVersionList.h"
 
-VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QString title, QWidget *parent, bool cancelable)
-    : QDialog(parent)
+VersionSelectDialog::VersionSelectDialog(BaseVersionList* vlist, QString title, QWidget* parent, bool cancelable) : QDialog(parent)
 {
     setObjectName(QStringLiteral("VersionSelectDialog"));
     resize(400, 347);
@@ -68,7 +67,7 @@ VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QString title,
     m_buttonBox = new QDialogButtonBox(this);
     m_buttonBox->setObjectName(QStringLiteral("buttonBox"));
     m_buttonBox->setOrientation(Qt::Horizontal);
-    m_buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+    m_buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
     m_horizontalLayout->addWidget(m_buttonBox);
 
     m_verticalLayout->addLayout(m_horizontalLayout);
@@ -85,8 +84,7 @@ VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QString title,
 
     m_vlist = vlist;
 
-    if (!cancelable)
-    {
+    if (!cancelable) {
         m_buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(false);
     }
 }
@@ -125,8 +123,7 @@ int VersionSelectDialog::exec()
     QDialog::open();
     m_versionWidget->initialize(m_vlist);
     m_versionWidget->selectSearch();
-    if(resizeOnColumn != -1)
-    {
+    if (resizeOnColumn != -1) {
         m_versionWidget->setResizeOn(resizeOnColumn);
     }
     return QDialog::exec();
@@ -152,7 +149,8 @@ void VersionSelectDialog::setExactFilter(BaseVersionList::ModelRoles role, QStri
     m_versionWidget->setExactFilter(role, filter);
 }
 
-void VersionSelectDialog::setExactIfPresentFilter(BaseVersionList::ModelRoles role, QString filter) {
+void VersionSelectDialog::setExactIfPresentFilter(BaseVersionList::ModelRoles role, QString filter)
+{
     m_versionWidget->setExactIfPresentFilter(role, filter);
 }
 
diff --git a/launcher/ui/dialogs/VersionSelectDialog.h b/launcher/ui/dialogs/VersionSelectDialog.h
index c20a9ed5..0ccd45e7 100644
--- a/launcher/ui/dialogs/VersionSelectDialog.h
+++ b/launcher/ui/dialogs/VersionSelectDialog.h
@@ -18,7 +18,6 @@
 #include <QDialog>
 #include <QSortFilterProxyModel>
 
-
 #include "BaseVersionList.h"
 
 class QVBoxLayout;
@@ -27,26 +26,24 @@ class QDialogButtonBox;
 class VersionSelectWidget;
 class QPushButton;
 
-namespace Ui
-{
+namespace Ui {
 class VersionSelectDialog;
 }
 
 class VersionProxyModel;
 
-class VersionSelectDialog : public QDialog
-{
+class VersionSelectDialog : public QDialog {
     Q_OBJECT
 
-public:
-    explicit VersionSelectDialog(BaseVersionList *vlist, QString title, QWidget *parent = 0, bool cancelable = true);
-    virtual ~VersionSelectDialog() {};
+   public:
+    explicit VersionSelectDialog(BaseVersionList* vlist, QString title, QWidget* parent = 0, bool cancelable = true);
+    virtual ~VersionSelectDialog(){};
 
     int exec() override;
 
     BaseVersion::Ptr selectedVersion() const;
 
-    void setCurrentVersion(const QString & version);
+    void setCurrentVersion(const QString& version);
     void setFuzzyFilter(BaseVersionList::ModelRoles role, QString filter);
     void setExactFilter(BaseVersionList::ModelRoles role, QString filter);
     void setExactIfPresentFilter(BaseVersionList::ModelRoles role, QString filter);
@@ -54,26 +51,26 @@ public:
     void setEmptyErrorString(QString emptyErrorString);
     void setResizeOn(int column);
 
-private slots:
+   private slots:
     void on_refreshButton_clicked();
 
-private:
+   private:
     void retranslate();
     void selectRecommended();
 
-private:
+   private:
     QString m_currentVersion;
-    VersionSelectWidget *m_versionWidget = nullptr;
-    QVBoxLayout *m_verticalLayout = nullptr;
-    QHBoxLayout *m_horizontalLayout = nullptr;
-    QPushButton *m_refreshButton = nullptr;
-    QDialogButtonBox *m_buttonBox = nullptr;
+    VersionSelectWidget* m_versionWidget = nullptr;
+    QVBoxLayout* m_verticalLayout = nullptr;
+    QHBoxLayout* m_horizontalLayout = nullptr;
+    QPushButton* m_refreshButton = nullptr;
+    QDialogButtonBox* m_buttonBox = nullptr;
 
-    BaseVersionList *m_vlist = nullptr;
+    BaseVersionList* m_vlist = nullptr;
 
-    VersionProxyModel *m_proxyModel = nullptr;
+    VersionProxyModel* m_proxyModel = nullptr;
 
     int resizeOnColumn = -1;
 
-    Task * loadTask = nullptr;
+    Task* loadTask = nullptr;
 };
diff --git a/launcher/ui/instanceview/AccessibleInstanceView.cpp b/launcher/ui/instanceview/AccessibleInstanceView.cpp
index 2e7b8300..c99fe541 100644
--- a/launcher/ui/instanceview/AccessibleInstanceView.cpp
+++ b/launcher/ui/instanceview/AccessibleInstanceView.cpp
@@ -1,42 +1,40 @@
-#include "InstanceView.h"
 #include "AccessibleInstanceView.h"
 #include "AccessibleInstanceView_p.h"
+#include "InstanceView.h"
 
-#include <qvariant.h>
 #include <qaccessible.h>
 #include <qheaderview.h>
+#include <qvariant.h>
 
 #ifndef QT_NO_ACCESSIBILITY
 
-QAccessibleInterface *groupViewAccessibleFactory(const QString &classname, QObject *object)
+QAccessibleInterface* groupViewAccessibleFactory(const QString& classname, QObject* object)
 {
-    QAccessibleInterface *iface = 0;
+    QAccessibleInterface* iface = 0;
     if (!object || !object->isWidgetType())
         return iface;
 
-    QWidget *widget = static_cast<QWidget*>(object);
+    QWidget* widget = static_cast<QWidget*>(object);
 
     if (classname == QLatin1String("InstanceView")) {
-        iface = new AccessibleInstanceView((InstanceView *)widget);
+        iface = new AccessibleInstanceView((InstanceView*)widget);
     }
     return iface;
 }
 
-
-QAbstractItemView *AccessibleInstanceView::view() const
+QAbstractItemView* AccessibleInstanceView::view() const
 {
     return qobject_cast<QAbstractItemView*>(object());
 }
 
-int AccessibleInstanceView::logicalIndex(const QModelIndex &index) const
+int AccessibleInstanceView::logicalIndex(const QModelIndex& index) const
 {
     if (!view()->model() || !index.isValid())
         return -1;
     return index.row() * (index.model()->columnCount()) + index.column();
 }
 
-AccessibleInstanceView::AccessibleInstanceView(QWidget *w)
-    : QAccessibleObject(w)
+AccessibleInstanceView::AccessibleInstanceView(QWidget* w) : QAccessibleObject(w)
 {
     Q_ASSERT(view());
 }
@@ -53,7 +51,7 @@ AccessibleInstanceView::~AccessibleInstanceView()
     }
 }
 
-QAccessibleInterface *AccessibleInstanceView::cellAt(int row, int column) const
+QAccessibleInterface* AccessibleInstanceView::cellAt(int row, int column) const
 {
     if (!view()->model()) {
         return 0;
@@ -68,7 +66,7 @@ QAccessibleInterface *AccessibleInstanceView::cellAt(int row, int column) const
     return child(logicalIndex(index));
 }
 
-QAccessibleInterface *AccessibleInstanceView::caption() const
+QAccessibleInterface* AccessibleInstanceView::caption() const
 {
     return 0;
 }
@@ -123,14 +121,14 @@ QString AccessibleInstanceView::rowDescription(int row) const
     return view()->model()->headerData(row, Qt::Vertical).toString();
 }
 
-QList<QAccessibleInterface *> AccessibleInstanceView::selectedCells() const
+QList<QAccessibleInterface*> AccessibleInstanceView::selectedCells() const
 {
     QList<QAccessibleInterface*> cells;
     if (!view()->selectionModel())
         return cells;
     const QModelIndexList selectedIndexes = view()->selectionModel()->selectedIndexes();
     cells.reserve(selectedIndexes.size());
-    for (const QModelIndex &index : selectedIndexes)
+    for (const QModelIndex& index : selectedIndexes)
         cells.append(child(logicalIndex(index)));
     return cells;
 }
@@ -145,7 +143,7 @@ QList<int> AccessibleInstanceView::selectedColumns() const
 
     QList<int> columns;
     columns.reserve(selectedColumns.size());
-    for (const QModelIndex &index : selectedColumns) {
+    for (const QModelIndex& index : selectedColumns) {
         columns.append(index.column());
     }
 
@@ -163,14 +161,14 @@ QList<int> AccessibleInstanceView::selectedRows() const
     const QModelIndexList selectedRows = view()->selectionModel()->selectedRows();
 
     rows.reserve(selectedRows.size());
-    for (const QModelIndex &index : selectedRows) {
+    for (const QModelIndex& index : selectedRows) {
         rows.append(index.row());
     }
 
     return rows;
 }
 
-QAccessibleInterface *AccessibleInstanceView::summary() const
+QAccessibleInterface* AccessibleInstanceView::summary() const
 {
     return 0;
 }
@@ -209,16 +207,17 @@ bool AccessibleInstanceView::selectRow(int row)
             return false;
         }
         case QAbstractItemView::SingleSelection: {
-            if (view()->selectionBehavior() != QAbstractItemView::SelectRows && columnCount() > 1 )
+            if (view()->selectionBehavior() != QAbstractItemView::SelectRows && columnCount() > 1)
                 return false;
             view()->clearSelection();
             break;
         }
         case QAbstractItemView::ContiguousSelection: {
-            if ((!row || !view()->selectionModel()->isRowSelected(row - 1, view()->rootIndex())) && !view()->selectionModel()->isRowSelected(row + 1, view()->rootIndex())) {
+            if ((!row || !view()->selectionModel()->isRowSelected(row - 1, view()->rootIndex())) &&
+                !view()->selectionModel()->isRowSelected(row + 1, view()->rootIndex())) {
                 view()->clearSelection();
             }
-        break;
+            break;
         }
         default: {
             break;
@@ -251,7 +250,8 @@ bool AccessibleInstanceView::selectColumn(int column)
         }
         /* fallthrough */
         case QAbstractItemView::ContiguousSelection: {
-            if ((!column || !view()->selectionModel()->isColumnSelected(column - 1, view()->rootIndex())) && !view()->selectionModel()->isColumnSelected(column + 1, view()->rootIndex())) {
+            if ((!column || !view()->selectionModel()->isColumnSelected(column - 1, view()->rootIndex())) &&
+                !view()->selectionModel()->isColumnSelected(column + 1, view()->rootIndex())) {
                 view()->clearSelection();
             }
             break;
@@ -292,10 +292,10 @@ bool AccessibleInstanceView::unselectRow(int row)
                 return false;
             }
 
-
-            if ((!row || selectionModel->isRowSelected(row - 1, view()->rootIndex())) && selectionModel->isRowSelected(row + 1, view()->rootIndex())) {
-                //If there are rows selected both up the current row and down the current rown,
-                //the ones which are down the current row will be deselected
+            if ((!row || selectionModel->isRowSelected(row - 1, view()->rootIndex())) &&
+                selectionModel->isRowSelected(row + 1, view()->rootIndex())) {
+                // If there are rows selected both up the current row and down the current rown,
+                // the ones which are down the current row will be deselected
                 selection = QItemSelection(index, view()->model()->index(rowCount() - 1, 0, view()->rootIndex()));
             }
         }
@@ -324,8 +324,8 @@ bool AccessibleInstanceView::unselectColumn(int column)
 
     switch (view()->selectionMode()) {
         case QAbstractItemView::SingleSelection: {
-            //In SingleSelection and ContiguousSelection once an item
-            //is selected, there's no way for the user to unselect all items
+            // In SingleSelection and ContiguousSelection once an item
+            // is selected, there's no way for the user to unselect all items
             if (selectedColumnCount() == 1) {
                 return false;
             }
@@ -336,10 +336,10 @@ bool AccessibleInstanceView::unselectColumn(int column)
                 return false;
             }
 
-            if ((!column || view()->selectionModel()->isColumnSelected(column - 1, view()->rootIndex()))
-                && view()->selectionModel()->isColumnSelected(column + 1, view()->rootIndex())) {
-                //If there are columns selected both at the left of the current row and at the right
-                //of the current row, the ones which are at the right will be deselected
+            if ((!column || view()->selectionModel()->isColumnSelected(column - 1, view()->rootIndex())) &&
+                view()->selectionModel()->isColumnSelected(column + 1, view()->rootIndex())) {
+                // If there are columns selected both at the left of the current row and at the right
+                // of the current row, the ones which are at the right will be deselected
                 selection = QItemSelection(index, model->index(0, columnCount() - 1, view()->rootIndex()));
             }
         default:
@@ -360,9 +360,9 @@ QAccessible::State AccessibleInstanceView::state() const
     return QAccessible::State();
 }
 
-QAccessibleInterface *AccessibleInstanceView::childAt(int x, int y) const
+QAccessibleInterface* AccessibleInstanceView::childAt(int x, int y) const
 {
-    QPoint viewportOffset = view()->viewport()->mapTo(view(), QPoint(0,0));
+    QPoint viewportOffset = view()->viewport()->mapTo(view(), QPoint(0, 0));
     QPoint indexPosition = view()->mapFromGlobal(QPoint(x, y) - viewportOffset);
     // FIXME: if indexPosition < 0 in one coordinate, return header
 
@@ -381,22 +381,23 @@ int AccessibleInstanceView::childCount() const
     return (view()->model()->rowCount()) * (view()->model()->columnCount());
 }
 
-int AccessibleInstanceView::indexOfChild(const QAccessibleInterface *iface) const
+int AccessibleInstanceView::indexOfChild(const QAccessibleInterface* iface) const
 {
     if (!view()->model())
         return -1;
-    QAccessibleInterface *parent = iface->parent();
+    QAccessibleInterface* parent = iface->parent();
     if (parent->object() != view())
         return -1;
 
-    Q_ASSERT(iface->role() != QAccessible::TreeItem); // should be handled by tree class
+    Q_ASSERT(iface->role() != QAccessible::TreeItem);  // should be handled by tree class
     if (iface->role() == QAccessible::Cell || iface->role() == QAccessible::ListItem) {
         const AccessibleInstanceViewItem* cell = static_cast<const AccessibleInstanceViewItem*>(iface);
         return logicalIndex(cell->m_index);
     } else if (iface->role() == QAccessible::Pane) {
-        return 0; // corner button
+        return 0;  // corner button
     } else {
-        qWarning() << "AccessibleInstanceView::indexOfChild has a child with unknown role..." << iface->role() << iface->text(QAccessible::Name);
+        qWarning() << "AccessibleInstanceView::indexOfChild has a child with unknown role..." << iface->role()
+                   << iface->text(QAccessible::Name);
     }
     // FIXME: we are in denial of our children. this should stop.
     return -1;
@@ -417,7 +418,7 @@ QRect AccessibleInstanceView::rect() const
     return QRect(pos.x(), pos.y(), view()->width(), view()->height());
 }
 
-QAccessibleInterface *AccessibleInstanceView::parent() const
+QAccessibleInterface* AccessibleInstanceView::parent() const
 {
     if (view() && view()->parent()) {
         if (qstrcmp("QComboBoxPrivateContainer", view()->parent()->metaObject()->className()) == 0) {
@@ -428,7 +429,7 @@ QAccessibleInterface *AccessibleInstanceView::parent() const
     return 0;
 }
 
-QAccessibleInterface *AccessibleInstanceView::child(int logicalIndex) const
+QAccessibleInterface* AccessibleInstanceView::child(int logicalIndex) const
 {
     if (!view()->model())
         return 0;
@@ -442,7 +443,7 @@ QAccessibleInterface *AccessibleInstanceView::child(int logicalIndex) const
     int row = logicalIndex / columns;
     int column = logicalIndex % columns;
 
-    QAccessibleInterface *iface = 0;
+    QAccessibleInterface* iface = 0;
 
     QModelIndex index = view()->model()->index(row, column, view()->rootIndex());
     if (Q_UNLIKELY(!index.isValid())) {
@@ -456,14 +457,14 @@ QAccessibleInterface *AccessibleInstanceView::child(int logicalIndex) const
     return iface;
 }
 
-void *AccessibleInstanceView::interface_cast(QAccessible::InterfaceType t)
+void* AccessibleInstanceView::interface_cast(QAccessible::InterfaceType t)
 {
     if (t == QAccessible::TableInterface)
-       return static_cast<QAccessibleTableInterface*>(this);
-   return 0;
+        return static_cast<QAccessibleTableInterface*>(this);
+    return 0;
 }
 
-void AccessibleInstanceView::modelChange(QAccessibleTableModelChangeEvent *event)
+void AccessibleInstanceView::modelChange(QAccessibleTableModelChangeEvent* event)
 {
     // if there is no cache yet, we don't update anything
     if (childToId.isEmpty())
@@ -479,13 +480,12 @@ void AccessibleInstanceView::modelChange(QAccessibleTableModelChangeEvent *event
         // rows are inserted: move every row after that
         case QAccessibleTableModelChangeEvent::RowsInserted:
         case QAccessibleTableModelChangeEvent::ColumnsInserted: {
-
             ChildCache newCache;
             ChildCache::ConstIterator iter = childToId.constBegin();
 
             while (iter != childToId.constEnd()) {
                 QAccessible::Id id = iter.value();
-                QAccessibleInterface *iface = QAccessible::accessibleInterface(id);
+                QAccessibleInterface* iface = QAccessible::accessibleInterface(id);
                 Q_ASSERT(iface);
                 if (indexOfChild(iface) >= 0) {
                     newCache.insert(indexOfChild(iface), id);
@@ -507,11 +507,11 @@ void AccessibleInstanceView::modelChange(QAccessibleTableModelChangeEvent *event
             ChildCache::ConstIterator iter = childToId.constBegin();
             while (iter != childToId.constEnd()) {
                 QAccessible::Id id = iter.value();
-                QAccessibleInterface *iface = QAccessible::accessibleInterface(id);
+                QAccessibleInterface* iface = QAccessible::accessibleInterface(id);
                 Q_ASSERT(iface);
                 if (iface->role() == QAccessible::Cell || iface->role() == QAccessible::ListItem) {
                     Q_ASSERT(iface->tableCellInterface());
-                    AccessibleInstanceViewItem *cell = static_cast<AccessibleInstanceViewItem*>(iface->tableCellInterface());
+                    AccessibleInstanceViewItem* cell = static_cast<AccessibleInstanceViewItem*>(iface->tableCellInterface());
                     // Since it is a QPersistentModelIndex, we only need to check if it is valid
                     if (cell->m_index.isValid())
                         newCache.insert(indexOfChild(cell), id);
@@ -532,14 +532,13 @@ void AccessibleInstanceView::modelChange(QAccessibleTableModelChangeEvent *event
 
 // TABLE CELL
 
-AccessibleInstanceViewItem::AccessibleInstanceViewItem(QAbstractItemView *view_, const QModelIndex &index_)
-    : view(view_), m_index(index_)
+AccessibleInstanceViewItem::AccessibleInstanceViewItem(QAbstractItemView* view_, const QModelIndex& index_) : view(view_), m_index(index_)
 {
     if (Q_UNLIKELY(!index_.isValid()))
         qWarning() << "AccessibleInstanceViewItem::AccessibleInstanceViewItem with invalid index: " << index_;
 }
 
-void *AccessibleInstanceViewItem::interface_cast(QAccessible::InterfaceType t)
+void* AccessibleInstanceViewItem::interface_cast(QAccessible::InterfaceType t)
 {
     if (t == QAccessible::TableCellInterface)
         return static_cast<QAccessibleTableCellInterface*>(this);
@@ -548,8 +547,14 @@ void *AccessibleInstanceViewItem::interface_cast(QAccessible::InterfaceType t)
     return 0;
 }
 
-int AccessibleInstanceViewItem::columnExtent() const { return 1; }
-int AccessibleInstanceViewItem::rowExtent() const { return 1; }
+int AccessibleInstanceViewItem::columnExtent() const
+{
+    return 1;
+}
+int AccessibleInstanceViewItem::rowExtent() const
+{
+    return 1;
+}
 
 QList<QAccessibleInterface*> AccessibleInstanceViewItem::rowHeaderCells() const
 {
@@ -600,19 +605,17 @@ void AccessibleInstanceViewItem::doAction(const QString& actionName)
     if (actionName == toggleAction()) {
         if (isSelected()) {
             unselectCell();
-        }
-        else {
+        } else {
             selectCell();
         }
     }
 }
 
-QStringList AccessibleInstanceViewItem::keyBindingsForAction(const QString &) const
+QStringList AccessibleInstanceViewItem::keyBindingsForAction(const QString&) const
 {
     return QStringList();
 }
 
-
 void AccessibleInstanceViewItem::selectCell()
 {
     if (!isValid()) {
@@ -624,7 +627,7 @@ void AccessibleInstanceViewItem::selectCell()
     }
 
     Q_ASSERT(table());
-    QAccessibleTableInterface *cellTable = table()->tableInterface();
+    QAccessibleTableInterface* cellTable = table()->tableInterface();
 
     switch (view->selectionBehavior()) {
         case QAbstractItemView::SelectItems:
@@ -654,7 +657,7 @@ void AccessibleInstanceViewItem::unselectCell()
     if (selectionMode == QAbstractItemView::NoSelection)
         return;
 
-    QAccessibleTableInterface *cellTable = table()->tableInterface();
+    QAccessibleTableInterface* cellTable = table()->tableInterface();
 
     switch (view->selectionBehavior()) {
         case QAbstractItemView::SelectItems:
@@ -669,15 +672,16 @@ void AccessibleInstanceViewItem::unselectCell()
             return;
     }
 
-    //If the mode is not MultiSelection or ExtendedSelection and only
-    //one cell is selected it cannot be unselected by the user
-    if ((selectionMode != QAbstractItemView::MultiSelection) && (selectionMode != QAbstractItemView::ExtendedSelection) && (view->selectionModel()->selectedIndexes().count() <= 1))
+    // If the mode is not MultiSelection or ExtendedSelection and only
+    // one cell is selected it cannot be unselected by the user
+    if ((selectionMode != QAbstractItemView::MultiSelection) && (selectionMode != QAbstractItemView::ExtendedSelection) &&
+        (view->selectionModel()->selectedIndexes().count() <= 1))
         return;
 
     view->selectionModel()->select(m_index, QItemSelectionModel::Deselect);
 }
 
-QAccessibleInterface *AccessibleInstanceViewItem::table() const
+QAccessibleInterface* AccessibleInstanceViewItem::table() const
 {
     return QAccessible::queryAccessibleInterface(view);
 }
@@ -694,7 +698,7 @@ QAccessible::State AccessibleInstanceViewItem::state() const
         return st;
 
     QRect globalRect = view->rect();
-    globalRect.translate(view->mapToGlobal(QPoint(0,0)));
+    globalRect.translate(view->mapToGlobal(QPoint(0, 0)));
     if (!globalRect.intersects(rect()))
         st.invisible = true;
 
@@ -717,7 +721,6 @@ QAccessible::State AccessibleInstanceViewItem::state() const
     return st;
 }
 
-
 QRect AccessibleInstanceViewItem::rect() const
 {
     QRect r;
@@ -726,7 +729,7 @@ QRect AccessibleInstanceViewItem::rect() const
     r = view->visualRect(m_index);
 
     if (!r.isNull()) {
-        r.translate(view->viewport()->mapTo(view, QPoint(0,0)));
+        r.translate(view->viewport()->mapTo(view, QPoint(0, 0)));
         r.translate(view->mapToGlobal(QPoint(0, 0)));
     }
     return r;
@@ -737,7 +740,7 @@ QString AccessibleInstanceViewItem::text(QAccessible::Text t) const
     QString value;
     if (!isValid())
         return value;
-    QAbstractItemModel *model = view->model();
+    QAbstractItemModel* model = view->model();
     switch (t) {
         case QAccessible::Name:
             value = model->data(m_index, Qt::AccessibleTextRole).toString();
@@ -753,7 +756,7 @@ QString AccessibleInstanceViewItem::text(QAccessible::Text t) const
     return value;
 }
 
-void AccessibleInstanceViewItem::setText(QAccessible::Text /*t*/, const QString &text)
+void AccessibleInstanceViewItem::setText(QAccessible::Text /*t*/, const QString& text)
 {
     if (!isValid() || !(m_index.flags() & Qt::ItemIsEditable))
         return;
@@ -765,12 +768,12 @@ bool AccessibleInstanceViewItem::isValid() const
     return view && view->model() && m_index.isValid();
 }
 
-QAccessibleInterface *AccessibleInstanceViewItem::parent() const
+QAccessibleInterface* AccessibleInstanceViewItem::parent() const
 {
     return QAccessible::queryAccessibleInterface(view);
 }
 
-QAccessibleInterface *AccessibleInstanceViewItem::child(int) const
+QAccessibleInterface* AccessibleInstanceViewItem::child(int) const
 {
     return 0;
 }
diff --git a/launcher/ui/instanceview/AccessibleInstanceView.h b/launcher/ui/instanceview/AccessibleInstanceView.h
index 9bfd1745..19522805 100644
--- a/launcher/ui/instanceview/AccessibleInstanceView.h
+++ b/launcher/ui/instanceview/AccessibleInstanceView.h
@@ -1,6 +1,7 @@
 #pragma once
 
+#include <QObject>
 #include <QString>
 class QAccessibleInterface;
 
-QAccessibleInterface *groupViewAccessibleFactory(const QString &classname, QObject *object);
+QAccessibleInterface* groupViewAccessibleFactory(const QString& classname, QObject* object);
diff --git a/launcher/ui/instanceview/AccessibleInstanceView_p.h b/launcher/ui/instanceview/AccessibleInstanceView_p.h
index 26462f51..e99f8506 100644
--- a/launcher/ui/instanceview/AccessibleInstanceView_p.h
+++ b/launcher/ui/instanceview/AccessibleInstanceView_p.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "QtCore/qpointer.h"
 #include <QtGui/qaccessible.h>
-#include <QAccessibleWidget>
 #include <QAbstractItemView>
+#include <QAccessibleWidget>
+#include "QtCore/qpointer.h"
 #ifndef QT_NO_ACCESSIBILITY
 #include "InstanceView.h"
 // #include <QHeaderView>
@@ -11,10 +11,9 @@
 class QAccessibleTableCell;
 class QAccessibleTableHeaderCell;
 
-class AccessibleInstanceView :public QAccessibleTableInterface, public QAccessibleObject
-{
-public:
-    explicit AccessibleInstanceView(QWidget *w);
+class AccessibleInstanceView : public QAccessibleTableInterface, public QAccessibleObject {
+   public:
+    explicit AccessibleInstanceView(QWidget* w);
     bool isValid() const override;
 
     QAccessible::Role role() const override;
@@ -22,19 +21,19 @@ public:
     QString text(QAccessible::Text t) const override;
     QRect rect() const override;
 
-    QAccessibleInterface *childAt(int x, int y) const override;
+    QAccessibleInterface* childAt(int x, int y) const override;
     int childCount() const override;
-    int indexOfChild(const QAccessibleInterface *) const override;
+    int indexOfChild(const QAccessibleInterface*) const override;
 
-    QAccessibleInterface *parent() const override;
-    QAccessibleInterface *child(int index) const override;
+    QAccessibleInterface* parent() const override;
+    QAccessibleInterface* child(int index) const override;
 
-    void *interface_cast(QAccessible::InterfaceType t) override;
+    void* interface_cast(QAccessible::InterfaceType t) override;
 
     // table interface
-    QAccessibleInterface *cellAt(int row, int column) const override;
-    QAccessibleInterface *caption() const override;
-    QAccessibleInterface *summary() const override;
+    QAccessibleInterface* cellAt(int row, int column) const override;
+    QAccessibleInterface* caption() const override;
+    QAccessibleInterface* summary() const override;
     QString columnDescription(int column) const override;
     QString rowDescription(int row) const override;
     int columnCount() const override;
@@ -54,42 +53,41 @@ public:
     bool unselectRow(int row) override;
     bool unselectColumn(int column) override;
 
-    QAbstractItemView *view() const;
+    QAbstractItemView* view() const;
 
-    void modelChange(QAccessibleTableModelChangeEvent *event) override;
+    void modelChange(QAccessibleTableModelChangeEvent* event) override;
 
-protected:
+   protected:
     // maybe vector
     typedef QHash<int, QAccessible::Id> ChildCache;
     mutable ChildCache childToId;
 
     virtual ~AccessibleInstanceView();
 
-private:
-    inline int logicalIndex(const QModelIndex &index) const;
+   private:
+    inline int logicalIndex(const QModelIndex& index) const;
 };
 
-class AccessibleInstanceViewItem: public QAccessibleInterface, public QAccessibleTableCellInterface, public QAccessibleActionInterface
-{
-public:
-    AccessibleInstanceViewItem(QAbstractItemView *view, const QModelIndex &m_index);
+class AccessibleInstanceViewItem : public QAccessibleInterface, public QAccessibleTableCellInterface, public QAccessibleActionInterface {
+   public:
+    AccessibleInstanceViewItem(QAbstractItemView* view, const QModelIndex& m_index);
 
-    void *interface_cast(QAccessible::InterfaceType t) override;
-    QObject *object() const override { return nullptr; }
+    void* interface_cast(QAccessible::InterfaceType t) override;
+    QObject* object() const override { return nullptr; }
     QAccessible::Role role() const override;
     QAccessible::State state() const override;
     QRect rect() const override;
     bool isValid() const override;
 
-    QAccessibleInterface *childAt(int, int) const override { return nullptr; }
+    QAccessibleInterface* childAt(int, int) const override { return nullptr; }
     int childCount() const override { return 0; }
-    int indexOfChild(const QAccessibleInterface *) const override { return -1; }
+    int indexOfChild(const QAccessibleInterface*) const override { return -1; }
 
     QString text(QAccessible::Text t) const override;
-    void setText(QAccessible::Text t, const QString &text) override;
+    void setText(QAccessible::Text t, const QString& text) override;
 
-    QAccessibleInterface *parent() const override;
-    QAccessibleInterface *child(int) const override;
+    QAccessibleInterface* parent() const override;
+    QAccessibleInterface* child(int) const override;
 
     // cell interface
     int columnExtent() const override;
@@ -101,13 +99,13 @@ public:
     bool isSelected() const override;
     QAccessibleInterface* table() const override;
 
-    //action interface
+    // action interface
     QStringList actionNames() const override;
-    void doAction(const QString &actionName) override;
-    QStringList keyBindingsForAction(const QString &actionName) const override;
+    void doAction(const QString& actionName) override;
+    QStringList keyBindingsForAction(const QString& actionName) const override;
 
-private:
-    QPointer<QAbstractItemView > view;
+   private:
+    QPointer<QAbstractItemView> view;
     QPersistentModelIndex m_index;
 
     void selectCell();
diff --git a/launcher/ui/instanceview/InstanceDelegate.cpp b/launcher/ui/instanceview/InstanceDelegate.cpp
index 137cc8d5..d947163b 100644
--- a/launcher/ui/instanceview/InstanceDelegate.cpp
+++ b/launcher/ui/instanceview/InstanceDelegate.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -34,29 +34,27 @@
  */
 
 #include "InstanceDelegate.h"
+#include <QApplication>
+#include <QDebug>
 #include <QPainter>
-#include <QTextOption>
 #include <QTextLayout>
-#include <QApplication>
+#include <QTextOption>
 #include <QtMath>
-#include <QDebug>
 
-#include "InstanceView.h"
-#include "BaseInstance.h"
-#include "InstanceList.h"
 #include <QIcon>
 #include <QTextEdit>
+#include "BaseInstance.h"
+#include "InstanceList.h"
+#include "InstanceView.h"
 
 // Origin: Qt
-static void viewItemTextLayout(QTextLayout &textLayout, int lineWidth, qreal &height,
-                               qreal &widthUsed)
+static void viewItemTextLayout(QTextLayout& textLayout, int lineWidth, qreal& height, qreal& widthUsed)
 {
     height = 0;
     widthUsed = 0;
     textLayout.beginLayout();
     QString str = textLayout.text();
-    while (true)
-    {
+    while (true) {
         QTextLine line = textLayout.createLine();
         if (!line.isValid())
             break;
@@ -70,24 +68,20 @@ static void viewItemTextLayout(QTextLayout &textLayout, int lineWidth, qreal &he
     textLayout.endLayout();
 }
 
-ListViewDelegate::ListViewDelegate(QObject *parent) : QStyledItemDelegate(parent)
-{
-}
+ListViewDelegate::ListViewDelegate(QObject* parent) : QStyledItemDelegate(parent) {}
 
-void drawSelectionRect(QPainter *painter, const QStyleOptionViewItem &option,
-                       const QRect &rect)
+void drawSelectionRect(QPainter* painter, const QStyleOptionViewItem& option, const QRect& rect)
 {
     if ((option.state & QStyle::State_Selected))
         painter->fillRect(rect, option.palette.brush(QPalette::Highlight));
-    else
-    {
+    else {
         QColor backgroundColor = option.palette.color(QPalette::Window);
         backgroundColor.setAlpha(160);
         painter->fillRect(rect, QBrush(backgroundColor));
     }
 }
 
-void drawFocusRect(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect)
+void drawFocusRect(QPainter* painter, const QStyleOptionViewItem& option, const QRect& rect)
 {
     if (!(option.state & QStyle::State_HasFocus))
         return;
@@ -103,7 +97,7 @@ void drawFocusRect(QPainter *painter, const QStyleOptionViewItem &option, const
     // Apparently some widget styles expect this hint to not be set
     painter->setRenderHint(QPainter::Antialiasing, false);
 
-    QStyle *style = option.widget ? option.widget->style() : QApplication::style();
+    QStyle* style = option.widget ? option.widget->style() : QApplication::style();
 
     style->drawPrimitive(QStyle::PE_FrameFocusRect, &opt, painter, option.widget);
 
@@ -111,11 +105,9 @@ void drawFocusRect(QPainter *painter, const QStyleOptionViewItem &option, const
 }
 
 // TODO this can be made a lot prettier
-void drawProgressOverlay(QPainter *painter, const QStyleOptionViewItem &option,
-                         const int value, const int maximum)
+void drawProgressOverlay(QPainter* painter, const QStyleOptionViewItem& option, const int value, const int maximum)
 {
-    if (maximum == 0 || value == maximum)
-    {
+    if (maximum == 0 || value == maximum) {
         return;
     }
 
@@ -131,19 +123,15 @@ void drawProgressOverlay(QPainter *painter, const QStyleOptionViewItem &option,
     painter->restore();
 }
 
-void drawBadges(QPainter *painter, const QStyleOptionViewItem &option, BaseInstance *instance, QIcon::Mode mode, QIcon::State state)
+void drawBadges(QPainter* painter, const QStyleOptionViewItem& option, BaseInstance* instance, QIcon::Mode mode, QIcon::State state)
 {
     QList<QString> pixmaps;
-    if (instance->isRunning())
-    {
+    if (instance->isRunning()) {
         pixmaps.append("status-running");
-    }
-    else if (instance->hasCrashed() || instance->hasVersionBroken())
-    {
+    } else if (instance->hasCrashed() || instance->hasVersionBroken()) {
         pixmaps.append("status-bad");
     }
-    if (instance->hasUpdateAvailable())
-    {
+    if (instance->hasUpdateAvailable()) {
         pixmaps.append("checkupdate");
     }
 
@@ -153,12 +141,9 @@ void drawBadges(QPainter *painter, const QStyleOptionViewItem &option, BaseInsta
     const int rows = qCeil((double)pixmaps.size() / (double)itemsPerRow);
     QListIterator<QString> it(pixmaps);
     painter->translate(option.rect.topLeft());
-    for (int y = 0; y < rows; ++y)
-    {
-        for (int x = 0; x < itemsPerRow; ++x)
-        {
-            if (!it.hasNext())
-            {
+    for (int y = 0; y < rows; ++y) {
+        for (int x = 0; x < itemsPerRow; ++x) {
+            if (!it.hasNext()) {
                 return;
             }
             // FIXME: inject this.
@@ -166,21 +151,17 @@ void drawBadges(QPainter *painter, const QStyleOptionViewItem &option, BaseInsta
             // opt.icon.paint(painter, iconbox, Qt::AlignCenter, mode, state);
             const QPixmap pixmap;
             // itemSide
-            QRect badgeRect(
-                option.rect.width() - x * itemSide + qMax(x - 1, 0) * spacing - itemSide,
-                y * itemSide + qMax(y - 1, 0) * spacing,
-                itemSide,
-                itemSide
-            );
+            QRect badgeRect(option.rect.width() - x * itemSide + qMax(x - 1, 0) * spacing - itemSide,
+                            y * itemSide + qMax(y - 1, 0) * spacing, itemSide, itemSide);
             icon.paint(painter, badgeRect, Qt::AlignCenter, mode, state);
         }
     }
     painter->translate(-option.rect.topLeft());
 }
 
-static QSize viewItemTextSize(const QStyleOptionViewItem *option)
+static QSize viewItemTextSize(const QStyleOptionViewItem* option)
 {
-    QStyle *style = option->widget ? option->widget->style() : QApplication::style();
+    QStyle* style = option->widget ? option->widget->style() : QApplication::style();
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
     QTextLayout textLayout;
@@ -195,8 +176,7 @@ static QSize viewItemTextSize(const QStyleOptionViewItem *option)
     return QSize(size.width() + 2 * textMargin, size.height());
 }
 
-void ListViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
-                             const QModelIndex &index) const
+void ListViewDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     QStyleOptionViewItem opt = option;
     initStyleOption(&opt, index);
@@ -208,7 +188,7 @@ void ListViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
     opt.textElideMode = Qt::ElideRight;
     opt.displayAlignment = Qt::AlignTop | Qt::AlignHCenter;
 
-    QStyle *style = opt.widget ? opt.widget->style() : QApplication::style();
+    QStyle* style = opt.widget ? opt.widget->style() : QApplication::style();
 
     // const int iconSize =  style->pixelMetric(QStyle::PM_IconViewIconSize);
     const int iconSize = 48;
@@ -296,16 +276,12 @@ void ListViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
         opt.icon.paint(painter, iconbox, Qt::AlignCenter, mode, state);
     }
     // set the text colors
-    QPalette::ColorGroup cg =
-        opt.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled;
+    QPalette::ColorGroup cg = opt.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled;
     if (cg == QPalette::Normal && !(opt.state & QStyle::State_Active))
         cg = QPalette::Inactive;
-    if (opt.state & QStyle::State_Selected)
-    {
+    if (opt.state & QStyle::State_Selected) {
         painter->setPen(opt.palette.color(cg, QPalette::HighlightedText));
-    }
-    else
-    {
+    } else {
         painter->setPen(opt.palette.color(cg, QPalette::Text));
     }
 
@@ -324,20 +300,16 @@ void ListViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
 
     const int lineCount = textLayout.lineCount();
 
-    const QRect layoutRect = QStyle::alignedRect(
-        opt.direction, opt.displayAlignment, QSize(textRect.width(), int(height)), textRect);
+    const QRect layoutRect = QStyle::alignedRect(opt.direction, opt.displayAlignment, QSize(textRect.width(), int(height)), textRect);
     const QPointF position = layoutRect.topLeft();
-    for (int i = 0; i < lineCount; ++i)
-    {
+    for (int i = 0; i < lineCount; ++i) {
         const QTextLine line = textLayout.lineAt(i);
         line.draw(painter, position);
     }
 
     // FIXME: this really has no business of being here. Make generic.
-    auto instance = (BaseInstance*)index.data(InstanceList::InstancePointerRole)
-            .value<void *>();
-    if (instance)
-    {
+    auto instance = (BaseInstance*)index.data(InstanceList::InstancePointerRole).value<void*>();
+    if (instance) {
         drawBadges(painter, opt, instance, mode, state);
     }
 
@@ -347,8 +319,7 @@ void ListViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
     painter->restore();
 }
 
-QSize ListViewDelegate::sizeHint(const QStyleOptionViewItem &option,
-                                 const QModelIndex &index) const
+QSize ListViewDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     QStyleOptionViewItem opt = option;
     initStyleOption(&opt, index);
@@ -357,9 +328,9 @@ QSize ListViewDelegate::sizeHint(const QStyleOptionViewItem &option,
     opt.textElideMode = Qt::ElideRight;
     opt.displayAlignment = Qt::AlignTop | Qt::AlignHCenter;
 
-    QStyle *style = opt.widget ? opt.widget->style() : QApplication::style();
+    QStyle* style = opt.widget ? opt.widget->style() : QApplication::style();
     const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, &option, opt.widget) + 1;
-    int height = 48 + textMargin * 2 + 5; // TODO: turn constants into variables
+    int height = 48 + textMargin * 2 + 5;  // TODO: turn constants into variables
     QSize szz = viewItemTextSize(&opt);
     height += szz.height();
     // FIXME: maybe the icon items could scale and keep proportions?
@@ -367,40 +338,38 @@ QSize ListViewDelegate::sizeHint(const QStyleOptionViewItem &option,
     return sz;
 }
 
-class NoReturnTextEdit: public QTextEdit
-{
+class NoReturnTextEdit : public QTextEdit {
     Q_OBJECT
-public:
-    explicit NoReturnTextEdit(QWidget *parent) : QTextEdit(parent)
+   public:
+    explicit NoReturnTextEdit(QWidget* parent) : QTextEdit(parent)
     {
         setTextInteractionFlags(Qt::TextEditorInteraction);
         setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOff);
         setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOff);
     }
-    bool event(QEvent * event) override
+    bool event(QEvent* event) override
     {
         auto eventType = event->type();
-        if(eventType == QEvent::KeyPress || eventType == QEvent::KeyRelease)
-        {
-            QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+        if (eventType == QEvent::KeyPress || eventType == QEvent::KeyRelease) {
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
             auto key = keyEvent->key();
-            if ((key == Qt::Key_Return || key == Qt::Key_Enter) && eventType == QEvent::KeyPress)
-            {
+            if ((key == Qt::Key_Return || key == Qt::Key_Enter) && eventType == QEvent::KeyPress) {
                 emit editingDone();
                 return true;
             }
-            if(key == Qt::Key_Tab)
-            {
+            if (key == Qt::Key_Tab) {
                 return true;
             }
         }
         return QTextEdit::event(event);
     }
-signals:
+   signals:
     void editingDone();
 };
 
-void ListViewDelegate::updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const
+void ListViewDelegate::updateEditorGeometry(QWidget* editor,
+                                            const QStyleOptionViewItem& option,
+                                            [[maybe_unused]] const QModelIndex& index) const
 {
     const int iconSize = 48;
     QRect textRect = option.rect;
@@ -412,28 +381,29 @@ void ListViewDelegate::updateEditorGeometry(QWidget* editor, const QStyleOptionV
 void ListViewDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const
 {
     auto text = index.data(Qt::EditRole).toString();
-    QTextEdit * realeditor = qobject_cast<NoReturnTextEdit *>(editor);
-    realeditor->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    realeditor->append(text);
-    realeditor->selectAll();
-    realeditor->document()->clearUndoRedoStacks();
+    QTextEdit* realEditor = qobject_cast<NoReturnTextEdit*>(editor);
+    realEditor->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    realEditor->append(text);
+    realEditor->selectAll();
+    realEditor->document()->clearUndoRedoStacks();
 }
 
 void ListViewDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
 {
-    QTextEdit * realeditor = qobject_cast<NoReturnTextEdit *>(editor);
-    QString text = realeditor->toPlainText();
+    QTextEdit* realEditor = qobject_cast<NoReturnTextEdit*>(editor);
+    QString text = realEditor->toPlainText();
     text.replace(QChar('\n'), QChar(' '));
     text = text.trimmed();
     // Prevent instance names longer than 128 chars
     text.truncate(128);
-    if(text.size() != 0)
-    {
+    if (text.size() != 0) {
         model->setData(index, text);
     }
 }
 
-QWidget * ListViewDelegate::createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const
+QWidget* ListViewDelegate::createEditor(QWidget* parent,
+                                        [[maybe_unused]] const QStyleOptionViewItem& option,
+                                        [[maybe_unused]] const QModelIndex& index) const
 {
     auto editor = new NoReturnTextEdit(parent);
     connect(editor, &NoReturnTextEdit::editingDone, this, &ListViewDelegate::editingDone);
@@ -442,7 +412,7 @@ QWidget * ListViewDelegate::createEditor(QWidget* parent, const QStyleOptionView
 
 void ListViewDelegate::editingDone()
 {
-    NoReturnTextEdit *editor = qobject_cast<NoReturnTextEdit *>(sender());
+    NoReturnTextEdit* editor = qobject_cast<NoReturnTextEdit*>(sender());
     emit commitData(editor);
     emit closeEditor(editor);
 }
diff --git a/launcher/ui/instanceview/InstanceDelegate.h b/launcher/ui/instanceview/InstanceDelegate.h
index d95279f3..69dd32ba 100644
--- a/launcher/ui/instanceview/InstanceDelegate.h
+++ b/launcher/ui/instanceview/InstanceDelegate.h
@@ -15,25 +15,24 @@
 
 #pragma once
 
-#include <QStyledItemDelegate>
 #include <QCache>
+#include <QStyledItemDelegate>
 
-class ListViewDelegate : public QStyledItemDelegate
-{
+class ListViewDelegate : public QStyledItemDelegate {
     Q_OBJECT
 
-public:
-    explicit ListViewDelegate(QObject *parent = 0);
+   public:
+    explicit ListViewDelegate(QObject* parent = 0);
     virtual ~ListViewDelegate() {}
 
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
-    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
-    void updateEditorGeometry(QWidget * editor, const QStyleOptionViewItem & option, const QModelIndex & index) const override;
-    QWidget * createEditor(QWidget * parent, const QStyleOptionViewItem & option, const QModelIndex & index) const override;
+    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+    QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+    void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+    QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
-    void setEditorData(QWidget * editor, const QModelIndex & index) const override;
-    void setModelData(QWidget * editor, QAbstractItemModel * model, const QModelIndex & index) const override;
+    void setEditorData(QWidget* editor, const QModelIndex& index) const override;
+    void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
 
-private slots:
+   private slots:
     void editingDone();
 };
diff --git a/launcher/ui/instanceview/InstanceProxyModel.cpp b/launcher/ui/instanceview/InstanceProxyModel.cpp
index d8de93ed..ab6bef69 100644
--- a/launcher/ui/instanceview/InstanceProxyModel.cpp
+++ b/launcher/ui/instanceview/InstanceProxyModel.cpp
@@ -15,57 +15,54 @@
 
 #include "InstanceProxyModel.h"
 
-#include "InstanceView.h"
-#include "Application.h"
 #include <BaseInstance.h>
 #include <icons/IconList.h>
+#include "Application.h"
+#include "InstanceView.h"
 
 #include <QDebug>
 
-InstanceProxyModel::InstanceProxyModel(QObject *parent) : QSortFilterProxyModel(parent) {
+InstanceProxyModel::InstanceProxyModel(QObject* parent) : QSortFilterProxyModel(parent)
+{
     m_naturalSort.setNumericMode(true);
     m_naturalSort.setCaseSensitivity(Qt::CaseSensitivity::CaseInsensitive);
     // FIXME: use loaded translation as source of locale instead, hook this up to translation changes
     m_naturalSort.setLocale(QLocale::system());
 }
 
-QVariant InstanceProxyModel::data(const QModelIndex & index, int role) const
+QVariant InstanceProxyModel::data(const QModelIndex& index, int role) const
 {
     QVariant data = QSortFilterProxyModel::data(index, role);
-    if(role == Qt::DecorationRole)
-    {
+    if (role == Qt::DecorationRole) {
         return QVariant(APPLICATION->icons()->getIcon(data.toString()));
     }
     return data;
 }
 
-bool InstanceProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const {
+bool InstanceProxyModel::lessThan(const QModelIndex& left, const QModelIndex& right) const
+{
     const QString leftCategory = left.data(InstanceViewRoles::GroupRole).toString();
     const QString rightCategory = right.data(InstanceViewRoles::GroupRole).toString();
     if (leftCategory == rightCategory) {
         return subSortLessThan(left, right);
-    }
-    else {
+    } else {
         // FIXME: real group sorting happens in InstanceView::updateGeometries(), see LocaleString
         auto result = leftCategory.localeAwareCompare(rightCategory);
-        if(result == 0) {
+        if (result == 0) {
             return subSortLessThan(left, right);
         }
         return result < 0;
     }
 }
 
-bool InstanceProxyModel::subSortLessThan(const QModelIndex &left, const QModelIndex &right) const
+bool InstanceProxyModel::subSortLessThan(const QModelIndex& left, const QModelIndex& right) const
 {
-    BaseInstance *pdataLeft = static_cast<BaseInstance *>(left.internalPointer());
-    BaseInstance *pdataRight = static_cast<BaseInstance *>(right.internalPointer());
+    BaseInstance* pdataLeft = static_cast<BaseInstance*>(left.internalPointer());
+    BaseInstance* pdataRight = static_cast<BaseInstance*>(right.internalPointer());
     QString sortMode = APPLICATION->settings()->get("InstSortMode").toString();
-    if (sortMode == "LastLaunch")
-    {
+    if (sortMode == "LastLaunch") {
         return pdataLeft->lastLaunch() > pdataRight->lastLaunch();
-    }
-    else
-    {
+    } else {
         return m_naturalSort.compare(pdataLeft->name(), pdataRight->name()) < 0;
     }
 }
diff --git a/launcher/ui/instanceview/InstanceProxyModel.h b/launcher/ui/instanceview/InstanceProxyModel.h
index bba8d2b5..13fec1bc 100644
--- a/launcher/ui/instanceview/InstanceProxyModel.h
+++ b/launcher/ui/instanceview/InstanceProxyModel.h
@@ -15,21 +15,20 @@
 
 #pragma once
 
-#include <QSortFilterProxyModel>
 #include <QCollator>
+#include <QSortFilterProxyModel>
 
-class InstanceProxyModel : public QSortFilterProxyModel
-{
+class InstanceProxyModel : public QSortFilterProxyModel {
     Q_OBJECT
 
-public:
-    InstanceProxyModel(QObject *parent = 0);
+   public:
+    InstanceProxyModel(QObject* parent = 0);
 
-protected:
-    QVariant data(const QModelIndex & index, int role) const override;
-    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
-    bool subSortLessThan(const QModelIndex &left, const QModelIndex &right) const;
+   protected:
+    QVariant data(const QModelIndex& index, int role) const override;
+    bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
+    bool subSortLessThan(const QModelIndex& left, const QModelIndex& right) const;
 
-private:
+   private:
     QCollator m_naturalSort;
 };
diff --git a/launcher/ui/instanceview/InstanceView.cpp b/launcher/ui/instanceview/InstanceView.cpp
index 05f0004d..690dc917 100644
--- a/launcher/ui/instanceview/InstanceView.cpp
+++ b/launcher/ui/instanceview/InstanceView.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,39 +35,36 @@
 
 #include "InstanceView.h"
 
-#include <QPainter>
+#include <QAccessible>
 #include <QApplication>
-#include <QtMath>
-#include <QMouseEvent>
-#include <QListView>
-#include <QPersistentModelIndex>
+#include <QCache>
 #include <QDrag>
+#include <QListView>
 #include <QMimeData>
-#include <QCache>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QPersistentModelIndex>
 #include <QScrollBar>
-#include <QAccessible>
+#include <QtMath>
 
 #include "VisualGroup.h"
-#include <QDebug>
+#include "ui/themes/ThemeManager.h"
 
 #include <Application.h>
 #include <InstanceList.h>
 
-
-template <typename T> bool listsIntersect(const QList<T> &l1, const QList<T> t2)
+template <typename T>
+bool listsIntersect(const QList<T>& l1, const QList<T> t2)
 {
-    for (auto &item : l1)
-    {
-        if (t2.contains(item))
-        {
+    for (auto& item : l1) {
+        if (t2.contains(item)) {
             return true;
         }
     }
     return false;
 }
 
-InstanceView::InstanceView(QWidget *parent)
-    : QAbstractItemView(parent)
+InstanceView::InstanceView(QWidget* parent) : QAbstractItemView(parent)
 {
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
@@ -82,23 +79,25 @@ InstanceView::~InstanceView()
     m_groups.clear();
 }
 
-void InstanceView::setModel(QAbstractItemModel *model)
+void InstanceView::setModel(QAbstractItemModel* model)
 {
     QAbstractItemView::setModel(model);
     connect(model, &QAbstractItemModel::modelReset, this, &InstanceView::modelReset);
     connect(model, &QAbstractItemModel::rowsRemoved, this, &InstanceView::rowsRemoved);
 }
 
-void InstanceView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
+void InstanceView::dataChanged([[maybe_unused]] const QModelIndex& topLeft,
+                               [[maybe_unused]] const QModelIndex& bottomRight,
+                               [[maybe_unused]] const QVector<int>& roles)
 {
     scheduleDelayedItemsLayout();
 }
-void InstanceView::rowsInserted(const QModelIndex &parent, int start, int end)
+void InstanceView::rowsInserted([[maybe_unused]] const QModelIndex& parent, [[maybe_unused]] int start, [[maybe_unused]] int end)
 {
     scheduleDelayedItemsLayout();
 }
 
-void InstanceView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
+void InstanceView::rowsAboutToBeRemoved([[maybe_unused]] const QModelIndex& parent, [[maybe_unused]] int start, [[maybe_unused]] int end)
 {
     scheduleDelayedItemsLayout();
 }
@@ -116,7 +115,8 @@ void InstanceView::rowsRemoved()
 void InstanceView::currentChanged(const QModelIndex& current, const QModelIndex& previous)
 {
     QAbstractItemView::currentChanged(current, previous);
-    // TODO: for accessibility support, implement+register a factory, steal QAccessibleTable from Qt and return an instance of it for InstanceView.
+    // TODO: for accessibility support, implement+register a factory, steal QAccessibleTable from Qt and return an instance of it for
+    // InstanceView.
 #ifndef QT_NO_ACCESSIBILITY
     if (QAccessible::isActive() && current.isValid()) {
         QAccessibleEvent event(this, QAccessible::Focus);
@@ -126,19 +126,13 @@ void InstanceView::currentChanged(const QModelIndex& current, const QModelIndex&
 #endif /* !QT_NO_ACCESSIBILITY */
 }
 
-
-class LocaleString : public QString
-{
-public:
-    LocaleString(const char *s) : QString(s)
-    {
-    }
-    LocaleString(const QString &s) : QString(s)
-    {
-    }
+class LocaleString : public QString {
+   public:
+    LocaleString(const char* s) : QString(s) {}
+    LocaleString(const QString& s) : QString(s) {}
 };
 
-inline bool operator<(const LocaleString &lhs, const LocaleString &rhs)
+inline bool operator<(const LocaleString& lhs, const LocaleString& rhs)
 {
     return (QString::localeAwareCompare(lhs, rhs) < 0);
 }
@@ -146,33 +140,28 @@ inline bool operator<(const LocaleString &lhs, const LocaleString &rhs)
 void InstanceView::updateScrollbar()
 {
     int previousScroll = verticalScrollBar()->value();
-    if (m_groups.isEmpty())
-    {
+    if (m_groups.isEmpty()) {
         verticalScrollBar()->setRange(0, 0);
-    }
-    else
-    {
+    } else {
         int totalHeight = 0;
         // top margin
         totalHeight += m_categoryMargin;
         int itemScroll = 0;
-        for (auto category : m_groups)
-        {
+        for (auto category : m_groups) {
             category->m_verticalPosition = totalHeight;
             totalHeight += category->totalHeight() + m_categoryMargin;
-            if(!itemScroll && category->totalHeight() != 0)
-            {
+            if (!itemScroll && category->totalHeight() != 0) {
                 itemScroll = category->contentHeight() / category->numRows();
             }
         }
         // do not divide by zero
-        if(itemScroll == 0)
+        if (itemScroll == 0)
             itemScroll = 64;
 
         totalHeight += m_bottomMargin;
-        verticalScrollBar()->setSingleStep ( itemScroll );
-        const int rowsPerPage = qMax ( viewport()->height() / itemScroll, 1 );
-        verticalScrollBar()->setPageStep ( rowsPerPage * itemScroll );
+        verticalScrollBar()->setSingleStep(itemScroll);
+        const int rowsPerPage = qMax(viewport()->height() / itemScroll, 1);
+        verticalScrollBar()->setPageStep(rowsPerPage * itemScroll);
 
         verticalScrollBar()->setRange(0, totalHeight - height());
     }
@@ -184,24 +173,19 @@ void InstanceView::updateGeometries()
 {
     geometryCache.clear();
 
-    QMap<LocaleString, VisualGroup *> cats;
+    QMap<LocaleString, VisualGroup*> cats;
 
-    for (int i = 0; i < model()->rowCount(); ++i)
-    {
+    for (int i = 0; i < model()->rowCount(); ++i) {
         const QString groupName = model()->index(i, 0).data(InstanceViewRoles::GroupRole).toString();
-        if (!cats.contains(groupName))
-        {
-            VisualGroup *old = this->category(groupName);
-            if (old)
-            {
+        if (!cats.contains(groupName)) {
+            VisualGroup* old = this->category(groupName);
+            if (old) {
                 auto cat = new VisualGroup(old);
                 cats.insert(groupName, cat);
                 cat->update();
-            }
-            else
-            {
+            } else {
                 auto cat = new VisualGroup(groupName, this);
-                if(fVisibility) {
+                if (fVisibility) {
                     cat->collapsed = fVisibility(groupName);
                 }
                 cats.insert(groupName, cat);
@@ -216,43 +200,36 @@ void InstanceView::updateGeometries()
     viewport()->update();
 }
 
-bool InstanceView::isIndexHidden(const QModelIndex &index) const
+bool InstanceView::isIndexHidden(const QModelIndex& index) const
 {
-    VisualGroup *cat = category(index);
-    if (cat)
-    {
+    VisualGroup* cat = category(index);
+    if (cat) {
         return cat->collapsed;
-    }
-    else
-    {
+    } else {
         return false;
     }
 }
 
-VisualGroup *InstanceView::category(const QModelIndex &index) const
+VisualGroup* InstanceView::category(const QModelIndex& index) const
 {
     return category(index.data(InstanceViewRoles::GroupRole).toString());
 }
 
-VisualGroup *InstanceView::category(const QString &cat) const
+VisualGroup* InstanceView::category(const QString& cat) const
 {
-    for (auto group : m_groups)
-    {
-        if (group->text == cat)
-        {
+    for (auto group : m_groups) {
+        if (group->text == cat) {
             return group;
         }
     }
     return nullptr;
 }
 
-VisualGroup *InstanceView::categoryAt(const QPoint &pos, VisualGroup::HitResults & result) const
+VisualGroup* InstanceView::categoryAt(const QPoint& pos, VisualGroup::HitResults& result) const
 {
-    for (auto group : m_groups)
-    {
+    for (auto group : m_groups) {
         result = group->hitScan(pos);
-        if(result != VisualGroup::NoHit)
-        {
+        if (result != VisualGroup::NoHit) {
             return group;
         }
     }
@@ -260,14 +237,13 @@ VisualGroup *InstanceView::categoryAt(const QPoint &pos, VisualGroup::HitResults
     return nullptr;
 }
 
-QString InstanceView::groupNameAt(const QPoint &point)
+QString InstanceView::groupNameAt(const QPoint& point)
 {
     executeDelayedItemsLayout();
 
-    VisualGroup::HitResults hitresult;
-    auto group = categoryAt(point + offset(), hitresult);
-    if(group && (hitresult & (VisualGroup::HeaderHit | VisualGroup::BodyHit)))
-    {
+    VisualGroup::HitResults hitResult;
+    auto group = categoryAt(point + offset(), hitResult);
+    if (group && (hitResult & (VisualGroup::HeaderHit | VisualGroup::BodyHit))) {
         return group->text;
     }
     return QString();
@@ -288,7 +264,7 @@ int InstanceView::itemWidth() const
     return m_itemWidth;
 }
 
-void InstanceView::mousePressEvent(QMouseEvent *event)
+void InstanceView::mousePressEvent(QMouseEvent* event)
 {
     executeDelayedItemsLayout();
 
@@ -301,19 +277,16 @@ void InstanceView::mousePressEvent(QMouseEvent *event)
     m_pressedAlreadySelected = selectionModel()->isSelected(m_pressedIndex);
     m_pressedPosition = geometryPos;
 
-    VisualGroup::HitResults hitresult;
-    m_pressedCategory = categoryAt(geometryPos, hitresult);
-    if (m_pressedCategory && hitresult & VisualGroup::CheckboxHit)
-    {
+    VisualGroup::HitResults hitResult;
+    m_pressedCategory = categoryAt(geometryPos, hitResult);
+    if (m_pressedCategory && hitResult & VisualGroup::CheckboxHit) {
         setState(m_pressedCategory->collapsed ? ExpandingState : CollapsingState);
         event->accept();
         return;
     }
 
-    if (index.isValid() && (index.flags() & Qt::ItemIsEnabled))
-    {
-        if(index != currentIndex())
-        {
+    if (index.isValid() && (index.flags() & Qt::ItemIsEnabled)) {
+        if (index != currentIndex()) {
             // FIXME: better!
             m_currentCursorColumn = -1;
         }
@@ -329,15 +302,13 @@ void InstanceView::mousePressEvent(QMouseEvent *event)
 
         // signal handlers may change the model
         emit pressed(index);
-    }
-    else
-    {
+    } else {
         // Forces a finalize() even if mouse is pressed, but not on a item
         selectionModel()->select(QModelIndex(), QItemSelectionModel::Select);
     }
 }
 
-void InstanceView::mouseMoveEvent(QMouseEvent *event)
+void InstanceView::mouseMoveEvent(QMouseEvent* event)
 {
     executeDelayedItemsLayout();
 
@@ -345,16 +316,13 @@ void InstanceView::mouseMoveEvent(QMouseEvent *event)
     QPoint visualPos = event->pos();
     QPoint geometryPos = event->pos() + offset();
 
-    if (state() == ExpandingState || state() == CollapsingState)
-    {
+    if (state() == ExpandingState || state() == CollapsingState) {
         return;
     }
 
-    if (state() == DraggingState)
-    {
+    if (state() == DraggingState) {
         topLeft = m_pressedPosition - offset();
-        if ((topLeft - event->pos()).manhattanLength() > QApplication::startDragDistance())
-        {
+        if ((topLeft - event->pos()).manhattanLength() > QApplication::startDragDistance()) {
             m_pressedIndex = QModelIndex();
             startDrag(model()->supportedDragActions());
             setState(NoState);
@@ -363,39 +331,31 @@ void InstanceView::mouseMoveEvent(QMouseEvent *event)
         return;
     }
 
-    if (selectionMode() != SingleSelection)
-    {
+    if (selectionMode() != SingleSelection) {
         topLeft = m_pressedPosition - offset();
-    }
-    else
-    {
+    } else {
         topLeft = geometryPos;
     }
 
-    if (m_pressedIndex.isValid() && (state() != DragSelectingState) &&
-        (event->buttons() != Qt::NoButton) && !selectedIndexes().isEmpty())
-    {
+    if (m_pressedIndex.isValid() && (state() != DragSelectingState) && (event->buttons() != Qt::NoButton) && !selectedIndexes().isEmpty()) {
         setState(DraggingState);
         return;
     }
 
-    if ((event->buttons() & Qt::LeftButton) && selectionModel())
-    {
+    if ((event->buttons() & Qt::LeftButton) && selectionModel()) {
         setState(DragSelectingState);
 
         setSelection(QRect(visualPos, visualPos), QItemSelectionModel::ClearAndSelect);
         QModelIndex index = indexAt(visualPos);
 
         // set at the end because it might scroll the view
-        if (index.isValid() && (index != selectionModel()->currentIndex()) &&
-            (index.flags() & Qt::ItemIsEnabled))
-        {
+        if (index.isValid() && (index != selectionModel()->currentIndex()) && (index.flags() & Qt::ItemIsEnabled)) {
             selectionModel()->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
         }
     }
 }
 
-void InstanceView::mouseReleaseEvent(QMouseEvent *event)
+void InstanceView::mouseReleaseEvent(QMouseEvent* event)
 {
     executeDelayedItemsLayout();
 
@@ -403,15 +363,13 @@ void InstanceView::mouseReleaseEvent(QMouseEvent *event)
     QPoint geometryPos = event->pos() + offset();
     QPersistentModelIndex index = indexAt(visualPos);
 
-    VisualGroup::HitResults hitresult;
+    VisualGroup::HitResults hitResult;
 
-    bool click = (index == m_pressedIndex && index.isValid()) ||
-                 (m_pressedCategory && m_pressedCategory == categoryAt(geometryPos, hitresult));
+    bool click =
+        (index == m_pressedIndex && index.isValid()) || (m_pressedCategory && m_pressedCategory == categoryAt(geometryPos, hitResult));
 
-    if (click && m_pressedCategory)
-    {
-        if (state() == ExpandingState)
-        {
+    if (click && m_pressedCategory) {
+        if (state() == ExpandingState) {
             m_pressedCategory->collapsed = false;
             emit groupStateChanged(m_pressedCategory->text, false);
 
@@ -421,9 +379,7 @@ void InstanceView::mouseReleaseEvent(QMouseEvent *event)
             m_pressedCategory = nullptr;
             setState(NoState);
             return;
-        }
-        else if (state() == CollapsingState)
-        {
+        } else if (state() == CollapsingState) {
             m_pressedCategory->collapsed = true;
             emit groupStateChanged(m_pressedCategory->text, true);
 
@@ -440,10 +396,8 @@ void InstanceView::mouseReleaseEvent(QMouseEvent *event)
 
     setState(NoState);
 
-    if (click)
-    {
-        if (event->button() == Qt::LeftButton)
-        {
+    if (click) {
+        if (event->button() == Qt::LeftButton) {
             emit clicked(index);
         }
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -452,34 +406,24 @@ void InstanceView::mouseReleaseEvent(QMouseEvent *event)
 #else
         QStyleOptionViewItem option = viewOptions();
 #endif
-        if (m_pressedAlreadySelected)
-        {
+        if (m_pressedAlreadySelected) {
             option.state |= QStyle::State_Selected;
         }
         if ((model()->flags(index) & Qt::ItemIsEnabled) &&
-            style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, &option, this))
-        {
+            style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, &option, this)) {
             emit activated(index);
         }
     }
 }
 
-void InstanceView::mouseDoubleClickEvent(QMouseEvent *event)
+void InstanceView::mouseDoubleClickEvent(QMouseEvent* event)
 {
     executeDelayedItemsLayout();
 
     QModelIndex index = indexAt(event->pos());
-    if (!index.isValid() || !(index.flags() & Qt::ItemIsEnabled) || (m_pressedIndex != index))
-    {
-        QMouseEvent me(
-            QEvent::MouseButtonPress,
-            event->localPos(),
-            event->windowPos(),
-            event->screenPos(),
-            event->button(),
-            event->buttons(),
-            event->modifiers()
-        );
+    if (!index.isValid() || !(index.flags() & Qt::ItemIsEnabled) || (m_pressedIndex != index)) {
+        QMouseEvent me(QEvent::MouseButtonPress, event->localPos(), event->windowPos(), event->screenPos(), event->button(),
+                       event->buttons(), event->modifiers());
         mousePressEvent(&me);
         return;
     }
@@ -493,8 +437,7 @@ void InstanceView::mouseDoubleClickEvent(QMouseEvent *event)
 #else
     QStyleOptionViewItem option = viewOptions();
 #endif
-    if ((model()->flags(index) & Qt::ItemIsEnabled) && !style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, &option, this))
-    {
+    if ((model()->flags(index) & Qt::ItemIsEnabled) && !style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, &option, this)) {
         emit activated(index);
     }
 }
@@ -503,12 +446,12 @@ void InstanceView::setPaintCat(bool visible)
 {
     m_catVisible = visible;
     if (visible)
-        m_catPixmap.load(APPLICATION->getCatPack());
+        m_catPixmap.load(APPLICATION->themeManager()->getCatPack());
     else
         m_catPixmap = QPixmap();
 }
 
-void InstanceView::paintEvent(QPaintEvent* event)
+void InstanceView::paintEvent([[maybe_unused]] QPaintEvent* event)
 {
     executeDelayedItemsLayout();
 
@@ -537,9 +480,8 @@ void InstanceView::paintEvent(QPaintEvent* event)
 
     int wpWidth = viewport()->width();
     option.rect.setWidth(wpWidth);
-    for (int i = 0; i < m_groups.size(); ++i)
-    {
-        VisualGroup *category = m_groups.at(i);
+    for (int i = 0; i < m_groups.size(); ++i) {
+        VisualGroup* category = m_groups.at(i);
         int y = category->verticalPosition();
         y -= verticalOffset();
         QRect backup = option.rect;
@@ -553,28 +495,21 @@ void InstanceView::paintEvent(QPaintEvent* event)
         option.rect = backup;
     }
 
-    for (int i = 0; i < model()->rowCount(); ++i)
-    {
+    for (int i = 0; i < model()->rowCount(); ++i) {
         const QModelIndex index = model()->index(i, 0);
-        if (isIndexHidden(index))
-        {
+        if (isIndexHidden(index)) {
             continue;
         }
         Qt::ItemFlags flags = index.flags();
         option.rect = visualRect(index);
         option.features |= QStyleOptionViewItem::WrapText;
-        if (flags & Qt::ItemIsSelectable && selectionModel()->isSelected(index))
-        {
-            option.state |= selectionModel()->isSelected(index) ? QStyle::State_Selected
-                                                                : QStyle::State_None;
-        }
-        else
-        {
+        if (flags & Qt::ItemIsSelectable && selectionModel()->isSelected(index)) {
+            option.state |= selectionModel()->isSelected(index) ? QStyle::State_Selected : QStyle::State_None;
+        } else {
             option.state &= ~QStyle::State_Selected;
         }
         option.state |= (index == currentIndex()) ? QStyle::State_HasFocus : QStyle::State_None;
-        if (!(flags & Qt::ItemIsEnabled))
-        {
+        if (!(flags & Qt::ItemIsEnabled)) {
             option.state &= ~QStyle::State_Enabled;
         }
         itemDelegate()->paint(&painter, option, index);
@@ -612,27 +547,23 @@ void InstanceView::paintEvent(QPaintEvent* event)
 #endif
 }
 
-void InstanceView::resizeEvent(QResizeEvent *event)
+void InstanceView::resizeEvent([[maybe_unused]] QResizeEvent* event)
 {
     int newItemsPerRow = calculateItemsPerRow();
-    if(newItemsPerRow != m_currentItemsPerRow)
-    {
+    if (newItemsPerRow != m_currentItemsPerRow) {
         m_currentCursorColumn = -1;
         m_currentItemsPerRow = newItemsPerRow;
         updateGeometries();
-    }
-    else
-    {
+    } else {
         updateScrollbar();
     }
 }
 
-void InstanceView::dragEnterEvent(QDragEnterEvent *event)
+void InstanceView::dragEnterEvent(QDragEnterEvent* event)
 {
     executeDelayedItemsLayout();
 
-    if (!isDragEventAccepted(event))
-    {
+    if (!isDragEventAccepted(event)) {
         return;
     }
     m_lastDragPosition = event->pos() + offset();
@@ -640,12 +571,11 @@ void InstanceView::dragEnterEvent(QDragEnterEvent *event)
     event->accept();
 }
 
-void InstanceView::dragMoveEvent(QDragMoveEvent *event)
+void InstanceView::dragMoveEvent(QDragMoveEvent* event)
 {
     executeDelayedItemsLayout();
 
-    if (!isDragEventAccepted(event))
-    {
+    if (!isDragEventAccepted(event)) {
         return;
     }
     m_lastDragPosition = event->pos() + offset();
@@ -653,7 +583,7 @@ void InstanceView::dragMoveEvent(QDragMoveEvent *event)
     event->accept();
 }
 
-void InstanceView::dragLeaveEvent(QDragLeaveEvent *event)
+void InstanceView::dragLeaveEvent([[maybe_unused]] QDragLeaveEvent* event)
 {
     executeDelayedItemsLayout();
 
@@ -661,7 +591,7 @@ void InstanceView::dragLeaveEvent(QDragLeaveEvent *event)
     viewport()->update();
 }
 
-void InstanceView::dropEvent(QDropEvent *event)
+void InstanceView::dropEvent(QDropEvent* event)
 {
     executeDelayedItemsLayout();
 
@@ -672,16 +602,13 @@ void InstanceView::dropEvent(QDropEvent *event)
 
     auto mimedata = event->mimeData();
 
-    if (event->source() == this)
-    {
-        if(event->possibleActions() & Qt::MoveAction)
-        {
-            std::pair<VisualGroup *, VisualGroup::HitResults> dropPos = rowDropPos(event->pos());
-            const VisualGroup *group = dropPos.first;
-            auto hitresult = dropPos.second;
+    if (event->source() == this) {
+        if (event->possibleActions() & Qt::MoveAction) {
+            std::pair<VisualGroup*, VisualGroup::HitResults> dropPos = rowDropPos(event->pos());
+            const VisualGroup* group = dropPos.first;
+            auto hitResult = dropPos.second;
 
-            if (hitresult == VisualGroup::HitResult::NoHit)
-            {
+            if (hitResult == VisualGroup::HitResult::NoHit) {
                 viewport()->update();
                 return;
             }
@@ -698,14 +625,12 @@ void InstanceView::dropEvent(QDropEvent *event)
     }
 
     // check if the action is supported
-    if (!mimedata)
-    {
+    if (!mimedata) {
         return;
     }
 
     // files dropped from outside?
-    if (mimedata->hasUrls())
-    {
+    if (mimedata->hasUrls()) {
         auto urls = mimedata->urls();
         event->accept();
         emit droppedURLs(urls);
@@ -717,57 +642,52 @@ void InstanceView::startDrag(Qt::DropActions supportedActions)
     executeDelayedItemsLayout();
 
     QModelIndexList indexes = selectionModel()->selectedIndexes();
-    if(indexes.count() == 0)
+    if (indexes.count() == 0)
         return;
 
-    QMimeData *data = model()->mimeData(indexes);
-    if (!data)
-    {
+    QMimeData* mimeData = model()->mimeData(indexes);
+    if (!mimeData) {
         return;
     }
     QRect rect;
     QPixmap pixmap = renderToPixmap(indexes, &rect);
-    QDrag *drag = new QDrag(this);
+    QDrag* drag = new QDrag(this);
     drag->setPixmap(pixmap);
-    drag->setMimeData(data);
+    drag->setMimeData(mimeData);
     drag->setHotSpot(m_pressedPosition - rect.topLeft());
     Qt::DropAction defaultDropAction = Qt::IgnoreAction;
-    if (this->defaultDropAction() != Qt::IgnoreAction && (supportedActions & this->defaultDropAction()))
-    {
+    if (this->defaultDropAction() != Qt::IgnoreAction && (supportedActions & this->defaultDropAction())) {
         defaultDropAction = this->defaultDropAction();
     }
     /*auto action = */
     drag->exec(supportedActions, defaultDropAction);
 }
 
-QRect InstanceView::visualRect(const QModelIndex &index) const
+QRect InstanceView::visualRect(const QModelIndex& index) const
 {
     const_cast<InstanceView*>(this)->executeDelayedItemsLayout();
 
     return geometryRect(index).translated(-offset());
 }
 
-QRect InstanceView::geometryRect(const QModelIndex &index) const
+QRect InstanceView::geometryRect(const QModelIndex& index) const
 {
     const_cast<InstanceView*>(this)->executeDelayedItemsLayout();
 
-    if (!index.isValid() || isIndexHidden(index) || index.column() > 0)
-    {
+    if (!index.isValid() || isIndexHidden(index) || index.column() > 0) {
         return QRect();
     }
 
     int row = index.row();
-    if(geometryCache.contains(row))
-    {
+    if (geometryCache.contains(row)) {
         return *geometryCache[row];
     }
 
-    const VisualGroup *cat = category(index);
+    const VisualGroup* cat = category(index);
     QPair<int, int> pos = cat->positionOf(index);
     int x = pos.first;
     // int y = pos.second;
 
-
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     QStyleOptionViewItem option;
     initViewItemOption(&option);
@@ -783,43 +703,38 @@ QRect InstanceView::geometryRect(const QModelIndex &index) const
     return out;
 }
 
-QModelIndex InstanceView::indexAt(const QPoint &point) const
+QModelIndex InstanceView::indexAt(const QPoint& point) const
 {
     const_cast<InstanceView*>(this)->executeDelayedItemsLayout();
 
-    for (int i = 0; i < model()->rowCount(); ++i)
-    {
+    for (int i = 0; i < model()->rowCount(); ++i) {
         QModelIndex index = model()->index(i, 0);
-        if (visualRect(index).contains(point))
-        {
+        if (visualRect(index).contains(point)) {
             return index;
         }
     }
     return QModelIndex();
 }
 
-void InstanceView::setSelection(const QRect &rect, const QItemSelectionModel::SelectionFlags commands)
+void InstanceView::setSelection(const QRect& rect, const QItemSelectionModel::SelectionFlags commands)
 {
     executeDelayedItemsLayout();
 
-    for (int i = 0; i < model()->rowCount(); ++i)
-    {
+    for (int i = 0; i < model()->rowCount(); ++i) {
         QModelIndex index = model()->index(i, 0);
         QRect itemRect = visualRect(index);
-        if (itemRect.intersects(rect))
-        {
+        if (itemRect.intersects(rect)) {
             selectionModel()->select(index, commands);
             update(itemRect.translated(-offset()));
         }
     }
 }
 
-QPixmap InstanceView::renderToPixmap(const QModelIndexList &indices, QRect *r) const
+QPixmap InstanceView::renderToPixmap(const QModelIndexList& indices, QRect* r) const
 {
     Q_ASSERT(r);
     auto paintPairs = draggablePaintPairs(indices, r);
-    if (paintPairs.isEmpty())
-    {
+    if (paintPairs.isEmpty()) {
         return QPixmap();
     }
     QPixmap pixmap(r->size());
@@ -832,23 +747,21 @@ QPixmap InstanceView::renderToPixmap(const QModelIndexList &indices, QRect *r) c
     QStyleOptionViewItem option = viewOptions();
 #endif
     option.state |= QStyle::State_Selected;
-    for (int j = 0; j < paintPairs.count(); ++j)
-    {
+    for (int j = 0; j < paintPairs.count(); ++j) {
         option.rect = paintPairs.at(j).first.translated(-r->topLeft());
-        const QModelIndex &current = paintPairs.at(j).second;
+        const QModelIndex& current = paintPairs.at(j).second;
         itemDelegate()->paint(&painter, option, current);
     }
     return pixmap;
 }
 
-QList<std::pair<QRect, QModelIndex>> InstanceView::draggablePaintPairs(const QModelIndexList &indices, QRect *r) const
+QList<std::pair<QRect, QModelIndex>> InstanceView::draggablePaintPairs(const QModelIndexList& indices, QRect* r) const
 {
     Q_ASSERT(r);
-    QRect &rect = *r;
+    QRect& rect = *r;
     QList<std::pair<QRect, QModelIndex>> ret;
-    for (int i = 0; i < indices.count(); ++i)
-    {
-        const QModelIndex &index = indices.at(i);
+    for (int i = 0; i < indices.count(); ++i) {
+        const QModelIndex& index = indices.at(i);
         const QRect current = geometryRect(index);
         ret += std::make_pair(current, index);
         rect |= current;
@@ -856,16 +769,16 @@ QList<std::pair<QRect, QModelIndex>> InstanceView::draggablePaintPairs(const QMo
     return ret;
 }
 
-bool InstanceView::isDragEventAccepted(QDropEvent *event)
+bool InstanceView::isDragEventAccepted([[maybe_unused]] QDropEvent* event)
 {
     return true;
 }
 
-std::pair<VisualGroup *, VisualGroup::HitResults> InstanceView::rowDropPos(const QPoint &pos)
+std::pair<VisualGroup*, VisualGroup::HitResults> InstanceView::rowDropPos(const QPoint& pos)
 {
-    VisualGroup::HitResults hitresult;
-    auto group = categoryAt(pos + offset(), hitresult);
-    return std::make_pair(group, hitresult);
+    VisualGroup::HitResults hitResult;
+    auto group = categoryAt(pos + offset(), hitResult);
+    return std::make_pair(group, hitResult);
 }
 
 QPoint InstanceView::offset() const
@@ -873,146 +786,118 @@ QPoint InstanceView::offset() const
     return QPoint(horizontalOffset(), verticalOffset());
 }
 
-QRegion InstanceView::visualRegionForSelection(const QItemSelection &selection) const
+QRegion InstanceView::visualRegionForSelection(const QItemSelection& selection) const
 {
     QRegion region;
-    for (auto &range : selection)
-    {
+    for (auto& range : selection) {
         int start_row = range.top();
         int end_row = range.bottom();
-        for (int row = start_row; row <= end_row; ++row)
-        {
+        for (int row = start_row; row <= end_row; ++row) {
             int start_column = range.left();
             int end_column = range.right();
-            for (int column = start_column; column <= end_column; ++column)
-            {
+            for (int column = start_column; column <= end_column; ++column) {
                 QModelIndex index = model()->index(row, column, rootIndex());
-                region += visualRect(index); // OK
+                region += visualRect(index);  // OK
             }
         }
     }
     return region;
 }
 
-QModelIndex InstanceView::moveCursor(QAbstractItemView::CursorAction cursorAction, Qt::KeyboardModifiers modifiers)
+QModelIndex InstanceView::moveCursor(QAbstractItemView::CursorAction cursorAction, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
 {
     auto current = currentIndex();
-    if(!current.isValid())
-    {
+    if (!current.isValid()) {
         return current;
     }
     auto cat = category(current);
     int group_index = m_groups.indexOf(cat);
-    if(group_index < 0)
+    if (group_index < 0)
         return current;
 
     QPair<int, int> pos = cat->positionOf(current);
     int column = pos.first;
     int row = pos.second;
-    if(m_currentCursorColumn < 0)
-    {
+    if (m_currentCursorColumn < 0) {
         m_currentCursorColumn = column;
     }
-    switch(cursorAction)
-    {
-        case MoveUp:
-        {
-            if(row == 0)
-            {
-                int prevgroupindex = group_index-1;
-                while(prevgroupindex >= 0)
-                {
-                    auto prevgroup = m_groups[prevgroupindex];
-                    if(prevgroup->collapsed)
-                    {
-                        prevgroupindex--;
+    switch (cursorAction) {
+        case MoveUp: {
+            if (row == 0) {
+                int prevGroupIndex = group_index - 1;
+                while (prevGroupIndex >= 0) {
+                    auto prevGroup = m_groups[prevGroupIndex];
+                    if (prevGroup->collapsed) {
+                        prevGroupIndex--;
                         continue;
                     }
-                    int newRow = prevgroup->numRows() - 1;
-                    int newRowSize = prevgroup->rows[newRow].size();
+                    int newRow = prevGroup->numRows() - 1;
+                    int newRowSize = prevGroup->rows[newRow].size();
                     int newColumn = m_currentCursorColumn;
-                    if (m_currentCursorColumn >= newRowSize)
-                    {
+                    if (m_currentCursorColumn >= newRowSize) {
                         newColumn = newRowSize - 1;
                     }
-                    return prevgroup->rows[newRow][newColumn];
+                    return prevGroup->rows[newRow][newColumn];
                 }
-            }
-            else
-            {
+            } else {
                 int newRow = row - 1;
                 int newRowSize = cat->rows[newRow].size();
                 int newColumn = m_currentCursorColumn;
-                if (m_currentCursorColumn >= newRowSize)
-                {
+                if (m_currentCursorColumn >= newRowSize) {
                     newColumn = newRowSize - 1;
                 }
                 return cat->rows[newRow][newColumn];
             }
             return current;
         }
-        case MoveDown:
-        {
-            if(row == cat->rows.size() - 1)
-            {
-                int nextgroupindex = group_index+1;
-                while (nextgroupindex < m_groups.size())
-                {
-                    auto nextgroup = m_groups[nextgroupindex];
-                    if(nextgroup->collapsed)
-                    {
-                        nextgroupindex++;
+        case MoveDown: {
+            if (row == cat->rows.size() - 1) {
+                int nextGroupIndex = group_index + 1;
+                while (nextGroupIndex < m_groups.size()) {
+                    auto nextGroup = m_groups[nextGroupIndex];
+                    if (nextGroup->collapsed) {
+                        nextGroupIndex++;
                         continue;
                     }
-                    int newRowSize = nextgroup->rows[0].size();
+                    int newRowSize = nextGroup->rows[0].size();
                     int newColumn = m_currentCursorColumn;
-                    if (m_currentCursorColumn >= newRowSize)
-                    {
+                    if (m_currentCursorColumn >= newRowSize) {
                         newColumn = newRowSize - 1;
                     }
-                    return nextgroup->rows[0][newColumn];
+                    return nextGroup->rows[0][newColumn];
                 }
-            }
-            else
-            {
+            } else {
                 int newRow = row + 1;
                 int newRowSize = cat->rows[newRow].size();
                 int newColumn = m_currentCursorColumn;
-                if (m_currentCursorColumn >= newRowSize)
-                {
+                if (m_currentCursorColumn >= newRowSize) {
                     newColumn = newRowSize - 1;
                 }
                 return cat->rows[newRow][newColumn];
             }
             return current;
         }
-        case MoveLeft:
-        {
-            if(column > 0)
-            {
+        case MoveLeft: {
+            if (column > 0) {
                 m_currentCursorColumn = column - 1;
                 return cat->rows[row][column - 1];
             }
             // TODO: moving to previous line
             return current;
         }
-        case MoveRight:
-        {
-            if(column < cat->rows[row].size() - 1)
-            {
+        case MoveRight: {
+            if (column < cat->rows[row].size() - 1) {
                 m_currentCursorColumn = column + 1;
                 return cat->rows[row][column + 1];
             }
             // TODO: moving to next line
             return current;
         }
-        case MoveHome:
-        {
+        case MoveHome: {
             m_currentCursorColumn = 0;
             return cat->rows[row][0];
         }
-        case MoveEnd:
-        {
+        case MoveEnd: {
             auto last = cat->rows[row].size() - 1;
             m_currentCursorColumn = last;
             return cat->rows[row][last];
@@ -1039,14 +924,13 @@ void InstanceView::scrollContentsBy(int dx, int dy)
     viewport()->scroll(dx, dy);
 }
 
-void InstanceView::scrollTo(const QModelIndex &index, ScrollHint hint)
+void InstanceView::scrollTo(const QModelIndex& index, ScrollHint hint)
 {
     if (!index.isValid())
         return;
 
     const QRect rect = visualRect(index);
-    if (hint == EnsureVisible && viewport()->rect().contains(rect))
-    {
+    if (hint == EnsureVisible && viewport()->rect().contains(rect)) {
         viewport()->update(rect);
         return;
     }
@@ -1054,7 +938,7 @@ void InstanceView::scrollTo(const QModelIndex &index, ScrollHint hint)
     verticalScrollBar()->setValue(verticalScrollToValue(index, rect, hint));
 }
 
-int InstanceView::verticalScrollToValue(const QModelIndex &index, const QRect &rect, QListView::ScrollHint hint) const
+int InstanceView::verticalScrollToValue([[maybe_unused]] const QModelIndex& index, const QRect& rect, QListView::ScrollHint hint) const
 {
     const QRect area = viewport()->rect();
     const bool above = (hint == QListView::EnsureVisible && rect.top() < area.top());
diff --git a/launcher/ui/instanceview/InstanceView.h b/launcher/ui/instanceview/InstanceView.h
index 36405675..3d4d5620 100644
--- a/launcher/ui/instanceview/InstanceView.h
+++ b/launcher/ui/instanceview/InstanceView.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,95 +35,86 @@
 
 #pragma once
 
-#include <QListView>
+#include <QCache>
 #include <QLineEdit>
+#include <QListView>
 #include <QScrollBar>
-#include <QCache>
-#include "VisualGroup.h"
 #include <functional>
+#include "VisualGroup.h"
 
-struct InstanceViewRoles
-{
-    enum
-    {
-        GroupRole = Qt::UserRole,
-        ProgressValueRole,
-        ProgressMaximumRole
-    };
+struct InstanceViewRoles {
+    enum { GroupRole = Qt::UserRole, ProgressValueRole, ProgressMaximumRole };
 };
 
-class InstanceView : public QAbstractItemView
-{
+class InstanceView : public QAbstractItemView {
     Q_OBJECT
 
-public:
-    InstanceView(QWidget *parent = 0);
+   public:
+    InstanceView(QWidget* parent = 0);
     ~InstanceView();
 
-    void setModel(QAbstractItemModel *model) override;
+    void setModel(QAbstractItemModel* model) override;
 
-    using visibilityFunction = std::function<bool(const QString &)>;
-    void setSourceOfGroupCollapseStatus(visibilityFunction f) {
-        fVisibility = f;
-    }
+    using visibilityFunction = std::function<bool(const QString&)>;
+    void setSourceOfGroupCollapseStatus(visibilityFunction f) { fVisibility = f; }
 
     /// return geometry rectangle occupied by the specified model item
-    QRect geometryRect(const QModelIndex &index) const;
+    QRect geometryRect(const QModelIndex& index) const;
     /// return visual rectangle occupied by the specified model item
-    virtual QRect visualRect(const QModelIndex &index) const override;
+    virtual QRect visualRect(const QModelIndex& index) const override;
     /// get the model index at the specified visual point
-    virtual QModelIndex indexAt(const QPoint &point) const override;
-    QString groupNameAt(const QPoint &point);
-    void setSelection(const QRect &rect, const QItemSelectionModel::SelectionFlags commands) override;
+    virtual QModelIndex indexAt(const QPoint& point) const override;
+    QString groupNameAt(const QPoint& point);
+    void setSelection(const QRect& rect, const QItemSelectionModel::SelectionFlags commands) override;
 
     virtual int horizontalOffset() const override;
     virtual int verticalOffset() const override;
     virtual void scrollContentsBy(int dx, int dy) override;
-    virtual void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override;
+    virtual void scrollTo(const QModelIndex& index, ScrollHint hint = EnsureVisible) override;
 
     virtual QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override;
 
-    virtual QRegion visualRegionForSelection(const QItemSelection &selection) const override;
+    virtual QRegion visualRegionForSelection(const QItemSelection& selection) const override;
 
     int spacing() const { return m_spacing; };
     void setPaintCat(bool visible);
 
-public slots:
+   public slots:
     virtual void updateGeometries() override;
 
-protected slots:
-    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) override;
-    virtual void rowsInserted(const QModelIndex &parent, int start, int end) override;
-    virtual void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override;
+   protected slots:
+    virtual void dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles) override;
+    virtual void rowsInserted(const QModelIndex& parent, int start, int end) override;
+    virtual void rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end) override;
     void modelReset();
     void rowsRemoved();
-    void currentChanged(const QModelIndex &current, const QModelIndex &previous) override;
+    void currentChanged(const QModelIndex& current, const QModelIndex& previous) override;
 
-signals:
+   signals:
     void droppedURLs(QList<QUrl> urls);
     void groupStateChanged(QString group, bool collapsed);
 
-protected:
-    bool isIndexHidden(const QModelIndex &index) const override;
-    void mousePressEvent(QMouseEvent *event) override;
-    void mouseMoveEvent(QMouseEvent *event) override;
-    void mouseReleaseEvent(QMouseEvent *event) override;
-    void mouseDoubleClickEvent(QMouseEvent *event) override;
-    void paintEvent(QPaintEvent *event) override;
-    void resizeEvent(QResizeEvent *event) override;
+   protected:
+    bool isIndexHidden(const QModelIndex& index) const override;
+    void mousePressEvent(QMouseEvent* event) override;
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
+    void mouseDoubleClickEvent(QMouseEvent* event) override;
+    void paintEvent(QPaintEvent* event) override;
+    void resizeEvent(QResizeEvent* event) override;
 
-    void dragEnterEvent(QDragEnterEvent *event) override;
-    void dragMoveEvent(QDragMoveEvent *event) override;
-    void dragLeaveEvent(QDragLeaveEvent *event) override;
-    void dropEvent(QDropEvent *event) override;
+    void dragEnterEvent(QDragEnterEvent* event) override;
+    void dragMoveEvent(QDragMoveEvent* event) override;
+    void dragLeaveEvent(QDragLeaveEvent* event) override;
+    void dropEvent(QDropEvent* event) override;
 
     void startDrag(Qt::DropActions supportedActions) override;
 
     void updateScrollbar();
 
-private:
+   private:
     friend struct VisualGroup;
-    QList<VisualGroup *> m_groups;
+    QList<VisualGroup*> m_groups;
 
     visibilityFunction fVisibility;
 
@@ -135,7 +126,7 @@ private:
     int m_spacing = 5;
     int m_itemWidth = 100;
     int m_currentItemsPerRow = -1;
-    int m_currentCursorColumn= -1;
+    int m_currentCursorColumn = -1;
     mutable QCache<int, QRect> geometryCache;
     bool m_catVisible = false;
     QPixmap m_catPixmap;
@@ -144,30 +135,27 @@ private:
     QPoint m_pressedPosition;
     QPersistentModelIndex m_pressedIndex;
     bool m_pressedAlreadySelected;
-    VisualGroup *m_pressedCategory;
+    VisualGroup* m_pressedCategory;
     QItemSelectionModel::SelectionFlag m_ctrlDragSelectionFlag;
     QPoint m_lastDragPosition;
 
-    VisualGroup *category(const QModelIndex &index) const;
-    VisualGroup *category(const QString &cat) const;
-    VisualGroup *categoryAt(const QPoint &pos, VisualGroup::HitResults & result) const;
+    VisualGroup* category(const QModelIndex& index) const;
+    VisualGroup* category(const QString& cat) const;
+    VisualGroup* categoryAt(const QPoint& pos, VisualGroup::HitResults& result) const;
 
-    int itemsPerRow() const
-    {
-        return m_currentItemsPerRow;
-    };
+    int itemsPerRow() const { return m_currentItemsPerRow; };
     int contentWidth() const;
 
-private: /* methods */
+   private: /* methods */
     int itemWidth() const;
     int calculateItemsPerRow() const;
-    int verticalScrollToValue(const QModelIndex &index, const QRect &rect, QListView::ScrollHint hint) const;
-    QPixmap renderToPixmap(const QModelIndexList &indices, QRect *r) const;
-    QList<std::pair<QRect, QModelIndex>> draggablePaintPairs(const QModelIndexList &indices, QRect *r) const;
+    int verticalScrollToValue(const QModelIndex& index, const QRect& rect, QListView::ScrollHint hint) const;
+    QPixmap renderToPixmap(const QModelIndexList& indices, QRect* r) const;
+    QList<std::pair<QRect, QModelIndex>> draggablePaintPairs(const QModelIndexList& indices, QRect* r) const;
 
-    bool isDragEventAccepted(QDropEvent *event);
+    bool isDragEventAccepted(QDropEvent* event);
 
-    std::pair<VisualGroup *, VisualGroup::HitResults> rowDropPos(const QPoint &pos);
+    std::pair<VisualGroup*, VisualGroup::HitResults> rowDropPos(const QPoint& pos);
 
     QPoint offset() const;
 };
diff --git a/launcher/ui/instanceview/VisualGroup.h b/launcher/ui/instanceview/VisualGroup.h
index 697298c2..8c6f06bc 100644
--- a/launcher/ui/instanceview/VisualGroup.h
+++ b/launcher/ui/instanceview/VisualGroup.h
@@ -35,56 +35,48 @@
 
 #pragma once
 
-#include <QString>
 #include <QRect>
-#include <QVector>
+#include <QString>
 #include <QStyleOption>
+#include <QVector>
 
 class InstanceView;
 class QPainter;
 class QModelIndex;
 
-struct VisualRow
-{
+struct VisualRow {
     QList<QModelIndex> items;
     int height = 0;
     int top = 0;
-    inline int size() const
-    {
-        return items.size();
-    }
-    inline QModelIndex &operator[](int i)
-    {
-        return items[i];
-    }
+    inline int size() const { return items.size(); }
+    inline QModelIndex& operator[](int i) { return items[i]; }
 };
 
-struct VisualGroup
-{
-/* constructors */
-    VisualGroup(QString text, InstanceView *view);
-    explicit VisualGroup(const VisualGroup *other);
+struct VisualGroup {
+    /* constructors */
+    VisualGroup(QString text, InstanceView* view);
+    explicit VisualGroup(const VisualGroup* other);
 
-/* data */
-    InstanceView *view = nullptr;
+    /* data */
+    InstanceView* view = nullptr;
     QString text;
     bool collapsed = false;
     QVector<VisualRow> rows;
     int firstItemIndex = 0;
     int m_verticalPosition = 0;
 
-/* logic */
+    /* logic */
     /// update the internal list of items and flow them into the rows.
     void update();
 
     /// draw the header at y-position.
-    void drawHeader(QPainter *painter, const QStyleOptionViewItem &option) const;
+    void drawHeader(QPainter* painter, const QStyleOptionViewItem& option) const;
 
     /// height of the group, in total. includes a small bit of padding.
     int totalHeight() const;
 
     /// height of the group header, in pixels
-    static int headerHeight() ;
+    static int headerHeight();
 
     /// height of the group content, in pixels
     int contentHeight() const;
@@ -99,26 +91,19 @@ struct VisualGroup
     int verticalPosition() const;
 
     /// relative geometry - top of the row of the given item
-    int rowTopOf(const QModelIndex &index) const;
+    int rowTopOf(const QModelIndex& index) const;
 
     /// height of the row of the given item
-    int rowHeightOf(const QModelIndex &index) const;
+    int rowHeightOf(const QModelIndex& index) const;
 
     /// x/y position of the given item inside the group (in items!)
-    QPair<int, int> positionOf(const QModelIndex &index) const;
-
-    enum HitResult
-    {
-        NoHit = 0x0,
-        TextHit = 0x1,
-        CheckboxHit = 0x2,
-        HeaderHit = 0x4,
-        BodyHit = 0x8
-    };
+    QPair<int, int> positionOf(const QModelIndex& index) const;
+
+    enum HitResult { NoHit = 0x0, TextHit = 0x1, CheckboxHit = 0x2, HeaderHit = 0x4, BodyHit = 0x8 };
     Q_DECLARE_FLAGS(HitResults, HitResult)
 
     /// shoot! BANG! what did we hit?
-    HitResults hitScan (const QPoint &pos) const;
+    HitResults hitScan(const QPoint& pos) const;
 
     QList<QModelIndex> items() const;
 };
diff --git a/launcher/ui/pagedialog/PageDialog.cpp b/launcher/ui/pagedialog/PageDialog.cpp
index 18d61dc2..6514217c 100644
--- a/launcher/ui/pagedialog/PageDialog.cpp
+++ b/launcher/ui/pagedialog/PageDialog.cpp
@@ -16,9 +16,9 @@
 #include "PageDialog.h"
 
 #include <QDialogButtonBox>
+#include <QKeyEvent>
 #include <QPushButton>
 #include <QVBoxLayout>
-#include <QKeyEvent>
 
 #include "Application.h"
 #include "settings/SettingsObject.h"
@@ -26,19 +26,18 @@
 #include "ui/widgets/IconLabel.h"
 #include "ui/widgets/PageContainer.h"
 
-PageDialog::PageDialog(BasePageProvider *pageProvider, QString defaultId, QWidget *parent)
-    : QDialog(parent)
+PageDialog::PageDialog(BasePageProvider* pageProvider, QString defaultId, QWidget* parent) : QDialog(parent)
 {
     setWindowTitle(pageProvider->dialogTitle());
     m_container = new PageContainer(pageProvider, defaultId, this);
 
-    QVBoxLayout *mainLayout = new QVBoxLayout;
+    QVBoxLayout* mainLayout = new QVBoxLayout;
     mainLayout->addWidget(m_container);
     mainLayout->setSpacing(0);
     mainLayout->setContentsMargins(0, 0, 0, 0);
     setLayout(mainLayout);
 
-    QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Help | QDialogButtonBox::Close);
+    QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Help | QDialogButtonBox::Close);
     buttons->button(QDialogButtonBox::Close)->setDefault(true);
     buttons->setContentsMargins(6, 0, 6, 0);
     m_container->addButtons(buttons);
@@ -49,11 +48,10 @@ PageDialog::PageDialog(BasePageProvider *pageProvider, QString defaultId, QWidge
     restoreGeometry(QByteArray::fromBase64(APPLICATION->settings()->get("PagedGeometry").toByteArray()));
 }
 
-void PageDialog::closeEvent(QCloseEvent *event)
+void PageDialog::closeEvent(QCloseEvent* event)
 {
     qDebug() << "Paged dialog close requested";
-    if (m_container->prepareToClose())
-    {
+    if (m_container->prepareToClose()) {
         qDebug() << "Paged dialog close approved";
         APPLICATION->settings()->set("PagedGeometry", saveGeometry().toBase64());
         qDebug() << "Paged dialog geometry saved";
diff --git a/launcher/ui/pagedialog/PageDialog.h b/launcher/ui/pagedialog/PageDialog.h
index 00d8b725..aa50bc5e 100644
--- a/launcher/ui/pagedialog/PageDialog.h
+++ b/launcher/ui/pagedialog/PageDialog.h
@@ -19,17 +19,15 @@
 #include "ui/pages/BasePageProvider.h"
 
 class PageContainer;
-class PageDialog : public QDialog
-{
+class PageDialog : public QDialog {
     Q_OBJECT
-public:
-    explicit PageDialog(BasePageProvider *pageProvider, QString defaultId = QString(), QWidget *parent = 0);
+   public:
+    explicit PageDialog(BasePageProvider* pageProvider, QString defaultId = QString(), QWidget* parent = 0);
     virtual ~PageDialog() {}
 
-private
-slots:
-    virtual void closeEvent(QCloseEvent *event);
+   private slots:
+    virtual void closeEvent(QCloseEvent* event);
 
-private:
-    PageContainer * m_container;
+   private:
+    PageContainer* m_container;
 };
diff --git a/launcher/ui/pages/BasePage.h b/launcher/ui/pages/BasePage.h
index dc2bde99..d35206a0 100644
--- a/launcher/ui/pages/BasePage.h
+++ b/launcher/ui/pages/BasePage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/launcher/ui/pages/BasePageContainer.h b/launcher/ui/pages/BasePageContainer.h
index eb3c9427..a497ef7b 100644
--- a/launcher/ui/pages/BasePageContainer.h
+++ b/launcher/ui/pages/BasePageContainer.h
@@ -2,9 +2,8 @@
 
 class BasePage;
 
-class BasePageContainer
-{
-public:
+class BasePageContainer {
+   public:
     virtual ~BasePageContainer(){};
     virtual bool selectPage(QString pageId) = 0;
     virtual BasePage* selectedPage() const = 0;
diff --git a/launcher/ui/pages/BasePageProvider.h b/launcher/ui/pages/BasePageProvider.h
index 873e8dce..4c3ecd6c 100644
--- a/launcher/ui/pages/BasePageProvider.h
+++ b/launcher/ui/pages/BasePageProvider.h
@@ -15,54 +15,43 @@
 
 #pragma once
 
-#include "ui/pages/BasePage.h"
-#include <memory>
 #include <functional>
+#include <memory>
+#include "ui/pages/BasePage.h"
 
-class BasePageProvider
-{
-public:
-    virtual QList<BasePage *> getPages() = 0;
+class BasePageProvider {
+   public:
+    virtual QList<BasePage*> getPages() = 0;
     virtual QString dialogTitle() = 0;
 };
 
-class GenericPageProvider : public BasePageProvider
-{
-    typedef std::function<BasePage *()> PageCreator;
-public:
-    explicit GenericPageProvider(const QString &dialogTitle)
-        : m_dialogTitle(dialogTitle)
-    {
-    }
+class GenericPageProvider : public BasePageProvider {
+    typedef std::function<BasePage*()> PageCreator;
+
+   public:
+    explicit GenericPageProvider(const QString& dialogTitle) : m_dialogTitle(dialogTitle) {}
     virtual ~GenericPageProvider() {}
 
-    QList<BasePage *> getPages() override
+    QList<BasePage*> getPages() override
     {
-        QList<BasePage *> pages;
-        for (PageCreator creator : m_creators)
-        {
+        QList<BasePage*> pages;
+        for (PageCreator creator : m_creators) {
             pages.append(creator());
         }
         return pages;
     }
     QString dialogTitle() override { return m_dialogTitle; }
 
-    void setDialogTitle(const QString &title)
-    {
-        m_dialogTitle = title;
-    }
-    void addPageCreator(PageCreator page)
-    {
-        m_creators.append(page);
-    }
+    void setDialogTitle(const QString& title) { m_dialogTitle = title; }
+    void addPageCreator(PageCreator page) { m_creators.append(page); }
 
-    template<typename PageClass>
+    template <typename PageClass>
     void addPage()
     {
-        addPageCreator([](){return new PageClass();});
+        addPageCreator([]() { return new PageClass(); });
     }
 
-private:
+   private:
     QList<PageCreator> m_creators;
     QString m_dialogTitle;
 };
diff --git a/launcher/ui/pages/global/APIPage.cpp b/launcher/ui/pages/global/APIPage.cpp
index 668aa007..82aa76a4 100644
--- a/launcher/ui/pages/global/APIPage.cpp
+++ b/launcher/ui/pages/global/APIPage.cpp
@@ -39,37 +39,30 @@
 #include "APIPage.h"
 #include "ui_APIPage.h"
 
-#include <QMessageBox>
 #include <QFileDialog>
+#include <QMessageBox>
 #include <QRegularExpression>
 #include <QStandardPaths>
 #include <QTabBar>
 #include <QValidator>
 #include <QVariant>
 
-#include "settings/SettingsObject.h"
-#include "tools/BaseProfiler.h"
 #include "Application.h"
-#include "net/PasteUpload.h"
 #include "BuildConfig.h"
+#include "net/PasteUpload.h"
+#include "settings/SettingsObject.h"
+#include "tools/BaseProfiler.h"
 
-APIPage::APIPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::APIPage)
+APIPage::APIPage(QWidget* parent) : QWidget(parent), ui(new Ui::APIPage)
 {
     // This is here so you can reorder the entries in the combobox without messing stuff up
-    int comboBoxEntries[] = {
-        PasteUpload::PasteType::Mclogs,
-        PasteUpload::PasteType::NullPointer,
-        PasteUpload::PasteType::PasteGG,
-        PasteUpload::PasteType::Hastebin
-    };
+    int comboBoxEntries[] = { PasteUpload::PasteType::Mclogs, PasteUpload::PasteType::NullPointer, PasteUpload::PasteType::PasteGG,
+                              PasteUpload::PasteType::Hastebin };
 
     static QRegularExpression validUrlRegExp("https?://.+");
-    static QRegularExpression validMSAClientID(QRegularExpression::anchoredPattern(
-                "[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"));
-    static QRegularExpression validFlameKey(QRegularExpression::anchoredPattern(
-                "\\$2[ayb]\\$.{56}"));
+    static QRegularExpression validMSAClientID(
+        QRegularExpression::anchoredPattern("[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"));
+    static QRegularExpression validFlameKey(QRegularExpression::anchoredPattern("\\$2[ayb]\\$.{56}"));
 
     ui->setupUi(this);
 
@@ -77,7 +70,7 @@ APIPage::APIPage(QWidget *parent) :
         ui->pasteTypeComboBox->addItem(PasteUpload::PasteTypes.at(pasteType).name, pasteType);
     }
 
-    void (QComboBox::*currentIndexChangedSignal)(int) (&QComboBox::currentIndexChanged);
+    void (QComboBox::*currentIndexChangedSignal)(int)(&QComboBox::currentIndexChanged);
     connect(ui->pasteTypeComboBox, currentIndexChangedSignal, this, &APIPage::updateBaseURLPlaceholder);
     // This function needs to be called even when the ComboBox's index is still in its default state.
     updateBaseURLPlaceholder(ui->pasteTypeComboBox->currentIndex());
@@ -110,12 +103,9 @@ void APIPage::resetBaseURLNote()
 
 void APIPage::updateBaseURLNote(int index)
 {
-    if (baseURLPasteType == index)
-    {
+    if (baseURLPasteType == index) {
         ui->baseURLNote->hide();
-    }
-    else if (!ui->baseURLEntry->text().isEmpty())
-    {
+    } else if (!ui->baseURLEntry->text().isEmpty()) {
         ui->baseURLNote->show();
     }
 }
@@ -136,8 +126,7 @@ void APIPage::loadSettings()
 
     ui->baseURLEntry->setText(pastebinURL);
     int pasteTypeIndex = ui->pasteTypeComboBox->findData(pasteType);
-    if (pasteTypeIndex == -1)
-    {
+    if (pasteTypeIndex == -1) {
         pasteTypeIndex = ui->pasteTypeComboBox->findData(PasteUpload::PasteType::Mclogs);
         ui->baseURLEntry->clear();
     }
@@ -167,15 +156,13 @@ void APIPage::applySettings()
     s->set("MSAClientIDOverride", msaClientID);
     QUrl metaURL(ui->metaURL->text());
     // Add required trailing slash
-    if (!metaURL.isEmpty() && !metaURL.path().endsWith('/'))
-    {
+    if (!metaURL.isEmpty() && !metaURL.path().endsWith('/')) {
         QString path = metaURL.path();
         path.append('/');
         metaURL.setPath(path);
     }
     // Don't allow HTTP, since meta is basically RCE with all the jar files.
-    if(!metaURL.isEmpty() && metaURL.scheme() == "http")
-    {
+    if (!metaURL.isEmpty() && metaURL.scheme() == "http") {
         metaURL.setScheme("https");
     }
 
diff --git a/launcher/ui/pages/global/APIPage.h b/launcher/ui/pages/global/APIPage.h
index 17e62ae7..d4ed9290 100644
--- a/launcher/ui/pages/global/APIPage.h
+++ b/launcher/ui/pages/global/APIPage.h
@@ -1,6 +1,6 @@
 // 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 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (c) 2022 Lenny McLennington <lenny@sneed.church>
@@ -39,41 +39,28 @@
 
 #include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
+#include "ui/pages/BasePage.h"
 
 namespace Ui {
 class APIPage;
 }
 
-class APIPage : public QWidget, public BasePage
-{
+class APIPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit APIPage(QWidget *parent = 0);
+   public:
+    explicit APIPage(QWidget* parent = 0);
     ~APIPage();
 
-    QString displayName() const override
-    {
-        return tr("APIs");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("worlds");
-    }
-    QString id() const override
-    {
-        return "apis";
-    }
-    QString helpPage() const override
-    {
-        return "APIs";
-    }
+    QString displayName() const override { return tr("APIs"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("worlds"); }
+    QString id() const override { return "apis"; }
+    QString helpPage() const override { return "APIs"; }
     virtual bool apply() override;
     void retranslate() override;
 
-private:
+   private:
     int baseURLPasteType;
     void resetBaseURLNote();
     void updateBaseURLNote(int index);
@@ -81,7 +68,6 @@ private:
     void loadSettings();
     void applySettings();
 
-private:
-    Ui::APIPage *ui;
+   private:
+    Ui::APIPage* ui;
 };
-
diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index fced5ff4..5c6fb092 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -1,6 +1,6 @@
 // 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 Jamie Mansfield <jmansfield@cadixdev.org>
  *
@@ -44,29 +44,27 @@
 
 #include "net/NetJob.h"
 
-#include "ui/dialogs/ProgressDialog.h"
-#include "ui/dialogs/OfflineLoginDialog.h"
+#include "ui/dialogs/CustomMessageBox.h"
 #include "ui/dialogs/LoginDialog.h"
 #include "ui/dialogs/MSALoginDialog.h"
-#include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/OfflineLoginDialog.h"
+#include "ui/dialogs/ProgressDialog.h"
 #include "ui/dialogs/SkinUploadDialog.h"
 
-#include "tasks/Task.h"
 #include "minecraft/auth/AccountTask.h"
 #include "minecraft/services/SkinDelete.h"
+#include "tasks/Task.h"
 
 #include "Application.h"
 
 #include "BuildConfig.h"
 
-AccountListPage::AccountListPage(QWidget *parent)
-    : QMainWindow(parent), ui(new Ui::AccountListPage)
+AccountListPage::AccountListPage(QWidget* parent) : QMainWindow(parent), ui(new Ui::AccountListPage)
 {
     ui->setupUi(this);
-    ui->listView->setEmptyString(tr(
-        "Welcome!\n"
-        "If you're new here, you can click the \"Add\" button to add your Mojang or Minecraft account."
-    ));
+    ui->listView->setEmptyString(
+        tr("Welcome!\n"
+           "If you're new here, you can click the \"Add\" button to add your Mojang or Minecraft account."));
     ui->listView->setEmptyMode(VersionListView::String);
     ui->listView->setContextMenuPolicy(Qt::CustomContextMenu);
 
@@ -82,11 +80,10 @@ AccountListPage::AccountListPage(QWidget *parent)
 
     // Expand the account column
 
-    QItemSelectionModel *selectionModel = ui->listView->selectionModel();
+    QItemSelectionModel* selectionModel = ui->listView->selectionModel();
 
-    connect(selectionModel, &QItemSelectionModel::selectionChanged, [this](const QItemSelection &sel, const QItemSelection &dsel) {
-        updateButtonStates();
-    });
+    connect(selectionModel, &QItemSelectionModel::selectionChanged,
+            [this]([[maybe_unused]] const QItemSelection& sel, [[maybe_unused]] const QItemSelection& dsel) { updateButtonStates(); });
     connect(ui->listView, &VersionListView::customContextMenuRequested, this, &AccountListPage::ShowContextMenu);
 
     connect(m_accounts.get(), &AccountList::listChanged, this, &AccountListPage::listChanged);
@@ -121,21 +118,19 @@ void AccountListPage::ShowContextMenu(const QPoint& pos)
 
 void AccountListPage::changeEvent(QEvent* event)
 {
-    if (event->type() == QEvent::LanguageChange)
-    {
+    if (event->type() == QEvent::LanguageChange) {
         ui->retranslateUi(this);
     }
     QMainWindow::changeEvent(event);
 }
 
-QMenu * AccountListPage::createPopupMenu()
+QMenu* AccountListPage::createPopupMenu()
 {
     QMenu* filteredMenu = QMainWindow::createPopupMenu();
-    filteredMenu->removeAction(ui->toolBar->toggleViewAction() );
+    filteredMenu->removeAction(ui->toolBar->toggleViewAction());
     return filteredMenu;
 }
 
-
 void AccountListPage::listChanged()
 {
     updateButtonStates();
@@ -143,13 +138,10 @@ void AccountListPage::listChanged()
 
 void AccountListPage::on_actionAddMojang_triggered()
 {
-    MinecraftAccountPtr account = LoginDialog::newAccount(
-        this,
-        tr("Please enter your Mojang account email and password to add your account.")
-    );
+    MinecraftAccountPtr account =
+        LoginDialog::newAccount(this, tr("Please enter your Mojang account email and password to add your account."));
 
-    if (account)
-    {
+    if (account) {
         m_accounts->addAccount(account);
         if (m_accounts->count() == 1) {
             m_accounts->setDefaultAccount(account);
@@ -159,13 +151,10 @@ void AccountListPage::on_actionAddMojang_triggered()
 
 void AccountListPage::on_actionAddMicrosoft_triggered()
 {
-    MinecraftAccountPtr account = MSALoginDialog::newAccount(
-        this,
-        tr("Please enter your Mojang account email and password to add your account.")
-    );
+    MinecraftAccountPtr account =
+        MSALoginDialog::newAccount(this, tr("Please enter your Mojang account email and password to add your account."));
 
-    if (account)
-    {
+    if (account) {
         m_accounts->addAccount(account);
         if (m_accounts->count() == 1) {
             m_accounts->setDefaultAccount(account);
@@ -176,25 +165,17 @@ void AccountListPage::on_actionAddMicrosoft_triggered()
 void AccountListPage::on_actionAddOffline_triggered()
 {
     if (!m_accounts->anyAccountIsValid()) {
-        QMessageBox::warning(
-            this,
-            tr("Error"),
-            tr(
-                "You must add a Microsoft or Mojang account that owns Minecraft before you can add an offline account."
-                "<br><br>"
-                "If you have lost your account you can contact Microsoft for support."
-            )
-        );
+        QMessageBox::warning(this, tr("Error"),
+                             tr("You must add a Microsoft or Mojang account that owns Minecraft before you can add an offline account."
+                                "<br><br>"
+                                "If you have lost your account you can contact Microsoft for support."));
         return;
     }
 
-    MinecraftAccountPtr account = OfflineLoginDialog::newAccount(
-        this,
-        tr("Please enter your desired username to add your offline account.")
-    );
+    MinecraftAccountPtr account =
+        OfflineLoginDialog::newAccount(this, tr("Please enter your desired username to add your offline account."));
 
-    if (account)
-    {
+    if (account) {
         m_accounts->addAccount(account);
         if (m_accounts->count() == 1) {
             m_accounts->setDefaultAccount(account);
@@ -205,14 +186,14 @@ void AccountListPage::on_actionAddOffline_triggered()
 void AccountListPage::on_actionRemove_triggered()
 {
     QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-    if (selection.size() > 0)
-    {
+    if (selection.size() > 0) {
         QModelIndex selected = selection.first();
         m_accounts->removeAccount(selected);
     }
 }
 
-void AccountListPage::on_actionRefresh_triggered() {
+void AccountListPage::on_actionRefresh_triggered()
+{
     QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
     if (selection.size() > 0) {
         QModelIndex selected = selection.first();
@@ -221,12 +202,10 @@ void AccountListPage::on_actionRefresh_triggered() {
     }
 }
 
-
 void AccountListPage::on_actionSetDefault_triggered()
 {
     QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-    if (selection.size() > 0)
-    {
+    if (selection.size() > 0) {
         QModelIndex selected = selection.first();
         MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
         m_accounts->setDefaultAccount(account);
@@ -245,8 +224,7 @@ void AccountListPage::updateButtonStates()
     bool hasSelection = !selection.empty();
     bool accountIsReady = false;
     bool accountIsOnline = false;
-    if (hasSelection)
-    {
+    if (hasSelection) {
         QModelIndex selected = selection.first();
         MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
         accountIsReady = !account->isActive();
@@ -258,11 +236,10 @@ void AccountListPage::updateButtonStates()
     ui->actionDeleteSkin->setEnabled(accountIsReady && accountIsOnline);
     ui->actionRefresh->setEnabled(accountIsReady && accountIsOnline);
 
-    if(m_accounts->defaultAccount().get() == nullptr) {
+    if (m_accounts->defaultAccount().get() == nullptr) {
         ui->actionNoDefault->setEnabled(false);
         ui->actionNoDefault->setChecked(true);
-    }
-    else {
+    } else {
         ui->actionNoDefault->setEnabled(true);
         ui->actionNoDefault->setChecked(false);
     }
@@ -271,8 +248,7 @@ void AccountListPage::updateButtonStates()
 void AccountListPage::on_actionUploadSkin_triggered()
 {
     QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-    if (selection.size() > 0)
-    {
+    if (selection.size() > 0) {
         QModelIndex selected = selection.first();
         MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
         SkinUploadDialog dialog(account, this);
diff --git a/launcher/ui/pages/global/AccountListPage.h b/launcher/ui/pages/global/AccountListPage.h
index 9395e92b..add0f4aa 100644
--- a/launcher/ui/pages/global/AccountListPage.h
+++ b/launcher/ui/pages/global/AccountListPage.h
@@ -1,6 +1,6 @@
 // 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 Jamie Mansfield <jmansfield@cadixdev.org>
  *
@@ -41,47 +41,35 @@
 
 #include "ui/pages/BasePage.h"
 
-#include "minecraft/auth/AccountList.h"
 #include "Application.h"
+#include "minecraft/auth/AccountList.h"
 
-namespace Ui
-{
+namespace Ui {
 class AccountListPage;
 }
 
 class AuthenticateTask;
 
-class AccountListPage : public QMainWindow, public BasePage
-{
+class AccountListPage : public QMainWindow, public BasePage {
     Q_OBJECT
-public:
-    explicit AccountListPage(QWidget *parent = 0);
+   public:
+    explicit AccountListPage(QWidget* parent = 0);
     ~AccountListPage();
 
-    QString displayName() const override
-    {
-        return tr("Accounts");
-    }
+    QString displayName() const override { return tr("Accounts"); }
     QIcon icon() const override
     {
         auto icon = APPLICATION->getThemedIcon("accounts");
-        if(icon.isNull())
-        {
+        if (icon.isNull()) {
             icon = APPLICATION->getThemedIcon("noaccount");
         }
         return icon;
     }
-    QString id() const override
-    {
-        return "accounts";
-    }
-    QString helpPage() const override
-    {
-        return "Getting-Started#adding-an-account";
-    }
+    QString id() const override { return "accounts"; }
+    QString helpPage() const override { return "Getting-Started#adding-an-account"; }
     void retranslate() override;
 
-public slots:
+   public slots:
     void on_actionAddMojang_triggered();
     void on_actionAddMicrosoft_triggered();
     void on_actionAddOffline_triggered();
@@ -97,12 +85,12 @@ public slots:
     //! Updates the states of the dialog's buttons.
     void updateButtonStates();
 
-protected slots:
-    void ShowContextMenu(const QPoint &pos);
+   protected slots:
+    void ShowContextMenu(const QPoint& pos);
 
-private:
-    void changeEvent(QEvent * event) override;
-    QMenu * createPopupMenu() override;
+   private:
+    void changeEvent(QEvent* event) override;
+    QMenu* createPopupMenu() override;
     shared_qobject_ptr<AccountList> m_accounts;
-    Ui::AccountListPage *ui;
+    Ui::AccountListPage* ui;
 };
diff --git a/launcher/ui/pages/global/CustomCommandsPage.cpp b/launcher/ui/pages/global/CustomCommandsPage.cpp
index df1420ca..cc8518c2 100644
--- a/launcher/ui/pages/global/CustomCommandsPage.cpp
+++ b/launcher/ui/pages/global/CustomCommandsPage.cpp
@@ -1,6 +1,6 @@
 // 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>
  *
@@ -35,13 +35,12 @@
  */
 
 #include "CustomCommandsPage.h"
-#include <QVBoxLayout>
-#include <QTabWidget>
 #include <QTabBar>
+#include <QTabWidget>
+#include <QVBoxLayout>
 
-CustomCommandsPage::CustomCommandsPage(QWidget* parent): QWidget(parent)
+CustomCommandsPage::CustomCommandsPage(QWidget* parent) : QWidget(parent)
 {
-
     auto verticalLayout = new QVBoxLayout(this);
     verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
     verticalLayout->setContentsMargins(0, 0, 0, 0);
@@ -56,9 +55,7 @@ CustomCommandsPage::CustomCommandsPage(QWidget* parent): QWidget(parent)
     loadSettings();
 }
 
-CustomCommandsPage::~CustomCommandsPage()
-{
-}
+CustomCommandsPage::~CustomCommandsPage() {}
 
 bool CustomCommandsPage::apply()
 {
@@ -77,13 +74,8 @@ void CustomCommandsPage::applySettings()
 void CustomCommandsPage::loadSettings()
 {
     auto s = APPLICATION->settings();
-    commands->initialize(
-        false,
-        true,
-        s->get("PreLaunchCommand").toString(),
-        s->get("WrapperCommand").toString(),
-        s->get("PostExitCommand").toString()
-    );
+    commands->initialize(false, true, s->get("PreLaunchCommand").toString(), s->get("WrapperCommand").toString(),
+                         s->get("PostExitCommand").toString());
 }
 
 void CustomCommandsPage::retranslate()
diff --git a/launcher/ui/pages/global/CustomCommandsPage.h b/launcher/ui/pages/global/CustomCommandsPage.h
index 865503ff..ec1204ff 100644
--- a/launcher/ui/pages/global/CustomCommandsPage.h
+++ b/launcher/ui/pages/global/CustomCommandsPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,42 +35,29 @@
 
 #pragma once
 
-#include <memory>
 #include <QDialog>
+#include <memory>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
+#include "ui/pages/BasePage.h"
 #include "ui/widgets/CustomCommands.h"
 
-class CustomCommandsPage : public QWidget, public BasePage
-{
+class CustomCommandsPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit CustomCommandsPage(QWidget *parent = 0);
+   public:
+    explicit CustomCommandsPage(QWidget* parent = 0);
     ~CustomCommandsPage();
 
-    QString displayName() const override
-    {
-        return tr("Custom Commands");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("custom-commands");
-    }
-    QString id() const override
-    {
-        return "custom-commands";
-    }
-    QString helpPage() const override
-    {
-        return "Custom-commands";
-    }
+    QString displayName() const override { return tr("Custom Commands"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("custom-commands"); }
+    QString id() const override { return "custom-commands"; }
+    QString helpPage() const override { return "Custom-commands"; }
     bool apply() override;
     void retranslate() override;
 
-private:
+   private:
     void applySettings();
     void loadSettings();
-    CustomCommands * commands;
+    CustomCommands* commands;
 };
diff --git a/launcher/ui/pages/global/ExternalToolsPage.cpp b/launcher/ui/pages/global/ExternalToolsPage.cpp
index 5ba0ebc2..33e9c538 100644
--- a/launcher/ui/pages/global/ExternalToolsPage.cpp
+++ b/launcher/ui/pages/global/ExternalToolsPage.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -36,20 +36,18 @@
 #include "ExternalToolsPage.h"
 #include "ui_ExternalToolsPage.h"
 
-#include <QMessageBox>
 #include <QFileDialog>
+#include <QMessageBox>
 #include <QStandardPaths>
 #include <QTabBar>
 
-#include "settings/SettingsObject.h"
-#include "tools/BaseProfiler.h"
 #include <FileSystem.h>
-#include "Application.h"
 #include <tools/MCEditTool.h>
+#include "Application.h"
+#include "settings/SettingsObject.h"
+#include "tools/BaseProfiler.h"
 
-ExternalToolsPage::ExternalToolsPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::ExternalToolsPage)
+ExternalToolsPage::ExternalToolsPage(QWidget* parent) : QWidget(parent), ui(new Ui::ExternalToolsPage)
 {
     ui->setupUi(this);
     ui->tabWidget->tabBar()->hide();
@@ -87,12 +85,9 @@ void ExternalToolsPage::applySettings()
 
     // Editors
     QString jsonEditor = ui->jsonEditorTextBox->text();
-    if (!jsonEditor.isEmpty() &&
-        (!QFileInfo(jsonEditor).exists() || !QFileInfo(jsonEditor).isExecutable()))
-    {
+    if (!jsonEditor.isEmpty() && (!QFileInfo(jsonEditor).exists() || !QFileInfo(jsonEditor).isExecutable())) {
         QString found = QStandardPaths::findExecutable(jsonEditor);
-        if (!found.isEmpty())
-        {
+        if (!found.isEmpty()) {
             jsonEditor = found;
         }
     }
@@ -103,21 +98,16 @@ void ExternalToolsPage::on_jprofilerPathBtn_clicked()
 {
     QString raw_dir = ui->jprofilerPathEdit->text();
     QString error;
-    do
-    {
+    do {
         raw_dir = QFileDialog::getExistingDirectory(this, tr("JProfiler Folder"), raw_dir);
-        if (raw_dir.isEmpty())
-        {
+        if (raw_dir.isEmpty()) {
             break;
         }
         QString cooked_dir = FS::NormalizePath(raw_dir);
-        if (!APPLICATION->profilers()["jprofiler"]->check(cooked_dir, &error))
-        {
+        if (!APPLICATION->profilers()["jprofiler"]->check(cooked_dir, &error)) {
             QMessageBox::critical(this, tr("Error"), tr("Error while checking JProfiler install:\n%1").arg(error));
             continue;
-        }
-        else
-        {
+        } else {
             ui->jprofilerPathEdit->setText(cooked_dir);
             break;
         }
@@ -126,12 +116,9 @@ void ExternalToolsPage::on_jprofilerPathBtn_clicked()
 void ExternalToolsPage::on_jprofilerCheckBtn_clicked()
 {
     QString error;
-    if (!APPLICATION->profilers()["jprofiler"]->check(ui->jprofilerPathEdit->text(), &error))
-    {
+    if (!APPLICATION->profilers()["jprofiler"]->check(ui->jprofilerPathEdit->text(), &error)) {
         QMessageBox::critical(this, tr("Error"), tr("Error while checking JProfiler install:\n%1").arg(error));
-    }
-    else
-    {
+    } else {
         QMessageBox::information(this, tr("OK"), tr("JProfiler setup seems to be OK"));
     }
 }
@@ -140,21 +127,16 @@ void ExternalToolsPage::on_jvisualvmPathBtn_clicked()
 {
     QString raw_dir = ui->jvisualvmPathEdit->text();
     QString error;
-    do
-    {
+    do {
         raw_dir = QFileDialog::getOpenFileName(this, tr("JVisualVM Executable"), raw_dir);
-        if (raw_dir.isEmpty())
-        {
+        if (raw_dir.isEmpty()) {
             break;
         }
         QString cooked_dir = FS::NormalizePath(raw_dir);
-        if (!APPLICATION->profilers()["jvisualvm"]->check(cooked_dir, &error))
-        {
+        if (!APPLICATION->profilers()["jvisualvm"]->check(cooked_dir, &error)) {
             QMessageBox::critical(this, tr("Error"), tr("Error while checking JVisualVM install:\n%1").arg(error));
             continue;
-        }
-        else
-        {
+        } else {
             ui->jvisualvmPathEdit->setText(cooked_dir);
             break;
         }
@@ -163,12 +145,9 @@ void ExternalToolsPage::on_jvisualvmPathBtn_clicked()
 void ExternalToolsPage::on_jvisualvmCheckBtn_clicked()
 {
     QString error;
-    if (!APPLICATION->profilers()["jvisualvm"]->check(ui->jvisualvmPathEdit->text(), &error))
-    {
+    if (!APPLICATION->profilers()["jvisualvm"]->check(ui->jvisualvmPathEdit->text(), &error)) {
         QMessageBox::critical(this, tr("Error"), tr("Error while checking JVisualVM install:\n%1").arg(error));
-    }
-    else
-    {
+    } else {
         QMessageBox::information(this, tr("OK"), tr("JVisualVM setup seems to be OK"));
     }
 }
@@ -177,25 +156,20 @@ void ExternalToolsPage::on_mceditPathBtn_clicked()
 {
     QString raw_dir = ui->mceditPathEdit->text();
     QString error;
-    do
-    {
+    do {
 #ifdef Q_OS_OSX
         raw_dir = QFileDialog::getOpenFileName(this, tr("MCEdit Application"), raw_dir);
 #else
         raw_dir = QFileDialog::getExistingDirectory(this, tr("MCEdit Folder"), raw_dir);
 #endif
-        if (raw_dir.isEmpty())
-        {
+        if (raw_dir.isEmpty()) {
             break;
         }
         QString cooked_dir = FS::NormalizePath(raw_dir);
-        if (!APPLICATION->mcedit()->check(cooked_dir, error))
-        {
+        if (!APPLICATION->mcedit()->check(cooked_dir, error)) {
             QMessageBox::critical(this, tr("Error"), tr("Error while checking MCEdit install:\n%1").arg(error));
             continue;
-        }
-        else
-        {
+        } else {
             ui->mceditPathEdit->setText(cooked_dir);
             break;
         }
@@ -204,43 +178,34 @@ void ExternalToolsPage::on_mceditPathBtn_clicked()
 void ExternalToolsPage::on_mceditCheckBtn_clicked()
 {
     QString error;
-    if (!APPLICATION->mcedit()->check(ui->mceditPathEdit->text(), error))
-    {
+    if (!APPLICATION->mcedit()->check(ui->mceditPathEdit->text(), error)) {
         QMessageBox::critical(this, tr("Error"), tr("Error while checking MCEdit install:\n%1").arg(error));
-    }
-    else
-    {
+    } else {
         QMessageBox::information(this, tr("OK"), tr("MCEdit setup seems to be OK"));
     }
 }
 
 void ExternalToolsPage::on_jsonEditorBrowseBtn_clicked()
 {
-    QString raw_file = QFileDialog::getOpenFileName(
-        this, tr("JSON Editor"),
-        ui->jsonEditorTextBox->text().isEmpty()
+    QString raw_file = QFileDialog::getOpenFileName(this, tr("JSON Editor"),
+                                                    ui->jsonEditorTextBox->text().isEmpty()
 #if defined(Q_OS_LINUX)
-                ? QString("/usr/bin")
+                                                        ? QString("/usr/bin")
 #else
-            ? QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).first()
+                                                        ? QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).first()
 #endif
-            : ui->jsonEditorTextBox->text());
+                                                        : ui->jsonEditorTextBox->text());
 
-    if (raw_file.isEmpty())
-    {
+    if (raw_file.isEmpty()) {
         return;
     }
     QString cooked_file = FS::NormalizePath(raw_file);
 
     // it has to exist and be an executable
-    if (QFileInfo(cooked_file).exists() && QFileInfo(cooked_file).isExecutable())
-    {
+    if (QFileInfo(cooked_file).exists() && QFileInfo(cooked_file).isExecutable()) {
         ui->jsonEditorTextBox->setText(cooked_file);
-    }
-    else
-    {
-        QMessageBox::warning(this, tr("Invalid"),
-                             tr("The file chosen does not seem to be an executable"));
+    } else {
+        QMessageBox::warning(this, tr("Invalid"), tr("The file chosen does not seem to be an executable"));
     }
 }
 
diff --git a/launcher/ui/pages/global/ExternalToolsPage.h b/launcher/ui/pages/global/ExternalToolsPage.h
index 8bd38a19..7248f0c9 100644
--- a/launcher/ui/pages/global/ExternalToolsPage.h
+++ b/launcher/ui/pages/global/ExternalToolsPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,54 +37,42 @@
 
 #include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
+#include "ui/pages/BasePage.h"
 
 namespace Ui {
 class ExternalToolsPage;
 }
 
-class ExternalToolsPage : public QWidget, public BasePage
-{
+class ExternalToolsPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit ExternalToolsPage(QWidget *parent = 0);
+   public:
+    explicit ExternalToolsPage(QWidget* parent = 0);
     ~ExternalToolsPage();
 
-    QString displayName() const override
-    {
-        return tr("External Tools");
-    }
+    QString displayName() const override { return tr("External Tools"); }
     QIcon icon() const override
     {
         auto icon = APPLICATION->getThemedIcon("externaltools");
-        if(icon.isNull())
-        {
+        if (icon.isNull()) {
             icon = APPLICATION->getThemedIcon("loadermods");
         }
         return icon;
     }
-    QString id() const override
-    {
-        return "external-tools";
-    }
-    QString helpPage() const override
-    {
-        return "Tools";
-    }
+    QString id() const override { return "external-tools"; }
+    QString helpPage() const override { return "Tools"; }
     virtual bool apply() override;
     void retranslate() override;
 
-private:
+   private:
     void loadSettings();
     void applySettings();
 
-private:
-    Ui::ExternalToolsPage *ui;
+   private:
+    Ui::ExternalToolsPage* ui;
 
-private
-slots:
+   private slots:
     void on_jprofilerPathBtn_clicked();
     void on_jprofilerCheckBtn_clicked();
     void on_jvisualvmPathBtn_clicked();
diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index 81dd4cc1..45d8f018 100644
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@@ -1,6 +1,6 @@
 // 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>
  *
@@ -38,22 +38,22 @@
 #include "JavaCommon.h"
 #include "ui_JavaPage.h"
 
+#include <QDir>
 #include <QFileDialog>
 #include <QMessageBox>
-#include <QDir>
 #include <QTabBar>
 
 #include "ui/dialogs/VersionSelectDialog.h"
 
-#include "java/JavaUtils.h"
 #include "java/JavaInstallList.h"
+#include "java/JavaUtils.h"
 
-#include "settings/SettingsObject.h"
 #include <FileSystem.h>
-#include "Application.h"
 #include <sys.h>
+#include "Application.h"
+#include "settings/SettingsObject.h"
 
-JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
+JavaPage::JavaPage(QWidget* parent) : QWidget(parent), ui(new Ui::JavaPage)
 {
     ui->setupUi(this);
     ui->tabWidget->tabBar()->hide();
@@ -80,13 +80,10 @@ void JavaPage::applySettings()
     // Memory
     int min = ui->minMemSpinBox->value();
     int max = ui->maxMemSpinBox->value();
-    if(min < max)
-    {
+    if (min < max) {
         s->set("MinMemAlloc", min);
         s->set("MaxMemAlloc", max);
-    }
-    else
-    {
+    } else {
         s->set("MinMemAlloc", max);
         s->set("MaxMemAlloc", min);
     }
@@ -105,13 +102,10 @@ void JavaPage::loadSettings()
     // Memory
     int min = s->get("MinMemAlloc").toInt();
     int max = s->get("MaxMemAlloc").toInt();
-    if(min < max)
-    {
+    if (min < max) {
         ui->minMemSpinBox->setValue(min);
         ui->maxMemSpinBox->setValue(max);
-    }
-    else
-    {
+    } else {
         ui->minMemSpinBox->setValue(max);
         ui->maxMemSpinBox->setValue(min);
     }
@@ -137,8 +131,7 @@ void JavaPage::on_javaDetectBtn_clicked()
     vselect.setResizeOn(2);
     vselect.exec();
 
-    if (vselect.result() == QDialog::Accepted && vselect.selectedVersion())
-    {
+    if (vselect.result() == QDialog::Accepted && vselect.selectedVersion()) {
         java = std::dynamic_pointer_cast<JavaInstall>(vselect.selectedVersion());
         ui->javaPathTextBox->setText(java->path);
     }
@@ -149,15 +142,14 @@ void JavaPage::on_javaBrowseBtn_clicked()
     QString raw_path = QFileDialog::getOpenFileName(this, tr("Find Java executable"));
 
     // do not allow current dir - it's dirty. Do not allow dirs that don't exist
-    if(raw_path.isEmpty())
-    {
+    if (raw_path.isEmpty()) {
         return;
     }
 
     QString cooked_path = FS::NormalizePath(raw_path);
-    QFileInfo javaInfo(cooked_path);;
-    if(!javaInfo.exists() || !javaInfo.isExecutable())
-    {
+    QFileInfo javaInfo(cooked_path);
+    ;
+    if (!javaInfo.exists() || !javaInfo.isExecutable()) {
         return;
     }
     ui->javaPathTextBox->setText(cooked_path);
@@ -165,18 +157,16 @@ void JavaPage::on_javaBrowseBtn_clicked()
 
 void JavaPage::on_javaTestBtn_clicked()
 {
-    if(checker)
-    {
+    if (checker) {
         return;
     }
-    checker.reset(new JavaCommon::TestCheck(
-        this, ui->javaPathTextBox->text(), ui->jvmArgsTextBox->toPlainText().replace("\n", " "),
-        ui->minMemSpinBox->value(), ui->maxMemSpinBox->value(), ui->permGenSpinBox->value()));
+    checker.reset(new JavaCommon::TestCheck(this, ui->javaPathTextBox->text(), ui->jvmArgsTextBox->toPlainText().replace("\n", " "),
+                                            ui->minMemSpinBox->value(), ui->maxMemSpinBox->value(), ui->permGenSpinBox->value()));
     connect(checker.get(), SIGNAL(finished()), SLOT(checkerFinished()));
     checker->run();
 }
 
-void JavaPage::on_maxMemSpinBox_valueChanged(int i)
+void JavaPage::on_maxMemSpinBox_valueChanged([[maybe_unused]] int i)
 {
     updateThresholds();
 }
diff --git a/launcher/ui/pages/global/JavaPage.h b/launcher/ui/pages/global/JavaPage.h
index 2ef6d749..1a1bd96e 100644
--- a/launcher/ui/pages/global/JavaPage.h
+++ b/launcher/ui/pages/global/JavaPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,62 +35,47 @@
 
 #pragma once
 
-#include <memory>
-#include <QDialog>
-#include "ui/pages/BasePage.h"
-#include "JavaCommon.h"
 #include <Application.h>
 #include <QObjectPtr.h>
+#include <QDialog>
+#include <memory>
+#include "JavaCommon.h"
+#include "ui/pages/BasePage.h"
 
 class SettingsObject;
 
-namespace Ui
-{
+namespace Ui {
 class JavaPage;
 }
 
-class JavaPage : public QWidget, public BasePage
-{
+class JavaPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit JavaPage(QWidget *parent = 0);
+   public:
+    explicit JavaPage(QWidget* parent = 0);
     ~JavaPage();
 
-    QString displayName() const override
-    {
-        return tr("Java");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("java");
-    }
-    QString id() const override
-    {
-        return "java-settings";
-    }
-    QString helpPage() const override
-    {
-        return "Java-settings";
-    }
+    QString displayName() const override { return tr("Java"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("java"); }
+    QString id() const override { return "java-settings"; }
+    QString helpPage() const override { return "Java-settings"; }
     bool apply() override;
     void retranslate() override;
 
     void updateThresholds();
 
-private:
+   private:
     void applySettings();
     void loadSettings();
 
-private
-slots:
+   private slots:
     void on_javaDetectBtn_clicked();
     void on_javaTestBtn_clicked();
     void on_javaBrowseBtn_clicked();
     void on_maxMemSpinBox_valueChanged(int i);
     void checkerFinished();
 
-private:
-    Ui::JavaPage *ui;
+   private:
+    Ui::JavaPage* ui;
     unique_qobject_ptr<JavaCommon::TestCheck> checker;
 };
diff --git a/launcher/ui/pages/global/LanguagePage.cpp b/launcher/ui/pages/global/LanguagePage.cpp
index fcd174bd..af6fc172 100644
--- a/launcher/ui/pages/global/LanguagePage.cpp
+++ b/launcher/ui/pages/global/LanguagePage.cpp
@@ -1,6 +1,6 @@
 // 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>
  *
@@ -36,23 +36,20 @@
 
 #include "LanguagePage.h"
 
-#include "ui/widgets/LanguageSelectionWidget.h"
 #include <QVBoxLayout>
+#include "ui/widgets/LanguageSelectionWidget.h"
 
-LanguagePage::LanguagePage(QWidget* parent) :
-    QWidget(parent)
+LanguagePage::LanguagePage(QWidget* parent) : QWidget(parent)
 {
     setObjectName(QStringLiteral("languagePage"));
     auto layout = new QVBoxLayout(this);
     mainWidget = new LanguageSelectionWidget(this);
-    layout->setContentsMargins(0,0,0,0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(mainWidget);
     retranslate();
 }
 
-LanguagePage::~LanguagePage()
-{
-}
+LanguagePage::~LanguagePage() {}
 
 bool LanguagePage::apply()
 {
diff --git a/launcher/ui/pages/global/LanguagePage.h b/launcher/ui/pages/global/LanguagePage.h
index 2fd4ab0d..ff7ce7dd 100644
--- a/launcher/ui/pages/global/LanguagePage.h
+++ b/launcher/ui/pages/global/LanguagePage.h
@@ -1,6 +1,6 @@
 // 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>
  *
@@ -36,45 +36,32 @@
 
 #pragma once
 
-#include <memory>
-#include "ui/pages/BasePage.h"
 #include <Application.h>
 #include <QWidget>
+#include <memory>
+#include "ui/pages/BasePage.h"
 
 class LanguageSelectionWidget;
 
-class LanguagePage : public QWidget, public BasePage
-{
+class LanguagePage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit LanguagePage(QWidget *parent = 0);
+   public:
+    explicit LanguagePage(QWidget* parent = 0);
     virtual ~LanguagePage();
 
-    QString displayName() const override
-    {
-        return tr("Language");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("language");
-    }
-    QString id() const override
-    {
-        return "language-settings";
-    }
-    QString helpPage() const override
-    {
-        return "Language-settings";
-    }
+    QString displayName() const override { return tr("Language"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("language"); }
+    QString id() const override { return "language-settings"; }
+    QString helpPage() const override { return "Language-settings"; }
     bool apply() override;
 
     void retranslate() override;
 
-private:
+   private:
     void applySettings();
     void loadSettings();
 
-private:
-    LanguageSelectionWidget *mainWidget;
+   private:
+    LanguageSelectionWidget* mainWidget;
 };
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 2080b56f..7f22fdb5 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -38,17 +38,17 @@
 #include "LauncherPage.h"
 #include "ui_LauncherPage.h"
 
+#include <QDir>
 #include <QFileDialog>
+#include <QMenuBar>
 #include <QMessageBox>
-#include <QDir>
 #include <QTextCharFormat>
-#include <QMenuBar>
 
-#include "settings/SettingsObject.h"
 #include <FileSystem.h>
 #include "Application.h"
 #include "BuildConfig.h"
 #include "DesktopServices.h"
+#include "settings/SettingsObject.h"
 #include "ui/themes/ITheme.h"
 #include "updater/ExternalUpdater.h"
 
@@ -56,15 +56,14 @@
 #include <QProcess>
 
 // FIXME: possibly move elsewhere
-enum InstSortMode
-{
+enum InstSortMode {
     // Sort alphabetically by name.
     Sort_Name,
     // Sort by which instance was launched most recently.
     Sort_LastLaunch
 };
 
-LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::LauncherPage)
+LauncherPage::LauncherPage(QWidget* parent) : QWidget(parent), ui(new Ui::LauncherPage)
 {
     ui->setupUi(this);
     auto origForeground = ui->fontPreview->palette().color(ui->fontPreview->foregroundRole());
@@ -104,46 +103,39 @@ void LauncherPage::on_instDirBrowseBtn_clicked()
     QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Instance Folder"), ui->instDirTextBox->text());
 
     // do not allow current dir - it's dirty. Do not allow dirs that don't exist
-    if (!raw_dir.isEmpty() && QDir(raw_dir).exists())
-    {
+    if (!raw_dir.isEmpty() && QDir(raw_dir).exists()) {
         QString cooked_dir = FS::NormalizePath(raw_dir);
-        if (FS::checkProblemticPathJava(QDir(cooked_dir)))
-        {
+        if (FS::checkProblemticPathJava(QDir(cooked_dir))) {
             QMessageBox warning;
-            warning.setText(tr("You're trying to specify an instance folder which\'s path "
-                               "contains at least one \'!\'. "
-                               "Java is known to cause problems if that is the case, your "
-                               "instances (probably) won't start!"));
+            warning.setText(
+                tr("You're trying to specify an instance folder which\'s path "
+                   "contains at least one \'!\'. "
+                   "Java is known to cause problems if that is the case, your "
+                   "instances (probably) won't start!"));
             warning.setInformativeText(
                 tr("Do you really want to use this path? "
                    "Selecting \"No\" will close this and not alter your instance path."));
             warning.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
             int result = warning.exec();
-            if (result == QMessageBox::Ok)
-            {
+            if (result == QMessageBox::Ok) {
                 ui->instDirTextBox->setText(cooked_dir);
             }
-        }
-        else if(DesktopServices::isFlatpak() && raw_dir.startsWith("/run/user"))
-        {
+        } else if (DesktopServices::isFlatpak() && raw_dir.startsWith("/run/user")) {
             QMessageBox warning;
             warning.setText(tr("You're trying to specify an instance folder "
-                            "which was granted temporarily via Flatpak.\n"
-                            "This is known to cause problems. "
-                            "After a restart the launcher might break, "
-                            "because it will no longer have access to that directory.\n\n"
-                            "Granting %1 access to it via Flatseal is recommended.").arg(BuildConfig.LAUNCHER_DISPLAYNAME));
-            warning.setInformativeText(
-             tr("Do you want to proceed anyway?"));
+                               "which was granted temporarily via Flatpak.\n"
+                               "This is known to cause problems. "
+                               "After a restart the launcher might break, "
+                               "because it will no longer have access to that directory.\n\n"
+                               "Granting %1 access to it via Flatseal is recommended.")
+                                .arg(BuildConfig.LAUNCHER_DISPLAYNAME));
+            warning.setInformativeText(tr("Do you want to proceed anyway?"));
             warning.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
             int result = warning.exec();
-            if (result == QMessageBox::Ok)
-            {
+            if (result == QMessageBox::Ok) {
                 ui->instDirTextBox->setText(cooked_dir);
             }
-        }
-        else
-        {
+        } else {
             ui->instDirTextBox->setText(cooked_dir);
         }
     }
@@ -154,8 +146,7 @@ void LauncherPage::on_iconsDirBrowseBtn_clicked()
     QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Icons Folder"), ui->iconsDirTextBox->text());
 
     // do not allow current dir - it's dirty. Do not allow dirs that don't exist
-    if (!raw_dir.isEmpty() && QDir(raw_dir).exists())
-    {
+    if (!raw_dir.isEmpty() && QDir(raw_dir).exists()) {
         QString cooked_dir = FS::NormalizePath(raw_dir);
         ui->iconsDirTextBox->setText(cooked_dir);
     }
@@ -166,8 +157,7 @@ void LauncherPage::on_modsDirBrowseBtn_clicked()
     QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Mods Folder"), ui->modsDirTextBox->text());
 
     // do not allow current dir - it's dirty. Do not allow dirs that don't exist
-    if (!raw_dir.isEmpty() && QDir(raw_dir).exists())
-    {
+    if (!raw_dir.isEmpty() && QDir(raw_dir).exists()) {
         QString cooked_dir = FS::NormalizePath(raw_dir);
         ui->modsDirTextBox->setText(cooked_dir);
     }
@@ -177,8 +167,7 @@ void LauncherPage::on_downloadsDirBrowseBtn_clicked()
 {
     QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Downloads Folder"), ui->downloadsDirTextBox->text());
 
-    if (!raw_dir.isEmpty() && QDir(raw_dir).exists())
-    {
+    if (!raw_dir.isEmpty() && QDir(raw_dir).exists()) {
         QString cooked_dir = FS::NormalizePath(raw_dir);
         ui->downloadsDirTextBox->setText(cooked_dir);
     }
@@ -194,8 +183,7 @@ void LauncherPage::applySettings()
     auto s = APPLICATION->settings();
 
     // Updates
-    if (APPLICATION->updater())
-    {
+    if (APPLICATION->updater()) {
         APPLICATION->updater()->setAutomaticallyChecksForUpdates(ui->autoUpdateCheckBox->isChecked());
     }
 
@@ -220,15 +208,14 @@ void LauncherPage::applySettings()
     s->set("DownloadsDirWatchRecursive", ui->downloadsDirWatchRecursiveCheckBox->isChecked());
 
     auto sortMode = (InstSortMode)ui->sortingModeGroup->checkedId();
-    switch (sortMode)
-    {
-    case Sort_LastLaunch:
-        s->set("InstSortMode", "LastLaunch");
-        break;
-    case Sort_Name:
-    default:
-        s->set("InstSortMode", "Name");
-        break;
+    switch (sortMode) {
+        case Sort_LastLaunch:
+            s->set("InstSortMode", "LastLaunch");
+            break;
+        case Sort_Name:
+        default:
+            s->set("InstSortMode", "Name");
+            break;
     }
 
     // Mods
@@ -238,12 +225,10 @@ void LauncherPage::loadSettings()
 {
     auto s = APPLICATION->settings();
     // Updates
-    if (APPLICATION->updater())
-    {
+    if (APPLICATION->updater()) {
         ui->autoUpdateCheckBox->setChecked(APPLICATION->updater()->getAutomaticallyChecksForUpdates());
     }
 
-
     // Toolbar/menu bar settings (not applicable if native menu bar is present)
     ui->toolsBox->setEnabled(!QMenuBar().isNativeMenuBar());
 #ifdef Q_OS_MACOS
@@ -261,8 +246,7 @@ void LauncherPage::loadSettings()
 
     bool conversionOk = true;
     int fontSize = APPLICATION->settings()->get("ConsoleFontSize").toInt(&conversionOk);
-    if(!conversionOk)
-    {
+    if (!conversionOk) {
         fontSize = 11;
     }
     ui->fontSizeBox->setValue(fontSize);
@@ -279,12 +263,9 @@ void LauncherPage::loadSettings()
 
     QString sortMode = s->get("InstSortMode").toString();
 
-    if (sortMode == "LastLaunch")
-    {
+    if (sortMode == "LastLaunch") {
         ui->sortLastLaunchedBtn->setChecked(true);
-    }
-    else
-    {
+    } else {
         ui->sortByNameBtn->setChecked(true);
     }
 
diff --git a/launcher/ui/pages/global/LauncherPage.h b/launcher/ui/pages/global/LauncherPage.h
index e06d9897..e733224d 100644
--- a/launcher/ui/pages/global/LauncherPage.h
+++ b/launcher/ui/pages/global/LauncherPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,56 +35,41 @@
 
 #pragma once
 
-#include <memory>
 #include <QDialog>
+#include <memory>
 
-#include "java/JavaChecker.h"
-#include "ui/pages/BasePage.h"
 #include <Application.h>
-#include "ui/ColorCache.h"
 #include <translations/TranslationsModel.h>
+#include "java/JavaChecker.h"
+#include "ui/ColorCache.h"
+#include "ui/pages/BasePage.h"
 
 class QTextCharFormat;
 class SettingsObject;
 
-namespace Ui
-{
+namespace Ui {
 class LauncherPage;
 }
 
-class LauncherPage : public QWidget, public BasePage
-{
+class LauncherPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit LauncherPage(QWidget *parent = 0);
+   public:
+    explicit LauncherPage(QWidget* parent = 0);
     ~LauncherPage();
 
-    QString displayName() const override
-    {
-        return tr("Launcher");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("launcher");
-    }
-    QString id() const override
-    {
-        return "launcher-settings";
-    }
-    QString helpPage() const override
-    {
-        return "Launcher-settings";
-    }
+    QString displayName() const override { return tr("Launcher"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("launcher"); }
+    QString id() const override { return "launcher-settings"; }
+    QString helpPage() const override { return "Launcher-settings"; }
     bool apply() override;
     void retranslate() override;
 
-private:
+   private:
     void applySettings();
     void loadSettings();
 
-private
-slots:
+   private slots:
     void on_instDirBrowseBtn_clicked();
     void on_modsDirBrowseBtn_clicked();
     void on_iconsDirBrowseBtn_clicked();
@@ -96,8 +81,8 @@ slots:
      */
     void refreshFontPreview();
 
-private:
-    Ui::LauncherPage *ui;
+   private:
+    Ui::LauncherPage* ui;
 
     /*!
      * Stores the currently selected update channel.
@@ -105,7 +90,7 @@ private:
     QString m_currentUpdateChannel;
 
     // default format for the font preview...
-    QTextCharFormat *defaultFormat;
+    QTextCharFormat* defaultFormat;
 
     std::unique_ptr<LogColorCache> m_colors;
 
diff --git a/launcher/ui/pages/global/MinecraftPage.cpp b/launcher/ui/pages/global/MinecraftPage.cpp
index 95482356..866a4121 100644
--- a/launcher/ui/pages/global/MinecraftPage.cpp
+++ b/launcher/ui/pages/global/MinecraftPage.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2023 seth <getchoo at tuta dot io>
  *
@@ -37,14 +37,14 @@
 #include "MinecraftPage.h"
 #include "ui_MinecraftPage.h"
 
-#include <QMessageBox>
 #include <QDir>
+#include <QMessageBox>
 #include <QTabBar>
 
-#include "settings/SettingsObject.h"
 #include "Application.h"
+#include "settings/SettingsObject.h"
 
-MinecraftPage::MinecraftPage(QWidget *parent) : QWidget(parent), ui(new Ui::MinecraftPage)
+MinecraftPage::MinecraftPage(QWidget* parent) : QWidget(parent), ui(new Ui::MinecraftPage)
 {
     ui->setupUi(this);
     loadSettings();
diff --git a/launcher/ui/pages/global/MinecraftPage.h b/launcher/ui/pages/global/MinecraftPage.h
index cf5f95eb..28c31b5d 100644
--- a/launcher/ui/pages/global/MinecraftPage.h
+++ b/launcher/ui/pages/global/MinecraftPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,57 +35,41 @@
 
 #pragma once
 
-#include <memory>
 #include <QDialog>
+#include <memory>
 
+#include <Application.h>
 #include "java/JavaChecker.h"
 #include "ui/pages/BasePage.h"
-#include <Application.h>
 
 class SettingsObject;
 
-namespace Ui
-{
+namespace Ui {
 class MinecraftPage;
 }
 
-class MinecraftPage : public QWidget, public BasePage
-{
+class MinecraftPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit MinecraftPage(QWidget *parent = 0);
+   public:
+    explicit MinecraftPage(QWidget* parent = 0);
     ~MinecraftPage();
 
-    QString displayName() const override
-    {
-        return tr("Minecraft");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("minecraft");
-    }
-    QString id() const override
-    {
-        return "minecraft-settings";
-    }
-    QString helpPage() const override
-    {
-        return "Minecraft-settings";
-    }
+    QString displayName() const override { return tr("Minecraft"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("minecraft"); }
+    QString id() const override { return "minecraft-settings"; }
+    QString helpPage() const override { return "Minecraft-settings"; }
     bool apply() override;
     void retranslate() override;
 
-private:
+   private:
     void updateCheckboxStuff();
     void applySettings();
     void loadSettings();
 
-private
-slots:
+   private slots:
     void on_maximizedCheckBox_clicked(bool checked);
 
-private:
-    Ui::MinecraftPage *ui;
-
+   private:
+    Ui::MinecraftPage* ui;
 };
diff --git a/launcher/ui/pages/global/ProxyPage.cpp b/launcher/ui/pages/global/ProxyPage.cpp
index ffff8456..9caffcb3 100644
--- a/launcher/ui/pages/global/ProxyPage.cpp
+++ b/launcher/ui/pages/global/ProxyPage.cpp
@@ -1,6 +1,6 @@
 // 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>
  *
@@ -40,18 +40,17 @@
 #include <QButtonGroup>
 #include <QTabBar>
 
-#include "settings/SettingsObject.h"
 #include "Application.h"
+#include "settings/SettingsObject.h"
 
-ProxyPage::ProxyPage(QWidget *parent) : QWidget(parent), ui(new Ui::ProxyPage)
+ProxyPage::ProxyPage(QWidget* parent) : QWidget(parent), ui(new Ui::ProxyPage)
 {
     ui->setupUi(this);
     ui->tabWidget->tabBar()->hide();
     loadSettings();
     updateCheckboxStuff();
 
-    connect(ui->proxyGroup, QOverload<QAbstractButton *>::of(&QButtonGroup::buttonClicked),
-            this, &ProxyPage::proxyGroupChanged);
+    connect(ui->proxyGroup, QOverload<QAbstractButton*>::of(&QButtonGroup::buttonClicked), this, &ProxyPage::proxyGroupChanged);
 }
 
 ProxyPage::~ProxyPage()
@@ -67,13 +66,12 @@ bool ProxyPage::apply()
 
 void ProxyPage::updateCheckboxStuff()
 {
-    bool enableEditing = ui->proxyHTTPBtn->isChecked()
-        || ui->proxySOCKS5Btn->isChecked();
+    bool enableEditing = ui->proxyHTTPBtn->isChecked() || ui->proxySOCKS5Btn->isChecked();
     ui->proxyAddrBox->setEnabled(enableEditing);
     ui->proxyAuthBox->setEnabled(enableEditing);
 }
 
-void ProxyPage::proxyGroupChanged(QAbstractButton *button)
+void ProxyPage::proxyGroupChanged([[maybe_unused]] QAbstractButton* button)
 {
     updateCheckboxStuff();
 }
@@ -99,13 +97,8 @@ void ProxyPage::applySettings()
     s->set("ProxyUser", ui->proxyUserEdit->text());
     s->set("ProxyPass", ui->proxyPassEdit->text());
 
-    APPLICATION->updateProxySettings(
-        proxyType,
-        ui->proxyAddrEdit->text(),
-        ui->proxyPortEdit->value(),
-        ui->proxyUserEdit->text(),
-        ui->proxyPassEdit->text()
-    );
+    APPLICATION->updateProxySettings(proxyType, ui->proxyAddrEdit->text(), ui->proxyPortEdit->value(), ui->proxyUserEdit->text(),
+                                     ui->proxyPassEdit->text());
 }
 void ProxyPage::loadSettings()
 {
diff --git a/launcher/ui/pages/global/ProxyPage.h b/launcher/ui/pages/global/ProxyPage.h
index 279a9029..26118f18 100644
--- a/launcher/ui/pages/global/ProxyPage.h
+++ b/launcher/ui/pages/global/ProxyPage.h
@@ -1,6 +1,6 @@
 // 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>
  *
@@ -36,53 +36,39 @@
 
 #pragma once
 
-#include <memory>
 #include <QAbstractButton>
 #include <QDialog>
+#include <memory>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class ProxyPage;
 }
 
-class ProxyPage : public QWidget, public BasePage
-{
+class ProxyPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit ProxyPage(QWidget *parent = 0);
+   public:
+    explicit ProxyPage(QWidget* parent = 0);
     ~ProxyPage();
 
-    QString displayName() const override
-    {
-        return tr("Proxy");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("proxy");
-    }
-    QString id() const override
-    {
-        return "proxy-settings";
-    }
-    QString helpPage() const override
-    {
-        return "Proxy-settings";
-    }
+    QString displayName() const override { return tr("Proxy"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("proxy"); }
+    QString id() const override { return "proxy-settings"; }
+    QString helpPage() const override { return "Proxy-settings"; }
     bool apply() override;
     void retranslate() override;
 
-private slots:
-    void proxyGroupChanged(QAbstractButton *button);
+   private slots:
+    void proxyGroupChanged(QAbstractButton* button);
 
-private:
+   private:
     void updateCheckboxStuff();
     void applySettings();
     void loadSettings();
 
-private:
-    Ui::ProxyPage *ui;
+   private:
+    Ui::ProxyPage* ui;
 };
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
index 12038f88..719db879 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.cpp
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
@@ -305,7 +305,7 @@ bool ExternalResourcesPage::current(const QModelIndex& current, const QModelInde
     return onSelectionChanged(current, previous);
 }
 
-bool ExternalResourcesPage::onSelectionChanged(const QModelIndex& current, const QModelIndex& previous)
+bool ExternalResourcesPage::onSelectionChanged(const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
 {
     auto sourceCurrent = m_filterModel->mapToSource(current);
     int row = sourceCurrent.row();
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.h b/launcher/ui/pages/instance/ExternalResourcesPage.h
index 97d922d8..d29be0fc 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.h
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.h
@@ -4,8 +4,8 @@
 #include <QSortFilterProxyModel>
 
 #include "Application.h"
-#include "settings/Setting.h"
 #include "minecraft/MinecraftInstance.h"
+#include "settings/Setting.h"
 #include "ui/pages/BasePage.h"
 
 class ResourceFolderModel;
@@ -52,7 +52,7 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
 
     virtual void addItem();
     void removeItem();
-    virtual void removeItems(const QItemSelection &selection);
+    virtual void removeItems(const QItemSelection& selection);
 
     virtual void enableItem();
     virtual void disableItem();
diff --git a/launcher/ui/pages/instance/GameOptionsPage.cpp b/launcher/ui/pages/instance/GameOptionsPage.cpp
index 63443166..8db392b1 100644
--- a/launcher/ui/pages/instance/GameOptionsPage.cpp
+++ b/launcher/ui/pages/instance/GameOptionsPage.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -34,23 +34,20 @@
  */
 
 #include "GameOptionsPage.h"
-#include "ui_GameOptionsPage.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/gameoptions/GameOptions.h"
+#include "ui_GameOptionsPage.h"
 
-GameOptionsPage::GameOptionsPage(MinecraftInstance * inst, QWidget* parent)
-    : QWidget(parent), ui(new Ui::GameOptionsPage)
+GameOptionsPage::GameOptionsPage(MinecraftInstance* inst, QWidget* parent) : QWidget(parent), ui(new Ui::GameOptionsPage)
 {
     ui->setupUi(this);
     ui->tabWidget->tabBar()->hide();
     m_model = inst->gameOptionsModel();
     ui->optionsView->setModel(m_model.get());
     auto head = ui->optionsView->header();
-    if(head->count())
-    {
+    if (head->count()) {
         head->setSectionResizeMode(0, QHeaderView::ResizeToContents);
-        for(int i = 1; i < head->count(); i++)
-        {
+        for (int i = 1; i < head->count(); i++) {
             head->setSectionResizeMode(i, QHeaderView::Stretch);
         }
     }
diff --git a/launcher/ui/pages/instance/GameOptionsPage.h b/launcher/ui/pages/instance/GameOptionsPage.h
index de8c421e..a132843e 100644
--- a/launcher/ui/pages/instance/GameOptionsPage.h
+++ b/launcher/ui/pages/instance/GameOptionsPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,50 +35,36 @@
 
 #pragma once
 
-#include <QWidget>
 #include <QString>
+#include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class GameOptionsPage;
 }
 
 class GameOptions;
 class MinecraftInstance;
 
-class GameOptionsPage : public QWidget, public BasePage
-{
+class GameOptionsPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit GameOptionsPage(MinecraftInstance *inst, QWidget *parent = 0);
+   public:
+    explicit GameOptionsPage(MinecraftInstance* inst, QWidget* parent = 0);
     virtual ~GameOptionsPage();
 
     void openedImpl() override;
     void closedImpl() override;
 
-    virtual QString displayName() const override
-    {
-        return tr("Game Options");
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("settings");
-    }
-    virtual QString id() const override
-    {
-        return "gameoptions";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Game-Options-management";
-    }
+    virtual QString displayName() const override { return tr("Game Options"); }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("settings"); }
+    virtual QString id() const override { return "gameoptions"; }
+    virtual QString helpPage() const override { return "Game-Options-management"; }
     void retranslate() override;
 
-private: // data
-    Ui::GameOptionsPage *ui = nullptr;
+   private:  // data
+    Ui::GameOptionsPage* ui = nullptr;
     std::shared_ptr<GameOptions> m_model;
 };
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index 25cc1a0d..f7be9168 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -1,6 +1,6 @@
 // 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) 2023 seth <getchoo at tuta dot io>
@@ -38,8 +38,8 @@
 #include "InstanceSettingsPage.h"
 #include "ui_InstanceSettingsPage.h"
 
-#include <QFileDialog>
 #include <QDialog>
+#include <QFileDialog>
 #include <QMessageBox>
 
 #include <sys.h>
@@ -47,15 +47,15 @@
 #include "ui/dialogs/VersionSelectDialog.h"
 #include "ui/widgets/CustomCommands.h"
 
-#include "JavaCommon.h"
 #include "Application.h"
+#include "JavaCommon.h"
 #include "minecraft/auth/AccountList.h"
 
 #include "FileSystem.h"
 #include "java/JavaInstallList.h"
 #include "java/JavaUtils.h"
 
-InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
+InstanceSettingsPage::InstanceSettingsPage(BaseInstance* inst, QWidget* parent)
     : QWidget(parent), ui(new Ui::InstanceSettingsPage), m_instance(inst)
 {
     m_settings = inst->settings();
@@ -78,7 +78,7 @@ InstanceSettingsPage::~InstanceSettingsPage()
 
 void InstanceSettingsPage::globalSettingsButtonClicked(bool)
 {
-    switch(ui->settingsTabs->currentIndex()) {
+    switch (ui->settingsTabs->currentIndex()) {
         case 0:
             APPLICATION->ShowGlobalSettings(this, "java-settings");
             return;
@@ -104,13 +104,10 @@ void InstanceSettingsPage::applySettings()
     // Miscellaneous
     bool miscellaneous = ui->miscellaneousSettingsBox->isChecked();
     m_settings->set("OverrideMiscellaneous", miscellaneous);
-    if (miscellaneous)
-    {
+    if (miscellaneous) {
         m_settings->set("CloseAfterLaunch", ui->closeAfterLaunchCheck->isChecked());
         m_settings->set("QuitAfterGameStop", ui->quitAfterGameStopCheck->isChecked());
-    }
-    else
-    {
+    } else {
         m_settings->reset("CloseAfterLaunch");
         m_settings->reset("QuitAfterGameStop");
     }
@@ -118,14 +115,11 @@ void InstanceSettingsPage::applySettings()
     // Console
     bool console = ui->consoleSettingsBox->isChecked();
     m_settings->set("OverrideConsole", console);
-    if (console)
-    {
+    if (console) {
         m_settings->set("ShowConsole", ui->showConsoleCheck->isChecked());
         m_settings->set("AutoCloseConsole", ui->autoCloseConsoleCheck->isChecked());
         m_settings->set("ShowConsoleOnError", ui->showConsoleErrorCheck->isChecked());
-    }
-    else
-    {
+    } else {
         m_settings->reset("ShowConsole");
         m_settings->reset("AutoCloseConsole");
         m_settings->reset("ShowConsoleOnError");
@@ -134,14 +128,11 @@ void InstanceSettingsPage::applySettings()
     // Window Size
     bool window = ui->windowSizeGroupBox->isChecked();
     m_settings->set("OverrideWindow", window);
-    if (window)
-    {
+    if (window) {
         m_settings->set("LaunchMaximized", ui->maximizedCheckBox->isChecked());
         m_settings->set("MinecraftWinWidth", ui->windowWidthSpinBox->value());
         m_settings->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
-    }
-    else
-    {
+    } else {
         m_settings->reset("LaunchMaximized");
         m_settings->reset("MinecraftWinWidth");
         m_settings->reset("MinecraftWinHeight");
@@ -150,24 +141,18 @@ void InstanceSettingsPage::applySettings()
     // Memory
     bool memory = ui->memoryGroupBox->isChecked();
     m_settings->set("OverrideMemory", memory);
-    if (memory)
-    {
+    if (memory) {
         int min = ui->minMemSpinBox->value();
         int max = ui->maxMemSpinBox->value();
-        if(min < max)
-        {
+        if (min < max) {
             m_settings->set("MinMemAlloc", min);
             m_settings->set("MaxMemAlloc", max);
-        }
-        else
-        {
+        } else {
             m_settings->set("MinMemAlloc", max);
             m_settings->set("MaxMemAlloc", min);
         }
         m_settings->set("PermGen", ui->permGenSpinBox->value());
-    }
-    else
-    {
+    } else {
         m_settings->reset("MinMemAlloc");
         m_settings->reset("MaxMemAlloc");
         m_settings->reset("PermGen");
@@ -176,13 +161,10 @@ void InstanceSettingsPage::applySettings()
     // Java Install Settings
     bool javaInstall = ui->javaSettingsGroupBox->isChecked();
     m_settings->set("OverrideJavaLocation", javaInstall);
-    if (javaInstall)
-    {
+    if (javaInstall) {
         m_settings->set("JavaPath", ui->javaPathTextBox->text());
         m_settings->set("IgnoreJavaCompatibility", ui->skipCompatibilityCheckbox->isChecked());
-    }
-    else
-    {
+    } else {
         m_settings->reset("JavaPath");
         m_settings->reset("IgnoreJavaCompatibility");
     }
@@ -190,12 +172,9 @@ void InstanceSettingsPage::applySettings()
     // Java arguments
     bool javaArgs = ui->javaArgumentsGroupBox->isChecked();
     m_settings->set("OverrideJavaArgs", javaArgs);
-    if(javaArgs)
-    {
+    if (javaArgs) {
         m_settings->set("JvmArgs", ui->jvmArgsTextBox->toPlainText().replace("\n", " "));
-    }
-    else
-    {
+    } else {
         m_settings->reset("JvmArgs");
     }
 
@@ -205,14 +184,11 @@ void InstanceSettingsPage::applySettings()
     // Custom Commands
     bool custcmd = ui->customCommands->checked();
     m_settings->set("OverrideCommands", custcmd);
-    if (custcmd)
-    {
+    if (custcmd) {
         m_settings->set("PreLaunchCommand", ui->customCommands->prelaunchCommand());
         m_settings->set("WrapperCommand", ui->customCommands->wrapperCommand());
         m_settings->set("PostExitCommand", ui->customCommands->postexitCommand());
-    }
-    else
-    {
+    } else {
         m_settings->reset("PreLaunchCommand");
         m_settings->reset("WrapperCommand");
         m_settings->reset("PostExitCommand");
@@ -221,13 +197,10 @@ void InstanceSettingsPage::applySettings()
     // Workarounds
     bool workarounds = ui->nativeWorkaroundsGroupBox->isChecked();
     m_settings->set("OverrideNativeWorkarounds", workarounds);
-    if(workarounds)
-    {
+    if (workarounds) {
         m_settings->set("UseNativeOpenAL", ui->useNativeOpenALCheck->isChecked());
         m_settings->set("UseNativeGLFW", ui->useNativeGLFWCheck->isChecked());
-    }
-    else
-    {
+    } else {
         m_settings->reset("UseNativeOpenAL");
         m_settings->reset("UseNativeGLFW");
     }
@@ -235,14 +208,11 @@ void InstanceSettingsPage::applySettings()
     // Performance
     bool performance = ui->perfomanceGroupBox->isChecked();
     m_settings->set("OverridePerformance", performance);
-    if(performance)
-    {
+    if (performance) {
         m_settings->set("EnableFeralGamemode", ui->enableFeralGamemodeCheck->isChecked());
         m_settings->set("EnableMangoHud", ui->enableMangoHud->isChecked());
         m_settings->set("UseDiscreteGpu", ui->useDiscreteGpuCheck->isChecked());
-    }
-    else
-    {
+    } else {
         m_settings->reset("EnableFeralGamemode");
         m_settings->reset("EnableMangoHud");
         m_settings->reset("UseDiscreteGpu");
@@ -251,13 +221,10 @@ void InstanceSettingsPage::applySettings()
     // Game time
     bool gameTime = ui->gameTimeGroupBox->isChecked();
     m_settings->set("OverrideGameTime", gameTime);
-    if (gameTime)
-    {
+    if (gameTime) {
         m_settings->set("ShowGameTime", ui->showGameTime->isChecked());
         m_settings->set("RecordGameTime", ui->recordGameTime->isChecked());
-    }
-    else
-    {
+    } else {
         m_settings->reset("ShowGameTime");
         m_settings->reset("RecordGameTime");
     }
@@ -265,12 +232,9 @@ void InstanceSettingsPage::applySettings()
     // Join server on launch
     bool joinServerOnLaunch = ui->serverJoinGroupBox->isChecked();
     m_settings->set("JoinServerOnLaunch", joinServerOnLaunch);
-    if (joinServerOnLaunch)
-    {
+    if (joinServerOnLaunch) {
         m_settings->set("JoinServerOnLaunchAddress", ui->serverJoinAddress->text());
-    }
-    else
-    {
+    } else {
         m_settings->reset("JoinServerOnLaunchAddress");
     }
 
@@ -316,13 +280,10 @@ void InstanceSettingsPage::loadSettings()
     ui->memoryGroupBox->setChecked(m_settings->get("OverrideMemory").toBool());
     int min = m_settings->get("MinMemAlloc").toInt();
     int max = m_settings->get("MaxMemAlloc").toInt();
-    if(min < max)
-    {
+    if (min < max) {
         ui->minMemSpinBox->setValue(min);
         ui->maxMemSpinBox->setValue(max);
-    }
-    else
-    {
+    } else {
         ui->minMemSpinBox->setValue(max);
         ui->maxMemSpinBox->setValue(min);
     }
@@ -332,7 +293,6 @@ void InstanceSettingsPage::loadSettings()
     ui->labelPermGen->setVisible(permGenVisible);
     ui->labelPermgenNote->setVisible(permGenVisible);
 
-
     // Java Settings
     bool overrideJava = m_settings->get("OverrideJava").toBool();
     bool overrideLocation = m_settings->get("OverrideJavaLocation").toBool() || overrideJava;
@@ -346,13 +306,8 @@ void InstanceSettingsPage::loadSettings()
     ui->jvmArgsTextBox->setPlainText(m_settings->get("JvmArgs").toString());
 
     // Custom commands
-    ui->customCommands->initialize(
-        true,
-        m_settings->get("OverrideCommands").toBool(),
-        m_settings->get("PreLaunchCommand").toString(),
-        m_settings->get("WrapperCommand").toString(),
-        m_settings->get("PostExitCommand").toString()
-    );
+    ui->customCommands->initialize(true, m_settings->get("OverrideCommands").toBool(), m_settings->get("PreLaunchCommand").toString(),
+                                   m_settings->get("WrapperCommand").toString(), m_settings->get("PostExitCommand").toString());
 
     // Workarounds
     ui->nativeWorkaroundsGroupBox->setChecked(m_settings->get("OverrideNativeWorkarounds").toBool());
@@ -408,8 +363,7 @@ void InstanceSettingsPage::on_javaDetectBtn_clicked()
     vselect.setResizeOn(2);
     vselect.exec();
 
-    if (vselect.result() == QDialog::Accepted && vselect.selectedVersion())
-    {
+    if (vselect.result() == QDialog::Accepted && vselect.selectedVersion()) {
         java = std::dynamic_pointer_cast<JavaInstall>(vselect.selectedVersion());
         ui->javaPathTextBox->setText(java->path);
         bool visible = java->id.requiresPermGen() && m_settings->get("OverrideMemory").toBool();
@@ -425,15 +379,13 @@ void InstanceSettingsPage::on_javaBrowseBtn_clicked()
     QString raw_path = QFileDialog::getOpenFileName(this, tr("Find Java executable"));
 
     // do not allow current dir - it's dirty. Do not allow dirs that don't exist
-    if(raw_path.isEmpty())
-    {
+    if (raw_path.isEmpty()) {
         return;
     }
     QString cooked_path = FS::NormalizePath(raw_path);
 
     QFileInfo javaInfo(cooked_path);
-    if(!javaInfo.exists() || !javaInfo.isExecutable())
-    {
+    if (!javaInfo.exists() || !javaInfo.isExecutable()) {
         return;
     }
     ui->javaPathTextBox->setText(cooked_path);
@@ -447,13 +399,11 @@ void InstanceSettingsPage::on_javaBrowseBtn_clicked()
 
 void InstanceSettingsPage::on_javaTestBtn_clicked()
 {
-    if(checker)
-    {
+    if (checker) {
         return;
     }
-    checker.reset(new JavaCommon::TestCheck(
-        this, ui->javaPathTextBox->text(), ui->jvmArgsTextBox->toPlainText().replace("\n", " "),
-        ui->minMemSpinBox->value(), ui->maxMemSpinBox->value(), ui->permGenSpinBox->value()));
+    checker.reset(new JavaCommon::TestCheck(this, ui->javaPathTextBox->text(), ui->jvmArgsTextBox->toPlainText().replace("\n", " "),
+                                            ui->minMemSpinBox->value(), ui->maxMemSpinBox->value(), ui->permGenSpinBox->value()));
     connect(checker.get(), SIGNAL(finished()), SLOT(checkerFinished()));
     checker->run();
 }
@@ -470,7 +420,6 @@ void InstanceSettingsPage::updateAccountsMenu()
         if (i == accountIndex)
             ui->instanceAccountSelector->setCurrentIndex(i);
     }
-
 }
 
 QIcon InstanceSettingsPage::getFaceForAccount(MinecraftAccountPtr account)
@@ -491,7 +440,7 @@ void InstanceSettingsPage::changeInstanceAccount(int index)
     }
 }
 
-void InstanceSettingsPage::on_maxMemSpinBox_valueChanged(int i)
+void InstanceSettingsPage::on_maxMemSpinBox_valueChanged([[maybe_unused]] int i)
 {
     updateThresholds();
 }
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.h b/launcher/ui/pages/instance/InstanceSettingsPage.h
index 036b4181..21ecbaf8 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.h
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -46,35 +46,21 @@
 #include "ui/pages/BasePage.h"
 
 class JavaChecker;
-namespace Ui
-{
+namespace Ui {
 class InstanceSettingsPage;
 }
 
-class InstanceSettingsPage : public QWidget, public BasePage
-{
+class InstanceSettingsPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit InstanceSettingsPage(BaseInstance *inst, QWidget *parent = 0);
+   public:
+    explicit InstanceSettingsPage(BaseInstance* inst, QWidget* parent = 0);
     virtual ~InstanceSettingsPage();
-    virtual QString displayName() const override
-    {
-        return tr("Settings");
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("instance-settings");
-    }
-    virtual QString id() const override
-    {
-        return "settings";
-    }
+    virtual QString displayName() const override { return tr("Settings"); }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("instance-settings"); }
+    virtual QString id() const override { return "settings"; }
     virtual bool apply() override;
-    virtual QString helpPage() const override
-    {
-        return "Instance-settings";
-    }
+    virtual QString helpPage() const override { return "Instance-settings"; }
     void retranslate() override;
 
     void updateThresholds();
@@ -96,9 +82,9 @@ public:
     QIcon getFaceForAccount(MinecraftAccountPtr account);
     void changeInstanceAccount(int index);
 
-private:
-    Ui::InstanceSettingsPage *ui;
-    BaseInstance *m_instance;
+   private:
+    Ui::InstanceSettingsPage* ui;
+    BaseInstance* m_instance;
     SettingsObjectPtr m_settings;
     unique_qobject_ptr<JavaCommon::TestCheck> checker;
 };
diff --git a/launcher/ui/pages/instance/LogPage.cpp b/launcher/ui/pages/instance/LogPage.cpp
index 639cd711..8e1e5376 100644
--- a/launcher/ui/pages/instance/LogPage.cpp
+++ b/launcher/ui/pages/instance/LogPage.cpp
@@ -47,56 +47,42 @@
 #include "launch/LaunchTask.h"
 #include "settings/Setting.h"
 
-#include "ui/GuiUtil.h"
 #include "ui/ColorCache.h"
+#include "ui/GuiUtil.h"
 
 #include <BuildConfig.h>
 
-class LogFormatProxyModel : public QIdentityProxyModel
-{
-public:
-    LogFormatProxyModel(QObject* parent = nullptr) : QIdentityProxyModel(parent)
-    {
-    }
-    QVariant data(const QModelIndex &index, int role) const override
+class LogFormatProxyModel : public QIdentityProxyModel {
+   public:
+    LogFormatProxyModel(QObject* parent = nullptr) : QIdentityProxyModel(parent) {}
+    QVariant data(const QModelIndex& index, int role) const override
     {
-        switch(role)
-        {
+        switch (role) {
             case Qt::FontRole:
                 return m_font;
-            case Qt::ForegroundRole:
-            {
-                MessageLevel::Enum level = (MessageLevel::Enum) QIdentityProxyModel::data(index, LogModel::LevelRole).toInt();
+            case Qt::ForegroundRole: {
+                MessageLevel::Enum level = (MessageLevel::Enum)QIdentityProxyModel::data(index, LogModel::LevelRole).toInt();
                 return m_colors->getFront(level);
             }
-            case Qt::BackgroundRole:
-            {
-                MessageLevel::Enum level = (MessageLevel::Enum) QIdentityProxyModel::data(index, LogModel::LevelRole).toInt();
+            case Qt::BackgroundRole: {
+                MessageLevel::Enum level = (MessageLevel::Enum)QIdentityProxyModel::data(index, LogModel::LevelRole).toInt();
                 return m_colors->getBack(level);
             }
             default:
                 return QIdentityProxyModel::data(index, role);
-            }
+        }
     }
 
-    void setFont(QFont font)
-    {
-        m_font = font;
-    }
+    void setFont(QFont font) { m_font = font; }
 
-    void setColors(LogColorCache* colors)
-    {
-        m_colors.reset(colors);
-    }
+    void setColors(LogColorCache* colors) { m_colors.reset(colors); }
 
-    QModelIndex find(const QModelIndex &start, const QString &value, bool reverse) const
+    QModelIndex find(const QModelIndex& start, const QString& value, bool reverse) const
     {
         QModelIndex parentIndex = parent(start);
-        auto compare = [&](int r) -> QModelIndex
-        {
+        auto compare = [&](int r) -> QModelIndex {
             QModelIndex idx = index(r, start.column(), parentIndex);
-            if (!idx.isValid() || idx == start)
-            {
+            if (!idx.isValid() || idx == start) {
                 return QModelIndex();
             }
             QVariant v = data(idx, Qt::DisplayRole);
@@ -105,35 +91,28 @@ public:
                 return idx;
             return QModelIndex();
         };
-        if(reverse)
-        {
+        if (reverse) {
             int from = start.row();
             int to = 0;
 
-            for (int i = 0; i < 2; ++i)
-            {
-                for (int r = from; (r >= to); --r)
-                {
+            for (int i = 0; i < 2; ++i) {
+                for (int r = from; (r >= to); --r) {
                     auto idx = compare(r);
-                    if(idx.isValid())
+                    if (idx.isValid())
                         return idx;
                 }
                 // prepare for the next iteration
                 from = rowCount() - 1;
                 to = start.row();
             }
-        }
-        else
-        {
+        } else {
             int from = start.row();
             int to = rowCount(parentIndex);
 
-            for (int i = 0; i < 2; ++i)
-            {
-                for (int r = from; (r < to); ++r)
-                {
+            for (int i = 0; i < 2; ++i) {
+                for (int r = from; (r < to); ++r) {
                     auto idx = compare(r);
-                    if(idx.isValid())
+                    if (idx.isValid())
                         return idx;
                 }
                 // prepare for the next iteration
@@ -143,13 +122,13 @@ public:
         }
         return QModelIndex();
     }
-private:
+
+   private:
     QFont m_font;
     std::unique_ptr<LogColorCache> m_colors;
 };
 
-LogPage::LogPage(InstancePtr instance, QWidget *parent)
-    : QWidget(parent), ui(new Ui::LogPage), m_instance(instance)
+LogPage::LogPage(InstancePtr instance, QWidget* parent) : QWidget(parent), ui(new Ui::LogPage), m_instance(instance)
 {
     ui->setupUi(this);
     ui->tabWidget->tabBar()->hide();
@@ -167,8 +146,7 @@ LogPage::LogPage(InstancePtr instance, QWidget *parent)
         QString fontFamily = APPLICATION->settings()->get("ConsoleFont").toString();
         bool conversionOk = false;
         int fontSize = APPLICATION->settings()->get("ConsoleFontSize").toInt(&conversionOk);
-        if(!conversionOk)
-        {
+        if (!conversionOk) {
             fontSize = 11;
         }
         m_proxy->setFont(QFont(fontFamily, fontSize));
@@ -179,8 +157,7 @@ LogPage::LogPage(InstancePtr instance, QWidget *parent)
     // set up instance and launch process recognition
     {
         auto launchTask = m_instance->getLaunchTask();
-        if(launchTask)
-        {
+        if (launchTask) {
             setInstanceLaunchTaskChanged(launchTask, true);
         }
         connect(m_instance.get(), &BaseInstance::launchTaskChanged, this, &LogPage::onInstanceLaunchTaskChanged);
@@ -202,30 +179,23 @@ LogPage::~LogPage()
 
 void LogPage::modelStateToUI()
 {
-    if(m_model->wrapLines())
-    {
+    if (m_model->wrapLines()) {
         ui->text->setWordWrap(true);
         ui->wrapCheckbox->setCheckState(Qt::Checked);
-    }
-    else
-    {
+    } else {
         ui->text->setWordWrap(false);
         ui->wrapCheckbox->setCheckState(Qt::Unchecked);
     }
-    if(m_model->suspended())
-    {
+    if (m_model->suspended()) {
         ui->trackLogCheckbox->setCheckState(Qt::Unchecked);
-    }
-    else
-    {
+    } else {
         ui->trackLogCheckbox->setCheckState(Qt::Checked);
     }
 }
 
 void LogPage::UIToModelState()
 {
-    if(!m_model)
-    {
+    if (!m_model) {
         return;
     }
     m_model->setLineWrap(ui->wrapCheckbox->checkState() == Qt::Checked);
@@ -235,21 +205,15 @@ void LogPage::UIToModelState()
 void LogPage::setInstanceLaunchTaskChanged(shared_qobject_ptr<LaunchTask> proc, bool initial)
 {
     m_process = proc;
-    if(m_process)
-    {
+    if (m_process) {
         m_model = proc->getLogModel();
         m_proxy->setSourceModel(m_model.get());
-        if(initial)
-        {
+        if (initial) {
             modelStateToUI();
-        }
-        else
-        {
+        } else {
             UIToModelState();
         }
-    }
-    else
-    {
+    } else {
         m_proxy->setSourceModel(nullptr);
         m_model.reset();
     }
@@ -272,34 +236,25 @@ bool LogPage::shouldDisplay() const
 
 void LogPage::on_btnPaste_clicked()
 {
-    if(!m_model)
+    if (!m_model)
         return;
 
-    //FIXME: turn this into a proper task and move the upload logic out of GuiUtil!
-    m_model->append(
-        MessageLevel::Launcher,
-        QString("Log upload triggered at: %1").arg(
-            QDateTime::currentDateTime().toString(Qt::RFC2822Date)
-        )
-    );
+    // FIXME: turn this into a proper task and move the upload logic out of GuiUtil!
+    m_model->append(MessageLevel::Launcher,
+                    QString("Log upload triggered at: %1").arg(QDateTime::currentDateTime().toString(Qt::RFC2822Date)));
     auto url = GuiUtil::uploadPaste(tr("Minecraft Log"), m_model->toPlainText(), this);
-    if(!url.has_value())
-    {
+    if (!url.has_value()) {
         m_model->append(MessageLevel::Error, QString("Log upload canceled"));
-    }
-    else if (url->isNull())
-    {
+    } else if (url->isNull()) {
         m_model->append(MessageLevel::Error, QString("Log upload failed!"));
-    }
-    else
-    {
+    } else {
         m_model->append(MessageLevel::Launcher, QString("Log uploaded to: %1").arg(url.value()));
     }
 }
 
 void LogPage::on_btnCopy_clicked()
 {
-    if(!m_model)
+    if (!m_model)
         return;
     m_model->append(MessageLevel::Launcher, QString("Clipboard copy at: %1").arg(QDateTime::currentDateTime().toString(Qt::RFC2822Date)));
     GuiUtil::setClipboardText(m_model->toPlainText());
@@ -307,7 +262,7 @@ void LogPage::on_btnCopy_clicked()
 
 void LogPage::on_btnClear_clicked()
 {
-    if(!m_model)
+    if (!m_model)
         return;
     m_model->clear();
     m_container->refreshContainer();
@@ -320,7 +275,7 @@ void LogPage::on_btnBottom_clicked()
 
 void LogPage::on_trackLogCheckbox_clicked(bool checked)
 {
-    if(!m_model)
+    if (!m_model)
         return;
     m_model->suspend(!checked);
 }
@@ -328,7 +283,7 @@ void LogPage::on_trackLogCheckbox_clicked(bool checked)
 void LogPage::on_wrapCheckbox_clicked(bool checked)
 {
     ui->text->setWordWrap(checked);
-    if(!m_model)
+    if (!m_model)
         return;
     m_model->setLineWrap(checked);
 }
@@ -353,8 +308,7 @@ void LogPage::findPreviousActivated()
 void LogPage::findActivated()
 {
     // focus the search bar if it doesn't have focus
-    if (!ui->searchBar->hasFocus())
-    {
+    if (!ui->searchBar->hasFocus()) {
         ui->searchBar->setFocus();
         ui->searchBar->selectAll();
     }
diff --git a/launcher/ui/pages/instance/LogPage.h b/launcher/ui/pages/instance/LogPage.h
index f6fe87c4..6c259891 100644
--- a/launcher/ui/pages/instance/LogPage.h
+++ b/launcher/ui/pages/instance/LogPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,46 +37,32 @@
 
 #include <QWidget>
 
+#include <Application.h>
 #include "BaseInstance.h"
 #include "launch/LaunchTask.h"
 #include "ui/pages/BasePage.h"
-#include <Application.h>
 
-namespace Ui
-{
+namespace Ui {
 class LogPage;
 }
 class QTextCharFormat;
 class LogFormatProxyModel;
 
-class LogPage : public QWidget, public BasePage
-{
+class LogPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit LogPage(InstancePtr instance, QWidget *parent = 0);
+   public:
+    explicit LogPage(InstancePtr instance, QWidget* parent = 0);
     virtual ~LogPage();
-    virtual QString displayName() const override
-    {
-        return tr("Minecraft Log");
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("log");
-    }
-    virtual QString id() const override
-    {
-        return "console";
-    }
+    virtual QString displayName() const override { return tr("Minecraft Log"); }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("log"); }
+    virtual QString id() const override { return "console"; }
     virtual bool apply() override;
-    virtual QString helpPage() const override
-    {
-        return "Minecraft-Logs";
-    }
+    virtual QString helpPage() const override { return "Minecraft-Logs"; }
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
-private slots:
+   private slots:
     void on_btnPaste_clicked();
     void on_btnCopy_clicked();
     void on_btnClear_clicked();
@@ -92,16 +78,16 @@ private slots:
 
     void onInstanceLaunchTaskChanged(shared_qobject_ptr<LaunchTask> proc);
 
-private:
+   private:
     void modelStateToUI();
     void UIToModelState();
     void setInstanceLaunchTaskChanged(shared_qobject_ptr<LaunchTask> proc, bool initial);
 
-private:
-    Ui::LogPage *ui;
+   private:
+    Ui::LogPage* ui;
     InstancePtr m_instance;
     shared_qobject_ptr<LaunchTask> m_process;
 
-    LogFormatProxyModel * m_proxy;
-    shared_qobject_ptr <LogModel> m_model;
+    LogFormatProxyModel* m_proxy;
+    shared_qobject_ptr<LogModel> m_model;
 };
diff --git a/launcher/ui/pages/instance/ManagedPackPage.cpp b/launcher/ui/pages/instance/ManagedPackPage.cpp
index 82de9742..8fdaf065 100644
--- a/launcher/ui/pages/instance/ManagedPackPage.cpp
+++ b/launcher/ui/pages/instance/ManagedPackPage.cpp
@@ -3,6 +3,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "ManagedPackPage.h"
+#include <QDesktopServices>
+#include <QUrl>
+#include <QUrlQuery>
 #include "ui_ManagedPackPage.h"
 
 #include <QListView>
@@ -105,6 +108,19 @@ ManagedPackPage::ManagedPackPage(BaseInstance* inst, InstanceWindow* instance_wi
         // Pretend we're opening the page again
         openedImpl();
     });
+
+    connect(ui->changelogTextBrowser, &QTextBrowser::anchorClicked, this, [](const QUrl url) {
+        if (url.scheme().isEmpty()) {
+            auto querry =
+                QUrlQuery(url.query()).queryItemValue("remoteUrl", QUrl::FullyDecoded);  // curseforge workaround for linkout?remoteUrl=
+            auto decoded = QUrl::fromPercentEncoding(querry.toUtf8());
+            auto newUrl = QUrl(decoded);
+            if (newUrl.isValid() && (newUrl.scheme() == "http" || newUrl.scheme() == "https"))
+                QDesktopServices ::openUrl(newUrl);
+            return;
+        }
+        QDesktopServices::openUrl(url);
+    });
 }
 
 ManagedPackPage::~ManagedPackPage()
diff --git a/launcher/ui/pages/instance/ManagedPackPage.ui b/launcher/ui/pages/instance/ManagedPackPage.ui
index bbe44a94..05e91bbc 100644
--- a/launcher/ui/pages/instance/ManagedPackPage.ui
+++ b/launcher/ui/pages/instance/ManagedPackPage.ui
@@ -168,10 +168,13 @@
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <item>
-         <widget class="QTextBrowser" name="changelogTextBrowser">
+         <widget class="ProjectDescriptionPage" name="changelogTextBrowser">
           <property name="placeholderText">
            <string>No changelog available for this version!</string>
           </property>
+          <property name="openLinks">
+           <bool>false</bool>
+          </property>
          </widget>
         </item>
        </layout>
@@ -188,6 +191,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ProjectDescriptionPage</class>
+   <extends>QTextBrowser</extends>
+   <header>ui/widgets/ProjectDescriptionPage.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index cef292bd..0f5e29cb 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -127,7 +127,7 @@ bool ModFolderPage::shouldDisplay() const
     return true;
 }
 
-bool ModFolderPage::onSelectionChanged(const QModelIndex& current, const QModelIndex& previous)
+bool ModFolderPage::onSelectionChanged(const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
 {
     auto sourceCurrent = m_filterModel->mapToSource(current);
     int row = sourceCurrent.row();
diff --git a/launcher/ui/pages/instance/NotesPage.cpp b/launcher/ui/pages/instance/NotesPage.cpp
index 95a9fad2..a86369f8 100644
--- a/launcher/ui/pages/instance/NotesPage.cpp
+++ b/launcher/ui/pages/instance/NotesPage.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -34,11 +34,10 @@
  */
 
 #include "NotesPage.h"
-#include "ui_NotesPage.h"
 #include <QTabBar>
+#include "ui_NotesPage.h"
 
-NotesPage::NotesPage(BaseInstance *inst, QWidget *parent)
-    : QWidget(parent), ui(new Ui::NotesPage), m_inst(inst)
+NotesPage::NotesPage(BaseInstance* inst, QWidget* parent) : QWidget(parent), ui(new Ui::NotesPage), m_inst(inst)
 {
     ui->setupUi(this);
     ui->noteEditor->setText(m_inst->notes());
diff --git a/launcher/ui/pages/instance/NotesPage.h b/launcher/ui/pages/instance/NotesPage.h
index 80a7279b..3351d25f 100644
--- a/launcher/ui/pages/instance/NotesPage.h
+++ b/launcher/ui/pages/instance/NotesPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,45 +37,34 @@
 
 #include <QWidget>
 
+#include <Application.h>
 #include "BaseInstance.h"
 #include "ui/pages/BasePage.h"
-#include <Application.h>
 
-namespace Ui
-{
+namespace Ui {
 class NotesPage;
 }
 
-class NotesPage : public QWidget, public BasePage
-{
+class NotesPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit NotesPage(BaseInstance *inst, QWidget *parent = 0);
+   public:
+    explicit NotesPage(BaseInstance* inst, QWidget* parent = 0);
     virtual ~NotesPage();
-    virtual QString displayName() const override
-    {
-        return tr("Notes");
-    }
+    virtual QString displayName() const override { return tr("Notes"); }
     virtual QIcon icon() const override
     {
         auto icon = APPLICATION->getThemedIcon("notes");
-        if(icon.isNull())
+        if (icon.isNull())
             icon = APPLICATION->getThemedIcon("news");
         return icon;
     }
-    virtual QString id() const override
-    {
-        return "notes";
-    }
+    virtual QString id() const override { return "notes"; }
     virtual bool apply() override;
-    virtual QString helpPage() const override
-    {
-        return "Notes";
-    }
+    virtual QString helpPage() const override { return "Notes"; }
     void retranslate() override;
 
-private:
-    Ui::NotesPage *ui;
-    BaseInstance *m_inst;
+   private:
+    Ui::NotesPage* ui;
+    BaseInstance* m_inst;
 };
diff --git a/launcher/ui/pages/instance/OtherLogsPage.cpp b/launcher/ui/pages/instance/OtherLogsPage.cpp
index bbdd7324..ab5d9828 100644
--- a/launcher/ui/pages/instance/OtherLogsPage.cpp
+++ b/launcher/ui/pages/instance/OtherLogsPage.cpp
@@ -41,14 +41,13 @@
 
 #include "ui/GuiUtil.h"
 
-#include "RecursiveFileSystemWatcher.h"
-#include <GZip.h>
 #include <FileSystem.h>
+#include <GZip.h>
 #include <QShortcut>
+#include "RecursiveFileSystemWatcher.h"
 
-OtherLogsPage::OtherLogsPage(QString path, IPathMatcher::Ptr fileFilter, QWidget *parent)
-    : QWidget(parent), ui(new Ui::OtherLogsPage), m_path(path), m_fileFilter(fileFilter),
-      m_watcher(new RecursiveFileSystemWatcher(this))
+OtherLogsPage::OtherLogsPage(QString path, IPathMatcher::Ptr fileFilter, QWidget* parent)
+    : QWidget(parent), ui(new Ui::OtherLogsPage), m_path(path), m_fileFilter(fileFilter), m_watcher(new RecursiveFileSystemWatcher(this))
 {
     ui->setupUi(this);
     ui->tabWidget->tabBar()->hide();
@@ -94,21 +93,15 @@ void OtherLogsPage::populateSelectLogBox()
 {
     ui->selectLogBox->clear();
     ui->selectLogBox->addItems(m_watcher->files());
-    if (m_currentFile.isEmpty())
-    {
+    if (m_currentFile.isEmpty()) {
         setControlsEnabled(false);
         ui->selectLogBox->setCurrentIndex(-1);
-    }
-    else
-    {
+    } else {
         const int index = ui->selectLogBox->findText(m_currentFile);
-        if (index != -1)
-        {
+        if (index != -1) {
             ui->selectLogBox->setCurrentIndex(index);
             setControlsEnabled(true);
-        }
-        else
-        {
+        } else {
             setControlsEnabled(false);
         }
     }
@@ -117,19 +110,15 @@ void OtherLogsPage::populateSelectLogBox()
 void OtherLogsPage::on_selectLogBox_currentIndexChanged(const int index)
 {
     QString file;
-    if (index != -1)
-    {
+    if (index != -1) {
         file = ui->selectLogBox->itemText(index);
     }
 
-    if (file.isEmpty() || !QFile::exists(FS::PathCombine(m_path, file)))
-    {
+    if (file.isEmpty() || !QFile::exists(FS::PathCombine(m_path, file))) {
         m_currentFile = QString();
         ui->text->clear();
         setControlsEnabled(false);
-    }
-    else
-    {
+    } else {
         m_currentFile = file;
         on_btnReload_clicked();
         setControlsEnabled(true);
@@ -138,64 +127,49 @@ void OtherLogsPage::on_selectLogBox_currentIndexChanged(const int index)
 
 void OtherLogsPage::on_btnReload_clicked()
 {
-    if(m_currentFile.isEmpty())
-    {
+    if (m_currentFile.isEmpty()) {
         setControlsEnabled(false);
         return;
     }
     QFile file(FS::PathCombine(m_path, m_currentFile));
-    if (!file.open(QFile::ReadOnly))
-    {
+    if (!file.open(QFile::ReadOnly)) {
         setControlsEnabled(false);
-        ui->btnReload->setEnabled(true); // allow reload
+        ui->btnReload->setEnabled(true);  // allow reload
         m_currentFile = QString();
-        QMessageBox::critical(this, tr("Error"), tr("Unable to open %1 for reading: %2")
-                                                     .arg(m_currentFile, file.errorString()));
-    }
-    else
-    {
-        auto setPlainText = [&](const QString & text)
-        {
+        QMessageBox::critical(this, tr("Error"), tr("Unable to open %1 for reading: %2").arg(m_currentFile, file.errorString()));
+    } else {
+        auto setPlainText = [&](const QString& text) {
             QString fontFamily = APPLICATION->settings()->get("ConsoleFont").toString();
             bool conversionOk = false;
             int fontSize = APPLICATION->settings()->get("ConsoleFontSize").toInt(&conversionOk);
-            if(!conversionOk)
-            {
+            if (!conversionOk) {
                 fontSize = 11;
             }
-            QTextDocument *doc = ui->text->document();
+            QTextDocument* doc = ui->text->document();
             doc->setDefaultFont(QFont(fontFamily, fontSize));
             ui->text->setPlainText(text);
         };
-        auto showTooBig = [&]()
-        {
-            setPlainText(
-                tr("The file (%1) is too big. You may want to open it in a viewer optimized "
-                   "for large files.").arg(file.fileName()));
+        auto showTooBig = [&]() {
+            setPlainText(tr("The file (%1) is too big. You may want to open it in a viewer optimized "
+                            "for large files.")
+                             .arg(file.fileName()));
         };
-        if(file.size() > (1024ll * 1024ll * 12ll))
-        {
+        if (file.size() > (1024ll * 1024ll * 12ll)) {
             showTooBig();
             return;
         }
         QString content;
-        if(file.fileName().endsWith(".gz"))
-        {
+        if (file.fileName().endsWith(".gz")) {
             QByteArray temp;
-            if(!GZip::unzip(file.readAll(), temp))
-            {
-                setPlainText(
-                    tr("The file (%1) is not readable.").arg(file.fileName()));
+            if (!GZip::unzip(file.readAll(), temp)) {
+                setPlainText(tr("The file (%1) is not readable.").arg(file.fileName()));
                 return;
             }
             content = QString::fromUtf8(temp);
-        }
-        else
-        {
+        } else {
             content = QString::fromUtf8(file.readAll());
         }
-        if (content.size() >= 50000000ll)
-        {
+        if (content.size() >= 50000000ll) {
             showTooBig();
             return;
         }
@@ -215,8 +189,7 @@ void OtherLogsPage::on_btnCopy_clicked()
 
 void OtherLogsPage::on_btnDelete_clicked()
 {
-    if(m_currentFile.isEmpty())
-    {
+    if (m_currentFile.isEmpty()) {
         setControlsEnabled(false);
         return;
     }
@@ -230,36 +203,27 @@ void OtherLogsPage::on_btnDelete_clicked()
     }
     QFile file(FS::PathCombine(m_path, m_currentFile));
 
-    if (FS::trash(file.fileName()))
-    {
+    if (FS::trash(file.fileName())) {
         return;
     }
 
-    if (!file.remove())
-    {
-        QMessageBox::critical(this, tr("Error"), tr("Unable to delete %1: %2")
-                                                     .arg(m_currentFile, file.errorString()));
+    if (!file.remove()) {
+        QMessageBox::critical(this, tr("Error"), tr("Unable to delete %1: %2").arg(m_currentFile, file.errorString()));
     }
 }
 
-
-
 void OtherLogsPage::on_btnClean_clicked()
 {
     auto toDelete = m_watcher->files();
-    if(toDelete.isEmpty())
-    {
+    if (toDelete.isEmpty()) {
         return;
     }
-    QMessageBox *messageBox = new QMessageBox(this);
+    QMessageBox* messageBox = new QMessageBox(this);
     messageBox->setWindowTitle(tr("Confirm Cleanup"));
-    if(toDelete.size() > 5)
-    {
+    if (toDelete.size() > 5) {
         messageBox->setText(tr("Are you sure you want to delete all log files?"));
         messageBox->setDetailedText(toDelete.join('\n'));
-    }
-    else
-    {
+    } else {
         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);
@@ -268,46 +232,37 @@ void OtherLogsPage::on_btnClean_clicked()
     messageBox->setIcon(QMessageBox::Question);
     messageBox->setTextInteractionFlags(Qt::TextBrowserInteraction);
 
-    if (messageBox->exec() != QMessageBox::Ok)
-    {
+    if (messageBox->exec() != QMessageBox::Ok) {
         return;
     }
     QStringList failed;
-    for(auto item: toDelete)
-    {
+    for (auto item : toDelete) {
         QFile file(FS::PathCombine(m_path, item));
-        if (FS::trash(file.fileName()))
-        {
+        if (FS::trash(file.fileName())) {
             continue;
         }
-        if (!file.remove())
-        {
+        if (!file.remove()) {
             failed.push_back(item);
         }
     }
-    if(!failed.empty())
-    {
-        QMessageBox *messageBox = new QMessageBox(this);
-        messageBox->setWindowTitle(tr("Error"));
-        if(failed.size() > 5)
-        {
-            messageBox->setText(tr("Couldn't delete some files!"));
-            messageBox->setDetailedText(failed.join('\n'));
-        }
-        else
-        {
-            messageBox->setText(tr("Couldn't delete some files:\n%1").arg(failed.join('\n')));
+    if (!failed.empty()) {
+        QMessageBox* messageBoxFailure = new QMessageBox(this);
+        messageBoxFailure->setWindowTitle(tr("Error"));
+        if (failed.size() > 5) {
+            messageBoxFailure->setText(tr("Couldn't delete some files!"));
+            messageBoxFailure->setDetailedText(failed.join('\n'));
+        } else {
+            messageBoxFailure->setText(tr("Couldn't delete some files:\n%1").arg(failed.join('\n')));
         }
-        messageBox->setStandardButtons(QMessageBox::Ok);
-        messageBox->setDefaultButton(QMessageBox::Ok);
-        messageBox->setTextInteractionFlags(Qt::TextSelectableByMouse);
-        messageBox->setIcon(QMessageBox::Critical);
-        messageBox->setTextInteractionFlags(Qt::TextBrowserInteraction);
-        messageBox->exec();
+        messageBoxFailure->setStandardButtons(QMessageBox::Ok);
+        messageBoxFailure->setDefaultButton(QMessageBox::Ok);
+        messageBoxFailure->setTextInteractionFlags(Qt::TextSelectableByMouse);
+        messageBoxFailure->setIcon(QMessageBox::Critical);
+        messageBoxFailure->setTextInteractionFlags(Qt::TextBrowserInteraction);
+        messageBoxFailure->exec();
     }
 }
 
-
 void OtherLogsPage::setControlsEnabled(const bool enabled)
 {
     ui->btnReload->setEnabled(enabled);
@@ -319,7 +274,7 @@ void OtherLogsPage::setControlsEnabled(const bool enabled)
 }
 
 // FIXME: HACK, use LogView instead?
-static void findNext(QPlainTextEdit * _this, const QString& what, bool reverse)
+static void findNext(QPlainTextEdit* _this, const QString& what, bool reverse)
 {
     _this->find(what, reverse ? QTextDocument::FindFlag::FindBackward : QTextDocument::FindFlag(0));
 }
@@ -344,8 +299,7 @@ void OtherLogsPage::findPreviousActivated()
 void OtherLogsPage::findActivated()
 {
     // focus the search bar if it doesn't have focus
-    if (!ui->searchBar->hasFocus())
-    {
+    if (!ui->searchBar->hasFocus()) {
         ui->searchBar->setFocus();
         ui->searchBar->selectAll();
     }
diff --git a/launcher/ui/pages/instance/OtherLogsPage.h b/launcher/ui/pages/instance/OtherLogsPage.h
index 95591638..4b3b122b 100644
--- a/launcher/ui/pages/instance/OtherLogsPage.h
+++ b/launcher/ui/pages/instance/OtherLogsPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,47 +37,33 @@
 
 #include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
 #include <pathmatcher/IPathMatcher.h>
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class OtherLogsPage;
 }
 
 class RecursiveFileSystemWatcher;
 
-class OtherLogsPage : public QWidget, public BasePage
-{
+class OtherLogsPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit OtherLogsPage(QString path, IPathMatcher::Ptr fileFilter, QWidget *parent = 0);
+   public:
+    explicit OtherLogsPage(QString path, IPathMatcher::Ptr fileFilter, QWidget* parent = 0);
     ~OtherLogsPage();
 
-    QString id() const override
-    {
-        return "logs";
-    }
-    QString displayName() const override
-    {
-        return tr("Other logs");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("log");
-    }
-    QString helpPage() const override
-    {
-        return "Minecraft-Logs";
-    }
+    QString id() const override { return "logs"; }
+    QString displayName() const override { return tr("Other logs"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("log"); }
+    QString helpPage() const override { return "Minecraft-Logs"; }
     void retranslate() override;
 
     void openedImpl() override;
     void closedImpl() override;
 
-private slots:
+   private slots:
     void populateSelectLogBox();
     void on_selectLogBox_currentIndexChanged(const int index);
     void on_btnReload_clicked();
@@ -91,13 +77,13 @@ private slots:
     void findNextActivated();
     void findPreviousActivated();
 
-private:
+   private:
     void setControlsEnabled(const bool enabled);
 
-private:
-    Ui::OtherLogsPage *ui;
+   private:
+    Ui::OtherLogsPage* ui;
     QString m_path;
     QString m_currentFile;
     IPathMatcher::Ptr m_fileFilter;
-    RecursiveFileSystemWatcher *m_watcher;
+    RecursiveFileSystemWatcher* m_watcher;
 };
diff --git a/launcher/ui/pages/instance/ResourcePackPage.cpp b/launcher/ui/pages/instance/ResourcePackPage.cpp
index 12b371df..26c14ca4 100644
--- a/launcher/ui/pages/instance/ResourcePackPage.cpp
+++ b/launcher/ui/pages/instance/ResourcePackPage.cpp
@@ -55,7 +55,7 @@ ResourcePackPage::ResourcePackPage(MinecraftInstance* instance, std::shared_ptr<
     ui->actionViewConfigs->setVisible(false);
 }
 
-bool ResourcePackPage::onSelectionChanged(const QModelIndex& current, const QModelIndex& previous)
+bool ResourcePackPage::onSelectionChanged(const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
 {
     auto sourceCurrent = m_filterModel->mapToSource(current);
     int row = sourceCurrent.row();
diff --git a/launcher/ui/pages/instance/ResourcePackPage.h b/launcher/ui/pages/instance/ResourcePackPage.h
index b04aa2e9..cb84ca96 100644
--- a/launcher/ui/pages/instance/ResourcePackPage.h
+++ b/launcher/ui/pages/instance/ResourcePackPage.h
@@ -42,11 +42,10 @@
 
 #include "minecraft/mod/ResourcePackFolderModel.h"
 
-class ResourcePackPage : public ExternalResourcesPage
-{
+class ResourcePackPage : public ExternalResourcesPage {
     Q_OBJECT
-public:
-    explicit ResourcePackPage(MinecraftInstance *instance, std::shared_ptr<ResourcePackFolderModel> model, QWidget *parent = 0);
+   public:
+    explicit ResourcePackPage(MinecraftInstance* instance, std::shared_ptr<ResourcePackFolderModel> model, QWidget* parent = 0);
 
     QString displayName() const override { return tr("Resource packs"); }
     QIcon icon() const override { return APPLICATION->getThemedIcon("resourcepacks"); }
@@ -55,12 +54,10 @@ public:
 
     virtual bool shouldDisplay() const override
     {
-        return !m_instance->traits().contains("no-texturepacks") &&
-               !m_instance->traits().contains("texturepacks");
+        return !m_instance->traits().contains("no-texturepacks") && !m_instance->traits().contains("texturepacks");
     }
 
    public slots:
     bool onSelectionChanged(const QModelIndex& current, const QModelIndex& previous) override;
     void downloadRPs();
 };
-
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp
index bcce5f57..29c835fc 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.cpp
+++ b/launcher/ui/pages/instance/ScreenshotsPage.cpp
@@ -39,52 +39,50 @@
 #include "BuildConfig.h"
 #include "ui_ScreenshotsPage.h"
 
-#include <QModelIndex>
-#include <QMutableListIterator>
-#include <QMap>
-#include <QSet>
+#include <QClipboard>
+#include <QEvent>
 #include <QFileIconProvider>
 #include <QFileSystemModel>
-#include <QStyledItemDelegate>
-#include <QLineEdit>
-#include <QEvent>
-#include <QPainter>
-#include <QClipboard>
 #include <QKeyEvent>
+#include <QLineEdit>
+#include <QMap>
 #include <QMenu>
+#include <QModelIndex>
+#include <QMutableListIterator>
+#include <QPainter>
 #include <QRegularExpression>
+#include <QSet>
+#include <QStyledItemDelegate>
 
 #include <Application.h>
 
-#include "ui/dialogs/ProgressDialog.h"
 #include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/ProgressDialog.h"
 
 #include "net/NetJob.h"
-#include "screenshots/ImgurUpload.h"
 #include "screenshots/ImgurAlbumCreation.h"
+#include "screenshots/ImgurUpload.h"
 #include "tasks/SequentialTask.h"
 
-#include "RWStorage.h"
-#include <FileSystem.h>
 #include <DesktopServices.h>
+#include <FileSystem.h>
+#include "RWStorage.h"
 
 typedef RWStorage<QString, QIcon> SharedIconCache;
 typedef std::shared_ptr<SharedIconCache> SharedIconCachePtr;
 
-class ThumbnailingResult : public QObject
-{
+class ThumbnailingResult : public QObject {
     Q_OBJECT
-public slots:
-    inline void emitResultsReady(const QString &path) { emit resultsReady(path); }
-    inline void emitResultsFailed(const QString &path) { emit resultsFailed(path); }
-signals:
-    void resultsReady(const QString &path);
-    void resultsFailed(const QString &path);
+   public slots:
+    inline void emitResultsReady(const QString& path) { emit resultsReady(path); }
+    inline void emitResultsFailed(const QString& path) { emit resultsFailed(path); }
+   signals:
+    void resultsReady(const QString& path);
+    void resultsFailed(const QString& path);
 };
 
-class ThumbnailRunnable : public QRunnable
-{
-public:
+class ThumbnailRunnable : public QRunnable {
+   public:
     ThumbnailRunnable(QString path, SharedIconCachePtr cache)
     {
         m_path = path;
@@ -129,57 +127,50 @@ public:
 
 // this is about as elegant and well written as a bag of bricks with scribbles done by insane
 // asylum patients.
-class FilterModel : public QIdentityProxyModel
-{
+class FilterModel : public QIdentityProxyModel {
     Q_OBJECT
-public:
-    explicit FilterModel(QObject *parent = 0) : QIdentityProxyModel(parent)
+   public:
+    explicit FilterModel(QObject* parent = 0) : QIdentityProxyModel(parent)
     {
         m_thumbnailingPool.setMaxThreadCount(4);
         m_thumbnailCache = std::make_shared<SharedIconCache>();
         m_thumbnailCache->add("placeholder", APPLICATION->getThemedIcon("screenshot-placeholder"));
         connect(&watcher, SIGNAL(fileChanged(QString)), SLOT(fileChanged(QString)));
     }
-    virtual ~FilterModel() {
+    virtual ~FilterModel()
+    {
         m_thumbnailingPool.clear();
         if (!m_thumbnailingPool.waitForDone(500))
             qDebug() << "Thumbnail pool took longer than 500ms to finish";
     }
-    virtual QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const
+    virtual QVariant data(const QModelIndex& proxyIndex, int role = Qt::DisplayRole) const
     {
         auto model = sourceModel();
         if (!model)
             return QVariant();
-        if (role == Qt::DisplayRole || role == Qt::EditRole)
-        {
+        if (role == Qt::DisplayRole || role == Qt::EditRole) {
             QVariant result = sourceModel()->data(mapToSource(proxyIndex), role);
             return result.toString().remove(QRegularExpression("\\.png$"));
         }
-        if (role == Qt::DecorationRole)
-        {
-            QVariant result =
-                sourceModel()->data(mapToSource(proxyIndex), QFileSystemModel::FilePathRole);
+        if (role == Qt::DecorationRole) {
+            QVariant result = sourceModel()->data(mapToSource(proxyIndex), QFileSystemModel::FilePathRole);
             QString filePath = result.toString();
             QIcon temp;
-            if (!watched.contains(filePath))
-            {
-                ((QFileSystemWatcher &)watcher).addPath(filePath);
-                ((QSet<QString> &)watched).insert(filePath);
+            if (!watched.contains(filePath)) {
+                ((QFileSystemWatcher&)watcher).addPath(filePath);
+                ((QSet<QString>&)watched).insert(filePath);
             }
-            if (m_thumbnailCache->get(filePath, temp))
-            {
+            if (m_thumbnailCache->get(filePath, temp)) {
                 return temp;
             }
-            if (!m_failed.contains(filePath))
-            {
-                ((FilterModel *)this)->thumbnailImage(filePath);
+            if (!m_failed.contains(filePath)) {
+                ((FilterModel*)this)->thumbnailImage(filePath);
             }
             return (m_thumbnailCache->get("placeholder"));
         }
         return sourceModel()->data(mapToSource(proxyIndex), role);
     }
-    virtual bool setData(const QModelIndex &index, const QVariant &value,
-                         int role = Qt::EditRole)
+    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole)
     {
         auto model = sourceModel();
         if (!model)
@@ -189,23 +180,21 @@ public:
         // FIXME: this is a workaround for a bug in QFileSystemModel, where it doesn't
         // sort after renames
         {
-            ((QFileSystemModel *)model)->setNameFilterDisables(true);
-            ((QFileSystemModel *)model)->setNameFilterDisables(false);
+            ((QFileSystemModel*)model)->setNameFilterDisables(true);
+            ((QFileSystemModel*)model)->setNameFilterDisables(false);
         }
         return model->setData(mapToSource(index), value.toString() + ".png", role);
     }
 
-private:
+   private:
     void thumbnailImage(QString path)
     {
         auto runnable = new ThumbnailRunnable(path, m_thumbnailCache);
-        connect(&(runnable->m_resultEmitter), SIGNAL(resultsReady(QString)),
-                SLOT(thumbnailReady(QString)));
-        connect(&(runnable->m_resultEmitter), SIGNAL(resultsFailed(QString)),
-                SLOT(thumbnailFailed(QString)));
-        ((QThreadPool &)m_thumbnailingPool).start(runnable);
+        connect(&(runnable->m_resultEmitter), SIGNAL(resultsReady(QString)), SLOT(thumbnailReady(QString)));
+        connect(&(runnable->m_resultEmitter), SIGNAL(resultsFailed(QString)), SLOT(thumbnailFailed(QString)));
+        ((QThreadPool&)m_thumbnailingPool).start(runnable);
     }
-private slots:
+   private slots:
     void thumbnailReady(QString path) { emit layoutChanged(); }
     void thumbnailFailed(QString path) { m_failed.insert(path); }
     void fileChanged(QString filepath)
@@ -219,7 +208,7 @@ private slots:
         }
     }
 
-private:
+   private:
     SharedIconCachePtr m_thumbnailCache;
     QThreadPool m_thumbnailingPool;
     QSet<QString> m_failed;
@@ -227,18 +216,15 @@ private:
     QFileSystemWatcher watcher;
 };
 
-class CenteredEditingDelegate : public QStyledItemDelegate
-{
-public:
-    explicit CenteredEditingDelegate(QObject *parent = 0) : QStyledItemDelegate(parent) {}
+class CenteredEditingDelegate : public QStyledItemDelegate {
+   public:
+    explicit CenteredEditingDelegate(QObject* parent = 0) : QStyledItemDelegate(parent) {}
     virtual ~CenteredEditingDelegate() {}
-    virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
-                                  const QModelIndex &index) const
+    virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const
     {
         auto widget = QStyledItemDelegate::createEditor(parent, option, index);
-        auto foo = dynamic_cast<QLineEdit *>(widget);
-        if (foo)
-        {
+        auto foo = dynamic_cast<QLineEdit*>(widget);
+        if (foo) {
             foo->setAlignment(Qt::AlignHCenter);
             foo->setFrame(true);
             foo->setMaximumWidth(192);
@@ -247,15 +233,14 @@ public:
     }
 };
 
-ScreenshotsPage::ScreenshotsPage(QString path, QWidget *parent)
-    : QMainWindow(parent), ui(new Ui::ScreenshotsPage)
+ScreenshotsPage::ScreenshotsPage(QString path, QWidget* parent) : QMainWindow(parent), ui(new Ui::ScreenshotsPage)
 {
     m_model.reset(new QFileSystemModel());
     m_filterModel.reset(new FilterModel());
     m_filterModel->setSourceModel(m_model.get());
     m_model->setFilter(QDir::Files);
     m_model->setReadOnly(false);
-    m_model->setNameFilters({"*.png"});
+    m_model->setNameFilters({ "*.png" });
     m_model->setNameFilterDisables(false);
     m_folder = path;
     m_valid = FS::ensureFolderPathExists(m_folder);
@@ -278,31 +263,29 @@ ScreenshotsPage::ScreenshotsPage(QString path, QWidget *parent)
     connect(ui->listView, SIGNAL(activated(QModelIndex)), SLOT(onItemActivated(QModelIndex)));
 }
 
-bool ScreenshotsPage::eventFilter(QObject *obj, QEvent *evt)
+bool ScreenshotsPage::eventFilter(QObject* obj, QEvent* evt)
 {
     if (obj != ui->listView)
         return QWidget::eventFilter(obj, evt);
-    if (evt->type() != QEvent::KeyPress)
-    {
+    if (evt->type() != QEvent::KeyPress) {
         return QWidget::eventFilter(obj, evt);
     }
-    QKeyEvent *keyEvent = static_cast<QKeyEvent *>(evt);
+    QKeyEvent* keyEvent = static_cast<QKeyEvent*>(evt);
 
     if (keyEvent->matches(QKeySequence::Copy)) {
         on_actionCopy_File_s_triggered();
         return true;
     }
 
-    switch (keyEvent->key())
-    {
-    case Qt::Key_Delete:
-        on_actionDelete_triggered();
-        return true;
-    case Qt::Key_F2:
-        on_actionRename_triggered();
-        return true;
-    default:
-        break;
+    switch (keyEvent->key()) {
+        case Qt::Key_Delete:
+            on_actionDelete_triggered();
+            return true;
+        case Qt::Key_F2:
+            on_actionRename_triggered();
+            return true;
+        default:
+            break;
     }
     return QWidget::eventFilter(obj, evt);
 }
@@ -322,17 +305,17 @@ void ScreenshotsPage::ShowContextMenu(const QPoint& pos)
     auto menu = ui->toolBar->createContextMenu(this, tr("Context menu"));
 
     if (ui->listView->selectionModel()->selectedRows().size() > 1) {
-        menu->removeAction( ui->actionCopy_Image );
+        menu->removeAction(ui->actionCopy_Image);
     }
 
     menu->exec(ui->listView->mapToGlobal(pos));
     delete menu;
 }
 
-QMenu * ScreenshotsPage::createPopupMenu()
+QMenu* ScreenshotsPage::createPopupMenu()
 {
     QMenu* filteredMenu = QMainWindow::createPopupMenu();
-    filteredMenu->removeAction( ui->toolBar->toggleViewAction() );
+    filteredMenu->removeAction(ui->toolBar->toggleViewAction());
     return filteredMenu;
 }
 
@@ -345,13 +328,12 @@ void ScreenshotsPage::onItemActivated(QModelIndex index)
     DesktopServices::openFile(info.absoluteFilePath());
 }
 
-void ScreenshotsPage::onCurrentSelectionChanged(const QItemSelection &selected)
+void ScreenshotsPage::onCurrentSelectionChanged(const QItemSelection& selected)
 {
     bool allReadable = !selected.isEmpty();
     bool allWritable = !selected.isEmpty();
 
-    for (auto index : selected.indexes())
-    {
+    for (auto index : selected.indexes()) {
         if (!index.isValid())
             break;
         auto info = m_model->fileInfo(index);
@@ -401,8 +383,7 @@ void ScreenshotsPage::on_actionUpload_triggered()
 
     QList<ScreenShot::Ptr> uploaded;
     auto job = NetJob::Ptr(new NetJob("Screenshot Upload", APPLICATION->network()));
-    if(selection.size() < 2)
-    {
+    if (selection.size() < 2) {
         auto item = selection.at(0);
         auto info = m_model->fileInfo(item);
         auto screenshot = std::make_shared<ScreenShot>(info);
@@ -411,31 +392,24 @@ void ScreenshotsPage::on_actionUpload_triggered()
         m_uploadActive = true;
         ProgressDialog dialog(this);
 
-        if(dialog.execWithTask(job.get()) != QDialog::Accepted)
-        {
-            CustomMessageBox::selectable(this, tr("Failed to upload screenshots!"),
-                                         tr("Unknown error"), QMessageBox::Warning)->exec();
-        }
-        else
-        {
+        if (dialog.execWithTask(job.get()) != QDialog::Accepted) {
+            CustomMessageBox::selectable(this, tr("Failed to upload screenshots!"), tr("Unknown error"), QMessageBox::Warning)->exec();
+        } else {
             auto link = screenshot->m_url;
-            QClipboard *clipboard = QApplication::clipboard();
+            QClipboard* clipboard = QApplication::clipboard();
             clipboard->setText(link);
             CustomMessageBox::selectable(
-                    this,
-                    tr("Upload finished"),
-                    tr("The <a href=\"%1\">link  to the uploaded screenshot</a> has been placed in your clipboard.")
-                        .arg(link),
-                    QMessageBox::Information
-            )->exec();
+                this, tr("Upload finished"),
+                tr("The <a href=\"%1\">link  to the uploaded screenshot</a> has been placed in your clipboard.").arg(link),
+                QMessageBox::Information)
+                ->exec();
         }
 
         m_uploadActive = false;
         return;
     }
 
-    for (auto item : selection)
-    {
+    for (auto item : selection) {
         auto info = m_model->fileInfo(item);
         auto screenshot = std::make_shared<ScreenShot>(info);
         uploaded.push_back(screenshot);
@@ -449,26 +423,16 @@ void ScreenshotsPage::on_actionUpload_triggered()
     task.addTask(albumTask);
     m_uploadActive = true;
     ProgressDialog prog(this);
-    if (prog.execWithTask(&task) != QDialog::Accepted)
-    {
-        CustomMessageBox::selectable(
-            this,
-            tr("Failed to upload screenshots!"),
-            tr("Unknown error"),
-            QMessageBox::Warning
-        )->exec();
-    }
-    else
-    {
+    if (prog.execWithTask(&task) != QDialog::Accepted) {
+        CustomMessageBox::selectable(this, tr("Failed to upload screenshots!"), tr("Unknown error"), QMessageBox::Warning)->exec();
+    } else {
         auto link = QString("https://imgur.com/a/%1").arg(imgurAlbum->id());
-        QClipboard *clipboard = QApplication::clipboard();
+        QClipboard* clipboard = QApplication::clipboard();
         clipboard->setText(link);
-        CustomMessageBox::selectable(
-            this,
-            tr("Upload finished"),
-            tr("The <a href=\"%1\">link  to the uploaded album</a> has been placed in your clipboard.") .arg(link),
-            QMessageBox::Information
-        )->exec();
+        CustomMessageBox::selectable(this, tr("Upload finished"),
+                                     tr("The <a href=\"%1\">link  to the uploaded album</a> has been placed in your clipboard.").arg(link),
+                                     QMessageBox::Information)
+            ->exec();
     }
     m_uploadActive = false;
 }
@@ -476,8 +440,7 @@ void ScreenshotsPage::on_actionUpload_triggered()
 void ScreenshotsPage::on_actionCopy_Image_triggered()
 {
     auto selection = ui->listView->selectionModel()->selectedRows();
-    if(selection.size() < 1)
-    {
+    if (selection.size() < 1) {
         return;
     }
 
@@ -492,15 +455,13 @@ void ScreenshotsPage::on_actionCopy_Image_triggered()
 void ScreenshotsPage::on_actionCopy_File_s_triggered()
 {
     auto selection = ui->listView->selectionModel()->selectedRows();
-    if(selection.size() < 1)
-    {
+    if (selection.size() < 1) {
         // Don't do anything so we don't empty the users clipboard
         return;
     }
 
     QString buf = "";
-    for (auto item : selection)
-    {
+    for (auto item : selection) {
         auto info = m_model->fileInfo(item);
         buf += "file:///" + info.absoluteFilePath() + "\r\n";
     }
@@ -532,8 +493,7 @@ void ScreenshotsPage::on_actionDelete_triggered()
     if (response != QMessageBox::Yes)
         return;
 
-    for (auto item : selected)
-    {
+    for (auto item : selected) {
         if (FS::trash(m_model->filePath(item)))
             continue;
 
@@ -552,23 +512,19 @@ void ScreenshotsPage::on_actionRename_triggered()
 
 void ScreenshotsPage::openedImpl()
 {
-    if(!m_valid)
-    {
+    if (!m_valid) {
         m_valid = FS::ensureFolderPathExists(m_folder);
     }
-    if (m_valid)
-    {
+    if (m_valid) {
         QString path = QDir(m_folder).absolutePath();
         auto idx = m_model->setRootPath(path);
-        if(idx.isValid())
-        {
+        if (idx.isValid()) {
             ui->listView->setModel(m_filterModel.get());
-            connect(ui->listView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &ScreenshotsPage::onCurrentSelectionChanged);
-            onCurrentSelectionChanged(ui->listView->selectionModel()->selection()); // set initial button enable states
+            connect(ui->listView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
+                    &ScreenshotsPage::onCurrentSelectionChanged);
+            onCurrentSelectionChanged(ui->listView->selectionModel()->selection());  // set initial button enable states
             ui->listView->setRootIndex(m_filterModel->mapFromSource(idx));
-        }
-        else
-        {
+        } else {
             ui->listView->setModel(nullptr);
         }
     }
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.h b/launcher/ui/pages/instance/ScreenshotsPage.h
index 89611b6d..bb127b42 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.h
+++ b/launcher/ui/pages/instance/ScreenshotsPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,16 +37,15 @@
 
 #include <QMainWindow>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
+#include "ui/pages/BasePage.h"
 
 #include "settings/Setting.h"
 
 class QFileSystemModel;
 class QIdentityProxyModel;
 class QItemSelection;
-namespace Ui
-{
+namespace Ui {
 class ScreenshotsPage;
 }
 
@@ -54,49 +53,30 @@ struct ScreenShot;
 class ScreenshotList;
 class ImgurAlbumCreation;
 
-class ScreenshotsPage : public QMainWindow, public BasePage
-{
+class ScreenshotsPage : public QMainWindow, public BasePage {
     Q_OBJECT
 
-public:
-    explicit ScreenshotsPage(QString path, QWidget *parent = 0);
+   public:
+    explicit ScreenshotsPage(QString path, QWidget* parent = 0);
     virtual ~ScreenshotsPage();
 
     void openedImpl() override;
     void closedImpl() override;
 
-    enum
-    {
-        NothingDone = 0x42
-    };
+    enum { NothingDone = 0x42 };
 
-    virtual bool eventFilter(QObject *, QEvent *) override;
-    virtual QString displayName() const override
-    {
-        return tr("Screenshots");
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("screenshots");
-    }
-    virtual QString id() const override
-    {
-        return "screenshots";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Screenshots-management";
-    }
-    virtual bool apply() override
-    {
-        return !m_uploadActive;
-    }
+    virtual bool eventFilter(QObject*, QEvent*) override;
+    virtual QString displayName() const override { return tr("Screenshots"); }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("screenshots"); }
+    virtual QString id() const override { return "screenshots"; }
+    virtual QString helpPage() const override { return "Screenshots-management"; }
+    virtual bool apply() override { return !m_uploadActive; }
     void retranslate() override;
 
-protected:
-    QMenu * createPopupMenu() override;
+   protected:
+    QMenu* createPopupMenu() override;
 
-private slots:
+   private slots:
     void on_actionUpload_triggered();
     void on_actionCopy_Image_triggered();
     void on_actionCopy_File_s_triggered();
@@ -104,11 +84,11 @@ private slots:
     void on_actionRename_triggered();
     void on_actionView_Folder_triggered();
     void onItemActivated(QModelIndex);
-    void onCurrentSelectionChanged(const QItemSelection &selected);
-    void ShowContextMenu(const QPoint &pos);
+    void onCurrentSelectionChanged(const QItemSelection& selected);
+    void ShowContextMenu(const QPoint& pos);
 
-private:
-    Ui::ScreenshotsPage *ui;
+   private:
+    Ui::ScreenshotsPage* ui;
     std::shared_ptr<QFileSystemModel> m_model;
     std::shared_ptr<QIdentityProxyModel> m_filterModel;
     QString m_folder;
diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index 4b1fa08a..da49f4a7 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -40,36 +40,27 @@
 #include "ui_ServersPage.h"
 
 #include <FileSystem.h>
-#include <sstream>
 #include <io/stream_reader.h>
-#include <tag_string.h>
-#include <tag_primitive.h>
-#include <tag_list.h>
-#include <tag_compound.h>
 #include <minecraft/MinecraftInstance.h>
+#include <tag_compound.h>
+#include <tag_list.h>
+#include <tag_primitive.h>
+#include <tag_string.h>
+#include <sstream>
 
 #include <QFileSystemWatcher>
 #include <QMenu>
 #include <QTimer>
 
-static const int COLUMN_COUNT = 2; // 3 , TBD: latency and other nice things.
+static const int COLUMN_COUNT = 2;  // 3 , TBD: latency and other nice things.
 
-struct Server
-{
+struct Server {
     // Types
-    enum class AcceptsTextures : int
-    {
-        ASK = 0,
-        ALWAYS = 1,
-        NEVER = 2
-    };
+    enum class AcceptsTextures : int { ASK = 0, ALWAYS = 1, NEVER = 2 };
 
     // Methods
-    Server()
-    {
-        m_name = QObject::tr("Minecraft Server");
-    }
-    Server(const QString & name, const QString & address)
+    Server() { m_name = QObject::tr("Minecraft Server"); }
+    Server(const QString& name, const QString& address)
     {
         m_name = name;
         m_address = address;
@@ -82,21 +73,16 @@ struct Server
         std::string nameStr(server["name"]);
         m_name = QString::fromUtf8(nameStr.c_str());
 
-        if(server["icon"])
-        {
+        if (server["icon"]) {
             std::string base64str(server["icon"]);
             m_icon = QByteArray::fromBase64(base64str.c_str());
         }
 
-        if(server.has_key("acceptTextures", nbt::tag_type::Byte))
-        {
+        if (server.has_key("acceptTextures", nbt::tag_type::Byte)) {
             bool value = server["acceptTextures"].as<nbt::tag_byte>().get();
-            if(value)
-            {
+            if (value) {
                 m_acceptsTextures = AcceptsTextures::ALWAYS;
-            }
-            else
-            {
+            } else {
                 m_acceptsTextures = AcceptsTextures::NEVER;
             }
         }
@@ -106,12 +92,10 @@ struct Server
     {
         server.insert("name", m_name.trimmed().toUtf8().toStdString());
         server.insert("ip", m_address.trimmed().toUtf8().toStdString());
-        if(m_icon.size())
-        {
+        if (m_icon.size()) {
             server.insert("icon", m_icon.toBase64().toStdString());
         }
-        if(m_acceptsTextures != AcceptsTextures::ASK)
-        {
+        if (m_acceptsTextures != AcceptsTextures::ASK) {
             server.insert("acceptTextures", nbt::tag_byte(m_acceptsTextures == AcceptsTextures::ALWAYS));
         }
     }
@@ -127,64 +111,54 @@ struct Server
     // Data - temporary
     bool m_checked = false;
     bool m_up = false;
-    QString m_motd; // https://mctools.org/motd-creator
+    QString m_motd;  // https://mctools.org/motd-creator
     int m_ping = 0;
     int m_currentPlayers = 0;
     int m_maxPlayers = 0;
 };
 
-static std::unique_ptr <nbt::tag_compound> parseServersDat(const QString& filename)
+static std::unique_ptr<nbt::tag_compound> parseServersDat(const QString& filename)
 {
-    try
-    {
+    try {
         QByteArray input = FS::read(filename);
         std::istringstream foo(std::string(input.constData(), input.size()));
         auto pair = nbt::io::read_compound(foo);
 
-        if(pair.first != "")
+        if (pair.first != "")
             return nullptr;
 
-        if(pair.second == nullptr)
+        if (pair.second == nullptr)
             return nullptr;
 
         return std::move(pair.second);
-    }
-    catch (...)
-    {
+    } catch (...) {
         return nullptr;
     }
 }
 
-static bool serializeServerDat(const QString& filename, nbt::tag_compound * levelInfo)
+static bool serializeServerDat(const QString& filename, nbt::tag_compound* levelInfo)
 {
-    try
-    {
-        if(!FS::ensureFilePathExists(filename))
-        {
+    try {
+        if (!FS::ensureFilePathExists(filename)) {
             return false;
         }
         std::ostringstream s;
         nbt::io::write_tag("", *levelInfo, s);
-        QByteArray val(s.str().data(), (int) s.str().size() );
+        QByteArray val(s.str().data(), (int)s.str().size());
         FS::write(filename, val);
         return true;
-    }
-    catch (...)
-    {
+    } catch (...) {
         return false;
     }
 }
 
-class ServersModel: public QAbstractListModel
-{
+class ServersModel : public QAbstractListModel {
     Q_OBJECT
-public:
-    enum Roles
-    {
+   public:
+    enum Roles {
         ServerPtrRole = Qt::UserRole,
     };
-    explicit ServersModel(const QString &path, QObject *parent = 0)
-        : QAbstractListModel(parent)
+    explicit ServersModel(const QString& path, QObject* parent = 0) : QAbstractListModel(parent)
     {
         m_path = path;
         m_watcher = new QFileSystemWatcher(this);
@@ -194,18 +168,16 @@ public:
         m_saveTimer.setInterval(5000);
         connect(&m_saveTimer, &QTimer::timeout, this, &ServersModel::save_internal);
     }
-    virtual ~ServersModel() {};
+    virtual ~ServersModel(){};
 
     void observe()
     {
-        if(m_observed)
-        {
+        if (m_observed) {
             return;
         }
         m_observed = true;
 
-        if(!m_loaded)
-        {
+        if (!m_loaded) {
             load();
         }
 
@@ -214,8 +186,7 @@ public:
 
     void unobserve()
     {
-        if(!m_observed)
-        {
+        if (!m_observed) {
             return;
         }
         m_observed = false;
@@ -225,8 +196,7 @@ public:
 
     void lock()
     {
-        if(m_locked)
-        {
+        if (m_locked) {
             return;
         }
         saveNow();
@@ -237,8 +207,7 @@ public:
 
     void unlock()
     {
-        if(!m_locked)
-        {
+        if (!m_locked) {
             return;
         }
         m_locked = false;
@@ -248,12 +217,10 @@ public:
 
     int addEmptyRow(int position)
     {
-        if(m_locked)
-        {
+        if (m_locked) {
             return -1;
         }
-        if(position < 0 || position >= rowCount())
-        {
+        if (position < 0 || position >= rowCount()) {
             position = rowCount();
         }
         beginInsertRows(QModelIndex(), position, position);
@@ -265,36 +232,32 @@ public:
 
     bool removeRow(int row)
     {
-        if(m_locked)
-        {
+        if (m_locked) {
             return false;
         }
-        if(row < 0 || row >= rowCount())
-        {
+        if (row < 0 || row >= rowCount()) {
             return false;
         }
         beginRemoveRows(QModelIndex(), row, row);
         m_servers.removeAt(row);
-        endRemoveRows(); // does absolutely nothing, the selected server stays as the next line...
+        endRemoveRows();  // does absolutely nothing, the selected server stays as the next line...
         scheduleSave();
         return true;
     }
 
     bool moveUp(int row)
     {
-        if(m_locked)
-        {
+        if (m_locked) {
             return false;
         }
-        if(row <= 0)
-        {
+        if (row <= 0) {
             return false;
         }
         beginMoveRows(QModelIndex(), row, row, QModelIndex(), row - 1);
 #if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
-        m_servers.swapItemsAt(row-1, row);
+        m_servers.swapItemsAt(row - 1, row);
 #else
-        m_servers.swap(row-1, row);
+        m_servers.swap(row - 1, row);
 #endif
         endMoveRows();
         scheduleSave();
@@ -303,20 +266,18 @@ public:
 
     bool moveDown(int row)
     {
-        if(m_locked)
-        {
+        if (m_locked) {
             return false;
         }
         int count = rowCount();
-        if(row + 1 >= count)
-        {
+        if (row + 1 >= count) {
             return false;
         }
         beginMoveRows(QModelIndex(), row, row, QModelIndex(), row + 2);
 #if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
-        m_servers.swapItemsAt(row+1, row);
+        m_servers.swapItemsAt(row + 1, row);
 #else
-        m_servers.swap(row+1, row);
+        m_servers.swap(row + 1, row);
 #endif
         endMoveRows();
         scheduleSave();
@@ -328,10 +289,8 @@ public:
         if (section < 0 || section >= COLUMN_COUNT)
             return QVariant();
 
-        if(role == Qt::DisplayRole)
-        {
-            switch(section)
-            {
+        if (role == Qt::DisplayRole) {
+            switch (section) {
                 case 0:
                     return tr("Name");
                 case 1:
@@ -344,90 +303,81 @@ public:
         return QAbstractListModel::headerData(section, orientation, role);
     }
 
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
     {
         if (!index.isValid())
             return QVariant();
 
         int row = index.row();
         int column = index.column();
-        if(column < 0 || column >= COLUMN_COUNT)
+        if (column < 0 || column >= COLUMN_COUNT)
             return QVariant();
 
         if (row < 0 || row >= m_servers.size())
             return QVariant();
 
-        switch(column)
-        {
+        switch (column) {
             case 0:
-                switch (role)
-                {
-                case Qt::DecorationRole:
-                {
-                    auto & bytes = m_servers[row].m_icon;
-                    if(bytes.size())
-                    {
-                        QPixmap px;
-                        if(px.loadFromData(bytes))
-                            return QIcon(px);
+                switch (role) {
+                    case Qt::DecorationRole: {
+                        auto& bytes = m_servers[row].m_icon;
+                        if (bytes.size()) {
+                            QPixmap px;
+                            if (px.loadFromData(bytes))
+                                return QIcon(px);
+                        }
+                        return APPLICATION->getThemedIcon("unknown_server");
                     }
-                    return APPLICATION->getThemedIcon("unknown_server");
-                }
-                case Qt::DisplayRole:
-                    return m_servers[row].m_name;
-                case ServerPtrRole:
-                    return QVariant::fromValue<void *>((void *)&m_servers[row]);
-                default:
-                    return QVariant();
+                    case Qt::DisplayRole:
+                        return m_servers[row].m_name;
+                    case ServerPtrRole:
+                        return QVariant::fromValue<void*>((void*)&m_servers[row]);
+                    default:
+                        return QVariant();
                 }
             case 1:
-                switch (role)
-                {
-                case Qt::DisplayRole:
-                    return m_servers[row].m_address;
-                default:
-                    return QVariant();
+                switch (role) {
+                    case Qt::DisplayRole:
+                        return m_servers[row].m_address;
+                    default:
+                        return QVariant();
                 }
             case 2:
-                switch (role)
-                {
-                case Qt::DisplayRole:
-                    return m_servers[row].m_ping;
-                default:
-                    return QVariant();
+                switch (role) {
+                    case Qt::DisplayRole:
+                        return m_servers[row].m_ping;
+                    default:
+                        return QVariant();
                 }
             default:
                 return QVariant();
         }
     }
 
-    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override
+    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override
     {
         return parent.isValid() ? 0 : m_servers.size();
     }
-    int columnCount(const QModelIndex & parent) const override
+    int columnCount(const QModelIndex& parent) const override
     {
         return parent.isValid() ? 0 : COLUMN_COUNT;
     }
 
-    Server * at(int index)
+    Server* at(int index)
     {
-        if(index < 0 || index >= rowCount())
-        {
+        if (index < 0 || index >= rowCount()) {
             return nullptr;
         }
         return &m_servers[index];
     }
 
-    void setName(int row, const QString & name)
+    void setName(int row, const QString& name)
     {
-        if(m_locked)
-        {
+        if (m_locked) {
             return;
         }
         auto server = at(row);
-        if(!server || server->m_name == name)
-        {
+        if (!server || server->m_name == name) {
             return;
         }
         server->m_name = name;
@@ -435,15 +385,13 @@ public:
         scheduleSave();
     }
 
-    void setAddress(int row, const QString & address)
+    void setAddress(int row, const QString& address)
     {
-        if(m_locked)
-        {
+        if (m_locked) {
             return;
         }
         auto server = at(row);
-        if(!server || server->m_address == address)
-        {
+        if (!server || server->m_address == address) {
             return;
         }
         server->m_address = address;
@@ -453,13 +401,11 @@ public:
 
     void setAcceptsTextures(int row, Server::AcceptsTextures textures)
     {
-        if(m_locked)
-        {
+        if (m_locked) {
             return;
         }
         auto server = at(row);
-        if(!server || server->m_acceptsTextures == textures)
-        {
+        if (!server || server->m_acceptsTextures == textures) {
             return;
         }
         server->m_acceptsTextures = textures;
@@ -473,12 +419,10 @@ public:
         beginResetModel();
         QList<Server> servers;
         auto serversDat = parseServersDat(serversPath());
-        if(serversDat)
-        {
-            auto &serversList = serversDat->at("servers").as<nbt::tag_list>();
-            for(auto iter = serversList.begin(); iter != serversList.end(); iter++)
-            {
-                auto & serverTag = (*iter).as<nbt::tag_compound>();
+        if (serversDat) {
+            auto& serversList = serversDat->at("servers").as<nbt::tag_list>();
+            for (auto iter = serversList.begin(); iter != serversList.end(); iter++) {
+                auto& serverTag = (*iter).as<nbt::tag_compound>();
                 Server s(serverTag);
                 servers.append(s);
             }
@@ -490,14 +434,12 @@ public:
 
     void saveNow()
     {
-        if(saveIsScheduled())
-        {
+        if (saveIsScheduled()) {
             save_internal();
         }
     }
 
-
-public slots:
+   public slots:
     void dirChanged(const QString& path)
     {
         qDebug() << "Changed:" << path;
@@ -508,7 +450,7 @@ public slots:
         qDebug() << "Changed:" << path;
     }
 
-private slots:
+   private slots:
     void save_internal()
     {
         cancelSave();
@@ -517,31 +459,27 @@ private slots:
 
         nbt::tag_compound out;
         nbt::tag_list list;
-        for(auto & server: m_servers)
-        {
+        for (auto& server : m_servers) {
             nbt::tag_compound serverNbt;
             server.serialize(serverNbt);
             list.push_back(std::move(serverNbt));
         }
         out.insert("servers", nbt::value(std::move(list)));
 
-        if(!serializeServerDat(path, &out))
-        {
+        if (!serializeServerDat(path, &out)) {
             qDebug() << "Failed to save server list:" << path << "Will try again.";
             scheduleSave();
         }
     }
 
-private:
+   private:
     void scheduleSave()
     {
-        if(!m_loaded)
-        {
+        if (!m_loaded) {
             qDebug() << "Server list should never save if it didn't successfully load, path:" << m_path;
             return;
         }
-        if(!m_dirty)
-        {
+        if (!m_dirty) {
             m_dirty = true;
             qDebug() << "Server list save is scheduled for" << m_path;
         }
@@ -562,24 +500,17 @@ private:
     void updateFSObserver()
     {
         bool observingFS = m_watcher->directories().contains(m_path);
-        if(m_observed && m_locked)
-        {
-            if(!observingFS)
-            {
+        if (m_observed && m_locked) {
+            if (!observingFS) {
                 qWarning() << "Will watch" << m_path;
-                if(!m_watcher->addPath(m_path))
-                {
+                if (!m_watcher->addPath(m_path)) {
                     qWarning() << "Failed to start watching" << m_path;
                 }
             }
-        }
-        else
-        {
-            if(observingFS)
-            {
+        } else {
+            if (observingFS) {
                 qWarning() << "Will stop watching" << m_path;
-                if(!m_watcher->removePath(m_path))
-                {
+                if (!m_watcher->removePath(m_path)) {
                     qWarning() << "Failed to stop watching" << m_path;
                 }
             }
@@ -592,34 +523,31 @@ private:
         return foo.filePath();
     }
 
-private:
+   private:
     bool m_loaded = false;
     bool m_locked = false;
     bool m_observed = false;
     bool m_dirty = false;
     QString m_path;
     QList<Server> m_servers;
-    QFileSystemWatcher *m_watcher = nullptr;
+    QFileSystemWatcher* m_watcher = nullptr;
     QTimer m_saveTimer;
 };
 
-ServersPage::ServersPage(InstancePtr inst, QWidget* parent)
-    : QMainWindow(parent), ui(new Ui::ServersPage)
+ServersPage::ServersPage(InstancePtr inst, QWidget* parent) : QMainWindow(parent), ui(new Ui::ServersPage)
 {
     ui->setupUi(this);
     m_inst = inst;
     m_model = new ServersModel(inst->gameRoot(), this);
-    ui->serversView->setIconSize(QSize(64,64));
+    ui->serversView->setIconSize(QSize(64, 64));
     ui->serversView->setModel(m_model);
     ui->serversView->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(ui->serversView, &QTreeView::customContextMenuRequested, this, &ServersPage::ShowContextMenu);
 
     auto head = ui->serversView->header();
-    if(head->count())
-    {
+    if (head->count()) {
         head->setSectionResizeMode(0, QHeaderView::Stretch);
-        for(int i = 1; i < head->count(); i++)
-        {
+        for (int i = 1; i < head->count(); i++) {
             head->setSectionResizeMode(i, QHeaderView::ResizeToContents);
         }
     }
@@ -633,8 +561,7 @@ ServersPage::ServersPage(InstancePtr inst, QWidget* parent)
     connect(m_model, &QAbstractItemModel::rowsRemoved, this, &ServersPage::rowsRemoved);
 
     m_locked = m_inst->isRunning();
-    if(m_locked)
-    {
+    if (m_locked) {
         m_model->lock();
     }
 
@@ -659,40 +586,33 @@ void ServersPage::ShowContextMenu(const QPoint& pos)
     delete menu;
 }
 
-QMenu * ServersPage::createPopupMenu()
+QMenu* ServersPage::createPopupMenu()
 {
     QMenu* filteredMenu = QMainWindow::createPopupMenu();
-    filteredMenu->removeAction( ui->toolBar->toggleViewAction() );
+    filteredMenu->removeAction(ui->toolBar->toggleViewAction());
     return filteredMenu;
 }
 
 void ServersPage::runningStateChanged(bool running)
 {
-    if(m_locked == running)
-    {
+    if (m_locked == running) {
         return;
     }
     m_locked = running;
-    if(m_locked)
-    {
+    if (m_locked) {
         m_model->lock();
-    }
-    else
-    {
+    } else {
         m_model->unlock();
     }
     updateState();
 }
 
-void ServersPage::currentChanged(const QModelIndex &current, const QModelIndex &previous)
+void ServersPage::currentChanged(const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
 {
     int nextServer = -1;
-    if (!current.isValid())
-    {
+    if (!current.isValid()) {
         nextServer = -1;
-    }
-    else
-    {
+    } else {
         nextServer = current.row();
     }
     currentServer = nextServer;
@@ -700,20 +620,15 @@ void ServersPage::currentChanged(const QModelIndex &current, const QModelIndex &
 }
 
 // WARNING: this is here because currentChanged is not accurate when removing rows. the current item needs to be fixed up after removal.
-void ServersPage::rowsRemoved(const QModelIndex& parent, int first, int last)
+void ServersPage::rowsRemoved([[maybe_unused]] const QModelIndex& parent, int first, int last)
 {
-    if(currentServer < first)
-    {
+    if (currentServer < first) {
         // current was before the removal
         return;
-    }
-    else if(currentServer >= first && currentServer <= last)
-    {
+    } else if (currentServer >= first && currentServer <= last) {
         // current got removed...
         return;
-    }
-    else
-    {
+    } else {
         // current was past the removal
         int count = last - first + 1;
         currentServer -= count;
@@ -749,14 +664,11 @@ void ServersPage::updateState()
     ui->actionRemove->setEnabled(serverEditEnabled);
     ui->actionJoin->setEnabled(serverEditEnabled);
 
-    if(server)
-    {
+    if (server) {
         ui->addressLine->setText(server->m_address);
         ui->nameLine->setText(server->m_name);
         ui->resourceComboBox->setCurrentIndex(int(server->m_acceptsTextures));
-    }
-    else
-    {
+    } else {
         ui->addressLine->setText(QString());
         ui->nameLine->setText(QString());
         ui->resourceComboBox->setCurrentIndex(0);
@@ -788,27 +700,25 @@ void ServersPage::closedImpl()
 void ServersPage::on_actionAdd_triggered()
 {
     int position = m_model->addEmptyRow(currentServer + 1);
-    if(position < 0)
-    {
+    if (position < 0) {
         return;
     }
     // select the new row
     ui->serversView->selectionModel()->setCurrentIndex(
-        m_model->index(position),
-        QItemSelectionModel::SelectCurrent | QItemSelectionModel::Clear | QItemSelectionModel::Rows
-    );
+        m_model->index(position), QItemSelectionModel::SelectCurrent | QItemSelectionModel::Clear | QItemSelectionModel::Rows);
     currentServer = position;
 }
 
 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();
+    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;
@@ -818,23 +728,21 @@ void ServersPage::on_actionRemove_triggered()
 
 void ServersPage::on_actionMove_Up_triggered()
 {
-    if(m_model->moveUp(currentServer))
-    {
-        currentServer --;
+    if (m_model->moveUp(currentServer)) {
+        currentServer--;
     }
 }
 
 void ServersPage::on_actionMove_Down_triggered()
 {
-    if(m_model->moveDown(currentServer))
-    {
-        currentServer ++;
+    if (m_model->moveDown(currentServer)) {
+        currentServer++;
     }
 }
 
 void ServersPage::on_actionJoin_triggered()
 {
-    const auto &address = m_model->at(currentServer)->m_address;
+    const auto& address = m_model->at(currentServer)->m_address;
     APPLICATION->launch(m_inst, true, false, nullptr, std::make_shared<MinecraftServerTarget>(MinecraftServerTarget::parse(address)));
 }
 
diff --git a/launcher/ui/pages/instance/ServersPage.h b/launcher/ui/pages/instance/ServersPage.h
index 476e7d70..a27d1d29 100644
--- a/launcher/ui/pages/instance/ServersPage.h
+++ b/launcher/ui/pages/instance/ServersPage.h
@@ -1,6 +1,6 @@
 // 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>
  *
@@ -39,13 +39,12 @@
 #include <QMainWindow>
 #include <QString>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
+#include "ui/pages/BasePage.h"
 
 #include "settings/Setting.h"
 
-namespace Ui
-{
+namespace Ui {
 class ServersPage;
 }
 
@@ -53,46 +52,33 @@ struct Server;
 class ServersModel;
 class MinecraftInstance;
 
-class ServersPage : public QMainWindow, public BasePage
-{
+class ServersPage : public QMainWindow, public BasePage {
     Q_OBJECT
 
-public:
-    explicit ServersPage(InstancePtr inst, QWidget *parent = 0);
+   public:
+    explicit ServersPage(InstancePtr inst, QWidget* parent = 0);
     virtual ~ServersPage();
 
     void openedImpl() override;
     void closedImpl() override;
 
-    virtual QString displayName() const override
-    {
-        return tr("Servers");
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("server");
-    }
-    virtual QString id() const override
-    {
-        return "servers";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Servers-management";
-    }
+    virtual QString displayName() const override { return tr("Servers"); }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("server"); }
+    virtual QString id() const override { return "servers"; }
+    virtual QString helpPage() const override { return "Servers-management"; }
     void retranslate() override;
 
-protected:
-    QMenu * createPopupMenu() override;
+   protected:
+    QMenu* createPopupMenu() override;
 
-private:
+   private:
     void updateState();
     void scheduleSave();
     bool saveIsScheduled() const;
 
-private slots:
-    void currentChanged(const QModelIndex &current, const QModelIndex &previous);
-    void rowsRemoved(const QModelIndex &parent, int first, int last);
+   private slots:
+    void currentChanged(const QModelIndex& current, const QModelIndex& previous);
+    void rowsRemoved(const QModelIndex& parent, int first, int last);
 
     void on_actionAdd_triggered();
     void on_actionRemove_triggered();
@@ -102,19 +88,18 @@ private slots:
 
     void runningStateChanged(bool running);
 
-    void nameEdited(const QString & name);
-    void addressEdited(const QString & address);
-    void resourceIndexChanged(int index);\
+    void nameEdited(const QString& name);
+    void addressEdited(const QString& address);
+    void resourceIndexChanged(int index);
 
-    void ShowContextMenu(const QPoint &pos);
+    void ShowContextMenu(const QPoint& pos);
 
-private: // data
+   private:  // data
     int currentServer = -1;
     bool m_locked = true;
-    Ui::ServersPage *ui = nullptr;
-    ServersModel * m_model = nullptr;
+    Ui::ServersPage* ui = nullptr;
+    ServersModel* m_model = nullptr;
     InstancePtr m_inst = nullptr;
 
     std::shared_ptr<Setting> m_wide_bar_setting = nullptr;
 };
-
diff --git a/launcher/ui/pages/instance/ShaderPackPage.h b/launcher/ui/pages/instance/ShaderPackPage.h
index a779fd8c..7c43a375 100644
--- a/launcher/ui/pages/instance/ShaderPackPage.h
+++ b/launcher/ui/pages/instance/ShaderPackPage.h
@@ -39,11 +39,10 @@
 
 #include "ExternalResourcesPage.h"
 
-class ShaderPackPage : public ExternalResourcesPage
-{
+class ShaderPackPage : public ExternalResourcesPage {
     Q_OBJECT
-public:
-    explicit ShaderPackPage(MinecraftInstance *instance, std::shared_ptr<ShaderPackFolderModel> model, QWidget *parent = nullptr);
+   public:
+    explicit ShaderPackPage(MinecraftInstance* instance, std::shared_ptr<ShaderPackFolderModel> model, QWidget* parent = nullptr);
     ~ShaderPackPage() override = default;
 
     QString displayName() const override { return tr("Shader packs"); }
diff --git a/launcher/ui/pages/instance/TexturePackPage.cpp b/launcher/ui/pages/instance/TexturePackPage.cpp
index e477ceda..fa478a9a 100644
--- a/launcher/ui/pages/instance/TexturePackPage.cpp
+++ b/launcher/ui/pages/instance/TexturePackPage.cpp
@@ -57,7 +57,7 @@ TexturePackPage::TexturePackPage(MinecraftInstance* instance, std::shared_ptr<Te
     ui->actionViewConfigs->setVisible(false);
 }
 
-bool TexturePackPage::onSelectionChanged(const QModelIndex& current, const QModelIndex& previous)
+bool TexturePackPage::onSelectionChanged(const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
 {
     auto sourceCurrent = m_filterModel->mapToSource(current);
     int row = sourceCurrent.row();
diff --git a/launcher/ui/pages/instance/TexturePackPage.h b/launcher/ui/pages/instance/TexturePackPage.h
index 47a8fa60..9c4f24b7 100644
--- a/launcher/ui/pages/instance/TexturePackPage.h
+++ b/launcher/ui/pages/instance/TexturePackPage.h
@@ -42,21 +42,17 @@
 
 #include "minecraft/mod/TexturePackFolderModel.h"
 
-class TexturePackPage : public ExternalResourcesPage
-{
+class TexturePackPage : public ExternalResourcesPage {
     Q_OBJECT
-public:
-    explicit TexturePackPage(MinecraftInstance *instance, std::shared_ptr<TexturePackFolderModel> model, QWidget* parent = nullptr);
+   public:
+    explicit TexturePackPage(MinecraftInstance* instance, std::shared_ptr<TexturePackFolderModel> model, QWidget* parent = nullptr);
 
     QString displayName() const override { return tr("Texture packs"); }
     QIcon icon() const override { return APPLICATION->getThemedIcon("resourcepacks"); }
     QString id() const override { return "texturepacks"; }
     QString helpPage() const override { return "Texture-packs"; }
 
-    virtual bool shouldDisplay() const override
-    {
-        return m_instance->traits().contains("texturepacks");
-    }
+    virtual bool shouldDisplay() const override { return m_instance->traits().contains("texturepacks"); }
 
    public slots:
     bool onSelectionChanged(const QModelIndex& current, const QModelIndex& previous) override;
diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp
index 9e34f766..ef029d1d 100644
--- a/launcher/ui/pages/instance/VersionPage.cpp
+++ b/launcher/ui/pages/instance/VersionPage.cpp
@@ -189,7 +189,7 @@ void VersionPage::showContextMenu(const QPoint& pos)
     delete menu;
 }
 
-void VersionPage::packageCurrent(const QModelIndex& current, const QModelIndex& previous)
+void VersionPage::packageCurrent(const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
 {
     if (!current.isValid()) {
         ui->frame->clear();
@@ -459,7 +459,7 @@ void VersionPage::on_actionMinecraftFolder_triggered()
     DesktopServices::openDirectory(m_inst->gameRoot(), true);
 }
 
-void VersionPage::versionCurrent(const QModelIndex& current, const QModelIndex& previous)
+void VersionPage::versionCurrent(const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
 {
     currentIdx = current.row();
     updateButtons(currentIdx);
diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp
index b2200b1a..587bb6ce 100644
--- a/launcher/ui/pages/instance/WorldListPage.cpp
+++ b/launcher/ui/pages/instance/WorldListPage.cpp
@@ -36,45 +36,42 @@
  */
 
 #include "WorldListPage.h"
+#include "minecraft/WorldList.h"
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui_WorldListPage.h"
-#include "minecraft/WorldList.h"
 
+#include <QClipboard>
 #include <QEvent>
-#include <QMenu>
+#include <QInputDialog>
 #include <QKeyEvent>
-#include <QClipboard>
+#include <QMenu>
 #include <QMessageBox>
 #include <QSortFilterProxyModel>
 #include <QTreeView>
-#include <QInputDialog>
 #include <Qt>
 
-#include "tools/MCEditTool.h"
 #include "FileSystem.h"
+#include "tools/MCEditTool.h"
 
-#include "ui/GuiUtil.h"
 #include "DesktopServices.h"
+#include "ui/GuiUtil.h"
 
 #include "Application.h"
 
-
-class WorldListProxyModel : public QSortFilterProxyModel
-{
+class WorldListProxyModel : public QSortFilterProxyModel {
     Q_OBJECT
 
-public:
-    WorldListProxyModel(QObject *parent) : QSortFilterProxyModel(parent) {}
+   public:
+    WorldListProxyModel(QObject* parent) : QSortFilterProxyModel(parent) {}
 
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const
     {
         QModelIndex sourceIndex = mapToSource(index);
 
-        if (index.column() == 0 && role == Qt::DecorationRole)
-        {
-            WorldList *worlds = qobject_cast<WorldList *>(sourceModel());
+        if (index.column() == 0 && role == Qt::DecorationRole) {
+            WorldList* worlds = qobject_cast<WorldList*>(sourceModel());
             auto iconFile = worlds->data(sourceIndex, WorldList::IconFileRole).toString();
-            if(iconFile.isNull()) {
+            if (iconFile.isNull()) {
                 // NOTE: Minecraft uses the same placeholder for servers AND worlds
                 return APPLICATION->getThemedIcon("unknown_server");
             }
@@ -85,15 +82,14 @@ public:
     }
 };
 
-
-WorldListPage::WorldListPage(BaseInstance *inst, std::shared_ptr<WorldList> worlds, QWidget *parent)
+WorldListPage::WorldListPage(BaseInstance* inst, std::shared_ptr<WorldList> worlds, QWidget* parent)
     : QMainWindow(parent), m_inst(inst), ui(new Ui::WorldListPage), m_worlds(worlds)
 {
     ui->setupUi(this);
 
     ui->toolBar->insertSpacer(ui->actionRefresh);
 
-    WorldListProxyModel * proxy = new WorldListProxyModel(this);
+    WorldListProxyModel* proxy = new WorldListProxyModel(this);
     proxy->setSortCaseSensitivity(Qt::CaseInsensitive);
     proxy->setSourceModel(m_worlds.get());
     proxy->setSortRole(Qt::UserRole);
@@ -101,7 +97,7 @@ WorldListPage::WorldListPage(BaseInstance *inst, std::shared_ptr<WorldList> worl
     ui->worldTreeView->setModel(proxy);
     ui->worldTreeView->installEventFilter(this);
     ui->worldTreeView->setContextMenuPolicy(Qt::CustomContextMenu);
-    ui->worldTreeView->setIconSize(QSize(64,64));
+    ui->worldTreeView->setIconSize(QSize(64, 64));
     connect(ui->worldTreeView, &QTreeView::customContextMenuRequested, this, &WorldListPage::ShowContextMenu);
 
     auto head = ui->worldTreeView->header();
@@ -146,10 +142,10 @@ void WorldListPage::ShowContextMenu(const QPoint& pos)
     delete menu;
 }
 
-QMenu * WorldListPage::createPopupMenu()
+QMenu* WorldListPage::createPopupMenu()
 {
     QMenu* filteredMenu = QMainWindow::createPopupMenu();
-    filteredMenu->removeAction( ui->toolBar->toggleViewAction() );
+    filteredMenu->removeAction(ui->toolBar->toggleViewAction());
     return filteredMenu;
 }
 
@@ -163,26 +159,24 @@ void WorldListPage::retranslate()
     ui->retranslateUi(this);
 }
 
-bool WorldListPage::worldListFilter(QKeyEvent *keyEvent)
+bool WorldListPage::worldListFilter(QKeyEvent* keyEvent)
 {
-    switch (keyEvent->key())
-    {
-    case Qt::Key_Delete:
-        on_actionRemove_triggered();
-        return true;
-    default:
-        break;
+    switch (keyEvent->key()) {
+        case Qt::Key_Delete:
+            on_actionRemove_triggered();
+            return true;
+        default:
+            break;
     }
     return QWidget::eventFilter(ui->worldTreeView, keyEvent);
 }
 
-bool WorldListPage::eventFilter(QObject *obj, QEvent *ev)
+bool WorldListPage::eventFilter(QObject* obj, QEvent* ev)
 {
-    if (ev->type() != QEvent::KeyPress)
-    {
+    if (ev->type() != QEvent::KeyPress) {
         return QWidget::eventFilter(obj, ev);
     }
-    QKeyEvent *keyEvent = static_cast<QKeyEvent *>(ev);
+    QKeyEvent* keyEvent = static_cast<QKeyEvent*>(ev);
     if (obj == ui->worldTreeView)
         return worldListFilter(keyEvent);
     return QWidget::eventFilter(obj, ev);
@@ -192,7 +186,7 @@ void WorldListPage::on_actionRemove_triggered()
 {
     auto proxiedIndex = getSelectedWorld();
 
-    if(!proxiedIndex.isValid())
+    if (!proxiedIndex.isValid())
         return;
 
     auto result = CustomMessageBox::selectable(this, tr("Confirm Deletion"),
@@ -203,8 +197,7 @@ void WorldListPage::on_actionRemove_triggered()
                                                QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
                       ->exec();
 
-    if(result != QMessageBox::Yes)
-    {
+    if (result != QMessageBox::Yes) {
         return;
     }
     m_worlds->stopWatching();
@@ -221,12 +214,11 @@ void WorldListPage::on_actionDatapacks_triggered()
 {
     QModelIndex index = getSelectedWorld();
 
-    if (!index.isValid())
-    {
+    if (!index.isValid()) {
         return;
     }
 
-    if(!worldSafetyNagQuestion(tr("Open World Datapacks Folder")))
+    if (!worldSafetyNagQuestion(tr("Open World Datapacks Folder")))
         return;
 
     auto fullPath = m_worlds->data(index, WorldList::FolderRole).toString();
@@ -234,25 +226,23 @@ void WorldListPage::on_actionDatapacks_triggered()
     DesktopServices::openDirectory(FS::PathCombine(fullPath, "datapacks"), true);
 }
 
-
 void WorldListPage::on_actionReset_Icon_triggered()
 {
     auto proxiedIndex = getSelectedWorld();
 
-    if(!proxiedIndex.isValid())
+    if (!proxiedIndex.isValid())
         return;
 
-    if(m_worlds->resetIcon(proxiedIndex.row())) {
+    if (m_worlds->resetIcon(proxiedIndex.row())) {
         ui->actionReset_Icon->setEnabled(false);
     }
 }
 
-
 QModelIndex WorldListPage::getSelectedWorld()
 {
     auto index = ui->worldTreeView->selectionModel()->currentIndex();
 
-    auto proxy = (QSortFilterProxyModel *) ui->worldTreeView->model();
+    auto proxy = (QSortFilterProxyModel*)ui->worldTreeView->model();
     return proxy->mapToSource(index);
 }
 
@@ -260,8 +250,7 @@ void WorldListPage::on_actionCopy_Seed_triggered()
 {
     QModelIndex index = getSelectedWorld();
 
-    if (!index.isValid())
-    {
+    if (!index.isValid()) {
         return;
     }
     int64_t seed = m_worlds->data(index, WorldList::SeedRole).toLongLong();
@@ -270,7 +259,7 @@ void WorldListPage::on_actionCopy_Seed_triggered()
 
 void WorldListPage::on_actionMCEdit_triggered()
 {
-    if(m_mceditStarting)
+    if (m_mceditStarting)
         return;
 
     auto mcedit = APPLICATION->mcedit();
@@ -279,81 +268,66 @@ void WorldListPage::on_actionMCEdit_triggered()
 
     QModelIndex index = getSelectedWorld();
 
-    if (!index.isValid())
-    {
+    if (!index.isValid()) {
         return;
     }
 
-    if(!worldSafetyNagQuestion(tr("Open World in MCEdit")))
+    if (!worldSafetyNagQuestion(tr("Open World in MCEdit")))
         return;
 
     auto fullPath = m_worlds->data(index, WorldList::FolderRole).toString();
 
     auto program = mcedit->getProgramPath();
-    if(program.size())
-    {
+    if (program.size()) {
 #ifdef Q_OS_WIN32
-        if(!QProcess::startDetached(program, {fullPath}, mceditPath))
-        {
+        if (!QProcess::startDetached(program, { fullPath }, mceditPath)) {
             mceditError();
         }
 #else
         m_mceditProcess.reset(new LoggedProcess());
         m_mceditProcess->setDetachable(true);
         connect(m_mceditProcess.get(), &LoggedProcess::stateChanged, this, &WorldListPage::mceditState);
-        m_mceditProcess->start(program, {fullPath});
+        m_mceditProcess->start(program, { fullPath });
         m_mceditProcess->setWorkingDirectory(mceditPath);
         m_mceditStarting = true;
 #endif
-    }
-    else
-    {
-        QMessageBox::warning(
-            this->parentWidget(),
-            tr("No MCEdit found or set up!"),
-            tr("You do not have MCEdit set up or it was moved.\nYou can set it up in the global settings.")
-        );
+    } else {
+        QMessageBox::warning(this->parentWidget(), tr("No MCEdit found or set up!"),
+                             tr("You do not have MCEdit set up or it was moved.\nYou can set it up in the global settings."));
     }
 }
 
 void WorldListPage::mceditError()
 {
-    QMessageBox::warning(
-        this->parentWidget(),
-        tr("MCEdit failed to start!"),
-        tr("MCEdit failed to start.\nIt may be necessary to reinstall it.")
-    );
+    QMessageBox::warning(this->parentWidget(), tr("MCEdit failed to start!"),
+                         tr("MCEdit failed to start.\nIt may be necessary to reinstall it."));
 }
 
 void WorldListPage::mceditState(LoggedProcess::State state)
 {
     bool failed = false;
-    switch(state)
-    {
+    switch (state) {
         case LoggedProcess::NotRunning:
         case LoggedProcess::Starting:
             return;
         case LoggedProcess::FailedToStart:
         case LoggedProcess::Crashed:
-        case LoggedProcess::Aborted:
-        {
+        case LoggedProcess::Aborted: {
             failed = true;
         }
         /* fallthrough */
         case LoggedProcess::Running:
-        case LoggedProcess::Finished:
-        {
+        case LoggedProcess::Finished: {
             m_mceditStarting = false;
             break;
         }
     }
-    if(failed)
-    {
+    if (failed) {
         mceditError();
     }
 }
 
-void WorldListPage::worldChanged(const QModelIndex &current, const QModelIndex &previous)
+void WorldListPage::worldChanged([[maybe_unused]] const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
 {
     QModelIndex index = getSelectedWorld();
     bool enable = index.isValid();
@@ -369,15 +343,11 @@ void WorldListPage::worldChanged(const QModelIndex &current, const QModelIndex &
 
 void WorldListPage::on_actionAdd_triggered()
 {
-    auto list = GuiUtil::BrowseForFiles(
-        displayName(),
-        tr("Select a Minecraft world zip"),
-        tr("Minecraft World Zip File (*.zip)"), QString(), this->parentWidget());
-    if (!list.empty())
-    {
+    auto list = GuiUtil::BrowseForFiles(displayName(), tr("Select a Minecraft world zip"), tr("Minecraft World Zip File (*.zip)"),
+                                        QString(), this->parentWidget());
+    if (!list.empty()) {
         m_worlds->stopWatching();
-        for (auto filename : list)
-        {
+        for (auto filename : list) {
             m_worlds->installWorld(QFileInfo(filename));
         }
         m_worlds->startWatching();
@@ -389,38 +359,35 @@ bool WorldListPage::isWorldSafe(QModelIndex)
     return !m_inst->isRunning();
 }
 
-bool WorldListPage::worldSafetyNagQuestion(const QString &actionType)
+bool WorldListPage::worldSafetyNagQuestion(const QString& actionType)
 {
-    if(!isWorldSafe(getSelectedWorld()))
-    {
-        auto result = QMessageBox::question(this, actionType, tr("Changing a world while Minecraft is running is potentially unsafe.\nDo you wish to proceed?"));
-        if(result == QMessageBox::No)
-        {
+    if (!isWorldSafe(getSelectedWorld())) {
+        auto result = QMessageBox::question(
+            this, actionType, tr("Changing a world while Minecraft is running is potentially unsafe.\nDo you wish to proceed?"));
+        if (result == QMessageBox::No) {
             return false;
         }
     }
     return true;
 }
 
-
 void WorldListPage::on_actionCopy_triggered()
 {
     QModelIndex index = getSelectedWorld();
-    if (!index.isValid())
-    {
+    if (!index.isValid()) {
         return;
     }
 
-    if(!worldSafetyNagQuestion(tr("Copy World")))
+    if (!worldSafetyNagQuestion(tr("Copy World")))
         return;
 
     auto worldVariant = m_worlds->data(index, WorldList::ObjectRole);
-    auto world = (World *) worldVariant.value<void *>();
+    auto world = (World*)worldVariant.value<void*>();
     bool ok = false;
-    QString name = QInputDialog::getText(this, tr("World name"), tr("Enter a new name for the copy."), QLineEdit::Normal, world->name(), &ok);
+    QString name =
+        QInputDialog::getText(this, tr("World name"), tr("Enter a new name for the copy."), QLineEdit::Normal, world->name(), &ok);
 
-    if (ok && name.length() > 0)
-    {
+    if (ok && name.length() > 0) {
         world->install(m_worlds->dir().absolutePath(), name);
     }
 }
@@ -428,22 +395,20 @@ void WorldListPage::on_actionCopy_triggered()
 void WorldListPage::on_actionRename_triggered()
 {
     QModelIndex index = getSelectedWorld();
-    if (!index.isValid())
-    {
+    if (!index.isValid()) {
         return;
     }
 
-    if(!worldSafetyNagQuestion(tr("Rename World")))
+    if (!worldSafetyNagQuestion(tr("Rename World")))
         return;
 
     auto worldVariant = m_worlds->data(index, WorldList::ObjectRole);
-    auto world = (World *) worldVariant.value<void *>();
+    auto world = (World*)worldVariant.value<void*>();
 
     bool ok = false;
     QString name = QInputDialog::getText(this, tr("World name"), tr("Enter a new world name."), QLineEdit::Normal, world->name(), &ok);
 
-    if (ok && name.length() > 0)
-    {
+    if (ok && name.length() > 0) {
         world->rename(name);
     }
 }
diff --git a/launcher/ui/pages/instance/WorldListPage.h b/launcher/ui/pages/instance/WorldListPage.h
index 925521be..4f83002f 100644
--- a/launcher/ui/pages/instance/WorldListPage.h
+++ b/launcher/ui/pages/instance/WorldListPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,76 +37,58 @@
 
 #include <QMainWindow>
 
-#include "minecraft/MinecraftInstance.h"
-#include "ui/pages/BasePage.h"
 #include <Application.h>
 #include <LoggedProcess.h>
+#include "minecraft/MinecraftInstance.h"
+#include "ui/pages/BasePage.h"
 
 #include "settings/Setting.h"
 
 class WorldList;
-namespace Ui
-{
+namespace Ui {
 class WorldListPage;
 }
 
-class WorldListPage : public QMainWindow, public BasePage
-{
+class WorldListPage : public QMainWindow, public BasePage {
     Q_OBJECT
 
-public:
-    explicit WorldListPage(
-        BaseInstance *inst,
-        std::shared_ptr<WorldList> worlds,
-        QWidget *parent = 0
-    );
+   public:
+    explicit WorldListPage(BaseInstance* inst, std::shared_ptr<WorldList> worlds, QWidget* parent = 0);
     virtual ~WorldListPage();
 
-    virtual QString displayName() const override
-    {
-        return tr("Worlds");
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("worlds");
-    }
-    virtual QString id() const override
-    {
-        return "worlds";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Worlds";
-    }
+    virtual QString displayName() const override { return tr("Worlds"); }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("worlds"); }
+    virtual QString id() const override { return "worlds"; }
+    virtual QString helpPage() const override { return "Worlds"; }
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
     virtual void openedImpl() override;
     virtual void closedImpl() override;
 
-protected:
-    bool eventFilter(QObject *obj, QEvent *ev) override;
-    bool worldListFilter(QKeyEvent *ev);
-    QMenu * createPopupMenu() override;
+   protected:
+    bool eventFilter(QObject* obj, QEvent* ev) override;
+    bool worldListFilter(QKeyEvent* ev);
+    QMenu* createPopupMenu() override;
 
-protected:
-    BaseInstance *m_inst;
+   protected:
+    BaseInstance* m_inst;
 
-private:
+   private:
     QModelIndex getSelectedWorld();
     bool isWorldSafe(QModelIndex index);
-    bool worldSafetyNagQuestion(const QString &actionType);
+    bool worldSafetyNagQuestion(const QString& actionType);
     void mceditError();
 
-private:
-    Ui::WorldListPage *ui;
+   private:
+    Ui::WorldListPage* ui;
     std::shared_ptr<WorldList> m_worlds;
     unique_qobject_ptr<LoggedProcess> m_mceditProcess;
     bool m_mceditStarting = false;
 
     std::shared_ptr<Setting> m_wide_bar_setting = nullptr;
 
-private slots:
+   private slots:
     void on_actionCopy_Seed_triggered();
     void on_actionMCEdit_triggered();
     void on_actionRemove_triggered();
@@ -117,8 +99,8 @@ private slots:
     void on_actionView_Folder_triggered();
     void on_actionDatapacks_triggered();
     void on_actionReset_Icon_triggered();
-    void worldChanged(const QModelIndex &current, const QModelIndex &previous);
+    void worldChanged(const QModelIndex& current, const QModelIndex& previous);
     void mceditState(LoggedProcess::State state);
 
-    void ShowContextMenu(const QPoint &pos);
+    void ShowContextMenu(const QPoint& pos);
 };
diff --git a/launcher/ui/pages/modplatform/CustomPage.cpp b/launcher/ui/pages/modplatform/CustomPage.cpp
index e164171a..4ac21b01 100644
--- a/launcher/ui/pages/modplatform/CustomPage.cpp
+++ b/launcher/ui/pages/modplatform/CustomPage.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -46,8 +46,7 @@
 #include "minecraft/VanillaInstanceCreationTask.h"
 #include "ui/dialogs/NewInstanceDialog.h"
 
-CustomPage::CustomPage(NewInstanceDialog *dialog, QWidget *parent)
-    : QWidget(parent), dialog(dialog), ui(new Ui::CustomPage)
+CustomPage::CustomPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), dialog(dialog), ui(new Ui::CustomPage)
 {
     ui->setupUi(this);
     ui->tabWidget->tabBar()->hide();
@@ -68,19 +67,15 @@ CustomPage::CustomPage(NewInstanceDialog *dialog, QWidget *parent)
     connect(ui->quiltFilter, &QRadioButton::toggled, this, &CustomPage::loaderFilterChanged);
     connect(ui->liteLoaderFilter, &QRadioButton::toggled, this, &CustomPage::loaderFilterChanged);
     connect(ui->loaderRefreshBtn, &QPushButton::clicked, this, &CustomPage::loaderRefresh);
-
 }
 
 void CustomPage::openedImpl()
 {
-    if(!initialized)
-    {
+    if (!initialized) {
         auto vlist = APPLICATION->metadataIndex()->get("net.minecraft");
         ui->versionList->initialize(vlist.get());
         initialized = true;
-    }
-    else
-    {
+    } else {
         suggestCurrent();
     }
 }
@@ -92,7 +87,7 @@ void CustomPage::refresh()
 
 void CustomPage::loaderRefresh()
 {
-    if(ui->noneFilter->isChecked())
+    if (ui->noneFilter->isChecked())
         return;
     ui->loaderVersionList->loadList();
 }
@@ -100,17 +95,17 @@ void CustomPage::loaderRefresh()
 void CustomPage::filterChanged()
 {
     QStringList out;
-    if(ui->alphaFilter->isChecked())
+    if (ui->alphaFilter->isChecked())
         out << "(old_alpha)";
-    if(ui->betaFilter->isChecked())
+    if (ui->betaFilter->isChecked())
         out << "(old_beta)";
-    if(ui->snapshotFilter->isChecked())
+    if (ui->snapshotFilter->isChecked())
         out << "(snapshot)";
-    if(ui->oldSnapshotFilter->isChecked())
+    if (ui->oldSnapshotFilter->isChecked())
         out << "(old_snapshot)";
-    if(ui->releaseFilter->isChecked())
+    if (ui->releaseFilter->isChecked())
         out << "(release)";
-    if(ui->experimentsFilter->isChecked())
+    if (ui->experimentsFilter->isChecked())
         out << "(experiment)";
     auto regexp = out.join('|');
     ui->versionList->setFilter(BaseVersionList::TypeRole, new RegexpFilter(regexp, false));
@@ -119,49 +114,37 @@ void CustomPage::filterChanged()
 void CustomPage::loaderFilterChanged()
 {
     QString minecraftVersion;
-    if (m_selectedVersion)
-    {
+    if (m_selectedVersion) {
         minecraftVersion = m_selectedVersion->descriptor();
-    }
-    else
-    {
-        ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA"); // empty list
+    } else {
+        ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA");  // empty list
         ui->loaderVersionList->setEmptyString(tr("No Minecraft version is selected."));
         ui->loaderVersionList->setEmptyMode(VersionListView::String);
         return;
     }
-    if(ui->noneFilter->isChecked())
-    {
-        ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA"); // empty list
+    if (ui->noneFilter->isChecked()) {
+        ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA");  // empty list
         ui->loaderVersionList->setEmptyString(tr("No mod loader is selected."));
         ui->loaderVersionList->setEmptyMode(VersionListView::String);
         return;
-    }
-    else if(ui->forgeFilter->isChecked())
-    {
+    } else if (ui->forgeFilter->isChecked()) {
         ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, minecraftVersion);
         m_selectedLoader = "net.minecraftforge";
-    }
-    else if(ui->fabricFilter->isChecked())
-    {
+    } else if (ui->fabricFilter->isChecked()) {
         // FIXME: dirty hack because the launcher is unaware of Fabric's dependencies
-        if (Version(minecraftVersion) >= Version("1.14")) // Fabric/Quilt supported
+        if (Version(minecraftVersion) >= Version("1.14"))  // Fabric/Quilt supported
             ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "");
-        else // Fabric/Quilt unsupported
-            ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA"); // clear list
+        else                                                                                   // Fabric/Quilt unsupported
+            ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA");  // clear list
         m_selectedLoader = "net.fabricmc.fabric-loader";
-    }
-    else if(ui->quiltFilter->isChecked())
-    {
+    } else if (ui->quiltFilter->isChecked()) {
         // FIXME: dirty hack because the launcher is unaware of Quilt's dependencies (same as Fabric)
-        if (Version(minecraftVersion) >= Version("1.14")) // Fabric/Quilt supported
+        if (Version(minecraftVersion) >= Version("1.14"))  // Fabric/Quilt supported
             ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "");
-        else // Fabric/Quilt unsupported
-            ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA"); // clear list
+        else                                                                                   // Fabric/Quilt unsupported
+            ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, "AAA");  // clear list
         m_selectedLoader = "org.quiltmc.quilt-loader";
-    }
-    else if(ui->liteLoaderFilter->isChecked())
-    {
+    } else if (ui->liteLoaderFilter->isChecked()) {
         ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, minecraftVersion);
         m_selectedLoader = "com.mumfrey.liteloader";
     }
@@ -204,25 +187,21 @@ QString CustomPage::selectedLoader() const
 
 void CustomPage::suggestCurrent()
 {
-    if (!isOpened)
-    {
+    if (!isOpened) {
         return;
     }
-        
-    if(!m_selectedVersion)
-    {
+
+    if (!m_selectedVersion) {
         dialog->setSuggestedPack();
         return;
     }
 
     // There isn't a selected version if the version list is empty
-    if(ui->loaderVersionList->selectedVersion() == nullptr)
+    if (ui->loaderVersionList->selectedVersion() == nullptr)
         dialog->setSuggestedPack(m_selectedVersion->descriptor(), new VanillaCreationTask(m_selectedVersion));
-    else
-    {
+    else {
         dialog->setSuggestedPack(m_selectedVersion->descriptor(),
-                                 new VanillaCreationTask(m_selectedVersion, m_selectedLoader,
-                                                          m_selectedLoaderVersion));
+                                 new VanillaCreationTask(m_selectedVersion, m_selectedLoader, m_selectedLoaderVersion));
     }
     dialog->setSuggestedIcon("default");
 }
diff --git a/launcher/ui/pages/modplatform/CustomPage.h b/launcher/ui/pages/modplatform/CustomPage.h
index 8b5a5011..c5d6d5af 100644
--- a/launcher/ui/pages/modplatform/CustomPage.h
+++ b/launcher/ui/pages/modplatform/CustomPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,40 +37,26 @@
 
 #include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
 #include "tasks/Task.h"
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class CustomPage;
 }
 
 class NewInstanceDialog;
 
-class CustomPage : public QWidget, public BasePage
-{
+class CustomPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit CustomPage(NewInstanceDialog *dialog, QWidget *parent = 0);
+   public:
+    explicit CustomPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~CustomPage();
-    virtual QString displayName() const override
-    {
-        return tr("Custom");
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("minecraft");
-    }
-    virtual QString id() const override
-    {
-        return "vanilla";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Vanilla-platform";
-    }
+    virtual QString displayName() const override { return tr("Custom"); }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("minecraft"); }
+    virtual QString id() const override { return "vanilla"; }
+    virtual QString helpPage() const override { return "Vanilla-platform"; }
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
@@ -80,23 +66,23 @@ public:
     BaseVersion::Ptr selectedLoaderVersion() const;
     QString selectedLoader() const;
 
-public slots:
+   public slots:
     void setSelectedVersion(BaseVersion::Ptr version);
     void setSelectedLoaderVersion(BaseVersion::Ptr version);
 
-private slots:
+   private slots:
     void filterChanged();
     void loaderFilterChanged();
 
-private:
+   private:
     void refresh();
     void loaderRefresh();
     void suggestCurrent();
 
-private:
+   private:
     bool initialized = false;
-    NewInstanceDialog *dialog = nullptr;
-    Ui::CustomPage *ui = nullptr;
+    NewInstanceDialog* dialog = nullptr;
+    Ui::CustomPage* ui = nullptr;
     bool m_versionSetByUser = false;
     BaseVersion::Ptr m_selectedVersion;
     BaseVersion::Ptr m_selectedLoaderVersion;
diff --git a/launcher/ui/pages/modplatform/ImportPage.cpp b/launcher/ui/pages/modplatform/ImportPage.cpp
index 8250193a..ee8757f8 100644
--- a/launcher/ui/pages/modplatform/ImportPage.cpp
+++ b/launcher/ui/pages/modplatform/ImportPage.cpp
@@ -1,6 +1,6 @@
 // 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>
  *
@@ -43,8 +43,8 @@
 #include <QValidator>
 #include <utility>
 
-#include "ui/dialogs/NewInstanceDialog.h"
 #include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/NewInstanceDialog.h"
 
 #include "modplatform/flame/FlameAPI.h"
 
@@ -52,32 +52,24 @@
 
 #include "InstanceImportTask.h"
 
-
-class UrlValidator : public QValidator
-{
-public:
+class UrlValidator : public QValidator {
+   public:
     using QValidator::QValidator;
 
-    State validate(QString &in, int &pos) const
+    State validate(QString& in, [[maybe_unused]] int& pos) const
     {
         const QUrl url(in);
-        if (url.isValid() && !url.isRelative() && !url.isEmpty())
-        {
+        if (url.isValid() && !url.isRelative() && !url.isEmpty()) {
             return Acceptable;
-        }
-        else if (QFile::exists(in))
-        {
+        } else if (QFile::exists(in)) {
             return Acceptable;
-        }
-        else
-        {
+        } else {
             return Intermediate;
         }
     }
 };
 
-ImportPage::ImportPage(NewInstanceDialog* dialog, QWidget *parent)
-    : QWidget(parent), ui(new Ui::ImportPage), dialog(dialog)
+ImportPage::ImportPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), ui(new Ui::ImportPage), dialog(dialog)
 {
     ui->setupUi(this);
     ui->modpackEdit->setValidator(new UrlValidator(ui->modpackEdit));
@@ -138,7 +130,7 @@ void ImportPage::updateState()
 
             auto api = FlameAPI();
             auto job = api.getFile(addonId, fileId, array);
-            
+
             connect(job.get(), &NetJob::failed, this,
                     [this](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show(); });
             connect(job.get(), &NetJob::succeeded, this, [this, array, addonId, fileId] {
@@ -201,7 +193,8 @@ void ImportPage::setUrl(const QString& url)
     updateState();
 }
 
-void ImportPage::setExtraInfo(const QMap<QString, QString>& extra_info) {
+void ImportPage::setExtraInfo(const QMap<QString, QString>& extra_info)
+{
     m_extra_info = extra_info;
     updateState();
 }
@@ -212,29 +205,21 @@ void ImportPage::on_modpackBtn_clicked()
     //: Option for filtering for *.mrpack files when importing
     filter += ";;" + tr("Modrinth pack") + " (*.mrpack)";
     const QUrl url = QFileDialog::getOpenFileUrl(this, tr("Choose modpack"), modpackUrl(), filter);
-    if (url.isValid())
-    {
-        if (url.isLocalFile())
-        {
+    if (url.isValid()) {
+        if (url.isLocalFile()) {
             ui->modpackEdit->setText(url.toLocalFile());
-        }
-        else
-        {
+        } else {
             ui->modpackEdit->setText(url.toString());
         }
     }
 }
 
-
 QUrl ImportPage::modpackUrl() const
 {
     const QUrl url(ui->modpackEdit->text());
-    if (url.isValid() && !url.isRelative() && !url.host().isEmpty())
-    {
+    if (url.isValid() && !url.isRelative() && !url.host().isEmpty()) {
         return url;
-    }
-    else
-    {
+    } else {
         return QUrl::fromLocalFile(ui->modpackEdit->text());
     }
 }
diff --git a/launcher/ui/pages/modplatform/ImportPage.h b/launcher/ui/pages/modplatform/ImportPage.h
index 54640752..70d7736e 100644
--- a/launcher/ui/pages/modplatform/ImportPage.h
+++ b/launcher/ui/pages/modplatform/ImportPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,56 +37,41 @@
 
 #include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
 #include "tasks/Task.h"
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class ImportPage;
 }
 
 class NewInstanceDialog;
 
-class ImportPage : public QWidget, public BasePage
-{
+class ImportPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit ImportPage(NewInstanceDialog* dialog, QWidget *parent = 0);
+   public:
+    explicit ImportPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~ImportPage();
-    virtual QString displayName() const override
-    {
-        return tr("Import");
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("viewfolder");
-    }
-    virtual QString id() const override
-    {
-        return "import";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Zip-import";
-    }
+    virtual QString displayName() const override { return tr("Import"); }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("viewfolder"); }
+    virtual QString id() const override { return "import"; }
+    virtual QString helpPage() const override { return "Zip-import"; }
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
-    void setUrl(const QString & url);
+    void setUrl(const QString& url);
     void openedImpl() override;
     void setExtraInfo(const QMap<QString, QString>& extra_info);
-private slots:
+   private slots:
     void on_modpackBtn_clicked();
     void updateState();
 
-private:
+   private:
     QUrl modpackUrl() const;
 
-private:
-    Ui::ImportPage *ui = nullptr;
+   private:
+    Ui::ImportPage* ui = nullptr;
     NewInstanceDialog* dialog = nullptr;
     QMap<QString, QString> m_extra_info = {};
 };
-
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
index 3e0c0257..0a7edb7b 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -102,7 +102,7 @@ QHash<int, QByteArray> ResourceModel::roleNames() const
     return roles;
 }
 
-bool ResourceModel::setData(const QModelIndex& index, const QVariant& value, int role)
+bool ResourceModel::setData(const QModelIndex& index, const QVariant& value, [[maybe_unused]] int role)
 {
     int pos = index.row();
     if (pos >= m_packs.size() || pos < 0 || !index.isValid())
@@ -310,7 +310,7 @@ std::optional<QIcon> ResourceModel::getIcon(QModelIndex& index, const QUrl& url)
 #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
+QJsonArray ResourceModel::documentToArray([[maybe_unused]] QJsonDocument& doc) const
 {
     NEED_FOR_CALLBACK_ASSERT("documentToArray");
     return {};
@@ -372,7 +372,7 @@ void ResourceModel::searchRequestSucceeded(QJsonDocument& doc)
     endInsertRows();
 }
 
-void ResourceModel::searchRequestFailed(QString reason, int network_error_code)
+void ResourceModel::searchRequestFailed([[maybe_unused]] QString reason, int network_error_code)
 {
     switch (network_error_code) {
         default:
diff --git a/launcher/ui/pages/modplatform/ResourceModel.h b/launcher/ui/pages/modplatform/ResourceModel.h
index 6533d9c6..cc813d6e 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.h
+++ b/launcher/ui/pages/modplatform/ResourceModel.h
@@ -42,7 +42,10 @@ class ResourceModel : public QAbstractListModel {
     [[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 rowCount(const QModelIndex& parent) const override
+    {
+        return parent.isValid() ? 0 : static_cast<int>(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); }
 
diff --git a/launcher/ui/pages/modplatform/ResourcePackModel.cpp b/launcher/ui/pages/modplatform/ResourcePackModel.cpp
index 18c14bf8..d436f320 100644
--- a/launcher/ui/pages/modplatform/ResourcePackModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePackModel.cpp
@@ -9,7 +9,8 @@
 namespace ResourceDownload {
 
 ResourcePackResourceModel::ResourcePackResourceModel(BaseInstance const& base_inst, ResourceAPI* api)
-    : ResourceModel(api), m_base_instance(base_inst){};
+    : ResourceModel(api), m_base_instance(base_inst)
+{}
 
 /******** Make data requests ********/
 
diff --git a/launcher/ui/pages/modplatform/ResourcePackPage.cpp b/launcher/ui/pages/modplatform/ResourcePackPage.cpp
index 52fb4802..2a4d0281 100644
--- a/launcher/ui/pages/modplatform/ResourcePackPage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePackPage.cpp
@@ -13,8 +13,7 @@
 
 namespace ResourceDownload {
 
-ResourcePackResourcePage::ResourcePackResourcePage(ResourceDownloadDialog* dialog, BaseInstance& instance)
-    : ResourcePage(dialog, instance)
+ResourcePackResourcePage::ResourcePackResourcePage(ResourceDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance)
 {
     connect(m_ui->searchButton, &QPushButton::clicked, this, &ResourcePackResourcePage::triggerSearch);
     connect(m_ui->packView, &QListView::doubleClicked, this, &ResourcePackResourcePage::onResourceSelected);
@@ -38,7 +37,8 @@ QMap<QString, QString> ResourcePackResourcePage::urlHandlers() const
 {
     QMap<QString, QString> map;
     map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?modrinth\\.com\\/resourcepack\\/([^\\/]+)\\/?"), "modrinth");
-    map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?curseforge\\.com\\/minecraft\\/texture-packs\\/([^\\/]+)\\/?"), "curseforge");
+    map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?curseforge\\.com\\/minecraft\\/texture-packs\\/([^\\/]+)\\/?"),
+               "curseforge");
     map.insert(QRegularExpression::anchoredPattern("minecraft\\.curseforge\\.com\\/projects\\/([^\\/]+)\\/?"), "curseforge");
     return map;
 }
diff --git a/launcher/ui/pages/modplatform/ResourcePackPage.h b/launcher/ui/pages/modplatform/ResourcePackPage.h
index 8c5cf08b..6015aec0 100644
--- a/launcher/ui/pages/modplatform/ResourcePackPage.h
+++ b/launcher/ui/pages/modplatform/ResourcePackPage.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "ui/pages/modplatform/ResourcePage.h"
 #include "ui/pages/modplatform/ResourcePackModel.h"
+#include "ui/pages/modplatform/ResourcePage.h"
 
 namespace Ui {
 class ResourcePage;
diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp
index d16ac6fd..c087e2be 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePage.cpp
@@ -280,7 +280,7 @@ void ResourcePage::updateVersionList()
     updateSelectionButton();
 }
 
-void ResourcePage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
+void ResourcePage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelIndex prev)
 {
     if (!curr.isValid()) {
         return;
@@ -307,9 +307,9 @@ void ResourcePage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
     updateUi();
 }
 
-void ResourcePage::onVersionSelectionChanged(QString data)
+void ResourcePage::onVersionSelectionChanged(QString versionData)
 {
-    if (data.isNull() || data.isEmpty()) {
+    if (versionData.isNull() || versionData.isEmpty()) {
         m_selected_version_index = -1;
         return;
     }
diff --git a/launcher/ui/pages/modplatform/ResourcePage.h b/launcher/ui/pages/modplatform/ResourcePage.h
index b4a87f57..7bec0a37 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.h
+++ b/launcher/ui/pages/modplatform/ResourcePage.h
@@ -97,7 +97,11 @@ class ResourcePage : public QWidget, public BasePage {
     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; };
+    virtual bool optedOut(ModPlatform::IndexedVersion& ver) const
+    {
+        Q_UNUSED(ver);
+        return false;
+    };
 
    public:
     BaseInstance& m_base_instance;
diff --git a/launcher/ui/pages/modplatform/ShaderPackModel.cpp b/launcher/ui/pages/modplatform/ShaderPackModel.cpp
index aabd3be6..8c913657 100644
--- a/launcher/ui/pages/modplatform/ShaderPackModel.cpp
+++ b/launcher/ui/pages/modplatform/ShaderPackModel.cpp
@@ -9,7 +9,8 @@
 namespace ResourceDownload {
 
 ShaderPackResourceModel::ShaderPackResourceModel(BaseInstance const& base_inst, ResourceAPI* api)
-    : ResourceModel(api), m_base_instance(base_inst){};
+    : ResourceModel(api), m_base_instance(base_inst)
+{}
 
 /******** Make data requests ********/
 
diff --git a/launcher/ui/pages/modplatform/TexturePackPage.h b/launcher/ui/pages/modplatform/TexturePackPage.h
index 0bdce2f9..948e5286 100644
--- a/launcher/ui/pages/modplatform/TexturePackPage.h
+++ b/launcher/ui/pages/modplatform/TexturePackPage.h
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "ui_ResourcePage.h"
 #include "ui/dialogs/ResourceDownloadDialog.h"
 #include "ui/pages/modplatform/ResourcePackPage.h"
 #include "ui/pages/modplatform/TexturePackModel.h"
+#include "ui_ResourcePage.h"
 
 namespace Ui {
 class ResourcePage;
@@ -39,8 +39,7 @@ class TexturePackResourcePage : public ResourcePackResourcePage {
     [[nodiscard]] inline QString resourceString() const override { return tr("texture pack"); }
 
    protected:
-    TexturePackResourcePage(TexturePackDownloadDialog* dialog, BaseInstance& instance)
-        : ResourcePackResourcePage(dialog, instance)
+    TexturePackResourcePage(TexturePackDownloadDialog* dialog, BaseInstance& instance) : ResourcePackResourcePage(dialog, instance)
     {
         connect(m_ui->searchButton, &QPushButton::clicked, this, &TexturePackResourcePage::triggerSearch);
         connect(m_ui->packView, &QListView::doubleClicked, this, &TexturePackResourcePage::onResourceSelected);
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.cpp
index 0887ebee..9cd5eed5 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.cpp
@@ -18,14 +18,14 @@
 
 #include <QDebug>
 
-#include <modplatform/atlauncher/ATLPackIndex.h>
 #include <Version.h>
+#include <modplatform/atlauncher/ATLPackIndex.h>
 
 #include "StringUtils.h"
 
 namespace Atl {
 
-FilterModel::FilterModel(QObject *parent) : QSortFilterProxyModel(parent)
+FilterModel::FilterModel(QObject* parent) : QSortFilterProxyModel(parent)
 {
     currentSorting = Sorting::ByPopularity;
     sortings.insert(tr("Sort by Popularity"), Sorting::ByPopularity);
@@ -62,7 +62,7 @@ void FilterModel::setSearchTerm(const QString term)
     invalidate();
 }
 
-bool FilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+bool FilterModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
 {
     if (searchTerm.isEmpty()) {
         return true;
@@ -73,20 +73,18 @@ bool FilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParen
     return pack.name.contains(searchTerm, Qt::CaseInsensitive);
 }
 
-bool FilterModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+bool FilterModel::lessThan(const QModelIndex& left, const QModelIndex& right) const
 {
     ATLauncher::IndexedPack leftPack = sourceModel()->data(left, Qt::UserRole).value<ATLauncher::IndexedPack>();
     ATLauncher::IndexedPack rightPack = sourceModel()->data(right, Qt::UserRole).value<ATLauncher::IndexedPack>();
 
     if (currentSorting == ByPopularity) {
         return leftPack.position > rightPack.position;
-    }
-    else if (currentSorting == ByGameVersion) {
+    } else if (currentSorting == ByGameVersion) {
         Version lv(leftPack.versions.at(0).minecraft);
         Version rv(rightPack.versions.at(0).minecraft);
         return lv < rv;
-    }
-    else if (currentSorting == ByName) {
+    } else if (currentSorting == ByName) {
         return StringUtils::naturalCompare(leftPack.name, rightPack.name, Qt::CaseSensitive) >= 0;
     }
 
@@ -95,4 +93,4 @@ bool FilterModel::lessThan(const QModelIndex &left, const QModelIndex &right) co
     return true;
 }
 
-}
+}  // namespace Atl
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.h b/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.h
index 5235ccdb..0ab46ed2 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.h
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.h
@@ -20,10 +20,9 @@
 
 namespace Atl {
 
-class FilterModel : public QSortFilterProxyModel
-{
+class FilterModel : public QSortFilterProxyModel {
     Q_OBJECT
-public:
+   public:
     FilterModel(QObject* parent = Q_NULLPTR);
     enum Sorting {
         ByPopularity,
@@ -36,15 +35,14 @@ public:
     Sorting getCurrentSorting();
     void setSearchTerm(QString term);
 
-protected:
-    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
-    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
+   protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
+    bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
 
-private:
+   private:
     QMap<QString, Sorting> sortings;
     Sorting currentSorting;
     QString searchTerm;
-
 };
 
-}
+}  // namespace Atl
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
index 267894bf..6fb86773 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -38,17 +38,15 @@
 
 #include <QInputDialog>
 #include <QMessageBox>
+#include "Application.h"
 #include "BuildConfig.h"
 #include "Json.h"
 #include "modplatform/atlauncher/ATLShareCode.h"
-#include "Application.h"
 
 #include "net/ApiDownload.h"
 
 AtlOptionalModListModel::AtlOptionalModListModel(QWidget* parent, ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods)
-    : QAbstractListModel(parent)
-    , m_version(version)
-    , m_mods(mods)
+    : QAbstractListModel(parent), m_version(version), m_mods(mods)
 {
     // fill mod index
     for (int i = 0; i < m_mods.size(); i++) {
@@ -64,7 +62,8 @@ AtlOptionalModListModel::AtlOptionalModListModel(QWidget* parent, ATLauncher::Pa
     }
 }
 
-QVector<QString> AtlOptionalModListModel::getResult() {
+QVector<QString> AtlOptionalModListModel::getResult()
+{
     QVector<QString> result;
 
     for (const auto& mod : m_mods) {
@@ -76,16 +75,19 @@ QVector<QString> AtlOptionalModListModel::getResult() {
     return result;
 }
 
-int AtlOptionalModListModel::rowCount(const QModelIndex &parent) const {
+int AtlOptionalModListModel::rowCount(const QModelIndex& parent) const
+{
     return parent.isValid() ? 0 : m_mods.size();
 }
 
-int AtlOptionalModListModel::columnCount(const QModelIndex &parent) const {
+int AtlOptionalModListModel::columnCount(const QModelIndex& parent) const
+{
     // Enabled, Name, Description
     return parent.isValid() ? 0 : 3;
 }
 
-QVariant AtlOptionalModListModel::data(const QModelIndex &index, int role) const {
+QVariant AtlOptionalModListModel::data(const QModelIndex& index, int role) const
+{
     auto row = index.row();
     auto mod = m_mods.at(row);
 
@@ -96,18 +98,15 @@ QVariant AtlOptionalModListModel::data(const QModelIndex &index, int role) const
         if (index.column() == DescriptionColumn) {
             return mod.description;
         }
-    }
-    else if (role == Qt::ToolTipRole) {
+    } else if (role == Qt::ToolTipRole) {
         if (index.column() == DescriptionColumn) {
             return mod.description;
         }
-    }
-    else if (role == Qt::ForegroundRole) {
+    } else if (role == Qt::ForegroundRole) {
         if (!mod.colour.isEmpty() && m_version.colours.contains(mod.colour)) {
             return QColor(QString("#%1").arg(m_version.colours[mod.colour]));
         }
-    }
-    else if (role == Qt::CheckStateRole) {
+    } else if (role == Qt::CheckStateRole) {
         if (index.column() == EnabledColumn) {
             return m_selection[mod.name] ? Qt::Checked : Qt::Unchecked;
         }
@@ -116,7 +115,8 @@ QVariant AtlOptionalModListModel::data(const QModelIndex &index, int role) const
     return {};
 }
 
-bool AtlOptionalModListModel::setData(const QModelIndex &index, const QVariant &value, int role) {
+bool AtlOptionalModListModel::setData(const QModelIndex& index, [[maybe_unused]] const QVariant& value, int role)
+{
     if (role == Qt::CheckStateRole) {
         auto row = index.row();
         auto mod = m_mods.at(row);
@@ -128,7 +128,8 @@ bool AtlOptionalModListModel::setData(const QModelIndex &index, const QVariant &
     return false;
 }
 
-QVariant AtlOptionalModListModel::headerData(int section, Qt::Orientation orientation, int role) const {
+QVariant AtlOptionalModListModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
     if (role == Qt::DisplayRole && orientation == Qt::Horizontal) {
         switch (section) {
             case EnabledColumn:
@@ -143,7 +144,8 @@ QVariant AtlOptionalModListModel::headerData(int section, Qt::Orientation orient
     return {};
 }
 
-Qt::ItemFlags AtlOptionalModListModel::flags(const QModelIndex &index) const {
+Qt::ItemFlags AtlOptionalModListModel::flags(const QModelIndex& index) const
+{
     auto flags = QAbstractListModel::flags(index);
     if (index.isValid() && index.column() == EnabledColumn) {
         flags |= Qt::ItemIsUserCheckable;
@@ -151,23 +153,23 @@ Qt::ItemFlags AtlOptionalModListModel::flags(const QModelIndex &index) const {
     return flags;
 }
 
-void AtlOptionalModListModel::useShareCode(const QString& code) {
+void AtlOptionalModListModel::useShareCode(const QString& code)
+{
     m_jobPtr.reset(new NetJob("Atl::Request", APPLICATION->network()));
     auto url = QString(BuildConfig.ATL_API_BASE_URL + "share-codes/" + code);
     m_jobPtr->addNetAction(Net::ApiDownload::makeByteArray(QUrl(url), m_response));
 
-    connect(m_jobPtr.get(), &NetJob::succeeded,
-            this, &AtlOptionalModListModel::shareCodeSuccess);
-    connect(m_jobPtr.get(), &NetJob::failed,
-            this, &AtlOptionalModListModel::shareCodeFailure);
+    connect(m_jobPtr.get(), &NetJob::succeeded, this, &AtlOptionalModListModel::shareCodeSuccess);
+    connect(m_jobPtr.get(), &NetJob::failed, this, &AtlOptionalModListModel::shareCodeFailure);
 
     m_jobPtr->start();
 }
 
-void AtlOptionalModListModel::shareCodeSuccess() {
+void AtlOptionalModListModel::shareCodeSuccess()
+{
     m_jobPtr.reset();
 
-    QJsonParseError parse_error {};
+    QJsonParseError parse_error{};
     auto doc = QJsonDocument::fromJson(*m_response, &parse_error);
     if (parse_error.error != QJsonParseError::NoError) {
         qWarning() << "Error while parsing JSON response from ATL at " << parse_error.offset << " reason: " << parse_error.errorString();
@@ -179,8 +181,7 @@ void AtlOptionalModListModel::shareCodeSuccess() {
     ATLauncher::ShareCodeResponse response;
     try {
         ATLauncher::loadShareCodeResponse(response, obj);
-    }
-    catch (const JSONValidationError& e) {
+    } catch (const JSONValidationError& e) {
         qDebug() << QString::fromUtf8(*m_response);
         qWarning() << "Error while reading response from ATLauncher: " << e.cause();
         return;
@@ -204,44 +205,44 @@ void AtlOptionalModListModel::shareCodeSuccess() {
         m_selection[mod.name] = mod.selected;
     }
 
-    emit dataChanged(AtlOptionalModListModel::index(0, EnabledColumn),
-                     AtlOptionalModListModel::index(m_mods.size() - 1, EnabledColumn));
+    emit dataChanged(AtlOptionalModListModel::index(0, EnabledColumn), AtlOptionalModListModel::index(m_mods.size() - 1, EnabledColumn));
 }
 
-void AtlOptionalModListModel::shareCodeFailure(const QString& reason) {
+void AtlOptionalModListModel::shareCodeFailure([[maybe_unused]] const QString& reason)
+{
     m_jobPtr.reset();
 
     // fixme: plumb in an error message
 }
 
-void AtlOptionalModListModel::selectRecommended() {
+void AtlOptionalModListModel::selectRecommended()
+{
     for (const auto& mod : m_mods) {
         m_selection[mod.name] = mod.recommended;
     }
 
-    emit dataChanged(AtlOptionalModListModel::index(0, EnabledColumn),
-                     AtlOptionalModListModel::index(m_mods.size() - 1, EnabledColumn));
+    emit dataChanged(AtlOptionalModListModel::index(0, EnabledColumn), AtlOptionalModListModel::index(m_mods.size() - 1, EnabledColumn));
 }
 
-void AtlOptionalModListModel::clearAll() {
+void AtlOptionalModListModel::clearAll()
+{
     for (const auto& mod : m_mods) {
         m_selection[mod.name] = false;
     }
 
-    emit dataChanged(AtlOptionalModListModel::index(0, EnabledColumn),
-                     AtlOptionalModListModel::index(m_mods.size() - 1, EnabledColumn));
+    emit dataChanged(AtlOptionalModListModel::index(0, EnabledColumn), AtlOptionalModListModel::index(m_mods.size() - 1, EnabledColumn));
 }
 
-void AtlOptionalModListModel::toggleMod(ATLauncher::VersionMod mod, int index) {
+void AtlOptionalModListModel::toggleMod(ATLauncher::VersionMod mod, int index)
+{
     auto enable = !m_selection[mod.name];
 
     // If there is a warning for the mod, display that first (if we would be enabling the mod)
     if (enable && !mod.warning.isEmpty() && m_version.warnings.contains(mod.warning)) {
-        auto message = QString("%1<br><br>%2")
-                           .arg(m_version.warnings[mod.warning], tr("Are you sure that you want to enable this mod?"));
+        auto message = QString("%1<br><br>%2").arg(m_version.warnings[mod.warning], tr("Are you sure that you want to enable this mod?"));
 
         // fixme: avoid casting here
-        auto result = QMessageBox::warning((QWidget*) this->parent(), tr("Warning"), message, QMessageBox::Yes | QMessageBox::No);
+        auto result = QMessageBox::warning((QWidget*)this->parent(), tr("Warning"), message, QMessageBox::Yes | QMessageBox::No);
         if (result != QMessageBox::Yes) {
             return;
         }
@@ -250,15 +251,18 @@ void AtlOptionalModListModel::toggleMod(ATLauncher::VersionMod mod, int index) {
     setMod(mod, index, enable);
 }
 
-void AtlOptionalModListModel::setMod(ATLauncher::VersionMod mod, int index, bool enable, bool shouldEmit) {
-    if (m_selection[mod.name] == enable) return;
+void AtlOptionalModListModel::setMod(ATLauncher::VersionMod mod, int index, bool enable, bool shouldEmit)
+{
+    if (m_selection[mod.name] == enable)
+        return;
 
     m_selection[mod.name] = enable;
 
     // disable other mods in the group, if applicable
     if (enable && !mod.group.isEmpty()) {
         for (int i = 0; i < m_mods.size(); i++) {
-            if (index == i) continue;
+            if (index == i)
+                continue;
             auto other = m_mods.at(i);
 
             if (mod.group == other.group) {
@@ -279,16 +283,15 @@ void AtlOptionalModListModel::setMod(ATLauncher::VersionMod mod, int index, bool
         // if the dependency is 'effectively hidden', then track which mods
         // depend on it - so we can efficiently disable it when no more dependents
         // depend on it.
-        auto dependants = m_dependants[dependencyName];
+        auto dependents = m_dependents[dependencyName];
 
         if (enable) {
-            dependants.append(mod.name);
-        }
-        else {
-            dependants.removeAll(mod.name);
+            dependents.append(mod.name);
+        } else {
+            dependents.removeAll(mod.name);
 
             // if there are no longer any dependents, let's disable the mod
-            if (dependencyMod.effectively_hidden && dependants.isEmpty()) {
+            if (dependencyMod.effectively_hidden && dependents.isEmpty()) {
                 setMod(dependencyMod, dependencyIndex, false, shouldEmit);
             }
         }
@@ -296,8 +299,8 @@ void AtlOptionalModListModel::setMod(ATLauncher::VersionMod mod, int index, bool
 
     // disable mods that depend on this one, if disabling
     if (!enable) {
-        auto dependants = m_dependants[mod.name];
-        for (const auto& dependencyName : dependants) {
+        auto dependents = m_dependents[mod.name];
+        for (const auto& dependencyName : dependents) {
             auto dependencyIndex = m_index[dependencyName];
             auto dependencyMod = m_mods.at(dependencyIndex);
 
@@ -306,14 +309,12 @@ void AtlOptionalModListModel::setMod(ATLauncher::VersionMod mod, int index, bool
     }
 
     if (shouldEmit) {
-        emit dataChanged(AtlOptionalModListModel::index(index, EnabledColumn),
-                         AtlOptionalModListModel::index(index, EnabledColumn));
+        emit dataChanged(AtlOptionalModListModel::index(index, EnabledColumn), AtlOptionalModListModel::index(index, EnabledColumn));
     }
 }
 
 AtlOptionalModDialog::AtlOptionalModDialog(QWidget* parent, ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods)
-    : QDialog(parent)
-    , ui(new Ui::AtlOptionalModDialog)
+    : QDialog(parent), ui(new Ui::AtlOptionalModDialog)
 {
     ui->setupUi(this);
 
@@ -321,35 +322,24 @@ AtlOptionalModDialog::AtlOptionalModDialog(QWidget* parent, ATLauncher::PackVers
     ui->treeView->setModel(listModel);
 
     ui->treeView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    ui->treeView->header()->setSectionResizeMode(
-            AtlOptionalModListModel::NameColumn, QHeaderView::ResizeToContents);
-    ui->treeView->header()->setSectionResizeMode(
-            AtlOptionalModListModel::DescriptionColumn, QHeaderView::Stretch);
-
-    connect(ui->shareCodeButton, &QPushButton::clicked,
-            this, &AtlOptionalModDialog::useShareCode);
-    connect(ui->selectRecommendedButton, &QPushButton::clicked,
-            listModel, &AtlOptionalModListModel::selectRecommended);
-    connect(ui->clearAllButton, &QPushButton::clicked,
-            listModel, &AtlOptionalModListModel::clearAll);
-    connect(ui->installButton, &QPushButton::clicked,
-            this, &QDialog::accept);
+    ui->treeView->header()->setSectionResizeMode(AtlOptionalModListModel::NameColumn, QHeaderView::ResizeToContents);
+    ui->treeView->header()->setSectionResizeMode(AtlOptionalModListModel::DescriptionColumn, QHeaderView::Stretch);
+
+    connect(ui->shareCodeButton, &QPushButton::clicked, this, &AtlOptionalModDialog::useShareCode);
+    connect(ui->selectRecommendedButton, &QPushButton::clicked, listModel, &AtlOptionalModListModel::selectRecommended);
+    connect(ui->clearAllButton, &QPushButton::clicked, listModel, &AtlOptionalModListModel::clearAll);
+    connect(ui->installButton, &QPushButton::clicked, this, &QDialog::accept);
 }
 
-AtlOptionalModDialog::~AtlOptionalModDialog() {
+AtlOptionalModDialog::~AtlOptionalModDialog()
+{
     delete ui;
 }
 
-void AtlOptionalModDialog::useShareCode() {
+void AtlOptionalModDialog::useShareCode()
+{
     bool ok;
-    auto shareCode = QInputDialog::getText(
-            this,
-            tr("Select a share code"),
-            tr("Share code:"),
-            QLineEdit::Normal,
-            "",
-            &ok
-            );
+    auto shareCode = QInputDialog::getText(this, tr("Select a share code"), tr("Share code:"), QLineEdit::Normal, "", &ok);
 
     if (!ok) {
         // If the user cancels the dialog, we don't need to show any error dialogs.
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.h b/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.h
index 639f0d48..55903003 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.h
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,8 +35,8 @@
 
 #pragma once
 
-#include <QDialog>
 #include <QAbstractListModel>
+#include <QDialog>
 
 #include "modplatform/atlauncher/ATLPackIndex.h"
 #include "net/NetJob.h"
@@ -48,37 +48,36 @@ class AtlOptionalModDialog;
 class AtlOptionalModListModel : public QAbstractListModel {
     Q_OBJECT
 
-public:
-    enum Columns
-    {
+   public:
+    enum Columns {
         EnabledColumn = 0,
         NameColumn,
         DescriptionColumn,
     };
 
-    AtlOptionalModListModel(QWidget *parent, ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods);
+    AtlOptionalModListModel(QWidget* parent, ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods);
 
     QVector<QString> getResult();
 
-    int rowCount(const QModelIndex &parent) const override;
-    int columnCount(const QModelIndex &parent) const override;
+    int rowCount(const QModelIndex& parent) const override;
+    int columnCount(const QModelIndex& parent) const override;
 
-    QVariant data(const QModelIndex &index, int role) const override;
-    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    QVariant data(const QModelIndex& index, int role) const override;
+    bool setData(const QModelIndex& index, const QVariant& value, int role) override;
     QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
 
-    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    Qt::ItemFlags flags(const QModelIndex& index) const override;
 
     void useShareCode(const QString& code);
 
-public slots:
+   public slots:
     void shareCodeSuccess();
     void shareCodeFailure(const QString& reason);
 
     void selectRecommended();
     void clearAll();
 
-private:
+   private:
     void toggleMod(ATLauncher::VersionMod mod, int index);
     void setMod(ATLauncher::VersionMod mod, int index, bool enable, bool shouldEmit = true);
 
@@ -91,24 +90,22 @@ private:
 
     QMap<QString, bool> m_selection;
     QMap<QString, int> m_index;
-    QMap<QString, QVector<QString>> m_dependants;
+    QMap<QString, QVector<QString>> m_dependents;
 };
 
 class AtlOptionalModDialog : public QDialog {
     Q_OBJECT
 
-public:
-    AtlOptionalModDialog(QWidget *parent, ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods);
+   public:
+    AtlOptionalModDialog(QWidget* parent, ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods);
     ~AtlOptionalModDialog() override;
 
-    QVector<QString> getResult() {
-        return listModel->getResult();
-    }
+    QVector<QString> getResult() { return listModel->getResult(); }
 
     void useShareCode();
 
-private:
-    Ui::AtlOptionalModDialog *ui;
+   private:
+    Ui::AtlOptionalModDialog* ui;
 
-    AtlOptionalModListModel *listModel;
+    AtlOptionalModListModel* listModel;
 };
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp
index 87544445..5e3b9ecf 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -46,10 +46,7 @@
 
 #include <QMessageBox>
 
-AtlPage::AtlPage(NewInstanceDialog* dialog, QWidget* parent)
-    : QWidget(parent)
-    , ui(new Ui::AtlPage)
-    , dialog(dialog)
+AtlPage::AtlPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), ui(new Ui::AtlPage), dialog(dialog)
 {
     ui->setupUi(this);
 
@@ -65,8 +62,7 @@ AtlPage::AtlPage(NewInstanceDialog* dialog, QWidget* parent)
     ui->versionSelectionBox->view()->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300);
 
-    for(int i = 0; i < filterModel->getAvailableSortings().size(); i++)
-    {
+    for (int i = 0; i < filterModel->getAvailableSortings().size(); i++) {
         ui->sortByBox->addItem(filterModel->getAvailableSortings().keys().at(i));
     }
     ui->sortByBox->setCurrentText(filterModel->translateCurrentSorting());
@@ -94,8 +90,7 @@ void AtlPage::retranslate()
 
 void AtlPage::openedImpl()
 {
-    if(!initialized)
-    {
+    if (!initialized) {
         listModel->request();
         initialized = true;
     }
@@ -105,13 +100,11 @@ void AtlPage::openedImpl()
 
 void AtlPage::suggestCurrent()
 {
-    if(!isOpened)
-    {
+    if (!isOpened) {
         return;
     }
 
-    if (selectedVersion.isEmpty())
-    {
+    if (selectedVersion.isEmpty()) {
         dialog->setSuggestedPack();
         return;
     }
@@ -121,10 +114,8 @@ void AtlPage::suggestCurrent()
 
     auto editedLogoName = selected.safeName;
     auto url = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "launcher/images/%1.png").arg(selected.safeName.toLower());
-    listModel->getLogo(selected.safeName, url, [this, editedLogoName](QString logo)
-    {
-        dialog->setSuggestedIconFromFile(logo, editedLogoName);
-    });
+    listModel->getLogo(selected.safeName, url,
+                       [this, editedLogoName](QString logo) { dialog->setSuggestedIconFromFile(logo, editedLogoName); });
 }
 
 void AtlPage::triggerSearch()
@@ -132,20 +123,18 @@ void AtlPage::triggerSearch()
     filterModel->setSearchTerm(ui->searchEdit->text());
 }
 
-void AtlPage::onSortingSelectionChanged(QString data)
+void AtlPage::onSortingSelectionChanged(QString sort)
 {
-    auto toSet = filterModel->getAvailableSortings().value(data);
+    auto toSet = filterModel->getAvailableSortings().value(sort);
     filterModel->setSorting(toSet);
 }
 
-void AtlPage::onSelectionChanged(QModelIndex first, QModelIndex second)
+void AtlPage::onSelectionChanged(QModelIndex first, [[maybe_unused]] QModelIndex second)
 {
     ui->versionSelectionBox->clear();
 
-    if(!first.isValid())
-    {
-        if(isOpened)
-        {
+    if (!first.isValid()) {
+        if (isOpened) {
             dialog->setSuggestedPack();
         }
         return;
@@ -155,21 +144,20 @@ void AtlPage::onSelectionChanged(QModelIndex first, QModelIndex second)
 
     ui->packDescription->setHtml(selected.description.replace("\n", "<br>"));
 
-    for(const auto& version : selected.versions) {
+    for (const auto& version : selected.versions) {
         ui->versionSelectionBox->addItem(version.version);
     }
 
     suggestCurrent();
 }
 
-void AtlPage::onVersionSelectionChanged(QString data)
+void AtlPage::onVersionSelectionChanged(QString version)
 {
-    if(data.isNull() || data.isEmpty())
-    {
+    if (version.isNull() || version.isEmpty()) {
         selectedVersion = "";
         return;
     }
 
-    selectedVersion = data;
+    selectedVersion = version;
     suggestCurrent();
 }
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlPage.h b/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
index 1b3b15c1..6bc44964 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -38,52 +38,38 @@
 #include "AtlFilterModel.h"
 #include "AtlListModel.h"
 
-#include <QWidget>
 #include <modplatform/atlauncher/ATLPackInstallTask.h>
+#include <QWidget>
 
 #include "Application.h"
-#include "ui/pages/BasePage.h"
 #include "tasks/Task.h"
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
-    class AtlPage;
+namespace Ui {
+class AtlPage;
 }
 
 class NewInstanceDialog;
 
-class AtlPage : public QWidget, public BasePage
-{
-Q_OBJECT
+class AtlPage : public QWidget, public BasePage {
+    Q_OBJECT
 
-public:
-    explicit AtlPage(NewInstanceDialog* dialog, QWidget *parent = 0);
+   public:
+    explicit AtlPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~AtlPage();
-    virtual QString displayName() const override
-    {
-        return "ATLauncher";
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("atlauncher");
-    }
-    virtual QString id() const override
-    {
-        return "atl";
-    }
-    virtual QString helpPage() const override
-    {
-        return "ATL-platform";
-    }
+    virtual QString displayName() const override { return "ATLauncher"; }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("atlauncher"); }
+    virtual QString id() const override { return "atl"; }
+    virtual QString helpPage() const override { return "ATL-platform"; }
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
     void openedImpl() override;
 
-private:
+   private:
     void suggestCurrent();
 
-private slots:
+   private slots:
     void triggerSearch();
 
     void onSortingSelectionChanged(QString data);
@@ -91,8 +77,8 @@ private slots:
     void onSelectionChanged(QModelIndex first, QModelIndex second);
     void onVersionSelectionChanged(QString data);
 
-private:
-    Ui::AtlPage *ui = nullptr;
+   private:
+    Ui::AtlPage* ui = nullptr;
     NewInstanceDialog* dialog = nullptr;
     Atl::ListModel* listModel = nullptr;
     Atl::FilterModel* filterModel = nullptr;
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
index 3d2d568a..0c725785 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -33,17 +33,16 @@
  *      limitations under the License.
  */
 
-#include <QMessageBox>
 #include "AtlUserInteractionSupportImpl.h"
+#include <QMessageBox>
 
 #include "AtlOptionalModDialog.h"
 #include "ui/dialogs/VersionSelectDialog.h"
 
-AtlUserInteractionSupportImpl::AtlUserInteractionSupportImpl(QWidget *parent) : m_parent(parent)
-{
-}
+AtlUserInteractionSupportImpl::AtlUserInteractionSupportImpl(QWidget* parent) : m_parent(parent) {}
 
-std::optional<QVector<QString>> AtlUserInteractionSupportImpl::chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods)
+std::optional<QVector<QString>> AtlUserInteractionSupportImpl::chooseOptionalMods(ATLauncher::PackVersion version,
+                                                                                  QVector<ATLauncher::VersionMod> mods)
 {
     AtlOptionalModDialog optionalModDialog(m_parent, version, mods);
     auto result = optionalModDialog.exec();
@@ -59,8 +58,7 @@ QString AtlUserInteractionSupportImpl::chooseVersion(Meta::VersionList::Ptr vlis
     if (minecraftVersion != nullptr) {
         vselect.setExactFilter(BaseVersionList::ParentVersionRole, minecraftVersion);
         vselect.setEmptyString(tr("No versions are currently available for Minecraft %1").arg(minecraftVersion));
-    }
-    else {
+    } else {
         vselect.setEmptyString(tr("No versions are currently available"));
     }
     vselect.setEmptyErrorString(tr("Couldn't load or download the version lists!"));
@@ -72,9 +70,7 @@ QString AtlUserInteractionSupportImpl::chooseVersion(Meta::VersionList::Ptr vlis
 
         // filter by minecraft version, if the loader depends on a certain version.
         if (minecraftVersion != nullptr) {
-            auto iter = std::find_if(reqs.begin(), reqs.end(), [](const Meta::Require& req) {
-                return req.uid == "net.minecraft";
-            });
+            auto iter = std::find_if(reqs.begin(), reqs.end(), [](const Meta::Require& req) { return req.uid == "net.minecraft"; });
             if (iter == reqs.end())
                 continue;
             if (iter->equalsVersion != minecraftVersion)
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h
index adeb53cb..52ced261 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/launcher/ui/pages/modplatform/flame/FlameModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
index e32024c4..ff21d010 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModel.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
@@ -72,7 +72,7 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
     return QVariant();
 }
 
-bool ListModel::setData(const QModelIndex& index, const QVariant& value, int role)
+bool ListModel::setData(const QModelIndex& index, const QVariant& value, [[maybe_unused]] int role)
 {
     int pos = index.row();
     if (pos >= modpacks.size() || pos < 0 || !index.isValid())
@@ -143,7 +143,7 @@ Qt::ItemFlags ListModel::flags(const QModelIndex& index) const
     return QAbstractListModel::flags(index);
 }
 
-bool ListModel::canFetchMore(const QModelIndex& parent) const
+bool ListModel::canFetchMore([[maybe_unused]] const QModelIndex& parent) const
 {
     return searchState == CanPossiblyFetchMore;
 }
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.cpp b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
index ada67644..183e16f9 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -116,7 +116,7 @@ void FlamePage::triggerSearch()
     listModel->searchWithTerm(ui->searchEdit->text(), ui->sortByBox->currentIndex());
 }
 
-void FlamePage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
+void FlamePage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelIndex prev)
 {
     ui->versionSelectionBox->clear();
 
@@ -134,7 +134,8 @@ void FlamePage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
         auto netJob = new NetJob(QString("Flame::PackVersions(%1)").arg(current.name), APPLICATION->network());
         auto response = std::make_shared<QByteArray>();
         int addonId = current.addonId;
-        netJob->addNetAction(Net::ApiDownload::makeByteArray(QString("https://api.curseforge.com/v1/mods/%1/files").arg(addonId), response));
+        netJob->addNetAction(
+            Net::ApiDownload::makeByteArray(QString("https://api.curseforge.com/v1/mods/%1/files").arg(addonId), response));
 
         QObject::connect(netJob, &NetJob::succeeded, this, [this, response, addonId, curr] {
             if (addonId != current.addonId) {
@@ -214,12 +215,12 @@ void FlamePage::suggestCurrent()
                        [this, editedLogoName](QString logo) { dialog->setSuggestedIconFromFile(logo, editedLogoName); });
 }
 
-void FlamePage::onVersionSelectionChanged(QString data)
+void FlamePage::onVersionSelectionChanged(QString version)
 {
     bool is_blocked = false;
     ui->versionSelectionBox->currentData().toInt(&is_blocked);
 
-    if (data.isNull() || data.isEmpty() || is_blocked) {
+    if (version.isNull() || version.isEmpty() || is_blocked) {
         m_selected_version_index = -1;
         return;
     }
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.h b/launcher/ui/pages/modplatform/flame/FlamePage.h
index 8bdca38e..ff5c7975 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.h
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,45 +37,31 @@
 
 #include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
-#include "tasks/Task.h"
 #include <modplatform/flame/FlamePackIndex.h>
+#include "tasks/Task.h"
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class FlamePage;
 }
 
 class NewInstanceDialog;
 
 namespace Flame {
-    class ListModel;
+class ListModel;
 }
 
-class FlamePage : public QWidget, public BasePage
-{
+class FlamePage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit FlamePage(NewInstanceDialog* dialog, QWidget *parent = 0);
+   public:
+    explicit FlamePage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~FlamePage();
-    virtual QString displayName() const override
-    {
-        return "CurseForge";
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("flame");
-    }
-    virtual QString id() const override
-    {
-        return "flame";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Flame-platform";
-    }
+    virtual QString displayName() const override { return "CurseForge"; }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("flame"); }
+    virtual QString id() const override { return "flame"; }
+    virtual QString helpPage() const override { return "Flame-platform"; }
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
@@ -83,18 +69,18 @@ public:
 
     void openedImpl() override;
 
-    bool eventFilter(QObject * watched, QEvent * event) override;
+    bool eventFilter(QObject* watched, QEvent* event) override;
 
-private:
+   private:
     void suggestCurrent();
 
-private slots:
+   private slots:
     void triggerSearch();
     void onSelectionChanged(QModelIndex first, QModelIndex second);
     void onVersionSelectionChanged(QString data);
 
-private:
-    Ui::FlamePage *ui = nullptr;
+   private:
+    Ui::FlamePage* ui = nullptr;
     NewInstanceDialog* dialog = nullptr;
     Flame::ListModel* listModel = nullptr;
     Flame::IndexedPack current;
diff --git a/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp b/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp
index 0fb67c50..2b020c48 100644
--- a/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp
@@ -32,7 +32,7 @@ void FlameModModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonAr
 auto FlameModModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
 {
     return FlameMod::loadDependencyVersions(m, arr);
-};
+}
 
 auto FlameModModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
diff --git a/launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp b/launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp
index f93e27e6..dc17e705 100644
--- a/launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp
@@ -49,8 +49,7 @@ static bool isOptedOut(ModPlatform::IndexedVersion const& ver)
     return ver.downloadUrl.isEmpty();
 }
 
-FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance& instance)
-    : ModPage(dialog, instance)
+FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance& instance) : ModPage(dialog, instance)
 {
     m_model = new FlameModModel(instance);
     m_ui->packView->setModel(m_model);
@@ -67,7 +66,9 @@ FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance& instance)
     m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-auto FlameModPage::validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, std::optional<ResourceAPI::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();
@@ -86,7 +87,7 @@ void FlameModPage::openUrl(const QUrl& url)
         if (query.startsWith("remoteUrl=")) {
             // attempt to resolve url from warning page
             query.remove(0, 10);
-            ModPage::openUrl({QUrl::fromPercentEncoding(query.toUtf8())}); // double decoding is necessary
+            ModPage::openUrl({ QUrl::fromPercentEncoding(query.toUtf8()) });  // double decoding is necessary
             return;
         }
     }
@@ -125,7 +126,7 @@ void FlameResourcePackPage::openUrl(const QUrl& url)
         if (query.startsWith("remoteUrl=")) {
             // attempt to resolve url from warning page
             query.remove(0, 10);
-            ResourcePackResourcePage::openUrl({QUrl::fromPercentEncoding(query.toUtf8())}); // double decoding is necessary
+            ResourcePackResourcePage::openUrl({ QUrl::fromPercentEncoding(query.toUtf8()) });  // double decoding is necessary
             return;
         }
     }
@@ -164,7 +165,7 @@ void FlameTexturePackPage::openUrl(const QUrl& url)
         if (query.startsWith("remoteUrl=")) {
             // attempt to resolve url from warning page
             query.remove(0, 10);
-            ResourcePackResourcePage::openUrl({QUrl::fromPercentEncoding(query.toUtf8())}); // double decoding is necessary
+            ResourcePackResourcePage::openUrl({ QUrl::fromPercentEncoding(query.toUtf8()) });  // double decoding is necessary
             return;
         }
     }
@@ -175,8 +176,17 @@ void FlameTexturePackPage::openUrl(const QUrl& url)
 // I don't know why, but doing this on the parent class makes it so that
 // other mod providers start loading before being selected, at least with
 // my Qt, so we need to implement this in every derived class...
-auto FlameModPage::shouldDisplay() const -> bool { return true; }
-auto FlameResourcePackPage::shouldDisplay() const -> bool { return true; }
-auto FlameTexturePackPage::shouldDisplay() const -> bool { return true; }
+auto FlameModPage::shouldDisplay() const -> bool
+{
+    return true;
+}
+auto FlameResourcePackPage::shouldDisplay() const -> bool
+{
+    return true;
+}
+auto FlameTexturePackPage::shouldDisplay() const -> bool
+{
+    return true;
+}
 
 }  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/flame/FlameResourcePages.h b/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
index 103a6bb9..c6ebc1ea 100644
--- a/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
+++ b/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
@@ -49,12 +49,27 @@
 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"; }
+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";
+}
+}  // namespace Flame
 
 class FlameModPage : public ModPage {
     Q_OBJECT
@@ -78,7 +93,9 @@ class FlameModPage : public ModPage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; }
 
-    bool validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, std::optional<ResourceAPI::ModLoaderTypes> loaders = {}) const 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;
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
index a42d4dad..356d919d 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,9 +35,9 @@
 
 #include "ListModel.h"
 #include "Application.h"
+#include "net/ApiDownload.h"
 #include "net/HttpMetaCache.h"
 #include "net/NetJob.h"
-#include "net/ApiDownload.h"
 
 #include <Version.h>
 #include "StringUtils.h"
@@ -77,7 +77,7 @@ bool FilterModel::lessThan(const QModelIndex& left, const QModelIndex& right) co
     return true;
 }
 
-bool FilterModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
+bool FilterModel::filterAcceptsRow([[maybe_unused]] int sourceRow, [[maybe_unused]] const QModelIndex& sourceParent) const
 {
     return true;
 }
@@ -174,10 +174,10 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
     return QVariant();
 }
 
-void ListModel::fill(ModpackList modpacks)
+void ListModel::fill(ModpackList modpacks_)
 {
     beginResetModel();
-    this->modpacks = modpacks;
+    this->modpacks = modpacks_;
     endResetModel();
 }
 
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.h b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.h
index c55df000..51a58d99 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.h
+++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <modplatform/legacy_ftb/PackHelpers.h>
 #include <RWStorage.h>
+#include <modplatform/legacy_ftb/PackHelpers.h>
 
 #include <QAbstractListModel>
-#include <QSortFilterProxyModel>
-#include <QThreadPool>
 #include <QIcon>
+#include <QSortFilterProxyModel>
 #include <QStyledItemDelegate>
+#include <QThreadPool>
 
 #include <functional>
 
@@ -16,34 +16,28 @@ namespace LegacyFTB {
 typedef QMap<QString, QIcon> FTBLogoMap;
 typedef std::function<void(QString)> LogoCallback;
 
-class FilterModel : public QSortFilterProxyModel
-{
+class FilterModel : public QSortFilterProxyModel {
     Q_OBJECT
-public:
+   public:
     FilterModel(QObject* parent = Q_NULLPTR);
-    enum Sorting {
-        ByName,
-        ByGameVersion
-    };
+    enum Sorting { ByName, ByGameVersion };
     const QMap<QString, Sorting> getAvailableSortings();
     QString translateCurrentSorting();
     void setSorting(Sorting sorting);
     Sorting getCurrentSorting();
 
-protected:
-    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
-    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
+   protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
+    bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
 
-private:
+   private:
     QMap<QString, Sorting> sortings;
     Sorting currentSorting;
-
 };
 
-class ListModel : public QAbstractListModel
-{
+class ListModel : public QAbstractListModel {
     Q_OBJECT
-private:
+   private:
     ModpackList modpacks;
     QStringList m_failedLogos;
     QStringList m_loadingLogos;
@@ -53,18 +47,17 @@ private:
     void requestLogo(QString file);
     QString translatePackType(PackType type) const;
 
-
-private slots:
+   private slots:
     void logoFailed(QString logo);
     void logoLoaded(QString logo, QIcon out);
 
-public:
-    ListModel(QObject *parent);
+   public:
+    ListModel(QObject* parent);
     ~ListModel();
-    int rowCount(const QModelIndex &parent) const override;
-    int columnCount(const QModelIndex &parent) const override;
-    QVariant data(const QModelIndex &index, int role) const override;
-    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    int rowCount(const QModelIndex& parent) const override;
+    int columnCount(const QModelIndex& parent) const override;
+    QVariant data(const QModelIndex& index, int role) const override;
+    Qt::ItemFlags flags(const QModelIndex& index) const override;
 
     void fill(ModpackList modpacks);
     void addPack(Modpack modpack);
@@ -72,7 +65,7 @@ public:
     void remove(int row);
 
     Modpack at(int row);
-    void getLogo(const QString &logo, LogoCallback callback);
+    void getLogo(const QString& logo, LogoCallback callback);
 };
 
-}
+}  // namespace LegacyFTB
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp b/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
index b3f6261f..0103bbaa 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
@@ -1,6 +1,6 @@
 // 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>
  *
@@ -44,15 +44,14 @@
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui/dialogs/NewInstanceDialog.h"
 
+#include "ListModel.h"
 #include "modplatform/legacy_ftb/PackFetchTask.h"
 #include "modplatform/legacy_ftb/PackInstallTask.h"
 #include "modplatform/legacy_ftb/PrivatePackManager.h"
-#include "ListModel.h"
 
 namespace LegacyFTB {
 
-Page::Page(NewInstanceDialog* dialog, QWidget *parent)
-    : QWidget(parent), dialog(dialog), ui(new Ui::Page)
+Page::Page(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), dialog(dialog), ui(new Ui::Page)
 {
     ftbFetchTask.reset(new PackFetchTask(APPLICATION->network()));
     ftbPrivatePacks.reset(new PrivatePackManager());
@@ -70,8 +69,7 @@ Page::Page(NewInstanceDialog* dialog, QWidget *parent)
         ui->publicPackList->setIndentation(0);
         ui->publicPackList->setIconSize(QSize(42, 42));
 
-        for(int i = 0; i < publicFilterModel->getAvailableSortings().size(); i++)
-        {
+        for (int i = 0; i < publicFilterModel->getAvailableSortings().size(); i++) {
             ui->sortByBox->addItem(publicFilterModel->getAvailableSortings().keys().at(i));
         }
 
@@ -142,8 +140,7 @@ bool Page::shouldDisplay() const
 
 void Page::openedImpl()
 {
-    if(!initialized)
-    {
+    if (!initialized) {
         connect(ftbFetchTask.get(), &PackFetchTask::finished, this, &Page::ftbPackDataDownloadSuccessfully);
         connect(ftbFetchTask.get(), &PackFetchTask::failed, this, &Page::ftbPackDataDownloadFailed);
         connect(ftbFetchTask.get(), &PackFetchTask::aborted, this, &Page::ftbPackDataDownloadAborted);
@@ -166,50 +163,34 @@ void Page::retranslate()
 
 void Page::suggestCurrent()
 {
-    if(!isOpened)
-    {
+    if (!isOpened) {
         return;
     }
 
-    if(selected.broken || selectedVersion.isEmpty())
-    {
+    if (selected.broken || selectedVersion.isEmpty()) {
         dialog->setSuggestedPack();
         return;
     }
 
     dialog->setSuggestedPack(selected.name, selectedVersion, new PackInstallTask(APPLICATION->network(), selected, selectedVersion));
     QString editedLogoName;
-    if(selected.logo.toLower().startsWith("ftb"))
-    {
+    if (selected.logo.toLower().startsWith("ftb")) {
         editedLogoName = selected.logo;
-    }
-    else
-    {
+    } else {
         editedLogoName = "ftb_" + selected.logo;
     }
 
     editedLogoName = editedLogoName.left(editedLogoName.lastIndexOf(".png"));
 
-    if(selected.type == PackType::Public)
-    {
-        publicListModel->getLogo(selected.logo, [this, editedLogoName](QString logo)
-        {
-            dialog->setSuggestedIconFromFile(logo, editedLogoName);
-        });
-    }
-    else if (selected.type == PackType::ThirdParty)
-    {
-        thirdPartyModel->getLogo(selected.logo, [this, editedLogoName](QString logo)
-        {
-            dialog->setSuggestedIconFromFile(logo, editedLogoName);
-        });
-    }
-    else if (selected.type == PackType::Private)
-    {
-        privateListModel->getLogo(selected.logo, [this, editedLogoName](QString logo)
-        {
-            dialog->setSuggestedIconFromFile(logo, editedLogoName);
-        });
+    if (selected.type == PackType::Public) {
+        publicListModel->getLogo(selected.logo,
+                                 [this, editedLogoName](QString logo) { dialog->setSuggestedIconFromFile(logo, editedLogoName); });
+    } else if (selected.type == PackType::ThirdParty) {
+        thirdPartyModel->getLogo(selected.logo,
+                                 [this, editedLogoName](QString logo) { dialog->setSuggestedIconFromFile(logo, editedLogoName); });
+    } else if (selected.type == PackType::Private) {
+        privateListModel->getLogo(selected.logo,
+                                  [this, editedLogoName](QString logo) { dialog->setSuggestedIconFromFile(logo, editedLogoName); });
     }
 }
 
@@ -234,23 +215,18 @@ void Page::ftbPrivatePackDataDownloadSuccessfully(Modpack pack)
     privateListModel->addPack(pack);
 }
 
-void Page::ftbPrivatePackDataDownloadFailed(QString reason, QString packCode)
+void Page::ftbPrivatePackDataDownloadFailed([[maybe_unused]] QString reason, QString packCode)
 {
-    auto reply = QMessageBox::question(
-        this,
-        tr("FTB private packs"),
-        tr("Failed to download pack information for code %1.\nShould it be removed now?").arg(packCode)
-    );
-    if(reply == QMessageBox::Yes)
-    {
+    auto reply = QMessageBox::question(this, tr("FTB private packs"),
+                                       tr("Failed to download pack information for code %1.\nShould it be removed now?").arg(packCode));
+    if (reply == QMessageBox::Yes) {
         ftbPrivatePacks->remove(packCode);
     }
 }
 
-void Page::onPublicPackSelectionChanged(QModelIndex now, QModelIndex prev)
+void Page::onPublicPackSelectionChanged(QModelIndex now, [[maybe_unused]] QModelIndex prev)
 {
-    if(!now.isValid())
-    {
+    if (!now.isValid()) {
         onPackSelectionChanged();
         return;
     }
@@ -258,10 +234,9 @@ void Page::onPublicPackSelectionChanged(QModelIndex now, QModelIndex prev)
     onPackSelectionChanged(&selectedPack);
 }
 
-void Page::onThirdPartyPackSelectionChanged(QModelIndex now, QModelIndex prev)
+void Page::onThirdPartyPackSelectionChanged(QModelIndex now, [[maybe_unused]] QModelIndex prev)
 {
-    if(!now.isValid())
-    {
+    if (!now.isValid()) {
         onPackSelectionChanged();
         return;
     }
@@ -269,10 +244,9 @@ void Page::onThirdPartyPackSelectionChanged(QModelIndex now, QModelIndex prev)
     onPackSelectionChanged(&selectedPack);
 }
 
-void Page::onPrivatePackSelectionChanged(QModelIndex now, QModelIndex prev)
+void Page::onPrivatePackSelectionChanged(QModelIndex now, [[maybe_unused]] QModelIndex prev)
 {
-    if(!now.isValid())
-    {
+    if (!now.isValid()) {
         onPackSelectionChanged();
         return;
     }
@@ -283,34 +257,26 @@ void Page::onPrivatePackSelectionChanged(QModelIndex now, QModelIndex prev)
 void Page::onPackSelectionChanged(Modpack* pack)
 {
     ui->versionSelectionBox->clear();
-    if(pack)
-    {
-        currentModpackInfo->setHtml("Pack by <b>" + pack->author + "</b>" +
-                                    "<br>Minecraft " + pack->mcVersion + "<br>" + "<br>" + pack->description + "<ul><li>" + pack->mods.replace(";", "</li><li>")
-                                    + "</li></ul>");
+    if (pack) {
+        currentModpackInfo->setHtml("Pack by <b>" + pack->author + "</b>" + "<br>Minecraft " + pack->mcVersion + "<br>" + "<br>" +
+                                    pack->description + "<ul><li>" + pack->mods.replace(";", "</li><li>") + "</li></ul>");
         bool currentAdded = false;
 
-        for(int i = 0; i < pack->oldVersions.size(); i++)
-        {
-            if(pack->currentVersion == pack->oldVersions.at(i))
-            {
+        for (int i = 0; i < pack->oldVersions.size(); i++) {
+            if (pack->currentVersion == pack->oldVersions.at(i)) {
                 currentAdded = true;
             }
             ui->versionSelectionBox->addItem(pack->oldVersions.at(i));
         }
 
-        if(!currentAdded)
-        {
+        if (!currentAdded) {
             ui->versionSelectionBox->addItem(pack->currentVersion);
         }
         selected = *pack;
-    }
-    else
-    {
+    } else {
         currentModpackInfo->setHtml("");
         ui->versionSelectionBox->clear();
-        if(isOpened)
-        {
+        if (isOpened) {
             dialog->setSuggestedPack();
         }
         return;
@@ -318,21 +284,20 @@ void Page::onPackSelectionChanged(Modpack* pack)
     suggestCurrent();
 }
 
-void Page::onVersionSelectionItemChanged(QString data)
+void Page::onVersionSelectionItemChanged(QString version)
 {
-    if(data.isNull() || data.isEmpty())
-    {
+    if (version.isNull() || version.isEmpty()) {
         selectedVersion = "";
         return;
     }
 
-    selectedVersion = data;
+    selectedVersion = version;
     suggestCurrent();
 }
 
-void Page::onSortingSelectionChanged(QString data)
+void Page::onSortingSelectionChanged(QString sort)
 {
-    FilterModel::Sorting toSet = publicFilterModel->getAvailableSortings().value(data);
+    FilterModel::Sorting toSet = publicFilterModel->getAvailableSortings().value(sort);
     publicFilterModel->setSorting(toSet);
     thirdPartyFilterModel->setSorting(toSet);
     privateFilterModel->setSorting(toSet);
@@ -340,20 +305,15 @@ void Page::onSortingSelectionChanged(QString data)
 
 void Page::onTabChanged(int tab)
 {
-    if(tab == 1)
-    {
+    if (tab == 1) {
         currentModel = thirdPartyFilterModel;
         currentList = ui->thirdPartyPackList;
         currentModpackInfo = ui->thirdPartyPackDescription;
-    }
-    else if(tab == 2)
-    {
+    } else if (tab == 2) {
         currentModel = privateFilterModel;
         currentList = ui->privatePackList;
         currentModpackInfo = ui->privatePackDescription;
-    }
-    else
-    {
+    } else {
         currentModel = publicFilterModel;
         currentList = ui->publicPackList;
         currentModpackInfo = ui->publicPackDescription;
@@ -361,13 +321,10 @@ void Page::onTabChanged(int tab)
 
     currentList->selectionModel()->reset();
     QModelIndex idx = currentList->currentIndex();
-    if(idx.isValid())
-    {
+    if (idx.isValid()) {
         auto pack = currentModel->data(idx, Qt::UserRole).value<Modpack>();
         onPackSelectionChanged(&pack);
-    }
-    else
-    {
+    } else {
         onPackSelectionChanged();
     }
 }
@@ -375,38 +332,24 @@ void Page::onTabChanged(int tab)
 void Page::onAddPackClicked()
 {
     bool ok;
-    QString text = QInputDialog::getText(
-        this,
-        tr("Add FTB pack"),
-        tr("Enter pack code:"),
-        QLineEdit::Normal,
-        QString(),
-        &ok
-    );
-    if(ok && !text.isEmpty())
-    {
+    QString text = QInputDialog::getText(this, tr("Add FTB pack"), tr("Enter pack code:"), QLineEdit::Normal, QString(), &ok);
+    if (ok && !text.isEmpty()) {
         ftbPrivatePacks->add(text);
-        ftbFetchTask->fetchPrivate({text});
+        ftbFetchTask->fetchPrivate({ text });
     }
 }
 
 void Page::onRemovePackClicked()
 {
     auto index = ui->privatePackList->currentIndex();
-    if(!index.isValid())
-    {
+    if (!index.isValid()) {
         return;
     }
     auto row = index.row();
     Modpack pack = privateListModel->at(row);
-    auto answer = QMessageBox::question(
-        this,
-        tr("Remove pack"),
-        tr("Are you sure you want to remove pack %1?").arg(pack.name),
-        QMessageBox::Yes | QMessageBox::No
-    );
-    if(answer != QMessageBox::Yes)
-    {
+    auto answer = QMessageBox::question(this, tr("Remove pack"), tr("Are you sure you want to remove pack %1?").arg(pack.name),
+                                        QMessageBox::Yes | QMessageBox::No);
+    if (answer != QMessageBox::Yes) {
         return;
     }
 
@@ -415,4 +358,4 @@ void Page::onRemovePackClicked()
     onPackSelectionChanged();
 }
 
-}
+}  // namespace LegacyFTB
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.h b/launcher/ui/pages/modplatform/legacy_ftb/Page.h
index 1de8b40a..a12b0745 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/Page.h
+++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,23 +35,22 @@
 
 #pragma once
 
-#include <QWidget>
-#include <QTreeView>
 #include <QTextBrowser>
+#include <QTreeView>
+#include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
-#include "tasks/Task.h"
-#include "modplatform/legacy_ftb/PackHelpers.h"
-#include "modplatform/legacy_ftb/PackFetchTask.h"
 #include "QObjectPtr.h"
+#include "modplatform/legacy_ftb/PackFetchTask.h"
+#include "modplatform/legacy_ftb/PackHelpers.h"
+#include "tasks/Task.h"
+#include "ui/pages/BasePage.h"
 
 class NewInstanceDialog;
 
 namespace LegacyFTB {
 
-namespace Ui
-{
+namespace Ui {
 class Page;
 }
 
@@ -61,38 +60,25 @@ class PrivatePackListModel;
 class PrivatePackFilterModel;
 class PrivatePackManager;
 
-class Page : public QWidget, public BasePage
-{
+class Page : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit Page(NewInstanceDialog * dialog, QWidget *parent = 0);
+   public:
+    explicit Page(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~Page();
-    QString displayName() const override
-    {
-        return "FTB Legacy";
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("ftb_logo");
-    }
-    QString id() const override
-    {
-        return "legacy_ftb";
-    }
-    QString helpPage() const override
-    {
-        return "FTB-platform";
-    }
+    QString displayName() const override { return "FTB Legacy"; }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("ftb_logo"); }
+    QString id() const override { return "legacy_ftb"; }
+    QString helpPage() const override { return "FTB-platform"; }
     bool shouldDisplay() const override;
     void openedImpl() override;
     void retranslate() override;
 
-private:
+   private:
     void suggestCurrent();
-    void onPackSelectionChanged(Modpack *pack = nullptr);
+    void onPackSelectionChanged(Modpack* pack = nullptr);
 
-private slots:
+   private slots:
     void ftbPackDataDownloadSuccessfully(ModpackList publicPacks, ModpackList thirdPartyPacks);
     void ftbPackDataDownloadFailed(QString reason);
     void ftbPackDataDownloadAborted();
@@ -112,7 +98,7 @@ private slots:
     void onAddPackClicked();
     void onRemovePackClicked();
 
-private:
+   private:
     FilterModel* currentModel = nullptr;
     QTreeView* currentList = nullptr;
     QTextBrowser* currentModpackInfo = nullptr;
@@ -124,18 +110,18 @@ private:
     ListModel* publicListModel = nullptr;
     FilterModel* publicFilterModel = nullptr;
 
-    ListModel *thirdPartyModel = nullptr;
-    FilterModel *thirdPartyFilterModel = nullptr;
+    ListModel* thirdPartyModel = nullptr;
+    FilterModel* thirdPartyFilterModel = nullptr;
 
-    ListModel *privateListModel = nullptr;
-    FilterModel *privateFilterModel = nullptr;
+    ListModel* privateListModel = nullptr;
+    FilterModel* privateFilterModel = nullptr;
 
     unique_qobject_ptr<PackFetchTask> ftbFetchTask;
     std::unique_ptr<PrivatePackManager> ftbPrivatePacks;
 
     NewInstanceDialog* dialog = nullptr;
 
-    Ui::Page *ui = nullptr;
+    Ui::Page* ui = nullptr;
 };
 
-}
+}  // namespace LegacyFTB
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index ee498743..ebc5556c 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
@@ -117,7 +117,7 @@ auto ModpackListModel::data(const QModelIndex& index, int role) const -> QVarian
     return {};
 }
 
-bool ModpackListModel::setData(const QModelIndex &index, const QVariant &value, int role)
+bool ModpackListModel::setData(const QModelIndex& index, const QVariant& value, [[maybe_unused]] int role)
 {
     int pos = index.row();
     if (pos >= modpacks.size() || pos < 0 || !index.isValid())
@@ -183,26 +183,24 @@ void ModpackListModel::refresh()
 
 static auto sortFromIndex(int index) -> QString
 {
-    switch(index){
-    default:
-    case 0:
-        return "relevance";
-    case 1:
-        return "downloads";
-    case 2:
-        return "follows";
-    case 3:
-        return "newest";
-    case 4:
-        return "updated";
+    switch (index) {
+        default:
+        case 0:
+            return "relevance";
+        case 1:
+            return "downloads";
+        case 2:
+            return "follows";
+        case 3:
+            return "newest";
+        case 4:
+            return "updated";
     }
-
-    return {};
 }
 
 void ModpackListModel::searchWithTerm(const QString& term, const int sort)
 {
-    if(sort > 5 || sort < 0)
+    if (sort > 5 || sort < 0)
         return;
 
     auto sort_str = sortFromIndex(sort);
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
index b9e9c3da..721c69f5 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -47,7 +47,7 @@ class Version;
 namespace Modrinth {
 
 using LogoMap = QMap<QString, QIcon>;
-using LogoCallback = std::function<void (QString)>;
+using LogoCallback = std::function<void(QString)>;
 
 class ModpackListModel : public QAbstractListModel {
     Q_OBJECT
@@ -64,7 +64,7 @@ class ModpackListModel : public QAbstractListModel {
 
     /* 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;
+    bool setData(const QModelIndex& index, const QVariant& value, int role) override;
 
     inline void setActiveJob(NetJob::Ptr ptr) { jobPtr = ptr; }
 
@@ -75,7 +75,10 @@ class ModpackListModel : public QAbstractListModel {
 
     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; };
+    inline auto canFetchMore(const QModelIndex& parent) const -> bool override
+    {
+        return parent.isValid() ? false : searchState == CanPossiblyFetchMore;
+    };
 
    public slots:
     void searchRequestFinished(QJsonDocument& doc_all);
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index e7d75dcf..41fd5003 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -107,7 +107,7 @@ bool ModrinthPage::eventFilter(QObject* watched, QEvent* event)
     return QObject::eventFilter(watched, event);
 }
 
-void ModrinthPage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
+void ModrinthPage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelIndex prev)
 {
     ui->versionSelectionBox->clear();
 
@@ -311,9 +311,9 @@ void ModrinthPage::triggerSearch()
     m_model->searchWithTerm(ui->searchEdit->text(), ui->sortByBox->currentIndex());
 }
 
-void ModrinthPage::onVersionSelectionChanged(QString data)
+void ModrinthPage::onVersionSelectionChanged(QString version)
 {
-    if (data.isNull() || data.isEmpty()) {
+    if (version.isNull() || version.isEmpty()) {
         selectedVersion = "";
         return;
     }
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
index db5e1a3d..b7054c88 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp
index 8aa64989..ce7475b6 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -45,7 +45,7 @@ void ModrinthModModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJso
 auto ModrinthModModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
 {
     return ::Modrinth::loadDependencyVersions(m, arr);
-};
+}
 
 auto ModrinthModModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.h b/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.h
index d7c858f8..15cd5854 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.h
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp
index dd143700..616c1a81 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -46,8 +46,7 @@
 
 namespace ResourceDownload {
 
-ModrinthModPage::ModrinthModPage(ModDownloadDialog* dialog, BaseInstance& instance)
-    : ModPage(dialog, instance)
+ModrinthModPage::ModrinthModPage(ModDownloadDialog* dialog, BaseInstance& instance) : ModPage(dialog, instance)
 {
     m_model = new ModrinthModModel(instance);
     m_ui->packView->setModel(m_model);
@@ -64,14 +63,15 @@ ModrinthModPage::ModrinthModPage(ModDownloadDialog* dialog, BaseInstance& instan
     m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-auto ModrinthModPage::validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, std::optional<ResourceAPI::ModLoaderTypes> loaders) const -> bool
+auto ModrinthModPage::validateVersion(ModPlatform::IndexedVersion& ver,
+                                      QString mineVer,
+                                      std::optional<ResourceAPI::ModLoaderTypes> loaders) const -> bool
 {
     auto loaderCompatible = !loaders.has_value();
 
     if (!loaderCompatible) {
         auto loaderStrings = ModrinthAPI::getModLoaderStrings(loaders.value());
-        for (auto remoteLoader : ver.loaders)
-        {
+        for (auto remoteLoader : ver.loaders) {
             if (loaderStrings.contains(remoteLoader)) {
                 loaderCompatible = true;
                 break;
@@ -139,9 +139,21 @@ ModrinthShaderPackPage::ModrinthShaderPackPage(ShaderPackDownloadDialog* dialog,
 // I don't know why, but doing this on the parent class makes it so that
 // 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; }
-auto ModrinthResourcePackPage::shouldDisplay() const -> bool { return true; }
-auto ModrinthTexturePackPage::shouldDisplay() const -> bool { return true; }
-auto ModrinthShaderPackPage::shouldDisplay() const -> bool { return true; }
+auto ModrinthModPage::shouldDisplay() const -> bool
+{
+    return true;
+}
+auto ModrinthResourcePackPage::shouldDisplay() const -> bool
+{
+    return true;
+}
+auto ModrinthTexturePackPage::shouldDisplay() const -> bool
+{
+    return true;
+}
+auto ModrinthShaderPackPage::shouldDisplay() const -> bool
+{
+    return true;
+}
 
 }  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h
index f4eb5ce0..86ba1ccb 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only AND Apache-2.0
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -43,18 +43,33 @@
 
 #include "ui/pages/modplatform/ModPage.h"
 #include "ui/pages/modplatform/ResourcePackPage.h"
-#include "ui/pages/modplatform/TexturePackPage.h"
 #include "ui/pages/modplatform/ShaderPackPage.h"
+#include "ui/pages/modplatform/TexturePackPage.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"; }
+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";
 }
+}  // namespace Modrinth
 
 class ModrinthModPage : public ModPage {
     Q_OBJECT
@@ -78,7 +93,8 @@ class ModrinthModPage : public ModPage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; }
 
-    auto validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, std::optional<ResourceAPI::ModLoaderTypes> loaders = {}) const -> bool override;
+    auto validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, std::optional<ResourceAPI::ModLoaderTypes> loaders = {}) const
+        -> bool override;
 };
 
 class ModrinthResourcePackPage : public ResourcePackResourcePage {
diff --git a/launcher/ui/pages/modplatform/technic/TechnicData.h b/launcher/ui/pages/modplatform/technic/TechnicData.h
index cd2ea8e1..fc7fa4d3 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicData.h
+++ b/launcher/ui/pages/modplatform/technic/TechnicData.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2021-2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -63,6 +63,6 @@ struct Modpack {
     QString recommended;
     QVector<QString> versions;
 };
-}
+}  // namespace Technic
 
 Q_DECLARE_METATYPE(Technic::Modpack)
diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
index 5ba804db..e8c5ac92 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2021 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.h b/launcher/ui/pages/modplatform/technic/TechnicModel.h
index 0f1a814e..d7a635d4 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicModel.h
+++ b/launcher/ui/pages/modplatform/technic/TechnicModel.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2021 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
index e066fa6f..54b86feb 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2021-2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -41,18 +41,17 @@
 #include "ui/dialogs/NewInstanceDialog.h"
 
 #include "BuildConfig.h"
+#include "Json.h"
 #include "TechnicModel.h"
 #include "modplatform/technic/SingleZipPackInstallTask.h"
 #include "modplatform/technic/SolderPackInstallTask.h"
-#include "Json.h"
 
 #include "Application.h"
 #include "modplatform/technic/SolderPackManifest.h"
 
 #include "net/ApiDownload.h"
 
-TechnicPage::TechnicPage(NewInstanceDialog* dialog, QWidget *parent)
-    : QWidget(parent), ui(new Ui::TechnicPage), dialog(dialog)
+TechnicPage::TechnicPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), ui(new Ui::TechnicPage), dialog(dialog)
 {
     ui->setupUi(this);
     connect(ui->searchButton, &QPushButton::clicked, this, &TechnicPage::triggerSearch);
@@ -98,18 +97,17 @@ void TechnicPage::openedImpl()
     triggerSearch();
 }
 
-void TechnicPage::triggerSearch() {
+void TechnicPage::triggerSearch()
+{
     model->searchWithTerm(ui->searchEdit->text());
 }
 
-void TechnicPage::onSelectionChanged(QModelIndex first, QModelIndex second)
+void TechnicPage::onSelectionChanged(QModelIndex first, [[maybe_unused]] QModelIndex second)
 {
     ui->versionSelectionBox->clear();
 
-    if(!first.isValid())
-    {
-        if(isOpened)
-        {
+    if (!first.isValid()) {
+        if (isOpened) {
             dialog->setSuggestedPack();
         }
         return;
@@ -121,12 +119,10 @@ void TechnicPage::onSelectionChanged(QModelIndex first, QModelIndex second)
 
 void TechnicPage::suggestCurrent()
 {
-    if (!isOpened)
-    {
+    if (!isOpened) {
         return;
     }
-    if (current.broken)
-    {
+    if (current.broken) {
         dialog->setSuggestedPack();
         return;
     }
@@ -142,50 +138,41 @@ void TechnicPage::suggestCurrent()
 
     auto netJob = makeShared<NetJob>(QString("Technic::PackMeta(%1)").arg(current.name), APPLICATION->network());
     QString slug = current.slug;
-    netJob->addNetAction(Net::ApiDownload::makeByteArray(QString("%1modpack/%2?build=%3").arg(BuildConfig.TECHNIC_API_BASE_URL, slug, BuildConfig.TECHNIC_API_BUILD), response));
-    QObject::connect(netJob.get(), &NetJob::succeeded, this, [this, slug]
-    {
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(
+        QString("%1modpack/%2?build=%3").arg(BuildConfig.TECHNIC_API_BASE_URL, slug, BuildConfig.TECHNIC_API_BUILD), response));
+    QObject::connect(netJob.get(), &NetJob::succeeded, this, [this, slug] {
         jobPtr.reset();
 
-        if (current.slug != slug)
-        {
+        if (current.slug != slug) {
             return;
         }
 
-        QJsonParseError parse_error {};
+        QJsonParseError parse_error{};
         QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
         QJsonObject obj = doc.object();
-        if(parse_error.error != QJsonParseError::NoError)
-        {
-            qWarning() << "Error while parsing JSON response from Technic at " << parse_error.offset << " reason: " << parse_error.errorString();
+        if (parse_error.error != QJsonParseError::NoError) {
+            qWarning() << "Error while parsing JSON response from Technic at " << parse_error.offset
+                       << " reason: " << parse_error.errorString();
             qWarning() << *response;
             return;
         }
-        if (!obj.contains("url"))
-        {
+        if (!obj.contains("url")) {
             qWarning() << "Json doesn't contain an url key";
             return;
         }
         QJsonValueRef url = obj["url"];
-        if (url.isString())
-        {
+        if (url.isString()) {
             current.url = url.toString();
-        }
-        else
-        {
-            if (!obj.contains("solder"))
-            {
+        } else {
+            if (!obj.contains("solder")) {
                 qWarning() << "Json doesn't contain a valid url or solder key";
                 return;
             }
             QJsonValueRef solderUrl = obj["solder"];
-            if (solderUrl.isString())
-            {
+            if (solderUrl.isString()) {
                 current.url = solderUrl.toString();
                 current.isSolder = true;
-            }
-            else
-            {
+            } else {
                 qWarning() << "Json doesn't contain a valid url or solder key";
                 return;
             }
@@ -226,22 +213,21 @@ void TechnicPage::metadataLoaded()
 
     // Strip trailing forward-slashes from Solder URL's
     if (current.isSolder) {
-        while (current.url.endsWith('/')) current.url.chop(1);
+        while (current.url.endsWith('/'))
+            current.url.chop(1);
     }
 
     // Display versions from Solder
     if (!current.isSolder) {
         // If the pack isn't a Solder pack, it only has the single version
         ui->versionSelectionBox->addItem(current.currentVersion);
-    }
-    else if (current.versionsLoaded) {
+    } else if (current.versionsLoaded) {
         // reverse foreach, so that the newest versions are first
         for (auto i = current.versions.size(); i--;) {
             ui->versionSelectionBox->addItem(current.versions.at(i));
         }
         ui->versionSelectionBox->setCurrentText(current.recommended);
-    }
-    else {
+    } else {
         // For now, until the versions are pulled from the Solder instance, display the current
         // version so we can display something quicker
         ui->versionSelectionBox->addItem(current.currentVersion);
@@ -259,7 +245,8 @@ void TechnicPage::metadataLoaded()
     selectVersion();
 }
 
-void TechnicPage::selectVersion() {
+void TechnicPage::selectVersion()
+{
     if (!isOpened) {
         return;
     }
@@ -268,17 +255,18 @@ void TechnicPage::selectVersion() {
         return;
     }
 
-    if (!current.isSolder)
-    {
-        dialog->setSuggestedPack(current.name, selectedVersion, new Technic::SingleZipPackInstallTask(current.url, current.minecraftVersion));
-    }
-    else
-    {
-        dialog->setSuggestedPack(current.name, selectedVersion, new Technic::SolderPackInstallTask(APPLICATION->network(), current.url, current.slug, selectedVersion, current.minecraftVersion));
+    if (!current.isSolder) {
+        dialog->setSuggestedPack(current.name, selectedVersion,
+                                 new Technic::SingleZipPackInstallTask(current.url, current.minecraftVersion));
+    } else {
+        dialog->setSuggestedPack(current.name, selectedVersion,
+                                 new Technic::SolderPackInstallTask(APPLICATION->network(), current.url, current.slug, selectedVersion,
+                                                                    current.minecraftVersion));
     }
 }
 
-void TechnicPage::onSolderLoaded() {
+void TechnicPage::onSolderLoaded()
+{
     jobPtr.reset();
 
     auto fallback = [this]() {
@@ -318,12 +306,13 @@ void TechnicPage::onSolderLoaded() {
     metadataLoaded();
 }
 
-void TechnicPage::onVersionSelectionChanged(QString data) {
-    if (data.isNull() || data.isEmpty()) {
+void TechnicPage::onVersionSelectionChanged(QString version)
+{
+    if (version.isNull() || version.isEmpty()) {
         selectedVersion = "";
         return;
     }
 
-    selectedVersion = data;
+    selectedVersion = version;
     selectVersion();
 }
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.h b/launcher/ui/pages/modplatform/technic/TechnicPage.h
index 753261b3..91b61eaf 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.h
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2021-2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,46 +37,32 @@
 
 #include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
+#include "TechnicData.h"
 #include "net/NetJob.h"
 #include "tasks/Task.h"
-#include "TechnicData.h"
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class TechnicPage;
 }
 
 class NewInstanceDialog;
 
 namespace Technic {
-    class ListModel;
+class ListModel;
 }
 
-class TechnicPage : public QWidget, public BasePage
-{
+class TechnicPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit TechnicPage(NewInstanceDialog* dialog, QWidget *parent = 0);
+   public:
+    explicit TechnicPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~TechnicPage();
-    virtual QString displayName() const override
-    {
-        return "Technic";
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("technic");
-    }
-    virtual QString id() const override
-    {
-        return "technic";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Technic-platform";
-    }
+    virtual QString displayName() const override { return "Technic"; }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("technic"); }
+    virtual QString id() const override { return "technic"; }
+    virtual QString helpPage() const override { return "Technic-platform"; }
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
@@ -84,19 +70,19 @@ public:
 
     bool eventFilter(QObject* watched, QEvent* event) override;
 
-private:
+   private:
     void suggestCurrent();
     void metadataLoaded();
     void selectVersion();
 
-private slots:
+   private slots:
     void triggerSearch();
     void onSelectionChanged(QModelIndex first, QModelIndex second);
     void onSolderLoaded();
     void onVersionSelectionChanged(QString data);
 
-private:
-    Ui::TechnicPage *ui = nullptr;
+   private:
+    Ui::TechnicPage* ui = nullptr;
     NewInstanceDialog* dialog = nullptr;
     Technic::ListModel* model = nullptr;
 
diff --git a/launcher/ui/setupwizard/BaseWizardPage.h b/launcher/ui/setupwizard/BaseWizardPage.h
index 72dbecfd..80cc6496 100644
--- a/launcher/ui/setupwizard/BaseWizardPage.h
+++ b/launcher/ui/setupwizard/BaseWizardPage.h
@@ -1,31 +1,21 @@
 #pragma once
 
-#include <QWizardPage>
 #include <QEvent>
+#include <QWizardPage>
 
-class BaseWizardPage : public QWizardPage
-{
-public:
-    explicit BaseWizardPage(QWidget *parent = Q_NULLPTR)
-        : QWizardPage(parent)
-    {
-    }
-    virtual ~BaseWizardPage() {};
+class BaseWizardPage : public QWizardPage {
+   public:
+    explicit BaseWizardPage(QWidget* parent = Q_NULLPTR) : QWizardPage(parent) {}
+    virtual ~BaseWizardPage(){};
 
-    virtual bool wantsRefreshButton()
-    {
-        return false;
-    }
-    virtual void refresh()
-    {
-    }
+    virtual bool wantsRefreshButton() { return false; }
+    virtual void refresh() {}
 
-protected:
+   protected:
     virtual void retranslate() = 0;
-    void changeEvent(QEvent * event) override
+    void changeEvent(QEvent* event) override
     {
-        if (event->type() == QEvent::LanguageChange)
-        {
+        if (event->type() == QEvent::LanguageChange) {
             retranslate();
         }
         QWizardPage::changeEvent(event);
diff --git a/launcher/ui/setupwizard/JavaWizardPage.cpp b/launcher/ui/setupwizard/JavaWizardPage.cpp
index 2b70c47c..e2c44437 100644
--- a/launcher/ui/setupwizard/JavaWizardPage.cpp
+++ b/launcher/ui/setupwizard/JavaWizardPage.cpp
@@ -1,29 +1,27 @@
 #include "JavaWizardPage.h"
 #include "Application.h"
 
-#include <QVBoxLayout>
+#include <QFileDialog>
 #include <QGroupBox>
-#include <QSpinBox>
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
+#include <QSpinBox>
 #include <QToolButton>
-#include <QFileDialog>
+#include <QVBoxLayout>
 
 #include <sys.h>
 
 #include "FileSystem.h"
+#include "JavaCommon.h"
 #include "java/JavaInstall.h"
 #include "java/JavaUtils.h"
-#include "JavaCommon.h"
 
-#include "ui/widgets/VersionSelectWidget.h"
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui/widgets/JavaSettingsWidget.h"
+#include "ui/widgets/VersionSelectWidget.h"
 
-
-JavaWizardPage::JavaWizardPage(QWidget *parent)
-    :BaseWizardPage(parent)
+JavaWizardPage::JavaWizardPage(QWidget* parent) : BaseWizardPage(parent)
 {
     setupUi();
 }
@@ -31,7 +29,7 @@ JavaWizardPage::JavaWizardPage(QWidget *parent)
 void JavaWizardPage::setupUi()
 {
     setObjectName(QStringLiteral("javaPage"));
-    QVBoxLayout * layout = new QVBoxLayout(this);
+    QVBoxLayout* layout = new QVBoxLayout(this);
 
     m_java_widget = new JavaSettingsWidget(this);
     layout->addWidget(m_java_widget);
@@ -59,30 +57,23 @@ bool JavaWizardPage::validatePage()
 {
     auto settings = APPLICATION->settings();
     auto result = m_java_widget->validate();
-    switch(result)
-    {
+    switch (result) {
         default:
-        case JavaSettingsWidget::ValidationStatus::Bad:
-        {
+        case JavaSettingsWidget::ValidationStatus::Bad: {
             return false;
         }
-        case JavaSettingsWidget::ValidationStatus::AllOK:
-        {
+        case JavaSettingsWidget::ValidationStatus::AllOK: {
             settings->set("JavaPath", m_java_widget->javaPath());
             return true;
         }
-        case JavaSettingsWidget::ValidationStatus::JavaBad:
-        {
+        case JavaSettingsWidget::ValidationStatus::JavaBad: {
             // Memory
             auto s = APPLICATION->settings();
             s->set("MinMemAlloc", m_java_widget->minHeapSize());
             s->set("MaxMemAlloc", m_java_widget->maxHeapSize());
-            if (m_java_widget->permGenEnabled())
-            {
+            if (m_java_widget->permGenEnabled()) {
                 s->set("PermGen", m_java_widget->permGenSize());
-            }
-            else
-            {
+            } else {
                 s->reset("PermGen");
             }
             return true;
@@ -93,7 +84,8 @@ bool JavaWizardPage::validatePage()
 void JavaWizardPage::retranslate()
 {
     setTitle(tr("Java"));
-    setSubTitle(tr("You do not have a working Java set up yet or it went missing.\n"
-        "Please select one of the following or browse for a Java executable."));
+    setSubTitle(
+        tr("You do not have a working Java set up yet or it went missing.\n"
+           "Please select one of the following or browse for a Java executable."));
     m_java_widget->retranslate();
 }
diff --git a/launcher/ui/setupwizard/JavaWizardPage.h b/launcher/ui/setupwizard/JavaWizardPage.h
index 0d749039..6c083dc9 100644
--- a/launcher/ui/setupwizard/JavaWizardPage.h
+++ b/launcher/ui/setupwizard/JavaWizardPage.h
@@ -4,26 +4,22 @@
 
 class JavaSettingsWidget;
 
-class JavaWizardPage : public BaseWizardPage
-{
+class JavaWizardPage : public BaseWizardPage {
     Q_OBJECT
-public:
-    explicit JavaWizardPage(QWidget *parent = Q_NULLPTR);
+   public:
+    explicit JavaWizardPage(QWidget* parent = Q_NULLPTR);
 
-    virtual ~JavaWizardPage()
-    {
-    };
+    virtual ~JavaWizardPage(){};
 
     bool wantsRefreshButton() override;
     void refresh() override;
     void initializePage() override;
     bool validatePage() override;
 
-protected: /* methods */
+   protected: /* methods */
     void setupUi();
     void retranslate() override;
 
-private: /* data */
-    JavaSettingsWidget *m_java_widget = nullptr;
+   private: /* data */
+    JavaSettingsWidget* m_java_widget = nullptr;
 };
-
diff --git a/launcher/ui/setupwizard/LanguageWizardPage.cpp b/launcher/ui/setupwizard/LanguageWizardPage.cpp
index 6bd19b6f..09cdb807 100644
--- a/launcher/ui/setupwizard/LanguageWizardPage.cpp
+++ b/launcher/ui/setupwizard/LanguageWizardPage.cpp
@@ -2,25 +2,22 @@
 #include <Application.h>
 #include <translations/TranslationsModel.h>
 
-#include "ui/widgets/LanguageSelectionWidget.h"
-#include <QVBoxLayout>
 #include <BuildConfig.h>
+#include <QVBoxLayout>
+#include "ui/widgets/LanguageSelectionWidget.h"
 
-LanguageWizardPage::LanguageWizardPage(QWidget *parent)
-    : BaseWizardPage(parent)
+LanguageWizardPage::LanguageWizardPage(QWidget* parent) : BaseWizardPage(parent)
 {
     setObjectName(QStringLiteral("languagePage"));
     auto layout = new QVBoxLayout(this);
     mainWidget = new LanguageSelectionWidget(this);
-    layout->setContentsMargins(0,0,0,0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(mainWidget);
 
     retranslate();
 }
 
-LanguageWizardPage::~LanguageWizardPage()
-{
-}
+LanguageWizardPage::~LanguageWizardPage() {}
 
 bool LanguageWizardPage::wantsRefreshButton()
 {
diff --git a/launcher/ui/setupwizard/LanguageWizardPage.h b/launcher/ui/setupwizard/LanguageWizardPage.h
index 45a0e5c0..44a06239 100644
--- a/launcher/ui/setupwizard/LanguageWizardPage.h
+++ b/launcher/ui/setupwizard/LanguageWizardPage.h
@@ -4,11 +4,10 @@
 
 class LanguageSelectionWidget;
 
-class LanguageWizardPage : public BaseWizardPage
-{
+class LanguageWizardPage : public BaseWizardPage {
     Q_OBJECT
-public:
-    explicit LanguageWizardPage(QWidget *parent = Q_NULLPTR);
+   public:
+    explicit LanguageWizardPage(QWidget* parent = Q_NULLPTR);
 
     virtual ~LanguageWizardPage();
 
@@ -18,9 +17,9 @@ public:
 
     bool validatePage() override;
 
-protected:
+   protected:
     void retranslate() override;
 
-private:
-    LanguageSelectionWidget *mainWidget = nullptr;
+   private:
+    LanguageSelectionWidget* mainWidget = nullptr;
 };
diff --git a/launcher/ui/setupwizard/PasteWizardPage.cpp b/launcher/ui/setupwizard/PasteWizardPage.cpp
index 0f47da4b..777fd3a4 100644
--- a/launcher/ui/setupwizard/PasteWizardPage.cpp
+++ b/launcher/ui/setupwizard/PasteWizardPage.cpp
@@ -4,9 +4,7 @@
 #include "Application.h"
 #include "net/PasteUpload.h"
 
-PasteWizardPage::PasteWizardPage(QWidget *parent) :
-    BaseWizardPage(parent),
-    ui(new Ui::PasteWizardPage)
+PasteWizardPage::PasteWizardPage(QWidget* parent) : BaseWizardPage(parent), ui(new Ui::PasteWizardPage)
 {
     ui->setupUi(this);
 }
@@ -16,17 +14,14 @@ PasteWizardPage::~PasteWizardPage()
     delete ui;
 }
 
-void PasteWizardPage::initializePage()
-{
-}
+void PasteWizardPage::initializePage() {}
 
 bool PasteWizardPage::validatePage()
 {
     auto s = APPLICATION->settings();
     QString prevPasteURL = s->get("PastebinURL").toString();
     s->reset("PastebinURL");
-    if (ui->previousSettingsRadioButton->isChecked())
-    {
+    if (ui->previousSettingsRadioButton->isChecked()) {
         bool usingDefaultBase = prevPasteURL == PasteUpload::PasteTypes.at(PasteUpload::PasteType::NullPointer).defaultBase;
         s->set("PastebinType", PasteUpload::PasteType::NullPointer);
         if (!usingDefaultBase)
diff --git a/launcher/ui/setupwizard/PasteWizardPage.h b/launcher/ui/setupwizard/PasteWizardPage.h
index 513a14cb..dece81c4 100644
--- a/launcher/ui/setupwizard/PasteWizardPage.h
+++ b/launcher/ui/setupwizard/PasteWizardPage.h
@@ -8,20 +8,19 @@ namespace Ui {
 class PasteWizardPage;
 }
 
-class PasteWizardPage : public BaseWizardPage
-{
+class PasteWizardPage : public BaseWizardPage {
     Q_OBJECT
 
-public:
-    explicit PasteWizardPage(QWidget *parent = nullptr);
+   public:
+    explicit PasteWizardPage(QWidget* parent = nullptr);
     ~PasteWizardPage();
 
     void initializePage() override;
     bool validatePage() override;
     void retranslate() override;
 
-private:
-    Ui::PasteWizardPage *ui;
+   private:
+    Ui::PasteWizardPage* ui;
 };
 
-#endif // PASTEDEFAULTSCONFIRMATIONWIZARD_H
+#endif  // PASTEDEFAULTSCONFIRMATIONWIZARD_H
diff --git a/launcher/ui/setupwizard/SetupWizard.cpp b/launcher/ui/setupwizard/SetupWizard.cpp
index 0a47334f..4e5bd1dc 100644
--- a/launcher/ui/setupwizard/SetupWizard.cpp
+++ b/launcher/ui/setupwizard/SetupWizard.cpp
@@ -1,16 +1,16 @@
 #include "SetupWizard.h"
 
-#include "LanguageWizardPage.h"
 #include "JavaWizardPage.h"
+#include "LanguageWizardPage.h"
 
-#include "translations/TranslationsModel.h"
 #include <Application.h>
 #include <FileSystem.h>
+#include "translations/TranslationsModel.h"
 
-#include <QAbstractButton>
 #include <BuildConfig.h>
+#include <QAbstractButton>
 
-SetupWizard::SetupWizard(QWidget *parent) : QWizard(parent)
+SetupWizard::SetupWizard(QWidget* parent) : QWizard(parent)
 {
     setObjectName(QStringLiteral("SetupWizard"));
     resize(620, 660);
@@ -33,17 +33,17 @@ void SetupWizard::retranslate()
     setWindowTitle(tr("%1 Quick Setup").arg(BuildConfig.LAUNCHER_DISPLAYNAME));
 }
 
-BaseWizardPage * SetupWizard::getBasePage(int id)
+BaseWizardPage* SetupWizard::getBasePage(int id)
 {
-    if(id == -1)
+    if (id == -1)
         return nullptr;
     auto pagePtr = page(id);
-    if(!pagePtr)
+    if (!pagePtr)
         return nullptr;
-    return dynamic_cast<BaseWizardPage *>(pagePtr);
+    return dynamic_cast<BaseWizardPage*>(pagePtr);
 }
 
-BaseWizardPage * SetupWizard::getCurrentBasePage()
+BaseWizardPage* SetupWizard::getCurrentBasePage()
 {
     return getBasePage(currentId());
 }
@@ -51,38 +51,29 @@ BaseWizardPage * SetupWizard::getCurrentBasePage()
 void SetupWizard::pageChanged(int id)
 {
     auto basePagePtr = getBasePage(id);
-    if(!basePagePtr)
-    {
+    if (!basePagePtr) {
         return;
     }
-    if(basePagePtr->wantsRefreshButton())
-    {
-        setButtonLayout({QWizard::CustomButton1, QWizard::Stretch, QWizard::BackButton, QWizard::NextButton, QWizard::FinishButton});
+    if (basePagePtr->wantsRefreshButton()) {
+        setButtonLayout({ QWizard::CustomButton1, QWizard::Stretch, QWizard::BackButton, QWizard::NextButton, QWizard::FinishButton });
         auto customButton = button(QWizard::CustomButton1);
-        connect(customButton, &QAbstractButton::clicked, [&](){
+        connect(customButton, &QAbstractButton::clicked, [&]() {
             auto basePagePtr = getCurrentBasePage();
-            if(basePagePtr)
-            {
+            if (basePagePtr) {
                 basePagePtr->refresh();
             }
         });
-    }
-    else
-    {
-        setButtonLayout({QWizard::Stretch, QWizard::BackButton, QWizard::NextButton, QWizard::FinishButton});
+    } else {
+        setButtonLayout({ QWizard::Stretch, QWizard::BackButton, QWizard::NextButton, QWizard::FinishButton });
     }
 }
 
-
-void SetupWizard::changeEvent(QEvent *event)
+void SetupWizard::changeEvent(QEvent* event)
 {
-    if (event->type() == QEvent::LanguageChange)
-    {
+    if (event->type() == QEvent::LanguageChange) {
         retranslate();
     }
     QWizard::changeEvent(event);
 }
 
-SetupWizard::~SetupWizard()
-{
-}
+SetupWizard::~SetupWizard() {}
diff --git a/launcher/ui/setupwizard/SetupWizard.h b/launcher/ui/setupwizard/SetupWizard.h
index 9b8adb4d..c26c59fd 100644
--- a/launcher/ui/setupwizard/SetupWizard.h
+++ b/launcher/ui/setupwizard/SetupWizard.h
@@ -17,29 +17,26 @@
 
 #include <QWizard>
 
-namespace Ui
-{
+namespace Ui {
 class SetupWizard;
 }
 
 class BaseWizardPage;
 
-class SetupWizard : public QWizard
-{
+class SetupWizard : public QWizard {
     Q_OBJECT
 
-public: /* con/destructors */
-    explicit SetupWizard(QWidget *parent = 0);
+   public: /* con/destructors */
+    explicit SetupWizard(QWidget* parent = 0);
     virtual ~SetupWizard();
 
-    void changeEvent(QEvent * event) override;
-    BaseWizardPage *getBasePage(int id);
-    BaseWizardPage *getCurrentBasePage();
+    void changeEvent(QEvent* event) override;
+    BaseWizardPage* getBasePage(int id);
+    BaseWizardPage* getCurrentBasePage();
 
-private slots:
+   private slots:
     void pageChanged(int id);
 
-private: /* methods */
+   private: /* methods */
     void retranslate();
 };
-
diff --git a/launcher/ui/setupwizard/ThemeWizardPage.cpp b/launcher/ui/setupwizard/ThemeWizardPage.cpp
index 1c336921..fe11ed9a 100644
--- a/launcher/ui/setupwizard/ThemeWizardPage.cpp
+++ b/launcher/ui/setupwizard/ThemeWizardPage.cpp
@@ -61,7 +61,7 @@ void ThemeWizardPage::updateIcons()
 void ThemeWizardPage::updateCat()
 {
     qDebug() << "Setting Cat";
-    ui->catImagePreviewButton->setIcon(QIcon(QString(R"(%1)").arg(APPLICATION->getCatPack())));
+    ui->catImagePreviewButton->setIcon(QIcon(QString(R"(%1)").arg(APPLICATION->themeManager()->getCatPack())));
 }
 
 void ThemeWizardPage::retranslate()
diff --git a/launcher/ui/themes/BrightTheme.cpp b/launcher/ui/themes/BrightTheme.cpp
index 696ffdfb..ffccdaab 100644
--- a/launcher/ui/themes/BrightTheme.cpp
+++ b/launcher/ui/themes/BrightTheme.cpp
@@ -20,18 +20,18 @@ bool BrightTheme::hasColorScheme()
 QPalette BrightTheme::colorScheme()
 {
     QPalette brightPalette;
-    brightPalette.setColor(QPalette::Window, QColor(255,255,255));
-    brightPalette.setColor(QPalette::WindowText, QColor(17,17,17));
-    brightPalette.setColor(QPalette::Base, QColor(250,250,250));
-    brightPalette.setColor(QPalette::AlternateBase, QColor(240,240,240));
-    brightPalette.setColor(QPalette::ToolTipBase, QColor(17,17,17));
-    brightPalette.setColor(QPalette::ToolTipText, QColor(255,255,255));
-    brightPalette.setColor(QPalette::Text,  Qt::black);
-    brightPalette.setColor(QPalette::Button, QColor(249,249,249));
+    brightPalette.setColor(QPalette::Window, QColor(255, 255, 255));
+    brightPalette.setColor(QPalette::WindowText, QColor(17, 17, 17));
+    brightPalette.setColor(QPalette::Base, QColor(250, 250, 250));
+    brightPalette.setColor(QPalette::AlternateBase, QColor(240, 240, 240));
+    brightPalette.setColor(QPalette::ToolTipBase, QColor(17, 17, 17));
+    brightPalette.setColor(QPalette::ToolTipText, QColor(255, 255, 255));
+    brightPalette.setColor(QPalette::Text, Qt::black);
+    brightPalette.setColor(QPalette::Button, QColor(249, 249, 249));
     brightPalette.setColor(QPalette::ButtonText, Qt::black);
     brightPalette.setColor(QPalette::BrightText, Qt::red);
-    brightPalette.setColor(QPalette::Link, QColor(37,137,164));
-    brightPalette.setColor(QPalette::Highlight, QColor(137,207,84));
+    brightPalette.setColor(QPalette::Link, QColor(37, 137, 164));
+    brightPalette.setColor(QPalette::Highlight, QColor(137, 207, 84));
     brightPalette.setColor(QPalette::HighlightedText, Qt::black);
     return fadeInactive(brightPalette, fadeAmount(), fadeColor());
 }
@@ -43,7 +43,7 @@ double BrightTheme::fadeAmount()
 
 QColor BrightTheme::fadeColor()
 {
-    return QColor(255,255,255);
+    return QColor(255, 255, 255);
 }
 
 bool BrightTheme::hasStyleSheet()
@@ -55,4 +55,3 @@ QString BrightTheme::appStyleSheet()
 {
     return QString();
 }
-
diff --git a/launcher/ui/themes/BrightTheme.h b/launcher/ui/themes/BrightTheme.h
index c61f52d5..44a76749 100644
--- a/launcher/ui/themes/BrightTheme.h
+++ b/launcher/ui/themes/BrightTheme.h
@@ -2,9 +2,8 @@
 
 #include "FusionTheme.h"
 
-class BrightTheme: public FusionTheme
-{
-public:
+class BrightTheme : public FusionTheme {
+   public:
     virtual ~BrightTheme() {}
 
     QString id() override;
@@ -16,4 +15,3 @@ public:
     double fadeAmount() override;
     QColor fadeColor() override;
 };
-
diff --git a/launcher/ui/themes/CatPack.h b/launcher/ui/themes/CatPack.h
index b03a19f0..fdd117a7 100644
--- a/launcher/ui/themes/CatPack.h
+++ b/launcher/ui/themes/CatPack.h
@@ -52,8 +52,8 @@ class BasicCatPack : public CatPack {
    public:
     BasicCatPack(QString id, QString name) : m_id(id), m_name(name) {}
     BasicCatPack(QString id) : BasicCatPack(id, id) {}
-    virtual QString id() { return m_id; };
-    virtual QString name() { return m_name; };
+    virtual QString id() { return m_id; }
+    virtual QString name() { return m_name; }
     virtual QString path();
 
    protected:
diff --git a/launcher/ui/themes/CustomTheme.cpp b/launcher/ui/themes/CustomTheme.cpp
index 177edefa..29ecf625 100644
--- a/launcher/ui/themes/CustomTheme.cpp
+++ b/launcher/ui/themes/CustomTheme.cpp
@@ -148,7 +148,7 @@ static bool writeThemeJson(const QString& path,
     try {
         Json::write(rootObj, path);
         return true;
-    } catch (const Exception& e) {
+    } catch ([[maybe_unused]] const Exception& e) {
         themeWarningLog() << "Failed to write theme json to" << path;
         return false;
     }
@@ -183,7 +183,8 @@ CustomTheme::CustomTheme(ITheme* baseTheme, QFileInfo& fileInfo, bool isManifest
             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)
+        // 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);
         }
diff --git a/launcher/ui/themes/DarkTheme.cpp b/launcher/ui/themes/DarkTheme.cpp
index 48231b53..c3a68a2d 100644
--- a/launcher/ui/themes/DarkTheme.cpp
+++ b/launcher/ui/themes/DarkTheme.cpp
@@ -20,21 +20,21 @@ bool DarkTheme::hasColorScheme()
 QPalette DarkTheme::colorScheme()
 {
     QPalette darkPalette;
-    darkPalette.setColor(QPalette::Window, QColor(49,49,49));
+    darkPalette.setColor(QPalette::Window, QColor(49, 49, 49));
     darkPalette.setColor(QPalette::WindowText, Qt::white);
-    darkPalette.setColor(QPalette::Base, QColor(34,34,34));
-    darkPalette.setColor(QPalette::AlternateBase, QColor(42,42,42));
+    darkPalette.setColor(QPalette::Base, QColor(34, 34, 34));
+    darkPalette.setColor(QPalette::AlternateBase, QColor(42, 42, 42));
     darkPalette.setColor(QPalette::ToolTipBase, Qt::white);
     darkPalette.setColor(QPalette::ToolTipText, Qt::white);
     darkPalette.setColor(QPalette::Text, Qt::white);
-    darkPalette.setColor(QPalette::Button, QColor(48,48,48));
+    darkPalette.setColor(QPalette::Button, QColor(48, 48, 48));
     darkPalette.setColor(QPalette::ButtonText, Qt::white);
     darkPalette.setColor(QPalette::BrightText, Qt::red);
-    darkPalette.setColor(QPalette::Link, QColor(47,163,198));
-    darkPalette.setColor(QPalette::Highlight, QColor(150,219,89));
+    darkPalette.setColor(QPalette::Link, QColor(47, 163, 198));
+    darkPalette.setColor(QPalette::Highlight, QColor(150, 219, 89));
     darkPalette.setColor(QPalette::HighlightedText, Qt::black);
     darkPalette.setColor(QPalette::PlaceholderText, Qt::darkGray);
-    return fadeInactive(darkPalette, fadeAmount(),  fadeColor());
+    return fadeInactive(darkPalette, fadeAmount(), fadeColor());
 }
 
 double DarkTheme::fadeAmount()
@@ -44,7 +44,7 @@ double DarkTheme::fadeAmount()
 
 QColor DarkTheme::fadeColor()
 {
-    return QColor(49,49,49);
+    return QColor(49, 49, 49);
 }
 
 bool DarkTheme::hasStyleSheet()
diff --git a/launcher/ui/themes/DarkTheme.h b/launcher/ui/themes/DarkTheme.h
index 9bd2f343..431e9a73 100644
--- a/launcher/ui/themes/DarkTheme.h
+++ b/launcher/ui/themes/DarkTheme.h
@@ -2,9 +2,8 @@
 
 #include "FusionTheme.h"
 
-class DarkTheme: public FusionTheme
-{
-public:
+class DarkTheme : public FusionTheme {
+   public:
     virtual ~DarkTheme() {}
 
     QString id() override;
diff --git a/launcher/ui/themes/FusionTheme.h b/launcher/ui/themes/FusionTheme.h
index ee34245a..826fae1d 100644
--- a/launcher/ui/themes/FusionTheme.h
+++ b/launcher/ui/themes/FusionTheme.h
@@ -2,9 +2,8 @@
 
 #include "ITheme.h"
 
-class FusionTheme: public ITheme
-{
-public:
+class FusionTheme : public ITheme {
+   public:
     virtual ~FusionTheme() {}
 
     QString qtTheme() override;
diff --git a/launcher/ui/themes/ITheme.cpp b/launcher/ui/themes/ITheme.cpp
index 42d63b11..316b0f2e 100644
--- a/launcher/ui/themes/ITheme.cpp
+++ b/launcher/ui/themes/ITheme.cpp
@@ -33,10 +33,10 @@
  *      limitations under the License.
  */
 #include "ITheme.h"
-#include "rainbow.h"
-#include <QStyleFactory>
 #include <QDir>
+#include <QStyleFactory>
 #include "Application.h"
+#include "rainbow.h"
 
 void ITheme::apply(bool)
 {
@@ -51,8 +51,7 @@ void ITheme::apply(bool)
 
 QPalette ITheme::fadeInactive(QPalette in, qreal bias, QColor color)
 {
-    auto blend = [&in, bias, color](QPalette::ColorRole role)
-    {
+    auto blend = [&in, bias, color](QPalette::ColorRole role) {
         QColor from = in.color(QPalette::Active, role);
         QColor blended = Rainbow::mix(from, color, bias);
         in.setColor(QPalette::Disabled, role, blended);
diff --git a/launcher/ui/themes/IconTheme.cpp b/launcher/ui/themes/IconTheme.cpp
new file mode 100644
index 00000000..4bd88985
--- /dev/null
+++ b/launcher/ui/themes/IconTheme.cpp
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 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 "IconTheme.h"
+
+#include <QFile>
+#include <QSettings>
+
+IconTheme::IconTheme(const QString& id, const QString& path) : m_id(id), m_path(path) {}
+
+bool IconTheme::load()
+{
+    const QString path = m_path + "/index.theme";
+
+    if (!QFile::exists(path))
+        return false;
+
+    QSettings settings(path, QSettings::IniFormat);
+    settings.beginGroup("Icon Theme");
+    m_name = settings.value("Name").toString();
+    settings.endGroup();
+    return !m_name.isNull();
+}
+
+QString IconTheme::id()
+{
+    return m_id;
+}
+
+QString IconTheme::path()
+{
+    return m_path;
+}
+
+QString IconTheme::name()
+{
+    return m_name;
+}
diff --git a/launcher/ui/themes/IconTheme.h b/launcher/ui/themes/IconTheme.h
new file mode 100644
index 00000000..4e466c6a
--- /dev/null
+++ b/launcher/ui/themes/IconTheme.h
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 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 <QString>
+
+class IconTheme {
+   public:
+    IconTheme(const QString& id, const QString& path);
+    IconTheme() = default;
+
+    bool load();
+    QString id();
+    QString path();
+    QString name();
+
+   private:
+    QString m_id;
+    QString m_path;
+    QString m_name;
+};
diff --git a/launcher/ui/themes/SystemTheme.cpp b/launcher/ui/themes/SystemTheme.cpp
index 3b8cb24a..7ad144c7 100644
--- a/launcher/ui/themes/SystemTheme.cpp
+++ b/launcher/ui/themes/SystemTheme.cpp
@@ -65,7 +65,7 @@ void SystemTheme::apply(bool initial)
     // See https://github.com/MultiMC/Launcher/issues/1790
     // or https://github.com/PrismLauncher/PrismLauncher/issues/490
     if (initial)
-        return; 
+        return;
     ITheme::apply(initial);
 }
 
diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp
index 321f7db4..0bcac100 100644
--- a/launcher/ui/themes/ThemeManager.cpp
+++ b/launcher/ui/themes/ThemeManager.cpp
@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2023 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
@@ -31,9 +32,8 @@
 
 #include "Application.h"
 
-ThemeManager::ThemeManager(MainWindow* mainWindow)
+ThemeManager::ThemeManager()
 {
-    m_mainWindow = mainWindow;
     initializeThemes();
     initializeCatPacks();
 }
@@ -59,53 +59,110 @@ ITheme* ThemeManager::getTheme(QString themeId)
     return m_themes[themeId].get();
 }
 
+QString ThemeManager::addIconTheme(IconTheme theme)
+{
+    QString id = theme.id();
+    if (m_icons.find(id) == m_icons.end())
+        m_icons.emplace(id, std::move(theme));
+    else
+        themeWarningLog() << "IconTheme(" << id << ") not added to prevent id duplication";
+    return id;
+}
+
 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.";
-    }
+    initializeIcons();
 
     // 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);
-        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));
-                }
+    initializeWidgets();
+}
+
+void ThemeManager::initializeIcons()
+{
+    // TODO: icon themes and instance icons do not mesh well together. Rearrange and fix discrepancies!
+    // set icon theme search path!
+    themeDebugLog() << "<> Initializing Icon Themes";
+
+    auto searchPaths = QIcon::themeSearchPaths();
+    searchPaths.append(m_iconThemeFolder.path());
+    QIcon::setThemeSearchPaths(searchPaths);
+
+    for (const QString& id : builtinIcons) {
+        IconTheme theme(id, QString(":/icons/%1").arg(id));
+        if (!theme.load()) {
+            themeWarningLog() << "Couldn't load built-in icon theme" << id;
+            continue;
+        }
+
+        addIconTheme(std::move(theme));
+        themeDebugLog() << "Loaded Built-In Icon Theme" << id;
+    }
+
+    if (!m_iconThemeFolder.mkpath("."))
+        themeWarningLog() << "Couldn't create icon theme folder";
+    themeDebugLog() << "Icon Theme Folder Path: " << m_iconThemeFolder.absolutePath();
+
+    QDirIterator directoryIterator(m_iconThemeFolder.path(), QDir::Dirs | QDir::NoDotAndDotDot);
+    while (directoryIterator.hasNext()) {
+        QDir dir(directoryIterator.next());
+        IconTheme theme(dir.dirName(), dir.path());
+        if (!theme.load())
+            continue;
+
+        addIconTheme(std::move(theme));
+        themeDebugLog() << "Loaded Custom Icon Theme from" << dir.path();
+    }
+
+    themeDebugLog() << "<> Icon themes initialized.";
+}
+
+void ThemeManager::initializeWidgets()
+{
+    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?)
+
+    if (!m_applicationThemeFolder.mkpath("."))
+        themeWarningLog() << "Couldn't create theme folder";
+    themeDebugLog() << "Theme Folder Path: " << m_applicationThemeFolder.absolutePath();
+
+    QDirIterator directoryIterator(m_applicationThemeFolder.path(), QDir::Dirs | QDir::NoDotAndDotDot);
+    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.";
+    themeDebugLog() << "<> Widget themes initialized.";
+}
+
+QList<IconTheme*> ThemeManager::getValidIconThemes()
+{
+    QList<IconTheme*> ret;
+    ret.reserve(m_icons.size());
+    for (auto&& [id, theme] : m_icons) {
+        ret.append(&theme);
     }
+    return ret;
 }
 
 QList<ITheme*> ThemeManager::getValidApplicationThemes()
@@ -128,17 +185,39 @@ QList<CatPack*> ThemeManager::getValidCatPacks()
     return ret;
 }
 
-void ThemeManager::setIconTheme(const QString& name)
+bool ThemeManager::isValidIconTheme(const QString& id)
 {
-    QIcon::setThemeName(name);
+    return !id.isEmpty() && m_icons.find(id) != m_icons.end();
 }
 
-void ThemeManager::applyCurrentlySelectedTheme(bool initial)
+bool ThemeManager::isValidApplicationTheme(const QString& id)
 {
-    setIconTheme(APPLICATION->settings()->get("IconTheme").toString());
-    themeDebugLog() << "<> Icon theme set.";
-    setApplicationTheme(APPLICATION->settings()->get("ApplicationTheme").toString(), initial);
-    themeDebugLog() << "<> Application theme set.";
+    return !id.isEmpty() && m_themes.find(id) != m_themes.end();
+}
+
+QDir ThemeManager::getIconThemesFolder()
+{
+    return m_iconThemeFolder;
+}
+
+QDir ThemeManager::getApplicationThemesFolder()
+{
+    return m_applicationThemeFolder;
+}
+
+QDir ThemeManager::getCatPacksFolder()
+{
+    return m_catPacksFolder;
+}
+
+void ThemeManager::setIconTheme(const QString& name)
+{
+    if (m_icons.find(name) == m_icons.end()) {
+        themeWarningLog() << "Tried to set invalid icon theme:" << name;
+        return;
+    }
+
+    QIcon::setThemeName(name);
 }
 
 void ThemeManager::setApplicationTheme(const QString& name, bool initial)
@@ -154,6 +233,15 @@ void ThemeManager::setApplicationTheme(const QString& name, bool initial)
     }
 }
 
+void ThemeManager::applyCurrentlySelectedTheme(bool initial)
+{
+    auto settings = APPLICATION->settings();
+    setIconTheme(settings->get("IconTheme").toString());
+    themeDebugLog() << "<> Icon theme set.";
+    setApplicationTheme(settings->get("ApplicationTheme").toString(), initial);
+    themeDebugLog() << "<> Application theme set.";
+}
+
 QString ThemeManager::getCatPack(QString catName)
 {
     auto catIter = m_catPacks.find(!catName.isEmpty() ? catName : APPLICATION->settings()->get("BackgroundCat").toString());
@@ -187,9 +275,9 @@ void ThemeManager::initializeCatPacks()
     for (auto [id, name] : defaultCats) {
         addCatPack(std::unique_ptr<CatPack>(new BasicCatPack(id, name)));
     }
-    QDir catpacksDir("catpacks");
-    QString catpacksFolder = catpacksDir.absoluteFilePath("");
-    themeDebugLog() << "CatPacks Folder Path:" << catpacksFolder;
+    if (!m_catPacksFolder.mkpath("."))
+        themeWarningLog() << "Couldn't create catpacks folder";
+    themeDebugLog() << "CatPacks Folder Path:" << m_catPacksFolder.absolutePath();
 
     QStringList supportedImageFormats;
     for (auto format : QImageReader::supportedImageFormats()) {
@@ -206,9 +294,9 @@ void ThemeManager::initializeCatPacks()
         }
     };
 
-    loadFiles(catpacksDir);
+    loadFiles(m_catPacksFolder);
 
-    QDirIterator directoryIterator(catpacksFolder, QDir::Dirs | QDir::NoDotAndDotDot);
+    QDirIterator directoryIterator(m_catPacksFolder.path(), QDir::Dirs | QDir::NoDotAndDotDot);
     while (directoryIterator.hasNext()) {
         QDir dir(directoryIterator.next());
         QFileInfo manifest(dir.absoluteFilePath("catpack.json"));
diff --git a/launcher/ui/themes/ThemeManager.h b/launcher/ui/themes/ThemeManager.h
index 1ce8c6f4..b5c66677 100644
--- a/launcher/ui/themes/ThemeManager.h
+++ b/launcher/ui/themes/ThemeManager.h
@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2023 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
@@ -19,6 +20,7 @@
 
 #include <QString>
 
+#include "IconTheme.h"
 #include "ui/MainWindow.h"
 #include "ui/themes/CatPack.h"
 #include "ui/themes/ITheme.h"
@@ -34,11 +36,17 @@ inline auto themeWarningLog()
 
 class ThemeManager {
    public:
-    ThemeManager(MainWindow* mainWindow);
+    ThemeManager();
 
+    QList<IconTheme*> getValidIconThemes();
     QList<ITheme*> getValidApplicationThemes();
-    void setIconTheme(const QString& name);
+    bool isValidIconTheme(const QString& id);
+    bool isValidApplicationTheme(const QString& id);
+    QDir getIconThemesFolder();
+    QDir getApplicationThemesFolder();
+    QDir getCatPacksFolder();
     void applyCurrentlySelectedTheme(bool initial = false);
+    void setIconTheme(const QString& name);
     void setApplicationTheme(const QString& name, bool initial = false);
 
     /// @brief Returns the background based on selected and with events (Birthday, XMas, etc.)
@@ -49,12 +57,21 @@ class ThemeManager {
 
    private:
     std::map<QString, std::unique_ptr<ITheme>> m_themes;
+    std::map<QString, IconTheme> m_icons;
+    QDir m_iconThemeFolder{ "iconthemes" };
+    QDir m_applicationThemeFolder{ "themes" };
+    QDir m_catPacksFolder{ "catpacks" };
     std::map<QString, std::unique_ptr<CatPack>> m_catPacks;
-    MainWindow* m_mainWindow;
 
     void initializeThemes();
     void initializeCatPacks();
     QString addTheme(std::unique_ptr<ITheme> theme);
     ITheme* getTheme(QString themeId);
+    QString addIconTheme(IconTheme theme);
     QString addCatPack(std::unique_ptr<CatPack> catPack);
+    void initializeIcons();
+    void initializeWidgets();
+
+    const QStringList builtinIcons{ "pe_colored", "pe_light", "pe_dark", "pe_blue",    "breeze_light", "breeze_dark",
+                                    "OSX",        "iOS",      "flat",    "flat_white", "multimc" };
 };
diff --git a/launcher/ui/widgets/CustomCommands.cpp b/launcher/ui/widgets/CustomCommands.cpp
index 5ab90395..9b98d740 100644
--- a/launcher/ui/widgets/CustomCommands.cpp
+++ b/launcher/ui/widgets/CustomCommands.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -41,9 +41,7 @@ CustomCommands::~CustomCommands()
     delete ui;
 }
 
-CustomCommands::CustomCommands(QWidget* parent):
-    QWidget(parent),
-    ui(new Ui::CustomCommands)
+CustomCommands::CustomCommands(QWidget* parent) : QWidget(parent), ui(new Ui::CustomCommands)
 {
     ui->setupUi(this);
 }
@@ -51,8 +49,7 @@ CustomCommands::CustomCommands(QWidget* parent):
 void CustomCommands::initialize(bool checkable, bool checked, const QString& prelaunch, const QString& wrapper, const QString& postexit)
 {
     ui->customCommandsGroupBox->setCheckable(checkable);
-    if(checkable)
-    {
+    if (checkable) {
         ui->customCommandsGroupBox->setChecked(checked);
     }
     ui->preLaunchCmdTextBox->setText(prelaunch);
@@ -60,14 +57,14 @@ void CustomCommands::initialize(bool checkable, bool checked, const QString& pre
     ui->postExitCmdTextBox->setText(postexit);
 }
 
-
-void CustomCommands::retranslate() {
+void CustomCommands::retranslate()
+{
     ui->retranslateUi(this);
 }
 
 bool CustomCommands::checked() const
 {
-    if(!ui->customCommandsGroupBox->isCheckable())
+    if (!ui->customCommandsGroupBox->isCheckable())
         return true;
     return ui->customCommandsGroupBox->isChecked();
 }
diff --git a/launcher/ui/widgets/CustomCommands.h b/launcher/ui/widgets/CustomCommands.h
index ed10ba95..5b410ae9 100644
--- a/launcher/ui/widgets/CustomCommands.h
+++ b/launcher/ui/widgets/CustomCommands.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,19 +37,17 @@
 
 #include <QWidget>
 
-namespace Ui
-{
+namespace Ui {
 class CustomCommands;
 }
 
-class CustomCommands : public QWidget
-{
+class CustomCommands : public QWidget {
     Q_OBJECT
 
-public:
-    explicit CustomCommands(QWidget *parent = 0);
+   public:
+    explicit CustomCommands(QWidget* parent = 0);
     virtual ~CustomCommands();
-    void initialize(bool checkable, bool checked, const QString & prelaunch, const QString & wrapper, const QString & postexit);
+    void initialize(bool checkable, bool checked, const QString& prelaunch, const QString& wrapper, const QString& postexit);
 
     void retranslate();
     bool checked() const;
@@ -57,8 +55,6 @@ public:
     QString wrapperCommand() const;
     QString postexitCommand() const;
 
-private:
-    Ui::CustomCommands *ui;
+   private:
+    Ui::CustomCommands* ui;
 };
-
-
diff --git a/launcher/ui/widgets/DropLabel.cpp b/launcher/ui/widgets/DropLabel.cpp
index a900e57c..b1473b35 100644
--- a/launcher/ui/widgets/DropLabel.cpp
+++ b/launcher/ui/widgets/DropLabel.cpp
@@ -1,34 +1,33 @@
 #include "DropLabel.h"
 
-#include <QMimeData>
 #include <QDropEvent>
+#include <QMimeData>
 
-DropLabel::DropLabel(QWidget *parent) : QLabel(parent)
+DropLabel::DropLabel(QWidget* parent) : QLabel(parent)
 {
     setAcceptDrops(true);
 }
 
-void DropLabel::dragEnterEvent(QDragEnterEvent *event)
+void DropLabel::dragEnterEvent(QDragEnterEvent* event)
 {
     event->acceptProposedAction();
 }
 
-void DropLabel::dragMoveEvent(QDragMoveEvent *event)
+void DropLabel::dragMoveEvent(QDragMoveEvent* event)
 {
     event->acceptProposedAction();
 }
 
-void DropLabel::dragLeaveEvent(QDragLeaveEvent *event)
+void DropLabel::dragLeaveEvent(QDragLeaveEvent* event)
 {
     event->accept();
 }
 
-void DropLabel::dropEvent(QDropEvent *event)
+void DropLabel::dropEvent(QDropEvent* event)
 {
-    const QMimeData *mimeData = event->mimeData();
+    const QMimeData* mimeData = event->mimeData();
 
-    if (!mimeData)
-    {
+    if (!mimeData) {
         return;
     }
 
diff --git a/launcher/ui/widgets/DropLabel.h b/launcher/ui/widgets/DropLabel.h
index c5ca0bcc..0027f48b 100644
--- a/launcher/ui/widgets/DropLabel.h
+++ b/launcher/ui/widgets/DropLabel.h
@@ -2,19 +2,18 @@
 
 #include <QLabel>
 
-class DropLabel : public QLabel
-{
+class DropLabel : public QLabel {
     Q_OBJECT
 
-public:
-    explicit DropLabel(QWidget *parent = nullptr);
+   public:
+    explicit DropLabel(QWidget* parent = nullptr);
 
-signals:
+   signals:
     void droppedURLs(QList<QUrl> urls);
 
-protected:
-    void dropEvent(QDropEvent *event) override;
-    void dragEnterEvent(QDragEnterEvent *event) override;
-    void dragMoveEvent(QDragMoveEvent *event) override;
-    void dragLeaveEvent(QDragLeaveEvent *event) override;
+   protected:
+    void dropEvent(QDropEvent* event) override;
+    void dragEnterEvent(QDragEnterEvent* event) override;
+    void dragMoveEvent(QDragMoveEvent* event) override;
+    void dragLeaveEvent(QDragLeaveEvent* event) override;
 };
diff --git a/launcher/ui/widgets/ErrorFrame.cpp b/launcher/ui/widgets/ErrorFrame.cpp
index b3e41036..213c26b7 100644
--- a/launcher/ui/widgets/ErrorFrame.cpp
+++ b/launcher/ui/widgets/ErrorFrame.cpp
@@ -27,9 +27,7 @@ void ErrorFrame::clear()
     setDescription(QString());
 }
 
-ErrorFrame::ErrorFrame(QWidget *parent) :
-    QFrame(parent),
-    ui(new Ui::ErrorFrame)
+ErrorFrame::ErrorFrame(QWidget* parent) : QFrame(parent), ui(new Ui::ErrorFrame)
 {
     ui->setupUi(this);
     ui->label_Description->setHidden(true);
@@ -44,24 +42,18 @@ ErrorFrame::~ErrorFrame()
 
 void ErrorFrame::updateHiddenState()
 {
-    if(ui->label_Description->isHidden() && ui->label_Title->isHidden())
-    {
+    if (ui->label_Description->isHidden() && ui->label_Title->isHidden()) {
         setHidden(true);
-    }
-    else
-    {
+    } else {
         setHidden(false);
     }
 }
 
 void ErrorFrame::setTitle(QString text)
 {
-    if(text.isEmpty())
-    {
+    if (text.isEmpty()) {
         ui->label_Title->setHidden(true);
-    }
-    else
-    {
+    } else {
         ui->label_Title->setText(text);
         ui->label_Title->setHidden(false);
     }
@@ -70,14 +62,11 @@ void ErrorFrame::setTitle(QString text)
 
 void ErrorFrame::setDescription(QString text)
 {
-    if(text.isEmpty())
-    {
+    if (text.isEmpty()) {
         ui->label_Description->setHidden(true);
         updateHiddenState();
         return;
-    }
-    else
-    {
+    } else {
         ui->label_Description->setHidden(false);
         updateHiddenState();
     }
@@ -87,9 +76,8 @@ void ErrorFrame::setDescription(QString text)
     QChar rem('\n');
     QString finaltext;
     finaltext.reserve(intermediatetext.size());
-    foreach(const QChar& c, intermediatetext)
-    {
-        if(c == rem && prev){
+    foreach (const QChar& c, intermediatetext) {
+        if (c == rem && prev) {
             continue;
         }
         prev = c == rem;
@@ -97,33 +85,27 @@ void ErrorFrame::setDescription(QString text)
     }
     QString labeltext;
     labeltext.reserve(300);
-    if(finaltext.length() > 290)
-    {
+    if (finaltext.length() > 290) {
         ui->label_Description->setOpenExternalLinks(false);
         ui->label_Description->setTextFormat(Qt::TextFormat::RichText);
         desc = text;
         // This allows injecting HTML here.
         labeltext.append("<html><body>" + finaltext.left(287) + "<a href=\"#mod_desc\">...</a></body></html>");
         QObject::connect(ui->label_Description, &QLabel::linkActivated, this, &ErrorFrame::ellipsisHandler);
-    }
-    else
-    {
+    } else {
         ui->label_Description->setTextFormat(Qt::TextFormat::PlainText);
         labeltext.append(finaltext);
     }
     ui->label_Description->setText(labeltext);
 }
 
-void ErrorFrame::ellipsisHandler(const QString &link)
+void ErrorFrame::ellipsisHandler(const QString& link)
 {
-    if(!currentBox)
-    {
+    if (!currentBox) {
         currentBox = CustomMessageBox::selectable(this, QString(), desc);
         connect(currentBox, &QMessageBox::finished, this, &ErrorFrame::boxClosed);
         currentBox->show();
-    }
-    else
-    {
+    } else {
         currentBox->setText(desc);
     }
 }
diff --git a/launcher/ui/widgets/ErrorFrame.h b/launcher/ui/widgets/ErrorFrame.h
index d5069a14..1aea6a1d 100644
--- a/launcher/ui/widgets/ErrorFrame.h
+++ b/launcher/ui/widgets/ErrorFrame.h
@@ -17,17 +17,15 @@
 
 #include <QFrame>
 
-namespace Ui
-{
+namespace Ui {
 class ErrorFrame;
 }
 
-class ErrorFrame : public QFrame
-{
+class ErrorFrame : public QFrame {
     Q_OBJECT
 
-public:
-    explicit ErrorFrame(QWidget *parent = 0);
+   public:
+    explicit ErrorFrame(QWidget* parent = 0);
     ~ErrorFrame();
 
     void setTitle(QString text);
@@ -35,15 +33,15 @@ public:
 
     void clear();
 
-public slots:
-    void ellipsisHandler(const QString& link );
+   public slots:
+    void ellipsisHandler(const QString& link);
     void boxClosed(int result);
 
-private:
+   private:
     void updateHiddenState();
 
-private:
-    Ui::ErrorFrame *ui;
+   private:
+    Ui::ErrorFrame* ui;
     QString desc;
-    class QMessageBox * currentBox = nullptr;
+    class QMessageBox* currentBox = nullptr;
 };
diff --git a/launcher/ui/widgets/FocusLineEdit.cpp b/launcher/ui/widgets/FocusLineEdit.cpp
index b272100c..6570227b 100644
--- a/launcher/ui/widgets/FocusLineEdit.cpp
+++ b/launcher/ui/widgets/FocusLineEdit.cpp
@@ -1,23 +1,22 @@
 #include "FocusLineEdit.h"
 #include <QDebug>
 
-FocusLineEdit::FocusLineEdit(QWidget *parent) : QLineEdit(parent)
+FocusLineEdit::FocusLineEdit(QWidget* parent) : QLineEdit(parent)
 {
     _selectOnMousePress = false;
 }
 
-void FocusLineEdit::focusInEvent(QFocusEvent *e)
+void FocusLineEdit::focusInEvent(QFocusEvent* e)
 {
     QLineEdit::focusInEvent(e);
     selectAll();
     _selectOnMousePress = true;
 }
 
-void FocusLineEdit::mousePressEvent(QMouseEvent *me)
+void FocusLineEdit::mousePressEvent(QMouseEvent* me)
 {
     QLineEdit::mousePressEvent(me);
-    if (_selectOnMousePress)
-    {
+    if (_selectOnMousePress) {
         selectAll();
         _selectOnMousePress = false;
     }
diff --git a/launcher/ui/widgets/FocusLineEdit.h b/launcher/ui/widgets/FocusLineEdit.h
index 71b4f140..f5ea6602 100644
--- a/launcher/ui/widgets/FocusLineEdit.h
+++ b/launcher/ui/widgets/FocusLineEdit.h
@@ -1,17 +1,14 @@
 #include <QLineEdit>
 
-class FocusLineEdit : public QLineEdit
-{
+class FocusLineEdit : public QLineEdit {
     Q_OBJECT
-public:
-    FocusLineEdit(QWidget *parent);
-    virtual ~FocusLineEdit()
-    {
-    }
+   public:
+    FocusLineEdit(QWidget* parent);
+    virtual ~FocusLineEdit() {}
 
-protected:
-    void focusInEvent(QFocusEvent *e);
-    void mousePressEvent(QMouseEvent *me);
+   protected:
+    void focusInEvent(QFocusEvent* e);
+    void mousePressEvent(QMouseEvent* me);
 
     bool _selectOnMousePress;
 };
diff --git a/launcher/ui/widgets/IconLabel.cpp b/launcher/ui/widgets/IconLabel.cpp
index bf1c2358..28776686 100644
--- a/launcher/ui/widgets/IconLabel.cpp
+++ b/launcher/ui/widgets/IconLabel.cpp
@@ -1,13 +1,12 @@
 #include "IconLabel.h"
 
-#include <QStyle>
-#include <QStyleOption>
 #include <QLayout>
 #include <QPainter>
 #include <QRect>
+#include <QStyle>
+#include <QStyleOption>
 
-IconLabel::IconLabel(QWidget *parent, QIcon icon, QSize size)
-    : QWidget(parent), m_size(size), m_icon(icon)
+IconLabel::IconLabel(QWidget* parent, QIcon icon, QSize size) : QWidget(parent), m_size(size), m_icon(icon)
 {
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 }
@@ -23,19 +22,16 @@ void IconLabel::setIcon(QIcon icon)
     update();
 }
 
-void IconLabel::paintEvent(QPaintEvent *)
+void IconLabel::paintEvent(QPaintEvent*)
 {
     QPainter p(this);
     QRect rect = contentsRect();
     int width = rect.width();
     int height = rect.height();
-    if(width < height)
-    {
+    if (width < height) {
         rect.setHeight(width);
         rect.translate(0, (height - width) / 2);
-    }
-    else if (width > height)
-    {
+    } else if (width > height) {
         rect.setWidth(height);
         rect.translate((width - height) / 2, 0);
     }
diff --git a/launcher/ui/widgets/IconLabel.h b/launcher/ui/widgets/IconLabel.h
index 6d212c4c..41d97f69 100644
--- a/launcher/ui/widgets/IconLabel.h
+++ b/launcher/ui/widgets/IconLabel.h
@@ -1,26 +1,25 @@
 #pragma once
-#include <QWidget>
 #include <QIcon>
+#include <QWidget>
 
 class QStyleOption;
 
 /**
  * This is a trivial widget that paints a QIcon of the specified size.
  */
-class IconLabel : public QWidget
-{
+class IconLabel : public QWidget {
     Q_OBJECT
 
-public:
+   public:
     /// Create a line separator. orientation is the orientation of the line.
-    explicit IconLabel(QWidget *parent, QIcon icon, QSize size);
+    explicit IconLabel(QWidget* parent, QIcon icon, QSize size);
 
     virtual QSize sizeHint() const;
-    virtual void paintEvent(QPaintEvent *);
+    virtual void paintEvent(QPaintEvent*);
 
     void setIcon(QIcon icon);
 
-private:
+   private:
     QSize m_size;
     QIcon m_icon;
 };
diff --git a/launcher/ui/widgets/InfoFrame.cpp b/launcher/ui/widgets/InfoFrame.cpp
index a0fda952..1f03f9ea 100644
--- a/launcher/ui/widgets/InfoFrame.cpp
+++ b/launcher/ui/widgets/InfoFrame.cpp
@@ -348,7 +348,7 @@ void InfoFrame::setImage(QPixmap img)
     }
 }
 
-void InfoFrame::descriptionEllipsisHandler(QString link)
+void InfoFrame::descriptionEllipsisHandler([[maybe_unused]] QString link)
 {
     if (!m_current_box) {
         m_current_box = CustomMessageBox::selectable(this, "", m_description);
@@ -359,7 +359,7 @@ void InfoFrame::descriptionEllipsisHandler(QString link)
     }
 }
 
-void InfoFrame::licenseEllipsisHandler(QString link)
+void InfoFrame::licenseEllipsisHandler([[maybe_unused]] QString link)
 {
     if (!m_current_box) {
         m_current_box = CustomMessageBox::selectable(this, "", m_license);
@@ -370,7 +370,7 @@ void InfoFrame::licenseEllipsisHandler(QString link)
     }
 }
 
-void InfoFrame::boxClosed(int result)
+void InfoFrame::boxClosed([[maybe_unused]] int result)
 {
     m_current_box = nullptr;
 }
diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index d77e0fa0..42279a66 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -1,20 +1,20 @@
 #include "JavaSettingsWidget.h"
 
-#include <QVBoxLayout>
+#include <QFileDialog>
 #include <QGroupBox>
-#include <QSpinBox>
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
+#include <QSpinBox>
 #include <QToolButton>
-#include <QFileDialog>
+#include <QVBoxLayout>
 
 #include <sys.h>
 
+#include "FileSystem.h"
 #include "JavaCommon.h"
 #include "java/JavaInstall.h"
 #include "java/JavaUtils.h"
-#include "FileSystem.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui/widgets/VersionSelectWidget.h"
@@ -150,40 +150,30 @@ void JavaSettingsWidget::refresh()
 
 JavaSettingsWidget::ValidationStatus JavaSettingsWidget::validate()
 {
-    switch(javaStatus)
-    {
+    switch (javaStatus) {
         default:
         case JavaStatus::NotSet:
         case JavaStatus::DoesNotExist:
         case JavaStatus::DoesNotStart:
-        case JavaStatus::ReturnedInvalidData:
-        {
-            int button = CustomMessageBox::selectable(
-                this,
-                tr("No Java version selected"),
-                tr("You didn't select a Java version or selected something that doesn't work.\n"
-                    "%1 will not be able to start Minecraft.\n"
-                    "Do you wish to proceed without any Java?"
-                    "\n\n"
-                    "You can change the Java version in the settings later.\n"
-                ).arg(BuildConfig.LAUNCHER_DISPLAYNAME),
-                QMessageBox::Warning,
-                QMessageBox::Yes | QMessageBox::No,
-                QMessageBox::NoButton
-            )->exec();
-            if(button == QMessageBox::No)
-            {
+        case JavaStatus::ReturnedInvalidData: {
+            int button = CustomMessageBox::selectable(this, tr("No Java version selected"),
+                                                      tr("You didn't select a Java version or selected something that doesn't work.\n"
+                                                         "%1 will not be able to start Minecraft.\n"
+                                                         "Do you wish to proceed without any Java?"
+                                                         "\n\n"
+                                                         "You can change the Java version in the settings later.\n")
+                                                          .arg(BuildConfig.LAUNCHER_DISPLAYNAME),
+                                                      QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::NoButton)
+                             ->exec();
+            if (button == QMessageBox::No) {
                 return ValidationStatus::Bad;
             }
             return ValidationStatus::JavaBad;
-        }
-        break;
-        case JavaStatus::Pending:
-        {
+        } break;
+        case JavaStatus::Pending: {
             return ValidationStatus::Bad;
         }
-        case JavaStatus::Good:
-        {
+        case JavaStatus::Good: {
             return ValidationStatus::AllOK;
         }
     }
@@ -220,34 +210,26 @@ void JavaSettingsWidget::memoryValueChanged(int)
     unsigned int min = m_minMemSpinBox->value();
     unsigned int max = m_maxMemSpinBox->value();
     unsigned int permgen = m_permGenSpinBox->value();
-    QObject *obj = sender();
-    if (obj == m_minMemSpinBox && min != observedMinMemory)
-    {
+    QObject* obj = sender();
+    if (obj == m_minMemSpinBox && min != observedMinMemory) {
         observedMinMemory = min;
         actuallyChanged = true;
-        if (min > max)
-        {
+        if (min > max) {
             observedMaxMemory = min;
             m_maxMemSpinBox->setValue(min);
         }
-    }
-    else if (obj == m_maxMemSpinBox && max != observedMaxMemory)
-    {
+    } else if (obj == m_maxMemSpinBox && max != observedMaxMemory) {
         observedMaxMemory = max;
         actuallyChanged = true;
-        if (min > max)
-        {
+        if (min > max) {
             observedMinMemory = max;
             m_minMemSpinBox->setValue(max);
         }
-    }
-    else if (obj == m_permGenSpinBox && permgen != observedPermGenMemory)
-    {
+    } else if (obj == m_permGenSpinBox && permgen != observedPermGenMemory) {
         observedPermGenMemory = permgen;
         actuallyChanged = true;
     }
-    if(actuallyChanged)
-    {
+    if (actuallyChanged) {
         checkJavaPathOnEdit(m_javaPathTextBox->text());
         updateThresholds();
     }
@@ -256,8 +238,7 @@ void JavaSettingsWidget::memoryValueChanged(int)
 void JavaSettingsWidget::javaVersionSelected(BaseVersion::Ptr version)
 {
     auto java = std::dynamic_pointer_cast<JavaInstall>(version);
-    if(!java)
-    {
+    if (!java) {
         return;
     }
     auto visible = java->id.requiresPermGen();
@@ -276,8 +257,7 @@ void JavaSettingsWidget::on_javaBrowseBtn_clicked()
     filter = "Java (java)";
 #endif
     QString raw_path = QFileDialog::getOpenFileName(this, tr("Find Java executable"), QString(), filter);
-    if(raw_path.isEmpty())
-    {
+    if (raw_path.isEmpty()) {
         return;
     }
     QString cooked_path = FS::NormalizePath(raw_path);
@@ -289,8 +269,7 @@ void JavaSettingsWidget::on_javaStatusBtn_clicked()
 {
     QString text;
     bool failed = false;
-    switch(javaStatus)
-    {
+    switch (javaStatus) {
         case JavaStatus::NotSet:
             checkJavaPath(m_javaPathTextBox->text());
             return;
@@ -298,24 +277,20 @@ void JavaSettingsWidget::on_javaStatusBtn_clicked()
             text += QObject::tr("The specified file either doesn't exist or is not a proper executable.");
             failed = true;
             break;
-        case JavaStatus::DoesNotStart:
-        {
+        case JavaStatus::DoesNotStart: {
             text += QObject::tr("The specified Java binary didn't start properly.<br />");
             auto htmlError = m_result.errorLog;
-            if(!htmlError.isEmpty())
-            {
+            if (!htmlError.isEmpty()) {
                 htmlError.replace('\n', "<br />");
                 text += QString("<font color=\"red\">%1</font>").arg(htmlError);
             }
             failed = true;
             break;
         }
-        case JavaStatus::ReturnedInvalidData:
-        {
+        case JavaStatus::ReturnedInvalidData: {
             text += QObject::tr("The specified Java binary returned unexpected results:<br />");
             auto htmlOut = m_result.outLog;
-            if(!htmlOut.isEmpty())
-            {
+            if (!htmlOut.isEmpty()) {
                 htmlOut.replace('\n', "<br />");
                 text += QString("<font color=\"red\">%1</font>").arg(htmlOut);
             }
@@ -323,26 +298,24 @@ void JavaSettingsWidget::on_javaStatusBtn_clicked()
             break;
         }
         case JavaStatus::Good:
-            text += QObject::tr("Java test succeeded!<br />Platform reported: %1<br />Java version "
-                "reported: %2<br />").arg(m_result.realPlatform, m_result.javaVersion.toString());
+            text += QObject::tr(
+                        "Java test succeeded!<br />Platform reported: %1<br />Java version "
+                        "reported: %2<br />")
+                        .arg(m_result.realPlatform, m_result.javaVersion.toString());
             break;
         case JavaStatus::Pending:
             // TODO: abort here?
             return;
     }
-    CustomMessageBox::selectable(
-        this,
-        failed ? QObject::tr("Java test failure") : QObject::tr("Java test success"),
-        text,
-        failed ? QMessageBox::Critical : QMessageBox::Information
-    )->show();
+    CustomMessageBox::selectable(this, failed ? QObject::tr("Java test failure") : QObject::tr("Java test success"), text,
+                                 failed ? QMessageBox::Critical : QMessageBox::Information)
+        ->show();
 }
 
 void JavaSettingsWidget::setJavaStatus(JavaSettingsWidget::JavaStatus status)
 {
     javaStatus = status;
-    switch(javaStatus)
-    {
+    switch (javaStatus) {
         case JavaStatus::Good:
             m_javaStatusBtn->setIcon(goodIcon);
             break;
@@ -365,29 +338,23 @@ void JavaSettingsWidget::checkJavaPathOnEdit(const QString& path)
 {
     auto realPath = FS::ResolveExecutable(path);
     QFileInfo pathInfo(realPath);
-    if (pathInfo.baseName().toLower().contains("java"))
-    {
+    if (pathInfo.baseName().toLower().contains("java")) {
         checkJavaPath(path);
-    }
-    else
-    {
-        if(!m_checker)
-        {
+    } else {
+        if (!m_checker) {
             setJavaStatus(JavaStatus::NotSet);
         }
     }
 }
 
-void JavaSettingsWidget::checkJavaPath(const QString &path)
+void JavaSettingsWidget::checkJavaPath(const QString& path)
 {
-    if(m_checker)
-    {
+    if (m_checker) {
         queuedCheck = path;
         return;
     }
     auto realPath = FS::ResolveExecutable(path);
-    if(realPath.isNull())
-    {
+    if (realPath.isNull()) {
         setJavaStatus(JavaStatus::DoesNotExist);
         return;
     }
@@ -396,8 +363,7 @@ void JavaSettingsWidget::checkJavaPath(const QString &path)
     m_checker->m_path = path;
     m_checker->m_minMem = m_minMemSpinBox->value();
     m_checker->m_maxMem = m_maxMemSpinBox->value();
-    if(m_permGenSpinBox->isVisible())
-    {
+    if (m_permGenSpinBox->isVisible()) {
         m_checker->m_permGen = m_permGenSpinBox->value();
     }
     connect(m_checker.get(), &JavaChecker::checkFinished, this, &JavaSettingsWidget::checkFinished);
@@ -407,27 +373,22 @@ void JavaSettingsWidget::checkJavaPath(const QString &path)
 void JavaSettingsWidget::checkFinished(JavaCheckResult result)
 {
     m_result = result;
-    switch(result.validity)
-    {
-        case JavaCheckResult::Validity::Valid:
-        {
+    switch (result.validity) {
+        case JavaCheckResult::Validity::Valid: {
             setJavaStatus(JavaStatus::Good);
             break;
         }
-        case JavaCheckResult::Validity::ReturnedInvalidData:
-        {
+        case JavaCheckResult::Validity::ReturnedInvalidData: {
             setJavaStatus(JavaStatus::ReturnedInvalidData);
             break;
         }
-        case JavaCheckResult::Validity::Errored:
-        {
+        case JavaCheckResult::Validity::Errored: {
             setJavaStatus(JavaStatus::DoesNotStart);
             break;
         }
     }
     m_checker.reset();
-    if(!queuedCheck.isNull())
-    {
+    if (!queuedCheck.isNull()) {
         checkJavaPath(queuedCheck);
         queuedCheck.clear();
     }
diff --git a/launcher/ui/widgets/JavaSettingsWidget.h b/launcher/ui/widgets/JavaSettingsWidget.h
index e4b7c712..6ea73da6 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.h
+++ b/launcher/ui/widgets/JavaSettingsWidget.h
@@ -1,9 +1,9 @@
 #pragma once
 #include <QWidget>
 
-#include <java/JavaChecker.h>
 #include <BaseVersion.h>
 #include <QObjectPtr.h>
+#include <java/JavaChecker.h>
 #include <QIcon>
 
 class QLineEdit;
@@ -20,30 +20,16 @@ class QToolButton;
 /**
  * This is a widget for all the Java settings dialogs and pages.
  */
-class JavaSettingsWidget : public QWidget
-{
+class JavaSettingsWidget : public QWidget {
     Q_OBJECT
 
-public:
-    explicit JavaSettingsWidget(QWidget *parent);
-    virtual ~JavaSettingsWidget() {};
+   public:
+    explicit JavaSettingsWidget(QWidget* parent);
+    virtual ~JavaSettingsWidget(){};
 
-    enum class JavaStatus
-    {
-        NotSet,
-        Pending,
-        Good,
-        DoesNotExist,
-        DoesNotStart,
-        ReturnedInvalidData
-    } javaStatus = JavaStatus::NotSet;
+    enum class JavaStatus { NotSet, Pending, Good, DoesNotExist, DoesNotStart, ReturnedInvalidData } javaStatus = JavaStatus::NotSet;
 
-    enum class ValidationStatus
-    {
-        Bad,
-        JavaBad,
-        AllOK
-    };
+    enum class ValidationStatus { Bad, JavaBad, AllOK };
 
     void refresh();
     void initialize();
@@ -58,39 +44,38 @@ public:
 
     void updateThresholds();
 
-
-protected slots:
+   protected slots:
     void memoryValueChanged(int);
-    void javaPathEdited(const QString &path);
+    void javaPathEdited(const QString& path);
     void javaVersionSelected(BaseVersion::Ptr version);
     void on_javaBrowseBtn_clicked();
     void on_javaStatusBtn_clicked();
     void checkFinished(JavaCheckResult result);
 
-protected: /* methods */
-    void checkJavaPathOnEdit(const QString &path);
-    void checkJavaPath(const QString &path);
+   protected: /* methods */
+    void checkJavaPathOnEdit(const QString& path);
+    void checkJavaPath(const QString& path);
     void setJavaStatus(JavaStatus status);
     void setupUi();
 
-private: /* data */
-    VersionSelectWidget *m_versionWidget = nullptr;
-    QVBoxLayout *m_verticalLayout = nullptr;
-
-    QLineEdit * m_javaPathTextBox = nullptr;
-    QPushButton * m_javaBrowseBtn = nullptr;
-    QToolButton * m_javaStatusBtn = nullptr;
-    QHBoxLayout *m_horizontalLayout = nullptr;
-
-    QGroupBox *m_memoryGroupBox = nullptr;
-    QGridLayout *m_gridLayout_2 = nullptr;
-    QSpinBox *m_maxMemSpinBox = nullptr;
-    QLabel *m_labelMinMem = nullptr;
-    QLabel *m_labelMaxMem = nullptr;
-    QLabel *m_labelMaxMemIcon = nullptr;
-    QSpinBox *m_minMemSpinBox = nullptr;
-    QLabel *m_labelPermGen = nullptr;
-    QSpinBox *m_permGenSpinBox = nullptr;
+   private: /* data */
+    VersionSelectWidget* m_versionWidget = nullptr;
+    QVBoxLayout* m_verticalLayout = nullptr;
+
+    QLineEdit* m_javaPathTextBox = nullptr;
+    QPushButton* m_javaBrowseBtn = nullptr;
+    QToolButton* m_javaStatusBtn = nullptr;
+    QHBoxLayout* m_horizontalLayout = nullptr;
+
+    QGroupBox* m_memoryGroupBox = nullptr;
+    QGridLayout* m_gridLayout_2 = nullptr;
+    QSpinBox* m_maxMemSpinBox = nullptr;
+    QLabel* m_labelMinMem = nullptr;
+    QLabel* m_labelMaxMem = nullptr;
+    QLabel* m_labelMaxMemIcon = nullptr;
+    QSpinBox* m_minMemSpinBox = nullptr;
+    QLabel* m_labelPermGen = nullptr;
+    QSpinBox* m_permGenSpinBox = nullptr;
     QIcon goodIcon;
     QIcon yellowIcon;
     QIcon badIcon;
diff --git a/launcher/ui/widgets/LabeledToolButton.cpp b/launcher/ui/widgets/LabeledToolButton.cpp
index f52e49c9..46114e04 100644
--- a/launcher/ui/widgets/LabeledToolButton.cpp
+++ b/launcher/ui/widgets/LabeledToolButton.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -33,31 +33,29 @@
  *      limitations under the License.
  */
 
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QResizeEvent>
-#include <QStyleOption>
 #include "LabeledToolButton.h"
 #include <QApplication>
 #include <QDebug>
+#include <QLabel>
+#include <QResizeEvent>
+#include <QStyleOption>
+#include <QVBoxLayout>
 
 /*
- * 
+ *
  *  Tool Button with a label on it, instead of the normal text rendering
- * 
+ *
  */
 
-LabeledToolButton::LabeledToolButton(QWidget * parent)
-    : QToolButton(parent)
-    , m_label(new QLabel(this))
+LabeledToolButton::LabeledToolButton(QWidget* parent) : QToolButton(parent), m_label(new QLabel(this))
 {
-    //QToolButton::setText(" ");
+    // QToolButton::setText(" ");
     m_label->setWordWrap(true);
     m_label->setMouseTracking(false);
     m_label->setAlignment(Qt::AlignCenter);
     m_label->setTextInteractionFlags(Qt::NoTextInteraction);
     // somehow, this makes word wrap work in the QLabel. yay.
-    //m_label->setMinimumWidth(100);
+    // m_label->setMinimumWidth(100);
 }
 
 QString LabeledToolButton::text() const
@@ -65,7 +63,7 @@ QString LabeledToolButton::text() const
     return m_label->text();
 }
 
-void LabeledToolButton::setText(const QString & text)
+void LabeledToolButton::setText(const QString& text)
 {
     m_label->setText(text);
 }
@@ -76,7 +74,6 @@ void LabeledToolButton::setIcon(QIcon icon)
     resetIcon();
 }
 
-
 /*!
     \reimp
 */
@@ -92,24 +89,21 @@ QSize LabeledToolButton::sizeHint() const
     int w = 0, h = 0;
     QStyleOptionToolButton opt;
     initStyleOption(&opt);
-    QSize sz =m_label->sizeHint();
+    QSize sz = m_label->sizeHint();
     w = sz.width();
     h = sz.height();
 
-    opt.rect.setSize(QSize(w, h)); // PM_MenuButtonIndicator depends on the height
+    opt.rect.setSize(QSize(w, h));  // PM_MenuButtonIndicator depends on the height
     if (popupMode() == MenuButtonPopup)
         w += style()->pixelMetric(QStyle::PM_MenuButtonIndicator, &opt, this);
-    
+
     return style()->sizeFromContents(QStyle::CT_ToolButton, &opt, QSize(w, h), this);
 }
 
-
-
-void LabeledToolButton::resizeEvent(QResizeEvent * event)
+void LabeledToolButton::resizeEvent(QResizeEvent* event)
 {
-    m_label->setGeometry(QRect(4, 4, width()-8, height()-8));
-    if(!m_icon.isNull())
-    {
+    m_label->setGeometry(QRect(4, 4, width() - 8, height() - 8));
+    if (!m_icon.isNull()) {
         resetIcon();
     }
     QWidget::resizeEvent(event);
@@ -120,14 +114,14 @@ void LabeledToolButton::resetIcon()
     auto iconSz = m_icon.actualSize(QSize(160, 80));
     float w = iconSz.width();
     float h = iconSz.height();
-    float ar = w/h;
+    float ar = w / h;
     // FIXME: hardcoded max size of 160x80
     int newW = 80 * ar;
-    if(newW > 160)
+    if (newW > 160)
         newW = 160;
-    QSize newSz (newW, 80);
+    QSize newSz(newW, 80);
     auto pixmap = m_icon.pixmap(newSz);
     m_label->setPixmap(pixmap);
     m_label->setMinimumHeight(80);
-    m_label->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
+    m_label->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
 }
diff --git a/launcher/ui/widgets/LabeledToolButton.h b/launcher/ui/widgets/LabeledToolButton.h
index 51f99e9b..0bb5e28d 100644
--- a/launcher/ui/widgets/LabeledToolButton.h
+++ b/launcher/ui/widgets/LabeledToolButton.h
@@ -20,21 +20,21 @@
 
 class QLabel;
 
-class LabeledToolButton : public QToolButton
-{
+class LabeledToolButton : public QToolButton {
     Q_OBJECT
 
-    QLabel * m_label;
+    QLabel* m_label;
     QIcon m_icon;
 
-public:
-    LabeledToolButton(QWidget * parent = 0);
+   public:
+    LabeledToolButton(QWidget* parent = 0);
 
     QString text() const;
-    void setText(const QString & text);
+    void setText(const QString& text);
     void setIcon(QIcon icon);
     virtual QSize sizeHint() const;
-protected:
-    void resizeEvent(QResizeEvent * event);
+
+   protected:
+    void resizeEvent(QResizeEvent* event);
     void resetIcon();
 };
diff --git a/launcher/ui/widgets/LineSeparator.cpp b/launcher/ui/widgets/LineSeparator.cpp
index d03e6762..2d6239a2 100644
--- a/launcher/ui/widgets/LineSeparator.cpp
+++ b/launcher/ui/widgets/LineSeparator.cpp
@@ -1,11 +1,11 @@
 #include "LineSeparator.h"
 
-#include <QStyle>
-#include <QStyleOption>
 #include <QLayout>
 #include <QPainter>
+#include <QStyle>
+#include <QStyleOption>
 
-void LineSeparator::initStyleOption(QStyleOption *option) const
+void LineSeparator::initStyleOption(QStyleOption* option) const
 {
     option->initFrom(this);
     // in a horizontal layout, the line is vertical (and vice versa)
@@ -13,8 +13,7 @@ void LineSeparator::initStyleOption(QStyleOption *option) const
         option->state |= QStyle::State_Horizontal;
 }
 
-LineSeparator::LineSeparator(QWidget *parent, Qt::Orientation orientation)
-    : QWidget(parent), m_orientation(orientation)
+LineSeparator::LineSeparator(QWidget* parent, Qt::Orientation orientation) : QWidget(parent), m_orientation(orientation)
 {
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 }
@@ -23,12 +22,11 @@ QSize LineSeparator::sizeHint() const
 {
     QStyleOption opt;
     initStyleOption(&opt);
-    const int extent =
-        style()->pixelMetric(QStyle::PM_ToolBarSeparatorExtent, &opt, parentWidget());
+    const int extent = style()->pixelMetric(QStyle::PM_ToolBarSeparatorExtent, &opt, parentWidget());
     return QSize(extent, extent);
 }
 
-void LineSeparator::paintEvent(QPaintEvent *)
+void LineSeparator::paintEvent(QPaintEvent*)
 {
     QPainter p(this);
     QStyleOption opt;
diff --git a/launcher/ui/widgets/LineSeparator.h b/launcher/ui/widgets/LineSeparator.h
index 22927b68..719facb9 100644
--- a/launcher/ui/widgets/LineSeparator.h
+++ b/launcher/ui/widgets/LineSeparator.h
@@ -3,16 +3,16 @@
 
 class QStyleOption;
 
-class LineSeparator : public QWidget
-{
+class LineSeparator : public QWidget {
     Q_OBJECT
 
-public:
+   public:
     /// Create a line separator. orientation is the orientation of the line.
-    explicit LineSeparator(QWidget *parent, Qt::Orientation orientation = Qt::Horizontal);
+    explicit LineSeparator(QWidget* parent, Qt::Orientation orientation = Qt::Horizontal);
     QSize sizeHint() const;
-    void paintEvent(QPaintEvent *);
-    void initStyleOption(QStyleOption *option) const;
-private:
+    void paintEvent(QPaintEvent*);
+    void initStyleOption(QStyleOption* option) const;
+
+   private:
     Qt::Orientation m_orientation = Qt::Horizontal;
 };
diff --git a/launcher/ui/widgets/LogView.cpp b/launcher/ui/widgets/LogView.cpp
index 9c46438d..4096889d 100644
--- a/launcher/ui/widgets/LogView.cpp
+++ b/launcher/ui/widgets/LogView.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -34,8 +34,8 @@
  */
 
 #include "LogView.h"
-#include <QTextBlock>
 #include <QScrollBar>
+#include <QTextBlock>
 
 LogView::LogView(QWidget* parent) : QPlainTextEdit(parent)
 {
@@ -50,13 +50,10 @@ LogView::~LogView()
 
 void LogView::setWordWrap(bool wrapping)
 {
-    if(wrapping)
-    {
+    if (wrapping) {
         setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
         setLineWrapMode(QPlainTextEdit::WidgetWidth);
-    }
-    else
-    {
+    } else {
         setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
         setLineWrapMode(QPlainTextEdit::NoWrap);
     }
@@ -64,16 +61,14 @@ void LogView::setWordWrap(bool wrapping)
 
 void LogView::setModel(QAbstractItemModel* model)
 {
-    if(m_model)
-    {
+    if (m_model) {
         disconnect(m_model, &QAbstractItemModel::modelReset, this, &LogView::repopulate);
         disconnect(m_model, &QAbstractItemModel::rowsInserted, this, &LogView::rowsInserted);
         disconnect(m_model, &QAbstractItemModel::rowsAboutToBeInserted, this, &LogView::rowsAboutToBeInserted);
         disconnect(m_model, &QAbstractItemModel::rowsRemoved, this, &LogView::rowsRemoved);
     }
     m_model = model;
-    if(m_model)
-    {
+    if (m_model) {
         connect(m_model, &QAbstractItemModel::modelReset, this, &LogView::repopulate);
         connect(m_model, &QAbstractItemModel::rowsInserted, this, &LogView::rowsInserted);
         connect(m_model, &QAbstractItemModel::rowsAboutToBeInserted, this, &LogView::rowsAboutToBeInserted);
@@ -83,15 +78,14 @@ void LogView::setModel(QAbstractItemModel* model)
     repopulate();
 }
 
-QAbstractItemModel * LogView::model() const
+QAbstractItemModel* LogView::model() const
 {
     return m_model;
 }
 
 void LogView::modelDestroyed(QObject* model)
 {
-    if(m_model == model)
-    {
+    if (m_model == model) {
         setModel(nullptr);
     }
 }
@@ -100,8 +94,7 @@ void LogView::repopulate()
 {
     auto doc = document();
     doc->clear();
-    if(!m_model)
-    {
+    if (!m_model) {
         return;
     }
     rowsInserted(QModelIndex(), 0, m_model->rowCount() - 1);
@@ -112,39 +105,32 @@ void LogView::rowsAboutToBeInserted(const QModelIndex& parent, int first, int la
     Q_UNUSED(parent)
     Q_UNUSED(first)
     Q_UNUSED(last)
-    QScrollBar *bar = verticalScrollBar();
+    QScrollBar* bar = verticalScrollBar();
     int max_bar = bar->maximum();
     int val_bar = bar->value();
-    if (m_scroll)
-    {
+    if (m_scroll) {
         m_scroll = (max_bar - val_bar) <= 1;
-    }
-    else
-    {
+    } else {
         m_scroll = val_bar == max_bar;
     }
 }
 
 void LogView::rowsInserted(const QModelIndex& parent, int first, int last)
 {
-    for(int i = first; i <= last; i++)
-    {
+    for (int i = first; i <= last; i++) {
         auto idx = m_model->index(i, 0, parent);
         auto text = m_model->data(idx, Qt::DisplayRole).toString();
         QTextCharFormat format(*m_defaultFormat);
         auto font = m_model->data(idx, Qt::FontRole);
-        if(font.isValid())
-        {
+        if (font.isValid()) {
             format.setFont(font.value<QFont>());
         }
         auto fg = m_model->data(idx, Qt::ForegroundRole);
-        if(fg.isValid())
-        {
+        if (fg.isValid()) {
             format.setForeground(fg.value<QColor>());
         }
         auto bg = m_model->data(idx, Qt::BackgroundRole);
-        if(bg.isValid())
-        {
+        if (bg.isValid()) {
             format.setBackground(bg.value<QColor>());
         }
         auto workCursor = textCursor();
@@ -152,10 +138,9 @@ void LogView::rowsInserted(const QModelIndex& parent, int first, int last)
         workCursor.insertText(text, format);
         workCursor.insertBlock();
     }
-    if(m_scroll && !m_scrolling)
-    {
+    if (m_scroll && !m_scrolling) {
         m_scrolling = true;
-        QMetaObject::invokeMethod( this, "scrollToBottom", Qt::QueuedConnection);
+        QMetaObject::invokeMethod(this, "scrollToBottom", Qt::QueuedConnection);
     }
 }
 
diff --git a/launcher/ui/widgets/LogView.h b/launcher/ui/widgets/LogView.h
index 3143360a..dde5f8f7 100644
--- a/launcher/ui/widgets/LogView.h
+++ b/launcher/ui/widgets/LogView.h
@@ -1,36 +1,35 @@
 #pragma once
-#include <QPlainTextEdit>
 #include <QAbstractItemView>
+#include <QPlainTextEdit>
 
 class QAbstractItemModel;
 
-class LogView: public QPlainTextEdit
-{
+class LogView : public QPlainTextEdit {
     Q_OBJECT
-public:
-    explicit LogView(QWidget *parent = nullptr);
+   public:
+    explicit LogView(QWidget* parent = nullptr);
     virtual ~LogView();
 
-    virtual void setModel(QAbstractItemModel *model);
-    QAbstractItemModel *model() const;
+    virtual void setModel(QAbstractItemModel* model);
+    QAbstractItemModel* model() const;
 
-public slots:
+   public slots:
     void setWordWrap(bool wrapping);
-    void findNext(const QString & what, bool reverse);
+    void findNext(const QString& what, bool reverse);
     void scrollToBottom();
 
-protected slots:
+   protected slots:
     void repopulate();
     // note: this supports only appending
-    void rowsInserted(const QModelIndex &parent, int first, int last);
-    void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last);
+    void rowsInserted(const QModelIndex& parent, int first, int last);
+    void rowsAboutToBeInserted(const QModelIndex& parent, int first, int last);
     // note: this supports only removing from front
-    void rowsRemoved(const QModelIndex &parent, int first, int last);
-    void modelDestroyed(QObject * model);
+    void rowsRemoved(const QModelIndex& parent, int first, int last);
+    void modelDestroyed(QObject* model);
 
-protected:
-    QAbstractItemModel *m_model = nullptr;
-    QTextCharFormat *m_defaultFormat = nullptr;
+   protected:
+    QAbstractItemModel* m_model = nullptr;
+    QTextCharFormat* m_defaultFormat = nullptr;
     bool m_scroll = false;
     bool m_scrolling = false;
 };
diff --git a/launcher/ui/widgets/ModFilterWidget.cpp b/launcher/ui/widgets/ModFilterWidget.cpp
index ea052c41..c2c099ee 100644
--- a/launcher/ui/widgets/ModFilterWidget.cpp
+++ b/launcher/ui/widgets/ModFilterWidget.cpp
@@ -18,9 +18,8 @@ unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(Version default_vers
 
         auto task = filter_widget->versionList()->getLoadTask();
 
-        connect(task.get(), &Task::failed, [filter_widget]{
-            filter_widget->disableVersionButton(VersionButtonID::Major, tr("failed to get version index"));
-        });
+        connect(task.get(), &Task::failed,
+                [filter_widget] { filter_widget->disableVersionButton(VersionButtonID::Major, tr("failed to get version index")); });
         connect(task.get(), &Task::finished, &load_version_list_loop, &QEventLoop::quit);
 
         if (!task->isRunning())
@@ -34,16 +33,15 @@ unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(Version default_vers
     return unique_qobject_ptr<ModFilterWidget>(filter_widget);
 }
 
-ModFilterWidget::ModFilterWidget(Version def, QWidget* parent)
-    : QTabWidget(parent), m_filter(new Filter()),  ui(new Ui::ModFilterWidget)
+ModFilterWidget::ModFilterWidget(Version def, QWidget* parent) : QTabWidget(parent), m_filter(new Filter()), ui(new Ui::ModFilterWidget)
 {
     ui->setupUi(this);
 
-    m_mcVersion_buttons.addButton(ui->strictVersionButton,   VersionButtonID::Strict);
+    m_mcVersion_buttons.addButton(ui->strictVersionButton, VersionButtonID::Strict);
     ui->strictVersionButton->click();
-    m_mcVersion_buttons.addButton(ui->majorVersionButton,    VersionButtonID::Major);
-    m_mcVersion_buttons.addButton(ui->allVersionsButton,     VersionButtonID::All);
-    //m_mcVersion_buttons.addButton(ui->betweenVersionsButton, VersionButtonID::Between);
+    m_mcVersion_buttons.addButton(ui->majorVersionButton, VersionButtonID::Major);
+    m_mcVersion_buttons.addButton(ui->allVersionsButton, VersionButtonID::All);
+    // m_mcVersion_buttons.addButton(ui->betweenVersionsButton, VersionButtonID::Between);
 
     connect(&m_mcVersion_buttons, SIGNAL(idClicked(int)), this, SLOT(onVersionFilterChanged(int)));
 
@@ -57,25 +55,19 @@ void ModFilterWidget::setInstance(MinecraftInstance* instance)
 {
     m_instance = instance;
 
-    ui->strictVersionButton->setText(
-        tr("Strict match (= %1)").arg(mcVersionStr()));
+    ui->strictVersionButton->setText(tr("Strict match (= %1)").arg(mcVersionStr()));
 
     // we can't do this for snapshots sadly
-    if(mcVersionStr().contains('.'))
-    {
+    if (mcVersionStr().contains('.')) {
         auto mcVersionSplit = mcVersionStr().split(".");
-        ui->majorVersionButton->setText(
-            tr("Major version match (= %1.%2.x)").arg(mcVersionSplit[0], mcVersionSplit[1]));
-    }
-    else
-    {
+        ui->majorVersionButton->setText(tr("Major version match (= %1.%2.x)").arg(mcVersionSplit[0], mcVersionSplit[1]));
+    } else {
         ui->majorVersionButton->setText(tr("Major version match (unsupported)"));
         disableVersionButton(Major);
     }
-    ui->allVersionsButton->setText(
-        tr("Any version"));
-    //ui->betweenVersionsButton->setText(
-    //    tr("Between two versions"));
+    ui->allVersionsButton->setText(tr("Any version"));
+    // ui->betweenVersionsButton->setText(
+    //     tr("Between two versions"));
 }
 
 auto ModFilterWidget::getFilter() -> std::shared_ptr<Filter>
@@ -89,19 +81,19 @@ void ModFilterWidget::disableVersionButton(VersionButtonID id, QString reason)
 {
     QAbstractButton* btn = nullptr;
 
-    switch(id){
-    case(VersionButtonID::Strict):
-        btn = ui->strictVersionButton;
-        break;
-    case(VersionButtonID::Major):
-        btn = ui->majorVersionButton;
-        break;
-    case(VersionButtonID::All):
-        btn = ui->allVersionsButton;
-        break;
-    case(VersionButtonID::Between):
-    default:
-        break;
+    switch (id) {
+        case (VersionButtonID::Strict):
+            btn = ui->strictVersionButton;
+            break;
+        case (VersionButtonID::Major):
+            btn = ui->majorVersionButton;
+            break;
+        case (VersionButtonID::All):
+            btn = ui->allVersionsButton;
+            break;
+        case (VersionButtonID::Between):
+        default:
+            break;
     }
 
     if (btn) {
@@ -113,12 +105,12 @@ void ModFilterWidget::disableVersionButton(VersionButtonID id, QString reason)
 
 void ModFilterWidget::onVersionFilterChanged(int id)
 {
-    //ui->lowerVersionComboBox->setEnabled(id == VersionButtonID::Between);
-    //ui->upperVersionComboBox->setEnabled(id == VersionButtonID::Between);
+    // ui->lowerVersionComboBox->setEnabled(id == VersionButtonID::Between);
+    // ui->upperVersionComboBox->setEnabled(id == VersionButtonID::Between);
 
     int index = 1;
 
-    auto cast_id = (VersionButtonID) id;
+    auto cast_id = (VersionButtonID)id;
     if (cast_id != m_version_id) {
         m_version_id = cast_id;
     } else {
@@ -127,32 +119,32 @@ void ModFilterWidget::onVersionFilterChanged(int id)
 
     m_filter->versions.clear();
 
-    switch(cast_id){
-    case(VersionButtonID::Strict):
-        m_filter->versions.push_front(mcVersion());
-        break;
-    case(VersionButtonID::Major): {
-        auto versionSplit = mcVersionStr().split(".");
+    switch (cast_id) {
+        case (VersionButtonID::Strict):
+            m_filter->versions.push_front(mcVersion());
+            break;
+        case (VersionButtonID::Major): {
+            auto versionSplit = mcVersionStr().split(".");
 
-        auto major_version = QString("%1.%2").arg(versionSplit[0], versionSplit[1]);
-        QString version_str = major_version;
+            auto major_version = QString("%1.%2").arg(versionSplit[0], versionSplit[1]);
+            QString version_str = major_version;
 
-        while (m_version_list->hasVersion(version_str)) {
-            m_filter->versions.emplace_back(version_str);
-            version_str = QString("%1.%2").arg(major_version, QString::number(index++));
-        }
+            while (m_version_list->hasVersion(version_str)) {
+                m_filter->versions.emplace_back(version_str);
+                version_str = QString("%1.%2").arg(major_version, QString::number(index++));
+            }
 
-        break;
-    }
-    case(VersionButtonID::All):
-        // Empty list to avoid enumerating all versions :P
-        break;
-    case(VersionButtonID::Between):
-        // TODO
-        break;
+            break;
+        }
+        case (VersionButtonID::All):
+            // Empty list to avoid enumerating all versions :P
+            break;
+        case (VersionButtonID::Between):
+            // TODO
+            break;
     }
 
-    if(changed())
+    if (changed())
         emit filterChanged();
     else
         emit filterUnchanged();
diff --git a/launcher/ui/widgets/ModFilterWidget.h b/launcher/ui/widgets/ModFilterWidget.h
index 706ffd21..ed6cd0ea 100644
--- a/launcher/ui/widgets/ModFilterWidget.h
+++ b/launcher/ui/widgets/ModFilterWidget.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QTabWidget>
 #include <QButtonGroup>
+#include <QTabWidget>
 
 #include "Version.h"
 
@@ -17,16 +17,10 @@ namespace Ui {
 class ModFilterWidget;
 }
 
-class ModFilterWidget : public QTabWidget
-{
+class ModFilterWidget : public QTabWidget {
     Q_OBJECT
-public:
-    enum VersionButtonID {
-        Strict = 0,
-        Major = 1,
-        All = 2,
-        Between = 3
-    };
+   public:
+    enum VersionButtonID { Strict = 0, Major = 1, All = 2, Between = 3 };
 
     struct Filter {
         std::list<Version> versions;
@@ -37,7 +31,7 @@ public:
 
     std::shared_ptr<Filter> m_filter;
 
-public:
+   public:
     static unique_qobject_ptr<ModFilterWidget> create(Version default_version, QWidget* parent = nullptr);
     ~ModFilterWidget();
 
@@ -51,26 +45,29 @@ public:
 
     Meta::VersionList::Ptr versionList() { return m_version_list; }
 
-private:
+   private:
     ModFilterWidget(Version def, QWidget* parent = nullptr);
 
-    inline auto mcVersionStr() const -> QString { return m_instance ? m_instance->getPackProfile()->getComponentVersion("net.minecraft") : ""; }
+    inline auto mcVersionStr() const -> QString
+    {
+        return m_instance ? m_instance->getPackProfile()->getComponentVersion("net.minecraft") : "";
+    }
     inline auto mcVersion() const -> Version { return { mcVersionStr() }; }
 
-private slots:
+   private slots:
     void onVersionFilterChanged(int id);
 
-public: signals:
+   public:
+   signals:
     void filterChanged();
     void filterUnchanged();
 
-private:
+   private:
     Ui::ModFilterWidget* ui;
 
     MinecraftInstance* m_instance = nullptr;
 
-
-/* Version stuff */
+    /* Version stuff */
     QButtonGroup m_mcVersion_buttons;
 
     Meta::VersionList::Ptr m_version_list;
diff --git a/launcher/ui/widgets/ModListView.cpp b/launcher/ui/widgets/ModListView.cpp
index 80a918b6..c72d4c52 100644
--- a/launcher/ui/widgets/ModListView.cpp
+++ b/launcher/ui/widgets/ModListView.cpp
@@ -14,61 +14,55 @@
  */
 
 #include "ModListView.h"
+#include <QDrag>
 #include <QHeaderView>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QDrag>
 #include <QRect>
 
-ModListView::ModListView ( QWidget* parent )
-    :QTreeView ( parent )
+ModListView::ModListView(QWidget* parent) : QTreeView(parent)
 {
-    setAllColumnsShowFocus ( true );
-    setExpandsOnDoubleClick ( false );
-    setRootIsDecorated ( false );
-    setSortingEnabled ( true );
-    setAlternatingRowColors ( true );
-    setSelectionMode ( QAbstractItemView::ExtendedSelection );
-    setHeaderHidden ( false );
+    setAllColumnsShowFocus(true);
+    setExpandsOnDoubleClick(false);
+    setRootIsDecorated(false);
+    setSortingEnabled(true);
+    setAlternatingRowColors(true);
+    setSelectionMode(QAbstractItemView::ExtendedSelection);
+    setHeaderHidden(false);
     setSelectionBehavior(QAbstractItemView::SelectRows);
-    setHorizontalScrollBarPolicy ( Qt::ScrollBarAsNeeded );
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     setDropIndicatorShown(true);
     setDragEnabled(true);
     setDragDropMode(QAbstractItemView::DropOnly);
     viewport()->setAcceptDrops(true);
 }
 
-void ModListView::setModel ( QAbstractItemModel* model )
+void ModListView::setModel(QAbstractItemModel* model)
 {
-    QTreeView::setModel ( model );
+    QTreeView::setModel(model);
     auto head = header();
     head->setStretchLastSection(false);
     // HACK: this is true for the checkbox column of mod lists
-    auto string = model->headerData(0,head->orientation()).toString();
-    if(head->count() < 1)
-    {
+    auto string = model->headerData(0, head->orientation()).toString();
+    if (head->count() < 1) {
         return;
     }
-    if(!string.size())
-    {
+    if (!string.size()) {
         head->setSectionResizeMode(0, QHeaderView::ResizeToContents);
         head->setSectionResizeMode(1, QHeaderView::Stretch);
-        for(int i = 2; i < head->count(); i++)
+        for (int i = 2; i < head->count(); i++)
             head->setSectionResizeMode(i, QHeaderView::ResizeToContents);
-    }
-    else
-    {
+    } else {
         head->setSectionResizeMode(0, QHeaderView::Stretch);
-        for(int i = 1; i < head->count(); i++)
+        for (int i = 1; i < head->count(); i++)
             head->setSectionResizeMode(i, QHeaderView::ResizeToContents);
     }
 }
 
-void ModListView::setResizeModes(const QList<QHeaderView::ResizeMode> &modes)
+void ModListView::setResizeModes(const QList<QHeaderView::ResizeMode>& modes)
 {
     auto head = header();
-    for(int i = 0; i < modes.count(); i++) {
+    for (int i = 0; i < modes.count(); i++) {
         head->setSectionResizeMode(i, modes[i]);
     }
 }
-
diff --git a/launcher/ui/widgets/ModListView.h b/launcher/ui/widgets/ModListView.h
index 3f0b3b0e..86316459 100644
--- a/launcher/ui/widgets/ModListView.h
+++ b/launcher/ui/widgets/ModListView.h
@@ -17,11 +17,10 @@
 #include <QHeaderView>
 #include <QTreeView>
 
-class ModListView: public QTreeView
-{
+class ModListView : public QTreeView {
     Q_OBJECT
-public:
-    explicit ModListView ( QWidget* parent = 0 );
-    virtual void setModel ( QAbstractItemModel* model );
-    virtual void setResizeModes (const QList<QHeaderView::ResizeMode>& modes);
+   public:
+    explicit ModListView(QWidget* parent = 0);
+    virtual void setModel(QAbstractItemModel* model);
+    virtual void setResizeModes(const QList<QHeaderView::ResizeMode>& modes);
 };
diff --git a/launcher/ui/widgets/PageContainer.cpp b/launcher/ui/widgets/PageContainer.cpp
index dbbed36a..514e1d25 100644
--- a/launcher/ui/widgets/PageContainer.cpp
+++ b/launcher/ui/widgets/PageContainer.cpp
@@ -39,36 +39,33 @@
 #include "BuildConfig.h"
 #include "PageContainer_p.h"
 
-#include <QStackedLayout>
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QListView>
 #include <QPushButton>
 #include <QSortFilterProxyModel>
-#include <QUrl>
+#include <QStackedLayout>
 #include <QStyledItemDelegate>
-#include <QListView>
-#include <QLineEdit>
-#include <QLabel>
-#include <QDialogButtonBox>
-#include <QGridLayout>
+#include <QUrl>
 
 #include "settings/SettingsObject.h"
 
 #include "ui/widgets/IconLabel.h"
 
-#include "DesktopServices.h"
 #include "Application.h"
+#include "DesktopServices.h"
 
-class PageEntryFilterModel : public QSortFilterProxyModel
-{
-public:
-    explicit PageEntryFilterModel(QObject *parent = 0) : QSortFilterProxyModel(parent)
-    {
-    }
+class PageEntryFilterModel : public QSortFilterProxyModel {
+   public:
+    explicit PageEntryFilterModel(QObject* parent = 0) : QSortFilterProxyModel(parent) {}
 
-protected:
-    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+   protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
     {
         const QString pattern = filterRegularExpression().pattern();
-        const auto model = static_cast<PageModel *>(sourceModel());
+        const auto model = static_cast<PageModel*>(sourceModel());
         const auto page = model->pages().at(sourceRow);
         if (!page->shouldDisplay())
             return false;
@@ -77,18 +74,15 @@ protected:
     }
 };
 
-PageContainer::PageContainer(BasePageProvider *pageProvider, QString defaultId,
-                             QWidget *parent)
-    : QWidget(parent)
+PageContainer::PageContainer(BasePageProvider* pageProvider, QString defaultId, QWidget* parent) : QWidget(parent)
 {
     createUI();
     m_model = new PageModel(this);
     m_proxyModel = new PageEntryFilterModel(this);
     int counter = 0;
     auto pages = pageProvider->getPages();
-    for (auto page : pages)
-    {
-        auto widget = dynamic_cast<QWidget *>(page);
+    for (auto page : pages) {
+        auto widget = dynamic_cast<QWidget*>(page);
         widget->setParent(this);
         page->stackIndex = m_pageStack->addWidget(widget);
         page->listIndex = counter;
@@ -109,8 +103,7 @@ PageContainer::PageContainer(BasePageProvider *pageProvider, QString defaultId,
     m_pageList->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
     m_pageList->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
     m_pageList->setModel(m_proxyModel);
-    connect(m_pageList->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)),
-            this, SLOT(currentChanged(QModelIndex)));
+    connect(m_pageList->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, SLOT(currentChanged(QModelIndex)));
     m_pageStack->setStackingMode(QStackedLayout::StackOne);
     m_pageList->setFocus();
     selectPage(defaultId);
@@ -121,16 +114,13 @@ bool PageContainer::selectPage(QString pageId)
     // now find what we want to have selected...
     auto page = m_model->findPageEntryById(pageId);
     QModelIndex index;
-    if (page)
-    {
+    if (page) {
         index = m_proxyModel->mapFromSource(m_model->index(page->listIndex));
     }
-    if(!index.isValid())
-    {
+    if (!index.isValid()) {
         index = m_proxyModel->index(0, 0);
     }
-    if (index.isValid())
-    {
+    if (index.isValid()) {
         m_pageList->setCurrentIndex(index);
         return true;
     }
@@ -155,15 +145,11 @@ const QList<BasePage*>& PageContainer::getPages() const
 void PageContainer::refreshContainer()
 {
     m_proxyModel->invalidate();
-    if(!m_currentPage->shouldDisplay())
-    {
+    if (!m_currentPage->shouldDisplay()) {
         auto index = m_proxyModel->index(0, 0);
-        if(index.isValid())
-        {
+        if (index.isValid()) {
             m_pageList->setCurrentIndex(index);
-        }
-        else
-        {
+        } else {
             // FIXME: unhandled corner case: what to do when there's no page to select?
         }
     }
@@ -183,7 +169,7 @@ void PageContainer::createUI()
         headerLabelFont.setPointSize(pointSize + 2);
     m_header->setFont(headerLabelFont);
 
-    QHBoxLayout *headerHLayout = new QHBoxLayout;
+    QHBoxLayout* headerHLayout = new QHBoxLayout;
     const int leftMargin = APPLICATION->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
     headerHLayout->addSpacerItem(new QSpacerItem(leftMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
     headerHLayout->addWidget(m_header);
@@ -201,7 +187,7 @@ void PageContainer::createUI()
     m_layout->addWidget(m_pageList, 0, 0, 2, 1);
     m_layout->addLayout(m_pageStack, 1, 1, 1, 1);
     m_layout->setColumnStretch(1, 4);
-    m_layout->setContentsMargins(0,0,0,6);
+    m_layout->setContentsMargins(0, 0, 0, 6);
     setLayout(m_layout);
 }
 
@@ -214,39 +200,32 @@ void PageContainer::retranslate()
         page->retranslate();
 }
 
-void PageContainer::addButtons(QWidget *buttons)
+void PageContainer::addButtons(QWidget* buttons)
 {
     m_layout->addWidget(buttons, 2, 0, 1, 2);
 }
 
-void PageContainer::addButtons(QLayout *buttons)
+void PageContainer::addButtons(QLayout* buttons)
 {
     m_layout->addLayout(buttons, 2, 0, 1, 2);
 }
 
 void PageContainer::showPage(int row)
 {
-    if (m_currentPage)
-    {
+    if (m_currentPage) {
         m_currentPage->closed();
     }
-    if (row != -1)
-    {
+    if (row != -1) {
         m_currentPage = m_model->pages().at(row);
-    }
-    else
-    {
+    } else {
         m_currentPage = nullptr;
     }
-    if (m_currentPage)
-    {
+    if (m_currentPage) {
         m_pageStack->setCurrentIndex(m_currentPage->stackIndex);
         m_header->setText(m_currentPage->displayName());
         m_iconHeader->setIcon(m_currentPage->icon());
         m_currentPage->opened();
-    }
-    else
-    {
+    } else {
         m_pageStack->setCurrentIndex(0);
         m_header->setText(QString());
         m_iconHeader->setIcon(APPLICATION->getThemedIcon("bug"));
@@ -255,8 +234,7 @@ void PageContainer::showPage(int row)
 
 void PageContainer::help()
 {
-    if (m_currentPage)
-    {
+    if (m_currentPage) {
         QString pageId = m_currentPage->helpPage();
         if (pageId.isEmpty())
             return;
@@ -264,7 +242,7 @@ void PageContainer::help()
     }
 }
 
-void PageContainer::currentChanged(const QModelIndex &current)
+void PageContainer::currentChanged(const QModelIndex& current)
 {
     int selected_index = current.isValid() ? m_proxyModel->mapToSource(current).row() : -1;
 
@@ -278,12 +256,10 @@ void PageContainer::currentChanged(const QModelIndex &current)
 
 bool PageContainer::prepareToClose()
 {
-    if(!saveAll())
-    {
+    if (!saveAll()) {
         return false;
     }
-    if (m_currentPage)
-    {
+    if (m_currentPage) {
         m_currentPage->closed();
     }
     return true;
@@ -291,8 +267,7 @@ bool PageContainer::prepareToClose()
 
 bool PageContainer::saveAll()
 {
-    for (auto page : m_model->pages())
-    {
+    for (auto page : m_model->pages()) {
         if (!page->apply())
             return false;
     }
diff --git a/launcher/ui/widgets/PageContainer.h b/launcher/ui/widgets/PageContainer.h
index eac59723..05be1c3a 100644
--- a/launcher/ui/widgets/PageContainer.h
+++ b/launcher/ui/widgets/PageContainer.h
@@ -36,11 +36,11 @@
 
 #pragma once
 
-#include <QWidget>
 #include <QModelIndex>
+#include <QWidget>
 
-#include "ui/pages/BasePageProvider.h"
 #include "ui/pages/BasePageContainer.h"
+#include "ui/pages/BasePageProvider.h"
 
 class QLayout;
 class IconLabel;
@@ -52,16 +52,14 @@ class QLineEdit;
 class QStackedLayout;
 class QGridLayout;
 
-class PageContainer : public QWidget, public BasePageContainer
-{
+class PageContainer : public QWidget, public BasePageContainer {
     Q_OBJECT
-public:
-    explicit PageContainer(BasePageProvider *pageProvider, QString defaultId = QString(),
-                        QWidget *parent = 0);
+   public:
+    explicit PageContainer(BasePageProvider* pageProvider, QString defaultId = QString(), QWidget* parent = 0);
     virtual ~PageContainer() {}
 
-    void addButtons(QWidget * buttons);
-    void addButtons(QLayout * buttons);
+    void addButtons(QWidget* buttons);
+    void addButtons(QLayout* buttons);
     /*
      * Save any unsaved state and prepare to be closed.
      * @return true if everything can be saved, false if there is something that requires attention
@@ -72,8 +70,7 @@ public:
     /* request close - used by individual pages */
     bool requestClose() override
     {
-        if(m_container)
-        {
+        if (m_container) {
             return m_container->requestClose();
         }
         return false;
@@ -85,36 +82,33 @@ public:
     const QList<BasePage*>& getPages() const;
 
     void refreshContainer() override;
-    virtual void setParentContainer(BasePageContainer * container)
-    {
-        m_container = container;
-    };
+    virtual void setParentContainer(BasePageContainer* container) { m_container = container; };
 
     void changeEvent(QEvent*) override;
 
-private:
+   private:
     void createUI();
     void retranslate();
 
-public slots:
+   public slots:
     void help();
 
-signals:
+   signals:
     /** Emitted when the currently selected page is changed */
     void selectedPageChanged(BasePage* previous, BasePage* selected);
 
-private slots:
-    void currentChanged(const QModelIndex &current);
+   private slots:
+    void currentChanged(const QModelIndex& current);
     void showPage(int row);
 
-private:
-    BasePageContainer * m_container = nullptr;
-    BasePage * m_currentPage = 0;
-    QSortFilterProxyModel *m_proxyModel;
-    PageModel *m_model;
-    QStackedLayout *m_pageStack;
-    QListView *m_pageList;
-    QLabel *m_header;
-    IconLabel *m_iconHeader;
-    QGridLayout *m_layout;
+   private:
+    BasePageContainer* m_container = nullptr;
+    BasePage* m_currentPage = 0;
+    QSortFilterProxyModel* m_proxyModel;
+    PageModel* m_model;
+    QStackedLayout* m_pageStack;
+    QListView* m_pageList;
+    QLabel* m_header;
+    IconLabel* m_iconHeader;
+    QGridLayout* m_layout;
 };
diff --git a/launcher/ui/widgets/PageContainer_p.h b/launcher/ui/widgets/PageContainer_p.h
index 8bf26618..e61f6e15 100644
--- a/launcher/ui/widgets/PageContainer_p.h
+++ b/launcher/ui/widgets/PageContainer_p.h
@@ -15,21 +15,18 @@
 
 #pragma once
 
-#include <QListView>
-#include <QStyledItemDelegate>
 #include <QEvent>
+#include <QListView>
 #include <QScrollBar>
+#include <QStyledItemDelegate>
 
 class BasePage;
 const int pageIconSize = 24;
 
-class PageViewDelegate : public QStyledItemDelegate
-{
-public:
-    PageViewDelegate(QObject *parent) : QStyledItemDelegate(parent)
-    {
-    }
-    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+class PageViewDelegate : public QStyledItemDelegate {
+   public:
+    PageViewDelegate(QObject* parent) : QStyledItemDelegate(parent) {}
+    QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
     {
         QSize size = QStyledItemDelegate::sizeHint(option, index);
         size.setHeight(qMax(size.height(), 32));
@@ -37,10 +34,9 @@ public:
     }
 };
 
-class PageModel : public QAbstractListModel
-{
-public:
-    PageModel(QObject *parent = 0) : QAbstractListModel(parent)
+class PageModel : public QAbstractListModel {
+   public:
+    PageModel(QObject* parent = 0) : QAbstractListModel(parent)
     {
         QPixmap empty(pageIconSize, pageIconSize);
         empty.fill(Qt::transparent);
@@ -48,57 +44,47 @@ public:
     }
     virtual ~PageModel() {}
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const
+    int rowCount(const QModelIndex& parent = QModelIndex()) const { return parent.isValid() ? 0 : m_pages.size(); }
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const
     {
-        return parent.isValid() ? 0 : m_pages.size();
-    }
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const
-    {
-        switch (role)
-        {
-        case Qt::DisplayRole:
-            return m_pages.at(index.row())->displayName();
-        case Qt::DecorationRole:
-        {
-            QIcon icon = m_pages.at(index.row())->icon();
-            if (icon.isNull())
-                icon = m_emptyIcon;
-            // HACK: fixes icon stretching on windows. TODO: report Qt bug for this
-            return QIcon(icon.pixmap(QSize(48,48)));
-        }
+        switch (role) {
+            case Qt::DisplayRole:
+                return m_pages.at(index.row())->displayName();
+            case Qt::DecorationRole: {
+                QIcon icon = m_pages.at(index.row())->icon();
+                if (icon.isNull())
+                    icon = m_emptyIcon;
+                // HACK: fixes icon stretching on windows. TODO: report Qt bug for this
+                return QIcon(icon.pixmap(QSize(48, 48)));
+            }
         }
         return QVariant();
     }
 
-    void setPages(const QList<BasePage *> &pages)
+    void setPages(const QList<BasePage*>& pages)
     {
         beginResetModel();
         m_pages = pages;
         endResetModel();
     }
-    const QList<BasePage *> &pages() const
-    {
-        return m_pages;
-    }
+    const QList<BasePage*>& pages() const { return m_pages; }
 
-    BasePage * findPageEntryById(QString id)
+    BasePage* findPageEntryById(QString id)
     {
-        for(auto page: m_pages)
-        {
+        for (auto page : m_pages) {
             if (page->id() == id)
                 return page;
         }
         return nullptr;
     }
 
-    QList<BasePage *> m_pages;
+    QList<BasePage*> m_pages;
     QIcon m_emptyIcon;
 };
 
-class PageView : public QListView
-{
-public:
-    PageView(QWidget *parent = 0) : QListView(parent)
+class PageView : public QListView {
+   public:
+    PageView(QWidget* parent = 0) : QListView(parent)
     {
         setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding);
         setItemDelegate(new PageViewDelegate(this));
@@ -115,10 +101,9 @@ public:
         return QSize(width, 100);
     }
 
-    virtual bool eventFilter(QObject *obj, QEvent *event)
+    virtual bool eventFilter(QObject* obj, QEvent* event)
     {
-        if (obj == verticalScrollBar() &&
-            (event->type() == QEvent::Show || event->type() == QEvent::Hide))
+        if (obj == verticalScrollBar() && (event->type() == QEvent::Show || event->type() == QEvent::Hide))
             updateGeometry();
         return QListView::eventFilter(obj, event);
     }
diff --git a/launcher/ui/widgets/ProjectItem.cpp b/launcher/ui/widgets/ProjectItem.cpp
index 0085d6b2..1481c1b6 100644
--- a/launcher/ui/widgets/ProjectItem.cpp
+++ b/launcher/ui/widgets/ProjectItem.cpp
@@ -116,7 +116,6 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
         }
 
         int description_x = rect.x();
-        
 
         // Have the y-value be set based on the number of lines in the description, to centralize the
         // description text with the space between the base and the title.
@@ -127,8 +126,8 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
             description_y -= opt.fontMetrics.height();
 
         // On the bottom, aligned to the left after the icon, and featuring at most two lines of text (with some margin space to spare)
-        painter->drawText(description_x, description_y, remaining_width,
-                          cut_text.size() * opt.fontMetrics.height(), Qt::TextWordWrap, description);
+        painter->drawText(description_x, description_y, remaining_width, cut_text.size() * opt.fontMetrics.height(), Qt::TextWordWrap,
+                          description);
     }
 
     painter->restore();
diff --git a/launcher/ui/widgets/ProjectItem.h b/launcher/ui/widgets/ProjectItem.h
index 196055ea..c3d0dce7 100644
--- a/launcher/ui/widgets/ProjectItem.h
+++ b/launcher/ui/widgets/ProjectItem.h
@@ -18,9 +18,8 @@ enum UserDataTypes {
 class ProjectItemDelegate final : public QStyledItemDelegate {
     Q_OBJECT
 
-    public:
-        ProjectItemDelegate(QWidget* parent);
-
-        void paint(QPainter*, const QStyleOptionViewItem&, const QModelIndex&) const override;
+   public:
+    ProjectItemDelegate(QWidget* parent);
 
+    void paint(QPainter*, const QStyleOptionViewItem&, const QModelIndex&) const override;
 };
diff --git a/launcher/ui/widgets/SubTaskProgressBar.cpp b/launcher/ui/widgets/SubTaskProgressBar.cpp
index 84ea5f20..b0e62e0f 100644
--- a/launcher/ui/widgets/SubTaskProgressBar.cpp
+++ b/launcher/ui/widgets/SubTaskProgressBar.cpp
@@ -26,12 +26,11 @@ unique_qobject_ptr<SubTaskProgressBar> SubTaskProgressBar::create(QWidget* paren
     return unique_qobject_ptr<SubTaskProgressBar>(progress_bar);
 }
 
-SubTaskProgressBar::SubTaskProgressBar(QWidget* parent)
-    : ui(new Ui::SubTaskProgressBar)
+SubTaskProgressBar::SubTaskProgressBar(QWidget* parent) : QWidget(parent), ui(new Ui::SubTaskProgressBar)
 {
     ui->setupUi(this);
 }
-SubTaskProgressBar::~SubTaskProgressBar() 
+SubTaskProgressBar::~SubTaskProgressBar()
 {
     delete ui;
 }
@@ -55,4 +54,3 @@ void SubTaskProgressBar::setDetails(QString details)
 {
     ui->statusDetailsLabel->setText(details);
 }
-
diff --git a/launcher/ui/widgets/SubTaskProgressBar.h b/launcher/ui/widgets/SubTaskProgressBar.h
index 8f8aeea2..cd08809f 100644
--- a/launcher/ui/widgets/SubTaskProgressBar.h
+++ b/launcher/ui/widgets/SubTaskProgressBar.h
@@ -25,11 +25,10 @@ namespace Ui {
 class SubTaskProgressBar;
 }
 
-class SubTaskProgressBar : public QWidget 
-{
+class SubTaskProgressBar : public QWidget {
     Q_OBJECT
 
-public:
+   public:
     static unique_qobject_ptr<SubTaskProgressBar> create(QWidget* parent = nullptr);
 
     SubTaskProgressBar(QWidget* parent = nullptr);
@@ -40,9 +39,6 @@ public:
     void setStatus(QString status);
     void setDetails(QString details);
 
-
-
-private:
+   private:
     Ui::SubTaskProgressBar* ui;
-  
 };
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.cpp b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
index 291f8ed9..0de97441 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.cpp
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
@@ -19,17 +19,26 @@
 #include "ui_ThemeCustomizationWidget.h"
 
 #include "Application.h"
+#include "DesktopServices.h"
 #include "ui/themes/ITheme.h"
 #include "ui/themes/ThemeManager.h"
 
-ThemeCustomizationWidget::ThemeCustomizationWidget(QWidget *parent) : QWidget(parent), ui(new Ui::ThemeCustomizationWidget)
+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->widgetStyleComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &ThemeCustomizationWidget::applyWidgetTheme);
     connect(ui->backgroundCatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyCatTheme);
+
+    connect(ui->iconsFolder, &QPushButton::clicked, this,
+            [] { DesktopServices::openDirectory(APPLICATION->themeManager()->getIconThemesFolder().path()); });
+    connect(ui->widgetStyleFolder, &QPushButton::clicked, this,
+            [] { DesktopServices::openDirectory(APPLICATION->themeManager()->getApplicationThemesFolder().path()); });
+    connect(ui->catPackFolder, &QPushButton::clicked, this,
+            [] { DesktopServices::openDirectory(APPLICATION->themeManager()->getCatPacksFolder().path()); });
 }
 
 ThemeCustomizationWidget::~ThemeCustomizationWidget()
@@ -40,7 +49,7 @@ ThemeCustomizationWidget::~ThemeCustomizationWidget()
 /// <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);
@@ -48,7 +57,7 @@ ThemeCustomizationWidget::~ThemeCustomizationWidget()
 /// 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);
@@ -61,35 +70,37 @@ ThemeCustomizationWidget::~ThemeCustomizationWidget()
 ///     }
 /// </summary>
 /// <param name="features"></param>
-void ThemeCustomizationWidget::showFeatures(ThemeFields features) {
+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->widgetStyleLabel->setEnabled(features & ThemeFields::WIDGETS);
     ui->backgroundCatComboBox->setEnabled(features & ThemeFields::CAT);
     ui->backgroundCatLabel->setEnabled(features & ThemeFields::CAT);
 }
 
-void ThemeCustomizationWidget::applyIconTheme(int index) {
+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);
-
+    auto newIconTheme = ui->iconsComboBox->currentData().toString();
     if (originalIconTheme != newIconTheme) {
-        APPLICATION->applyCurrentlySelectedTheme();
+        settings->set("IconTheme", newIconTheme);
+        APPLICATION->themeManager()->applyCurrentlySelectedTheme();
     }
 
     emit currentIconThemeChanged(index);
 }
 
-void ThemeCustomizationWidget::applyWidgetTheme(int 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();
+        APPLICATION->themeManager()->applyCurrentlySelectedTheme();
     }
 
     emit currentWidgetThemeChanged(index);
@@ -117,18 +128,23 @@ 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 currentIconTheme = settings->get("IconTheme").toString();
+        auto iconThemes = APPLICATION->themeManager()->getValidIconThemes();
+        int idx = 0;
+        for (auto iconTheme : iconThemes) {
+            QIcon iconForComboBox = QIcon(iconTheme->path() + "/scalable/settings");
+            ui->iconsComboBox->addItem(iconForComboBox, iconTheme->name(), iconTheme->id());
+            if (currentIconTheme == iconTheme->id()) {
+                ui->iconsComboBox->setCurrentIndex(idx);
+            }
+            idx++;
         }
     }
 
     {
         auto currentTheme = settings->get("ApplicationTheme").toString();
-        auto themes = APPLICATION->getValidApplicationThemes();
+        auto themes = APPLICATION->themeManager()->getValidApplicationThemes();
         int idx = 0;
         for (auto& theme : themes) {
             ui->widgetStyleComboBox->addItem(theme->name(), theme->id());
@@ -140,7 +156,7 @@ void ThemeCustomizationWidget::loadSettings()
     }
 
     auto cat = settings->get("BackgroundCat").toString();
-    for (auto& catFromList : APPLICATION->getValidCatPacks()) {
+    for (auto& catFromList : APPLICATION->themeManager()->getValidCatPacks()) {
         QIcon catIcon = QIcon(QString("%1").arg(catFromList->path()));
         ui->backgroundCatComboBox->addItem(catIcon, catFromList->name(), catFromList->id());
         if (cat == catFromList->id()) {
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.h b/launcher/ui/widgets/ThemeCustomizationWidget.h
index af47c788..cef5fb6c 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.h
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.h
@@ -31,7 +31,7 @@ class ThemeCustomizationWidget : public QWidget {
 
    public:
     explicit ThemeCustomizationWidget(QWidget* parent = nullptr);
-    ~ThemeCustomizationWidget();
+    ~ThemeCustomizationWidget() override;
 
     void showFeatures(ThemeFields features);
 
@@ -52,18 +52,4 @@ class ThemeCustomizationWidget : public QWidget {
 
    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") } };
 };
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.ui b/launcher/ui/widgets/ThemeCustomizationWidget.ui
index f216a610..4503181c 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.ui
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.ui
@@ -40,22 +40,43 @@
     </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>
+    <layout class="QHBoxLayout" name="iconsLayout">
+     <item>
+      <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>
+      <widget class="QPushButton" name="iconsFolder">
+       <property name="toolTip">
+        <string>View icon themes folder.</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset theme="viewfolder">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item row="1" column="0">
-    <widget class="QLabel" name="widgetThemeLabel">
+    <widget class="QLabel" name="widgetStyleLabel">
      <property name="text">
-      <string>&amp;Colors</string>
+      <string>&amp;Widgets</string>
      </property>
      <property name="buddy">
       <cstring>widgetStyleComboBox</cstring>
@@ -63,17 +84,38 @@
     </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>
+    <layout class="QHBoxLayout" name="widgetStyleLayout">
+     <item>
+      <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>
+      <widget class="QPushButton" name="widgetStyleFolder">
+       <property name="toolTip">
+        <string>View widget themes folder.</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset theme="viewfolder">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="backgroundCatLabel">
@@ -89,7 +131,7 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="catLayout">
      <item>
       <widget class="QComboBox" name="backgroundCatComboBox">
        <property name="sizePolicy">
@@ -107,15 +149,15 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="catInfoLabel">
+      <widget class="QPushButton" name="catPackFolder">
        <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>
+        <string>View cat packs folder.</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
-        <iconset theme="about">
+        <iconset theme="viewfolder">
          <normaloff>.</normaloff>.</iconset>
        </property>
        <property name="flat">
diff --git a/launcher/ui/widgets/VariableSizedImageObject.cpp b/launcher/ui/widgets/VariableSizedImageObject.cpp
index 3aa3343d..f655fc38 100644
--- a/launcher/ui/widgets/VariableSizedImageObject.cpp
+++ b/launcher/ui/widgets/VariableSizedImageObject.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -25,8 +25,8 @@
 
 #include "Application.h"
 
-#include "net/NetJob.h"
 #include "net/ApiDownload.h"
+#include "net/NetJob.h"
 
 enum FormatProperties { ImageData = QTextFormat::UserProperty + 1 };
 
diff --git a/launcher/ui/widgets/VariableSizedImageObject.h b/launcher/ui/widgets/VariableSizedImageObject.h
index 137487ee..ca67af0c 100644
--- a/launcher/ui/widgets/VariableSizedImageObject.h
+++ b/launcher/ui/widgets/VariableSizedImageObject.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/launcher/ui/widgets/VersionListView.cpp b/launcher/ui/widgets/VersionListView.cpp
index 06e58d22..7701d127 100644
--- a/launcher/ui/widgets/VersionListView.cpp
+++ b/launcher/ui/widgets/VersionListView.cpp
@@ -34,35 +34,33 @@
  *      limitations under the License.
  */
 
-#include <QHeaderView>
+#include "VersionListView.h"
 #include <QApplication>
-#include <QMouseEvent>
 #include <QDrag>
+#include <QHeaderView>
+#include <QMouseEvent>
 #include <QPainter>
-#include "VersionListView.h"
 
-VersionListView::VersionListView(QWidget *parent)
-    :QTreeView ( parent )
+VersionListView::VersionListView(QWidget* parent) : QTreeView(parent)
 {
     m_emptyString = tr("No versions are currently available.");
 }
 
-void VersionListView::rowsInserted(const QModelIndex &parent, int start, int end)
+void VersionListView::rowsInserted(const QModelIndex& parent, int start, int end)
 {
-    m_itemCount += end-start+1;
+    m_itemCount += end - start + 1;
     updateEmptyViewPort();
     QTreeView::rowsInserted(parent, start, end);
 }
 
-
-void VersionListView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
+void VersionListView::rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
-    m_itemCount -= end-start+1;
+    m_itemCount -= end - start + 1;
     updateEmptyViewPort();
     QTreeView::rowsInserted(parent, start, end);
 }
 
-void VersionListView::setModel(QAbstractItemModel *model)
+void VersionListView::setModel(QAbstractItemModel* model)
 {
     m_itemCount = model->rowCount();
     updateEmptyViewPort();
@@ -71,11 +69,9 @@ void VersionListView::setModel(QAbstractItemModel *model)
 
 void VersionListView::reset()
 {
-    if(model())
-    {
+    if (model()) {
         m_itemCount = model()->rowCount();
-    }
-    else {
+    } else {
         m_itemCount = 0;
     }
     updateEmptyViewPort();
@@ -106,28 +102,23 @@ void VersionListView::updateEmptyViewPort()
     setAccessibleDescription(currentEmptyString());
 #endif /* !QT_NO_ACCESSIBILITY */
 
-    if(!m_itemCount)
-    {
+    if (!m_itemCount) {
         viewport()->update();
     }
 }
 
-void VersionListView::paintEvent(QPaintEvent *event)
+void VersionListView::paintEvent(QPaintEvent* event)
 {
-    if(m_itemCount)
-    {
+    if (m_itemCount) {
         QTreeView::paintEvent(event);
-    }
-    else
-    {
+    } else {
         paintInfoLabel(event);
     }
 }
 
 QString VersionListView::currentEmptyString() const
 {
-    switch(m_emptyMode)
-    {
+    switch (m_emptyMode) {
         default:
         case VersionListView::String:
             return m_emptyString;
@@ -136,12 +127,11 @@ QString VersionListView::currentEmptyString() const
     }
 }
 
-
-void VersionListView::paintInfoLabel(QPaintEvent *event) const
+void VersionListView::paintInfoLabel(QPaintEvent* event) const
 {
     QString emptyString = currentEmptyString();
 
-    //calculate the rect for the overlay
+    // calculate the rect for the overlay
     QPainter painter(viewport());
     painter.setRenderHint(QPainter::Antialiasing, true);
     QFont font("sans", 20);
@@ -163,7 +153,7 @@ void VersionListView::paintInfoLabel(QPaintEvent *event) const
     auto wrapRect = textRect;
     wrapRect.adjust(-10, -10, 10, 10);
 
-    //check if we are allowed to draw in our area
+    // check if we are allowed to draw in our area
     if (!event->rect().intersects(wrapRect)) {
         return;
     }
diff --git a/launcher/ui/widgets/VersionListView.h b/launcher/ui/widgets/VersionListView.h
index 4153b314..07792db5 100644
--- a/launcher/ui/widgets/VersionListView.h
+++ b/launcher/ui/widgets/VersionListView.h
@@ -16,39 +16,32 @@
 #pragma once
 #include <QTreeView>
 
-class VersionListView : public QTreeView
-{
+class VersionListView : public QTreeView {
     Q_OBJECT
-public:
-
-    explicit VersionListView(QWidget *parent = 0);
-    virtual void paintEvent(QPaintEvent *event) override;
+   public:
+    explicit VersionListView(QWidget* parent = 0);
+    virtual void paintEvent(QPaintEvent* event) override;
     virtual void setModel(QAbstractItemModel* model) override;
 
-    enum EmptyMode
-    {
-        Empty,
-        String,
-        ErrorString
-    };
+    enum EmptyMode { Empty, String, ErrorString };
 
     void setEmptyString(QString emptyString);
     void setEmptyErrorString(QString emptyErrorString);
     void setEmptyMode(EmptyMode mode);
 
-public slots:
+   public slots:
     virtual void reset() override;
 
-protected slots:
-    virtual void rowsAboutToBeRemoved(const QModelIndex & parent, int start, int end) override;
-    virtual void rowsInserted(const QModelIndex &parent, int start, int end) override;
+   protected slots:
+    virtual void rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end) override;
+    virtual void rowsInserted(const QModelIndex& parent, int start, int end) override;
 
-private: /* methods */
-    void paintInfoLabel(QPaintEvent *event) const;
+   private: /* methods */
+    void paintInfoLabel(QPaintEvent* event) const;
     void updateEmptyViewPort();
     QString currentEmptyString() const;
 
-private: /* variables */
+   private: /* variables */
     int m_itemCount = 0;
     QString m_emptyString;
     QString m_emptyErrorString;
diff --git a/launcher/ui/widgets/VersionSelectWidget.cpp b/launcher/ui/widgets/VersionSelectWidget.cpp
index 2b22a4a9..a24630b3 100644
--- a/launcher/ui/widgets/VersionSelectWidget.cpp
+++ b/launcher/ui/widgets/VersionSelectWidget.cpp
@@ -11,8 +11,7 @@
 
 #include "ui/dialogs/CustomMessageBox.h"
 
-VersionSelectWidget::VersionSelectWidget(QWidget* parent)
-    : QWidget(parent)
+VersionSelectWidget::VersionSelectWidget(QWidget* parent) : QWidget(parent)
 {
     setObjectName(QStringLiteral("VersionSelectWidget"));
     verticalLayout = new QVBoxLayout(this);
@@ -79,9 +78,7 @@ void VersionSelectWidget::setEmptyMode(VersionListView::EmptyMode mode)
     listView->setEmptyMode(mode);
 }
 
-VersionSelectWidget::~VersionSelectWidget()
-{
-}
+VersionSelectWidget::~VersionSelectWidget() {}
 
 void VersionSelectWidget::setResizeOn(int column)
 {
@@ -90,7 +87,8 @@ void VersionSelectWidget::setResizeOn(int column)
     listView->header()->setSectionResizeMode(resizeOnColumn, QHeaderView::Stretch);
 }
 
-bool VersionSelectWidget::eventFilter(QObject *watched, QEvent *event) {
+bool VersionSelectWidget::eventFilter(QObject* watched, QEvent* event)
+{
     if (watched == search && event->type() == QEvent::KeyPress) {
         const QKeyEvent* keyEvent = (QKeyEvent*)event;
         const bool up = keyEvent->key() == Qt::Key_Up;
@@ -107,28 +105,24 @@ bool VersionSelectWidget::eventFilter(QObject *watched, QEvent *event) {
     return QObject::eventFilter(watched, event);
 }
 
-void VersionSelectWidget::initialize(BaseVersionList *vlist)
+void VersionSelectWidget::initialize(BaseVersionList* vlist)
 {
     m_vlist = vlist;
     m_proxyModel->setSourceModel(vlist);
     listView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
     listView->header()->setSectionResizeMode(resizeOnColumn, QHeaderView::Stretch);
 
-    if (!m_vlist->isLoaded())
-    {
+    if (!m_vlist->isLoaded()) {
         loadList();
-    }
-    else
-    {
-        if (m_proxyModel->rowCount() == 0)
-        {
+    } else {
+        if (m_proxyModel->rowCount() == 0) {
             listView->setEmptyMode(VersionListView::String);
         }
         preselect();
     }
 }
 
-void VersionSelectWidget::closeEvent(QCloseEvent * event)
+void VersionSelectWidget::closeEvent(QCloseEvent* event)
 {
     QWidget::closeEvent(event);
 }
@@ -136,16 +130,14 @@ void VersionSelectWidget::closeEvent(QCloseEvent * event)
 void VersionSelectWidget::loadList()
 {
     auto newTask = m_vlist->getLoadTask();
-    if (!newTask)
-    {
+    if (!newTask) {
         return;
     }
     loadTask = newTask.get();
     connect(loadTask, &Task::succeeded, this, &VersionSelectWidget::onTaskSucceeded);
     connect(loadTask, &Task::failed, this, &VersionSelectWidget::onTaskFailed);
     connect(loadTask, &Task::progress, this, &VersionSelectWidget::changeProgress);
-    if(!loadTask->isRunning())
-    {
+    if (!loadTask->isRunning()) {
         loadTask->start();
     }
     sneakyProgressBar->setHidden(false);
@@ -153,8 +145,7 @@ void VersionSelectWidget::loadList()
 
 void VersionSelectWidget::onTaskSucceeded()
 {
-    if (m_proxyModel->rowCount() == 0)
-    {
+    if (m_proxyModel->rowCount() == 0) {
         listView->setEmptyMode(VersionListView::String);
     }
     sneakyProgressBar->setHidden(true);
@@ -182,25 +173,23 @@ void VersionSelectWidget::currentRowChanged(const QModelIndex& current, const QM
 
 void VersionSelectWidget::preselect()
 {
-    if(preselectedAlready)
+    if (preselectedAlready)
         return;
     selectCurrent();
-    if(preselectedAlready)
+    if (preselectedAlready)
         return;
     selectRecommended();
 }
 
 void VersionSelectWidget::selectCurrent()
 {
-    if(m_currentVersion.isEmpty())
-    {
+    if (m_currentVersion.isEmpty()) {
         return;
     }
     auto idx = m_proxyModel->getVersion(m_currentVersion);
-    if(idx.isValid())
-    {
+    if (idx.isValid()) {
         preselectedAlready = true;
-        listView->selectionModel()->setCurrentIndex(idx,QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+        listView->selectionModel()->setCurrentIndex(idx, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
         listView->scrollTo(idx, QAbstractItemView::PositionAtCenter);
     }
 }
@@ -218,10 +207,9 @@ VersionListView* VersionSelectWidget::view()
 void VersionSelectWidget::selectRecommended()
 {
     auto idx = m_proxyModel->getRecommended();
-    if(idx.isValid())
-    {
+    if (idx.isValid()) {
         preselectedAlready = true;
-        listView->selectionModel()->setCurrentIndex(idx,QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+        listView->selectionModel()->setCurrentIndex(idx, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
         listView->scrollTo(idx, QAbstractItemView::PositionAtCenter);
     }
 }
@@ -253,7 +241,7 @@ void VersionSelectWidget::setExactIfPresentFilter(BaseVersionList::ModelRoles ro
     m_proxyModel->setFilter(role, new ExactIfPresentFilter(filter));
 }
 
-void VersionSelectWidget::setFilter(BaseVersionList::ModelRoles role, Filter *filter)
+void VersionSelectWidget::setFilter(BaseVersionList::ModelRoles role, Filter* filter)
 {
     m_proxyModel->setFilter(role, filter);
 }
diff --git a/launcher/ui/widgets/VersionSelectWidget.h b/launcher/ui/widgets/VersionSelectWidget.h
index 598e1059..99729fbd 100644
--- a/launcher/ui/widgets/VersionSelectWidget.h
+++ b/launcher/ui/widgets/VersionSelectWidget.h
@@ -35,9 +35,9 @@
 
 #pragma once
 
-#include <QWidget>
-#include <QSortFilterProxyModel>
 #include <QLineEdit>
+#include <QSortFilterProxyModel>
+#include <QWidget>
 #include "BaseVersionList.h"
 #include "VersionListView.h"
 
@@ -47,15 +47,14 @@ class QVBoxLayout;
 class QProgressBar;
 class Filter;
 
-class VersionSelectWidget: public QWidget
-{
+class VersionSelectWidget : public QWidget {
     Q_OBJECT
-public:
-    explicit VersionSelectWidget(QWidget *parent);
+   public:
+    explicit VersionSelectWidget(QWidget* parent);
     ~VersionSelectWidget();
 
     //! loads the list if needed.
-    void initialize(BaseVersionList *vlist);
+    void initialize(BaseVersionList* vlist);
 
     //! Starts a task that loads the list.
     void loadList();
@@ -67,11 +66,11 @@ public:
     void selectSearch();
     VersionListView* view();
 
-    void setCurrentVersion(const QString & version);
+    void setCurrentVersion(const QString& version);
     void setFuzzyFilter(BaseVersionList::ModelRoles role, QString filter);
     void setExactFilter(BaseVersionList::ModelRoles role, QString filter);
     void setExactIfPresentFilter(BaseVersionList::ModelRoles role, QString filter);
-    void setFilter(BaseVersionList::ModelRoles role, Filter *filter);
+    void setFilter(BaseVersionList::ModelRoles role, Filter* filter);
     void setEmptyString(QString emptyString);
     void setEmptyErrorString(QString emptyErrorString);
     void setEmptyMode(VersionListView::EmptyMode mode);
@@ -79,31 +78,31 @@ public:
 
     bool eventFilter(QObject* watched, QEvent* event) override;
 
-signals:
+   signals:
     void selectedVersionChanged(BaseVersion::Ptr version);
 
-protected:
-    virtual void closeEvent ( QCloseEvent* );
+   protected:
+    virtual void closeEvent(QCloseEvent*);
 
-private slots:
+   private slots:
     void onTaskSucceeded();
-    void onTaskFailed(const QString &reason);
+    void onTaskFailed(const QString& reason);
     void changeProgress(qint64 current, qint64 total);
-    void currentRowChanged(const QModelIndex &current, const QModelIndex &);
+    void currentRowChanged(const QModelIndex& current, const QModelIndex&);
 
-private:
+   private:
     void preselect();
 
-private:
+   private:
     QString m_currentVersion;
-    BaseVersionList *m_vlist = nullptr;
-    VersionProxyModel *m_proxyModel = nullptr;
+    BaseVersionList* m_vlist = nullptr;
+    VersionProxyModel* m_proxyModel = nullptr;
     int resizeOnColumn = 0;
-    Task * loadTask;
+    Task* loadTask;
     bool preselectedAlready = false;
 
-    QVBoxLayout *verticalLayout = nullptr;
-    VersionListView *listView = nullptr;
-    QLineEdit *search;
-    QProgressBar *sneakyProgressBar = nullptr;
+    QVBoxLayout* verticalLayout = nullptr;
+    VersionListView* listView = nullptr;
+    QLineEdit* search;
+    QProgressBar* sneakyProgressBar = nullptr;
 };
diff --git a/launcher/ui/widgets/WideBar.cpp b/launcher/ui/widgets/WideBar.cpp
index 3b57ee89..46caaaef 100644
--- a/launcher/ui/widgets/WideBar.cpp
+++ b/launcher/ui/widgets/WideBar.cpp
@@ -7,8 +7,8 @@
 class ActionButton : public QToolButton {
     Q_OBJECT
    public:
-    ActionButton(QAction* action, QWidget* parent = nullptr, bool use_default_action = false) : QToolButton(parent),
-    m_action(action), m_use_default_action(use_default_action)
+    ActionButton(QAction* action, QWidget* parent = nullptr, bool use_default_action = false)
+        : QToolButton(parent), m_action(action), m_use_default_action(use_default_action)
     {
         setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
         setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
@@ -229,7 +229,7 @@ void WideBar::showVisibilityMenu(QPoint const& position)
             act->setCheckable(true);
             act->setChecked(entry.bar_action->isVisible());
 
-            connect(act, &QAction::toggled, entry.bar_action, [this, &entry](bool toggled){
+            connect(act, &QAction::toggled, entry.bar_action, [this, &entry](bool toggled) {
                 entry.bar_action->setVisible(toggled);
 
                 // NOTE: This is needed so that disabled actions get reflected on the button when it is made visible.
@@ -245,7 +245,8 @@ void WideBar::showVisibilityMenu(QPoint const& position)
     m_bar_menu->popup(mapToGlobal(position));
 }
 
-void WideBar::addContextMenuAction(QAction* action) {
+void WideBar::addContextMenuAction(QAction* action)
+{
     m_context_menu_actions.append(action);
 }
 
@@ -308,5 +309,4 @@ bool WideBar::checkHash(QByteArray const& old_hash) const
     return old_hash == getHash();
 }
 
-
 #include "WideBar.moc"