Rework the settings dialog. Rework all of it. Thoroughly.

Also introduces the ColumnResizer from:
https://github.com/agateau/columnresizer/

26 files changed, 2286 insertions, 1525 deletions

diff --git a/gui/ColumnResizer.cpp b/gui/ColumnResizer.cpp
new file mode 100644
index 00000000..1c5597aa
--- /dev/null
+++ b/gui/ColumnResizer.cpp
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2011 Aurélien Gâteau <agateau@kde.org>
+ * License: LGPL v2.1 or later (see COPYING)
+ */
+#include "ColumnResizer.h"
+
+#include <QDebug>
+#include <QEvent>
+#include <QFormLayout>
+#include <QGridLayout>
+#include <QTimer>
+#include <QWidget>
+
+class FormLayoutWidgetItem : public QWidgetItem
+{
+public:
+    FormLayoutWidgetItem(QWidget* widget, QFormLayout* formLayout, QFormLayout::ItemRole itemRole)
+    : QWidgetItem(widget)
+    , m_width(-1)
+    , m_formLayout(formLayout)
+    , m_itemRole(itemRole)
+    {}
+
+    QSize sizeHint() const
+    {
+        QSize size = QWidgetItem::sizeHint();
+        if (m_width != -1) {
+            size.setWidth(m_width);
+        }
+        return size;
+    }
+
+    QSize minimumSize() const
+    {
+        QSize size = QWidgetItem::minimumSize();
+        if (m_width != -1) {
+            size.setWidth(m_width);
+        }
+        return size;
+    }
+
+    QSize maximumSize() const
+    {
+        QSize size = QWidgetItem::maximumSize();
+        if (m_width != -1) {
+            size.setWidth(m_width);
+        }
+        return size;
+    }
+
+    void setWidth(int width)
+    {
+        if (width != m_width) {
+            m_width = width;
+            invalidate();
+        }
+    }
+
+    void setGeometry(const QRect& _rect)
+    {
+        QRect rect = _rect;
+        int width = widget()->sizeHint().width();
+        if (m_itemRole == QFormLayout::LabelRole && m_formLayout->labelAlignment() & Qt::AlignRight) {
+            rect.setLeft(rect.right() - width);
+        }
+        QWidgetItem::setGeometry(rect);
+    }
+
+    QFormLayout* formLayout() const
+    {
+        return m_formLayout;
+    }
+
+private:
+    int m_width;
+    QFormLayout* m_formLayout;
+    QFormLayout::ItemRole m_itemRole;
+};
+
+typedef QPair<QGridLayout*, int> GridColumnInfo;
+
+class ColumnResizerPrivate
+{
+public:
+    ColumnResizerPrivate(ColumnResizer* q_ptr)
+    : q(q_ptr)
+    , m_updateTimer(new QTimer(q))
+    {
+        m_updateTimer->setSingleShot(true);
+        m_updateTimer->setInterval(0);
+        QObject::connect(m_updateTimer, SIGNAL(timeout()), q, SLOT(updateWidth()));
+    }
+
+    void scheduleWidthUpdate()
+    {
+        m_updateTimer->start();
+    }
+
+    ColumnResizer* q;
+    QTimer* m_updateTimer;
+    QList<QWidget*> m_widgets;
+    QList<FormLayoutWidgetItem*> m_wrWidgetItemList;
+    QList<GridColumnInfo> m_gridColumnInfoList;
+};
+
+ColumnResizer::ColumnResizer(QObject* parent)
+: QObject(parent)
+, d(new ColumnResizerPrivate(this))
+{}
+
+ColumnResizer::~ColumnResizer()
+{
+    delete d;
+}
+
+void ColumnResizer::addWidget(QWidget* widget)
+{
+    d->m_widgets.append(widget);
+    widget->installEventFilter(this);
+    d->scheduleWidthUpdate();
+}
+
+void ColumnResizer::updateWidth()
+{
+    int width = 0;
+    Q_FOREACH(QWidget* widget, d->m_widgets) {
+        width = qMax(widget->sizeHint().width(), width);
+    }
+    Q_FOREACH(FormLayoutWidgetItem* item, d->m_wrWidgetItemList) {
+        item->setWidth(width);
+        item->formLayout()->update();
+    }
+    Q_FOREACH(GridColumnInfo info, d->m_gridColumnInfoList) {
+        info.first->setColumnMinimumWidth(info.second, width);
+    }
+}
+
+bool ColumnResizer::eventFilter(QObject*, QEvent* event)
+{
+    if (event->type() == QEvent::Resize) {
+        d->scheduleWidthUpdate();
+    }
+    return false;
+}
+
+void ColumnResizer::addWidgetsFromLayout(QLayout* layout, int column)
+{
+    Q_ASSERT(column >= 0);
+    QGridLayout* gridLayout = qobject_cast<QGridLayout*>(layout);
+    QFormLayout* formLayout = qobject_cast<QFormLayout*>(layout);
+    if (gridLayout) {
+        addWidgetsFromGridLayout(gridLayout, column);
+    } else if (formLayout) {
+        if (column > QFormLayout::SpanningRole) {
+            qCritical() << "column should not be more than" << QFormLayout::SpanningRole << "for QFormLayout";
+            return;
+        }
+        QFormLayout::ItemRole role = static_cast<QFormLayout::ItemRole>(column);
+        addWidgetsFromFormLayout(formLayout, role);
+    } else {
+        qCritical() << "Don't know how to handle layout" << layout;
+    }
+}
+
+void ColumnResizer::addWidgetsFromGridLayout(QGridLayout* layout, int column)
+{
+    for (int row = 0; row < layout->rowCount(); ++row) {
+        QLayoutItem* item = layout->itemAtPosition(row, column);
+        if (!item) {
+            continue;
+        }
+        QWidget* widget = item->widget();
+        if (!widget) {
+            continue;
+        }
+        addWidget(widget);
+    }
+    d->m_gridColumnInfoList << GridColumnInfo(layout, column);
+}
+
+void ColumnResizer::addWidgetsFromFormLayout(QFormLayout* layout, QFormLayout::ItemRole role)
+{
+    for (int row = 0; row < layout->rowCount(); ++row) {
+        QLayoutItem* item = layout->itemAt(row, role);
+        if (!item) {
+            continue;
+        }
+        QWidget* widget = item->widget();
+        if (!widget) {
+            continue;
+        }
+        layout->removeItem(item);
+        delete item;
+        FormLayoutWidgetItem* newItem = new FormLayoutWidgetItem(widget, layout, role);
+        layout->setItem(row, role, newItem);
+        addWidget(widget);
+        d->m_wrWidgetItemList << newItem;
+    }
+}
+
+#include <ColumnResizer.moc>
+// vi: ts=4 sw=4 et
diff --git a/gui/ColumnResizer.h b/gui/ColumnResizer.h
new file mode 100644
index 00000000..4bbac383
--- /dev/null
+++ b/gui/ColumnResizer.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2011 Aurélien Gâteau <agateau@kde.org>
+ * License: LGPL v2.1 or later (see COPYING)
+ */
+#pragma once
+
+#include <QFormLayout>
+
+#include <QtCore/QObject>
+#include <QtCore/QList>
+
+class QEvent;
+class QGridLayout;
+class QLayout;
+class QWidget;
+
+class ColumnResizerPrivate;
+class ColumnResizer : public QObject
+{
+    Q_OBJECT
+public:
+    ColumnResizer(QObject* parent = 0);
+    ~ColumnResizer();
+
+    void addWidget(QWidget* widget);
+    void addWidgetsFromLayout(QLayout*, int column);
+    void addWidgetsFromGridLayout(QGridLayout*, int column);
+    void addWidgetsFromFormLayout(QFormLayout*, QFormLayout::ItemRole role);
+
+private Q_SLOTS:
+    void updateWidth();
+
+protected:
+    bool eventFilter(QObject*, QEvent* event);
+
+private:
+    ColumnResizerPrivate* const d;
+};
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 81ee466b..ce03d7b9 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -62,9 +62,12 @@
 #include "gui/dialogs/EditAccountDialog.h"
 #include "gui/dialogs/NotificationDialog.h"
 
