Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle

25 files changed, 426 insertions, 334 deletions

diff --git a/launcher/ui/InstanceWindow.cpp b/launcher/ui/InstanceWindow.cpp
index c62b370f..d784a40f 100644
--- a/launcher/ui/InstanceWindow.cpp
+++ b/launcher/ui/InstanceWindow.cpp
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 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
@@ -263,6 +264,11 @@ bool InstanceWindow::selectPage(QString pageId)
     return m_container->selectPage(pageId);
 }
 
+BasePage* InstanceWindow::selectedPage() const
+{
+    return m_container->selectedPage();
+}
+
 void InstanceWindow::refreshContainer()
 {
     m_container->refreshContainer();
diff --git a/launcher/ui/InstanceWindow.h b/launcher/ui/InstanceWindow.h
index 554c4c74..582cff13 100644
--- a/launcher/ui/InstanceWindow.h
+++ b/launcher/ui/InstanceWindow.h
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 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
@@ -56,6 +57,7 @@ public:
     virtual ~InstanceWindow();
 
     bool selectPage(QString pageId) override;
+    BasePage* selectedPage() const override;
     void refreshContainer() override;
 
     QString instanceId();
diff --git a/launcher/ui/dialogs/InstallLoaderDialog.cpp b/launcher/ui/dialogs/InstallLoaderDialog.cpp
new file mode 100644
index 00000000..840a328f
--- /dev/null
+++ b/launcher/ui/dialogs/InstallLoaderDialog.cpp
@@ -0,0 +1,164 @@
+// 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 "InstallLoaderDialog.h"
+
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include "Application.h"
+#include "BuildConfig.h"
+#include "DesktopServices.h"
+#include "meta/Index.h"
+#include "minecraft/MinecraftInstance.h"
+#include "minecraft/PackProfile.h"
+#include "ui/widgets/PageContainer.h"
+#include "ui/widgets/VersionSelectWidget.h"
+
+class InstallLoaderPage : public VersionSelectWidget, public BasePage {
+   public:
+    InstallLoaderPage(const QString& id,
+                      const QString& iconName,
+                      const QString& name,
+                      const Version& oldestVersion,
+                      const std::shared_ptr<PackProfile> profile)
+        : VersionSelectWidget(nullptr), uid(id), iconName(iconName), name(name)
+    {
+        const QString minecraftVersion = profile->getComponentVersion("net.minecraft");
+        setEmptyString(tr("No versions are currently available for Minecraft %1").arg(minecraftVersion));
+        setExactIfPresentFilter(BaseVersionList::ParentVersionRole, minecraftVersion);
+
+        if (oldestVersion != Version() && Version(minecraftVersion) < oldestVersion)
+            setExactFilter(BaseVersionList::ParentVersionRole, "AAA");
+
+        if (const QString currentVersion = profile->getComponentVersion(id); !currentVersion.isNull())
+            setCurrentVersion(currentVersion);
+    }
+
+    QString id() const override { return uid; }
+    QString displayName() const override { return name; }
+    QIcon icon() const override { return APPLICATION->getThemedIcon(iconName); }
+
+    void openedImpl() override
+    {
+        if (loaded)
+            return;
+
+        const auto versions = APPLICATION->metadataIndex()->get(uid);
+        if (!versions)
+            return;
+
+        initialize(versions.get());
+        loaded = true;
+    }
+
+    void setParentContainer(BasePageContainer* container) override
+    {
+        auto dialog = dynamic_cast<QDialog*>(dynamic_cast<PageContainer*>(container)->parent());
+        connect(view(), &QAbstractItemView::doubleClicked, dialog, &QDialog::accept);
+    }
+
+   private:
+    const QString uid;
+    const QString iconName;
+    const QString name;
+    bool loaded = false;
+};
+
+static InstallLoaderPage* pageCast(BasePage* page)
+{
+    auto result = dynamic_cast<InstallLoaderPage*>(page);
+    Q_ASSERT(result != nullptr);
+    return result;
+}
+
+InstallLoaderDialog::InstallLoaderDialog(std::shared_ptr<PackProfile> profile, const QString& uid, QWidget* parent)
+    : QDialog(parent), profile(std::move(profile)), container(new PageContainer(this, QString(), this)), buttons(new QDialogButtonBox(this))
+{
+    auto layout = new QVBoxLayout(this);
+
+    container->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+    layout->addWidget(container);
+
+    auto buttonLayout = new QHBoxLayout(this);
+
+    auto refreshButton = new QPushButton(tr("&Refresh"), this);
+    connect(refreshButton, &QPushButton::clicked, this, [this] { pageCast(container->selectedPage())->loadList(); });
+    buttonLayout->addWidget(refreshButton);
+
+    buttons->setOrientation(Qt::Horizontal);
+    buttons->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+    connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
+    buttonLayout->addWidget(buttons);
+
+    layout->addLayout(buttonLayout);
+
+    setWindowTitle(dialogTitle());
+    setWindowModality(Qt::WindowModal);
+    resize(520, 347);
+
+    for (BasePage* page : container->getPages()) {
+        if (page->id() == uid)
+            container->selectPage(page->id());
+
+        connect(pageCast(page), &VersionSelectWidget::selectedVersionChanged, this, [this, page] {
+            if (page->id() == container->selectedPage()->id())
+                validate(container->selectedPage());
+        });
+    }
+    connect(container, &PageContainer::selectedPageChanged, this, [this](BasePage* previous, BasePage* current) { validate(current); });
+    pageCast(container->selectedPage())->selectSearch();
+    validate(container->selectedPage());
+}
+
+QList<BasePage*> InstallLoaderDialog::getPages()
+{
+    return { // Forge
+             new InstallLoaderPage("net.minecraftforge", "forge", tr("Forge"), {}, profile),
+             // Fabric
+             new InstallLoaderPage("net.fabricmc.fabric-loader", "fabricmc", tr("Fabric"), Version("1.14"), profile),
+             // Quilt
+             new InstallLoaderPage("org.quiltmc.quilt-loader", "quiltmc", tr("Quilt"), Version("1.14"), profile),
+             // LiteLoader
+             new InstallLoaderPage("com.mumfrey.liteloader", "liteloader", tr("LiteLoader"), {}, profile)
+    };
+}
+
+QString InstallLoaderDialog::dialogTitle()
+{
+    return tr("Install Loader");
+}
+
+void InstallLoaderDialog::validate(BasePage* page)
+{
+    buttons->button(QDialogButtonBox::Ok)->setEnabled(pageCast(page)->selectedVersion() != nullptr);
+}
+
+void InstallLoaderDialog::done(int result)
+{
+    if (result == Accepted) {
+        auto* page = pageCast(container->selectedPage());
+        if (page->selectedVersion()) {
+            profile->setComponentVersion(page->id(), page->selectedVersion()->descriptor());
+            profile->resolve(Net::Mode::Online);
+        }
+    }
+
+    QDialog::done(result);
+}
diff --git a/launcher/ui/dialogs/InstallLoaderDialog.h b/launcher/ui/dialogs/InstallLoaderDialog.h
new file mode 100644
index 00000000..86cb3bdd
--- /dev/null
+++ b/launcher/ui/dialogs/InstallLoaderDialog.h
@@ -0,0 +1,45 @@
+// 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 <QDialog>
+#include "ui/pages/BasePageProvider.h"
+
+class MinecraftInstance;
+class PageContainer;
+class PackProfile;
+class QDialogButtonBox;
+
+class InstallLoaderDialog final : public QDialog, protected BasePageProvider {
+    Q_OBJECT
+
+   public:
+    explicit InstallLoaderDialog(std::shared_ptr<PackProfile> instance, const QString& uid = QString(), QWidget* parent = nullptr);
+
+    QList<BasePage*> getPages() override;
+    QString dialogTitle() override;
+
+    void validate(BasePage* page);
+    void done(int result) override;
+
+   private:
+    std::shared_ptr<PackProfile> profile;
+    PageContainer* container;
+    QDialogButtonBox* buttons;
+};
diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.cpp b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
index b17eced3..c243ce28 100644
--- a/launcher/ui/dialogs/ResourceDownloadDialog.cpp
+++ b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
@@ -2,7 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  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
@@ -209,15 +209,17 @@ bool ResourceDownloadDialog::selectPage(QString pageId)
     return m_container->selectPage(pageId);
 }
 
