NOISSUE move everything.

43 files changed, 0 insertions, 6482 deletions

diff --git a/gui/pages/BasePage.h b/gui/pages/BasePage.h
deleted file mode 100644
index ecf0692c..00000000
--- a/gui/pages/BasePage.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QString>
-#include <QIcon>
-#include <memory>
-
-class BasePage
-{
-public:
-	virtual ~BasePage() {}
-	virtual QString id() const = 0;
-	virtual QString displayName() const = 0;
-	virtual QIcon icon() const = 0;
-	virtual bool apply() { return true; }
-	virtual bool shouldDisplay() const { return true; }
-	virtual QString helpPage() const { return QString(); }
-	virtual void opened() {}
-	virtual void closed() {}
-	int stackIndex = -1;
-	int listIndex = -1;
-};
-
-typedef std::shared_ptr<BasePage> BasePagePtr;
diff --git a/gui/pages/BasePageProvider.h b/gui/pages/BasePageProvider.h
deleted file mode 100644
index c55683e0..00000000
--- a/gui/pages/BasePageProvider.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2013-2015 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 "BasePage.h"
-#include <memory>
-#include <functional>
-
-class BasePageProvider
-{
-public:
-	virtual QList<BasePage *> getPages() = 0;
-	virtual QString dialogTitle() = 0;
-};
-
-class GenericPageProvider : public BasePageProvider
-{
-	typedef std::function<BasePage *()> PageCreator;
-public:
-	explicit GenericPageProvider(const QString &dialogTitle)
-		: m_dialogTitle(dialogTitle)
-	{
-	}
-
-	QList<BasePage *> getPages() override
-	{
-		QList<BasePage *> pages;
-		for (PageCreator creator : m_creators)
-		{
-			pages.append(creator());
-		}
-		return pages;
-	}
-	QString dialogTitle() override { return m_dialogTitle; }
-
-	void setDialogTitle(const QString &title)
-	{
-		m_dialogTitle = title;
-	}
-	void addPageCreator(PageCreator page)
-	{
-		m_creators.append(page);
-	}
-
-	template<typename PageClass>
-	void addPage()
-	{
-		addPageCreator([](){return new PageClass();});
-	}
-
-private:
-	QList<PageCreator> m_creators;
-	QString m_dialogTitle;
-};
-
-typedef std::shared_ptr<BasePageProvider> BasePageProviderPtr;
diff --git a/gui/pages/InstanceSettingsPage.cpp b/gui/pages/InstanceSettingsPage.cpp
deleted file mode 100644
index e1a9c666..00000000
--- a/gui/pages/InstanceSettingsPage.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-#include "InstanceSettingsPage.h"
-#include "ui_InstanceSettingsPage.h"
-
-#include <QFileDialog>
-#include <QDialog>
-#include <QMessageBox>
-
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "gui/NagUtils.h"
-#include "logic/java/JavaVersionList.h"
-#include "MultiMC.h"
-
-InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
-	: QWidget(parent), ui(new Ui::InstanceSettingsPage), m_instance(inst)
-{
-	m_settings = &(inst->settings());
-	ui->setupUi(this);
-	loadSettings();
-}
-
-bool InstanceSettingsPage::shouldDisplay() const
-{
-	return !m_instance->isRunning();
-}
-
-InstanceSettingsPage::~InstanceSettingsPage()
-{
-	delete ui;
-}
-
-bool InstanceSettingsPage::apply()
-{
-	applySettings();
-	return true;
-}
-
-void InstanceSettingsPage::applySettings()
-{
-	// Console
-	bool console = ui->consoleSettingsBox->isChecked();
-	m_settings->set("OverrideConsole", console);
-	if (console)
-	{
-		m_settings->set("ShowConsole", ui->showConsoleCheck->isChecked());
-		m_settings->set("AutoCloseConsole", ui->autoCloseConsoleCheck->isChecked());
-	}
-	else
-	{
-		m_settings->reset("ShowConsole");
-		m_settings->reset("AutoCloseConsole");
-	}
-
-	// Window Size
-	bool window = ui->windowSizeGroupBox->isChecked();
-	m_settings->set("OverrideWindow", window);
-	if (window)
-	{
-		m_settings->set("LaunchMaximized", ui->maximizedCheckBox->isChecked());
-		m_settings->set("MinecraftWinWidth", ui->windowWidthSpinBox->value());
-		m_settings->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
-	}
-	else
-	{
-		m_settings->reset("LaunchMaximized");
-		m_settings->reset("MinecraftWinWidth");
-		m_settings->reset("MinecraftWinHeight");
-	}
-
-	// Memory
-	bool memory = ui->memoryGroupBox->isChecked();
-	m_settings->set("OverrideMemory", memory);
-	if (memory)
-	{
-		m_settings->set("MinMemAlloc", ui->minMemSpinBox->value());
-		m_settings->set("MaxMemAlloc", ui->maxMemSpinBox->value());
-		m_settings->set("PermGen", ui->permGenSpinBox->value());
-	}
-	else
-	{
-		m_settings->reset("MinMemAlloc");
-		m_settings->reset("MaxMemAlloc");
-		m_settings->reset("PermGen");
-	}
-
-	// Java Install Settings
-	bool javaInstall = ui->javaSettingsGroupBox->isChecked();
-	m_settings->set("OverrideJavaLocation", javaInstall);
-	if (javaInstall)
-	{
-		m_settings->set("JavaPath", ui->javaPathTextBox->text());
-	}
-	else
-	{
-		m_settings->reset("JavaPath");
-	}
-
-	// Java arguments
-	bool javaArgs = ui->javaArgumentsGroupBox->isChecked();
-	m_settings->set("OverrideJavaArgs", javaArgs);
-	if(javaArgs)
-	{
-		m_settings->set("JvmArgs", ui->jvmArgsTextBox->toPlainText().replace("\n", " "));
-		NagUtils::checkJVMArgs(m_settings->get("JvmArgs").toString(), this->parentWidget());
-	}
-	else
-	{
-		m_settings->reset("JvmArgs");
-	}
-
-	// old generic 'override both' is removed.
-	m_settings->reset("OverrideJava");
-
-	// Custom Commands
-	bool custcmd = ui->customCommandsGroupBox->isChecked();
-	m_settings->set("OverrideCommands", custcmd);
-	if (custcmd)
-	{
-		m_settings->set("PreLaunchCommand", ui->preLaunchCmdTextBox->text());
-		m_settings->set("PostExitCommand", ui->postExitCmdTextBox->text());
-	}
-	else
-	{
-		m_settings->reset("PreLaunchCommand");
-		m_settings->reset("PostExitCommand");
-	}
-}
-
-void InstanceSettingsPage::loadSettings()
-{
-	// Console
-	ui->consoleSettingsBox->setChecked(m_settings->get("OverrideConsole").toBool());
-	ui->showConsoleCheck->setChecked(m_settings->get("ShowConsole").toBool());
-	ui->autoCloseConsoleCheck->setChecked(m_settings->get("AutoCloseConsole").toBool());
-
-	// Window Size
-	ui->windowSizeGroupBox->setChecked(m_settings->get("OverrideWindow").toBool());
-	ui->maximizedCheckBox->setChecked(m_settings->get("LaunchMaximized").toBool());
-	ui->windowWidthSpinBox->setValue(m_settings->get("MinecraftWinWidth").toInt());
-	ui->windowHeightSpinBox->setValue(m_settings->get("MinecraftWinHeight").toInt());
-
-	// Memory
-	ui->memoryGroupBox->setChecked(m_settings->get("OverrideMemory").toBool());
-	ui->minMemSpinBox->setValue(m_settings->get("MinMemAlloc").toInt());
-	ui->maxMemSpinBox->setValue(m_settings->get("MaxMemAlloc").toInt());
-	ui->permGenSpinBox->setValue(m_settings->get("PermGen").toInt());
-
-	// Java Settings
-	bool overrideJava = m_settings->get("OverrideJava").toBool();
-	bool overrideLocation = m_settings->get("OverrideJavaLocation").toBool() || overrideJava;
-	bool overrideArgs = m_settings->get("OverrideJavaArgs").toBool() || overrideJava;
-
-	ui->javaSettingsGroupBox->setChecked(overrideLocation);
-	ui->javaPathTextBox->setText(m_settings->get("JavaPath").toString());
-
-	ui->javaArgumentsGroupBox->setChecked(overrideArgs);
-	ui->jvmArgsTextBox->setPlainText(m_settings->get("JvmArgs").toString());
-
-	// Custom Commands
-	ui->customCommandsGroupBox->setChecked(m_settings->get("OverrideCommands").toBool());
-	ui->preLaunchCmdTextBox->setText(m_settings->get("PreLaunchCommand").toString());
-	ui->postExitCmdTextBox->setText(m_settings->get("PostExitCommand").toString());
-}
-
-void InstanceSettingsPage::on_javaDetectBtn_clicked()
-{
-	JavaVersionPtr java;
-
-	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<JavaVersion>(vselect.selectedVersion());
-		ui->javaPathTextBox->setText(java->path);
-	}
-}
-
-void InstanceSettingsPage::on_javaBrowseBtn_clicked()
-{
-	QString dir = QFileDialog::getOpenFileName(this, tr("Find Java executable"));
-	if (!dir.isNull())
-	{
-		ui->javaPathTextBox->setText(dir);
-	}
-}
-
-void InstanceSettingsPage::on_javaTestBtn_clicked()
-{
-	checker.reset(new JavaChecker());
-	connect(checker.get(), SIGNAL(checkFinished(JavaCheckResult)), this,
-			SLOT(checkFinished(JavaCheckResult)));
-	checker->path = ui->javaPathTextBox->text();
-	checker->performCheck();
-}
-
-void InstanceSettingsPage::checkFinished(JavaCheckResult result)
-{
-	if (result.valid)
-	{
-		QString text;
-		text += "Java test succeeded!\n";
-		if (result.is_64bit)
-			text += "Using 64bit java.\n";
-		text += "\n";
-		text += "Platform reported: " + result.realPlatform;
-		QMessageBox::information(this, tr("Java test success"), text);
-	}
-	else
-	{
-		QMessageBox::warning(
-			this, tr("Java test failure"),
-			tr("The specified java binary didn't work. You should use the auto-detect feature, "
-			   "or set the path to the java executable."));
-	}
-}
diff --git a/gui/pages/InstanceSettingsPage.h b/gui/pages/InstanceSettingsPage.h
deleted file mode 100644
index 8835d02e..00000000
--- a/gui/pages/InstanceSettingsPage.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QWidget>
-
-#include "logic/net/NetJob.h"
-#include "logic/java/JavaChecker.h"
-#include "logic/BaseInstance.h"
-#include "BasePage.h"
-#include "MultiMC.h"
-
-class JavaChecker;
-namespace Ui
-{
-class InstanceSettingsPage;
-}
-
-class InstanceSettingsPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit InstanceSettingsPage(BaseInstance *inst, QWidget *parent = 0);
-	virtual ~InstanceSettingsPage();
-	virtual QString displayName() const override
-	{
-		return tr("Settings");
-	}
-	virtual QIcon icon() const override
-	{
-		return MMC->getThemedIcon("instance-settings");
-	}
-	virtual QString id() const override
-	{
-		return "settings";
-	}
-	virtual bool apply();
-	virtual QString helpPage() const override
-	{
-		return "Instance-settings";
-	}
-	virtual bool shouldDisplay() const;
-private slots:
-	void on_javaDetectBtn_clicked();
-
-	void on_javaTestBtn_clicked();
-
-	void on_javaBrowseBtn_clicked();
-
-	void checkFinished(JavaCheckResult result);
-
-	void applySettings();
-	void loadSettings();
-
-private:
-	Ui::InstanceSettingsPage *ui;
-	BaseInstance *m_instance;
-	SettingsObject *m_settings;
-	std::shared_ptr<JavaChecker> checker;
-};
diff --git a/gui/pages/InstanceSettingsPage.ui b/gui/pages/InstanceSettingsPage.ui
deleted file mode 100644
index 64109378..00000000
--- a/gui/pages/InstanceSettingsPage.ui
+++ /dev/null
@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>InstanceSettingsPage</class>
- <widget class="QWidget" name="InstanceSettingsPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>458</width>
-    <height>426</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="settingsTabs">
-     <property name="tabShape">
-      <enum>QTabWidget::Rounded</enum>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="minecraftTab">
-      <attribute name="title">
-       <string>Java</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_5">
-       <item>
-        <widget class="QGroupBox" name="javaSettingsGroupBox">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="title">
-          <string>Java installation</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="0" column="0" colspan="3">
-           <widget class="QLineEdit" name="javaPathTextBox"/>
-          </item>
-          <item row="1" column="0">
-           <widget class="QPushButton" name="javaDetectBtn">
-            <property name="text">
-             <string>Auto-detect...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="javaBrowseBtn">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="javaTestBtn">
-            <property name="text">
-             <string>Test</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="memoryGroupBox">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="title">
-          <string>Memory</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="1" column="1">
-           <widget class="QSpinBox" name="maxMemSpinBox">
-            <property name="toolTip">
-             <string>The maximum amount of memory Minecraft is allowed to use.</string>
-            </property>
-            <property name="suffix">
-             <string> MB</string>
-            </property>
-            <property name="minimum">
-             <number>512</number>
-            </property>
-            <property name="maximum">
-             <number>65536</number>
-            </property>
-            <property name="singleStep">
-             <number>128</number>
-            </property>
-            <property name="value">
-             <number>1024</number>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelMinMem">
-            <property name="text">
-             <string>Minimum memory allocation:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="labelMaxMem">
-            <property name="text">
-             <string>Maximum memory allocation:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QSpinBox" name="minMemSpinBox">
-            <property name="toolTip">
-             <string>The amount of memory Minecraft is started with.</string>
-            </property>
-            <property name="suffix">
-             <string> MB</string>
-            </property>
-            <property name="minimum">
-             <number>256</number>
-            </property>
-            <property name="maximum">
-             <number>65536</number>
-            </property>
-            <property name="singleStep">
-             <number>128</number>
-            </property>
-            <property name="value">
-             <number>256</number>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QSpinBox" name="permGenSpinBox">
-            <property name="toolTip">
-             <string>The amount of memory available to store loaded Java classes.</string>
-            </property>
-            <property name="suffix">
-             <string> MB</string>
-            </property>
-            <property name="minimum">
-             <number>64</number>
-            </property>
-            <property name="maximum">
-             <number>999999999</number>
-            </property>
-            <property name="singleStep">
-             <number>8</number>
-            </property>
-            <property name="value">
-             <number>64</number>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="labelPermGen">
-            <property name="text">
-             <string>PermGen:</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="javaArgumentsGroupBox">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="title">
-          <string>Java arguments</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_5">
-          <item row="1" column="1">
-           <widget class="QPlainTextEdit" name="jvmArgsTextBox"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacerMinecraft">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="javaTab">
-      <attribute name="title">
-       <string>Game windows</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <widget class="QGroupBox" name="windowSizeGroupBox">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="title">
-          <string>Game Window</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_4">
-          <item>
-           <widget class="QCheckBox" name="maximizedCheckBox">
-            <property name="text">
-             <string>Start Minecraft maximized?</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QGridLayout" name="gridLayoutWindowSize">
-            <item row="1" column="0">
-             <widget class="QLabel" name="labelWindowHeight">
-              <property name="text">
-               <string>Window height:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="labelWindowWidth">
-              <property name="text">
-               <string>Window width:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QSpinBox" name="windowWidthSpinBox">
-              <property name="minimum">
-               <number>1</number>
-              </property>
-              <property name="maximum">
-               <number>65536</number>
-              </property>
-              <property name="singleStep">
-               <number>1</number>
-              </property>
-              <property name="value">
-               <number>854</number>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QSpinBox" name="windowHeightSpinBox">
-              <property name="minimum">
-               <number>1</number>
-              </property>
-              <property name="maximum">
-               <number>65536</number>
-              </property>
-              <property name="value">
-               <number>480</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="consoleSettingsBox">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="title">
-          <string>Console Settings</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
-          <item>
-           <widget class="QCheckBox" name="showConsoleCheck">
-            <property name="text">
-             <string>Show console while the game is running?</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="autoCloseConsoleCheck">
-            <property name="text">
-             <string>Automatically close console when the game quits?</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacerMinecraft_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>88</width>
-           <height>125</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Custom commands</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_6">
-       <item>
-        <widget class="QGroupBox" name="customCommandsGroupBox">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="title">
-          <string>Custom Commands</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_4">
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="preLaunchCmdTextBox"/>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="labelPostExitCmd">
-            <property name="text">
-             <string>Post-exit command:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelPreLaunchCmd">
-            <property name="text">
-             <string>Pre-launch command:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="postExitCmdTextBox"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="labelCustomCmdsDescription">
-         <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pre-launch command runs before the instance launches and post-exit command runs after it exits.&lt;/p&gt;&lt;p&gt;Both will be run in MultiMC's working directory with extra environment variables:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;INST_NAME - Name of the instance&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;INST_ID - ID of the instance&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;INST_DIR - absolute path of the instance&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;INST_MC_DIR - absolute path of minecraft&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;INST_JAVA - java binary used for launch&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;INST_JAVA_ARGS - command-line parameters used for launch&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-         <property name="textInteractionFlags">
-          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacerMinecraft_3">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>88</width>
-           <height>186</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>settingsTabs</tabstop>
-  <tabstop>javaSettingsGroupBox</tabstop>
-  <tabstop>javaPathTextBox</tabstop>
-  <tabstop>javaDetectBtn</tabstop>
-  <tabstop>javaBrowseBtn</tabstop>
-  <tabstop>javaTestBtn</tabstop>
-  <tabstop>memoryGroupBox</tabstop>
-  <tabstop>minMemSpinBox</tabstop>
-  <tabstop>maxMemSpinBox</tabstop>
-  <tabstop>permGenSpinBox</tabstop>
-  <tabstop>javaArgumentsGroupBox</tabstop>
-  <tabstop>jvmArgsTextBox</tabstop>
-  <tabstop>windowSizeGroupBox</tabstop>
-  <tabstop>maximizedCheckBox</tabstop>
-  <tabstop>windowWidthSpinBox</tabstop>
-  <tabstop>windowHeightSpinBox</tabstop>
-  <tabstop>consoleSettingsBox</tabstop>
-  <tabstop>showConsoleCheck</tabstop>
-  <tabstop>autoCloseConsoleCheck</tabstop>
-  <tabstop>customCommandsGroupBox</tabstop>
-  <tabstop>preLaunchCmdTextBox</tabstop>
-  <tabstop>postExitCmdTextBox</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/LogPage.cpp b/gui/pages/LogPage.cpp
deleted file mode 100644
index 4e9e4f52..00000000
--- a/gui/pages/LogPage.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-#include "LogPage.h"
-#include "ui_LogPage.h"
-
-#include "MultiMC.h"
-
-#include <QIcon>
-#include <QScrollBar>
-#include <QShortcut>
-
-#include "logic/BaseProcess.h"
-#include "gui/GuiUtil.h"
-
-LogPage::LogPage(BaseProcess *proc, QWidget *parent)
-	: QWidget(parent), ui(new Ui::LogPage), m_process(proc)
-{
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-	connect(m_process, SIGNAL(log(QString, MessageLevel::Enum)), this,
-			SLOT(write(QString, MessageLevel::Enum)));
-
-	// create the format and set its font
-	defaultFormat = new QTextCharFormat(ui->text->currentCharFormat());
-	QString fontFamily = MMC->settings()->get("ConsoleFont").toString();
-	bool conversionOk = false;
-	int fontSize = MMC->settings()->get("ConsoleFontSize").toInt(&conversionOk);
-	if(!conversionOk)
-	{
-		fontSize = 11;
-	}
-	defaultFormat->setFont(QFont(fontFamily, fontSize));
-
-	auto findShortcut = new QShortcut(QKeySequence(QKeySequence::Find), this);
-	connect(findShortcut, SIGNAL(activated()), SLOT(findActivated()));
-	auto findNextShortcut = new QShortcut(QKeySequence(QKeySequence::FindNext), this);
-	connect(findNextShortcut, SIGNAL(activated()), SLOT(findNextActivated()));
-	connect(ui->searchBar, SIGNAL(returnPressed()), SLOT(on_findButton_clicked()));
-	auto findPreviousShortcut = new QShortcut(QKeySequence(QKeySequence::FindPrevious), this);
-	connect(findPreviousShortcut, SIGNAL(activated()), SLOT(findPreviousActivated()));
-}
-
-LogPage::~LogPage()
-{
-	delete ui;
-	delete defaultFormat;
-}
-
-bool LogPage::apply()
-{
-	return true;
-}
-
-bool LogPage::shouldDisplay() const
-{
-	return m_process->instance()->isRunning();
-}
-
-void LogPage::on_btnPaste_clicked()
-{
-	GuiUtil::uploadPaste(ui->text->toPlainText(), this);
-}
-
-void LogPage::on_btnCopy_clicked()
-{
-	GuiUtil::setClipboardText(ui->text->toPlainText());
-}
-
-void LogPage::on_btnClear_clicked()
-{
-	ui->text->clear();
-}
-
-void LogPage::on_trackLogCheckbox_clicked(bool checked)
-{
-	m_write_active = checked;
-}
-
-void LogPage::on_findButton_clicked()
-{
-	auto modifiers = QApplication::keyboardModifiers();
-	if (modifiers & Qt::ShiftModifier)
-	{
-		findPreviousActivated();
-	}
-	else
-	{
-		findNextActivated();
-	}
-}
-
-void LogPage::findActivated()
-{
-	// focus the search bar if it doesn't have focus
-	if (!ui->searchBar->hasFocus())
-	{
-		auto searchForCursor = ui->text->textCursor();
-		auto searchForString = searchForCursor.selectedText();
-		if (searchForString.size())
-		{
-			ui->searchBar->setText(searchForString);
-		}
-		ui->searchBar->setFocus();
-		ui->searchBar->selectAll();
-	}
-}
-
-void LogPage::findNextActivated()
-{
-	auto toSearch = ui->searchBar->text();
-	if (toSearch.size())
-	{
-		ui->text->find(toSearch);
-	}
-}
-
-void LogPage::findPreviousActivated()
-{
-	auto toSearch = ui->searchBar->text();
-	if (toSearch.size())
-	{
-		ui->text->find(toSearch, QTextDocument::FindBackward);
-	}
-}
-
-void LogPage::write(QString data, MessageLevel::Enum mode)
-{
-	if (!m_write_active)
-	{
-		if (mode != MessageLevel::PrePost && mode != MessageLevel::MultiMC)
-		{
-			return;
-		}
-	}
-
-	// save the cursor so it can be restored.
-	auto savedCursor = ui->text->cursor();
-
-	QScrollBar *bar = ui->text->verticalScrollBar();
-	int max_bar = bar->maximum();
-	int val_bar = bar->value();
-	if (isVisible())
-	{
-		if (m_scroll_active)
-		{
-			m_scroll_active = (max_bar - val_bar) <= 1;
-		}
-		else
-		{
-			m_scroll_active = val_bar == max_bar;
-		}
-	}
-	if (data.endsWith('\n'))
-		data = data.left(data.length() - 1);
-	QStringList paragraphs = data.split('\n');
-	QStringList filtered;
-	for (QString &paragraph : paragraphs)
-	{
-		//TODO: implement filtering here.
-		filtered.append(paragraph);
-	}
-	QListIterator<QString> iter(filtered);
-	QTextCharFormat format(*defaultFormat);
-
-	switch(mode)
-	{
-		case MessageLevel::MultiMC:
-		{
-			format.setForeground(QColor("blue"));
-			break;
-		}
-		case MessageLevel::Debug:
-		{
-			format.setForeground(QColor("green"));
-			break;
-		}
-		case MessageLevel::Warning:
-		{
-			format.setForeground(QColor("orange"));
-			break;
-		}
-		case MessageLevel::Error:
-		{
-			format.setForeground(QColor("red"));
-			break;
-		}
-		case MessageLevel::Fatal:
-		{
-			format.setForeground(QColor("red"));
-			format.setBackground(QColor("black"));
-			break;
-		}
-		case MessageLevel::PrePost:
-		{
-			format.setForeground(QColor("grey"));
-			break;
-		}
-		case MessageLevel::Info:
-		case MessageLevel::Message:
-		default:
-		{
-			// do nothing, keep original
-		}
-	}
-
-	while (iter.hasNext())
-	{
-		// append a paragraph/line
-		auto workCursor = ui->text->textCursor();
-		workCursor.movePosition(QTextCursor::End);
-		workCursor.insertText(iter.next(), format);
-		workCursor.insertBlock();
-	}
-
-	if (isVisible())
-	{
-		if (m_scroll_active)
-		{
-			bar->setValue(bar->maximum());
-		}
-		m_last_scroll_value = bar->value();
-	}
-	ui->text->setCursor(savedCursor);
-}
diff --git a/gui/pages/LogPage.h b/gui/pages/LogPage.h
deleted file mode 100644
index fea438c0..00000000
--- a/gui/pages/LogPage.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QWidget>
-
-#include "logic/BaseInstance.h"
-#include "logic/net/NetJob.h"
-#include "logic/BaseProcess.h"
-#include "BasePage.h"
-#include <MultiMC.h>
-
-namespace Ui
-{
-class LogPage;
-}
-class QTextCharFormat;
-
-class LogPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit LogPage(BaseProcess *proc, QWidget *parent = 0);
-	virtual ~LogPage();
-	virtual QString displayName() const override
-	{
-		return tr("Minecraft Log");
-	}
-	virtual QIcon icon() const override
-	{
-		return MMC->getThemedIcon("log");
-	}
-	virtual QString id() const override
-	{
-		return "console";
-	}
-	virtual bool apply();
-	virtual QString helpPage() const override
-	{
-		return "Minecraft-Logs";
-	}
-	virtual bool shouldDisplay() const;
-
-private slots:
-	/**
-	 * @brief write a string
-	 * @param data the string
-	 * @param mode the WriteMode
-	 * lines have to be put through this as a whole!
-	 */
-	void write(QString data, MessageLevel::Enum level = MessageLevel::MultiMC);
-	void on_btnPaste_clicked();
-	void on_btnCopy_clicked();
-	void on_btnClear_clicked();
-
-	void on_trackLogCheckbox_clicked(bool checked);
-
-	void on_findButton_clicked();
-	void findActivated();
-	void findNextActivated();
-	void findPreviousActivated();
-
-private:
-	Ui::LogPage *ui;
-	BaseProcess *m_process;
-	int m_last_scroll_value = 0;
-	bool m_scroll_active = true;
-	int m_saved_offset = 0;
-	bool m_write_active = true;
-
-	QTextCharFormat * defaultFormat;
-};
diff --git a/gui/pages/LogPage.ui b/gui/pages/LogPage.ui
deleted file mode 100644
index 089bc906..00000000
--- a/gui/pages/LogPage.ui
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>LogPage</class>
- <widget class="QWidget" name="LogPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>825</width>
-    <height>782</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Log</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Tab 1</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout">
-       <item row="2" column="0">
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>Search:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2">
-        <widget class="QPushButton" name="findButton">
-         <property name="text">
-          <string>Find</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0" colspan="3">
-        <widget class="QPlainTextEdit" name="text">
-         <property name="undoRedoEnabled">
-          <bool>false</bool>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-         <property name="plainText">
-          <string notr="true"/>
-         </property>
-         <property name="textInteractionFlags">
-          <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-         </property>
-         <property name="centerOnScroll">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0" colspan="3">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QCheckBox" name="trackLogCheckbox">
-           <property name="text">
-            <string>Keep updating</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnCopy">
-           <property name="toolTip">
-            <string>Copy the whole log into the clipboard</string>
-           </property>
-           <property name="text">
-            <string>&amp;Copy</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnPaste">
-           <property name="toolTip">
-            <string>Upload the log to paste.ee - it will stay online for a month</string>
-           </property>
-           <property name="text">
-            <string>Upload</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnClear">
-           <property name="toolTip">
-            <string>Clear the log</string>
-           </property>
-           <property name="text">
-            <string>Clear</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="searchBar"/>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/ModFolderPage.cpp b/gui/pages/ModFolderPage.cpp
deleted file mode 100644
index 167ba471..00000000
--- a/gui/pages/ModFolderPage.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ModFolderPage.h"
-#include "ui_ModFolderPage.h"
-
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QEvent>
-#include <QKeyEvent>
-#include <QDesktopServices>
-#include <QAbstractItemModel>
-
-#include <pathutils.h>
-
-#include "MultiMC.h"
-#include "gui/dialogs/CustomMessageBox.h"
-#include "gui/dialogs/ModEditDialogCommon.h"
-#include "logic/minecraft/ModList.h"
-#include "logic/minecraft/Mod.h"
-#include "logic/minecraft/VersionFilterData.h"
-
-ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
-							 QString iconName, QString displayName, QString helpPage,
-							 QWidget *parent)
-	: QWidget(parent), ui(new Ui::ModFolderPage)
-{
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-	m_inst = inst;
-	m_mods = mods;
-	m_id = id;
-	m_displayName = displayName;
-	m_iconName = iconName;
-	m_helpName = helpPage;
-	ui->modTreeView->setModel(m_mods.get());
-	ui->modTreeView->installEventFilter(this);
-	m_mods->startWatching();
-	auto smodel = ui->modTreeView->selectionModel();
-	connect(smodel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-			SLOT(modCurrent(QModelIndex, QModelIndex)));
-}
-
-CoreModFolderPage::CoreModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods,
-									 QString id, QString iconName, QString displayName,
-									 QString helpPage, QWidget *parent)
-	: ModFolderPage(inst, mods, id, iconName, displayName, helpPage, parent)
-{
-}
-
-ModFolderPage::~ModFolderPage()
-{
-	m_mods->stopWatching();
-	delete ui;
-}
-
-bool ModFolderPage::shouldDisplay() const
-{
-	if (m_inst)
-		return !m_inst->isRunning();
-	return true;
-}
-
-bool CoreModFolderPage::shouldDisplay() const
-{
-	if (ModFolderPage::shouldDisplay())
-	{
-		auto inst = dynamic_cast<OneSixInstance *>(m_inst);
-		if (!inst)
-			return true;
-		auto version = inst->getMinecraftProfile();
-		if (!version)
-			return true;
-		if (version->m_releaseTime < g_VersionFilterData.legacyCutoffDate)
-		{
-			return true;
-		}
-	}
-	return false;
-}
-
-bool ModFolderPage::modListFilter(QKeyEvent *keyEvent)
-{
-	switch (keyEvent->key())
-	{
-	case Qt::Key_Delete:
-		on_rmModBtn_clicked();
-		return true;
-	case Qt::Key_Plus:
-		on_addModBtn_clicked();
-		return true;
-	default:
-		break;
-	}
-	return QWidget::eventFilter(ui->modTreeView, keyEvent);
-}
-
-bool ModFolderPage::eventFilter(QObject *obj, QEvent *ev)
-{
-	if (ev->type() != QEvent::KeyPress)
-	{
-		return QWidget::eventFilter(obj, ev);
-	}
-	QKeyEvent *keyEvent = static_cast<QKeyEvent *>(ev);
-	if (obj == ui->modTreeView)
-		return modListFilter(keyEvent);
-	return QWidget::eventFilter(obj, ev);
-}
-
-void ModFolderPage::on_addModBtn_clicked()
-{
-	QStringList fileNames = QFileDialog::getOpenFileNames(
-		this, QApplication::translate("ModFolderPage", "Select Loader Mods"));
-	for (auto filename : fileNames)
-	{
-		m_mods->stopWatching();
-		m_mods->installMod(QFileInfo(filename));
-		m_mods->startWatching();
-	}
-}
-void ModFolderPage::on_rmModBtn_clicked()
-{
-	int first, last;
-	auto list = ui->modTreeView->selectionModel()->selectedRows();
-
-	if (!lastfirst(list, first, last))
-		return;
-	m_mods->stopWatching();
-	m_mods->deleteMods(first, last);
-	m_mods->startWatching();
-}
-
-void ModFolderPage::on_viewModBtn_clicked()
-{
-	openDirInDefaultProgram(m_mods->dir().absolutePath(), true);
-}
-
-void ModFolderPage::modCurrent(const QModelIndex &current, const QModelIndex &previous)
-{
-	if (!current.isValid())
-	{
-		ui->frame->clear();
-		return;
-	}
-	int row = current.row();
-	Mod &m = m_mods->operator[](row);
-	ui->frame->updateWithMod(m);
-}
diff --git a/gui/pages/ModFolderPage.h b/gui/pages/ModFolderPage.h
deleted file mode 100644
index bd5156d4..00000000
--- a/gui/pages/ModFolderPage.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QWidget>
-
-#include "logic/minecraft/OneSixInstance.h"
-#include "logic/net/NetJob.h"
-#include "BasePage.h"
-#include <MultiMC.h>
-
-class ModList;
-namespace Ui
-{
-class ModFolderPage;
-}
-
-class ModFolderPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
-						   QString iconName, QString displayName, QString helpPage = "",
-						   QWidget *parent = 0);
-	virtual ~ModFolderPage();
-	virtual QString displayName() const override
-	{
-		return m_displayName;
-	}
-	virtual QIcon icon() const override
-	{
-		return MMC->getThemedIcon(m_iconName);
-	}
-	virtual QString id() const override
-	{
-		return m_id;
-	}
-	virtual QString helpPage() const override
-	{
-		return m_helpName;
-	}
-	virtual bool shouldDisplay() const;
-
-protected:
-	bool eventFilter(QObject *obj, QEvent *ev);
-	bool modListFilter(QKeyEvent *ev);
-
-protected:
-	BaseInstance *m_inst;
-
-private:
-	Ui::ModFolderPage *ui;
-	std::shared_ptr<ModList> m_mods;
-	QString m_iconName;
-	QString m_id;
-	QString m_displayName;
-	QString m_helpName;
-
-public
-slots:
-	void modCurrent(const QModelIndex &current, const QModelIndex &previous);
-
-private
-slots:
-	void on_addModBtn_clicked();
-	void on_rmModBtn_clicked();
-	void on_viewModBtn_clicked();
-};
-
-class CoreModFolderPage : public ModFolderPage
-{
-public:
-	explicit CoreModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
-							   QString iconName, QString displayName, QString helpPage = "",
-							   QWidget *parent = 0);
-	virtual ~CoreModFolderPage()
-	{
-	}
-	virtual bool shouldDisplay() const;
-};
diff --git a/gui/pages/ModFolderPage.ui b/gui/pages/ModFolderPage.ui
deleted file mode 100644
index 019b8faf..00000000
--- a/gui/pages/ModFolderPage.ui
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ModFolderPage</class>
- <widget class="QWidget" name="ModFolderPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>723</width>
-    <height>532</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Mods</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Tab 1</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout">
-       <item row="0" column="0">
-        <widget class="ModListView" name="modTreeView">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="acceptDrops">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DropOnly</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <item>
-          <widget class="QPushButton" name="addModBtn">
-           <property name="text">
-            <string>&amp;Add</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="rmModBtn">
-           <property name="text">
-            <string>&amp;Remove</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="viewModBtn">
-           <property name="text">
-            <string>&amp;View Folder</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="0" colspan="2">
-        <widget class="MCModInfoFrame" name="frame">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ModListView</class>
-   <extends>QTreeView</extends>
-   <header>gui/widgets/ModListView.h</header>
-  </customwidget>
-  <customwidget>
-   <class>MCModInfoFrame</class>
-   <extends>QFrame</extends>
-   <header>gui/widgets/MCModInfoFrame.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/NotesPage.cpp b/gui/pages/NotesPage.cpp
deleted file mode 100644
index 48bb468c..00000000
--- a/gui/pages/NotesPage.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "NotesPage.h"
-#include "ui_NotesPage.h"
-
-NotesPage::NotesPage(BaseInstance *inst, QWidget *parent)
-	: QWidget(parent), ui(new Ui::NotesPage), m_inst(inst)
-{
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-	ui->noteEditor->setText(m_inst->notes());
-}
-
-NotesPage::~NotesPage()
-{
-	delete ui;
-}
-
-bool NotesPage::apply()
-{
-	m_inst->setNotes(ui->noteEditor->toPlainText());
-	return true;
-}
diff --git a/gui/pages/NotesPage.h b/gui/pages/NotesPage.h
deleted file mode 100644
index 6dcdce32..00000000
--- a/gui/pages/NotesPage.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QWidget>
-
-#include "logic/BaseInstance.h"
-#include "logic/net/NetJob.h"
-#include "BasePage.h"
-#include <MultiMC.h>
-
-namespace Ui
-{
-class NotesPage;
-}
-
-class NotesPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit NotesPage(BaseInstance *inst, QWidget *parent = 0);
-	virtual ~NotesPage();
-	virtual QString displayName() const override
-	{
-		return tr("Notes");
-	}
-	virtual QIcon icon() const override
-	{
-		auto icon = MMC->getThemedIcon("notes");
-		if(icon.isNull())
-			icon = MMC->getThemedIcon("news");
-		return icon;
-	}
-	virtual QString id() const override
-	{
-		return "notes";
-	}
-	virtual bool apply();
-	virtual QString helpPage() const override
-	{
-		return "Notes";
-	}
-
-private:
-	Ui::NotesPage *ui;
-	BaseInstance *m_inst;
-};
diff --git a/gui/pages/NotesPage.ui b/gui/pages/NotesPage.ui
deleted file mode 100644
index 8da01c8b..00000000
--- a/gui/pages/NotesPage.ui
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>NotesPage</class>
- <widget class="QWidget" name="NotesPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>731</width>
-    <height>538</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Tab 1</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QTextEdit" name="noteEditor">
-         <property name="verticalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-         <property name="acceptRichText">
-          <bool>false</bool>
-         </property>
-         <property name="textInteractionFlags">
-          <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/OtherLogsPage.cpp b/gui/pages/OtherLogsPage.cpp
deleted file mode 100644
index c9b0aa51..00000000
--- a/gui/pages/OtherLogsPage.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "OtherLogsPage.h"
-#include "ui_OtherLogsPage.h"
-
-#include <QFileDialog>
-#include <QMessageBox>
-
-#include "gui/GuiUtil.h"
-#include "logic/RecursiveFileSystemWatcher.h"
-#include <pathutils.h>
-
-OtherLogsPage::OtherLogsPage(QString path, QWidget *parent)
-	: QWidget(parent), ui(new Ui::OtherLogsPage), m_path(path),
-	  m_watcher(new RecursiveFileSystemWatcher(this))
-{
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-
-	m_watcher->setFileExpression("(.*\\.log(\\.[0-9]*)?$)|(crash-.*\\.txt)");
-	m_watcher->setRootDir(QDir::current().absoluteFilePath(m_path));
-
-	connect(m_watcher, &RecursiveFileSystemWatcher::filesChanged, this,
-			&OtherLogsPage::populateSelectLogBox);
-	populateSelectLogBox();
-}
-
-OtherLogsPage::~OtherLogsPage()
-{
-	delete ui;
-}
-
-void OtherLogsPage::opened()
-{
-	m_watcher->enable();
-}
-void OtherLogsPage::closed()
-{
-	m_watcher->disable();
-}
-
-void OtherLogsPage::populateSelectLogBox()
-{
-	ui->selectLogBox->clear();
-	ui->selectLogBox->addItems(m_watcher->files());
-	if (m_currentFile.isNull())
-	{
-		ui->selectLogBox->setCurrentIndex(-1);
-	}
-	else
-	{
-		const int index = ui->selectLogBox->findText(m_currentFile);
-		if (index != -1)
-			ui->selectLogBox->setCurrentIndex(index);
-	}
-}
-
-void OtherLogsPage::on_selectLogBox_currentIndexChanged(const int index)
-{
-	QString file;
-	if (index != -1)
-	{
-		file = ui->selectLogBox->itemText(index);
-	}
-
-	if (file.isEmpty() || !QFile::exists(PathCombine(m_path, file)))
-	{
-		m_currentFile = QString();
-		ui->text->clear();
-		setControlsEnabled(false);
-	}
-	else
-	{
-		m_currentFile = file;
-		on_btnReload_clicked();
-		setControlsEnabled(true);
-	}
-}
-
-void OtherLogsPage::on_btnReload_clicked()
-{
-	QFile file(PathCombine(m_path, m_currentFile));
-	if (!file.open(QFile::ReadOnly))
-	{
-		setControlsEnabled(false);
-		ui->btnReload->setEnabled(true); // allow reload
-		m_currentFile = QString();
-		QMessageBox::critical(this, tr("Error"), tr("Unable to open %1 for reading: %2")
-													 .arg(m_currentFile, file.errorString()));
-	}
-	else
-	{
-		if (file.size() < 10000000ll)
-		{
-			ui->text->setPlainText(QString::fromUtf8(file.readAll()));
-		}
-		else
-		{
-			ui->text->setPlainText(
-				tr("The file (%1) is too big. You may want to open it in a viewer optimized "
-				   "for large files.").arg(file.fileName()));
-		}
-	}
-}
-
-void OtherLogsPage::on_btnPaste_clicked()
-{
-	GuiUtil::uploadPaste(ui->text->toPlainText(), this);
-}
-void OtherLogsPage::on_btnCopy_clicked()
-{
-	GuiUtil::setClipboardText(ui->text->toPlainText());
-}
-void OtherLogsPage::on_btnDelete_clicked()
-{
-	if (QMessageBox::question(this, tr("Delete"),
-							  tr("Do you really want to delete %1?").arg(m_currentFile),
-							  QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
-	{
-		return;
-	}
-	QFile file(PathCombine(m_path, m_currentFile));
-	if (!file.remove())
-	{
-		QMessageBox::critical(this, tr("Error"), tr("Unable to delete %1: %2")
-													 .arg(m_currentFile, file.errorString()));
-	}
-}
-
-void OtherLogsPage::setControlsEnabled(const bool enabled)
-{
-	ui->btnReload->setEnabled(enabled);
-	ui->btnDelete->setEnabled(enabled);
-	ui->btnCopy->setEnabled(enabled);
-	ui->btnPaste->setEnabled(enabled);
-	ui->text->setEnabled(enabled);
-}
diff --git a/gui/pages/OtherLogsPage.h b/gui/pages/OtherLogsPage.h
deleted file mode 100644
index d6e4ec9f..00000000
--- a/gui/pages/OtherLogsPage.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QWidget>
-
-#include "BasePage.h"
-#include <MultiMC.h>
-
-namespace Ui
-{
-class OtherLogsPage;
-}
-
-class RecursiveFileSystemWatcher;
-
-class OtherLogsPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit OtherLogsPage(QString path, QWidget *parent = 0);
-	~OtherLogsPage();
-
-	QString id() const override
-	{
-		return "logs";
-	}
-	QString displayName() const override
-	{
-		return tr("Other logs");
-	}
-	QIcon icon() const override
-	{
-		return MMC->getThemedIcon("log");
-	}
-	QString helpPage() const override
-	{
-		return "Minecraft-Logs";
-	}
-	void opened() override;
-	void closed() override;
-
-private slots:
-	void populateSelectLogBox();
-	void on_selectLogBox_currentIndexChanged(const int index);
-	void on_btnReload_clicked();
-	void on_btnPaste_clicked();
-	void on_btnCopy_clicked();
-	void on_btnDelete_clicked();
-
-private:
-	Ui::OtherLogsPage *ui;
-	QString m_path;
-	RecursiveFileSystemWatcher *m_watcher;
-	QString m_currentFile;
-
-	void setControlsEnabled(const bool enabled);
-};
diff --git a/gui/pages/OtherLogsPage.ui b/gui/pages/OtherLogsPage.ui
deleted file mode 100644
index 08200684..00000000
--- a/gui/pages/OtherLogsPage.ui
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>OtherLogsPage</class>
- <widget class="QWidget" name="OtherLogsPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>657</width>
-    <height>538</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Tab 1</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QComboBox" name="selectLogBox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnReload">
-           <property name="text">
-            <string>Reload</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnCopy">
-           <property name="toolTip">
-            <string>Copy the whole log into the clipboard</string>
-           </property>
-           <property name="text">
-            <string>&amp;Copy</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnPaste">
-           <property name="toolTip">
-            <string>Upload the log to paste.ee - it will stay online for a month</string>
-           </property>
-           <property name="text">
-            <string>Upload</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnDelete">
-           <property name="toolTip">
-            <string>Clear the log</string>
-           </property>
-           <property name="text">
-            <string>Delete</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QPlainTextEdit" name="text">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="verticalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-         <property name="textInteractionFlags">
-          <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>text</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/ResourcePackPage.h b/gui/pages/ResourcePackPage.h
deleted file mode 100644
index d79590df..00000000
--- a/gui/pages/ResourcePackPage.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-#include "ModFolderPage.h"
-
-class ResourcePackPage : public ModFolderPage
-{
-public:
-	explicit ResourcePackPage(MinecraftInstance *instance, QWidget *parent = 0)
-		: ModFolderPage(instance, instance->resourcePackList(), "resourcepacks",
-						"resourcepacks", tr("Resource packs"), "Resource-packs", parent)
-	{
-	}
-
-	virtual ~ResourcePackPage() {}
-	virtual bool shouldDisplay() const override
-	{
-		return !m_inst->traits().contains("no-texturepacks") &&
-			   !m_inst->traits().contains("texturepacks");
-	}
-};
diff --git a/gui/pages/ScreenshotsPage.cpp b/gui/pages/ScreenshotsPage.cpp
deleted file mode 100644
index 219a47ae..00000000
--- a/gui/pages/ScreenshotsPage.cpp
+++ /dev/null
@@ -1,362 +0,0 @@
-#include "ScreenshotsPage.h"
-#include "ui_ScreenshotsPage.h"
-
-#include <QModelIndex>
-#include <QMutableListIterator>
-#include <QMap>
-#include <QSet>
-#include <QFileIconProvider>
-#include <QFileSystemModel>
-#include <QStyledItemDelegate>
-#include <QLineEdit>
-#include <QEvent>
-#include <QPainter>
-#include <QClipboard>
-#include <QDesktopServices>
-#include <QKeyEvent>
-
-#include <pathutils.h>
-#include <MultiMC.h>
-
-#include "gui/dialogs/ProgressDialog.h"
-#include "gui/dialogs/CustomMessageBox.h"
-#include "logic/net/NetJob.h"
-#include "logic/screenshots/ImgurUpload.h"
-#include "logic/screenshots/ImgurAlbumCreation.h"
-#include "logic/tasks/SequentialTask.h"
-
-#include "logic/RWStorage.h"
-
-typedef RWStorage<QString, QIcon> SharedIconCache;
-typedef std::shared_ptr<SharedIconCache> SharedIconCachePtr;
-
-class ThumbnailingResult : public QObject
-{
-	Q_OBJECT
-public slots:
-	inline void emitResultsReady(const QString &path) { emit resultsReady(path); }
-	inline void emitResultsFailed(const QString &path) { emit resultsFailed(path); }
-signals:
-	void resultsReady(const QString &path);
-	void resultsFailed(const QString &path);
-};
-
-class ThumbnailRunnable : public QRunnable
-{
-public:
-	ThumbnailRunnable(QString path, SharedIconCachePtr cache)
-	{
-		m_path = path;
-		m_cache = cache;
-	}
-	void run()
-	{
-		QFileInfo info(m_path);
-		if (info.isDir())
-			return;
-		if ((info.suffix().compare("png", Qt::CaseInsensitive) != 0))
-			return;
-		int tries = 5;
-		while (tries)
-		{
-			if (!m_cache->stale(m_path))
-				return;
-			QImage image(m_path);
-			if (image.isNull())
-			{
-				QThread::msleep(500);
-				tries--;
-				continue;
-			}
-			QImage small;
-			if (image.width() > image.height())
-				small = image.scaledToWidth(512).scaledToWidth(256, Qt::SmoothTransformation);
-			else
-				small = image.scaledToHeight(512).scaledToHeight(256, Qt::SmoothTransformation);
-			auto smallSize = small.size();
-			QPoint offset((256 - small.width()) / 2, (256 - small.height()) / 2);
-			QImage square(QSize(256, 256), QImage::Format_ARGB32);
-			square.fill(Qt::transparent);
-
-			QPainter painter(&square);
-			painter.drawImage(offset, small);
-			painter.end();
-
-			QIcon icon(QPixmap::fromImage(square));
-			m_cache->add(m_path, icon);
-			m_resultEmitter.emitResultsReady(m_path);
-			return;
-		}
-		m_resultEmitter.emitResultsFailed(m_path);
-	}
-	QString m_path;
-	SharedIconCachePtr m_cache;
-	ThumbnailingResult m_resultEmitter;
-};
-
-// this is about as elegant and well written as a bag of bricks with scribbles done by insane
-// asylum patients.
-class FilterModel : public QIdentityProxyModel
-{
-	Q_OBJECT
-public:
-	explicit FilterModel(QObject *parent = 0) : QIdentityProxyModel(parent)
-	{
-		m_thumbnailingPool.setMaxThreadCount(4);
-		m_thumbnailCache = std::make_shared<SharedIconCache>();
-		m_thumbnailCache->add("placeholder", MMC->getThemedIcon("screenshot-placeholder"));
-		connect(&watcher, SIGNAL(fileChanged(QString)), SLOT(fileChanged(QString)));
-		// FIXME: the watched file set is not updated when files are removed
-	}
-	virtual ~FilterModel() { m_thumbnailingPool.waitForDone(500); }
-	virtual QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const
-	{
-		auto model = sourceModel();
-		if (!model)
-			return QVariant();
-		if (role == Qt::DisplayRole || role == Qt::EditRole)
-		{
-			QVariant result = sourceModel()->data(mapToSource(proxyIndex), role);
-			return result.toString().remove(QRegExp("\\.png$"));
-		}
-		if (role == Qt::DecorationRole)
-		{
-			QVariant result =
-				sourceModel()->data(mapToSource(proxyIndex), QFileSystemModel::FilePathRole);
-			QString filePath = result.toString();
-			QIcon temp;
-			if (!watched.contains(filePath))
-			{
-				((QFileSystemWatcher &)watcher).addPath(filePath);
-				((QSet<QString> &)watched).insert(filePath);
-			}
-			if (m_thumbnailCache->get(filePath, temp))
-			{
-				return temp;
-			}
-			if (!m_failed.contains(filePath))
-			{
-				((FilterModel *)this)->thumbnailImage(filePath);
-			}
-			return (m_thumbnailCache->get("placeholder"));
-		}
-		return sourceModel()->data(mapToSource(proxyIndex), role);
-	}
-	virtual bool setData(const QModelIndex &index, const QVariant &value,
-						 int role = Qt::EditRole)
-	{
-		auto model = sourceModel();
-		if (!model)
-			return false;
-		if (role != Qt::EditRole)
-			return false;
-		// FIXME: this is a workaround for a bug in QFileSystemModel, where it doesn't
-		// sort after renames
-		{
-			((QFileSystemModel *)model)->setNameFilterDisables(true);
-			((QFileSystemModel *)model)->setNameFilterDisables(false);
-		}
-		return model->setData(mapToSource(index), value.toString() + ".png", role);
-	}
-
-private:
-	void thumbnailImage(QString path)
-	{
-		auto runnable = new ThumbnailRunnable(path, m_thumbnailCache);
-		connect(&(runnable->m_resultEmitter), SIGNAL(resultsReady(QString)),
-				SLOT(thumbnailReady(QString)));
-		connect(&(runnable->m_resultEmitter), SIGNAL(resultsFailed(QString)),
-				SLOT(thumbnailFailed(QString)));
-		((QThreadPool &)m_thumbnailingPool).start(runnable);
-	}
-private slots:
-	void thumbnailReady(QString path) { emit layoutChanged(); }
-	void thumbnailFailed(QString path) { m_failed.insert(path); }
-	void fileChanged(QString filepath)
-	{
-		m_thumbnailCache->setStale(filepath);
-		thumbnailImage(filepath);
-		// reinsert the path...
-		watcher.removePath(filepath);
-		watcher.addPath(filepath);
-	}
-
-private:
-	SharedIconCachePtr m_thumbnailCache;
-	QThreadPool m_thumbnailingPool;
-	QSet<QString> m_failed;
-	QSet<QString> watched;
-	QFileSystemWatcher watcher;
-};
-
-class CenteredEditingDelegate : public QStyledItemDelegate
-{
-public:
-	explicit CenteredEditingDelegate(QObject *parent = 0) : QStyledItemDelegate(parent) {}
-	virtual ~CenteredEditingDelegate() {}
-	virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
-								  const QModelIndex &index) const
-	{
-		auto widget = QStyledItemDelegate::createEditor(parent, option, index);
-		auto foo = dynamic_cast<QLineEdit *>(widget);
-		if (foo)
-		{
-			foo->setAlignment(Qt::AlignHCenter);
-			foo->setFrame(true);
-			foo->setMaximumWidth(192);
-		}
-		return widget;
-	}
-};
-
-ScreenshotsPage::ScreenshotsPage(QString path, QWidget *parent)
-	: QWidget(parent), ui(new Ui::ScreenshotsPage)
-{
-	m_model.reset(new QFileSystemModel());
-	m_filterModel.reset(new FilterModel());
-	m_filterModel->setSourceModel(m_model.get());
-	m_model->setFilter(QDir::Files | QDir::Writable | QDir::Readable);
-	m_model->setReadOnly(false);
-	m_model->setNameFilters({"*.png"});
-	m_model->setNameFilterDisables(false);
-	m_folder = path;
-	m_valid = ensureFolderPathExists(m_folder);
-
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-	ui->listView->setModel(m_filterModel.get());
-	ui->listView->setIconSize(QSize(128, 128));
-	ui->listView->setGridSize(QSize(192, 160));
-	ui->listView->setSpacing(9);
-	// ui->listView->setUniformItemSizes(true);
-	ui->listView->setLayoutMode(QListView::Batched);
-	ui->listView->setViewMode(QListView::IconMode);
-	ui->listView->setResizeMode(QListView::Adjust);
-	ui->listView->installEventFilter(this);
-	ui->listView->setEditTriggers(0);
-	ui->listView->setItemDelegate(new CenteredEditingDelegate(this));
-	connect(ui->listView, SIGNAL(activated(QModelIndex)), SLOT(onItemActivated(QModelIndex)));
-}
-
-bool ScreenshotsPage::eventFilter(QObject *obj, QEvent *evt)
-{
-	if (obj != ui->listView)
-		return QWidget::eventFilter(obj, evt);
-	if (evt->type() != QEvent::KeyPress)
-	{
-		return QWidget::eventFilter(obj, evt);
-	}
-	QKeyEvent *keyEvent = static_cast<QKeyEvent *>(evt);
-	switch (keyEvent->key())
-	{
-	case Qt::Key_Delete:
-		on_deleteBtn_clicked();
-		return true;
-	case Qt::Key_F2:
-		on_renameBtn_clicked();
-		return true;
-	default:
-		break;
-	}
-	return QWidget::eventFilter(obj, evt);
-}
-
-ScreenshotsPage::~ScreenshotsPage()
-{
-	delete ui;
-}
-
-void ScreenshotsPage::onItemActivated(QModelIndex index)
-{
-	if (!index.isValid())
-		return;
-	auto info = m_model->fileInfo(index);
-	QString fileName = info.absoluteFilePath();
-	openFileInDefaultProgram(info.absoluteFilePath());
-}
-
-void ScreenshotsPage::on_viewFolderBtn_clicked()
-{
-	openDirInDefaultProgram(m_folder, true);
-}
-
-void ScreenshotsPage::on_uploadBtn_clicked()
-{
-	auto selection = ui->listView->selectionModel()->selectedIndexes();
-	if (selection.isEmpty())
-		return;
-
-	QList<ScreenshotPtr> uploaded;
-	auto job = std::make_shared<NetJob>("Screenshot Upload");
-	for (auto item : selection)
-	{
-		auto info = m_model->fileInfo(item);
-		auto screenshot = std::make_shared<ScreenShot>(info);
-		uploaded.push_back(screenshot);
-		job->addNetAction(ImgurUpload::make(screenshot));
-	}
-	SequentialTask task;
-	auto albumTask = std::make_shared<NetJob>("Imgur Album Creation");
-	auto imgurAlbum = ImgurAlbumCreation::make(uploaded);
-	albumTask->addNetAction(imgurAlbum);
-	task.addTask(job);
-	task.addTask(albumTask);
-	ProgressDialog prog(this);
-	if (prog.exec(&task) != QDialog::Accepted)
-	{
-		CustomMessageBox::selectable(this, tr("Failed to upload screenshots!"),
-									 tr("Unknown error"), QMessageBox::Warning)->exec();
-	}
-	else
-	{
-		auto link = QString("https://imgur.com/a/%1").arg(imgurAlbum->id());
-		QClipboard *clipboard = QApplication::clipboard();
-		clipboard->setText(link);
-		QDesktopServices::openUrl(link);
-		CustomMessageBox::selectable(
-			this, tr("Upload finished"),
-			tr("The <a href=\"%1\">link  to the uploaded album</a> has been opened in the "
-			   "default browser and placed in your clipboard.<br/>Delete hash: %2 (save "
-			   "this if you want to be able to edit/delete the album)")
-				.arg(link, imgurAlbum->deleteHash()),
-			QMessageBox::Information)->exec();
-	}
-}
-
-void ScreenshotsPage::on_deleteBtn_clicked()
-{
-	auto mbox = CustomMessageBox::selectable(
-		this, tr("Are you sure?"), tr("This will delete all selected screenshots."),
-		QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No);
-	std::unique_ptr<QMessageBox> box(mbox);
-
-	if (box->exec() != QMessageBox::Yes)
-		return;
-
-	auto selected = ui->listView->selectionModel()->selectedIndexes();
-	for (auto item : selected)
-	{
-		m_model->remove(item);
-	}
-}
-
-void ScreenshotsPage::on_renameBtn_clicked()
-{
-	auto selection = ui->listView->selectionModel()->selectedIndexes();
-	if (selection.isEmpty())
-		return;
-	ui->listView->edit(selection[0]);
-	// TODO: mass renaming
-}
-
-void ScreenshotsPage::opened()
-{
-	if (m_valid)
-	{
-		QString path = QDir(m_folder).absolutePath();
-		m_model->setRootPath(path);
-		ui->listView->setRootIndex(m_filterModel->mapFromSource(m_model->index(path)));
-	}
-}
-
-#include "ScreenshotsPage.moc"
diff --git a/gui/pages/ScreenshotsPage.h b/gui/pages/ScreenshotsPage.h
deleted file mode 100644
index f5700ba8..00000000
--- a/gui/pages/ScreenshotsPage.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QWidget>
-
-#include "BasePage.h"
-#include <MultiMC.h>
-
-class QFileSystemModel;
-class QIdentityProxyModel;
-namespace Ui
-{
-class ScreenshotsPage;
-}
-
-struct ScreenShot;
-class ScreenshotList;
-class ImgurAlbumCreation;
-
-class ScreenshotsPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit ScreenshotsPage(QString path, QWidget *parent = 0);
-	virtual ~ScreenshotsPage();
-
-	virtual void opened() override;
-
-	enum
-	{
-		NothingDone = 0x42
-	};
-
-	virtual bool eventFilter(QObject *, QEvent *);
-	virtual QString displayName() const override
-	{
-		return tr("Screenshots");
-	}
-	virtual QIcon icon() const override
-	{
-		return MMC->getThemedIcon("screenshots");
-	}
-	virtual QString id() const override
-	{
-		return "screenshots";
-	}
-	virtual QString helpPage() const override
-	{
-		return "Screenshots-management";
-	}
-private slots:
-	void on_uploadBtn_clicked();
-	void on_deleteBtn_clicked();
-	void on_renameBtn_clicked();
-	void on_viewFolderBtn_clicked();
-	void onItemActivated(QModelIndex);
-
-private:
-	Ui::ScreenshotsPage *ui;
-	std::shared_ptr<QFileSystemModel> m_model;
-	std::shared_ptr<QIdentityProxyModel> m_filterModel;
-	QString m_folder;
-	bool m_valid = false;
-};
diff --git a/gui/pages/ScreenshotsPage.ui b/gui/pages/ScreenshotsPage.ui
deleted file mode 100644
index 30b55092..00000000
--- a/gui/pages/ScreenshotsPage.ui
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ScreenshotsPage</class>
- <widget class="QWidget" name="ScreenshotsPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>723</width>
-    <height>532</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Mods</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Tab 1</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QListView" name="listView">
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-         <property name="selectionBehavior">
-          <enum>QAbstractItemView::SelectItems</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <item>
-          <widget class="QPushButton" name="uploadBtn">
-           <property name="text">
-            <string>&amp;Upload</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="deleteBtn">
-           <property name="text">
-            <string>&amp;Delete</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="renameBtn">
-           <property name="text">
-            <string>&amp;Rename</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="viewFolderBtn">
-           <property name="text">
-            <string>&amp;View Folder</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>listView</tabstop>
-  <tabstop>uploadBtn</tabstop>
-  <tabstop>deleteBtn</tabstop>
-  <tabstop>renameBtn</tabstop>
-  <tabstop>viewFolderBtn</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/TexturePackPage.h b/gui/pages/TexturePackPage.h
deleted file mode 100644
index 3c5c27d7..00000000
--- a/gui/pages/TexturePackPage.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-#include "ModFolderPage.h"
-
-class TexturePackPage : public ModFolderPage
-{
-public:
-	explicit TexturePackPage(MinecraftInstance *instance, QWidget *parent = 0)
-		: ModFolderPage(instance, instance->texturePackList(), "texturepacks", "resourcepacks",
-						tr("Texture packs"), "Texture-packs", parent)
-	{
-	}
-	virtual ~TexturePackPage() {}
-	virtual bool shouldDisplay() const override
-	{
-		return m_inst->traits().contains("texturepacks");
-	}
-};
diff --git a/gui/pages/VersionPage.cpp b/gui/pages/VersionPage.cpp
deleted file mode 100644
index 712b496f..00000000
--- a/gui/pages/VersionPage.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MultiMC.h"
-
-#include <pathutils.h>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QEvent>
-#include <QKeyEvent>
-
-#include "VersionPage.h"
-#include "ui_VersionPage.h"
-
-#include "gui/Platform.h"
-#include "gui/dialogs/CustomMessageBox.h"
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "gui/dialogs/ModEditDialogCommon.h"
-
-#include "gui/dialogs/ProgressDialog.h"
-
-#include <QAbstractItemModel>
-#include <QMessageBox>
-#include <QListView>
-#include <QString>
-#include <QUrl>
-
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/forge/ForgeVersionList.h"
-#include "logic/forge/ForgeInstaller.h"
-#include "logic/liteloader/LiteLoaderVersionList.h"
-#include "logic/liteloader/LiteLoaderInstaller.h"
-#include "logic/minecraft/VersionBuilder.h"
-#include "logic/auth/MojangAccountList.h"
-#include "logic/minecraft/Mod.h"
-#include "logic/icons/IconList.h"
-
-
-QIcon VersionPage::icon() const
-{
-	return ENV.icons()->getIcon(m_inst->iconKey());
-}
-bool VersionPage::shouldDisplay() const
-{
-	return !m_inst->isRunning();
-}
-
-VersionPage::VersionPage(OneSixInstance *inst, QWidget *parent)
-	: QWidget(parent), ui(new Ui::VersionPage), m_inst(inst)
-{
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-
-	m_version = m_inst->getMinecraftProfile();
-	if (m_version)
-	{
-		ui->libraryTreeView->setModel(m_version.get());
-		ui->libraryTreeView->installEventFilter(this);
-		ui->libraryTreeView->setSelectionMode(QAbstractItemView::SingleSelection);
-		connect(ui->libraryTreeView->selectionModel(), &QItemSelectionModel::currentChanged,
-				this, &VersionPage::versionCurrent);
-		updateVersionControls();
-		// select first item.
-		auto index = ui->libraryTreeView->model()->index(0,0);
-		if(index.isValid())
-			ui->libraryTreeView->setCurrentIndex(index);
-	}
-	else
-	{
-		disableVersionControls();
-	}
-	connect(m_inst, &OneSixInstance::versionReloaded, this,
-			&VersionPage::updateVersionControls);
-}
-
-VersionPage::~VersionPage()
-{
-	delete ui;
-}
-
-void VersionPage::updateVersionControls()
-{
-	ui->forgeBtn->setEnabled(true);
-	ui->liteloaderBtn->setEnabled(true);
-}
-
-void VersionPage::disableVersionControls()
-{
-	ui->forgeBtn->setEnabled(false);
-	ui->liteloaderBtn->setEnabled(false);
-	ui->reloadLibrariesBtn->setEnabled(false);
-	ui->removeLibraryBtn->setEnabled(false);
-}
-
-bool VersionPage::reloadMinecraftProfile()
-{
-	try
-	{
-		m_inst->reloadProfile();
-		return true;
-	}
-	catch (MMCError &e)
-	{
-		QMessageBox::critical(this, tr("Error"), e.cause());
-		return false;
-	}
-	catch (...)
-	{
-		QMessageBox::critical(
-			this, tr("Error"),
-			tr("Failed to load the version description file for reasons unknown."));
-		return false;
-	}
-}
-
-void VersionPage::on_reloadLibrariesBtn_clicked()
-{
-	reloadMinecraftProfile();
-}
-
-void VersionPage::on_removeLibraryBtn_clicked()
-{
-	if (ui->libraryTreeView->currentIndex().isValid())
-	{
-		// FIXME: use actual model, not reloading.
-		if (!m_version->remove(ui->libraryTreeView->currentIndex().row()))
-		{
-			QMessageBox::critical(this, tr("Error"), tr("Couldn't remove file"));
-		}
-	}
-}
-
-void VersionPage::on_jarmodBtn_clicked()
-{
-	QFileDialog w;
-	QSet<QString> locations;
-	QString modsFolder = MMC->settings()->get("CentralModsDir").toString();
-	auto f = [&](QStandardPaths::StandardLocation l)
-	{
-		QString location = QStandardPaths::writableLocation(l);
-		QFileInfo finfo(location);
-		if (!finfo.exists())
-			return;
-		locations.insert(location);
-	};
-	f(QStandardPaths::DesktopLocation);
-	f(QStandardPaths::DocumentsLocation);
-	f(QStandardPaths::DownloadLocation);
-	f(QStandardPaths::HomeLocation);
-	QList<QUrl> urls;
-	for (auto location : locations)
-	{
-		urls.append(QUrl::fromLocalFile(location));
-	}
-	urls.append(QUrl::fromLocalFile(modsFolder));
-
-	w.setFileMode(QFileDialog::ExistingFiles);
-	w.setAcceptMode(QFileDialog::AcceptOpen);
-	w.setNameFilter(tr("Minecraft jar mods (*.zip *.jar)"));
-	w.setDirectory(modsFolder);
-	w.setSidebarUrls(urls);
-
-	if (w.exec())
-		m_version->installJarMods(w.selectedFiles());
-}
-
-void VersionPage::on_resetLibraryOrderBtn_clicked()
-{
-	try
-	{
-		m_version->resetOrder();
-	}
-	catch (MMCError &e)
-	{
-		QMessageBox::critical(this, tr("Error"), e.cause());
-	}
-}
-
-void VersionPage::on_moveLibraryUpBtn_clicked()
-{
-	if (ui->libraryTreeView->selectionModel()->selectedRows().isEmpty())
-	{
-		return;
-	}
-	try
-	{
-		const int row = ui->libraryTreeView->selectionModel()->selectedRows().first().row();
-		m_version->move(row, MinecraftProfile::MoveUp);
-	}
-	catch (MMCError &e)
-	{
-		QMessageBox::critical(this, tr("Error"), e.cause());
-	}
-}
-
-void VersionPage::on_moveLibraryDownBtn_clicked()
-{
-	if (ui->libraryTreeView->selectionModel()->selectedRows().isEmpty())
-	{
-		return;
-	}
-	try
-	{
-		const int row = ui->libraryTreeView->selectionModel()->selectedRows().first().row();
-		m_version->move(row, MinecraftProfile::MoveDown);
-	}
-	catch (MMCError &e)
-	{
-		QMessageBox::critical(this, tr("Error"), e.cause());
-	}
-}
-
-void VersionPage::on_changeMCVersionBtn_clicked()
-{
-	VersionSelectDialog vselect(m_inst->versionList().get(), tr("Change Minecraft version"),
-								this);
-	if (!vselect.exec() || !vselect.selectedVersion())
-		return;
-
-	if (!MMC->accounts()->anyAccountIsValid())
-	{
-		CustomMessageBox::selectable(
-			this, tr("Error"),
-			tr("MultiMC cannot download Minecraft or update instances unless you have at least "
-			   "one account added.\nPlease add your Mojang or Minecraft account."),
-			QMessageBox::Warning)->show();
-		return;
-	}
-
-	if (!m_version->isVanilla())
-	{
-		auto result = CustomMessageBox::selectable(
-			this, tr("Are you sure?"),
-			tr("This will remove any library/version customization you did previously. "
-			   "This includes things like Forge install and similar."),
-			QMessageBox::Warning, QMessageBox::Ok | QMessageBox::Abort,
-			QMessageBox::Abort)->exec();
-
-		if (result != QMessageBox::Ok)
-			return;
-		m_version->revertToVanilla();
-		reloadMinecraftProfile();
-	}
-	m_inst->setIntendedVersionId(vselect.selectedVersion()->descriptor());
-
-	auto updateTask = m_inst->doUpdate();
-	if (!updateTask)
-	{
-		return;
-	}
-	ProgressDialog tDialog(this);
-	connect(updateTask.get(), SIGNAL(failed(QString)), SLOT(onGameUpdateError(QString)));
-	tDialog.exec(updateTask.get());
-}
-
-void VersionPage::on_forgeBtn_clicked()
-{
-	VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this);
-	vselect.setExactFilter(1, m_inst->currentVersionId());
-	vselect.setEmptyString(tr("No Forge versions are currently available for Minecraft ") +
-						   m_inst->currentVersionId());
-	if (vselect.exec() && vselect.selectedVersion())
-	{
-		ProgressDialog dialog(this);
-		dialog.exec(
-			ForgeInstaller().createInstallTask(m_inst, vselect.selectedVersion(), this));
-	}
-}
-
-void VersionPage::on_liteloaderBtn_clicked()
-{
-	VersionSelectDialog vselect(MMC->liteloaderlist().get(), tr("Select LiteLoader version"),
-								this);
-	vselect.setExactFilter(1, m_inst->currentVersionId());
-	vselect.setEmptyString(tr("No LiteLoader versions are currently available for Minecraft ") +
-						   m_inst->currentVersionId());
-	if (vselect.exec() && vselect.selectedVersion())
-	{
-		ProgressDialog dialog(this);
-		dialog.exec(
-			LiteLoaderInstaller().createInstallTask(m_inst, vselect.selectedVersion(), this));
-	}
-}
-
-void VersionPage::versionCurrent(const QModelIndex &current, const QModelIndex &previous)
-{
-	if (!current.isValid())
-	{
-		ui->removeLibraryBtn->setDisabled(true);
-		ui->moveLibraryDownBtn->setDisabled(true);
-		ui->moveLibraryUpBtn->setDisabled(true);
-	}
-	else
-	{
-		bool enabled = m_version->canRemove(current.row());
-		ui->removeLibraryBtn->setEnabled(enabled);
-		ui->moveLibraryDownBtn->setEnabled(enabled);
-		ui->moveLibraryUpBtn->setEnabled(enabled);
-	}
-	QString selectedId = m_version->versionFileId(current.row());
-	if (selectedId == "net.minecraft")
-	{
-		ui->changeMCVersionBtn->setEnabled(true);
-	}
-	else
-	{
-		ui->changeMCVersionBtn->setEnabled(false);
-	}
-}
diff --git a/gui/pages/VersionPage.h b/gui/pages/VersionPage.h
deleted file mode 100644
index 3b90d0c6..00000000
--- a/gui/pages/VersionPage.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QWidget>
-
-#include "logic/minecraft/OneSixInstance.h"
-#include "logic/net/NetJob.h"
-#include "BasePage.h"
-
-namespace Ui
-{
-class VersionPage;
-}
-
-class VersionPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit VersionPage(OneSixInstance *inst, QWidget *parent = 0);
-	virtual ~VersionPage();
-	virtual QString displayName() const override
-	{
-		return tr("Version");
-	}
-	virtual QIcon icon() const override;
-	virtual QString id() const override
-	{
-		return "version";
-	}
-	virtual QString helpPage() const override
-	{
-		return "Instance-version";
-	}
-	virtual bool shouldDisplay() const;
-private
-slots:
-
-	// version tab
-	void on_forgeBtn_clicked();
-	void on_liteloaderBtn_clicked();
-	void on_reloadLibrariesBtn_clicked();
-	void on_removeLibraryBtn_clicked();
-	void on_resetLibraryOrderBtn_clicked();
-	void on_moveLibraryUpBtn_clicked();
-	void on_moveLibraryDownBtn_clicked();
-	void on_jarmodBtn_clicked();
-
-	void updateVersionControls();
-	void disableVersionControls();
-	void on_changeMCVersionBtn_clicked();
-
-protected:
-	/// FIXME: this shouldn't be necessary!
-	bool reloadMinecraftProfile();
-
-private:
-	Ui::VersionPage *ui;
-	std::shared_ptr<MinecraftProfile> m_version;
-	OneSixInstance *m_inst;
-	NetJobPtr forgeJob;
-
-public
-slots:
-	void versionCurrent(const QModelIndex &current, const QModelIndex &previous);
-};
diff --git a/gui/pages/VersionPage.ui b/gui/pages/VersionPage.ui
deleted file mode 100644
index 9b270d01..00000000
--- a/gui/pages/VersionPage.ui
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>VersionPage</class>
- <widget class="QWidget" name="VersionPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>693</width>
-    <height>575</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Version</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Tab 1</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="ModListView" name="libraryTreeView">
-         <property name="verticalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
-         <property name="horizontalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOff</enum>
-         </property>
-         <property name="headerHidden">
-          <bool>false</bool>
-         </property>
-         <attribute name="headerVisible">
-          <bool>true</bool>
-         </attribute>
-        </widget>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_4">
-         <item>
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>Selection</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="changeMCVersionBtn">
-           <property name="text">
-            <string>Change version</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="moveLibraryUpBtn">
-           <property name="toolTip">
-            <string>This isn't implemented yet.</string>
-           </property>
-           <property name="text">
-            <string>Move up</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="moveLibraryDownBtn">
-           <property name="toolTip">
-            <string>This isn't implemented yet.</string>
-           </property>
-           <property name="text">
-            <string>Move down</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="removeLibraryBtn">
-           <property name="text">
-            <string>Remove</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="LineSeparator" name="separator" native="true"/>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_2">
-           <property name="text">
-            <string>Install</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="forgeBtn">
-           <property name="toolTip">
-            <string>Replace any current custom version with Minecraft Forge</string>
-           </property>
-           <property name="text">
-            <string>Install Forge</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="liteloaderBtn">
-           <property name="text">
-            <string>Install LiteLoader</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="jarmodBtn">
-           <property name="text">
-            <string>Add jar mod</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="LineSeparator" name="widget" native="true"/>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_5">
-           <property name="text">
-            <string>List</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="resetLibraryOrderBtn">
-           <property name="toolTip">
-            <string>This isn't implemented yet.</string>
-           </property>
-           <property name="text">
-            <string>Reset order</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="reloadLibrariesBtn">
-           <property name="text">
-            <string>Reload</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="verticalSpacer_7">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ModListView</class>
-   <extends>QTreeView</extends>
-   <header>gui/widgets/ModListView.h</header>
-  </customwidget>
-  <customwidget>
-   <class>LineSeparator</class>
-   <extends>QWidget</extends>
-   <header>gui/widgets/LineSeparator.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/global/AccountListPage.cpp b/gui/pages/global/AccountListPage.cpp
deleted file mode 100644
index 72e18405..00000000
--- a/gui/pages/global/AccountListPage.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "AccountListPage.h"
-#include "ui_AccountListPage.h"
-
-#include <QItemSelectionModel>
-
-#include <QDebug>
-
-#include "logic/net/NetJob.h"
-#include "logic/net/URLConstants.h"
-#include "logic/Env.h"
-
-#include "gui/dialogs/EditAccountDialog.h"
-#include "gui/dialogs/ProgressDialog.h"
-#include "gui/dialogs/AccountSelectDialog.h"
-#include "gui/dialogs/LoginDialog.h"
-#include "gui/dialogs/CustomMessageBox.h"
-#include "logic/tasks/Task.h"
-#include "logic/auth/YggdrasilTask.h"
-
-#include <MultiMC.h>
-
-AccountListPage::AccountListPage(QWidget *parent)
-	: QWidget(parent), ui(new Ui::AccountListPage)
-{
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-
-	m_accounts = MMC->accounts();
-
-	ui->listView->setModel(m_accounts.get());
-	ui->listView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-
-	// Expand the account column
-	ui->listView->header()->setSectionResizeMode(1, QHeaderView::Stretch);
-
-	QItemSelectionModel *selectionModel = ui->listView->selectionModel();
-
-	connect(selectionModel, &QItemSelectionModel::selectionChanged,
-			[this](const QItemSelection &sel, const QItemSelection &dsel)
-	{ updateButtonStates(); });
-
-	connect(m_accounts.get(), SIGNAL(listChanged()), SLOT(listChanged()));
-	connect(m_accounts.get(), SIGNAL(activeAccountChanged()), SLOT(listChanged()));
-
-	updateButtonStates();
-}
-
-AccountListPage::~AccountListPage()
-{
-	delete ui;
-}
-
-void AccountListPage::listChanged()
-{
-	updateButtonStates();
-}
-
-void AccountListPage::on_addAccountBtn_clicked()
-{
-	addAccount(tr("Please enter your Mojang or Minecraft account username and password to add "
-				  "your account."));
-}
-
-void AccountListPage::on_rmAccountBtn_clicked()
-{
-	QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-	if (selection.size() > 0)
-	{
-		QModelIndex selected = selection.first();
-		m_accounts->removeAccount(selected);
-	}
-}
-
-void AccountListPage::on_setDefaultBtn_clicked()
-{
-	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()
-{
-	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->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.name + ".png");
-			auto action = CacheDownload::make(
-				QUrl("http://" + URLConstants::SKINS_BASE + profile.name + ".png"), meta);
-			job->addNetAction(action);
-			meta->stale = true;
-		}
-
-		job->start();
-	}
-}
diff --git a/gui/pages/global/AccountListPage.h b/gui/pages/global/AccountListPage.h
deleted file mode 100644
index 9fd894b8..00000000
--- a/gui/pages/global/AccountListPage.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2013-2015 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 <QDialog>
-#include <memory>
-
-#include "gui/pages/BasePage.h"
-
-#include "logic/auth/MojangAccountList.h"
-#include <MultiMC.h>
-
-namespace Ui
-{
-class AccountListPage;
-}
-
-class AuthenticateTask;
-
-class AccountListPage : public QWidget, public BasePage
-{
-	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 "Accounts";
-	}
-
-public
-slots:
-	void on_addAccountBtn_clicked();
-
-	void on_rmAccountBtn_clicked();
-
-	void on_setDefaultBtn_clicked();
-
-	void on_noDefaultBtn_clicked();
-
-	void listChanged();
-
-	//! Updates the states of the dialog's buttons.
-	void updateButtonStates();
-
-protected:
-	std::shared_ptr<MojangAccountList> m_accounts;
-
-protected
-slots:
-	void addAccount(const QString& errMsg="");
-
-private:
-	Ui::AccountListPage *ui;
-};
diff --git a/gui/pages/global/AccountListPage.ui b/gui/pages/global/AccountListPage.ui
deleted file mode 100644
index 8ad78cf4..00000000
--- a/gui/pages/global/AccountListPage.ui
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AccountListPage</class>
- <widget class="QWidget" name="AccountListPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>694</width>
-    <height>609</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Manage Accounts</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>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>
-          </layout>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/global/ExternalToolsPage.cpp b/gui/pages/global/ExternalToolsPage.cpp
deleted file mode 100644
index e2dd70dd..00000000
--- a/gui/pages/global/ExternalToolsPage.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ExternalToolsPage.h"
-#include "ui_ExternalToolsPage.h"
-
-#include <QMessageBox>
-#include <QFileDialog>
-#include <QStandardPaths>
-
-#include <pathutils.h>
-
-#include "logic/settings/SettingsObject.h"
-#include "logic/tools/BaseProfiler.h"
-#include "MultiMC.h"
-
-ExternalToolsPage::ExternalToolsPage(QWidget *parent) :
-	QWidget(parent),
-	ui(new Ui::ExternalToolsPage)
-{
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-
-	#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-	ui->jsonEditorTextBox->setClearButtonEnabled(true);
-	#endif
-
-	ui->mceditLink->setOpenExternalLinks(true);
-	ui->jvisualvmLink->setOpenExternalLinks(true);
-	ui->jprofilerLink->setOpenExternalLinks(true);
-	loadSettings();
-}
-
-ExternalToolsPage::~ExternalToolsPage()
-{
-	delete ui;
-}
-
-void ExternalToolsPage::loadSettings()
-{
-	auto s = 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());
-}
-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);
-}
-
-void ExternalToolsPage::on_jprofilerPathBtn_clicked()
-{
-	QString raw_dir = ui->jprofilerPathEdit->text();
-	QString error;
-	do
-	{
-		raw_dir = QFileDialog::getExistingDirectory(this, tr("JProfiler Directory"), raw_dir);
-		if (raw_dir.isEmpty())
-		{
-			break;
-		}
-		QString cooked_dir = 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"));
-	}
-}
-
-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 = 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"));
-	}
-}
-
-void ExternalToolsPage::on_mceditPathBtn_clicked()
-{
-	QString raw_dir = ui->mceditPathEdit->text();
-	QString error;
-	do
-	{
-#ifdef Q_OS_OSX
-#warning stuff
-		raw_dir = QFileDialog::getOpenFileName(this, tr("MCEdit Application"), raw_dir);
-#else
-		raw_dir = QFileDialog::getExistingDirectory(this, tr("MCEdit Directory"), raw_dir);
-#endif
-		if (raw_dir.isEmpty())
-		{
-			break;
-		}
-		QString cooked_dir = NormalizePath(raw_dir);
-		if (!MMC->tools()["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->tools()["mcedit"]->check(ui->mceditPathEdit->text(), &error))
-	{
-		QMessageBox::critical(this, tr("Error"),
-							  tr("Error while checking MCEdit install:\n%1").arg(error));
-	}
-	else
-	{
-		QMessageBox::information(this, tr("OK"), tr("MCEdit setup seems to be OK"));
-	}
-}
-
-void ExternalToolsPage::on_jsonEditorBrowseBtn_clicked()
-{
-	QString raw_file = QFileDialog::getOpenFileName(
-		this, tr("JSON Editor"),
-		ui->jsonEditorTextBox->text().isEmpty()
-#if defined(Q_OS_LINUX)
-				? QString("/usr/bin")
-#else
-			? QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).first()
-#endif
-			: ui->jsonEditorTextBox->text());
-	QString cooked_file = NormalizePath(raw_file);
-
-	if (cooked_file.isEmpty())
-	{
-		return;
-	}
-
-	// it has to exist and be an executable
-	if (QFileInfo(cooked_file).exists() && QFileInfo(cooked_file).isExecutable())
-	{
-		ui->jsonEditorTextBox->setText(cooked_file);
-	}
-	else
-	{
-		QMessageBox::warning(this, tr("Invalid"),
-							 tr("The file chosen does not seem to be an executable"));
-	}
-}
-
-bool ExternalToolsPage::apply()
-{
-	applySettings();
-	return true;
-}
diff --git a/gui/pages/global/ExternalToolsPage.h b/gui/pages/global/ExternalToolsPage.h
deleted file mode 100644
index 7c5efad6..00000000
--- a/gui/pages/global/ExternalToolsPage.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QWidget>
-
-#include "gui/pages/BasePage.h"
-#include <MultiMC.h>
-
-namespace Ui {
-class ExternalToolsPage;
-}
-
-class ExternalToolsPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit ExternalToolsPage(QWidget *parent = 0);
-	~ExternalToolsPage();
-
-	QString displayName() const override
-	{
-		return tr("External Tools");
-	}
-	QIcon icon() const override
-	{
-		auto icon = MMC->getThemedIcon("externaltools");
-		if(icon.isNull())
-		{
-			icon = MMC->getThemedIcon("loadermods");
-		}
-		return icon;
-	}
-	QString id() const override
-	{
-		return "external-tools";
-	}
-	QString helpPage() const override
-	{
-		return "External-tools";
-	}
-	virtual bool apply();
-
-private:
-	void loadSettings();
-	void applySettings();
-
-private:
-	Ui::ExternalToolsPage *ui;
-
-private
-slots:
-	void on_jprofilerPathBtn_clicked();
-	void on_jprofilerCheckBtn_clicked();
-	void on_jvisualvmPathBtn_clicked();
-	void on_jvisualvmCheckBtn_clicked();
-	void on_mceditPathBtn_clicked();
-	void on_mceditCheckBtn_clicked();
-	void on_jsonEditorBrowseBtn_clicked();
-};
diff --git a/gui/pages/global/ExternalToolsPage.ui b/gui/pages/global/ExternalToolsPage.ui
deleted file mode 100644
index ba1b6f01..00000000
--- a/gui/pages/global/ExternalToolsPage.ui
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ExternalToolsPage</class>
- <widget class="QWidget" name="ExternalToolsPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>673</width>
-    <height>751</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Tab 1</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string>JProfiler</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_10">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
-            <item>
-             <widget class="QLineEdit" name="jprofilerPathEdit"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="jprofilerPathBtn">
-              <property name="text">
-               <string>...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QPushButton" name="jprofilerCheckBtn">
-            <property name="text">
-             <string>Check</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="jprofilerLink">
-            <property name="text">
-             <string>&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;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.ej-technologies.com/products/jprofiler/overview.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_3">
-         <property name="title">
-          <string>JVisualVM</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_11">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <item>
-             <widget class="QLineEdit" name="jvisualvmPathEdit"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="jvisualvmPathBtn">
-              <property name="text">
-               <string>...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QPushButton" name="jvisualvmCheckBtn">
-            <property name="text">
-             <string>Check</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="jvisualvmLink">
-            <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://visualvm.java.net/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://visualvm.java.net/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_4">
-         <property name="title">
-          <string>MCEdit</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_12">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_6">
-            <item>
-             <widget class="QLineEdit" name="mceditPathEdit"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="mceditPathBtn">
-              <property name="text">
-               <string>...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QPushButton" name="mceditCheckBtn">
-            <property name="text">
-             <string>Check</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="mceditLink">
-            <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://www.mcedit.net/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.mcedit.net/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="editorsBox">
-         <property name="title">
-          <string>External Editors (leave empty for system default)</string>
-         </property>
-         <layout class="QGridLayout" name="foldersBoxLayout_2">
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="jsonEditorTextBox"/>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelJsonEditor">
-            <property name="text">
-             <string>Text Editor:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <widget class="QToolButton" name="jsonEditorBrowseBtn">
-            <property name="text">
-             <string>...</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>216</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/global/JavaPage.cpp b/gui/pages/global/JavaPage.cpp
deleted file mode 100644
index b0ed23ea..00000000
--- a/gui/pages/global/JavaPage.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "JavaPage.h"
-#include "ui_JavaPage.h"
-
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QDir>
-
-#include <pathutils.h>
-
-#include "gui/NagUtils.h"
-
-#include "gui/Platform.h"
-#include "gui/dialogs/VersionSelectDialog.h"
-#include <gui/ColumnResizer.h>
-
-#include "logic/java/JavaUtils.h"
-#include "logic/java/JavaVersionList.h"
-#include "logic/java/JavaChecker.h"
-
-#include "logic/settings/SettingsObject.h"
-#include "MultiMC.h"
-
-JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
-{
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-
-	auto resizer = new ColumnResizer(this);
-	resizer->addWidgetsFromLayout(ui->javaSettingsGroupBox->layout(), 0);
-	resizer->addWidgetsFromLayout(ui->customCommandsGroupBox->layout(), 0);
-
-	loadSettings();
-}
-
-JavaPage::~JavaPage()
-{
-	delete ui;
-}
-
-bool JavaPage::apply()
-{
-	applySettings();
-	return true;
-}
-
-void JavaPage::applySettings()
-{
-	auto s = MMC->settings();
-	// Memory
-	s->set("MinMemAlloc", ui->minMemSpinBox->value());
-	s->set("MaxMemAlloc", ui->maxMemSpinBox->value());
-	s->set("PermGen", ui->permGenSpinBox->value());
-
-	// Java Settings
-	s->set("JavaPath", ui->javaPathTextBox->text());
-	s->set("JvmArgs", ui->jvmArgsTextBox->text());
-	NagUtils::checkJVMArgs(s->get("JvmArgs").toString(), this->parentWidget());
-
-	// Custom Commands
-	s->set("PreLaunchCommand", ui->preLaunchCmdTextBox->text());
-	s->set("PostExitCommand", ui->postExitCmdTextBox->text());
-}
-void JavaPage::loadSettings()
-{
-	auto s = MMC->settings();
-	// Memory
-	ui->minMemSpinBox->setValue(s->get("MinMemAlloc").toInt());
-	ui->maxMemSpinBox->setValue(s->get("MaxMemAlloc").toInt());
-	ui->permGenSpinBox->setValue(s->get("PermGen").toInt());
-
-	// Java Settings
-	ui->javaPathTextBox->setText(s->get("JavaPath").toString());
-	ui->jvmArgsTextBox->setText(s->get("JvmArgs").toString());
-
-	// Custom Commands
-	ui->preLaunchCmdTextBox->setText(s->get("PreLaunchCommand").toString());
-	ui->postExitCmdTextBox->setText(s->get("PostExitCommand").toString());
-}
-
-void JavaPage::on_javaDetectBtn_clicked()
-{
-	JavaVersionPtr java;
-
-	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<JavaVersion>(vselect.selectedVersion());
-		ui->javaPathTextBox->setText(java->path);
-	}
-}
-void JavaPage::on_javaBrowseBtn_clicked()
-{
-	QString dir = QFileDialog::getOpenFileName(this, tr("Find Java executable"));
-	if (!dir.isNull())
-	{
-		ui->javaPathTextBox->setText(dir);
-	}
-}
-void JavaPage::on_javaTestBtn_clicked()
-{
-	checker.reset(new JavaChecker());
-	connect(checker.get(), SIGNAL(checkFinished(JavaCheckResult)), this,
-			SLOT(checkFinished(JavaCheckResult)));
-	checker->path = ui->javaPathTextBox->text();
-	checker->performCheck();
-}
-
-void JavaPage::checkFinished(JavaCheckResult result)
-{
-	if (result.valid)
-	{
-		QString text;
-		text += "Java test succeeded!\n";
-		if (result.is_64bit)
-			text += "Using 64bit java.\n";
-		text += "\n";
-		text += "Platform reported: " + result.realPlatform + "\n";
-		text += "Java version reported: " + result.javaVersion;
-		QMessageBox::information(this, tr("Java test success"), text);
-	}
-	else
-	{
-		QMessageBox::warning(
-			this, tr("Java test failure"),
-			tr("The specified java binary didn't work. You should use the auto-detect feature, "
-			   "or set the path to the java executable."));
-	}
-}
diff --git a/gui/pages/global/JavaPage.h b/gui/pages/global/JavaPage.h
deleted file mode 100644
index f70d9dbd..00000000
--- a/gui/pages/global/JavaPage.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <memory>
-#include <QDialog>
-
-#include "logic/java/JavaChecker.h"
-#include "gui/pages/BasePage.h"
-#include <MultiMC.h>
-
-class SettingsObject;
-
-namespace Ui
-{
-class JavaPage;
-}
-
-class JavaPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit JavaPage(QWidget *parent = 0);
-	~JavaPage();
-
-	QString displayName() const override
-	{
-		return tr("Java");
-	}
-	QIcon icon() const override
-	{
-		return 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();
-
-private
-slots:
-	void on_javaDetectBtn_clicked();
-	void on_javaTestBtn_clicked();
-	void on_javaBrowseBtn_clicked();
-
-	void checkFinished(JavaCheckResult result);
-
-private:
-	Ui::JavaPage *ui;
-	std::shared_ptr<JavaChecker> checker;
-};
diff --git a/gui/pages/global/JavaPage.ui b/gui/pages/global/JavaPage.ui
deleted file mode 100644
index 6ae41a49..00000000
--- a/gui/pages/global/JavaPage.ui
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>JavaPage</class>
- <widget class="QWidget" name="JavaPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>545</width>
-    <height>609</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Settings</string>
-  </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>:/icons/toolbar/settings</normaloff>:/icons/toolbar/settings</iconset>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Tab 1</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QGroupBox" name="memoryGroupBox">
-         <property name="title">
-          <string>Memory</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="1" column="1">
-           <widget class="QSpinBox" name="maxMemSpinBox">
-            <property name="toolTip">
-             <string>The maximum amount of memory Minecraft is allowed to use.</string>
-            </property>
-            <property name="suffix">
-             <string> MB</string>
-            </property>
-            <property name="minimum">
-             <number>512</number>
-            </property>
-            <property name="maximum">
-             <number>65536</number>
-            </property>
-            <property name="singleStep">
-             <number>128</number>
-            </property>
-            <property name="value">
-             <number>1024</number>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelMinMem">
-            <property name="text">
-             <string>Minimum memory allocation:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="labelMaxMem">
-            <property name="text">
-             <string>Maximum memory allocation:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QSpinBox" name="minMemSpinBox">
-            <property name="toolTip">
-             <string>The amount of memory Minecraft is started with.</string>
-            </property>
-            <property name="suffix">
-             <string> MB</string>
-            </property>
-            <property name="minimum">
-             <number>256</number>
-            </property>
-            <property name="maximum">
-             <number>65536</number>
-            </property>
-            <property name="singleStep">
-             <number>128</number>
-            </property>
-            <property name="value">
-             <number>256</number>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="labelPermGen">
-            <property name="text">
-             <string>PermGen:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QSpinBox" name="permGenSpinBox">
-            <property name="toolTip">
-             <string>The amount of memory available to store loaded Java classes.</string>
-            </property>
-            <property name="suffix">
-             <string> MB</string>
-            </property>
-            <property name="minimum">
-             <number>64</number>
-            </property>
-            <property name="maximum">
-             <number>999999999</number>
-            </property>
-            <property name="singleStep">
-             <number>8</number>
-            </property>
-            <property name="value">
-             <number>64</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="javaSettingsGroupBox">
-         <property name="title">
-          <string>Java Runtime</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_3">
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelJavaPath">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Java path:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="javaDetectBtn">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Auto-detect...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="javaTestBtn">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Test</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="labelJVMArgs">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>JVM arguments:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" colspan="2">
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <item>
-             <widget class="QLineEdit" name="javaPathTextBox"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="javaBrowseBtn">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>28</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="2" column="1" colspan="2">
-           <widget class="QLineEdit" name="jvmArgsTextBox"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="customCommandsGroupBox">
-         <property name="title">
-          <string>Custom Commands</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_4">
-          <item row="1" column="0">
-           <widget class="QLabel" name="labelPostExitCmd">
-            <property name="text">
-             <string>Post-exit command:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelPreLaunchCmd">
-            <property name="text">
-             <string>Pre-launch command:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="preLaunchCmdTextBox"/>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="postExitCmdTextBox"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="labelCustomCmdsDescription">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Pre-launch command runs before the instance launches and post-exit command runs after it exits. Both will be run in MultiMC's working directory with INST_ID, INST_DIR, and INST_NAME as environment variables.</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>minMemSpinBox</tabstop>
-  <tabstop>maxMemSpinBox</tabstop>
-  <tabstop>permGenSpinBox</tabstop>
-  <tabstop>javaPathTextBox</tabstop>
-  <tabstop>javaBrowseBtn</tabstop>
-  <tabstop>javaDetectBtn</tabstop>
-  <tabstop>javaTestBtn</tabstop>
-  <tabstop>jvmArgsTextBox</tabstop>
-  <tabstop>preLaunchCmdTextBox</tabstop>
-  <tabstop>postExitCmdTextBox</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/global/MinecraftPage.cpp b/gui/pages/global/MinecraftPage.cpp
deleted file mode 100644
index 5f752206..00000000
--- a/gui/pages/global/MinecraftPage.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MinecraftPage.h"
-#include "ui_MinecraftPage.h"
-
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QDir>
-
-#include <pathutils.h>
-
-#include "gui/Platform.h"
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "gui/dialogs/CustomMessageBox.h"
-
-#include "gui/NagUtils.h"
-
-#include "logic/java/JavaUtils.h"
-#include "logic/java/JavaVersionList.h"
-#include "logic/java/JavaChecker.h"
-
-#include "logic/updater/UpdateChecker.h"
-
-#include "logic/tools/BaseProfiler.h"
-
-#include "logic/settings/SettingsObject.h"
-#include "MultiMC.h"
-
-MinecraftPage::MinecraftPage(QWidget *parent) : QWidget(parent), ui(new Ui::MinecraftPage)
-{
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-	loadSettings();
-	updateCheckboxStuff();
-}
-
-MinecraftPage::~MinecraftPage()
-{
-	delete ui;
-}
-
-bool MinecraftPage::apply()
-{
-	applySettings();
-	return true;
-}
-
-void MinecraftPage::updateCheckboxStuff()
-{
-	ui->windowWidthSpinBox->setEnabled(!ui->maximizedCheckBox->isChecked());
-	ui->windowHeightSpinBox->setEnabled(!ui->maximizedCheckBox->isChecked());
-}
-
-void MinecraftPage::on_maximizedCheckBox_clicked(bool checked)
-{
-	Q_UNUSED(checked);
-	updateCheckboxStuff();
-}
-
-
-void MinecraftPage::applySettings()
-{
-	auto s = MMC->settings();
-
-	// 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();
-
-	// 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/gui/pages/global/MinecraftPage.h b/gui/pages/global/MinecraftPage.h
deleted file mode 100644
index 6dd86338..00000000
--- a/gui/pages/global/MinecraftPage.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <memory>
-#include <QDialog>
-
-#include "logic/java/JavaChecker.h"
-#include "gui/pages/BasePage.h"
-#include <MultiMC.h>
-
-class SettingsObject;
-
-namespace Ui
-{
-class MinecraftPage;
-}
-
-class MinecraftPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit MinecraftPage(QWidget *parent = 0);
-	~MinecraftPage();
-
-	QString displayName() const override
-	{
-		return tr("Minecraft");
-	}
-	QIcon icon() const override
-	{
-		return 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();
-
-private
-slots:
-	void on_maximizedCheckBox_clicked(bool checked);
-
-private:
-	Ui::MinecraftPage *ui;
-
-};
diff --git a/gui/pages/global/MinecraftPage.ui b/gui/pages/global/MinecraftPage.ui
deleted file mode 100644
index 825f6a56..00000000
--- a/gui/pages/global/MinecraftPage.ui
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MinecraftPage</class>
- <widget class="QWidget" name="MinecraftPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>545</width>
-    <height>195</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Settings</string>
-  </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>:/icons/toolbar/settings</normaloff>:/icons/toolbar/settings</iconset>
-  </property>
-  <layout class="QVBoxLayout" name="mainLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="tabShape">
-      <enum>QTabWidget::Rounded</enum>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="minecraftTab">
-      <attribute name="title">
-       <string>Minecraft</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <widget class="QGroupBox" name="windowSizeGroupBox">
-         <property name="title">
-          <string>Window Size</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_4">
-          <item>
-           <widget class="QCheckBox" name="maximizedCheckBox">
-            <property name="text">
-             <string>Start Minecraft maximized?</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QGridLayout" name="gridLayoutWindowSize">
-            <item row="1" column="0">
-             <widget class="QLabel" name="labelWindowHeight">
-              <property name="text">
-               <string>Window hei&amp;ght:</string>
-              </property>
-              <property name="buddy">
-               <cstring>windowHeightSpinBox</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="labelWindowWidth">
-              <property name="text">
-               <string>W&amp;indow width:</string>
-              </property>
-              <property name="buddy">
-               <cstring>windowWidthSpinBox</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QSpinBox" name="windowWidthSpinBox">
-              <property name="minimum">
-               <number>1</number>
-              </property>
-              <property name="maximum">
-               <number>65536</number>
-              </property>
-              <property name="singleStep">
-               <number>1</number>
-              </property>
-              <property name="value">
-               <number>854</number>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QSpinBox" name="windowHeightSpinBox">
-              <property name="minimum">
-               <number>1</number>
-              </property>
-              <property name="maximum">
-               <number>65536</number>
-              </property>
-              <property name="value">
-               <number>480</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacerMinecraft">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>tabWidget</tabstop>
-  <tabstop>maximizedCheckBox</tabstop>
-  <tabstop>windowWidthSpinBox</tabstop>
-  <tabstop>windowHeightSpinBox</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/global/MultiMCPage.cpp b/gui/pages/global/MultiMCPage.cpp
deleted file mode 100644
index d2934666..00000000
--- a/gui/pages/global/MultiMCPage.cpp
+++ /dev/null
@@ -1,459 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MultiMCPage.h"
-#include "ui_MultiMCPage.h"
-
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QDir>
-#include <QTextCharFormat>
-
-#include <pathutils.h>
-
-#include "gui/Platform.h"
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "gui/dialogs/CustomMessageBox.h"
-#include <gui/ColumnResizer.h>
-
-#include "gui/NagUtils.h"
-
-#include "logic/java/JavaUtils.h"
-#include "logic/java/JavaVersionList.h"
-#include "logic/java/JavaChecker.h"
-
-#include "logic/updater/UpdateChecker.h"
-
-#include "logic/tools/BaseProfiler.h"
-
-#include "logic/settings/SettingsObject.h"
-#include "MultiMC.h"
-
-// FIXME: possibly move elsewhere
-enum InstSortMode
-{
-	// 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);
-	ui->sortingModeGroup->setId(ui->sortByNameBtn, Sort_Name);
-	ui->sortingModeGroup->setId(ui->sortLastLaunchedBtn, Sort_LastLaunch);
-
-	auto resizer = new ColumnResizer(this);
-	resizer->addWidgetsFromLayout(ui->groupBox->layout(), 1);
-	resizer->addWidgetsFromLayout(ui->foldersBox->layout(), 1);
-
-	defaultFormat = new QTextCharFormat(ui->fontPreview->currentCharFormat());
-
-	loadSettings();
-
-	QObject::connect(MMC->updateChecker().get(), &UpdateChecker::channelListLoaded, this,
-					 &MultiMCPage::refreshUpdateChannelList);
-
-	if (MMC->updateChecker()->hasChannels())
-	{
-		refreshUpdateChannelList();
-	}
-	else
-	{
-		MMC->updateChecker()->updateChanList(false);
-	}
-	connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview()));
-	connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview()));
-}
-
-MultiMCPage::~MultiMCPage()
-{
-	delete ui;
-}
-
-bool MultiMCPage::apply()
-{
-	applySettings();
-	return true;
-}
-
-void MultiMCPage::on_ftbLauncherBrowseBtn_clicked()
-{
-	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("FTB Launcher Directory"),
-														ui->ftbLauncherBox->text());
-	QString cooked_dir = NormalizePath(raw_dir);
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
-	{
-		ui->ftbLauncherBox->setText(cooked_dir);
-	}
-}
-void MultiMCPage::on_ftbBrowseBtn_clicked()
-{
-	QString raw_dir =
-		QFileDialog::getExistingDirectory(this, tr("FTB Directory"), ui->ftbBox->text());
-	QString cooked_dir = NormalizePath(raw_dir);
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
-	{
-		ui->ftbBox->setText(cooked_dir);
-	}
-}
-
-void MultiMCPage::on_instDirBrowseBtn_clicked()
-{
-    QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Instance Directory"),
-                                                        ui->instDirTextBox->text());
-    QString cooked_dir = NormalizePath(raw_dir);
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
-	{
-		if (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 Directory"),
-														ui->iconsDirTextBox->text());
-	QString cooked_dir = NormalizePath(raw_dir);
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
-	{
-		ui->iconsDirTextBox->setText(cooked_dir);
-	}
-}
-void MultiMCPage::on_modsDirBrowseBtn_clicked()
-{
-	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Mods Directory"),
-														ui->modsDirTextBox->text());
-	QString cooked_dir = NormalizePath(raw_dir);
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
-	{
-		ui->modsDirTextBox->setText(cooked_dir);
-	}
-}
-void MultiMCPage::on_lwjglDirBrowseBtn_clicked()
-{
-	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("LWJGL Directory"),
-														ui->lwjglDirTextBox->text());
-	QString cooked_dir = NormalizePath(raw_dir);
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
-	{
-		ui->lwjglDirTextBox->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);
-}
-
-void MultiMCPage::updateChannelSelectionChanged(int index)
-{
-	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;
-	}
-}
-
-void MultiMCPage::applySettings()
-{
-	auto s = MMC->settings();
-	// Language
-	s->set("Language",
-		   ui->languageBox->itemData(ui->languageBox->currentIndex()).toLocale().bcp47Name());
-
-	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 0:
-	default:
-		s->set("IconTheme", "multimc");
-		break;
-	}
-
-	if(original != s->get("IconTheme"))
-	{
-		MMC->setIconTheme(s->get("IconTheme").toString());
-	}
-
-	// Console settings
-	s->set("ShowConsole", ui->showConsoleCheck->isChecked());
-	s->set("AutoCloseConsole", ui->autoCloseConsoleCheck->isChecked());
-	QString consoleFontFamily = ui->consoleFont->currentFont().family();
-	s->set("ConsoleFont", consoleFontFamily);
-	s->set("ConsoleFontSize", ui->fontSizeBox->value());
-
-	// FTB
-	s->set("TrackFTBInstances", ui->trackFtbBox->isChecked());
-	s->set("FTBLauncherRoot", ui->ftbLauncherBox->text());
-	s->set("FTBRoot", ui->ftbBox->text());
-
-	// Folders
-	// TODO: Offer to move instances to new instance folder.
-	s->set("InstanceDir", ui->instDirTextBox->text());
-	s->set("CentralModsDir", ui->modsDirTextBox->text());
-	s->set("LWJGLDir", ui->lwjglDirTextBox->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;
-	}
-}
-void MultiMCPage::loadSettings()
-{
-	auto s = MMC->settings();
-	// Language
-	ui->languageBox->clear();
-	ui->languageBox->addItem(tr("English"), QLocale(QLocale::English));
-	foreach(const QString & lang, QDir(MMC->staticData() + "/translations")
-									  .entryList(QStringList() << "*.qm", QDir::Files))
-	{
-		QLocale locale(lang.section(QRegExp("[_\\.]"), 1));
-		ui->languageBox->addItem(QLocale::languageToString(locale.language()), locale);
-	}
-	ui->languageBox->setCurrentIndex(
-		ui->languageBox->findData(QLocale(s->get("Language").toString())));
-
-	// 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
-	{
-		ui->themeComboBox->setCurrentIndex(0);
-	}
-
-	// Console settings
-	ui->showConsoleCheck->setChecked(s->get("ShowConsole").toBool());
-	ui->autoCloseConsoleCheck->setChecked(s->get("AutoCloseConsole").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();
-
-	// FTB
-	ui->trackFtbBox->setChecked(s->get("TrackFTBInstances").toBool());
-	ui->ftbLauncherBox->setText(s->get("FTBLauncherRoot").toString());
-	ui->ftbBox->setText(s->get("FTBRoot").toString());
-
-	// Folders
-	ui->instDirTextBox->setText(s->get("InstanceDir").toString());
-	ui->modsDirTextBox->setText(s->get("CentralModsDir").toString());
-	ui->lwjglDirTextBox->setText(s->get("LWJGLDir").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);
-	}
-}
-
-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(QColor("red"));
-		// 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);
-		// 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(QColor("orange"));
-		// 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();
-	}
-}
\ No newline at end of file
diff --git a/gui/pages/global/MultiMCPage.h b/gui/pages/global/MultiMCPage.h
deleted file mode 100644
index 96e56f47..00000000
--- a/gui/pages/global/MultiMCPage.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <memory>
-#include <QDialog>
-
-#include "logic/java/JavaChecker.h"
-#include "gui/pages/BasePage.h"
-#include <MultiMC.h>
-
-class QTextCharFormat;
-class SettingsObject;
-
-namespace Ui
-{
-class MultiMCPage;
-}
-
-class MultiMCPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit MultiMCPage(QWidget *parent = 0);
-	~MultiMCPage();
-
-	QString displayName() const override
-	{
-		return tr("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();
-
-private
-slots:
-	void on_ftbLauncherBrowseBtn_clicked();
-	void on_ftbBrowseBtn_clicked();
-
-	void on_instDirBrowseBtn_clicked();
-	void on_modsDirBrowseBtn_clicked();
-	void on_lwjglDirBrowseBtn_clicked();
-	void on_iconsDirBrowseBtn_clicked();
-
-	/*!
-	 * Updates the list of update channels in the combo box.
-	 */
-	void refreshUpdateChannelList();
-
-	/*!
-	 * Updates the channel description label.
-	 */
-	void refreshUpdateChannelDesc();
-
-	/*!
-	 * Updates the font preview
-	 */
-	void refreshFontPreview();
-
-	void updateChannelSelectionChanged(int index);
-
-private:
-	Ui::MultiMCPage *ui;
-
-	/*!
-	 * Stores the currently selected update channel.
-	 */
-	QString m_currentUpdateChannel;
-
-	// default format for the font preview...
-	QTextCharFormat *defaultFormat;
-};
diff --git a/gui/pages/global/MultiMCPage.ui b/gui/pages/global/MultiMCPage.ui
deleted file mode 100644
index 38d1bb1d..00000000
--- a/gui/pages/global/MultiMCPage.ui
+++ /dev/null
@@ -1,532 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MultiMCPage</class>
- <widget class="QWidget" name="MultiMCPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>487</width>
-    <height>519</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Settings</string>
-  </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>:/icons/toolbar/settings</normaloff>:/icons/toolbar/settings</iconset>
-  </property>
-  <layout class="QVBoxLayout" name="mainLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="tabShape">
-      <enum>QTabWidget::Rounded</enum>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="featuresTab">
-      <attribute name="title">
-       <string>Features</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_9">
-       <item>
-        <widget class="QGroupBox" name="updateSettingsBox">
-         <property name="title">
-          <string>Update Settings</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_7">
-          <item>
-           <widget class="QCheckBox" name="autoUpdateCheckBox">
-            <property name="text">
-             <string>Check for updates when MultiMC starts?</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="updateChannelLabel">
-            <property name="text">
-             <string>Up&amp;date Channel:</string>
-            </property>
-            <property name="buddy">
-             <cstring>updateChannelComboBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="updateChannelComboBox">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="updateChannelDescLabel">
-            <property name="text">
-             <string>No channel selected.</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox">
-         <property name="title">
-          <string>FTB</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="2" column="0">
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>&amp;Launcher:</string>
-            </property>
-            <property name="buddy">
-             <cstring>ftbLauncherBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="ftbLauncherBox">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QLineEdit" name="ftbBox"/>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>Files:</string>
-            </property>
-            <property name="buddy">
-             <cstring>ftbBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="2">
-           <widget class="QToolButton" name="ftbBrowseBtn">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="text">
-             <string>...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="2">
-           <widget class="QToolButton" name="ftbLauncherBrowseBtn">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::TabFocus</enum>
-            </property>
-            <property name="text">
-             <string>...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" colspan="3">
-           <widget class="QCheckBox" name="trackFtbBox">
-            <property name="text">
-             <string>Track FTB instances</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="foldersBox">
-         <property name="title">
-          <string>Folders</string>
-         </property>
-         <layout class="QGridLayout" name="foldersBoxLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelInstDir">
-            <property name="text">
-             <string>I&amp;nstances:</string>
-            </property>
-            <property name="buddy">
-             <cstring>instDirTextBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="instDirTextBox"/>
-          </item>
-          <item row="0" column="2">
-           <widget class="QToolButton" name="instDirBrowseBtn">
-            <property name="text">
-             <string>...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="labelModsDir">
-            <property name="text">
-             <string>&amp;Mods:</string>
-            </property>
-            <property name="buddy">
-             <cstring>modsDirTextBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="modsDirTextBox"/>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="lwjglDirTextBox"/>
-          </item>
-          <item row="1" column="2">
-           <widget class="QToolButton" name="modsDirBrowseBtn">
-            <property name="text">
-             <string>...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="labelLWJGLDir">
-            <property name="text">
-             <string>LW&amp;JGL:</string>
-            </property>
-            <property name="buddy">
-             <cstring>lwjglDirTextBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="2">
-           <widget class="QToolButton" name="lwjglDirBrowseBtn">
-            <property name="text">
-             <string>...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QLineEdit" name="iconsDirTextBox"/>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="labelIconsDir">
-            <property name="text">
-             <string>&amp;Icons:</string>
-            </property>
-            <property name="buddy">
-             <cstring>iconsDirTextBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="2">
-           <widget class="QToolButton" name="iconsDirBrowseBtn">
-            <property name="text">
-             <string>...</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="generalTab">
-      <attribute name="title">
-       <string>User Interface</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_6">
-       <item>
-        <widget class="QGroupBox" name="groupBox_3">
-         <property name="title">
-          <string>MultiMC notifications</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
-          <item>
-           <widget class="QPushButton" name="resetNotificationsBtn">
-            <property name="text">
-             <string>Reset hidden notifications</string>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="sortingModeBox">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="title">
-          <string>Instance view sorting mode</string>
-         </property>
-         <layout class="QHBoxLayout" name="sortingModeBoxLayout">
-          <item>
-           <widget class="QRadioButton" name="sortLastLaunchedBtn">
-            <property name="text">
-             <string>By &amp;last launched</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">sortingModeGroup</string>
-            </attribute>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="sortByNameBtn">
-            <property name="text">
-             <string>By &amp;name</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">sortingModeGroup</string>
-            </attribute>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string>Language (needs restart):</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>Icon Theme (needs restart, work in progress)</string>
-         </property>
-         <layout class="QHBoxLayout" name="themeBoxLayout">
-          <item>
-           <widget class="QComboBox" name="themeComboBox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::StrongFocus</enum>
-            </property>
-            <item>
-             <property name="text">
-              <string>Default</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Dark Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Light Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Blue Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Colored Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>OSX</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>iOS</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="generalTabSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Console</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QGroupBox" name="consoleSettingsBox">
-         <property name="title">
-          <string>Console Settings</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_3">
-          <item>
-           <widget class="QCheckBox" name="showConsoleCheck">
-            <property name="text">
-             <string>Show console while the game is running?</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="autoCloseConsoleCheck">
-            <property name="text">
-             <string>Automatically close console when the game quits?</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="themeBox_2">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Console font</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="1" column="0" colspan="2">
-           <widget class="QTextEdit" name="fontPreview">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="horizontalScrollBarPolicy">
-             <enum>Qt::ScrollBarAlwaysOff</enum>
-            </property>
-            <property name="undoRedoEnabled">
-             <bool>false</bool>
-            </property>
-            <property name="textInteractionFlags">
-             <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QFontComboBox" name="consoleFont">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QSpinBox" name="fontSizeBox">
-            <property name="minimum">
-             <number>5</number>
-            </property>
-            <property name="maximum">
-             <number>16</number>
-            </property>
-            <property name="value">
-             <number>11</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>tabWidget</tabstop>
-  <tabstop>autoUpdateCheckBox</tabstop>
-  <tabstop>updateChannelComboBox</tabstop>
-  <tabstop>trackFtbBox</tabstop>
-  <tabstop>ftbLauncherBox</tabstop>
-  <tabstop>ftbLauncherBrowseBtn</tabstop>
-  <tabstop>ftbBox</tabstop>
-  <tabstop>ftbBrowseBtn</tabstop>
-  <tabstop>instDirTextBox</tabstop>
-  <tabstop>instDirBrowseBtn</tabstop>
-  <tabstop>modsDirTextBox</tabstop>
-  <tabstop>modsDirBrowseBtn</tabstop>
-  <tabstop>lwjglDirTextBox</tabstop>
-  <tabstop>lwjglDirBrowseBtn</tabstop>
-  <tabstop>iconsDirTextBox</tabstop>
-  <tabstop>iconsDirBrowseBtn</tabstop>
-  <tabstop>resetNotificationsBtn</tabstop>
-  <tabstop>sortLastLaunchedBtn</tabstop>
-  <tabstop>sortByNameBtn</tabstop>
-  <tabstop>languageBox</tabstop>
-  <tabstop>themeComboBox</tabstop>
-  <tabstop>showConsoleCheck</tabstop>
-  <tabstop>autoCloseConsoleCheck</tabstop>
-  <tabstop>consoleFont</tabstop>
-  <tabstop>fontSizeBox</tabstop>
-  <tabstop>fontPreview</tabstop>
- </tabstops>
- <resources/>
- <connections/>
- <buttongroups>
-  <buttongroup name="sortingModeGroup"/>
- </buttongroups>
-</ui>
diff --git a/gui/pages/global/ProxyPage.cpp b/gui/pages/global/ProxyPage.cpp
deleted file mode 100644
index 02a5beb4..00000000
--- a/gui/pages/global/ProxyPage.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ProxyPage.h"
-#include "ui_ProxyPage.h"
-
-#include "logic/settings/SettingsObject.h"
-#include "MultiMC.h"
-
-ProxyPage::ProxyPage(QWidget *parent) : QWidget(parent), ui(new Ui::ProxyPage)
-{
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-	loadSettings();
-	updateCheckboxStuff();
-
-	connect(ui->proxyGroup, SIGNAL(buttonClicked(int)), SLOT(proxyChanged(int)));
-}
-
-ProxyPage::~ProxyPage()
-{
-	delete ui;
-}
-
-bool ProxyPage::apply()
-{
-	applySettings();
-	return true;
-}
-
-void ProxyPage::updateCheckboxStuff()
-{
-	ui->proxyAddrBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
-								 !ui->proxyDefaultBtn->isChecked());
-	ui->proxyAuthBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
-								 !ui->proxyDefaultBtn->isChecked());
-}
-
-void ProxyPage::proxyChanged(int)
-{
-	updateCheckboxStuff();
-}
-
-void ProxyPage::applySettings()
-{
-	auto s = 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";
-
-	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());
-}
-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);
-
-	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/gui/pages/global/ProxyPage.h b/gui/pages/global/ProxyPage.h
deleted file mode 100644
index edb7587a..00000000
--- a/gui/pages/global/ProxyPage.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <memory>
-#include <QDialog>
-
-#include "logic/java/JavaChecker.h"
-#include "gui/pages/BasePage.h"
-#include <MultiMC.h>
-
-namespace Ui
-{
-class ProxyPage;
-}
-
-class ProxyPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit ProxyPage(QWidget *parent = 0);
-	~ProxyPage();
-
-	QString displayName() const override
-	{
-		return tr("Proxy");
-	}
-	QIcon icon() const override
-	{
-		return 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();
-
-private
-slots:
-	void proxyChanged(int);
-
-private:
-	Ui::ProxyPage *ui;
-};
diff --git a/gui/pages/global/ProxyPage.ui b/gui/pages/global/ProxyPage.ui
deleted file mode 100644
index 7cddd66d..00000000
--- a/gui/pages/global/ProxyPage.ui
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProxyPage</class>
- <widget class="QWidget" name="ProxyPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>607</width>
-    <height>632</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Settings</string>
-  </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>:/icons/toolbar/settings</normaloff>:/icons/toolbar/settings</iconset>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <widget class="QWidget" name="tabWidgetPage1" native="true">
-      <attribute name="title">
-       <string/>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QGroupBox" name="proxyTypeBox">
-         <property name="title">
-          <string>Type</string>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_3">
-          <item>
-           <widget class="QRadioButton" name="proxyDefaultBtn">
-            <property name="toolTip">
-             <string>Uses your system's default proxy settings.</string>
-            </property>
-            <property name="text">
-             <string>Default</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">proxyGroup</string>
-            </attribute>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="proxyNoneBtn">
-            <property name="text">
-             <string>None</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">proxyGroup</string>
-            </attribute>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="proxySOCKS5Btn">
-            <property name="text">
-             <string>SOCKS5</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">proxyGroup</string>
-            </attribute>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="proxyHTTPBtn">
-            <property name="text">
-             <string>HTTP</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">proxyGroup</string>
-            </attribute>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="proxyAddrBox">
-         <property name="title">
-          <string>Address and Port</string>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <widget class="QLineEdit" name="proxyAddrEdit">
-            <property name="placeholderText">
-             <string>127.0.0.1</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QSpinBox" name="proxyPortEdit">
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-            <property name="buttonSymbols">
-             <enum>QAbstractSpinBox::PlusMinus</enum>
-            </property>
-            <property name="maximum">
-             <number>65535</number>
-            </property>
-            <property name="value">
-             <number>8080</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="proxyAuthBox">
-         <property name="title">
-          <string>Authentication</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_5">
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="proxyUserEdit"/>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="proxyUsernameLabel">
-            <property name="text">
-             <string>Username:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="proxyPasswordLabel">
-            <property name="text">
-             <string>Password:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="proxyPassEdit">
-            <property name="echoMode">
-             <enum>QLineEdit::Password</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0" colspan="2">
-           <widget class="QLabel" name="proxyPlainTextWarningLabel">
-            <property name="text">
-             <string>Note: Proxy username and password are stored in plain text inside MultiMC's configuration file!</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
- <buttongroups>
-  <buttongroup name="proxyGroup"/>
- </buttongroups>
-</ui>