merged from 0.6.7 codebase

23 files changed, 1471 insertions, 1173 deletions

diff --git a/application/pages/global/AccountListPage.cpp b/application/pages/global/AccountListPage.cpp
index 63943174..c14134f3 100644
--- a/application/pages/global/AccountListPage.cpp
+++ b/application/pages/global/AccountListPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 #include "ui_AccountListPage.h"
 
 #include <QItemSelectionModel>
+#include <QMenu>
 
 #include <QDebug>
 
@@ -34,120 +35,159 @@
 #include "MultiMC.h"
 
 AccountListPage::AccountListPage(QWidget *parent)
-	: QWidget(parent), ui(new Ui::AccountListPage)
+    : QMainWindow(parent), ui(new Ui::AccountListPage)
 {
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
+    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 = MMC->accounts();
+    m_accounts = MMC->accounts();
 
-	ui->listView->setModel(m_accounts.get());
-	ui->listView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+    ui->listView->setModel(m_accounts.get());
+    ui->listView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+    ui->listView->setSelectionMode(QAbstractItemView::SingleSelection);
 
-	// Expand the account column
-	ui->listView->header()->setSectionResizeMode(1, QHeaderView::Stretch);
+    // Expand the account column
+    ui->listView->header()->setSectionResizeMode(1, QHeaderView::Stretch);
 
-	QItemSelectionModel *selectionModel = ui->listView->selectionModel();
+    QItemSelectionModel *selectionModel = ui->listView->selectionModel();
 
-	connect(selectionModel, &QItemSelectionModel::selectionChanged,
-			[this](const QItemSelection &sel, const QItemSelection &dsel)
-	{ updateButtonStates(); });
+    connect(selectionModel, &QItemSelectionModel::selectionChanged, [this](const QItemSelection &sel, const QItemSelection &dsel) {
+        updateButtonStates();
+    });
+    connect(ui->listView, &VersionListView::customContextMenuRequested, this, &AccountListPage::ShowContextMenu);
 
-	connect(m_accounts.get(), SIGNAL(listChanged()), SLOT(listChanged()));
-	connect(m_accounts.get(), SIGNAL(activeAccountChanged()), SLOT(listChanged()));
+    connect(m_accounts.get(), SIGNAL(listChanged()), SLOT(listChanged()));
+    connect(m_accounts.get(), SIGNAL(activeAccountChanged()), SLOT(listChanged()));
 
-	updateButtonStates();
+    updateButtonStates();
 }
 
 AccountListPage::~AccountListPage()
 {
-	delete ui;
+    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();
+    updateButtonStates();
 }
 
-void AccountListPage::on_addAccountBtn_clicked()
+void AccountListPage::on_actionAdd_triggered()
 {
-	addAccount(tr("Please enter your Mojang or Minecraft account username and password to add "
-				  "your account."));
+    addAccount(tr("Please enter your Mojang or Minecraft account username and password to add "
+                  "your account."));
 }
 
-void AccountListPage::on_rmAccountBtn_clicked()
+void AccountListPage::on_actionRemove_triggered()
 {
-	QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-	if (selection.size() > 0)
-	{
-		QModelIndex selected = selection.first();
-		m_accounts->removeAccount(selected);
-	}
+    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
+    if (selection.size() > 0)
+    {
+        QModelIndex selected = selection.first();
+        m_accounts->removeAccount(selected);
+    }
 }
 
-void AccountListPage::on_setDefaultBtn_clicked()
+void AccountListPage::on_actionSetDefault_triggered()
 {
-	QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-	if (selection.size() > 0)
-	{
-		QModelIndex selected = selection.first();
-		MojangAccountPtr account =
-			selected.data(MojangAccountList::PointerRole).value<MojangAccountPtr>();
-		m_accounts->setActiveAccount(account->username());
-	}
+    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
+    if (selection.size() > 0)
+    {
+        QModelIndex selected = selection.first();
+        MojangAccountPtr account =
+            selected.data(MojangAccountList::PointerRole).value<MojangAccountPtr>();
+        m_accounts->setActiveAccount(account->username());
+    }
 }
 
-void AccountListPage::on_noDefaultBtn_clicked()
+void AccountListPage::on_actionNoDefault_triggered()
 {
-	m_accounts->setActiveAccount("");
+    m_accounts->setActiveAccount("");
 }
 
 void AccountListPage::updateButtonStates()
 {
-	// If there is no selection, disable buttons that require something selected.
-	QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-
-	ui->rmAccountBtn->setEnabled(selection.size() > 0);
-	ui->setDefaultBtn->setEnabled(selection.size() > 0);
-	ui->uploadSkinBtn->setEnabled(selection.size() > 0);
+    // If there is no selection, disable buttons that require something selected.
+    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
+
+    ui->actionRemove->setEnabled(selection.size() > 0);
+    ui->actionSetDefault->setEnabled(selection.size() > 0);
+    ui->actionUploadSkin->setEnabled(selection.size() > 0);
+
+    if(m_accounts->activeAccount().get() == nullptr) {
+        ui->actionNoDefault->setEnabled(false);
+        ui->actionNoDefault->setChecked(true);
+    }
+    else {
+        ui->actionNoDefault->setEnabled(true);
+        ui->actionNoDefault->setChecked(false);
+    }
 
-	ui->noDefaultBtn->setDown(m_accounts->activeAccount().get() == nullptr);
 }
 
 void AccountListPage::addAccount(const QString &errMsg)
 {
-	// TODO: The login dialog isn't quite done yet
-	MojangAccountPtr account = LoginDialog::newAccount(this, errMsg);
-
-	if (account != nullptr)
-	{
-		m_accounts->addAccount(account);
-		if (m_accounts->count() == 1)
-			m_accounts->setActiveAccount(account->username());
-
-		// Grab associated player skins
-		auto job = new NetJob("Player skins: " + account->username());
-
-		for (AccountProfile profile : account->profiles())
-		{
-			auto meta = Env::getInstance().metacache()->resolveEntry("skins", profile.id + ".png");
-			auto action = Net::Download::makeCached(QUrl("https://" + URLConstants::SKINS_BASE + profile.id + ".png"), meta);
-			job->addNetAction(action);
-			meta->setStale(true);
-		}
-
-		job->start();
-	}
+    // TODO: The login dialog isn't quite done yet
+    MojangAccountPtr account = LoginDialog::newAccount(this, errMsg);
+
+    if (account != nullptr)
+    {
+        m_accounts->addAccount(account);
+        if (m_accounts->count() == 1)
+            m_accounts->setActiveAccount(account->username());
+
+        // Grab associated player skins
+        auto job = new NetJob("Player skins: " + account->username());
+
+        for (AccountProfile profile : account->profiles())
+        {
+            auto meta = Env::getInstance().metacache()->resolveEntry("skins", profile.id + ".png");
+            auto action = Net::Download::makeCached(QUrl(URLConstants::SKINS_BASE + profile.id + ".png"), meta);
+            job->addNetAction(action);
+            meta->setStale(true);
+        }
+
+        job->start();
+    }
 }
 
-void AccountListPage::on_uploadSkinBtn_clicked()
+void AccountListPage::on_actionUploadSkin_triggered()
 {
-	QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-	if (selection.size() > 0)
-	{
-		QModelIndex selected = selection.first();
-		MojangAccountPtr account = selected.data(MojangAccountList::PointerRole).value<MojangAccountPtr>();
-		SkinUploadDialog dialog(account, this);
-		dialog.exec();
-	}
+    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
+    if (selection.size() > 0)
+    {
+        QModelIndex selected = selection.first();
+        MojangAccountPtr account = selected.data(MojangAccountList::PointerRole).value<MojangAccountPtr>();
+        SkinUploadDialog dialog(account, this);
+        dialog.exec();
+    }
 }
diff --git a/application/pages/global/AccountListPage.h b/application/pages/global/AccountListPage.h
index fa5561fe..4c8bc00b 100644
--- a/application/pages/global/AccountListPage.h
+++ b/application/pages/global/AccountListPage.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <QDialog>
+#include <QMainWindow>
 #include <memory>
 
 #include "pages/BasePage.h"
