NOISSUE continue reshuffling the codebase

25 files changed, 0 insertions, 3832 deletions

diff --git a/launcher/pages/global/AccountListPage.cpp b/launcher/pages/global/AccountListPage.cpp
deleted file mode 100644
index 1e175df7..00000000
--- a/launcher/pages/global/AccountListPage.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "AccountListPage.h"
-#include "ui_AccountListPage.h"
-
-#include <QItemSelectionModel>
-#include <QMenu>
-
-#include <QDebug>
-
-#include "net/NetJob.h"
-
-#include "dialogs/ProgressDialog.h"
-#include "dialogs/LoginDialog.h"
-#include "dialogs/CustomMessageBox.h"
-#include "dialogs/SkinUploadDialog.h"
-#include "tasks/Task.h"
-#include "minecraft/auth/AccountTask.h"
-#include "minecraft/services/SkinDelete.h"
-
-#include "Application.h"
-
-#include "BuildConfig.h"
-#include <dialogs/MSALoginDialog.h>
-
-#include "Secrets.h"
-
-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->setEmptyMode(VersionListView::String);
-    ui->listView->setContextMenuPolicy(Qt::CustomContextMenu);
-
-    m_accounts = APPLICATION->accounts();
-
-    ui->listView->setModel(m_accounts.get());
-    ui->listView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
-    ui->listView->header()->setSectionResizeMode(1, QHeaderView::Stretch);
-    ui->listView->header()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
-    ui->listView->setSelectionMode(QAbstractItemView::SingleSelection);
-
-    // Expand the account column
-
-    QItemSelectionModel *selectionModel = ui->listView->selectionModel();
-
-    connect(selectionModel, &QItemSelectionModel::selectionChanged, [this](const QItemSelection &sel, const QItemSelection &dsel) {
-        updateButtonStates();
-    });
-    connect(ui->listView, &VersionListView::customContextMenuRequested, this, &AccountListPage::ShowContextMenu);
-
-    connect(m_accounts.get(), &AccountList::listChanged, this, &AccountListPage::listChanged);
-    connect(m_accounts.get(), &AccountList::listActivityChanged, this, &AccountListPage::listChanged);
-    connect(m_accounts.get(), &AccountList::defaultAccountChanged, this, &AccountListPage::listChanged);
-
-    updateButtonStates();
-
-    // Xbox authentication won't work without a client identifier, so disable the button if it is missing
-    ui->actionAddMicrosoft->setVisible(Secrets::hasMSAClientID());
-}
-
-AccountListPage::~AccountListPage()
-{
-    delete ui;
-}
-
-void AccountListPage::ShowContextMenu(const QPoint& pos)
-{
-    auto menu = ui->toolBar->createContextMenu(this, tr("Context menu"));
-    menu->exec(ui->listView->mapToGlobal(pos));
-    delete menu;
-}
-
-void AccountListPage::changeEvent(QEvent* event)
-{
-    if (event->type() == QEvent::LanguageChange)
-    {
-        ui->retranslateUi(this);
-    }
-    QMainWindow::changeEvent(event);
-}
-
-QMenu * AccountListPage::createPopupMenu()
-{
-    QMenu* filteredMenu = QMainWindow::createPopupMenu();
-    filteredMenu->removeAction(ui->toolBar->toggleViewAction() );
-    return filteredMenu;
-}
-
-
-void AccountListPage::listChanged()
-{
-    updateButtonStates();
-}
-
-void AccountListPage::on_actionAddMojang_triggered()
-{
-    MinecraftAccountPtr account = LoginDialog::newAccount(
-        this,
-        tr("Please enter your Mojang account email and password to add your account.")
-    );
-
-    if (account)
-    {
-        m_accounts->addAccount(account);
-        if (m_accounts->count() == 1) {
-            m_accounts->setDefaultAccount(account);
-        }
-    }
-}
-
-void AccountListPage::on_actionAddMicrosoft_triggered()
-{
-    if(BuildConfig.BUILD_PLATFORM == "osx64") {
-        CustomMessageBox::selectable(
-            this,
-            tr("Microsoft Accounts not available"),
-            tr(
-                "Microsoft accounts are only usable on macOS 10.13 or newer, with fully updated MultiMC.\n\n"
-                "Please update both your operating system and MultiMC."
-            ),
-            QMessageBox::Warning
-        )->exec();
-        return;
-    }
-    MinecraftAccountPtr account = MSALoginDialog::newAccount(
-        this,
-        tr("Please enter your Mojang account email and password to add your account.")
-    );
-
-    if (account)
-    {
-        m_accounts->addAccount(account);
-        if (m_accounts->count() == 1) {
-            m_accounts->setDefaultAccount(account);
-        }
-    }
-}
-
-void AccountListPage::on_actionRemove_triggered()
-{
-    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-    if (selection.size() > 0)
-    {
-        QModelIndex selected = selection.first();
-        m_accounts->removeAccount(selected);
-    }
-}
-
-void AccountListPage::on_actionRefresh_triggered() {
-    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-    if (selection.size() > 0) {
-        QModelIndex selected = selection.first();
-        MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
-        AuthSessionPtr session = std::make_shared<AuthSession>();
-        auto task = account->refresh(session);
-        if (task) {
-            ProgressDialog progDialog(this);
-            progDialog.execWithTask(task.get());
-            // TODO: respond to results of the task
-        }
-    }
-}
-
-
-void AccountListPage::on_actionSetDefault_triggered()
-{
-    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-    if (selection.size() > 0)
-    {
-        QModelIndex selected = selection.first();
-        MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
-        m_accounts->setDefaultAccount(account);
-    }
-}
-
-void AccountListPage::on_actionNoDefault_triggered()
-{
-    m_accounts->setDefaultAccount(nullptr);
-}
-
-void AccountListPage::updateButtonStates()
-{
-    // If there is no selection, disable buttons that require something selected.
-    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-    bool hasSelection = selection.size() > 0;
-    bool accountIsReady = false;
-    if (hasSelection)
-    {
-        QModelIndex selected = selection.first();
-        MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
-        accountIsReady = !account->isActive();
-    }
-    ui->actionRemove->setEnabled(accountIsReady);
-    ui->actionSetDefault->setEnabled(accountIsReady);
-    ui->actionUploadSkin->setEnabled(accountIsReady);
-    ui->actionDeleteSkin->setEnabled(accountIsReady);
-    ui->actionRefresh->setEnabled(accountIsReady);
-
-    if(m_accounts->defaultAccount().get() == nullptr) {
-        ui->actionNoDefault->setEnabled(false);
-        ui->actionNoDefault->setChecked(true);
-    }
-    else {
-        ui->actionNoDefault->setEnabled(true);
-        ui->actionNoDefault->setChecked(false);
-    }
-}
-
-void AccountListPage::on_actionUploadSkin_triggered()
-{
-    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-    if (selection.size() > 0)
-    {
-        QModelIndex selected = selection.first();
-        MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
-        SkinUploadDialog dialog(account, this);
-        dialog.exec();
-    }
-}
-
-void AccountListPage::on_actionDeleteSkin_triggered()
-{
-    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-    if (selection.size() <= 0)
-        return;
-
-    QModelIndex selected = selection.first();
-    AuthSessionPtr session = std::make_shared<AuthSession>();
-    MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
-    auto login = account->refresh(session);
-    ProgressDialog prog(this);
-    if (prog.execWithTask((Task*)login.get()) != QDialog::Accepted) {
-        CustomMessageBox::selectable(this, tr("Skin Delete"), tr("Failed to login!"), QMessageBox::Warning)->exec();
-        return;
-    }
-    auto deleteSkinTask = std::make_shared<SkinDelete>(this, session);
-    if (prog.execWithTask((Task*)deleteSkinTask.get()) != QDialog::Accepted) {
-        CustomMessageBox::selectable(this, tr("Skin Delete"), tr("Failed to delete current skin!"), QMessageBox::Warning)->exec();
-        return;
-    }
-}
diff --git a/launcher/pages/global/AccountListPage.h b/launcher/pages/global/AccountListPage.h
deleted file mode 100644
index eb131ea8..00000000
--- a/launcher/pages/global/AccountListPage.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QMainWindow>
-#include <memory>
-
-#include "pages/BasePage.h"
-
-#include "minecraft/auth/AccountList.h"
-#include "Application.h"
-
-namespace Ui
-{
-class AccountListPage;
-}
-
-class AuthenticateTask;
-
-class AccountListPage : public QMainWindow, public BasePage
-{
-    Q_OBJECT
-public:
-    explicit AccountListPage(QWidget *parent = 0);
-    ~AccountListPage();
-
-    QString displayName() const override
-    {
-        return tr("Accounts");
-    }
-    QIcon icon() const override
-    {
-        auto icon = APPLICATION->getThemedIcon("accounts");
-        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";
-    }
-
-public slots:
-    void on_actionAddMojang_triggered();
-    void on_actionAddMicrosoft_triggered();
-    void on_actionRemove_triggered();
-    void on_actionRefresh_triggered();
-    void on_actionSetDefault_triggered();
-    void on_actionNoDefault_triggered();
-    void on_actionUploadSkin_triggered();
-    void on_actionDeleteSkin_triggered();
-
-    void listChanged();
-
-    //! Updates the states of the dialog's buttons.
-    void updateButtonStates();
-
-protected slots:
-    void ShowContextMenu(const QPoint &pos);
-
-private:
-    void changeEvent(QEvent * event) override;
-    QMenu * createPopupMenu() override;
-    shared_qobject_ptr<AccountList> m_accounts;
-    Ui::AccountListPage *ui;
-};
diff --git a/launcher/pages/global/AccountListPage.ui b/launcher/pages/global/AccountListPage.ui
deleted file mode 100644
index 8af23a2f..00000000
--- a/launcher/pages/global/AccountListPage.ui
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AccountListPage</class>
- <widget class="QMainWindow" name="AccountListPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>800</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QHBoxLayout" name="horizontalLayout">
-    <property name="leftMargin">
-     <number>0</number>
-    </property>
-    <property name="topMargin">
-     <number>0</number>
-    </property>
-    <property name="rightMargin">
-     <number>0</number>
-    </property>
-    <property name="bottomMargin">
-     <number>0</number>
-    </property>
-    <item>
-     <widget class="VersionListView" name="listView">
-      <property name="alternatingRowColors">
-       <bool>true</bool>
-      </property>
-      <property name="rootIsDecorated">
-       <bool>false</bool>
-      </property>
-      <property name="itemsExpandable">
-       <bool>false</bool>
-      </property>
-      <property name="allColumnsShowFocus">
-       <bool>true</bool>
-      </property>
-      <attribute name="headerStretchLastSection">
-       <bool>false</bool>
-      </attribute>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="WideBar" name="toolBar">
-   <attribute name="toolBarArea">
-    <enum>RightToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-   <addaction name="actionAddMicrosoft"/>
-   <addaction name="actionAddMojang"/>
-   <addaction name="actionRefresh"/>
-   <addaction name="actionRemove"/>
-   <addaction name="actionSetDefault"/>
-   <addaction name="actionNoDefault"/>
-   <addaction name="separator"/>
-   <addaction name="actionUploadSkin"/>
-   <addaction name="actionDeleteSkin"/>
-  </widget>
-  <action name="actionAddMojang">
-   <property name="text">
-    <string>Add Mojang</string>
-   </property>
-  </action>
-  <action name="actionRemove">
-   <property name="text">
-    <string>Remove</string>
-   </property>
-  </action>
-  <action name="actionSetDefault">
-   <property name="text">
-    <string>Set Default</string>
-   </property>
-  </action>
-  <action name="actionNoDefault">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>No Default</string>
-   </property>
-  </action>
-  <action name="actionUploadSkin">
-   <property name="text">
-    <string>Upload Skin</string>
-   </property>
-  </action>
-  <action name="actionDeleteSkin">
-   <property name="text">
-    <string>Delete Skin</string>
-   </property>
-   <property name="toolTip">
-    <string>Delete the currently active skin and go back to the default one</string>
-   </property>
-  </action>
-  <action name="actionAddMicrosoft">
-   <property name="text">
-    <string>Add Microsoft</string>
-   </property>
-  </action>
-  <action name="actionRefresh">
-   <property name="text">
-    <string>Refresh</string>
-   </property>
-   <property name="toolTip">
-    <string>Refresh the account tokens</string>
-   </property>
-  </action>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>VersionListView</class>
-   <extends>QTreeView</extends>
-   <header>widgets/VersionListView.h</header>
-  </customwidget>
-  <customwidget>
-   <class>WideBar</class>
-   <extends>QToolBar</extends>
-   <header>widgets/WideBar.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/launcher/pages/global/CustomCommandsPage.cpp b/launcher/pages/global/CustomCommandsPage.cpp
deleted file mode 100644
index 8541e3c1..00000000
--- a/launcher/pages/global/CustomCommandsPage.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "CustomCommandsPage.h"
-#include <QVBoxLayout>
-#include <QTabWidget>
-#include <QTabBar>
-
-CustomCommandsPage::CustomCommandsPage(QWidget* parent): QWidget(parent)
-{
-
-    auto verticalLayout = new QVBoxLayout(this);
-    verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
-    verticalLayout->setContentsMargins(0, 0, 0, 0);
-
-    auto tabWidget = new QTabWidget(this);
-    tabWidget->setObjectName(QStringLiteral("tabWidget"));
-    commands = new CustomCommands(this);
-    commands->setContentsMargins(6, 6, 6, 6);
-    tabWidget->addTab(commands, "Foo");
-    tabWidget->tabBar()->hide();
-    verticalLayout->addWidget(tabWidget);
-    loadSettings();
-}
-
-CustomCommandsPage::~CustomCommandsPage()
-{
-}
-
-bool CustomCommandsPage::apply()
-{
-    applySettings();
-    return true;
-}
-
-void CustomCommandsPage::applySettings()
-{
-    auto s = APPLICATION->settings();
-    s->set("PreLaunchCommand", commands->prelaunchCommand());
-    s->set("WrapperCommand", commands->wrapperCommand());
-    s->set("PostExitCommand", commands->postexitCommand());
-}
-
-void CustomCommandsPage::loadSettings()
-{
-    auto s = APPLICATION->settings();
-    commands->initialize(
-        false,
-        true,
-        s->get("PreLaunchCommand").toString(),
-        s->get("WrapperCommand").toString(),
-        s->get("PostExitCommand").toString()
-    );
-}
diff --git a/launcher/pages/global/CustomCommandsPage.h b/launcher/pages/global/CustomCommandsPage.h
deleted file mode 100644
index f81b192a..00000000
--- a/launcher/pages/global/CustomCommandsPage.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2018-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <memory>
-#include <QDialog>
-
-#include "pages/BasePage.h"
-#include <Application.h>
-#include "widgets/CustomCommands.h"
-
-class CustomCommandsPage : public QWidget, public BasePage
-{
-    Q_OBJECT
-
-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";
-    }
-    bool apply() override;
-
-private:
-    void applySettings();
-    void loadSettings();
-    CustomCommands * commands;
-};
diff --git a/launcher/pages/global/ExternalToolsPage.cpp b/launcher/pages/global/ExternalToolsPage.cpp
deleted file mode 100644
index 41d900aa..00000000
--- a/launcher/pages/global/ExternalToolsPage.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ExternalToolsPage.h"
-#include "ui_ExternalToolsPage.h"
-
-#include <QMessageBox>
-#include <QFileDialog>
-#include <QStandardPaths>
-#include <QTabBar>
-
-#include "settings/SettingsObject.h"
-#include "tools/BaseProfiler.h"
-#include <FileSystem.h>
-#include "Application.h"
-#include <tools/MCEditTool.h>
-
-ExternalToolsPage::ExternalToolsPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::ExternalToolsPage)
-{
-    ui->setupUi(this);
-    ui->tabWidget->tabBar()->hide();
-
-    #if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-    ui->jsonEditorTextBox->setClearButtonEnabled(true);
-    #endif
-
-    ui->mceditLink->setOpenExternalLinks(true);
-    ui->jvisualvmLink->setOpenExternalLinks(true);
-    ui->jprofilerLink->setOpenExternalLinks(true);
-    loadSettings();
-}
-
-ExternalToolsPage::~ExternalToolsPage()
-{
-    delete ui;
-}
-
-void ExternalToolsPage::loadSettings()
-{
-    auto s = APPLICATION->settings();
-    ui->jprofilerPathEdit->setText(s->get("JProfilerPath").toString());
-    ui->jvisualvmPathEdit->setText(s->get("JVisualVMPath").toString());
-    ui->mceditPathEdit->setText(s->get("MCEditPath").toString());
-
-    // Editors
-    ui->jsonEditorTextBox->setText(s->get("JsonEditor").toString());
-}
-void ExternalToolsPage::applySettings()
-{
-    auto s = APPLICATION->settings();
-
-    s->set("JProfilerPath", ui->jprofilerPathEdit->text());
-    s->set("JVisualVMPath", ui->jvisualvmPathEdit->text());
-    s->set("MCEditPath", ui->mceditPathEdit->text());
-
-    // Editors
-    QString jsonEditor = ui->jsonEditorTextBox->text();
-    if (!jsonEditor.isEmpty() &&
-        (!QFileInfo(jsonEditor).exists() || !QFileInfo(jsonEditor).isExecutable()))
-    {
-        QString found = QStandardPaths::findExecutable(jsonEditor);
-        if (!found.isEmpty())
-        {
-            jsonEditor = found;
-        }
-    }
-    s->set("JsonEditor", jsonEditor);
-}
-
-void ExternalToolsPage::on_jprofilerPathBtn_clicked()
-{
-    QString raw_dir = ui->jprofilerPathEdit->text();
-    QString error;
-    do
-    {
-        raw_dir = QFileDialog::getExistingDirectory(this, tr("JProfiler Folder"), raw_dir);
-        if (raw_dir.isEmpty())
-        {
-            break;
-        }
-        QString cooked_dir = FS::NormalizePath(raw_dir);
-        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
-        {
-            ui->jprofilerPathEdit->setText(cooked_dir);
-            break;
-        }
-    } while (1);
-}
-void ExternalToolsPage::on_jprofilerCheckBtn_clicked()
-{
-    QString 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
-    {
-        QMessageBox::information(this, tr("OK"), tr("JProfiler setup seems to be OK"));
-    }
-}
-
-void ExternalToolsPage::on_jvisualvmPathBtn_clicked()
-{
-    QString raw_dir = ui->jvisualvmPathEdit->text();
-    QString error;
-    do
-    {
-        raw_dir = QFileDialog::getOpenFileName(this, tr("JVisualVM Executable"), raw_dir);
-        if (raw_dir.isEmpty())
-        {
-            break;
-        }
-        QString cooked_dir = FS::NormalizePath(raw_dir);
-        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
-        {
-            ui->jvisualvmPathEdit->setText(cooked_dir);
-            break;
-        }
-    } while (1);
-}
-void ExternalToolsPage::on_jvisualvmCheckBtn_clicked()
-{
-    QString 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
-    {
-        QMessageBox::information(this, tr("OK"), tr("JVisualVM setup seems to be OK"));
-    }
-}
-
-void ExternalToolsPage::on_mceditPathBtn_clicked()
-{
-    QString raw_dir = ui->mceditPathEdit->text();
-    QString error;
-    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())
-        {
-            break;
-        }
-        QString cooked_dir = FS::NormalizePath(raw_dir);
-        if (!APPLICATION->mcedit()->check(cooked_dir, error))
-        {
-            QMessageBox::critical(this, tr("Error"), tr("Error while checking MCEdit install:\n%1").arg(error));
-            continue;
-        }
-        else
-        {
-            ui->mceditPathEdit->setText(cooked_dir);
-            break;
-        }
-    } while (1);
-}
-void ExternalToolsPage::on_mceditCheckBtn_clicked()
-{
-    QString 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
-    {
-        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()
-#if defined(Q_OS_LINUX)
-                ? QString("/usr/bin")
-#else
-            ? QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).first()
-#endif
-            : ui->jsonEditorTextBox->text());
-
-    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())
-    {
-        ui->jsonEditorTextBox->setText(cooked_file);
-    }
-    else
-    {
-        QMessageBox::warning(this, tr("Invalid"),
-                             tr("The file chosen does not seem to be an executable"));
-    }
-}
-
-bool ExternalToolsPage::apply()
-{
-    applySettings();
-    return true;
-}
diff --git a/launcher/pages/global/ExternalToolsPage.h b/launcher/pages/global/ExternalToolsPage.h
deleted file mode 100644
index 9571ce75..00000000
--- a/launcher/pages/global/ExternalToolsPage.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QWidget>
-
-#include "pages/BasePage.h"
-#include <Application.h>
-
-namespace Ui {
-class ExternalToolsPage;
-}
-
-class ExternalToolsPage : public QWidget, public BasePage
-{
-    Q_OBJECT
-
-public:
-    explicit ExternalToolsPage(QWidget *parent = 0);
-    ~ExternalToolsPage();
-
-    QString displayName() const override
-    {
-        return tr("External Tools");
-    }
-    QIcon icon() const override
-    {
-        auto icon = APPLICATION->getThemedIcon("externaltools");
-        if(icon.isNull())
-        {
-            icon = APPLICATION->getThemedIcon("loadermods");
-        }
-        return icon;
-    }
-    QString id() const override
-    {
-        return "external-tools";
-    }
-    QString helpPage() const override
-    {
-        return "Tools";
-    }
-    virtual bool apply() override;
-
-private:
-    void loadSettings();
-    void applySettings();
-
-private:
-    Ui::ExternalToolsPage *ui;
-
-private
-slots:
-    void on_jprofilerPathBtn_clicked();
-    void on_jprofilerCheckBtn_clicked();
-    void on_jvisualvmPathBtn_clicked();
-    void on_jvisualvmCheckBtn_clicked();
-    void on_mceditPathBtn_clicked();
-    void on_mceditCheckBtn_clicked();
-    void on_jsonEditorBrowseBtn_clicked();
-};
diff --git a/launcher/pages/global/ExternalToolsPage.ui b/launcher/pages/global/ExternalToolsPage.ui
deleted file mode 100644
index e79e9388..00000000
--- a/launcher/pages/global/ExternalToolsPage.ui
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ExternalToolsPage</class>
- <widget class="QWidget" name="ExternalToolsPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>673</width>
-    <height>751</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string notr="true">Tab 1</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string notr="true">JProfiler</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_10">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
-            <item>
-             <widget class="QLineEdit" name="jprofilerPathEdit"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="jprofilerPathBtn">
-              <property name="text">
-               <string notr="true">...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QPushButton" name="jprofilerCheckBtn">
-            <property name="text">
-             <string>Check</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="jprofilerLink">
-            <property name="text">
-             <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://www.ej-technologies.com/products/jprofiler/overview.html&quot;&gt;https://www.ej-technologies.com/products/jprofiler/overview.html&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_3">
-         <property name="title">
-          <string notr="true">JVisualVM</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_11">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <item>
-             <widget class="QLineEdit" name="jvisualvmPathEdit"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="jvisualvmPathBtn">
-              <property name="text">
-               <string notr="true">...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QPushButton" name="jvisualvmCheckBtn">
-            <property name="text">
-             <string>Check</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="jvisualvmLink">
-            <property name="text">
-             <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://visualvm.github.io/&quot;&gt;https://visualvm.github.io/&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_4">
-         <property name="title">
-          <string notr="true">MCEdit</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_12">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_6">
-            <item>
-             <widget class="QLineEdit" name="mceditPathEdit"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="mceditPathBtn">
-              <property name="text">
-               <string notr="true">...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QPushButton" name="mceditCheckBtn">
-            <property name="text">
-             <string>Check</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="mceditLink">
-            <property name="text">
-             <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://www.mcedit.net/&quot;&gt;https://www.mcedit.net/&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="editorsBox">
-         <property name="title">
-          <string>External Editors (leave empty for system default)</string>
-         </property>
-         <layout class="QGridLayout" name="foldersBoxLayout_2">
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="jsonEditorTextBox"/>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelJsonEditor">
-            <property name="text">
-             <string>Text Editor:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <widget class="QToolButton" name="jsonEditorBrowseBtn">
-            <property name="text">
-             <string notr="true">...</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>216</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/launcher/pages/global/JavaPage.cpp b/launcher/pages/global/JavaPage.cpp
deleted file mode 100644
index fe545636..00000000
--- a/launcher/pages/global/JavaPage.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "JavaPage.h"
-#include "JavaCommon.h"
-#include "ui_JavaPage.h"
-
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QDir>
-#include <QTabBar>
-
-#include "dialogs/VersionSelectDialog.h"
-
-#include "java/JavaUtils.h"
-#include "java/JavaInstallList.h"
-
-#include "settings/SettingsObject.h"
-#include <FileSystem.h>
-#include "Application.h"
-#include <sys.h>
-
-JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
-{
-    ui->setupUi(this);
-    ui->tabWidget->tabBar()->hide();
-
-    auto sysMiB = Sys::getSystemRam() / Sys::mebibyte;
-    ui->maxMemSpinBox->setMaximum(sysMiB);
-    loadSettings();
-}
-
-JavaPage::~JavaPage()
-{
-    delete ui;
-}
-
-bool JavaPage::apply()
-{
-    applySettings();
-    return true;
-}
-
-void JavaPage::applySettings()
-{
-    auto s = APPLICATION->settings();
-
-    // Memory
-    int min = ui->minMemSpinBox->value();
-    int max = ui->maxMemSpinBox->value();
-    if(min < max)
-    {
-        s->set("MinMemAlloc", min);
-        s->set("MaxMemAlloc", max);
-    }
-    else
-    {
-        s->set("MinMemAlloc", max);
-        s->set("MaxMemAlloc", min);
-    }
-    s->set("PermGen", ui->permGenSpinBox->value());
-
-    // Java Settings
-    s->set("JavaPath", ui->javaPathTextBox->text());
-    s->set("JvmArgs", ui->jvmArgsTextBox->text());
-    JavaCommon::checkJVMArgs(s->get("JvmArgs").toString(), this->parentWidget());
-}
-void JavaPage::loadSettings()
-{
-    auto s = APPLICATION->settings();
-    // Memory
-    int min = s->get("MinMemAlloc").toInt();
-    int max = s->get("MaxMemAlloc").toInt();
-    if(min < max)
-    {
-        ui->minMemSpinBox->setValue(min);
-        ui->maxMemSpinBox->setValue(max);
-    }
-    else
-    {
-        ui->minMemSpinBox->setValue(max);
-        ui->maxMemSpinBox->setValue(min);
-    }
-    ui->permGenSpinBox->setValue(s->get("PermGen").toInt());
-
-    // Java Settings
-    ui->javaPathTextBox->setText(s->get("JavaPath").toString());
-    ui->jvmArgsTextBox->setText(s->get("JvmArgs").toString());
-}
-
-void JavaPage::on_javaDetectBtn_clicked()
-{
-    JavaInstallPtr java;
-
-    VersionSelectDialog vselect(APPLICATION->javalist().get(), tr("Select a Java version"), this, true);
-    vselect.setResizeOn(2);
-    vselect.exec();
-
-    if (vselect.result() == QDialog::Accepted && vselect.selectedVersion())
-    {
-        java = std::dynamic_pointer_cast<JavaInstall>(vselect.selectedVersion());
-        ui->javaPathTextBox->setText(java->path);
-    }
-}
-
-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())
-    {
-        return;
-    }
-
-    QString cooked_path = FS::NormalizePath(raw_path);
-    QFileInfo javaInfo(cooked_path);;
-    if(!javaInfo.exists() || !javaInfo.isExecutable())
-    {
-        return;
-    }
-    ui->javaPathTextBox->setText(cooked_path);
-}
-
-void JavaPage::on_javaTestBtn_clicked()
-{
-    if(checker)
-    {
-        return;
-    }
-    checker.reset(new JavaCommon::TestCheck(
-        this, ui->javaPathTextBox->text(), ui->jvmArgsTextBox->text(),
-        ui->minMemSpinBox->value(), ui->maxMemSpinBox->value(), ui->permGenSpinBox->value()));
-    connect(checker.get(), SIGNAL(finished()), SLOT(checkerFinished()));
-    checker->run();
-}
-
-void JavaPage::checkerFinished()
-{
-    checker.reset();
-}
diff --git a/launcher/pages/global/JavaPage.h b/launcher/pages/global/JavaPage.h
deleted file mode 100644
index 56a1d36b..00000000
--- a/launcher/pages/global/JavaPage.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <memory>
-#include <QDialog>
-#include "pages/BasePage.h"
-#include "JavaCommon.h"
-#include <Application.h>
-#include <QObjectPtr.h>
-
-class SettingsObject;
-
-namespace Ui
-{
-class JavaPage;
-}
-
-class JavaPage : public QWidget, public BasePage
-{
-    Q_OBJECT
-
-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";
-    }
-    bool apply() override;
-
-private:
-    void applySettings();
-    void loadSettings();
-
-private
-slots:
-    void on_javaDetectBtn_clicked();
-    void on_javaTestBtn_clicked();
-    void on_javaBrowseBtn_clicked();
-    void checkerFinished();
-
-private:
-    Ui::JavaPage *ui;
-    unique_qobject_ptr<JavaCommon::TestCheck> checker;
-};
diff --git a/launcher/pages/global/JavaPage.ui b/launcher/pages/global/JavaPage.ui
deleted file mode 100644
index b67e9994..00000000
--- a/launcher/pages/global/JavaPage.ui
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>JavaPage</class>
- <widget class="QWidget" name="JavaPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>545</width>
-    <height>580</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string notr="true">Tab 1</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QGroupBox" name="memoryGroupBox">
-         <property name="title">
-          <string>Memory</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="1" column="1">
-           <widget class="QSpinBox" name="maxMemSpinBox">
-            <property name="toolTip">
-             <string>The maximum amount of memory Minecraft is allowed to use.</string>
-            </property>
-            <property name="suffix">
-             <string notr="true"> MiB</string>
-            </property>
-            <property name="minimum">
-             <number>128</number>
-            </property>
-            <property name="maximum">
-             <number>65536</number>
-            </property>
-            <property name="singleStep">
-             <number>128</number>
-            </property>
-            <property name="value">
-             <number>1024</number>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelMinMem">
-            <property name="text">
-             <string>Minimum memory allocation:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="labelMaxMem">
-            <property name="text">
-             <string>Maximum memory allocation:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QSpinBox" name="minMemSpinBox">
-            <property name="toolTip">
-             <string>The amount of memory Minecraft is started with.</string>
-            </property>
-            <property name="suffix">
-             <string notr="true"> MiB</string>
-            </property>
-            <property name="minimum">
-             <number>128</number>
-            </property>
-            <property name="maximum">
-             <number>65536</number>
-            </property>
-            <property name="singleStep">
-             <number>128</number>
-            </property>
-            <property name="value">
-             <number>256</number>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="labelPermGen">
-            <property name="text">
-             <string notr="true">PermGen:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QSpinBox" name="permGenSpinBox">
-            <property name="toolTip">
-             <string>The amount of memory available to store loaded Java classes.</string>
-            </property>
-            <property name="suffix">
-             <string notr="true"> MiB</string>
-            </property>
-            <property name="minimum">
-             <number>64</number>
-            </property>
-            <property name="maximum">
-             <number>999999999</number>
-            </property>
-            <property name="singleStep">
-             <number>8</number>
-            </property>
-            <property name="value">
-             <number>64</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="javaSettingsGroupBox">
-         <property name="title">
-          <string>Java Runtime</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_3">
-          <item row="0" column="0">
-           <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>Java path:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" colspan="2">
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <item>
-             <widget class="QLineEdit" name="javaPathTextBox"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="javaBrowseBtn">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" 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>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="2" column="1" colspan="2">
-           <widget class="QLineEdit" name="jvmArgsTextBox"/>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="labelJVMArgs">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>JVM arguments:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <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>Auto-detect...</string>
-            </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>
-            </property>
-            <property name="text">
-             <string>Test</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>minMemSpinBox</tabstop>
-  <tabstop>maxMemSpinBox</tabstop>
-  <tabstop>permGenSpinBox</tabstop>
-  <tabstop>javaBrowseBtn</tabstop>
-  <tabstop>javaPathTextBox</tabstop>
-  <tabstop>jvmArgsTextBox</tabstop>
-  <tabstop>javaDetectBtn</tabstop>
-  <tabstop>javaTestBtn</tabstop>
-  <tabstop>tabWidget</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/launcher/pages/global/LanguagePage.cpp b/launcher/pages/global/LanguagePage.cpp
deleted file mode 100644
index 142517db..00000000
--- a/launcher/pages/global/LanguagePage.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "LanguagePage.h"
-
-#include "widgets/LanguageSelectionWidget.h"
-#include <QVBoxLayout>
-
-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->addWidget(mainWidget);
-    retranslate();
-}
-
-LanguagePage::~LanguagePage()
-{
-}
-
-bool LanguagePage::apply()
-{
-    applySettings();
-    return true;
-}
-
-void LanguagePage::applySettings()
-{
-    auto settings = APPLICATION->settings();
-    QString key = mainWidget->getSelectedLanguageKey();
-    settings->set("Language", key);
-}
-
-void LanguagePage::loadSettings()
-{
-    // NIL
-}
-
-void LanguagePage::retranslate()
-{
-    mainWidget->retranslate();
-}
-
-void LanguagePage::changeEvent(QEvent* event)
-{
-    if (event->type() == QEvent::LanguageChange)
-    {
-        retranslate();
-    }
-    QWidget::changeEvent(event);
-}
diff --git a/launcher/pages/global/LanguagePage.h b/launcher/pages/global/LanguagePage.h
deleted file mode 100644
index c269cefc..00000000
--- a/launcher/pages/global/LanguagePage.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <memory>
-#include "pages/BasePage.h"
-#include <Application.h>
-#include <QWidget>
-
-class LanguageSelectionWidget;
-
-class LanguagePage : public QWidget, public BasePage
-{
-    Q_OBJECT
-
-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";
-    }
-    bool apply() override;
-
-    void changeEvent(QEvent * ) override;
-
-private:
-    void applySettings();
-    void loadSettings();
-    void retranslate();
-
-private:
-    LanguageSelectionWidget *mainWidget;
-};
diff --git a/launcher/pages/global/LauncherPage.cpp b/launcher/pages/global/LauncherPage.cpp
deleted file mode 100644
index b77a9e81..00000000
--- a/launcher/pages/global/LauncherPage.cpp
+++ /dev/null
@@ -1,466 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LauncherPage.h"
-#include "ui_LauncherPage.h"
-
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QDir>
-#include <QTextCharFormat>
-
-#include "updater/UpdateChecker.h"
-
-#include "settings/SettingsObject.h"
-#include <FileSystem.h>
-#include "Application.h"
-#include "BuildConfig.h"
-#include "themes/ITheme.h"
-
-#include <QApplication>
-#include <QProcess>
-
-// FIXME: possibly move elsewhere
-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)
-{
-    ui->setupUi(this);
-    auto origForeground = ui->fontPreview->palette().color(ui->fontPreview->foregroundRole());
-    auto origBackground = ui->fontPreview->palette().color(ui->fontPreview->backgroundRole());
-    m_colors.reset(new LogColorCache(origForeground, origBackground));
-
-    ui->sortingModeGroup->setId(ui->sortByNameBtn, Sort_Name);
-    ui->sortingModeGroup->setId(ui->sortLastLaunchedBtn, Sort_LastLaunch);
-
-    defaultFormat = new QTextCharFormat(ui->fontPreview->currentCharFormat());
-
-    m_languageModel = APPLICATION->translations();
-    loadSettings();
-
-    if(BuildConfig.UPDATER_ENABLED)
-    {
-        QObject::connect(APPLICATION->updateChecker().get(), &UpdateChecker::channelListLoaded, this, &LauncherPage::refreshUpdateChannelList);
-
-        if (APPLICATION->updateChecker()->hasChannels())
-        {
-            refreshUpdateChannelList();
-        }
-        else
-        {
-            APPLICATION->updateChecker()->updateChanList(false);
-        }
-    }
-    else
-    {
-        ui->updateSettingsBox->setHidden(true);
-    }
-    // Analytics
-    if(BuildConfig.ANALYTICS_ID.isEmpty())
-    {
-        ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->analyticsTab));
-    }
-    connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview()));
-    connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview()));
-
-    //move mac data button
-    QFile file(QDir::current().absolutePath() + "/dontmovemacdata");
-    if (!file.exists())
-    {
-        ui->migrateDataFolderMacBtn->setVisible(false);
-    }
-}
-
-LauncherPage::~LauncherPage()
-{
-    delete ui;
-    delete defaultFormat;
-}
-
-bool LauncherPage::apply()
-{
-    applySettings();
-    return true;
-}
-
-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())
-    {
-        QString cooked_dir = FS::NormalizePath(raw_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.setInformativeText(
-                tr("Do you really want to use this path? "
-                   "Selecting \"No\" will close this and not alter your instance path."));
-            warning.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-            int result = warning.exec();
-            if (result == QMessageBox::Yes)
-            {
-                ui->instDirTextBox->setText(cooked_dir);
-            }
-        }
-        else
-        {
-            ui->instDirTextBox->setText(cooked_dir);
-        }
-    }
-}
-
-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())
-    {
-        QString cooked_dir = FS::NormalizePath(raw_dir);
-        ui->iconsDirTextBox->setText(cooked_dir);
-    }
-}
-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())
-    {
-        QString cooked_dir = FS::NormalizePath(raw_dir);
-        ui->modsDirTextBox->setText(cooked_dir);
-    }
-}
-void LauncherPage::on_migrateDataFolderMacBtn_clicked()
-{
-    QFile file(QDir::current().absolutePath() + "/dontmovemacdata");
-    file.remove();
-    QProcess::startDetached(qApp->arguments()[0]);
-    qApp->quit();
-}
-
-void LauncherPage::refreshUpdateChannelList()
-{
-    // Stop listening for selection changes. It's going to change a lot while we update it and
-    // we don't need to update the
-    // description label constantly.
-    QObject::disconnect(ui->updateChannelComboBox, SIGNAL(currentIndexChanged(int)), this,
-                        SLOT(updateChannelSelectionChanged(int)));
-
-    QList<UpdateChecker::ChannelListEntry> channelList = APPLICATION->updateChecker()->getChannelList();
-    ui->updateChannelComboBox->clear();
-    int selection = -1;
-    for (int i = 0; i < channelList.count(); i++)
-    {
-        UpdateChecker::ChannelListEntry entry = channelList.at(i);
-
-        // When it comes to selection, we'll rely on the indexes of a channel entry being the
-        // same in the
-        // combo box as it is in the update checker's channel list.
-        // This probably isn't very safe, but the channel list doesn't change often enough (or
-        // at all) for
-        // this to be a big deal. Hope it doesn't break...
-        ui->updateChannelComboBox->addItem(entry.name);
-
-        // If the update channel we just added was the selected one, set the current index in
-        // the combo box to it.
-        if (entry.id == m_currentUpdateChannel)
-        {
-            qDebug() << "Selected index" << i << "channel id" << m_currentUpdateChannel;
-            selection = i;
-        }
-    }
-
-    ui->updateChannelComboBox->setCurrentIndex(selection);
-
-    // Start listening for selection changes again and update the description label.
-    QObject::connect(ui->updateChannelComboBox, SIGNAL(currentIndexChanged(int)), this,
-                     SLOT(updateChannelSelectionChanged(int)));
-    refreshUpdateChannelDesc();
-
-    // Now that we've updated the channel list, we can enable the combo box.
-    // It starts off disabled so that if the channel list hasn't been loaded, it will be
-    // disabled.
-    ui->updateChannelComboBox->setEnabled(true);
-}
-
-void LauncherPage::updateChannelSelectionChanged(int index)
-{
-    refreshUpdateChannelDesc();
-}
-
-void LauncherPage::refreshUpdateChannelDesc()
-{
-    // Get the channel list.
-    QList<UpdateChecker::ChannelListEntry> channelList = APPLICATION->updateChecker()->getChannelList();
-    int selectedIndex = ui->updateChannelComboBox->currentIndex();
-    if (selectedIndex < 0)
-    {
-        return;
-    }
-    if (selectedIndex < channelList.count())
-    {
-        // Find the channel list entry with the given index.
-        UpdateChecker::ChannelListEntry selected = channelList.at(selectedIndex);
-
-        // Set the description text.
-        ui->updateChannelDescLabel->setText(selected.description);
-
-        // Set the currently selected channel ID.
-        m_currentUpdateChannel = selected.id;
-    }
-}
-
-void LauncherPage::applySettings()
-{
-    auto s = APPLICATION->settings();
-
-    if (ui->resetNotificationsBtn->isChecked())
-    {
-        s->set("ShownNotifications", QString());
-    }
-
-    // Updates
-    s->set("AutoUpdate", ui->autoUpdateCheckBox->isChecked());
-    s->set("UpdateChannel", m_currentUpdateChannel);
-    auto original = s->get("IconTheme").toString();
-    //FIXME: make generic
-    switch (ui->themeComboBox->currentIndex())
-    {
-    case 1:
-        s->set("IconTheme", "pe_dark");
-        break;
-    case 2:
-        s->set("IconTheme", "pe_light");
-        break;
-    case 3:
-        s->set("IconTheme", "pe_blue");
-        break;
-    case 4:
-        s->set("IconTheme", "pe_colored");
-        break;
-    case 5:
-        s->set("IconTheme", "OSX");
-        break;
-    case 6:
-        s->set("IconTheme", "iOS");
-        break;
-    case 7:
-        s->set("IconTheme", "flat");
-        break;
-    case 8:
-        s->set("IconTheme", "custom");
-        break;
-    case 0:
-    default:
-        s->set("IconTheme", "multimc");
-        break;
-    }
-
-    if(original != s->get("IconTheme"))
-    {
-        APPLICATION->setIconTheme(s->get("IconTheme").toString());
-    }
-
-    auto originalAppTheme = s->get("ApplicationTheme").toString();
-    auto newAppTheme = ui->themeComboBoxColors->currentData().toString();
-    if(originalAppTheme != newAppTheme)
-    {
-        s->set("ApplicationTheme", newAppTheme);
-        APPLICATION->setApplicationTheme(newAppTheme, false);
-    }
-
-    // Console settings
-    s->set("ShowConsole", ui->showConsoleCheck->isChecked());
-    s->set("AutoCloseConsole", ui->autoCloseConsoleCheck->isChecked());
-    s->set("ShowConsoleOnError", ui->showConsoleErrorCheck->isChecked());
-    QString consoleFontFamily = ui->consoleFont->currentFont().family();
-    s->set("ConsoleFont", consoleFontFamily);
-    s->set("ConsoleFontSize", ui->fontSizeBox->value());
-    s->set("ConsoleMaxLines", ui->lineLimitSpinBox->value());
-    s->set("ConsoleOverflowStop", ui->checkStopLogging->checkState() != Qt::Unchecked);
-
-    // Folders
-    // TODO: Offer to move instances to new instance folder.
-    s->set("InstanceDir", ui->instDirTextBox->text());
-    s->set("CentralModsDir", ui->modsDirTextBox->text());
-    s->set("IconsDir", ui->iconsDirTextBox->text());
-
-    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;
-    }
-
-    // Analytics
-    if(!BuildConfig.ANALYTICS_ID.isEmpty())
-    {
-        s->set("Analytics", ui->analyticsCheck->isChecked());
-    }
-}
-void LauncherPage::loadSettings()
-{
-    auto s = APPLICATION->settings();
-    // Updates
-    ui->autoUpdateCheckBox->setChecked(s->get("AutoUpdate").toBool());
-    m_currentUpdateChannel = s->get("UpdateChannel").toString();
-    //FIXME: make generic
-    auto theme = s->get("IconTheme").toString();
-    if (theme == "pe_dark")
-    {
-        ui->themeComboBox->setCurrentIndex(1);
-    }
-    else if (theme == "pe_light")
-    {
-        ui->themeComboBox->setCurrentIndex(2);
-    }
-    else if (theme == "pe_blue")
-    {
-        ui->themeComboBox->setCurrentIndex(3);
-    }
-    else if (theme == "pe_colored")
-    {
-        ui->themeComboBox->setCurrentIndex(4);
-    }
-    else if (theme == "OSX")
-    {
-        ui->themeComboBox->setCurrentIndex(5);
-    }
-    else if (theme == "iOS")
-    {
-        ui->themeComboBox->setCurrentIndex(6);
-    }
-    else if (theme == "flat")
-    {
-        ui->themeComboBox->setCurrentIndex(7);
-    }
-    else if (theme == "custom")
-    {
-        ui->themeComboBox->setCurrentIndex(8);
-    }
-    else
-    {
-        ui->themeComboBox->setCurrentIndex(0);
-    }
-
-    {
-        auto currentTheme = s->get("ApplicationTheme").toString();
-        auto themes = APPLICATION->getValidApplicationThemes();
-        int idx = 0;
-        for(auto &theme: themes)
-        {
-            ui->themeComboBoxColors->addItem(theme->name(), theme->id());
-            if(currentTheme == theme->id())
-            {
-                ui->themeComboBoxColors->setCurrentIndex(idx);
-            }
-            idx++;
-        }
-    }
-
-    // Console settings
-    ui->showConsoleCheck->setChecked(s->get("ShowConsole").toBool());
-    ui->autoCloseConsoleCheck->setChecked(s->get("AutoCloseConsole").toBool());
-    ui->showConsoleErrorCheck->setChecked(s->get("ShowConsoleOnError").toBool());
-    QString fontFamily = APPLICATION->settings()->get("ConsoleFont").toString();
-    QFont consoleFont(fontFamily);
-    ui->consoleFont->setCurrentFont(consoleFont);
-
-    bool conversionOk = true;
-    int fontSize = APPLICATION->settings()->get("ConsoleFontSize").toInt(&conversionOk);
-    if(!conversionOk)
-    {
-        fontSize = 11;
-    }
-    ui->fontSizeBox->setValue(fontSize);
-    refreshFontPreview();
-    ui->lineLimitSpinBox->setValue(s->get("ConsoleMaxLines").toInt());
-    ui->checkStopLogging->setChecked(s->get("ConsoleOverflowStop").toBool());
-
-    // Folders
-    ui->instDirTextBox->setText(s->get("InstanceDir").toString());
-    ui->modsDirTextBox->setText(s->get("CentralModsDir").toString());
-    ui->iconsDirTextBox->setText(s->get("IconsDir").toString());
-
-    QString sortMode = s->get("InstSortMode").toString();
-
-    if (sortMode == "LastLaunch")
-    {
-        ui->sortLastLaunchedBtn->setChecked(true);
-    }
-    else
-    {
-        ui->sortByNameBtn->setChecked(true);
-    }
-
-    // Analytics
-    if(!BuildConfig.ANALYTICS_ID.isEmpty())
-    {
-        ui->analyticsCheck->setChecked(s->get("Analytics").toBool());
-    }
-}
-
-void LauncherPage::refreshFontPreview()
-{
-    int fontSize = ui->fontSizeBox->value();
-    QString fontFamily = ui->consoleFont->currentFont().family();
-    ui->fontPreview->clear();
-    defaultFormat->setFont(QFont(fontFamily, fontSize));
-    {
-        QTextCharFormat format(*defaultFormat);
-        format.setForeground(m_colors->getFront(MessageLevel::Error));
-        // append a paragraph/line
-        auto workCursor = ui->fontPreview->textCursor();
-        workCursor.movePosition(QTextCursor::End);
-        workCursor.insertText(tr("[Something/ERROR] A spooky error!"), format);
-        workCursor.insertBlock();
-    }
-    {
-        QTextCharFormat format(*defaultFormat);
-        format.setForeground(m_colors->getFront(MessageLevel::Message));
-        // append a paragraph/line
-        auto workCursor = ui->fontPreview->textCursor();
-        workCursor.movePosition(QTextCursor::End);
-        workCursor.insertText(tr("[Test/INFO] A harmless message..."), format);
-        workCursor.insertBlock();
-    }
-    {
-        QTextCharFormat format(*defaultFormat);
-        format.setForeground(m_colors->getFront(MessageLevel::Warning));
-        // append a paragraph/line
-        auto workCursor = ui->fontPreview->textCursor();
-        workCursor.movePosition(QTextCursor::End);
-        workCursor.insertText(tr("[Something/WARN] A not so spooky warning."), format);
-        workCursor.insertBlock();
-    }
-}
diff --git a/launcher/pages/global/LauncherPage.h b/launcher/pages/global/LauncherPage.h
deleted file mode 100644
index 62a4f84c..00000000
--- a/launcher/pages/global/LauncherPage.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <memory>
-#include <QDialog>
-
-#include "java/JavaChecker.h"
-#include "pages/BasePage.h"
-#include <Application.h>
-#include "ColorCache.h"
-#include <translations/TranslationsModel.h>
-
-class QTextCharFormat;
-class SettingsObject;
-
-namespace Ui
-{
-class LauncherPage;
-}
-
-class LauncherPage : public QWidget, public BasePage
-{
-    Q_OBJECT
-
-public:
-    explicit LauncherPage(QWidget *parent = 0);
-    ~LauncherPage();
-
-    QString displayName() const override
-    {
-        return "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;
-
-private:
-    void applySettings();
-    void loadSettings();
-
-private
-slots:
-    void on_instDirBrowseBtn_clicked();
-    void on_modsDirBrowseBtn_clicked();
-    void on_iconsDirBrowseBtn_clicked();
-    void on_migrateDataFolderMacBtn_clicked();
-
-    /*!
-     * Updates the list of update channels in the combo box.
-     */
-    void refreshUpdateChannelList();
-
-    /*!
-     * Updates the channel description label.
-     */
-    void refreshUpdateChannelDesc();
-
-    /*!
-     * Updates the font preview
-     */
-    void refreshFontPreview();
-
-    void updateChannelSelectionChanged(int index);
-
-private:
-    Ui::LauncherPage *ui;
-
-    /*!
-     * Stores the currently selected update channel.
-     */
-    QString m_currentUpdateChannel;
-
-    // default format for the font preview...
-    QTextCharFormat *defaultFormat;
-
-    std::unique_ptr<LogColorCache> m_colors;
-
-    std::shared_ptr<TranslationsModel> m_languageModel;
-};
diff --git a/launcher/pages/global/LauncherPage.ui b/launcher/pages/global/LauncherPage.ui
deleted file mode 100644
index 62a66d73..00000000
--- a/launcher/pages/global/LauncherPage.ui
+++ /dev/null
@@ -1,584 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>LauncherPage</class>
- <widget class="QWidget" name="LauncherPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>514</width>
-    <height>629</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <layout class="QVBoxLayout" name="mainLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="toolTip">
-      <string notr="true"/>
-     </property>
-     <property name="tabShape">
-      <enum>QTabWidget::Rounded</enum>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="featuresTab">
-      <attribute name="title">
-       <string>Features</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_9">
-       <item>
-        <widget class="QGroupBox" name="updateSettingsBox">
-         <property name="title">
-          <string>Update Settings</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_7">
-          <item>
-           <widget class="QCheckBox" name="autoUpdateCheckBox">
-            <property name="text">
-             <string>Check for updates on start?</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="updateChannelLabel">
-            <property name="text">
-             <string>Up&amp;date Channel:</string>
-            </property>
-            <property name="buddy">
-             <cstring>updateChannelComboBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="updateChannelComboBox">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="updateChannelDescLabel">
-            <property name="text">
-             <string>No channel selected.</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="foldersBox">
-         <property name="title">
-          <string>Folders</string>
-         </property>
-         <layout class="QGridLayout" name="foldersBoxLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelInstDir">
-            <property name="text">
-             <string>I&amp;nstances:</string>
-            </property>
-            <property name="buddy">
-             <cstring>instDirTextBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="instDirTextBox"/>
-          </item>
-          <item row="0" column="2">
-           <widget class="QToolButton" name="instDirBrowseBtn">
-            <property name="text">
-             <string notr="true">...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="labelModsDir">
-            <property name="text">
-             <string>&amp;Mods:</string>
-            </property>
-            <property name="buddy">
-             <cstring>modsDirTextBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="modsDirTextBox"/>
-          </item>
-          <item row="1" column="2">
-           <widget class="QToolButton" name="modsDirBrowseBtn">
-            <property name="text">
-             <string notr="true">...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="iconsDirTextBox"/>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="labelIconsDir">
-            <property name="text">
-             <string>&amp;Icons:</string>
-            </property>
-            <property name="buddy">
-             <cstring>iconsDirTextBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="2">
-           <widget class="QToolButton" name="iconsDirBrowseBtn">
-            <property name="text">
-             <string notr="true">...</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="migrateDataFolderMacBtn">
-         <property name="text">
-          <string>Move the data to new location (will restart the launcher)</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="generalTab">
-      <attribute name="title">
-       <string>User Interface</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_6">
-       <item>
-        <widget class="QGroupBox" name="groupBox_3">
-         <property name="title">
-          <string>Launcher notifications</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
-          <item>
-           <widget class="QPushButton" name="resetNotificationsBtn">
-            <property name="text">
-             <string>Reset hidden notifications</string>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="sortingModeBox">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="title">
-          <string>Instance view sorting mode</string>
-         </property>
-         <layout class="QHBoxLayout" name="sortingModeBoxLayout">
-          <item>
-           <widget class="QRadioButton" name="sortLastLaunchedBtn">
-            <property name="text">
-             <string>By &amp;last launched</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">sortingModeGroup</string>
-            </attribute>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="sortByNameBtn">
-            <property name="text">
-             <string>By &amp;name</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">sortingModeGroup</string>
-            </attribute>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="themeBox">
-         <property name="title">
-          <string>Theme</string>
-         </property>
-         <layout class="QFormLayout" name="formLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>&amp;Icons</string>
-            </property>
-            <property name="buddy">
-             <cstring>themeComboBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="themeComboBox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::StrongFocus</enum>
-            </property>
-            <item>
-             <property name="text">
-              <string>Default</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Dark Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Light Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Blue Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Colored Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string notr="true">OSX</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string notr="true">iOS</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string notr="true">Flat</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Custom</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="themeComboBoxColors">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::StrongFocus</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>Colors</string>
-            </property>
-            <property name="buddy">
-             <cstring>themeComboBoxColors</cstring>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="generalTabSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="consoleTab">
-      <attribute name="title">
-       <string>Console</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QGroupBox" name="consoleSettingsBox">
-         <property name="title">
-          <string>Console Settings</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_3">
-          <item>
-           <widget class="QCheckBox" name="showConsoleCheck">
-            <property name="text">
-             <string>Show console while the game is running?</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="autoCloseConsoleCheck">
-            <property name="text">
-             <string>Automatically close console when the game quits?</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="showConsoleErrorCheck">
-            <property name="text">
-             <string>Show console when the game crashes?</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_4">
-         <property name="title">
-          <string>History limit</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_3">
-          <item row="1" column="0">
-           <widget class="QCheckBox" name="checkStopLogging">
-            <property name="text">
-             <string>Stop logging when log overflows</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QSpinBox" name="lineLimitSpinBox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="suffix">
-             <string> lines</string>
-            </property>
-            <property name="minimum">
-             <number>10000</number>
-            </property>
-            <property name="maximum">
-             <number>1000000</number>
-            </property>
-            <property name="singleStep">
-             <number>10000</number>
-            </property>
-            <property name="value">
-             <number>100000</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="themeBox_2">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Console font</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="1" column="0" colspan="2">
-           <widget class="QTextEdit" name="fontPreview">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="horizontalScrollBarPolicy">
-             <enum>Qt::ScrollBarAlwaysOff</enum>
-            </property>
-            <property name="undoRedoEnabled">
-             <bool>false</bool>
-            </property>
-            <property name="textInteractionFlags">
-             <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QFontComboBox" name="consoleFont">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QSpinBox" name="fontSizeBox">
-            <property name="minimum">
-             <number>5</number>
-            </property>
-            <property name="maximum">
-             <number>16</number>
-            </property>
-            <property name="value">
-             <number>11</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="analyticsTab">
-      <attribute name="title">
-       <string>Analytics</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_8">
-       <item>
-        <widget class="QGroupBox" name="consoleSettingsBox_2">
-         <property name="title">
-          <string>Analytics Settings</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_4">
-          <item>
-           <widget class="QCheckBox" name="analyticsCheck">
-            <property name="text">
-             <string>Send anonymous usage statistics?</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="Line" name="line">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label_5">
-            <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;
-&lt;body&gt;
-&lt;p&gt;The launcher sends anonymous usage statistics on every start of the application.&lt;/p&gt;&lt;p&gt;The following data is collected:&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Launcher version.&lt;/li&gt;
-&lt;li&gt;Operating system name, version and architecture.&lt;/li&gt;
-&lt;li&gt;CPU architecture (kernel architecture on linux).&lt;/li&gt;
-&lt;li&gt;Size of system memory.&lt;/li&gt;
-&lt;li&gt;Java version, architecture and memory settings.&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>tabWidget</tabstop>
-  <tabstop>autoUpdateCheckBox</tabstop>
-  <tabstop>updateChannelComboBox</tabstop>
-  <tabstop>instDirTextBox</tabstop>
-  <tabstop>instDirBrowseBtn</tabstop>
-  <tabstop>modsDirTextBox</tabstop>
-  <tabstop>modsDirBrowseBtn</tabstop>
-  <tabstop>iconsDirTextBox</tabstop>
-  <tabstop>iconsDirBrowseBtn</tabstop>
-  <tabstop>resetNotificationsBtn</tabstop>
-  <tabstop>sortLastLaunchedBtn</tabstop>
-  <tabstop>sortByNameBtn</tabstop>
-  <tabstop>themeComboBox</tabstop>
-  <tabstop>themeComboBoxColors</tabstop>
-  <tabstop>showConsoleCheck</tabstop>
-  <tabstop>autoCloseConsoleCheck</tabstop>
-  <tabstop>showConsoleErrorCheck</tabstop>
-  <tabstop>lineLimitSpinBox</tabstop>
-  <tabstop>checkStopLogging</tabstop>
-  <tabstop>consoleFont</tabstop>
-  <tabstop>fontSizeBox</tabstop>
-  <tabstop>fontPreview</tabstop>
- </tabstops>
- <resources/>
- <connections/>
- <buttongroups>
-  <buttongroup name="sortingModeGroup"/>
- </buttongroups>
-</ui>
diff --git a/launcher/pages/global/MinecraftPage.cpp b/launcher/pages/global/MinecraftPage.cpp
deleted file mode 100644
index c763f8ac..00000000
--- a/launcher/pages/global/MinecraftPage.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MinecraftPage.h"
-#include "ui_MinecraftPage.h"
-
-#include <QMessageBox>
-#include <QDir>
-#include <QTabBar>
-
-#include "settings/SettingsObject.h"
-#include "Application.h"
-
-MinecraftPage::MinecraftPage(QWidget *parent) : QWidget(parent), ui(new Ui::MinecraftPage)
-{
-    ui->setupUi(this);
-    ui->tabWidget->tabBar()->hide();
-    loadSettings();
-    updateCheckboxStuff();
-}
-
-MinecraftPage::~MinecraftPage()
-{
-    delete ui;
-}
-
-bool MinecraftPage::apply()
-{
-    applySettings();
-    return true;
-}
-
-void MinecraftPage::updateCheckboxStuff()
-{
-    ui->windowWidthSpinBox->setEnabled(!ui->maximizedCheckBox->isChecked());
-    ui->windowHeightSpinBox->setEnabled(!ui->maximizedCheckBox->isChecked());
-}
-
-void MinecraftPage::on_maximizedCheckBox_clicked(bool checked)
-{
-    Q_UNUSED(checked);
-    updateCheckboxStuff();
-}
-
-void MinecraftPage::applySettings()
-{
-    auto s = APPLICATION->settings();
-
-    // Window Size
-    s->set("LaunchMaximized", ui->maximizedCheckBox->isChecked());
-    s->set("MinecraftWinWidth", ui->windowWidthSpinBox->value());
-    s->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
-
-    // Native library workarounds
-    s->set("UseNativeOpenAL", ui->useNativeOpenALCheck->isChecked());
-    s->set("UseNativeGLFW", ui->useNativeGLFWCheck->isChecked());
-
-    // Game time
-    s->set("ShowGameTime", ui->showGameTime->isChecked());
-    s->set("ShowGlobalGameTime", ui->showGlobalGameTime->isChecked());
-    s->set("RecordGameTime", ui->recordGameTime->isChecked());
-}
-
-void MinecraftPage::loadSettings()
-{
-    auto s = APPLICATION->settings();
-
-    // Window Size
-    ui->maximizedCheckBox->setChecked(s->get("LaunchMaximized").toBool());
-    ui->windowWidthSpinBox->setValue(s->get("MinecraftWinWidth").toInt());
-    ui->windowHeightSpinBox->setValue(s->get("MinecraftWinHeight").toInt());
-
-    ui->useNativeOpenALCheck->setChecked(s->get("UseNativeOpenAL").toBool());
-    ui->useNativeGLFWCheck->setChecked(s->get("UseNativeGLFW").toBool());
-
-    ui->showGameTime->setChecked(s->get("ShowGameTime").toBool());
-    ui->showGlobalGameTime->setChecked(s->get("ShowGlobalGameTime").toBool());
-    ui->recordGameTime->setChecked(s->get("RecordGameTime").toBool());
-}
diff --git a/launcher/pages/global/MinecraftPage.h b/launcher/pages/global/MinecraftPage.h
deleted file mode 100644
index 96a90f6e..00000000
--- a/launcher/pages/global/MinecraftPage.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <memory>
-#include <QDialog>
-
-#include "java/JavaChecker.h"
-#include "pages/BasePage.h"
-#include <Application.h>
-
-class SettingsObject;
-
-namespace Ui
-{
-class MinecraftPage;
-}
-
-class MinecraftPage : public QWidget, public BasePage
-{
-    Q_OBJECT
-
-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";
-    }
-    bool apply() override;
-
-private:
-    void updateCheckboxStuff();
-    void applySettings();
-    void loadSettings();
-
-private
-slots:
-    void on_maximizedCheckBox_clicked(bool checked);
-
-private:
-    Ui::MinecraftPage *ui;
-
-};
diff --git a/launcher/pages/global/MinecraftPage.ui b/launcher/pages/global/MinecraftPage.ui
deleted file mode 100644
index 857b8cfb..00000000
--- a/launcher/pages/global/MinecraftPage.ui
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MinecraftPage</class>
- <widget class="QWidget" name="MinecraftPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>936</width>
-    <height>1134</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <layout class="QVBoxLayout" name="mainLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="tabShape">
-      <enum>QTabWidget::Rounded</enum>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="minecraftTab">
-      <attribute name="title">
-       <string notr="true">Minecraft</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <widget class="QGroupBox" name="windowSizeGroupBox">
-         <property name="title">
-          <string>Window Size</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_4">
-          <item>
-           <widget class="QCheckBox" name="maximizedCheckBox">
-            <property name="text">
-             <string>Start Minecraft maximized?</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QGridLayout" name="gridLayoutWindowSize">
-            <item row="1" column="0">
-             <widget class="QLabel" name="labelWindowHeight">
-              <property name="text">
-               <string>Window hei&amp;ght:</string>
-              </property>
-              <property name="buddy">
-               <cstring>windowHeightSpinBox</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="labelWindowWidth">
-              <property name="text">
-               <string>W&amp;indow width:</string>
-              </property>
-              <property name="buddy">
-               <cstring>windowWidthSpinBox</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QSpinBox" name="windowWidthSpinBox">
-              <property name="minimum">
-               <number>1</number>
-              </property>
-              <property name="maximum">
-               <number>65536</number>
-              </property>
-              <property name="singleStep">
-               <number>1</number>
-              </property>
-              <property name="value">
-               <number>854</number>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QSpinBox" name="windowHeightSpinBox">
-              <property name="minimum">
-               <number>1</number>
-              </property>
-              <property name="maximum">
-               <number>65536</number>
-              </property>
-              <property name="value">
-               <number>480</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="nativeLibWorkaroundGroupBox">
-         <property name="title">
-          <string>Native library workarounds</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
-          <item>
-           <widget class="QCheckBox" name="useNativeGLFWCheck">
-            <property name="text">
-             <string>Use system installation of GLFW</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="useNativeOpenALCheck">
-            <property name="text">
-             <string>Use system installation of OpenAL</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="gameTimeGroupBox">
-         <property name="title">
-          <string>Game time</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_6">
-          <item>
-           <widget class="QCheckBox" name="showGameTime">
-            <property name="text">
-             <string>Show time spent playing instances</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="showGlobalGameTime">
-            <property name="text">
-             <string>Show time spent playing across all instances</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="recordGameTime">
-            <property name="text">
-             <string>Record time spent playing instances</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacerMinecraft">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>tabWidget</tabstop>
-  <tabstop>maximizedCheckBox</tabstop>
-  <tabstop>windowWidthSpinBox</tabstop>
-  <tabstop>windowHeightSpinBox</tabstop>
-  <tabstop>useNativeGLFWCheck</tabstop>
-  <tabstop>useNativeOpenALCheck</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/launcher/pages/global/PasteEEPage.cpp b/launcher/pages/global/PasteEEPage.cpp
deleted file mode 100644
index 4b375d9a..00000000
--- a/launcher/pages/global/PasteEEPage.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "PasteEEPage.h"
-#include "ui_PasteEEPage.h"
-
-#include <QMessageBox>
-#include <QFileDialog>
-#include <QStandardPaths>
-#include <QTabBar>
-
-#include "settings/SettingsObject.h"
-#include "tools/BaseProfiler.h"
-#include "Application.h"
-
-PasteEEPage::PasteEEPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::PasteEEPage)
-{
-    ui->setupUi(this);
-    ui->tabWidget->tabBar()->hide();\
-    connect(ui->customAPIkeyEdit, &QLineEdit::textEdited, this, &PasteEEPage::textEdited);
-    loadSettings();
-}
-
-PasteEEPage::~PasteEEPage()
-{
-    delete ui;
-}
-
-void PasteEEPage::loadSettings()
-{
-    auto s = APPLICATION->settings();
-    QString keyToUse = s->get("PasteEEAPIKey").toString();
-    if(keyToUse == "multimc")
-    {
-        ui->multimcButton->setChecked(true);
-    }
-    else
-    {
-        ui->customButton->setChecked(true);
-        ui->customAPIkeyEdit->setText(keyToUse);
-    }
-}
-
-void PasteEEPage::applySettings()
-{
-    auto s = APPLICATION->settings();
-
-    QString pasteKeyToUse;
-    if (ui->customButton->isChecked())
-        pasteKeyToUse = ui->customAPIkeyEdit->text();
-    else
-    {
-        pasteKeyToUse =  "multimc";
-    }
-    s->set("PasteEEAPIKey", pasteKeyToUse);
-}
-
-bool PasteEEPage::apply()
-{
-    applySettings();
-    return true;
-}
-
-void PasteEEPage::textEdited(const QString& text)
-{
-    ui->customButton->setChecked(true);
-}
diff --git a/launcher/pages/global/PasteEEPage.h b/launcher/pages/global/PasteEEPage.h
deleted file mode 100644
index 0ea74e7c..00000000
--- a/launcher/pages/global/PasteEEPage.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QWidget>
-
-#include "pages/BasePage.h"
-#include <Application.h>
-
-namespace Ui {
-class PasteEEPage;
-}
-
-class PasteEEPage : public QWidget, public BasePage
-{
-    Q_OBJECT
-
-public:
-    explicit PasteEEPage(QWidget *parent = 0);
-    ~PasteEEPage();
-
-    QString displayName() const override
-    {
-        return tr("Log Upload");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("log");
-    }
-    QString id() const override
-    {
-        return "log-upload";
-    }
-    QString helpPage() const override
-    {
-        return "Log-Upload";
-    }
-    virtual bool apply() override;
-
-private:
-    void loadSettings();
-    void applySettings();
-
-private slots:
-    void textEdited(const QString &text);
-
-private:
-    Ui::PasteEEPage *ui;
-};
diff --git a/launcher/pages/global/PasteEEPage.ui b/launcher/pages/global/PasteEEPage.ui
deleted file mode 100644
index 10883781..00000000
--- a/launcher/pages/global/PasteEEPage.ui
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PasteEEPage</class>
- <widget class="QWidget" name="PasteEEPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>491</width>
-    <height>474</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string notr="true">Tab 1</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string>paste.ee API key</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_10">
-          <item>
-           <widget class="QRadioButton" name="multimcButton">
-            <property name="text">
-             <string>MultiMC key - 12MB &amp;upload limit</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">pasteButtonGroup</string>
-            </attribute>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="customButton">
-            <property name="text">
-             <string>&amp;Your own key - 12MB upload limit:</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">pasteButtonGroup</string>
-            </attribute>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLineEdit" name="customAPIkeyEdit">
-            <property name="echoMode">
-             <enum>QLineEdit::Password</enum>
-            </property>
-            <property name="placeholderText">
-             <string>Paste your API key here!</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="Line" name="line">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://paste.ee&quot;&gt;paste.ee&lt;/a&gt; is used by MultiMC for log uploads. If you have a &lt;a href=&quot;https://paste.ee&quot;&gt;paste.ee&lt;/a&gt; account, you can add your API key here and have your uploaded logs paired with your account.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="textFormat">
-             <enum>Qt::RichText</enum>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-            <property name="openExternalLinks">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>216</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>tabWidget</tabstop>
-  <tabstop>multimcButton</tabstop>
-  <tabstop>customButton</tabstop>
-  <tabstop>customAPIkeyEdit</tabstop>
- </tabstops>
- <resources/>
- <connections/>
- <buttongroups>
-  <buttongroup name="pasteButtonGroup"/>
- </buttongroups>
-</ui>
diff --git a/launcher/pages/global/ProxyPage.cpp b/launcher/pages/global/ProxyPage.cpp
deleted file mode 100644
index 5bc8199e..00000000
--- a/launcher/pages/global/ProxyPage.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ProxyPage.h"
-#include "ui_ProxyPage.h"
-
-#include <QTabBar>
-
-#include "settings/SettingsObject.h"
-#include "Application.h"
-#include "Application.h"
-
-ProxyPage::ProxyPage(QWidget *parent) : QWidget(parent), ui(new Ui::ProxyPage)
-{
-    ui->setupUi(this);
-    ui->tabWidget->tabBar()->hide();
-    loadSettings();
-    updateCheckboxStuff();
-
-    connect(ui->proxyGroup, SIGNAL(buttonClicked(int)), SLOT(proxyChanged(int)));
-}
-
-ProxyPage::~ProxyPage()
-{
-    delete ui;
-}
-
-bool ProxyPage::apply()
-{
-    applySettings();
-    return true;
-}
-
-void ProxyPage::updateCheckboxStuff()
-{
-    ui->proxyAddrBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
-                                 !ui->proxyDefaultBtn->isChecked());
-    ui->proxyAuthBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
-                                 !ui->proxyDefaultBtn->isChecked());
-}
-
-void ProxyPage::proxyChanged(int)
-{
-    updateCheckboxStuff();
-}
-
-void ProxyPage::applySettings()
-{
-    auto s = APPLICATION->settings();
-
-    // Proxy
-    QString proxyType = "None";
-    if (ui->proxyDefaultBtn->isChecked())
-        proxyType = "Default";
-    else if (ui->proxyNoneBtn->isChecked())
-        proxyType = "None";
-    else if (ui->proxySOCKS5Btn->isChecked())
-        proxyType = "SOCKS5";
-    else if (ui->proxyHTTPBtn->isChecked())
-        proxyType = "HTTP";
-
-    s->set("ProxyType", proxyType);
-    s->set("ProxyAddr", ui->proxyAddrEdit->text());
-    s->set("ProxyPort", ui->proxyPortEdit->value());
-    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()
-    );
-}
-void ProxyPage::loadSettings()
-{
-    auto s = APPLICATION->settings();
-    // Proxy
-    QString proxyType = s->get("ProxyType").toString();
-    if (proxyType == "Default")
-        ui->proxyDefaultBtn->setChecked(true);
-    else if (proxyType == "None")
-        ui->proxyNoneBtn->setChecked(true);
-    else if (proxyType == "SOCKS5")
-        ui->proxySOCKS5Btn->setChecked(true);
-    else if (proxyType == "HTTP")
-        ui->proxyHTTPBtn->setChecked(true);
-
-    ui->proxyAddrEdit->setText(s->get("ProxyAddr").toString());
-    ui->proxyPortEdit->setValue(s->get("ProxyPort").value<uint16_t>());
-    ui->proxyUserEdit->setText(s->get("ProxyUser").toString());
-    ui->proxyPassEdit->setText(s->get("ProxyPass").toString());
-}
diff --git a/launcher/pages/global/ProxyPage.h b/launcher/pages/global/ProxyPage.h
deleted file mode 100644
index 91f1fbaa..00000000
--- a/launcher/pages/global/ProxyPage.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <memory>
-#include <QDialog>
-
-#include "pages/BasePage.h"
-#include <Application.h>
-
-namespace Ui
-{
-class ProxyPage;
-}
-
-class ProxyPage : public QWidget, public BasePage
-{
-    Q_OBJECT
-
-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";
-    }
-    bool apply() override;
-
-private:
-    void updateCheckboxStuff();
-    void applySettings();
-    void loadSettings();
-
-private
-slots:
-    void proxyChanged(int);
-
-private:
-    Ui::ProxyPage *ui;
-};
diff --git a/launcher/pages/global/ProxyPage.ui b/launcher/pages/global/ProxyPage.ui
deleted file mode 100644
index 347fa86c..00000000
--- a/launcher/pages/global/ProxyPage.ui
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProxyPage</class>
- <widget class="QWidget" name="ProxyPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>598</width>
-    <height>617</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <widget class="QWidget" name="tabWidgetPage1">
-      <attribute name="title">
-       <string notr="true"/>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QLabel" name="proxyPlainTextWarningLabel_2">
-         <property name="text">
-          <string>This only applies to the launcher. Minecraft does not accept proxy settings.</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="proxyTypeBox">
-         <property name="title">
-          <string>Type</string>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_3">
-          <item>
-           <widget class="QRadioButton" name="proxyDefaultBtn">
-            <property name="toolTip">
-             <string>Uses your system's default proxy settings.</string>
-            </property>
-            <property name="text">
-             <string>&amp;Default</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">proxyGroup</string>
-            </attribute>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="proxyNoneBtn">
-            <property name="text">
-             <string>&amp;None</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">proxyGroup</string>
-            </attribute>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="proxySOCKS5Btn">
-            <property name="text">
-             <string>SOC&amp;KS5</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">proxyGroup</string>
-            </attribute>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="proxyHTTPBtn">
-            <property name="text">
-             <string>H&amp;TTP</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">proxyGroup</string>
-            </attribute>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="proxyAddrBox">
-         <property name="title">
-          <string>Address and Port</string>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <widget class="QLineEdit" name="proxyAddrEdit">
-            <property name="placeholderText">
-             <string notr="true">127.0.0.1</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QSpinBox" name="proxyPortEdit">
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-            <property name="buttonSymbols">
-             <enum>QAbstractSpinBox::PlusMinus</enum>
-            </property>
-            <property name="maximum">
-             <number>65535</number>
-            </property>
-            <property name="value">
-             <number>8080</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="proxyAuthBox">
-         <property name="title">
-          <string>Authentication</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_5">
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="proxyUserEdit"/>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="proxyUsernameLabel">
-            <property name="text">
-             <string>Username:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="proxyPasswordLabel">
-            <property name="text">
-             <string>Password:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="proxyPassEdit">
-            <property name="echoMode">
-             <enum>QLineEdit::Password</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0" colspan="2">
-           <widget class="QLabel" name="proxyPlainTextWarningLabel">
-            <property name="text">
-             <string>Note: Proxy username and password are stored in plain text inside the launcher's configuration file!</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
- <buttongroups>
-  <buttongroup name="proxyGroup"/>
- </buttongroups>
-</ui>