-#include "gui/pages/global/SettingsPage.h"
+#include "gui/pages/global/MultiMCPage.h"
 #include "gui/pages/global/ExternalToolsPage.h"
 #include "gui/pages/global/AccountListPage.h"
+#include "pages/global/ProxyPage.h"
+#include "pages/global/JavaPage.h"
+#include "pages/global/MinecraftPage.h"
 
 #include "gui/ConsoleWindow.h"
 #include "pagedialog/PageDialog.h"
@@ -250,9 +253,12 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 	// set up global pages dialog
 	{
 		m_globalSettingsProvider = std::make_shared<GenericPageProvider>(tr("Settings"));
-		m_globalSettingsProvider->addPage<AccountListPage>();
-		m_globalSettingsProvider->addPage<SettingsPage>();
+		m_globalSettingsProvider->addPage<MultiMCPage>();
+		m_globalSettingsProvider->addPage<MinecraftPage>();
+		m_globalSettingsProvider->addPage<JavaPage>();
+		m_globalSettingsProvider->addPage<ProxyPage>();
 		m_globalSettingsProvider->addPage<ExternalToolsPage>();
+		m_globalSettingsProvider->addPage<AccountListPage>();
 	}
 
 	// Update the menu when the active account changes.
diff --git a/gui/dialogs/AboutDialog.ui b/gui/dialogs/AboutDialog.ui
index 04983299..93fa8963 100644
--- a/gui/dialogs/AboutDialog.ui
+++ b/gui/dialogs/AboutDialog.ui
@@ -96,7 +96,7 @@
    <item>
     <widget class="QToolBox" name="toolBox">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="aboutPage">
       <property name="geometry">
@@ -104,7 +104,7 @@
         <x>0</x>
         <y>0</y>
         <width>689</width>
-        <height>331</height>
+        <height>311</height>
        </rect>
       </property>
       <attribute name="label">
@@ -229,7 +229,7 @@
         <x>0</x>
         <y>0</y>
         <width>689</width>
-        <height>331</height>
+        <height>311</height>
        </rect>
       </property>
       <attribute name="label">
@@ -245,8 +245,8 @@
           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Bitstream Vera Sans'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textInteractionFlags">
           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
@@ -271,7 +271,7 @@ p, li { white-space: pre-wrap; }
         <x>0</x>
         <y>0</y>
         <width>689</width>
-        <height>331</height>
+        <height>311</height>
        </rect>
       </property>
       <attribute name="label">
@@ -298,7 +298,7 @@ p, li { white-space: pre-wrap; }
           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans Mono'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans Mono'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Bitstream Vera Sans'; font-size:18pt; font-weight:600;&quot;&gt;MultiMC&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Copyright 2012-2014 MultiMC Contributors&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Licensed under the Apache License, Version 2.0 (the &amp;quot;License&amp;quot;);&lt;/span&gt;&lt;/p&gt;