@@ -30,59 +30,64 @@ class AccountListPage;
 
 class AuthenticateTask;
 
-class AccountListPage : public QWidget, public BasePage
+class AccountListPage : public QMainWindow, public BasePage
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit AccountListPage(QWidget *parent = 0);
-	~AccountListPage();
-
-	QString displayName() const override
-	{
-		return tr("Accounts");
-	}
-	QIcon icon() const override
-	{
-		auto icon = MMC->getThemedIcon("accounts");
-		if(icon.isNull())
-		{
-			icon = MMC->getThemedIcon("noaccount");
-		}
-		return icon;
-	}
-	QString id() const override
-	{
-		return "accounts";
-	}
-	QString helpPage() const override
-	{
-		return "Getting-Started#adding-an-account";
-	}
+    explicit AccountListPage(QWidget *parent = 0);
+    ~AccountListPage();
+
+    QString displayName() const override
+    {
+        return tr("Accounts");
+    }
+    QIcon icon() const override
+    {
+        auto icon = MMC->getThemedIcon("accounts");
+        if(icon.isNull())
+        {
+            icon = MMC->getThemedIcon("noaccount");
+        }
+        return icon;
+    }
+    QString id() const override
+    {
+        return "accounts";
+    }
+    QString helpPage() const override
+    {
+        return "Getting-Started#adding-an-account";
+    }
+
+private:
+    void changeEvent(QEvent * event) override;
+    QMenu * createPopupMenu() override;
 
 public
 slots:
-	void on_addAccountBtn_clicked();
+    void on_actionAdd_triggered();
 
-	void on_rmAccountBtn_clicked();
+    void on_actionRemove_triggered();
 
-	void on_setDefaultBtn_clicked();
+    void on_actionSetDefault_triggered();
 
-	void on_noDefaultBtn_clicked();
+    void on_actionNoDefault_triggered();
 
-	void on_uploadSkinBtn_clicked();
+    void on_actionUploadSkin_triggered();
 
-	void listChanged();
+    void listChanged();
 
-	//! Updates the states of the dialog's buttons.
-	void updateButtonStates();
+    //! Updates the states of the dialog's buttons.
+    void updateButtonStates();
 
 protected:
-	std::shared_ptr<MojangAccountList> m_accounts;
+    std::shared_ptr<MojangAccountList> m_accounts;
 
 protected
 slots:
-	void addAccount(const QString& errMsg="");
+    void ShowContextMenu(const QPoint &pos);
+    void addAccount(const QString& errMsg="");
 
 private:
-	Ui::AccountListPage *ui;
+    Ui::AccountListPage *ui;
 };
diff --git a/application/pages/global/AccountListPage.ui b/application/pages/global/AccountListPage.ui
index f4e87680..433c1f7f 100644
--- a/application/pages/global/AccountListPage.ui
+++ b/application/pages/global/AccountListPage.ui
@@ -1,122 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>AccountListPage</class>
- <widget class="QWidget" name="AccountListPage">
+ <widget class="QMainWindow" name="AccountListPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>694</width>
-    <height>609</height>
+    <width>800</width>
+    <height>600</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="leftMargin">
-    <number>0</number>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </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"/>
+    </item>
+   </layout>
+  </widget>
+  <widget class="WideBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>RightToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionAdd"/>
+   <addaction name="actionRemove"/>
+   <addaction name="actionSetDefault"/>
+   <addaction name="actionNoDefault"/>
+   <addaction name="actionUploadSkin"/>
+  </widget>
+  <action name="actionAdd">
+   <property name="text">
+    <string>Add</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>
-   <property name="topMargin">
-    <number>0</number>
+  </action>
+  <action name="actionNoDefault">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
-   <property name="rightMargin">
-    <number>0</number>
+   <property name="text">
+    <string>No Default</string>
    </property>
-   <property name="bottomMargin">
-    <number>0</number>
+  </action>
+  <action name="actionUploadSkin">
+   <property name="text">
+    <string>Upload Skin</string>
    </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">
-       <item>
-        <widget class="QLabel" name="welcomeLabel">
-         <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Welcome! If you're new here, you can click the &amp;quot;Add&amp;quot; button to add your Mojang or Minecraft account.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QTreeView" name="listView"/>
-         </item>
-         <item>
-          <layout class="QVBoxLayout" name="manageAcctsBtnBox">
-           <item>
-            <widget class="QPushButton" name="addAccountBtn">
-             <property name="text">
-              <string>&amp;Add</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="rmAccountBtn">
-             <property name="text">
-              <string>&amp;Remove</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="buttonSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QPushButton" name="setDefaultBtn">
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the currently selected account as the active account. The active account is the account that is used to log in (unless it is overridden in an instance-specific setting).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>&amp;Set Default</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="noDefaultBtn">
-             <property name="toolTip">
-              <string>Set no default account. This will cause MultiMC to prompt you to select an account every time you launch an instance that doesn't have its own default set.</string>
-             </property>
-             <property name="text">
-              <string>&amp;No Default</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="uploadSkinBtn">
-             <property name="toolTip">
-              <string>Opens a dialog to select and upload a skin image to the selected account.</string>
-             </property>
-             <property name="text">
-              <string>&amp;Upload Skin</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
+  </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/application/pages/global/CustomCommandsPage.cpp b/application/pages/global/CustomCommandsPage.cpp
index 1352b6be..3b182319 100644
--- a/application/pages/global/CustomCommandsPage.cpp
+++ b/application/pages/global/CustomCommandsPage.cpp
@@ -6,17 +6,18 @@
 CustomCommandsPage::CustomCommandsPage(QWidget* parent): QWidget(parent)
 {
 
-	auto verticalLayout = new QVBoxLayout(this);
-	verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
-	verticalLayout->setContentsMargins(0, 0, 0, 0);
+    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);
-	tabWidget->addTab(commands, "Foo");
-	tabWidget->tabBar()->hide();
-	verticalLayout->addWidget(tabWidget);
-	loadSettings();
+    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()
@@ -25,26 +26,26 @@ CustomCommandsPage::~CustomCommandsPage()
 
 bool CustomCommandsPage::apply()
 {
-	applySettings();
-	return true;
+    applySettings();
+    return true;
 }
 
 void CustomCommandsPage::applySettings()
 {
-	auto s = MMC->settings();
-	s->set("PreLaunchCommand", commands->prelaunchCommand());
-	s->set("WrapperCommand", commands->wrapperCommand());
-	s->set("PostExitCommand", commands->postexitCommand());
+    auto s = MMC->settings();
+    s->set("PreLaunchCommand", commands->prelaunchCommand());
+    s->set("WrapperCommand", commands->wrapperCommand());
+    s->set("PostExitCommand", commands->postexitCommand());
 }
 
 void CustomCommandsPage::loadSettings()
 {
-	auto s = MMC->settings();
-	commands->initialize(
-		false,
-		true,
-		s->get("PreLaunchCommand").toString(),
-		s->get("WrapperCommand").toString(),
-		s->get("PostExitCommand").toString()
-	);
+    auto s = MMC->settings();
+    commands->initialize(
+        false,
+        true,
+        s->get("PreLaunchCommand").toString(),
+        s->get("WrapperCommand").toString(),
+        s->get("PostExitCommand").toString()
+    );
 }