-ResourcePage* ResourceDownloadDialog::getSelectedPage()
+ResourcePage* ResourceDownloadDialog::selectedPage()
 {
-    return m_selectedPage;
+    ResourcePage* result = dynamic_cast<ResourcePage*>(m_container->selectedPage());
+    Q_ASSERT(result != nullptr);
+    return result;
 }
 
 void ResourceDownloadDialog::addResource(ModPlatform::IndexedPack::Ptr pack, ModPlatform::IndexedVersion& ver)
 {
     removeResource(pack->name);
-    m_selectedPage->addResourceToPage(pack, ver, getBaseModel());
+    selectedPage()->addResourceToPage(pack, ver, getBaseModel());
     setButtonStatus();
 }
 
@@ -257,14 +259,8 @@ void ResourceDownloadDialog::selectedPageChanged(BasePage* previous, BasePage* s
         return;
     }
 
-    m_selectedPage = dynamic_cast<ResourcePage*>(selected);
-    if (!m_selectedPage) {
-        qCritical() << "Page '" << selected->displayName() << "' in ResourceDownloadDialog is not a ResourcePage!";
-        return;
-    }
-
     // Same effect as having a global search bar
-    m_selectedPage->setSearchTerm(prev_page->getSearchTerm());
+    selectedPage()->setSearchTerm(prev_page->getSearchTerm());
 }
 
 ModDownloadDialog::ModDownloadDialog(QWidget* parent, const std::shared_ptr<ModFolderModel>& mods, BaseInstance* instance)
@@ -290,8 +286,6 @@ QList<BasePage*> ModDownloadDialog::getPages()
     if (APPLICATION->capabilities() & Application::SupportsFlame && FlameAPI::validateModLoaders(loaders))
         pages.append(FlameModPage::create(this, *m_instance));
 
-    m_selectedPage = dynamic_cast<ModPage*>(pages[0]);
-
     return pages;
 }
 
@@ -330,8 +324,6 @@ QList<BasePage*> ResourcePackDownloadDialog::getPages()
     if (APPLICATION->capabilities() & Application::SupportsFlame)
         pages.append(FlameResourcePackPage::create(this, *m_instance));
 
-    m_selectedPage = dynamic_cast<ResourcePackResourcePage*>(pages[0]);
-
     return pages;
 }
 
@@ -357,8 +349,6 @@ QList<BasePage*> TexturePackDownloadDialog::getPages()
     if (APPLICATION->capabilities() & Application::SupportsFlame)
         pages.append(FlameTexturePackPage::create(this, *m_instance));
 
-    m_selectedPage = dynamic_cast<TexturePackResourcePage*>(pages[0]);
-
     return pages;
 }
 