@@ -422,7 +422,7 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; */&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Bitstream Vera Sans'; font-size:18pt; font-weight:600;&quot;&gt;Java IconLoader class&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Copyright (c) 2011, Chris Molini&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;All rights reserved.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
@@ -447,8 +447,13 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Bitstream Vera Sans'; font-size:18pt; font-weight:600;&quot;&gt;ColumnResizer&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;/*&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; * Copyright 2011 Aurélien Gâteau &amp;lt;agateau@kde.org&amp;gt;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; * License: LGPL v2.1 or later (see COPYING)&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; */&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
@@ -459,8 +464,8 @@ p, li { white-space: pre-wrap; }
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>689</width>
-        <height>331</height>
+        <width>98</width>
+        <height>88</height>
        </rect>
       </property>
       <attribute name="label">
@@ -473,12 +478,12 @@ p, li { white-space: pre-wrap; }
           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Bitstream Vera Sans'; font-size:11pt;&quot;&gt;We keep MultiMC open source because we think it's important to be able to see the source code for a project like this, and we do so using the Apache license.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Bitstream Vera Sans'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Bitstream Vera Sans'; font-size:11pt;&quot;&gt;Part of the reason for using the Apache license is we don't want people using the &amp;quot;MultiMC&amp;quot; name when redistributing the project. This means people must take the time to go through the source code and remove all references to &amp;quot;MultiMC&amp;quot;, including but not limited to the project icon and the title of windows, (no *MultiMC-fork* in the title).&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Bitstream Vera Sans'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Bitstream Vera Sans'; font-size:11pt;&quot;&gt;The Apache license covers reasonable use for the name - a mention of the project's origins in the About dialog and the license is acceptable. However, it should be abundantly clear that the project is a fork &lt;/span&gt;&lt;span style=&quot; font-family:'Bitstream Vera Sans'; font-size:11pt; font-weight:600;&quot;&gt;without&lt;/span&gt;&lt;span style=&quot; font-family:'Bitstream Vera Sans'; font-size:11pt;&quot;&gt; implying that you have our blessing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Bitstream Vera Sans'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;We keep MultiMC open source because we think it's important to be able to see the source code for a project like this, and we do so using the Apache license.&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Part of the reason for using the Apache license is we don't want people using the &amp;quot;MultiMC&amp;quot; name when redistributing the project. This means people must take the time to go through the source code and remove all references to &amp;quot;MultiMC&amp;quot;, including but not limited to the project icon and the title of windows, (no *MultiMC-fork* in the title).&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The Apache license covers reasonable use for the name - a mention of the project's origins in the About dialog and the license is acceptable. However, it should be abundantly clear that the project is a fork &lt;span style=&quot; font-weight:600;&quot;&gt;without&lt;/span&gt; implying that you have our blessing.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textInteractionFlags">
           <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
diff --git a/gui/pages/global/AccountListPage.cpp b/gui/pages/global/AccountListPage.cpp
index cad7d5bc..00487d57 100644
--- a/gui/pages/global/AccountListPage.cpp
+++ b/gui/pages/global/AccountListPage.cpp
@@ -34,9 +34,10 @@
 #include <MultiMC.h>
 
 AccountListPage::AccountListPage(QWidget *parent)