diff --git a/application/pages/global/CustomCommandsPage.h b/application/pages/global/CustomCommandsPage.h
index 52256ed3..a9047e63 100644
--- a/application/pages/global/CustomCommandsPage.h
+++ b/application/pages/global/CustomCommandsPage.h
@@ -1,4 +1,4 @@
-/* Copyright 2018-2018 MultiMC Contributors
+/* Copyright 2018-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,32 +24,32 @@
 
 class CustomCommandsPage : public QWidget, public BasePage
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit CustomCommandsPage(QWidget *parent = 0);
-	~CustomCommandsPage();
+    explicit CustomCommandsPage(QWidget *parent = 0);
+    ~CustomCommandsPage();
 
-	QString displayName() const override
-	{
-		return tr("Custom Commands");
-	}
-	QIcon icon() const override
-	{
-		return MMC->getThemedIcon("custom-commands");
-	}
-	QString id() const override
-	{
-		return "custom-commands";
-	}
-	QString helpPage() const override
-	{
-		return "Custom-commands";
-	}
-	bool apply() override;
+    QString displayName() const override
+    {
+        return tr("Custom Commands");
+    }
+    QIcon icon() const override
+    {
+        return MMC->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;
+    void applySettings();
+    void loadSettings();
+    CustomCommands * commands;
 };
diff --git a/application/pages/global/ExternalToolsPage.cpp b/application/pages/global/ExternalToolsPage.cpp
index 20887b54..7de6f858 100644
--- a/application/pages/global/ExternalToolsPage.cpp
+++ b/application/pages/global/ExternalToolsPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QStandardPaths>
+#include <QTabBar>
 
 #include "settings/SettingsObject.h"
 #include "tools/BaseProfiler.h"
@@ -28,206 +29,206 @@
 #include <QTabBar>
 
 ExternalToolsPage::ExternalToolsPage(QWidget *parent) :
-	QWidget(parent),
-	ui(new Ui::ExternalToolsPage)
+    QWidget(parent),
+    ui(new Ui::ExternalToolsPage)
 {
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
+    ui->setupUi(this);
+    ui->tabWidget->tabBar()->hide();
 
-	#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-	ui->jsonEditorTextBox->setClearButtonEnabled(true);
-	#endif
+    #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();
+    ui->mceditLink->setOpenExternalLinks(true);
+    ui->jvisualvmLink->setOpenExternalLinks(true);
+    ui->jprofilerLink->setOpenExternalLinks(true);
+    loadSettings();
 }
 
 ExternalToolsPage::~ExternalToolsPage()
 {
-	delete ui;
+    delete ui;
 }
 
 void ExternalToolsPage::loadSettings()
 {
-	auto s = MMC->settings();
-	ui->jprofilerPathEdit->setText(s->get("JProfilerPath").toString());
-	ui->jvisualvmPathEdit->setText(s->get("JVisualVMPath").toString());
-	ui->mceditPathEdit->setText(s->get("MCEditPath").toString());
+    auto s = MMC->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());
+    // Editors
+    ui->jsonEditorTextBox->setText(s->get("JsonEditor").toString());
 }
 void ExternalToolsPage::applySettings()
 {
-	auto s = MMC->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);
+    auto s = MMC->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 (!MMC->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);
+    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 (!MMC->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 (!MMC->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"));
-	}
+    QString error;
+    if (!MMC->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 (!MMC->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);
+    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 (!MMC->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 (!MMC->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"));
-	}
+    QString error;
+    if (!MMC->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
-	{
+    QString raw_dir = ui->mceditPathEdit->text();
+    QString error;
+    do
+    {
 #ifdef Q_OS_OSX
-		raw_dir = QFileDialog::getOpenFileName(this, tr("MCEdit Application"), raw_dir);
+        raw_dir = QFileDialog::getOpenFileName(this, tr("MCEdit Application"), raw_dir);
 #else
-		raw_dir = QFileDialog::getExistingDirectory(this, tr("MCEdit Folder"), raw_dir);
+        raw_dir = QFileDialog::getExistingDirectory(this, tr("MCEdit Folder"), raw_dir);
 #endif
-		if (raw_dir.isEmpty())
-		{
-			break;
-		}
-		QString cooked_dir = FS::NormalizePath(raw_dir);
-		if (!MMC->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);
+        if (raw_dir.isEmpty())
+        {
+            break;
+        }
+        QString cooked_dir = FS::NormalizePath(raw_dir);
+        if (!MMC->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 (!MMC->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"));
-	}
+    QString error;
+    if (!MMC->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()
+    QString raw_file = QFileDialog::getOpenFileName(
+        this, tr("JSON Editor"),
+        ui->jsonEditorTextBox->text().isEmpty()
 #if defined(Q_OS_LINUX)
-				? QString("/usr/bin")
+                ? QString("/usr/bin")
 #else
-			? QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).first()
+            ? QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).first()
 #endif
-			: ui->jsonEditorTextBox->text());
-
-	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"));
-	}
+            : 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;
+    applySettings();
+    return true;
 }
diff --git a/application/pages/global/ExternalToolsPage.h b/application/pages/global/ExternalToolsPage.h
index de46d8a6..06e64273 100644
--- a/application/pages/global/ExternalToolsPage.h
+++ b/application/pages/global/ExternalToolsPage.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,49 +26,49 @@ class ExternalToolsPage;
 
 class ExternalToolsPage : public QWidget, public BasePage
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit ExternalToolsPage(QWidget *parent = 0);
-	~ExternalToolsPage();
+    explicit ExternalToolsPage(QWidget *parent = 0);
+    ~ExternalToolsPage();
 
-	QString displayName() const override
-	{
-		return tr("External Tools");
-	}
-	QIcon icon() const override
-	{
-		auto icon = MMC->getThemedIcon("externaltools");
-		if(icon.isNull())
-		{
-			icon = MMC->getThemedIcon("loadermods");
-		}
-		return icon;
-	}
-	QString id() const override
-	{
-		return "external-tools";
-	}
-	QString helpPage() const override
-	{
-		return "Tools";
-	}
-	virtual bool apply() override;
+    QString displayName() const override
+    {
+        return tr("External Tools");
+    }
+    QIcon icon() const override
+    {
+        auto icon = MMC->getThemedIcon("externaltools");
+        if(icon.isNull())
+        {
+            icon = MMC->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();
+    void loadSettings();
+    void applySettings();
 
 private:
-	Ui::ExternalToolsPage *ui;
+    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();
+    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/application/pages/global/ExternalToolsPage.ui b/application/pages/global/ExternalToolsPage.ui
index 5f19898b..e79e9388 100644
--- a/application/pages/global/ExternalToolsPage.ui
+++ b/application/pages/global/ExternalToolsPage.ui
@@ -63,7 +63,7 @@
           <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;http://www.ej-technologies.com/products/jprofiler/overview.html&quot;&gt;http://www.ej-technologies.com/products/jprofiler/overview.html&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <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>
@@ -137,7 +137,7 @@
           <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;http://www.mcedit.net/&quot;&gt;http://www.mcedit.net/&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <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>
diff --git a/application/pages/global/JavaPage.cpp b/application/pages/global/JavaPage.cpp
index ce733778..211dc929 100644
--- a/application/pages/global/JavaPage.cpp
+++ b/application/pages/global/JavaPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QDir>
+#include <QTabBar>
 
 #include "dialogs/VersionSelectDialog.h"
 
@@ -34,120 +35,120 @@
 
 JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
 {
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
+    ui->setupUi(this);
+    ui->tabWidget->tabBar()->hide();
 
-	auto sysMB = Sys::getSystemRam() / Sys::megabyte;
-	ui->maxMemSpinBox->setMaximum(sysMB);
-	loadSettings();
+    auto sysMB = Sys::getSystemRam() / Sys::megabyte;
+    ui->maxMemSpinBox->setMaximum(sysMB);
+    loadSettings();
 }
 
 JavaPage::~JavaPage()
 {
-	delete ui;
+    delete ui;
 }
 
 bool JavaPage::apply()
 {
-	applySettings();
-	return true;
+    applySettings();
+    return true;
 }
 
 void JavaPage::applySettings()
 {
-	auto s = MMC->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());
+    auto s = MMC->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 = MMC->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());
+    auto s = MMC->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;
+    JavaInstallPtr java;
 
-	VersionSelectDialog vselect(MMC->javalist().get(), tr("Select a Java version"), this, true);
-	vselect.setResizeOn(2);
-	vselect.exec();
+    VersionSelectDialog vselect(MMC->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);
-	}
+    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);
+    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();
+    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();
+    checker.reset();
 }
diff --git a/application/pages/global/JavaPage.h b/application/pages/global/JavaPage.h
index e3a9f37f..3efebb78 100644
--- a/application/pages/global/JavaPage.h
+++ b/application/pages/global/JavaPage.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,42 +31,42 @@ class JavaPage;
 
 class JavaPage : public QWidget, public BasePage
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit JavaPage(QWidget *parent = 0);
-	~JavaPage();
+    explicit JavaPage(QWidget *parent = 0);
+    ~JavaPage();
 
-	QString displayName() const override
-	{
-		return tr("Java");
-	}
-	QIcon icon() const override
-	{
-		return MMC->getThemedIcon("java");
-	}
-	QString id() const override
-	{
-		return "java-settings";
-	}
-	QString helpPage() const override
-	{
-		return "Java-settings";
-	}
-	bool apply() override;
+    QString displayName() const override
+    {
+        return tr("Java");
+    }
+    QIcon icon() const override
+    {
+        return MMC->getThemedIcon("java");
+    }
+    QString id() const override
+    {
+        return "java-settings";
+    }
+    QString helpPage() const override
+    {
+        return "Java-settings";
+    }
+    bool apply() override;
 
 private:
-	void applySettings();
-	void loadSettings();
+    void applySettings();
+    void loadSettings();
 
 private
 slots:
-	void on_javaDetectBtn_clicked();
-	void on_javaTestBtn_clicked();
-	void on_javaBrowseBtn_clicked();
-	void checkerFinished();
+    void on_javaDetectBtn_clicked();
+    void on_javaTestBtn_clicked();
+    void on_javaBrowseBtn_clicked();
+    void checkerFinished();
 
 private:
-	Ui::JavaPage *ui;
-	unique_qobject_ptr<JavaCommon::TestCheck> checker;
+    Ui::JavaPage *ui;
+    unique_qobject_ptr<JavaCommon::TestCheck> checker;
 };
diff --git a/application/pages/global/LanguagePage.cpp b/application/pages/global/LanguagePage.cpp
new file mode 100644
index 00000000..ae3168cc
--- /dev/null
+++ b/application/pages/global/LanguagePage.cpp
@@ -0,0 +1,51 @@
+#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 = MMC->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/application/pages/global/LanguagePage.h b/application/pages/global/LanguagePage.h
new file mode 100644
index 00000000..c4df2ea9
--- /dev/null
+++ b/application/pages/global/LanguagePage.h
@@ -0,0 +1,60 @@
+/* Copyright 2013-2019 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 <MultiMC.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 MMC->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/application/pages/global/MinecraftPage.cpp b/application/pages/global/MinecraftPage.cpp
index 4efc2fa0..5e0d9625 100644
--- a/application/pages/global/MinecraftPage.cpp
+++ b/application/pages/global/MinecraftPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 #include <QMessageBox>
 #include <QDir>
+#include <QTabBar>
 
 #include "settings/SettingsObject.h"
 #include "MultiMC.h"
@@ -25,52 +26,52 @@
 
 MinecraftPage::MinecraftPage(QWidget *parent) : QWidget(parent), ui(new Ui::MinecraftPage)
 {
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-	loadSettings();
-	updateCheckboxStuff();
+    ui->setupUi(this);
+    ui->tabWidget->tabBar()->hide();
+    loadSettings();
+    updateCheckboxStuff();
 }
 
 MinecraftPage::~MinecraftPage()
 {
-	delete ui;
+    delete ui;
 }
 
 bool MinecraftPage::apply()
 {
-	applySettings();
-	return true;
+    applySettings();
+    return true;
 }
 
 void MinecraftPage::updateCheckboxStuff()
 {
-	ui->windowWidthSpinBox->setEnabled(!ui->maximizedCheckBox->isChecked());
-	ui->windowHeightSpinBox->setEnabled(!ui->maximizedCheckBox->isChecked());
+    ui->windowWidthSpinBox->setEnabled(!ui->maximizedCheckBox->isChecked());
+    ui->windowHeightSpinBox->setEnabled(!ui->maximizedCheckBox->isChecked());
 }
 
 void MinecraftPage::on_maximizedCheckBox_clicked(bool checked)
 {
-	Q_UNUSED(checked);
-	updateCheckboxStuff();
+    Q_UNUSED(checked);
+    updateCheckboxStuff();
 }
 
 
 void MinecraftPage::applySettings()
 {
-	auto s = MMC->settings();
+    auto s = MMC->settings();
 
-	// Window Size
-	s->set("LaunchMaximized", ui->maximizedCheckBox->isChecked());
-	s->set("MinecraftWinWidth", ui->windowWidthSpinBox->value());
-	s->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
+    // Window Size
+    s->set("LaunchMaximized", ui->maximizedCheckBox->isChecked());
+    s->set("MinecraftWinWidth", ui->windowWidthSpinBox->value());
+    s->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
 }
 
 void MinecraftPage::loadSettings()
 {
-	auto s = MMC->settings();
+    auto s = MMC->settings();
 
-	// Window Size
-	ui->maximizedCheckBox->setChecked(s->get("LaunchMaximized").toBool());
-	ui->windowWidthSpinBox->setValue(s->get("MinecraftWinWidth").toInt());
-	ui->windowHeightSpinBox->setValue(s->get("MinecraftWinHeight").toInt());
+    // Window Size
+    ui->maximizedCheckBox->setChecked(s->get("LaunchMaximized").toBool());
+    ui->windowWidthSpinBox->setValue(s->get("MinecraftWinWidth").toInt());
+    ui->windowHeightSpinBox->setValue(s->get("MinecraftWinHeight").toInt());
 }
diff --git a/application/pages/global/MinecraftPage.h b/application/pages/global/MinecraftPage.h
index d1abd6fe..39265fbe 100644
--- a/application/pages/global/MinecraftPage.h
+++ b/application/pages/global/MinecraftPage.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,40 +31,40 @@ class MinecraftPage;
 
 class MinecraftPage : public QWidget, public BasePage
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit MinecraftPage(QWidget *parent = 0);
-	~MinecraftPage();
+    explicit MinecraftPage(QWidget *parent = 0);
+    ~MinecraftPage();
 
-	QString displayName() const override
-	{
-		return tr("Minecraft");
-	}
-	QIcon icon() const override
-	{
-		return MMC->getThemedIcon("minecraft");
-	}
-	QString id() const override
-	{
-		return "minecraft-settings";
-	}
-	QString helpPage() const override
-	{
-		return "Minecraft-settings";
-	}
-	bool apply() override;
+    QString displayName() const override
+    {
+        return tr("Minecraft");
+    }
+    QIcon icon() const override
+    {
+        return MMC->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();
+    void updateCheckboxStuff();
+    void applySettings();
+    void loadSettings();
 
 private
 slots:
-	void on_maximizedCheckBox_clicked(bool checked);
+    void on_maximizedCheckBox_clicked(bool checked);
 
 private:
-	Ui::MinecraftPage *ui;
+    Ui::MinecraftPage *ui;
 
 };
diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp
index 21e8123c..d10d4caa 100644
--- a/application/pages/global/MultiMCPage.cpp
+++ b/application/pages/global/MultiMCPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,208 +32,190 @@
 // FIXME: possibly move elsewhere
 enum InstSortMode
 {
-	// Sort alphabetically by name.
-	Sort_Name,
-	// Sort by which instance was launched most recently.
-	Sort_LastLaunch
+    // Sort alphabetically by name.
+    Sort_Name,
+    // Sort by which instance was launched most recently.
+    Sort_LastLaunch
 };
 
 MultiMCPage::MultiMCPage(QWidget *parent) : QWidget(parent), ui(new Ui::MultiMCPage)
 {
-	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 = MMC->translations();
-	loadSettings();
-
-	if(BuildConfig.UPDATER_ENABLED)
-	{
-		QObject::connect(MMC->updateChecker().get(), &UpdateChecker::channelListLoaded, this,
-						&MultiMCPage::refreshUpdateChannelList);
-
-		if (MMC->updateChecker()->hasChannels())
-		{
-			refreshUpdateChannelList();
-		}
-		else
-		{
-			MMC->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()));
-	connect(ui->languageBox, SIGNAL(currentIndexChanged(int)), SLOT(languageIndexChanged(int)));
+    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 = MMC->translations();
+    loadSettings();
+
+    if(BuildConfig.UPDATER_ENABLED)
+    {
+        QObject::connect(MMC->updateChecker().get(), &UpdateChecker::channelListLoaded, this,
+                        &MultiMCPage::refreshUpdateChannelList);
+
+        if (MMC->updateChecker()->hasChannels())
+        {
+            refreshUpdateChannelList();
+        }
+        else
+        {
+            MMC->updateChecker()->updateChanList(false);
+        }
+    }
+    else
+    {
+        ui->updateSettingsBox->setHidden(true);
+    }
+    connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview()));
+    connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview()));
 }
 
 MultiMCPage::~MultiMCPage()
 {
-	delete ui;
+    delete ui;
 }
 
 bool MultiMCPage::apply()
 {
-	applySettings();
-	return true;
+    applySettings();
+    return true;
 }
 
 void MultiMCPage::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);
-		}
-	}
+    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 MultiMCPage::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);
-	}
+    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 MultiMCPage::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 MultiMCPage::languageIndexChanged(int index)
-{
-	auto languageCode = ui->languageBox->itemData(ui->languageBox->currentIndex()).toString();
-	if(languageCode.isEmpty())
-	{
-		qWarning() << "Unknown language at index" << index;
-		return;
-	}
-	auto translations = MMC->translations();
-	translations->selectLanguage(languageCode);
-	translations->updateLanguage(languageCode);
+    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 MultiMCPage::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 = MMC->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);
+    // 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 = MMC->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 MultiMCPage::updateChannelSelectionChanged(int index)
 {
-	refreshUpdateChannelDesc();
+    refreshUpdateChannelDesc();
 }
 
 void MultiMCPage::refreshUpdateChannelDesc()
 {
-	// Get the channel list.
-	QList<UpdateChecker::ChannelListEntry> channelList = MMC->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;
-	}
+    // Get the channel list.
+    QList<UpdateChecker::ChannelListEntry> channelList = MMC->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 MultiMCPage::applySettings()
 {
+<<<<<<< HEAD
 	auto s = MMC->settings();
 
 	// Language
@@ -434,39 +416,232 @@ void MultiMCPage::loadSettings()
 	{
 		ui->analyticsCheck->setChecked(s->get("Analytics").toBool());
 	}	*/