@@ -379,11 +369,7 @@ ShaderPackDownloadDialog::ShaderPackDownloadDialog(QWidget* parent,
 QList<BasePage*> ShaderPackDownloadDialog::getPages()
 {
     QList<BasePage*> pages;
-
     pages.append(ModrinthShaderPackPage::create(this, *m_instance));
-
-    m_selectedPage = dynamic_cast<ShaderPackResourcePage*>(pages[0]);
-
     return pages;
 }
 
diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.h b/launcher/ui/dialogs/ResourceDownloadDialog.h
index f65daaa3..e9d2cfbe 100644
--- a/launcher/ui/dialogs/ResourceDownloadDialog.h
+++ b/launcher/ui/dialogs/ResourceDownloadDialog.h
@@ -2,7 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  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
@@ -61,7 +61,7 @@ class ResourceDownloadDialog : public QDialog, public BasePageProvider {
     QString dialogTitle() override { return tr("Download %1").arg(resourcesString()); };
 
     bool selectPage(QString pageId);
-    ResourcePage* getSelectedPage();
+    ResourcePage* selectedPage();
 
     void addResource(ModPlatform::IndexedPack::Ptr, ModPlatform::IndexedVersion&);
     void removeResource(const QString&);
@@ -88,7 +88,6 @@ class ResourceDownloadDialog : public QDialog, public BasePageProvider {
     const std::shared_ptr<ResourceFolderModel> m_base_model;
 
     PageContainer* m_container = nullptr;
-    ResourcePage* m_selectedPage = nullptr;
 
     QDialogButtonBox m_buttons;
     QVBoxLayout m_vertical_layout;
diff --git a/launcher/ui/dialogs/SkinUploadDialog.ui b/launcher/ui/dialogs/SkinUploadDialog.ui
index c7b16645..2c81a7fe 100644
--- a/launcher/ui/dialogs/SkinUploadDialog.ui
+++ b/launcher/ui/dialogs/SkinUploadDialog.ui
@@ -42,7 +42,7 @@
          </size>
         </property>
         <property name="text">
-         <string notr="true">...</string>
+         <string>Browse</string>
         </property>
        </widget>
       </item>
diff --git a/launcher/ui/dialogs/VersionSelectDialog.cpp b/launcher/ui/dialogs/VersionSelectDialog.cpp
index 5feb70d2..9fa3c90f 100644
--- a/launcher/ui/dialogs/VersionSelectDialog.cpp
+++ b/launcher/ui/dialogs/VersionSelectDialog.cpp
@@ -55,7 +55,7 @@ VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QString title,
     m_verticalLayout = new QVBoxLayout(this);
     m_verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
 
-    m_versionWidget = new VersionSelectWidget(true, parent);
+    m_versionWidget = new VersionSelectWidget(parent);
     m_verticalLayout->addWidget(m_versionWidget);
 
     m_horizontalLayout = new QHBoxLayout();
@@ -75,8 +75,9 @@ VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QString title,
 
     retranslate();
 
-    QObject::connect(m_buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    QObject::connect(m_buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(m_versionWidget->view(), &QAbstractItemView::doubleClicked, this, &QDialog::accept);
+    connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
     QMetaObject::connectSlotsByName(this);
     setWindowModality(Qt::WindowModal);
@@ -123,6 +124,7 @@ int VersionSelectDialog::exec()
 {
     QDialog::open();
     m_versionWidget->initialize(m_vlist);
+    m_versionWidget->selectSearch();
     if(resizeOnColumn != -1)
     {
         m_versionWidget->setResizeOn(resizeOnColumn);
@@ -150,6 +152,10 @@ void VersionSelectDialog::setExactFilter(BaseVersionList::ModelRoles role, QStri
     m_versionWidget->setExactFilter(role, filter);
 }
 
+void VersionSelectDialog::setExactIfPresentFilter(BaseVersionList::ModelRoles role, QString filter) {
+    m_versionWidget->setExactIfPresentFilter(role, filter);
+}
+
 void VersionSelectDialog::setFuzzyFilter(BaseVersionList::ModelRoles role, QString filter)
 {
     m_versionWidget->setFuzzyFilter(role, filter);
diff --git a/launcher/ui/dialogs/VersionSelectDialog.h b/launcher/ui/dialogs/VersionSelectDialog.h
index 18a50cdb..c20a9ed5 100644
--- a/launcher/ui/dialogs/VersionSelectDialog.h
+++ b/launcher/ui/dialogs/VersionSelectDialog.h
@@ -49,6 +49,7 @@ public:
     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 setEmptyString(QString emptyString);
     void setEmptyErrorString(QString emptyErrorString);
     void setResizeOn(int column);
diff --git a/launcher/ui/pages/BasePageContainer.h b/launcher/ui/pages/BasePageContainer.h
index b41fe12a..eb3c9427 100644
--- a/launcher/ui/pages/BasePageContainer.h
+++ b/launcher/ui/pages/BasePageContainer.h
@@ -7,6 +7,7 @@ class BasePageContainer
 public:
     virtual ~BasePageContainer(){};
     virtual bool selectPage(QString pageId) = 0;
+    virtual BasePage* selectedPage() const = 0;
     virtual BasePage* getPage(QString pageId) { return nullptr; };
     virtual void refreshContainer() = 0;
     virtual bool requestClose() = 0;
diff --git a/launcher/ui/pages/global/ExternalToolsPage.ui b/launcher/ui/pages/global/ExternalToolsPage.ui
index 3643094d..47c77842 100644
--- a/launcher/ui/pages/global/ExternalToolsPage.ui
+++ b/launcher/ui/pages/global/ExternalToolsPage.ui
@@ -47,7 +47,7 @@
             <item>
              <widget class="QPushButton" name="jprofilerPathBtn">
               <property name="text">
-               <string notr="true">...</string>
+               <string>Browse</string>
               </property>
              </widget>
             </item>
@@ -84,7 +84,7 @@
             <item>
              <widget class="QPushButton" name="jvisualvmPathBtn">
               <property name="text">
-               <string notr="true">...</string>
+               <string>Browse</string>
               </property>
              </widget>
             </item>
@@ -121,7 +121,7 @@
             <item>
              <widget class="QPushButton" name="mceditPathBtn">
               <property name="text">
-               <string notr="true">...</string>
+               <string>Browse</string>
               </property>
              </widget>
             </item>
@@ -166,7 +166,7 @@
           <item row="0" column="2">
            <widget class="QToolButton" name="jsonEditorBrowseBtn">
             <property name="text">
-             <string notr="true">...</string>
+             <string>Browse</string>
             </property>
            </widget>
           </item>
diff --git a/launcher/ui/pages/global/JavaPage.ui b/launcher/ui/pages/global/JavaPage.ui
index 561cf79b..5a547637 100644
--- a/launcher/ui/pages/global/JavaPage.ui
+++ b/launcher/ui/pages/global/JavaPage.ui
@@ -160,37 +160,73 @@
           <string>Java Runtime</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_3">
-          <item row="3" column="1">
-           <widget class="QPushButton" name="javaDetectBtn">
+          <item row="7" column="0" colspan="3">
+           <widget class="QPlainTextEdit" name="jvmArgsTextBox">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="text">
-             <string>&amp;Auto-detect...</string>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>100</height>
+             </size>
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="labelJVMArgs">
+          <item row="4" column="0">
+           <widget class="QCheckBox" name="skipCompatibilityCheckbox">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="text">
-             <string>JVM arguments:</string>
+            <property name="toolTip">
+             <string>If enabled, the launcher will not check if an instance is compatible with the selected Java version.</string>
             </property>
-            <property name="alignment">
-             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+            <property name="text">
+             <string>&amp;Skip Java compatibility checks</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelJavaPath">
+          <item row="2" column="0" colspan="3">
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QPushButton" name="javaDetectBtn">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>&amp;Auto-detect...</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="javaTestBtn">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>&amp;Test</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="labelJVMArgs">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -198,69 +234,50 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>&amp;Java path:</string>
-            </property>
-            <property name="buddy">
-             <cstring>javaPathTextBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="2">
-           <widget class="QPushButton" name="javaTestBtn">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+             <string>JVM arguments:</string>
             </property>
-            <property name="text">
-             <string>&amp;Test</string>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="2">
+          <item row="1" column="0" colspan="3">
            <layout class="QHBoxLayout" name="horizontalLayout">
             <item>
+             <widget class="QLabel" name="labelJavaPath">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>&amp;Java path:</string>
+              </property>
+              <property name="buddy">
+               <cstring>javaPathTextBox</cstring>
+              </property>
+             </widget>
+            </item>
+            <item>
              <widget class="QLineEdit" name="javaPathTextBox"/>
             </item>
             <item>
              <widget class="QPushButton" name="javaBrowseBtn">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
-              <property name="maximumSize">
-               <size>
-                <width>28</width>
-                <height>16777215</height>
-               </size>
-              </property>
               <property name="text">
-               <string notr="true">...</string>
+               <string>Browse</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
-          <item row="4" column="1">
-           <widget class="QCheckBox" name="skipCompatibilityCheckbox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="toolTip">
-             <string>If enabled, the launcher will not check if an instance is compatible with the selected Java version.</string>
-            </property>
-            <property name="text">
-             <string>&amp;Skip Java compatibility checks</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1">
+          <item row="5" column="0">
            <widget class="QCheckBox" name="skipJavaWizardCheckbox">
             <property name="toolTip">
              <string>If enabled, the launcher will not prompt you to choose a Java version if one isn't found.</string>
@@ -270,25 +287,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1" colspan="2">
-           <widget class="QPlainTextEdit" name="jvmArgsTextBox">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>100</height>
-             </size>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
@@ -317,8 +315,6 @@
   <tabstop>permGenSpinBox</tabstop>
   <tabstop>javaBrowseBtn</tabstop>
   <tabstop>javaPathTextBox</tabstop>
-  <tabstop>javaDetectBtn</tabstop>
-  <tabstop>javaTestBtn</tabstop>
   <tabstop>tabWidget</tabstop>
  </tabstops>
  <resources/>
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 26408f44..bc259a9b 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -99,7 +99,7 @@
           <item row="3" column="2">
            <widget class="QToolButton" name="downloadsDirBrowseBtn">
             <property name="text">
-             <string notr="true">...</string>
+             <string>Browse</string>
             </property>
            </widget>
           </item>
@@ -109,7 +109,7 @@
           <item row="1" column="2">
            <widget class="QToolButton" name="modsDirBrowseBtn">
             <property name="text">
-             <string notr="true">...</string>
+             <string>Browse</string>
             </property>
            </widget>
           </item>
@@ -126,14 +126,14 @@
           <item row="0" column="2">
            <widget class="QToolButton" name="instDirBrowseBtn">
             <property name="text">
-             <string notr="true">...</string>
+             <string>Browse</string>
             </property>
            </widget>
           </item>
           <item row="2" column="2">
            <widget class="QToolButton" name="iconsDirBrowseBtn">
             <property name="text">
-             <string notr="true">...</string>
+             <string>Browse</string>
             </property>
            </widget>
           </item>
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.ui b/launcher/ui/pages/instance/InstanceSettingsPage.ui
index 245433fe..380d8c88 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.ui
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.ui
@@ -61,31 +61,7 @@
           <bool>false</bool>
          </property>
          <layout class="QGridLayout" name="gridLayout">
-          <item row="0" column="0" colspan="3">
-           <widget class="QLineEdit" name="javaPathTextBox"/>
-          </item>
-          <item row="1" column="0">
-           <widget class="QPushButton" name="javaDetectBtn">
-            <property name="text">
-             <string>Auto-detect...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="javaBrowseBtn">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="javaTestBtn">
-            <property name="text">
-             <string>Test</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
+          <item row="4" column="0">
            <widget class="QCheckBox" name="skipCompatibilityCheckbox">
             <property name="toolTip">
              <string>If enabled, the launcher will not check if an instance is compatible with the selected Java version.</string>
@@ -95,6 +71,38 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QLineEdit" name="javaPathTextBox"/>
+            </item>
+            <item>
+             <widget class="QPushButton" name="javaBrowseBtn">
+              <property name="text">
+               <string>Browse</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="2" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QPushButton" name="javaDetectBtn">
+              <property name="text">
+               <string>Auto-detect...</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="javaTestBtn">
+              <property name="text">
+               <string>Test</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </item>
@@ -699,10 +707,6 @@
   <tabstop>openGlobalJavaSettingsButton</tabstop>
   <tabstop>settingsTabs</tabstop>
   <tabstop>javaSettingsGroupBox</tabstop>
-  <tabstop>javaPathTextBox</tabstop>
-  <tabstop>javaDetectBtn</tabstop>
-  <tabstop>javaBrowseBtn</tabstop>
-  <tabstop>javaTestBtn</tabstop>
   <tabstop>memoryGroupBox</tabstop>
   <tabstop>minMemSpinBox</tabstop>
   <tabstop>maxMemSpinBox</tabstop>
diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp
index a180c804..9e34f766 100644
--- a/launcher/ui/pages/instance/VersionPage.cpp
+++ b/launcher/ui/pages/instance/VersionPage.cpp
@@ -6,7 +6,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022-2023 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  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
@@ -51,6 +51,7 @@
 #include <QUrl>
 
 #include "VersionPage.h"
+#include "ui/dialogs/InstallLoaderDialog.h"
 #include "ui_VersionPage.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
@@ -226,18 +227,6 @@ void VersionPage::packageCurrent(const QModelIndex& current, const QModelIndex&
 
 void VersionPage::updateVersionControls()
 {
-    // FIXME: this is a dirty hack
-    auto minecraftVersion = Version(m_profile->getComponentVersion("net.minecraft"));
-
-    bool supportsFabric = minecraftVersion >= Version("1.14");
-    ui->actionInstall_Fabric->setEnabled(supportsFabric);
-
-    bool supportsQuilt = minecraftVersion >= Version("1.14");
-    ui->actionInstall_Quilt->setEnabled(supportsQuilt);
-
-    bool supportsLiteLoader = minecraftVersion <= Version("1.12.2");
-    ui->actionInstall_LiteLoader->setEnabled(supportsLiteLoader);
-
     updateButtons();
 }
 
@@ -389,20 +378,14 @@ void VersionPage::on_actionChange_version_triggered()
         return;
     }
     auto uid = list->uid();
-    // FIXME: this is a horrible HACK. Get version filtering information from the actual metadata...
-    if (uid == "net.minecraftforge") {
-        on_actionInstall_Forge_triggered();
-        return;
-    } else if (uid == "com.mumfrey.liteloader") {
-        on_actionInstall_LiteLoader_triggered();
-        return;
-    }
+
     VersionSelectDialog vselect(list.get(), tr("Change %1 version").arg(name), this);
     if (uid == "net.fabricmc.intermediary" || uid == "org.quiltmc.hashed") {
         vselect.setEmptyString(tr("No intermediary mappings versions are currently available."));
         vselect.setEmptyErrorString(tr("Couldn't load or download the intermediary mappings version lists!"));
-        vselect.setExactFilter(BaseVersionList::ParentVersionRole, m_profile->getComponentVersion("net.minecraft"));
     }
+    vselect.setExactIfPresentFilter(BaseVersionList::ParentVersionRole, m_profile->getComponentVersion("net.minecraft"));
+
     auto currentVersion = patch->getVersion();
     if (!currentVersion.isEmpty()) {
         vselect.setCurrentVersion(currentVersion);
@@ -443,79 +426,11 @@ void VersionPage::on_actionDownload_All_triggered()
     m_container->refreshContainer();
 }
 
-void VersionPage::on_actionInstall_Forge_triggered()
-{
-    auto vlist = APPLICATION->metadataIndex()->get("net.minecraftforge");
-    if (!vlist) {
-        return;
-    }
-    VersionSelectDialog vselect(vlist.get(), tr("Select Forge version"), this);
-    vselect.setExactFilter(BaseVersionList::ParentVersionRole, m_profile->getComponentVersion("net.minecraft"));
-    vselect.setEmptyString(tr("No Forge versions are currently available for Minecraft ") +
-                           m_profile->getComponentVersion("net.minecraft"));
-    vselect.setEmptyErrorString(tr("Couldn't load or download the Forge version lists!"));
-
-    auto currentVersion = m_profile->getComponentVersion("net.minecraftforge");
-    if (!currentVersion.isEmpty()) {
-        vselect.setCurrentVersion(currentVersion);
-    }
-
-    if (vselect.exec() && vselect.selectedVersion()) {
-        auto vsn = vselect.selectedVersion();
-        m_profile->setComponentVersion("net.minecraftforge", vsn->descriptor());
-        m_profile->resolve(Net::Mode::Online);
-        // m_profile->installVersion();
-        preselect(m_profile->rowCount(QModelIndex()) - 1);
-        m_container->refreshContainer();
-    }
-}
-
-void VersionPage::on_actionInstall_Fabric_triggered()
+void VersionPage::on_actionInstall_Loader_triggered()
 {
-    auto vlist = APPLICATION->metadataIndex()->get("net.fabricmc.fabric-loader");
-    if (!vlist) {
-        return;
-    }
-    VersionSelectDialog vselect(vlist.get(), tr("Select Fabric Loader version"), this);
-    vselect.setEmptyString(tr("No Fabric Loader versions are currently available."));
-    vselect.setEmptyErrorString(tr("Couldn't load or download the Fabric Loader version lists!"));
-
-    auto currentVersion = m_profile->getComponentVersion("net.fabricmc.fabric-loader");
-    if (!currentVersion.isEmpty()) {
-        vselect.setCurrentVersion(currentVersion);
-    }
-
-    if (vselect.exec() && vselect.selectedVersion()) {
-        auto vsn = vselect.selectedVersion();
-        m_profile->setComponentVersion("net.fabricmc.fabric-loader", vsn->descriptor());
-        m_profile->resolve(Net::Mode::Online);
-        preselect(m_profile->rowCount(QModelIndex()) - 1);
-        m_container->refreshContainer();
-    }
-}
-
-void VersionPage::on_actionInstall_Quilt_triggered()
-{
-    auto vlist = APPLICATION->metadataIndex()->get("org.quiltmc.quilt-loader");
-    if (!vlist) {
-        return;
-    }
-    VersionSelectDialog vselect(vlist.get(), tr("Select Quilt Loader version"), this);
-    vselect.setEmptyString(tr("No Quilt Loader versions are currently available."));
-    vselect.setEmptyErrorString(tr("Couldn't load or download the Quilt Loader version lists!"));
-
-    auto currentVersion = m_profile->getComponentVersion("org.quiltmc.quilt-loader");
-    if (!currentVersion.isEmpty()) {
-        vselect.setCurrentVersion(currentVersion);
-    }
-
-    if (vselect.exec() && vselect.selectedVersion()) {
-        auto vsn = vselect.selectedVersion();
-        m_profile->setComponentVersion("org.quiltmc.quilt-loader", vsn->descriptor());
-        m_profile->resolve(Net::Mode::Online);
-        preselect(m_profile->rowCount(QModelIndex()) - 1);
-        m_container->refreshContainer();
-    }
+    InstallLoaderDialog dialog(m_inst->getPackProfile(), QString(), this);
+    dialog.exec();
+    m_container->refreshContainer();
 }
 
 void VersionPage::on_actionAdd_Empty_triggered()
@@ -534,33 +449,6 @@ void VersionPage::on_actionAdd_Empty_triggered()
     }
 }
 
-void VersionPage::on_actionInstall_LiteLoader_triggered()
-{
-    auto vlist = APPLICATION->metadataIndex()->get("com.mumfrey.liteloader");
-    if (!vlist) {
-        return;
-    }
-    VersionSelectDialog vselect(vlist.get(), tr("Select LiteLoader version"), this);
-    vselect.setExactFilter(BaseVersionList::ParentVersionRole, m_profile->getComponentVersion("net.minecraft"));
-    vselect.setEmptyString(tr("No LiteLoader versions are currently available for Minecraft ") +
-                           m_profile->getComponentVersion("net.minecraft"));
-    vselect.setEmptyErrorString(tr("Couldn't load or download the LiteLoader version lists!"));
-
-    auto currentVersion = m_profile->getComponentVersion("com.mumfrey.liteloader");
-    if (!currentVersion.isEmpty()) {
-        vselect.setCurrentVersion(currentVersion);
-    }
-
-    if (vselect.exec() && vselect.selectedVersion()) {
-        auto vsn = vselect.selectedVersion();
-        m_profile->setComponentVersion("com.mumfrey.liteloader", vsn->descriptor());
-        m_profile->resolve(Net::Mode::Online);
-        // m_profile->installVersion(vselect.selectedVersion());
-        preselect(m_profile->rowCount(QModelIndex()) - 1);
-        m_container->refreshContainer();
-    }
-}
-
 void VersionPage::on_actionLibrariesFolder_triggered()
 {
     DesktopServices::openDirectory(m_inst->getLocalLibraryPath(), true);
diff --git a/launcher/ui/pages/instance/VersionPage.h b/launcher/ui/pages/instance/VersionPage.h
index 45d383f4..6915be88 100644
--- a/launcher/ui/pages/instance/VersionPage.h
+++ b/launcher/ui/pages/instance/VersionPage.h
@@ -68,11 +68,8 @@ class VersionPage : public QMainWindow, public BasePage {
 
    private slots:
     void on_actionChange_version_triggered();
-    void on_actionInstall_Forge_triggered();
-    void on_actionInstall_Fabric_triggered();
-    void on_actionInstall_Quilt_triggered();
+    void on_actionInstall_Loader_triggered();
     void on_actionAdd_Empty_triggered();
-    void on_actionInstall_LiteLoader_triggered();
     void on_actionReload_triggered();
     void on_actionRemove_triggered();
     void on_actionMove_up_triggered();
diff --git a/launcher/ui/pages/instance/VersionPage.ui b/launcher/ui/pages/instance/VersionPage.ui
index a73c42d6..9be21d49 100644
--- a/launcher/ui/pages/instance/VersionPage.ui
+++ b/launcher/ui/pages/instance/VersionPage.ui
@@ -98,11 +98,7 @@
    <addaction name="actionEdit"/>
    <addaction name="actionRevert"/>
    <addaction name="separator"/>
-   <addaction name="actionInstall_Forge"/>
-   <addaction name="actionInstall_Fabric"/>
-   <addaction name="actionInstall_Quilt"/>
-   <addaction name="actionInstall_LiteLoader"/>
-   <addaction name="separator"/>
+   <addaction name="actionInstall_Loader"/>
    <addaction name="actionAdd_to_Minecraft_jar"/>
    <addaction name="actionReplace_Minecraft_jar"/>
    <addaction name="actionAdd_Agents"/>
@@ -116,26 +112,26 @@
   </widget>
   <action name="actionChange_version">
    <property name="text">
-    <string>Change version</string>
+    <string>Change Version</string>
    </property>
    <property name="toolTip">
-    <string>Change version of the selected package.</string>
+    <string>Change version of the selected component.</string>
    </property>
   </action>
   <action name="actionMove_up">
    <property name="text">
-    <string>Move up</string>
+    <string>Move Up</string>
    </property>
    <property name="toolTip">
-    <string>Make the selected package apply sooner.</string>
+    <string>Make the selected component apply sooner.</string>
    </property>
   </action>
   <action name="actionMove_down">
    <property name="text">
-    <string>Move down</string>
+    <string>Move Down</string>
    </property>
    <property name="toolTip">
-    <string>Make the selected package apply later.</string>
+    <string>Make the selected component apply later.</string>
    </property>
   </action>
   <action name="actionRemove">
@@ -143,7 +139,7 @@
     <string>Remove</string>
    </property>
    <property name="toolTip">
-    <string>Remove selected package from the instance.</string>
+    <string>Remove selected component from the instance.</string>
    </property>
   </action>
   <action name="actionCustomize">
@@ -151,7 +147,7 @@
     <string>Customize</string>
    </property>
    <property name="toolTip">
-    <string>Customize selected package.</string>
+    <string>Customize selected component.</string>
    </property>
   </action>
   <action name="actionEdit">
@@ -159,7 +155,7 @@
     <string>Edit</string>
    </property>
    <property name="toolTip">
-    <string>Edit selected package.</string>
+    <string>Edit selected component.</string>
    </property>
   </action>
   <action name="actionRevert">
@@ -167,39 +163,15 @@
     <string>Revert</string>
    </property>
    <property name="toolTip">
-    <string>Revert the selected package to default.</string>
-   </property>
-  </action>
-  <action name="actionInstall_Forge">
-   <property name="text">
-    <string>Install Forge</string>
-   </property>
-   <property name="toolTip">
-    <string>Install the Minecraft Forge package.</string>
-   </property>
-  </action>
-  <action name="actionInstall_Fabric">
-   <property name="text">
-    <string>Install Fabric</string>
-   </property>
-   <property name="toolTip">
-    <string>Install the Fabric Loader package.</string>
-   </property>
-  </action>
-  <action name="actionInstall_Quilt">
-   <property name="text">
-    <string>Install Quilt</string>
-   </property>
-   <property name="toolTip">
-    <string>Install the Quilt Loader package.</string>
+    <string>Revert the selected component to default.</string>
    </property>
   </action>
-  <action name="actionInstall_LiteLoader">
+  <action name="actionInstall_Loader">
    <property name="text">
-    <string>Install LiteLoader</string>
+    <string>Install Loader</string>
    </property>
    <property name="toolTip">
-    <string>Install the LiteLoader package.</string>
+    <string>Install a mod loader.</string>
    </property>
   </action>
   <action name="actionAdd_to_Minecraft_jar">
@@ -228,7 +200,7 @@
     <string>Add Empty</string>
    </property>
    <property name="toolTip">
-    <string>Add an empty custom package.</string>
+    <string>Add an empty custom component.</string>
    </property>
   </action>
   <action name="actionReload">
@@ -236,12 +208,12 @@
     <string>Reload</string>
    </property>
    <property name="toolTip">
-    <string>Reload all packages.</string>
+    <string>Reload all components.</string>
    </property>
   </action>
   <action name="actionDownload_All">
    <property name="text">
-    <string>Download All</string>
+    <string>Download all</string>
    </property>
    <property name="toolTip">
     <string>Download the files needed to launch the instance now.</string>
diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp
index 48afbd90..d16ac6fd 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePage.cpp
@@ -4,7 +4,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  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
@@ -395,7 +395,7 @@ void ResourcePage::openUrl(const QUrl& url)
         if (auto current_pack = getCurrentPack(); current_pack && slug != current_pack->slug) {
             m_parent_dialog->selectPage(page);
 
-            auto newPage = m_parent_dialog->getSelectedPage();
+            auto newPage = m_parent_dialog->selectedPage();
 
             QLineEdit* searchEdit = newPage->m_ui->searchEdit;
             auto model = newPage->m_model;
diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index c94fdd8d..d77e0fa0 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -46,7 +46,7 @@ void JavaSettingsWidget::setupUi()
     m_verticalLayout = new QVBoxLayout(this);
     m_verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
 
-    m_versionWidget = new VersionSelectWidget(true, this);
+    m_versionWidget = new VersionSelectWidget(this);
     m_verticalLayout->addWidget(m_versionWidget);
 
     m_horizontalLayout = new QHBoxLayout();
@@ -126,6 +126,7 @@ void JavaSettingsWidget::setupUi()
 void JavaSettingsWidget::initialize()
 {
     m_versionWidget->initialize(APPLICATION->javalist().get());
+    m_versionWidget->selectSearch();
     m_versionWidget->setResizeOn(2);
     auto s = APPLICATION->settings();
     // Memory
diff --git a/launcher/ui/widgets/PageContainer.cpp b/launcher/ui/widgets/PageContainer.cpp
index b98c9796..dbbed36a 100644
--- a/launcher/ui/widgets/PageContainer.cpp
+++ b/launcher/ui/widgets/PageContainer.cpp
@@ -1,8 +1,9 @@
 // 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) 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
@@ -141,7 +142,12 @@ BasePage* PageContainer::getPage(QString pageId)
     return m_model->findPageEntryById(pageId);
 }
 
-const QList<BasePage*> PageContainer::getPages() const
+BasePage* PageContainer::selectedPage() const
+{
+    return m_currentPage;
+}
+
+const QList<BasePage*>& PageContainer::getPages() const
 {
     return m_model->pages();
 }
diff --git a/launcher/ui/widgets/PageContainer.h b/launcher/ui/widgets/PageContainer.h
index ad74d43a..eac59723 100644
--- a/launcher/ui/widgets/PageContainer.h
+++ b/launcher/ui/widgets/PageContainer.h
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 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
@@ -78,9 +79,10 @@ public:
         return false;
     }
 
-    virtual bool selectPage(QString pageId) override;
+    bool selectPage(QString pageId) override;
+    BasePage* selectedPage() const override;
     BasePage* getPage(QString pageId) override;
-    const QList<BasePage*> getPages() const;
+    const QList<BasePage*>& getPages() const;
 
     void refreshContainer() override;
     virtual void setParentContainer(BasePageContainer * container)
diff --git a/launcher/ui/widgets/PageContainer_p.h b/launcher/ui/widgets/PageContainer_p.h
index da1a66f4..8bf26618 100644
--- a/launcher/ui/widgets/PageContainer_p.h
+++ b/launcher/ui/widgets/PageContainer_p.h
@@ -103,6 +103,8 @@ public:
         setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding);
         setItemDelegate(new PageViewDelegate(this));
         setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        // Adjust margins when using Breeze theme
+        setProperty("_kde_side_panel_view", true);
     }
 
     virtual QSize sizeHint() const
diff --git a/launcher/ui/widgets/VersionSelectWidget.cpp b/launcher/ui/widgets/VersionSelectWidget.cpp
index a956ddb3..2b22a4a9 100644
--- a/launcher/ui/widgets/VersionSelectWidget.cpp
+++ b/launcher/ui/widgets/VersionSelectWidget.cpp
@@ -11,10 +11,8 @@
 
 #include "ui/dialogs/CustomMessageBox.h"
 
-VersionSelectWidget::VersionSelectWidget(QWidget* parent) : VersionSelectWidget(false, parent) {}
-
-VersionSelectWidget::VersionSelectWidget(bool focusSearch, QWidget* parent)
-    : QWidget(parent), focusSearch(focusSearch)
+VersionSelectWidget::VersionSelectWidget(QWidget* parent)
+    : QWidget(parent)
 {
     setObjectName(QStringLiteral("VersionSelectWidget"));
     verticalLayout = new QVBoxLayout(this);
@@ -116,9 +114,6 @@ void VersionSelectWidget::initialize(BaseVersionList *vlist)
     listView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
     listView->header()->setSectionResizeMode(resizeOnColumn, QHeaderView::Stretch);
 
-    if (focusSearch)
-        search->setFocus();
-
     if (!m_vlist->isLoaded())
     {
         loadList();
@@ -210,6 +205,16 @@ void VersionSelectWidget::selectCurrent()
     }
 }
 
+void VersionSelectWidget::selectSearch()
+{
+    search->setFocus();
+}
+
+VersionListView* VersionSelectWidget::view()
+{
+    return listView;
+}
+
 void VersionSelectWidget::selectRecommended()
 {
     auto idx = m_proxyModel->getRecommended();
@@ -233,14 +238,19 @@ BaseVersion::Ptr VersionSelectWidget::selectedVersion() const
     return variant.value<BaseVersion::Ptr>();
 }
 
+void VersionSelectWidget::setFuzzyFilter(BaseVersionList::ModelRoles role, QString filter)
+{
+    m_proxyModel->setFilter(role, new ContainsFilter(filter));
+}
+
 void VersionSelectWidget::setExactFilter(BaseVersionList::ModelRoles role, QString filter)
 {
     m_proxyModel->setFilter(role, new ExactFilter(filter));
 }
 
-void VersionSelectWidget::setFuzzyFilter(BaseVersionList::ModelRoles role, QString filter)
+void VersionSelectWidget::setExactIfPresentFilter(BaseVersionList::ModelRoles role, QString filter)
 {
-    m_proxyModel->setFilter(role, new ContainsFilter(filter));
+    m_proxyModel->setFilter(role, new ExactIfPresentFilter(filter));
 }
 
 void VersionSelectWidget::setFilter(BaseVersionList::ModelRoles role, Filter *filter)
diff --git a/launcher/ui/widgets/VersionSelectWidget.h b/launcher/ui/widgets/VersionSelectWidget.h
index be4ba768..598e1059 100644
--- a/launcher/ui/widgets/VersionSelectWidget.h
+++ b/launcher/ui/widgets/VersionSelectWidget.h
@@ -52,7 +52,6 @@ class VersionSelectWidget: public QWidget
     Q_OBJECT
 public:
     explicit VersionSelectWidget(QWidget *parent);
-    explicit VersionSelectWidget(bool focusSearch = false, QWidget *parent = 0);
     ~VersionSelectWidget();
 
     //! loads the list if needed.
@@ -65,15 +64,19 @@ public:
     BaseVersion::Ptr selectedVersion() const;
     void selectRecommended();
     void selectCurrent();
+    void selectSearch();
+    VersionListView* view();
 
     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 setEmptyString(QString emptyString);
     void setEmptyErrorString(QString emptyErrorString);
     void setEmptyMode(VersionListView::EmptyMode mode);
     void setResizeOn(int column);
+
     bool eventFilter(QObject* watched, QEvent* event) override;
 
 signals:
@@ -98,7 +101,6 @@ private:
     int resizeOnColumn = 0;
     Task * loadTask;
     bool preselectedAlready = false;
-    bool focusSearch;
 
     QVBoxLayout *verticalLayout = nullptr;
     VersionListView *listView = nullptr;
diff --git a/launcher/ui/widgets/WideBar.cpp b/launcher/ui/widgets/WideBar.cpp
index a77c45fe..3b57ee89 100644
--- a/launcher/ui/widgets/WideBar.cpp
+++ b/launcher/ui/widgets/WideBar.cpp
@@ -204,8 +204,10 @@ static void copyAction(QAction* from, QAction* to)
 
 void WideBar::showVisibilityMenu(QPoint const& position)
 {
-    if (!m_bar_menu)
+    if (!m_bar_menu) {
         m_bar_menu = std::make_unique<QMenu>(this);
+        m_bar_menu->setTearOffEnabled(true);
+    }
 
     if (m_menu_state == MenuState::Dirty) {
         for (auto* old_action : m_bar_menu->actions())