-	: QDialog(parent), ui(new Ui::AccountListPage)
+	: QWidget(parent), ui(new Ui::AccountListPage)
 {
 	ui->setupUi(this);
+	ui->tabWidget->tabBar()->hide();
 
 	m_accounts = MMC->accounts();
 
diff --git a/gui/pages/global/AccountListPage.h b/gui/pages/global/AccountListPage.h
index fd4724d1..fd2c96e3 100644
--- a/gui/pages/global/AccountListPage.h
+++ b/gui/pages/global/AccountListPage.h
@@ -29,7 +29,7 @@ class AccountListPage;
 
 class AuthenticateTask;
 
-class AccountListPage : public QDialog, public BasePage
+class AccountListPage : public QWidget, public BasePage
 {
 	Q_OBJECT
 public:
diff --git a/gui/pages/global/AccountListPage.ui b/gui/pages/global/AccountListPage.ui
index 1e5b07eb..8ad78cf4 100644
--- a/gui/pages/global/AccountListPage.ui
+++ b/gui/pages/global/AccountListPage.ui
@@ -6,81 +6,107 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <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="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>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
      </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">
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>Tab 1</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout">
        <item>
-        <widget class="QPushButton" name="addAccountBtn">
+        <widget class="QLabel" name="welcomeLabel">
          <property name="text">
-          <string>&amp;Add</string>
+          <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>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="rmAccountBtn">
-         <property name="text">
-          <string>&amp;Remove</string>
+         <property name="wordWrap">
+          <bool>true</bool>
          </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>
+        <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>
-     </item>
-    </layout>
+     </widget>
+    </widget>
    </item>
   </layout>
  </widget>
diff --git a/gui/pages/global/BaseSettingsPage.cpp b/gui/pages/global/BaseSettingsPage.cpp
deleted file mode 100644
index 167b23c0..00000000
--- a/gui/pages/global/BaseSettingsPage.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2014 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 "BaseSettingsPage.h"
-
-#include "MultiMC.h"
-
-void BaseSettingsPage::opened()
-{
-	loadSettings(MMC->settings().get());
-}
-bool BaseSettingsPage::apply()
-{
-	applySettings(MMC->settings().get());
-	return true;
-}
diff --git a/gui/pages/global/BaseSettingsPage.h b/gui/pages/global/BaseSettingsPage.h
deleted file mode 100644
index 55e5f2a4..00000000
--- a/gui/pages/global/BaseSettingsPage.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2014 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 "gui/pages/BasePage.h"
-
-class SettingsObject;
-
-class BaseSettingsPage : public BasePage
-{
-public:
-	virtual ~BaseSettingsPage()
-	{
-	}
-
-	void opened() override;
-	bool apply() override;
-
-protected:
-	virtual void loadSettings(SettingsObject *object) = 0;
-	virtual void applySettings(SettingsObject *object) = 0;
-};
diff --git a/gui/pages/global/ExternalToolsPage.cpp b/gui/pages/global/ExternalToolsPage.cpp
index e0312ee5..417a13e3 100644
--- a/gui/pages/global/ExternalToolsPage.cpp
+++ b/gui/pages/global/ExternalToolsPage.cpp
@@ -18,6 +18,7 @@
 
 #include <QMessageBox>
 #include <QFileDialog>
+#include <QStandardPaths>
 
 #include <pathutils.h>
 
@@ -30,10 +31,16 @@ ExternalToolsPage::ExternalToolsPage(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()
@@ -41,17 +48,35 @@ ExternalToolsPage::~ExternalToolsPage()
 	delete ui;
 }
 
-void ExternalToolsPage::loadSettings(SettingsObject *object)
+void ExternalToolsPage::loadSettings()
 {
-	ui->jprofilerPathEdit->setText(object->get("JProfilerPath").toString());
-	ui->jvisualvmPathEdit->setText(object->get("JVisualVMPath").toString());
-	ui->mceditPathEdit->setText(object->get("MCEditPath").toString());
+	auto s = MMC->settings();
+	ui->jprofilerPathEdit->setText(s->get("JProfilerPath").toString());
+	ui->jvisualvmPathEdit->setText(s->get("JVisualVMPath").toString());
+	ui->mceditPathEdit->setText(s->get("MCEditPath").toString());
+
+	// Editors
+	ui->jsonEditorTextBox->setText(s->get("JsonEditor").toString());
 }
-void ExternalToolsPage::applySettings(SettingsObject *object)
+void ExternalToolsPage::applySettings()
 {
-	object->set("JProfilerPath", ui->jprofilerPathEdit->text());
-	object->set("JVisualVMPath", ui->jvisualvmPathEdit->text());
-	object->set("MCEditPath", ui->mceditPathEdit->text());
+	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()
@@ -175,3 +200,39 @@ void ExternalToolsPage::on_mceditCheckBtn_clicked()
 		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
index 1b35a92b..027e164e 100644
--- a/gui/pages/global/ExternalToolsPage.h
+++ b/gui/pages/global/ExternalToolsPage.h
@@ -17,13 +17,13 @@
 
 #include <QWidget>
 
-#include "BaseSettingsPage.h"
+#include "gui/pages/BasePage.h"
 
 namespace Ui {
 class ExternalToolsPage;
 }
 
-class ExternalToolsPage : public QWidget, public BaseSettingsPage
+class ExternalToolsPage : public QWidget, public BasePage
 {
 	Q_OBJECT
 
@@ -47,10 +47,11 @@ public:
 	{
 		return "External-tools";
 	}
+	virtual bool apply();
 
-protected:
-	void loadSettings(SettingsObject *object) override;
-	void applySettings(SettingsObject *object) override;
+private:
+	void loadSettings();
+	void applySettings();
 
 private:
 	Ui::ExternalToolsPage *ui;
@@ -63,4 +64,5 @@ slots:
 	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
index 96650f0f..ba1b6f01 100644
--- a/gui/pages/global/ExternalToolsPage.ui
+++ b/gui/pages/global/ExternalToolsPage.ui
@@ -6,138 +6,190 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>494</width>
-    <height>562</height>
+    <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="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>JProfiler</string>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
      </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 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>
-   <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>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>160</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/gui/pages/global/JavaPage.cpp b/gui/pages/global/JavaPage.cpp
new file mode 100644
index 00000000..86451411
--- /dev/null
+++ b/gui/pages/global/JavaPage.cpp
@@ -0,0 +1,146 @@
+/* Copyright 2013 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 "logic/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
new file mode 100644
index 00000000..d0228bd2
--- /dev/null
+++ b/gui/pages/global/JavaPage.h
@@ -0,0 +1,72 @@
+/* Copyright 2013 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"
+
+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 QIcon::fromTheme("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
new file mode 100644
index 00000000..6ae41a49
--- /dev/null
+++ b/gui/pages/global/JavaPage.ui
@@ -0,0 +1,303 @@
+<?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
new file mode 100644
index 00000000..0fe56fde
--- /dev/null
+++ b/gui/pages/global/MinecraftPage.cpp
@@ -0,0 +1,104 @@
+/* Copyright 2013 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 "logic/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();
+	// Minecraft version updates
+	s->set("AutoUpdateMinecraftVersions", ui->autoupdateMinecraft->isChecked());
+
+	// Console
+	s->set("ShowConsole", ui->showConsoleCheck->isChecked());
+	s->set("AutoCloseConsole", ui->autoCloseConsoleCheck->isChecked());
+
+	// 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();
+	// Minecraft version updates
+	ui->autoupdateMinecraft->setChecked(s->get("AutoUpdateMinecraftVersions").toBool());
+	
+	// Console
+	ui->showConsoleCheck->setChecked(s->get("ShowConsole").toBool());
+	ui->autoCloseConsoleCheck->setChecked(s->get("AutoCloseConsole").toBool());
+
+	// 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
new file mode 100644
index 00000000..90299020
--- /dev/null
+++ b/gui/pages/global/MinecraftPage.h
@@ -0,0 +1,69 @@
+/* Copyright 2013 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"
+
+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 QIcon::fromTheme("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
new file mode 100644
index 00000000..e938d09d
--- /dev/null
+++ b/gui/pages/global/MinecraftPage.ui
@@ -0,0 +1,184 @@
+<?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>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="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="groupBox_5">
+         <property name="title">
+          <string>Minecraft Version Updates</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_14">
+          <item>
+           <widget class="QCheckBox" name="autoupdateMinecraft">
+            <property name="text">
+             <string>Automatically update to latest version revision</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <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 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>854</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>480</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="title">
+          <string>Console Settings</string>
+         </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">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>autoupdateMinecraft</tabstop>
+  <tabstop>maximizedCheckBox</tabstop>
+  <tabstop>windowWidthSpinBox</tabstop>
+  <tabstop>windowHeightSpinBox</tabstop>
+  <tabstop>showConsoleCheck</tabstop>
+  <tabstop>autoCloseConsoleCheck</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/gui/pages/global/SettingsPage.cpp b/gui/pages/global/MultiMCPage.cpp
index 37b0539c..2d6eb7d5 100644
--- a/gui/pages/global/SettingsPage.cpp
+++ b/gui/pages/global/MultiMCPage.cpp
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#include "SettingsPage.h"
-#include "ui_SettingsPage.h"
+#include "MultiMCPage.h"
+#include "ui_MultiMCPage.h"
 
 #include <QFileDialog>
 #include <QMessageBox>
@@ -25,6 +25,7 @@
 #include "gui/Platform.h"
 #include "gui/dialogs/VersionSelectDialog.h"
 #include "gui/dialogs/CustomMessageBox.h"
+#include <gui/ColumnResizer.h>
 
 #include "logic/NagUtils.h"
 
@@ -48,22 +49,20 @@ enum InstSortMode
 	Sort_LastLaunch
 };
 
-SettingsPage::SettingsPage(QWidget *parent) : QWidget(parent), ui(new Ui::SettingsPage)
+MultiMCPage::MultiMCPage(QWidget *parent) : QWidget(parent), ui(new Ui::MultiMCPage)
 {
-	MultiMCPlatform::fixWM_CLASS(this);
 	ui->setupUi(this);
 	ui->sortingModeGroup->setId(ui->sortByNameBtn, Sort_Name);
 	ui->sortingModeGroup->setId(ui->sortLastLaunchedBtn, Sort_LastLaunch);
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-	ui->jsonEditorTextBox->setClearButtonEnabled(true);
-#endif
+	auto resizer = new ColumnResizer(this);
+	resizer->addWidgetsFromLayout(ui->groupBox->layout(), 1);
+	resizer->addWidgetsFromLayout(ui->foldersBox->layout(), 1);
 
-	restoreGeometry(
-		QByteArray::fromBase64(MMC->settings()->get("SettingsGeometry").toByteArray()));
+	loadSettings();
 
 	QObject::connect(MMC->updateChecker().get(), &UpdateChecker::channelListLoaded, this,
-					 &SettingsPage::refreshUpdateChannelList);
+					 &MultiMCPage::refreshUpdateChannelList);
 
 	if (MMC->updateChecker()->hasChannels())
 	{
@@ -73,32 +72,20 @@ SettingsPage::SettingsPage(QWidget *parent) : QWidget(parent), ui(new Ui::Settin
 	{
 		MMC->updateChecker()->updateChanList(false);
 	}
-	connect(ui->proxyGroup, SIGNAL(buttonClicked(int)), SLOT(proxyChanged(int)));
 }
 
-SettingsPage::~SettingsPage()
+MultiMCPage::~MultiMCPage()
 {
 	delete ui;
 }
 
-void SettingsPage::closeEvent(QCloseEvent *ev)
+bool MultiMCPage::apply()
 {
-	MMC->settings()->set("SettingsGeometry", saveGeometry().toBase64());
-
-	QWidget::closeEvent(ev);
-}
-
-void SettingsPage::updateCheckboxStuff()
-{
-	ui->windowWidthSpinBox->setEnabled(!ui->maximizedCheckBox->isChecked());
-	ui->windowHeightSpinBox->setEnabled(!ui->maximizedCheckBox->isChecked());
-	ui->proxyAddrBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
-								 !ui->proxyDefaultBtn->isChecked());
-	ui->proxyAuthBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
-								 !ui->proxyDefaultBtn->isChecked());
+	applySettings();
+	return true;
 }
 
-void SettingsPage::on_ftbLauncherBrowseBtn_clicked()
+void MultiMCPage::on_ftbLauncherBrowseBtn_clicked()
 {
 	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("FTB Launcher Directory"),
 														ui->ftbLauncherBox->text());
@@ -110,7 +97,7 @@ void SettingsPage::on_ftbLauncherBrowseBtn_clicked()
 		ui->ftbLauncherBox->setText(cooked_dir);
 	}
 }
-void SettingsPage::on_ftbBrowseBtn_clicked()
+void MultiMCPage::on_ftbBrowseBtn_clicked()
 {
 	QString raw_dir =
 		QFileDialog::getExistingDirectory(this, tr("FTB Directory"), ui->ftbBox->text());
@@ -123,7 +110,7 @@ void SettingsPage::on_ftbBrowseBtn_clicked()
 	}
 }
 
-void SettingsPage::on_instDirBrowseBtn_clicked()
+void MultiMCPage::on_instDirBrowseBtn_clicked()
 {
 	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Instance Directory"),
 														ui->instDirTextBox->text());
@@ -135,7 +122,7 @@ void SettingsPage::on_instDirBrowseBtn_clicked()
 		ui->instDirTextBox->setText(cooked_dir);
 	}
 }
-void SettingsPage::on_iconsDirBrowseBtn_clicked()
+void MultiMCPage::on_iconsDirBrowseBtn_clicked()
 {
 	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Icons Directory"),
 														ui->iconsDirTextBox->text());
@@ -147,7 +134,7 @@ void SettingsPage::on_iconsDirBrowseBtn_clicked()
 		ui->iconsDirTextBox->setText(cooked_dir);
 	}
 }
-void SettingsPage::on_modsDirBrowseBtn_clicked()
+void MultiMCPage::on_modsDirBrowseBtn_clicked()
 {
 	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Mods Directory"),
 														ui->modsDirTextBox->text());
@@ -159,7 +146,7 @@ void SettingsPage::on_modsDirBrowseBtn_clicked()
 		ui->modsDirTextBox->setText(cooked_dir);
 	}
 }
-void SettingsPage::on_lwjglDirBrowseBtn_clicked()
+void MultiMCPage::on_lwjglDirBrowseBtn_clicked()
 {
 	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("LWJGL Directory"),
 														ui->lwjglDirTextBox->text());
@@ -172,48 +159,7 @@ void SettingsPage::on_lwjglDirBrowseBtn_clicked()
 	}
 }
 
-void SettingsPage::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"));
-	}
-}
-
-void SettingsPage::on_maximizedCheckBox_clicked(bool checked)
-{
-	Q_UNUSED(checked);
-	updateCheckboxStuff();
-}
-
-void SettingsPage::proxyChanged(int)
-{
-	updateCheckboxStuff();
-}
-
-void SettingsPage::refreshUpdateChannelList()
+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
@@ -258,12 +204,12 @@ void SettingsPage::refreshUpdateChannelList()
 	ui->updateChannelComboBox->setEnabled(true);
 }
 
-void SettingsPage::updateChannelSelectionChanged(int index)
+void MultiMCPage::updateChannelSelectionChanged(int index)
 {
 	refreshUpdateChannelDesc();
 }
 
-void SettingsPage::refreshUpdateChannelDesc()
+void MultiMCPage::refreshUpdateChannelDesc()
 {
 	// Get the channel list.
 	QList<UpdateChecker::ChannelListEntry> channelList = MMC->updateChecker()->getChannelList();
@@ -285,8 +231,9 @@ void SettingsPage::refreshUpdateChannelDesc()
 	}
 }
 
-void SettingsPage::applySettings(SettingsObject *s)
+void MultiMCPage::applySettings()
 {
+	auto s = MMC->settings();
 	// Language
 	s->set("Language",
 		   ui->languageBox->itemData(ui->languageBox->currentIndex()).toLocale().bcp47Name());
@@ -325,62 +272,6 @@ void SettingsPage::applySettings(SettingsObject *s)
 	s->set("LWJGLDir", ui->lwjglDirTextBox->text());
 	s->set("IconsDir", ui->iconsDirTextBox->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);
-
-	// Minecraft version updates
-	s->set("AutoUpdateMinecraftVersions", ui->autoupdateMinecraft->isChecked());
-
-	// Console
-	s->set("ShowConsole", ui->showConsoleCheck->isChecked());
-	s->set("AutoCloseConsole", ui->autoCloseConsoleCheck->isChecked());
-
-	// Window Size
-	s->set("LaunchMaximized", ui->maximizedCheckBox->isChecked());
-	s->set("MinecraftWinWidth", ui->windowWidthSpinBox->value());
-	s->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
-
-	// 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());
-
-	// 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());
-
 	auto sortMode = (InstSortMode)ui->sortingModeGroup->checkedId();
 	switch (sortMode)
 	{
@@ -392,11 +283,10 @@ void SettingsPage::applySettings(SettingsObject *s)
 		s->set("InstSortMode", "Name");
 		break;
 	}
-
-	s->set("PostExitCommand", ui->postExitCmdTextBox->text());
 }
-void SettingsPage::loadSettings(SettingsObject *s)
+void MultiMCPage::loadSettings()
 {
+	auto s = MMC->settings();
 	// Language
 	ui->languageBox->clear();
 	ui->languageBox->addItem(tr("English"), QLocale(QLocale::English));
@@ -437,26 +327,6 @@ void SettingsPage::loadSettings(SettingsObject *s)
 	ui->lwjglDirTextBox->setText(s->get("LWJGLDir").toString());
 	ui->iconsDirTextBox->setText(s->get("IconsDir").toString());
 
-	// Editors
-	ui->jsonEditorTextBox->setText(s->get("JsonEditor").toString());
-
-	// Minecraft version updates
-	ui->autoupdateMinecraft->setChecked(s->get("AutoUpdateMinecraftVersions").toBool());
-	
-	// Console
-	ui->showConsoleCheck->setChecked(s->get("ShowConsole").toBool());
-	ui->autoCloseConsoleCheck->setChecked(s->get("AutoCloseConsole").toBool());
-
-	// Window Size
-	ui->maximizedCheckBox->setChecked(s->get("LaunchMaximized").toBool());
-	ui->windowWidthSpinBox->setValue(s->get("MinecraftWinWidth").toInt());
-	ui->windowHeightSpinBox->setValue(s->get("MinecraftWinHeight").toInt());
-
-	// Memory
-	ui->minMemSpinBox->setValue(s->get("MinMemAlloc").toInt());
-	ui->maxMemSpinBox->setValue(s->get("MaxMemAlloc").toInt());
-	ui->permGenSpinBox->setValue(s->get("PermGen").toInt());
-
 	QString sortMode = s->get("InstSortMode").toString();
 
 	if (sortMode == "LastLaunch")
@@ -467,81 +337,4 @@ void SettingsPage::loadSettings(SettingsObject *s)
 	{
 		ui->sortByNameBtn->setChecked(true);
 	}
-
-	// 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());
-
-	// 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 SettingsPage::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 SettingsPage::on_javaBrowseBtn_clicked()
-{
-	QString dir = QFileDialog::getOpenFileName(this, tr("Find Java executable"));
-	if (!dir.isNull())
-	{
-		ui->javaPathTextBox->setText(dir);
-	}
-}
-void SettingsPage::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 SettingsPage::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/SettingsPage.h b/gui/pages/global/MultiMCPage.h
index 46a38ec7..b465355f 100644
--- a/gui/pages/global/SettingsPage.h
+++ b/gui/pages/global/MultiMCPage.h
@@ -19,47 +19,44 @@
 #include <QDialog>
 
 #include "logic/java/JavaChecker.h"
-#include "BaseSettingsPage.h"
+#include "gui/pages/BasePage.h"
 
 class SettingsObject;
 
 namespace Ui
 {
-class SettingsPage;
+class MultiMCPage;
 }
 
-class SettingsPage : public QWidget, public BaseSettingsPage
+class MultiMCPage : public QWidget, public BasePage
 {
 	Q_OBJECT
 
 public:
-	explicit SettingsPage(QWidget *parent = 0);
-	~SettingsPage();
+	explicit MultiMCPage(QWidget *parent = 0);
+	~MultiMCPage();
 
 	QString displayName() const override
 	{
-		return tr("Settings");
+		return tr("MultiMC");
 	}
 	QIcon icon() const override
 	{
-		return QIcon::fromTheme("settings");
+		return QIcon::fromTheme("multimc");
 	}
 	QString id() const override
 	{
-		return "global-settings";
+		return "multimc-settings";
 	}
 	QString helpPage() const override
 	{
-		return "Global-settings";
+		return "MultiMC-settings";
 	}
+	bool apply() override;
 
-	void updateCheckboxStuff();
-
-
-protected:
-	void applySettings(SettingsObject *s) override;
-	void loadSettings(SettingsObject *s) override;
-	virtual void closeEvent(QCloseEvent *ev);
+private:
+	void applySettings();
+	void loadSettings();
 
 private
 slots:
@@ -71,16 +68,6 @@ slots:
 	void on_lwjglDirBrowseBtn_clicked();
 	void on_iconsDirBrowseBtn_clicked();
 
-	void on_jsonEditorBrowseBtn_clicked();
-
-	void on_maximizedCheckBox_clicked(bool checked);
-
-	void on_javaDetectBtn_clicked();
-	void on_javaTestBtn_clicked();
-	void on_javaBrowseBtn_clicked();
-
-	void checkFinished(JavaCheckResult result);
-
 	/*!
 	 * Updates the list of update channels in the combo box.
 	 */
@@ -92,11 +79,9 @@ slots:
 	void refreshUpdateChannelDesc();
 
     void updateChannelSelectionChanged(int index);
-	void proxyChanged(int);
 
 private:
-	Ui::SettingsPage *ui;
-	std::shared_ptr<JavaChecker> checker;
+	Ui::MultiMCPage *ui;
 
 	/*!
 	 * Stores the currently selected update channel.
diff --git a/gui/pages/global/MultiMCPage.ui b/gui/pages/global/MultiMCPage.ui
new file mode 100644
index 00000000..f456ebc1
--- /dev/null
+++ b/gui/pages/global/MultiMCPage.ui
@@ -0,0 +1,399 @@
+<?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>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="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>Update Channel:</string>
+            </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>Launcher:</string>
+            </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>
+           </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>Instances:</string>
+            </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>Mods:</string>
+            </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>LWJGL:</string>
+            </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>Icons:</string>
+            </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>20</width>
+           <height>40</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 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 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</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Simple (Light Icons)</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>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>autoUpdateCheckBox</tabstop>
+  <tabstop>updateChannelComboBox</tabstop>
+  <tabstop>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>
+ </tabstops>
+ <resources/>
+ <connections/>
+ <buttongroups>
+  <buttongroup name="sortingModeGroup"/>
+ </buttongroups>
+</ui>
diff --git a/gui/pages/global/ProxyPage.cpp b/gui/pages/global/ProxyPage.cpp
new file mode 100644
index 00000000..5578fbb7
--- /dev/null
+++ b/gui/pages/global/ProxyPage.cpp
@@ -0,0 +1,95 @@
+/* Copyright 2013 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
new file mode 100644
index 00000000..700a3af0
--- /dev/null
+++ b/gui/pages/global/ProxyPage.h
@@ -0,0 +1,66 @@
+/* Copyright 2013 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"
+
+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 QIcon::fromTheme("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
new file mode 100644
index 00000000..7cddd66d
--- /dev/null
+++ b/gui/pages/global/ProxyPage.ui
@@ -0,0 +1,197 @@
+<?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>
diff --git a/gui/pages/global/SettingsPage.ui b/gui/pages/global/SettingsPage.ui
deleted file mode 100644
index ed1d8cda..00000000
--- a/gui/pages/global/SettingsPage.ui
+++ /dev/null
@@ -1,985 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SettingsPage</class>
- <widget class="QWidget" name="SettingsPage">
-  <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="mainLayout">
-   <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="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>Update Channel:</string>
-            </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="2">
-           <widget class="QPushButton" name="ftbLauncherBrowseBtn">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <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="focusPolicy">
-             <enum>Qt::TabFocus</enum>
-            </property>
-            <property name="text">
-             <string>...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Launcher:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="ftbLauncherBox">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" colspan="2">
-           <widget class="QCheckBox" name="trackFtbBox">
-            <property name="text">
-             <string>Track FTB instances</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QLineEdit" name="ftbBox"/>
-          </item>
-          <item row="3" column="2">
-           <widget class="QPushButton" name="ftbBrowseBtn">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <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>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>Files:</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>Instances:</string>
-            </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>Mods:</string>
-            </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>LWJGL:</string>
-            </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>Icons:</string>
-            </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>20</width>
-           <height>40</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">
-       <item>
-        <layout class="QGridLayout" name="_2">
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_3">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Language (needs restart):</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QComboBox" name="languageBox"/>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QPushButton" name="resetNotificationsBtn">
-         <property name="text">
-          <string>Reset hidden notifications</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="sortingModeBox">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="title">
-          <string>Sorting Mode</string>
-         </property>
-         <layout class="QHBoxLayout" name="sortingModeBoxLayout">
-          <item>
-           <widget class="QRadioButton" name="sortLastLaunchedBtn">
-            <property name="text">
-             <string>By 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 name</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">sortingModeGroup</string>
-            </attribute>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="themeBox">
-         <property name="title">
-          <string>Icon Theme</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</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Light Icons)</string>
-             </property>
-            </item>
-           </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>JSON 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="generalTabSpacer">
-         <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 class="QWidget" name="minecraftTab">
-      <attribute name="title">
-       <string>Minecraft</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <widget class="QGroupBox" name="groupBox_5">
-         <property name="title">
-          <string>Minecraft Version Updates</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_14">
-          <item>
-           <widget class="QCheckBox" name="autoupdateMinecraft">
-            <property name="text">
-             <string>Automatically update to latest version revision</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <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 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>854</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>480</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="title">
-          <string>Console Settings</string>
-         </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">
-         <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 class="QWidget" name="javaTab">
-      <attribute name="title">
-       <string>Java</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_5">
-       <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 Settings</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 class="QWidget" name="networkTab">
-      <property name="toolTip">
-       <string>Network settings.</string>
-      </property>
-      <attribute name="title">
-       <string>Network</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_6">
-       <item>
-        <widget class="QGroupBox" name="proxySettingsBox">
-         <property name="title">
-          <string>Proxy</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_8">
-          <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>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>settingsTabs</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>languageBox</tabstop>
-  <tabstop>resetNotificationsBtn</tabstop>
-  <tabstop>sortLastLaunchedBtn</tabstop>
-  <tabstop>sortByNameBtn</tabstop>
-  <tabstop>themeComboBox</tabstop>
-  <tabstop>jsonEditorTextBox</tabstop>
-  <tabstop>jsonEditorBrowseBtn</tabstop>
-  <tabstop>autoupdateMinecraft</tabstop>
-  <tabstop>maximizedCheckBox</tabstop>
-  <tabstop>windowWidthSpinBox</tabstop>
-  <tabstop>windowHeightSpinBox</tabstop>
-  <tabstop>showConsoleCheck</tabstop>
-  <tabstop>autoCloseConsoleCheck</tabstop>
-  <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>
-  <tabstop>proxyDefaultBtn</tabstop>
-  <tabstop>proxyNoneBtn</tabstop>
-  <tabstop>proxySOCKS5Btn</tabstop>
-  <tabstop>proxyHTTPBtn</tabstop>
-  <tabstop>proxyAddrEdit</tabstop>
-  <tabstop>proxyPortEdit</tabstop>
-  <tabstop>proxyUserEdit</tabstop>
-  <tabstop>proxyPassEdit</tabstop>
- </tabstops>
- <resources/>
- <connections/>
- <buttongroups>
-  <buttongroup name="sortingModeGroup"/>
-  <buttongroup name="proxyGroup"/>
- </buttongroups>
-</ui>
diff --git a/gui/widgets/PageContainer.cpp b/gui/widgets/PageContainer.cpp
index a68f94cd..0620c725 100644
--- a/gui/widgets/PageContainer.cpp
+++ b/gui/widgets/PageContainer.cpp
@@ -124,6 +124,9 @@ void PageContainer::createUI()
 	headerHLayout->addSpacerItem(
 		new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored));
 	headerHLayout->addWidget(m_iconHeader);
+	const int rightMargin = MMC->style()->pixelMetric(QStyle::PM_LayoutRightMargin);
+	headerHLayout->addSpacerItem(
+		new QSpacerItem(rightMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
 
 	m_pageStack->setMargin(0);
 	m_pageStack->addWidget(new QWidget(this));