+=======
+    auto s = MMC->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"))
+    {
+        MMC->setIconTheme(s->get("IconTheme").toString());
+    }
+
+    auto originalAppTheme = s->get("ApplicationTheme").toString();
+    auto newAppTheme = ui->themeComboBoxColors->currentData().toString();
+    if(originalAppTheme != newAppTheme)
+    {
+        s->set("ApplicationTheme", newAppTheme);
+        MMC->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 MultiMCPage::loadSettings()
+{
+    auto s = MMC->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 = MMC->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 = MMC->settings()->get("ConsoleFont").toString();
+    QFont consoleFont(fontFamily);
+    ui->consoleFont->setCurrentFont(consoleFont);
+
+    bool conversionOk = true;
+    int fontSize = MMC->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());
+    }
+>>>>>>> origin/stable
 }
 
 void MultiMCPage::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();
-	}
+    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/application/pages/global/MultiMCPage.h b/application/pages/global/MultiMCPage.h
index d5194c0e..27a801be 100644
--- a/application/pages/global/MultiMCPage.h
+++ b/application/pages/global/MultiMCPage.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,71 +34,69 @@ class MultiMCPage;
 
 class MultiMCPage : public QWidget, public BasePage
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit MultiMCPage(QWidget *parent = 0);
-	~MultiMCPage();
-
-	QString displayName() const override
-	{
-		return "MultiMC";
-	}
-	QIcon icon() const override
-	{
-		return MMC->getThemedIcon("multimc");
-	}
-	QString id() const override
-	{
-		return "multimc-settings";
-	}
-	QString helpPage() const override
-	{
-		return "MultiMC-settings";
-	}
-	bool apply() override;
+    explicit MultiMCPage(QWidget *parent = 0);
+    ~MultiMCPage();
+
+    QString displayName() const override
+    {
+        return "MultiMC";
+    }
+    QIcon icon() const override
+    {
+        return MMC->getThemedIcon("multimc");
+    }
+    QString id() const override
+    {
+        return "multimc-settings";
+    }
+    QString helpPage() const override
+    {
+        return "MultiMC-settings";
+    }
+    bool apply() override;
 
 private:
-	void applySettings();
-	void loadSettings();
+    void applySettings();
+    void loadSettings();
 
 private
 slots:
-	void on_instDirBrowseBtn_clicked();
-	void on_modsDirBrowseBtn_clicked();
-	void on_iconsDirBrowseBtn_clicked();
+    void on_instDirBrowseBtn_clicked();
+    void on_modsDirBrowseBtn_clicked();
+    void on_iconsDirBrowseBtn_clicked();
 
-	void languageIndexChanged(int index);
+    /*!
+     * Updates the list of update channels in the combo box.
+     */
+    void refreshUpdateChannelList();
 
-	/*!
-	 * Updates the list of update channels in the combo box.
-	 */
-	void refreshUpdateChannelList();
+    /*!
+     * Updates the channel description label.
+     */
+    void refreshUpdateChannelDesc();
 
-	/*!
-	 * Updates the channel description label.
-	 */
-	void refreshUpdateChannelDesc();
+    /*!
+     * Updates the font preview
+     */
+    void refreshFontPreview();
 
-	/*!
-	 * Updates the font preview
-	 */
-	void refreshFontPreview();
-
-	void updateChannelSelectionChanged(int index);
+    void updateChannelSelectionChanged(int index);
 
 private:
-	Ui::MultiMCPage *ui;
+    Ui::MultiMCPage *ui;
 
-	/*!
-	 * Stores the currently selected update channel.
-	 */
-	QString m_currentUpdateChannel;
+    /*!
+     * Stores the currently selected update channel.
+     */
+    QString m_currentUpdateChannel;
 
-	// default format for the font preview...
-	QTextCharFormat *defaultFormat;
+    // default format for the font preview...
+    QTextCharFormat *defaultFormat;
 
-	std::unique_ptr<LogColorCache> m_colors;
+    std::unique_ptr<LogColorCache> m_colors;
 
-	std::shared_ptr<TranslationsModel> m_languageModel;
+    std::shared_ptr<TranslationsModel> m_languageModel;
 };
diff --git a/application/pages/global/MultiMCPage.ui b/application/pages/global/MultiMCPage.ui
index 124401c3..ea034919 100644
--- a/application/pages/global/MultiMCPage.ui
+++ b/application/pages/global/MultiMCPage.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>467</width>
+    <width>514</width>
     <height>629</height>
    </rect>
   </property>
@@ -229,18 +229,6 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string>Language:</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <widget class="QComboBox" name="languageBox"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
         <widget class="QGroupBox" name="themeBox">
          <property name="title">
           <string>Theme</string>
@@ -570,7 +558,6 @@
   <tabstop>resetNotificationsBtn</tabstop>
   <tabstop>sortLastLaunchedBtn</tabstop>
   <tabstop>sortByNameBtn</tabstop>
-  <tabstop>languageBox</tabstop>
   <tabstop>themeComboBox</tabstop>
   <tabstop>themeComboBoxColors</tabstop>
   <tabstop>showConsoleCheck</tabstop>
diff --git a/application/pages/global/PackagesPage.cpp b/application/pages/global/PackagesPage.cpp
index 7cf1e3f5..1bbbed7a 100644
--- a/application/pages/global/PackagesPage.cpp
+++ b/application/pages/global/PackagesPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2015-2018 MultiMC Contributors
+/* Copyright 2015-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,192 +33,192 @@ using namespace Meta;
 
 static QString formatRequires(const VersionPtr &version)
 {
-	QStringList lines;
-	auto & reqs = version->requires();
-	auto iter = reqs.begin();
-	while (iter != reqs.end())
-	{
-		auto &uid = iter->uid;
-		auto &version = iter->equalsVersion;
-		const QString readable = ENV.metadataIndex()->hasUid(uid) ? ENV.metadataIndex()->get(uid)->humanReadable() : uid;
-		if(!version.isEmpty())
-		{
-			lines.append(QString("%1 (%2)").arg(readable, version));
-		}
-		else
-		{
-			lines.append(QString("%1").arg(readable));
-		}
-		iter++;
-	}
-	return lines.join('\n');
+    QStringList lines;
+    auto & reqs = version->requires();
+    auto iter = reqs.begin();
+    while (iter != reqs.end())
+    {
+        auto &uid = iter->uid;
+        auto &version = iter->equalsVersion;
+        const QString readable = ENV.metadataIndex()->hasUid(uid) ? ENV.metadataIndex()->get(uid)->humanReadable() : uid;
+        if(!version.isEmpty())
+        {
+            lines.append(QString("%1 (%2)").arg(readable, version));
+        }
+        else
+        {
+            lines.append(QString("%1").arg(readable));
+        }
+        iter++;
+    }
+    return lines.join('\n');
 }
 
 PackagesPage::PackagesPage(QWidget *parent) :
-	QWidget(parent),
-	ui(new Ui::PackagesPage)
+    QWidget(parent),
+    ui(new Ui::PackagesPage)
 {
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-
-	m_fileProxy = new QSortFilterProxyModel(this);
-	m_fileProxy->setSortRole(Qt::DisplayRole);
-	m_fileProxy->setSortCaseSensitivity(Qt::CaseInsensitive);
-	m_fileProxy->setFilterCaseSensitivity(Qt::CaseInsensitive);
-	m_fileProxy->setFilterRole(Qt::DisplayRole);
-	m_fileProxy->setFilterKeyColumn(0);
-	m_fileProxy->sort(0);
-	m_fileProxy->setSourceModel(ENV.metadataIndex().get());
-	ui->indexView->setModel(m_fileProxy);
-
-	m_filterProxy = new QSortFilterProxyModel(this);
-	m_filterProxy->setSortRole(VersionList::SortRole);
-	m_filterProxy->setFilterCaseSensitivity(Qt::CaseInsensitive);
-	m_filterProxy->setFilterRole(Qt::DisplayRole);
-	m_filterProxy->setFilterKeyColumn(0);
-	m_filterProxy->sort(0, Qt::DescendingOrder);
-	ui->versionsView->setModel(m_filterProxy);
-
-	m_versionProxy = new VersionProxyModel(this);
-	m_filterProxy->setSourceModel(m_versionProxy);
-
-	connect(ui->indexView->selectionModel(), &QItemSelectionModel::currentChanged, this, &PackagesPage::updateCurrentVersionList);
-	connect(ui->versionsView->selectionModel(), &QItemSelectionModel::currentChanged, this, &PackagesPage::updateVersion);
-	connect(m_filterProxy, &QSortFilterProxyModel::dataChanged, this, &PackagesPage::versionListDataChanged);
-
-	updateCurrentVersionList(QModelIndex());
-	updateVersion();
+    ui->setupUi(this);
+    ui->tabWidget->tabBar()->hide();
+
+    m_fileProxy = new QSortFilterProxyModel(this);
+    m_fileProxy->setSortRole(Qt::DisplayRole);
+    m_fileProxy->setSortCaseSensitivity(Qt::CaseInsensitive);
+    m_fileProxy->setFilterCaseSensitivity(Qt::CaseInsensitive);
+    m_fileProxy->setFilterRole(Qt::DisplayRole);
+    m_fileProxy->setFilterKeyColumn(0);
+    m_fileProxy->sort(0);
+    m_fileProxy->setSourceModel(ENV.metadataIndex().get());
+    ui->indexView->setModel(m_fileProxy);
+
+    m_filterProxy = new QSortFilterProxyModel(this);
+    m_filterProxy->setSortRole(VersionList::SortRole);
+    m_filterProxy->setFilterCaseSensitivity(Qt::CaseInsensitive);
+    m_filterProxy->setFilterRole(Qt::DisplayRole);
+    m_filterProxy->setFilterKeyColumn(0);
+    m_filterProxy->sort(0, Qt::DescendingOrder);
+    ui->versionsView->setModel(m_filterProxy);
+
+    m_versionProxy = new VersionProxyModel(this);
+    m_filterProxy->setSourceModel(m_versionProxy);
+
+    connect(ui->indexView->selectionModel(), &QItemSelectionModel::currentChanged, this, &PackagesPage::updateCurrentVersionList);
+    connect(ui->versionsView->selectionModel(), &QItemSelectionModel::currentChanged, this, &PackagesPage::updateVersion);
+    connect(m_filterProxy, &QSortFilterProxyModel::dataChanged, this, &PackagesPage::versionListDataChanged);
+
+    updateCurrentVersionList(QModelIndex());
+    updateVersion();
 }
 
 PackagesPage::~PackagesPage()
 {
-	delete ui;
+    delete ui;
 }
 
 QIcon PackagesPage::icon() const
 {
-	return MMC->getThemedIcon("packages");
+    return MMC->getThemedIcon("packages");
 }
 
 void PackagesPage::on_refreshIndexBtn_clicked()
 {
-	ENV.metadataIndex()->load(Net::Mode::Online);
+    ENV.metadataIndex()->load(Net::Mode::Online);
 }
 void PackagesPage::on_refreshFileBtn_clicked()
 {
-	VersionListPtr list = ui->indexView->currentIndex().data(Index::ListPtrRole).value<VersionListPtr>();
-	if (!list)
-	{
-		return;
-	}
-	list->load(Net::Mode::Online);
+    VersionListPtr list = ui->indexView->currentIndex().data(Index::ListPtrRole).value<VersionListPtr>();
+    if (!list)
+    {
+        return;
+    }
+    list->load(Net::Mode::Online);
 }
 void PackagesPage::on_refreshVersionBtn_clicked()
 {
-	VersionPtr version = ui->versionsView->currentIndex().data(VersionList::VersionPtrRole).value<VersionPtr>();
-	if (!version)
-	{
-		return;
-	}
-	version->load(Net::Mode::Online);
+    VersionPtr version = ui->versionsView->currentIndex().data(VersionList::VersionPtrRole).value<VersionPtr>();
+    if (!version)
+    {
+        return;
+    }
+    version->load(Net::Mode::Online);
 }
 
 void PackagesPage::on_fileSearchEdit_textChanged(const QString &search)
 {
-	if (search.isEmpty())
-	{
-		m_fileProxy->setFilterFixedString(QString());
-	}
-	else
-	{
-		QStringList parts = search.split(' ');
-		std::transform(parts.begin(), parts.end(), parts.begin(), &QRegularExpression::escape);
-		m_fileProxy->setFilterRegExp(".*" + parts.join(".*") + ".*");
-	}
+    if (search.isEmpty())
+    {
+        m_fileProxy->setFilterFixedString(QString());
+    }
+    else
+    {
+        QStringList parts = search.split(' ');
+        std::transform(parts.begin(), parts.end(), parts.begin(), &QRegularExpression::escape);
+        m_fileProxy->setFilterRegExp(".*" + parts.join(".*") + ".*");
+    }
 }
 void PackagesPage::on_versionSearchEdit_textChanged(const QString &search)
 {
-	if (search.isEmpty())
-	{
-		m_filterProxy->setFilterFixedString(QString());
-	}
-	else
-	{
-		QStringList parts = search.split(' ');
-		std::transform(parts.begin(), parts.end(), parts.begin(), &QRegularExpression::escape);
-		m_filterProxy->setFilterRegExp(".*" + parts.join(".*") + ".*");
-	}
+    if (search.isEmpty())
+    {
+        m_filterProxy->setFilterFixedString(QString());
+    }
+    else
+    {
+        QStringList parts = search.split(' ');
+        std::transform(parts.begin(), parts.end(), parts.begin(), &QRegularExpression::escape);
+        m_filterProxy->setFilterRegExp(".*" + parts.join(".*") + ".*");
+    }
 }
 
 void PackagesPage::updateCurrentVersionList(const QModelIndex &index)
 {
-	if (index.isValid())
-	{
-		VersionListPtr list = index.data(Index::ListPtrRole).value<VersionListPtr>();
-		ui->versionsBox->setEnabled(true);
-		ui->refreshFileBtn->setEnabled(true);
-		ui->fileUidLabel->setEnabled(true);
-		ui->fileUid->setText(list->uid());
-		ui->fileNameLabel->setEnabled(true);
-		ui->fileName->setText(list->name());
-		m_versionProxy->setSourceModel(list.get());
-		ui->refreshFileBtn->setText(tr("Refresh %1").arg(list->humanReadable()));
-		list->load(Net::Mode::Offline);
-	}
-	else
-	{
-		ui->versionsBox->setEnabled(false);
-		ui->refreshFileBtn->setEnabled(false);
-		ui->fileUidLabel->setEnabled(false);
-		ui->fileUid->clear();
-		ui->fileNameLabel->setEnabled(false);
-		ui->fileName->clear();
-		m_versionProxy->setSourceModel(nullptr);
-		ui->refreshFileBtn->setText(tr("Refresh"));
-	}
+    if (index.isValid())
+    {
+        VersionListPtr list = index.data(Index::ListPtrRole).value<VersionListPtr>();
+        ui->versionsBox->setEnabled(true);
+        ui->refreshFileBtn->setEnabled(true);
+        ui->fileUidLabel->setEnabled(true);
+        ui->fileUid->setText(list->uid());
+        ui->fileNameLabel->setEnabled(true);
+        ui->fileName->setText(list->name());
+        m_versionProxy->setSourceModel(list.get());
+        ui->refreshFileBtn->setText(tr("Refresh %1").arg(list->humanReadable()));
+        list->load(Net::Mode::Offline);
+    }
+    else
+    {
+        ui->versionsBox->setEnabled(false);
+        ui->refreshFileBtn->setEnabled(false);
+        ui->fileUidLabel->setEnabled(false);
+        ui->fileUid->clear();
+        ui->fileNameLabel->setEnabled(false);
+        ui->fileName->clear();
+        m_versionProxy->setSourceModel(nullptr);
+        ui->refreshFileBtn->setText(tr("Refresh"));
+    }
 }
 
 void PackagesPage::versionListDataChanged(const QModelIndex &tl, const QModelIndex &br)
 {
-	if (QItemSelection(tl, br).contains(ui->versionsView->currentIndex()))
-	{
-		updateVersion();
-	}
+    if (QItemSelection(tl, br).contains(ui->versionsView->currentIndex()))
+    {
+        updateVersion();
+    }
 }
 
 void PackagesPage::updateVersion()
 {
-	VersionPtr version = std::dynamic_pointer_cast<Version>(
-				ui->versionsView->currentIndex().data(VersionList::VersionPointerRole).value<BaseVersionPtr>());
-	if (version)
-	{
-		ui->refreshVersionBtn->setEnabled(true);
-		ui->versionVersionLabel->setEnabled(true);
-		ui->versionVersion->setText(version->version());
-		ui->versionTimeLabel->setEnabled(true);
-		ui->versionTime->setText(version->time().toString("yyyy-MM-dd HH:mm"));
-		ui->versionTypeLabel->setEnabled(true);
-		ui->versionType->setText(version->type());
-		ui->versionRequiresLabel->setEnabled(true);
-		ui->versionRequires->setText(formatRequires(version));
-		ui->refreshVersionBtn->setText(tr("Refresh %1").arg(version->version()));
-	}
-	else
-	{
-		ui->refreshVersionBtn->setEnabled(false);
-		ui->versionVersionLabel->setEnabled(false);
-		ui->versionVersion->clear();
-		ui->versionTimeLabel->setEnabled(false);
-		ui->versionTime->clear();
-		ui->versionTypeLabel->setEnabled(false);
-		ui->versionType->clear();
-		ui->versionRequiresLabel->setEnabled(false);
-		ui->versionRequires->clear();
-		ui->refreshVersionBtn->setText(tr("Refresh"));
-	}
+    VersionPtr version = std::dynamic_pointer_cast<Version>(
+                ui->versionsView->currentIndex().data(VersionList::VersionPointerRole).value<BaseVersionPtr>());
+    if (version)
+    {
+        ui->refreshVersionBtn->setEnabled(true);
+        ui->versionVersionLabel->setEnabled(true);
+        ui->versionVersion->setText(version->version());
+        ui->versionTimeLabel->setEnabled(true);
+        ui->versionTime->setText(version->time().toString("yyyy-MM-dd HH:mm"));
+        ui->versionTypeLabel->setEnabled(true);
+        ui->versionType->setText(version->type());
+        ui->versionRequiresLabel->setEnabled(true);
+        ui->versionRequires->setText(formatRequires(version));
+        ui->refreshVersionBtn->setText(tr("Refresh %1").arg(version->version()));
+    }
+    else
+    {
+        ui->refreshVersionBtn->setEnabled(false);
+        ui->versionVersionLabel->setEnabled(false);
+        ui->versionVersion->clear();
+        ui->versionTimeLabel->setEnabled(false);
+        ui->versionTime->clear();
+        ui->versionTypeLabel->setEnabled(false);
+        ui->versionType->clear();
+        ui->versionRequiresLabel->setEnabled(false);
+        ui->versionRequires->clear();
+        ui->refreshVersionBtn->setText(tr("Refresh"));
+    }
 }
 
 void PackagesPage::openedImpl()
 {
-	ENV.metadataIndex()->load(Net::Mode::Offline);
+    ENV.metadataIndex()->load(Net::Mode::Offline);
 }
diff --git a/application/pages/global/PackagesPage.h b/application/pages/global/PackagesPage.h
index ad155d9e..872961a5 100644
--- a/application/pages/global/PackagesPage.h
+++ b/application/pages/global/PackagesPage.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2018 MultiMC Contributors
+/* Copyright 2015-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,30 +28,30 @@ class VersionProxyModel;
 
 class PackagesPage : public QWidget, public BasePage
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit PackagesPage(QWidget *parent = 0);
-	~PackagesPage();
+    explicit PackagesPage(QWidget *parent = 0);
+    ~PackagesPage();
 
-	QString id() const override { return "packages-global"; }
-	QString displayName() const override { return tr("Packages"); }
-	QIcon icon() const override;
-	void openedImpl() override;
+    QString id() const override { return "packages-global"; }
+    QString displayName() const override { return tr("Packages"); }
+    QIcon icon() const override;
+    void openedImpl() override;
 
 private slots:
-	void on_refreshIndexBtn_clicked();
-	void on_refreshFileBtn_clicked();
-	void on_refreshVersionBtn_clicked();
-	void on_fileSearchEdit_textChanged(const QString &search);
-	void on_versionSearchEdit_textChanged(const QString &search);
-	void updateCurrentVersionList(const QModelIndex &index);
-	void versionListDataChanged(const QModelIndex &tl, const QModelIndex &br);
+    void on_refreshIndexBtn_clicked();
+    void on_refreshFileBtn_clicked();
+    void on_refreshVersionBtn_clicked();
+    void on_fileSearchEdit_textChanged(const QString &search);
+    void on_versionSearchEdit_textChanged(const QString &search);
+    void updateCurrentVersionList(const QModelIndex &index);
+    void versionListDataChanged(const QModelIndex &tl, const QModelIndex &br);
 
 private:
-	Ui::PackagesPage *ui;
-	QSortFilterProxyModel *m_fileProxy;
-	QSortFilterProxyModel *m_filterProxy;
-	VersionProxyModel *m_versionProxy;
+    Ui::PackagesPage *ui;
+    QSortFilterProxyModel *m_fileProxy;
+    QSortFilterProxyModel *m_filterProxy;
+    VersionProxyModel *m_versionProxy;
 
-	void updateVersion();
+    void updateVersion();
 };
diff --git a/application/pages/global/PasteEEPage.cpp b/application/pages/global/PasteEEPage.cpp
index 83dd6411..5355d63a 100644
--- a/application/pages/global/PasteEEPage.cpp
+++ b/application/pages/global/PasteEEPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QStandardPaths>
+#include <QTabBar>
 
 #include "settings/SettingsObject.h"
 #include "tools/BaseProfiler.h"
@@ -26,56 +27,56 @@
 #include <QTabBar>
 
 PasteEEPage::PasteEEPage(QWidget *parent) :
-	QWidget(parent),
-	ui(new Ui::PasteEEPage)
+    QWidget(parent),
+    ui(new Ui::PasteEEPage)
 {
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();\
-	connect(ui->customAPIkeyEdit, &QLineEdit::textEdited, this, &PasteEEPage::textEdited);
-	loadSettings();
+    ui->setupUi(this);
+    ui->tabWidget->tabBar()->hide();\
+    connect(ui->customAPIkeyEdit, &QLineEdit::textEdited, this, &PasteEEPage::textEdited);
+    loadSettings();
 }
 
 PasteEEPage::~PasteEEPage()
 {
-	delete ui;
+    delete ui;
 }
 
 void PasteEEPage::loadSettings()
 {
-	auto s = MMC->settings();
-	QString keyToUse = s->get("PasteEEAPIKey").toString();
-	if(keyToUse == "multimc")
-	{
-		ui->multimcButton->setChecked(true);
-	}
-	else
-	{
-		ui->customButton->setChecked(true);
-		ui->customAPIkeyEdit->setText(keyToUse);
-	}
+    auto s = MMC->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 = MMC->settings();
+    auto s = MMC->settings();
 
-	QString pasteKeyToUse;
-	if (ui->customButton->isChecked())
-		pasteKeyToUse = ui->customAPIkeyEdit->text();
-	else
-	{
-		pasteKeyToUse =  "multimc";
-	}
-	s->set("PasteEEAPIKey", pasteKeyToUse);
+    QString pasteKeyToUse;
+    if (ui->customButton->isChecked())
+        pasteKeyToUse = ui->customAPIkeyEdit->text();
+    else
+    {
+        pasteKeyToUse =  "multimc";
+    }
+    s->set("PasteEEAPIKey", pasteKeyToUse);
 }
 
 bool PasteEEPage::apply()
 {
-	applySettings();
-	return true;
+    applySettings();
+    return true;
 }
 
 void PasteEEPage::textEdited(const QString& text)
 {
-	ui->customButton->setChecked(true);
+    ui->customButton->setChecked(true);
 }
diff --git a/application/pages/global/PasteEEPage.h b/application/pages/global/PasteEEPage.h
index 1b152577..78cf41f4 100644
--- a/application/pages/global/PasteEEPage.h
+++ b/application/pages/global/PasteEEPage.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,37 +26,37 @@ class PasteEEPage;
 
 class PasteEEPage : public QWidget, public BasePage
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit PasteEEPage(QWidget *parent = 0);
-	~PasteEEPage();
-
-	QString displayName() const override
-	{
-		return tr("Log Upload");
-	}
-	QIcon icon() const override
-	{
-		return MMC->getThemedIcon("log");
-	}
-	QString id() const override
-	{
-		return "log-upload";
-	}
-	QString helpPage() const override
-	{
-		return "Log-Upload";
-	}
-	virtual bool apply() override;
+    explicit PasteEEPage(QWidget *parent = 0);
+    ~PasteEEPage();
+
+    QString displayName() const override
+    {
+        return tr("Log Upload");
+    }
+    QIcon icon() const override
+    {
+        return MMC->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();
+    void loadSettings();
+    void applySettings();
 
 private slots:
-	void textEdited(const QString &text);
+    void textEdited(const QString &text);
 
 private:
-	Ui::PasteEEPage *ui;
+    Ui::PasteEEPage *ui;
 };
diff --git a/application/pages/global/ProxyPage.cpp b/application/pages/global/ProxyPage.cpp
index 7dbcb860..ee56a54e 100644
--- a/application/pages/global/ProxyPage.cpp
+++ b/application/pages/global/ProxyPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,81 +16,86 @@
 #include "ProxyPage.h"
 #include "ui_ProxyPage.h"
 
+#include <QTabBar>
+
 #include "settings/SettingsObject.h"
 #include "MultiMC.h"
-#include <QTabBar>
+#include "Env.h"
 
 ProxyPage::ProxyPage(QWidget *parent) : QWidget(parent), ui(new Ui::ProxyPage)
 {
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-	loadSettings();
-	updateCheckboxStuff();
+    ui->setupUi(this);
+    ui->tabWidget->tabBar()->hide();
+    loadSettings();
+    updateCheckboxStuff();
 
-	connect(ui->proxyGroup, SIGNAL(buttonClicked(int)), SLOT(proxyChanged(int)));
+    connect(ui->proxyGroup, SIGNAL(buttonClicked(int)), SLOT(proxyChanged(int)));
 }
 
 ProxyPage::~ProxyPage()
 {
-	delete ui;
+    delete ui;
 }
 
 bool ProxyPage::apply()
 {
-	applySettings();
-	return true;
+    applySettings();
+    return true;
 }
 
 void ProxyPage::updateCheckboxStuff()
 {
-	ui->proxyAddrBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
-								 !ui->proxyDefaultBtn->isChecked());
-	ui->proxyAuthBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
-								 !ui->proxyDefaultBtn->isChecked());
+    ui->proxyAddrBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
+                                 !ui->proxyDefaultBtn->isChecked());
+    ui->proxyAuthBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
+                                 !ui->proxyDefaultBtn->isChecked());
 }
 
 void ProxyPage::proxyChanged(int)
 {
-	updateCheckboxStuff();
+    updateCheckboxStuff();
 }
 
 void ProxyPage::applySettings()
 {
-	auto s = MMC->settings();
+    auto s = MMC->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";
 
-	// 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());
 
-	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());
+    ENV.updateProxySettings(proxyType, ui->proxyAddrEdit->text(), ui->proxyPortEdit->value(),
+            ui->proxyUserEdit->text(), ui->proxyPassEdit->text());
 }
 void ProxyPage::loadSettings()
 {
-	auto s = MMC->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);
+    auto s = MMC->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<qint16>());
-	ui->proxyUserEdit->setText(s->get("ProxyUser").toString());
-	ui->proxyPassEdit->setText(s->get("ProxyPass").toString());
+    ui->proxyAddrEdit->setText(s->get("ProxyAddr").toString());
+    ui->proxyPortEdit->setValue(s->get("ProxyPort").value<qint16>());
+    ui->proxyUserEdit->setText(s->get("ProxyUser").toString());
+    ui->proxyPassEdit->setText(s->get("ProxyPass").toString());
 }
diff --git a/application/pages/global/ProxyPage.h b/application/pages/global/ProxyPage.h
index 565c2857..d87bc120 100644
--- a/application/pages/global/ProxyPage.h
+++ b/application/pages/global/ProxyPage.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,39 +28,39 @@ class ProxyPage;
 
 class ProxyPage : public QWidget, public BasePage
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit ProxyPage(QWidget *parent = 0);
-	~ProxyPage();
+    explicit ProxyPage(QWidget *parent = 0);
+    ~ProxyPage();
 
-	QString displayName() const override
-	{
-		return tr("Proxy");
-	}
-	QIcon icon() const override
-	{
-		return MMC->getThemedIcon("proxy");
-	}
-	QString id() const override
-	{
-		return "proxy-settings";
-	}
-	QString helpPage() const override
-	{
-		return "Proxy-settings";
-	}
-	bool apply() override;
+    QString displayName() const override
+    {
+        return tr("Proxy");
+    }
+    QIcon icon() const override
+    {
+        return MMC->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();
+    void updateCheckboxStuff();
+    void applySettings();
+    void loadSettings();
 
 private
 slots:
-	void proxyChanged(int);
+    void proxyChanged(int);
 
 private:
-	Ui::ProxyPage *ui;
+    Ui::ProxyPage *ui;
 };