33 files changed, 915 insertions, 456 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b276cf8..43de626b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -297,8 +297,8 @@ gui/dialogs/IconPickerDialog.h
 gui/dialogs/IconPickerDialog.cpp
 gui/dialogs/LegacyModEditDialog.h
 gui/dialogs/LegacyModEditDialog.cpp
-gui/dialogs/OneSixModEditDialog.h
-gui/dialogs/OneSixModEditDialog.cpp
+gui/dialogs/DerpModEditDialog.h
+gui/dialogs/DerpModEditDialog.cpp
 gui/dialogs/ModEditDialogCommon.h
 gui/dialogs/ModEditDialogCommon.cpp
 gui/dialogs/EditNotesDialog.h
@@ -405,32 +405,34 @@ logic/LegacyUpdate.cpp
 logic/LegacyForge.h
 logic/LegacyForge.cpp
 
-# 1.6 instances
-logic/OneSixInstance.h
-logic/OneSixInstance.cpp
-logic/OneSixInstance_p.h
-logic/OneSixUpdate.h
-logic/OneSixUpdate.cpp
-logic/OneSixVersion.h
-logic/OneSixVersion.cpp
-logic/OneSixLibrary.h
-logic/OneSixLibrary.cpp
-logic/OneSixRule.h
-logic/OneSixRule.cpp
+# Derp instances
+logic/DerpUpdate.h
+logic/DerpUpdate.cpp
+logic/DerpVersion.h
+logic/DerpVersion.cpp
+logic/DerpLibrary.h
+logic/DerpLibrary.cpp
+logic/DerpRule.h
+logic/DerpRule.cpp
 logic/OpSys.h
 logic/OpSys.cpp
 logic/ForgeInstaller.h
 logic/ForgeInstaller.cpp
 logic/LiteLoaderInstaller.h
 logic/LiteLoaderInstaller.cpp
+logic/DerpInstance.h
+logic/DerpInstance.cpp
+logic/DerpInstance_p.h
+logic/DerpVersionBuilder.h
+logic/DerpVersionBuilder.cpp
 
 # Nostalgia
 logic/NostalgiaInstance.h
 logic/NostalgiaInstance.cpp
 
 # FTB
-logic/OneSixFTBInstance.h
-logic/OneSixFTBInstance.cpp
+logic/DerpFTBInstance.h
+logic/DerpFTBInstance.cpp
 logic/LegacyFTBInstance.h
 logic/LegacyFTBInstance.cpp
 
@@ -506,7 +508,7 @@ gui/dialogs/InstanceSettings.ui
 gui/dialogs/ProgressDialog.ui
 gui/dialogs/IconPickerDialog.ui
 gui/dialogs/LegacyModEditDialog.ui
-gui/dialogs/OneSixModEditDialog.ui
+gui/dialogs/DerpModEditDialog.ui
 gui/dialogs/EditNotesDialog.ui
 gui/dialogs/AccountListDialog.ui
 gui/dialogs/AccountSelectDialog.ui
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index ee9c3fad..ba394a94 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -84,7 +84,7 @@
 #include "logic/BaseInstance.h"
 #include "logic/InstanceFactory.h"
 #include "logic/MinecraftProcess.h"
-#include "logic/OneSixUpdate.h"
+#include "logic/DerpUpdate.h"
 #include "logic/JavaUtils.h"
 #include "logic/NagUtils.h"
 #include "logic/SkinUtils.h"
@@ -1257,7 +1257,7 @@ void MainWindow::on_actionChangeInstMCVersion_triggered()
 
 	VersionSelectDialog vselect(m_selectedInstance->versionList().get(),
 								tr("Change Minecraft version"), this);
-	vselect.setFilter(1, "OneSix");
+	vselect.setFilter(1, "Derp");
 	if(!vselect.exec() || !vselect.selectedVersion())
 		return;
 
diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/DerpModEditDialog.cpp
index 3982f17d..be17404c 100644
--- a/gui/dialogs/OneSixModEditDialog.cpp
+++ b/gui/dialogs/DerpModEditDialog.cpp
@@ -23,9 +23,9 @@
 #include <QKeyEvent>
 #include <QDesktopServices>
 
-#include "OneSixModEditDialog.h"
+#include "DerpModEditDialog.h"
 #include "ModEditDialogCommon.h"
-#include "ui_OneSixModEditDialog.h"
+#include "ui_DerpModEditDialog.h"
 
 #include "gui/Platform.h"
 #include "gui/dialogs/CustomMessageBox.h"
@@ -34,14 +34,14 @@
 #include "gui/dialogs/ProgressDialog.h"
 
 #include "logic/ModList.h"
-#include "logic/OneSixVersion.h"
+#include "logic/DerpVersion.h"
 #include "logic/EnabledItemFilter.h"
 #include "logic/lists/ForgeVersionList.h"
 #include "logic/ForgeInstaller.h"
 #include "logic/LiteLoaderInstaller.h"
 
-OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
-	: QDialog(parent), ui(new Ui::OneSixModEditDialog), m_inst(inst)
+DerpModEditDialog::DerpModEditDialog(DerpInstance *inst, QWidget *parent)
+	: QDialog(parent), ui(new Ui::DerpModEditDialog), m_inst(inst)
 {
 	MultiMCPlatform::fixWM_CLASS(this);
 	ui->setupUi(this);
@@ -81,64 +81,35 @@ OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
 		ui->resPackTreeView->installEventFilter(this);
 		m_resourcepacks->startWatching();
 	}
+
+	connect(m_inst, &DerpInstance::versionReloaded, this, &DerpModEditDialog::updateVersionControls);
 }
 
-OneSixModEditDialog::~OneSixModEditDialog()
+DerpModEditDialog::~DerpModEditDialog()
 {
 	m_mods->stopWatching();
 	m_resourcepacks->stopWatching();
 	delete ui;
 }
 
-void OneSixModEditDialog::updateVersionControls()
+void DerpModEditDialog::updateVersionControls()
 {
 	bool customVersion = m_inst->versionIsCustom();
-	ui->customizeBtn->setEnabled(!customVersion);
-	ui->revertBtn->setEnabled(customVersion);
 	ui->forgeBtn->setEnabled(true);
 	ui->liteloaderBtn->setEnabled(LiteLoaderInstaller(m_inst->intendedVersionId()).canApply());
 	ui->customEditorBtn->setEnabled(customVersion);
 }
 
-void OneSixModEditDialog::disableVersionControls()
+void DerpModEditDialog::disableVersionControls()
 {
-	ui->customizeBtn->setEnabled(false);
-	ui->revertBtn->setEnabled(false);
 	ui->forgeBtn->setEnabled(false);
 	ui->liteloaderBtn->setEnabled(false);
 	ui->customEditorBtn->setEnabled(false);
 }
 
-void OneSixModEditDialog::on_customizeBtn_clicked()
-{
-	if (m_inst->customizeVersion())
-	{
-		m_version = m_inst->getFullVersion();
-		main_model->setSourceModel(m_version.get());
-		updateVersionControls();
-	}
-}
-
-void OneSixModEditDialog::on_revertBtn_clicked()
-{
-	auto response = CustomMessageBox::selectable(
-		this, tr("Revert?"), tr("Do you want to revert the "
-								"version of this instance to its original configuration?"),
-		QMessageBox::Question, QMessageBox::Yes | QMessageBox::No)->exec();
-	if (response == QMessageBox::Yes)
-	{
-		if (m_inst->revertCustomVersion())
-		{
-			m_version = m_inst->getFullVersion();
-			main_model->setSourceModel(m_version.get());
-			updateVersionControls();
-		}
-	}
-}
-
-void OneSixModEditDialog::on_customEditorBtn_clicked()
+void DerpModEditDialog::on_customEditorBtn_clicked()
 {
-	if (m_inst->versionIsCustom())
+	if (QDir(m_inst->instanceRoot()).exists("custom.json"))
 	{
 		if (!MMC->openJsonEditor(m_inst->instanceRoot() + "/custom.json"))
 		{
@@ -147,40 +118,12 @@ void OneSixModEditDialog::on_customEditorBtn_clicked()
 	}
 }
 
-void OneSixModEditDialog::on_forgeBtn_clicked()
+void DerpModEditDialog::on_forgeBtn_clicked()
 {
 	VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this);
 	vselect.setFilter(1, m_inst->currentVersionId());
 	if (vselect.exec() && vselect.selectedVersion())
 	{
-		if (m_inst->versionIsCustom())
-		{
-			auto reply = QMessageBox::question(
-				this, tr("Revert?"),
-				tr("This will revert any "
-				   "changes you did to the version up to this point. Is that "
-				   "OK?"),
-				QMessageBox::Yes | QMessageBox::No);
-			if (reply == QMessageBox::Yes)
-			{
-				m_inst->revertCustomVersion();
-				m_inst->customizeVersion();
-				{
-					m_version = m_inst->getFullVersion();
-					main_model->setSourceModel(m_version.get());
-					updateVersionControls();
-				}
-			}
-			else
-				return;
-		}
-		else
-		{
-			m_inst->customizeVersion();
-			m_version = m_inst->getFullVersion();
-			main_model->setSourceModel(m_version.get());
-			updateVersionControls();
-		}
 		ForgeVersionPtr forgeVersion =
 			std::dynamic_pointer_cast<ForgeVersion>(vselect.selectedVersion());
 		if (!forgeVersion)
@@ -220,7 +163,7 @@ void OneSixModEditDialog::on_forgeBtn_clicked()
 	}
 }
 
-void OneSixModEditDialog::on_liteloaderBtn_clicked()
+void DerpModEditDialog::on_liteloaderBtn_clicked()
 {
 	LiteLoaderInstaller liteloader(m_inst->intendedVersionId());
 	if (!liteloader.canApply())
@@ -231,13 +174,6 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked()
 			   "into this version of Minecraft"));
 		return;
 	}
-	if (!m_inst->versionIsCustom())
-	{
-		m_inst->customizeVersion();
-		m_version = m_inst->getFullVersion();
-		main_model->setSourceModel(m_version.get());
-		updateVersionControls();
-	}
 	if (!liteloader.apply(m_version))
 	{
 		QMessageBox::critical(
@@ -246,7 +182,7 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked()
 	}
 }
 
-bool OneSixModEditDialog::loaderListFilter(QKeyEvent *keyEvent)
+bool DerpModEditDialog::loaderListFilter(QKeyEvent *keyEvent)
 {
 	switch (keyEvent->key())
 	{
@@ -262,7 +198,7 @@ bool OneSixModEditDialog::loaderListFilter(QKeyEvent *keyEvent)
 	return QDialog::eventFilter(ui->loaderModTreeView, keyEvent);
 }
 
-bool OneSixModEditDialog::resourcePackListFilter(QKeyEvent *keyEvent)
+bool DerpModEditDialog::resourcePackListFilter(QKeyEvent *keyEvent)
 {
 	switch (keyEvent->key())
 	{
@@ -278,7 +214,7 @@ bool OneSixModEditDialog::resourcePackListFilter(QKeyEvent *keyEvent)
 	return QDialog::eventFilter(ui->resPackTreeView, keyEvent);
 }
 
-bool OneSixModEditDialog::eventFilter(QObject *obj, QEvent *ev)
+bool DerpModEditDialog::eventFilter(QObject *obj, QEvent *ev)
 {
 	if (ev->type() != QEvent::KeyPress)
 	{
@@ -292,12 +228,12 @@ bool OneSixModEditDialog::eventFilter(QObject *obj, QEvent *ev)
 	return QDialog::eventFilter(obj, ev);
 }
 
-void OneSixModEditDialog::on_buttonBox_rejected()
+void DerpModEditDialog::on_buttonBox_rejected()
 {
 	close();
 }
 
-void OneSixModEditDialog::on_addModBtn_clicked()
+void DerpModEditDialog::on_addModBtn_clicked()
 {
 	QStringList fileNames = QFileDialog::getOpenFileNames(
 		this, QApplication::translate("LegacyModEditDialog", "Select Loader Mods"));
@@ -308,7 +244,7 @@ void OneSixModEditDialog::on_addModBtn_clicked()
 		m_mods->startWatching();
 	}
 }
-void OneSixModEditDialog::on_rmModBtn_clicked()
+void DerpModEditDialog::on_rmModBtn_clicked()
 {
 	int first, last;
 	auto list = ui->loaderModTreeView->selectionModel()->selectedRows();
@@ -319,12 +255,12 @@ void OneSixModEditDialog::on_rmModBtn_clicked()
 	m_mods->deleteMods(first, last);
 	m_mods->startWatching();
 }
-void OneSixModEditDialog::on_viewModBtn_clicked()
+void DerpModEditDialog::on_viewModBtn_clicked()
 {
 	openDirInDefaultProgram(m_inst->loaderModsDir(), true);
 }
 
-void OneSixModEditDialog::on_addResPackBtn_clicked()
+void DerpModEditDialog::on_addResPackBtn_clicked()
 {
 	QStringList fileNames = QFileDialog::getOpenFileNames(
 		this, QApplication::translate("LegacyModEditDialog", "Select Resource Packs"));
@@ -335,7 +271,7 @@ void OneSixModEditDialog::on_addResPackBtn_clicked()
 		m_resourcepacks->startWatching();
 	}
 }
-void OneSixModEditDialog::on_rmResPackBtn_clicked()
+void DerpModEditDialog::on_rmResPackBtn_clicked()
 {
 	int first, last;
 	auto list = ui->resPackTreeView->selectionModel()->selectedRows();
@@ -346,12 +282,12 @@ void OneSixModEditDialog::on_rmResPackBtn_clicked()
 	m_resourcepacks->deleteMods(first, last);
 	m_resourcepacks->startWatching();
 }
-void OneSixModEditDialog::on_viewResPackBtn_clicked()
+void DerpModEditDialog::on_viewResPackBtn_clicked()
 {
 	openDirInDefaultProgram(m_inst->resourcePacksDir(), true);
 }
 
-void OneSixModEditDialog::loaderCurrent(QModelIndex current, QModelIndex previous)
+void DerpModEditDialog::loaderCurrent(QModelIndex current, QModelIndex previous)
 {
 	if (!current.isValid())
 	{
diff --git a/gui/dialogs/OneSixModEditDialog.h b/gui/dialogs/DerpModEditDialog.h
index 2510c59c..e9e61c65 100644
--- a/gui/dialogs/OneSixModEditDialog.h
+++ b/gui/dialogs/DerpModEditDialog.h
@@ -16,21 +16,21 @@
 #pragma once
 #include <QDialog>
 
-#include <logic/OneSixInstance.h>
+#include <logic/DerpInstance.h>
 
 class EnabledItemFilter;
 namespace Ui
 {
-class OneSixModEditDialog;
+class DerpModEditDialog;
 }
 
-class OneSixModEditDialog : public QDialog
+class DerpModEditDialog : public QDialog
 {
 	Q_OBJECT
 
 public:
-	explicit OneSixModEditDialog(OneSixInstance *inst, QWidget *parent = 0);
-	virtual ~OneSixModEditDialog();
+	explicit DerpModEditDialog(DerpInstance *inst, QWidget *parent = 0);
+	virtual ~DerpModEditDialog();
 
 private
 slots:
@@ -45,8 +45,6 @@ slots:
 	void on_buttonBox_rejected();
 	void on_forgeBtn_clicked();
 	void on_liteloaderBtn_clicked();
-	void on_customizeBtn_clicked();
-	void on_revertBtn_clicked();
 	void on_customEditorBtn_clicked();
 	void updateVersionControls();
 	void disableVersionControls();
@@ -57,12 +55,12 @@ protected:
 	bool resourcePackListFilter(QKeyEvent *ev);
 
 private:
-	Ui::OneSixModEditDialog *ui;
-	std::shared_ptr<OneSixVersion> m_version;
+	Ui::DerpModEditDialog *ui;
+	std::shared_ptr<DerpVersion> m_version;
 	std::shared_ptr<ModList> m_mods;
 	std::shared_ptr<ModList> m_resourcepacks;
 	EnabledItemFilter *main_model;
-	OneSixInstance *m_inst;
+	DerpInstance *m_inst;
 public
 slots:
 	void loaderCurrent(QModelIndex current, QModelIndex previous);
diff --git a/gui/dialogs/OneSixModEditDialog.ui b/gui/dialogs/DerpModEditDialog.ui
index 899e0cbf..7aaf1564 100644
--- a/gui/dialogs/OneSixModEditDialog.ui
+++ b/gui/dialogs/DerpModEditDialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OneSixModEditDialog</class>
- <widget class="QDialog" name="OneSixModEditDialog">
+ <class>DerpModEditDialog</class>
+ <widget class="QDialog" name="DerpModEditDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -85,29 +85,6 @@
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="customizeBtn">
-           <property name="toolTip">
-            <string>Create an customized copy of the base version</string>
-           </property>
-           <property name="text">
-            <string>Customize</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="revertBtn">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="toolTip">
-            <string>Revert to original base version</string>
-           </property>
-           <property name="text">
-            <string>Revert</string>
-           </property>
-          </widget>
-         </item>
-         <item>
           <widget class="Line" name="line">
            <property name="frameShadow">
             <enum>QFrame::Sunken</enum>
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h
index a861e9b2..79640c84 100644
--- a/logic/BaseInstance.h
+++ b/logic/BaseInstance.h
@@ -27,7 +27,7 @@
 class QDialog;
 class Task;
 class MinecraftProcess;
-class OneSixUpdate;
+class DerpUpdate;
 class InstanceList;
 class BaseInstancePrivate;
 
diff --git a/logic/OneSixFTBInstance.cpp b/logic/DerpFTBInstance.cpp
index e50a5b53..f9aeeca0 100644
--- a/logic/OneSixFTBInstance.cpp
+++ b/logic/DerpFTBInstance.cpp
@@ -1,17 +1,17 @@
-#include "OneSixFTBInstance.h"
+#include "DerpFTBInstance.h"
 
-#include "OneSixVersion.h"
-#include "OneSixLibrary.h"
+#include "DerpVersion.h"
+#include "DerpLibrary.h"
 #include "tasks/SequentialTask.h"
 #include "ForgeInstaller.h"
 #include "lists/ForgeVersionList.h"
 #include "MultiMC.h"
 
-class OneSixFTBInstanceForge : public Task
+class DerpFTBInstanceForge : public Task
 {
 	Q_OBJECT
 public:
-	explicit OneSixFTBInstanceForge(const QString &version, OneSixFTBInstance *inst, QObject *parent = 0) :
+	explicit DerpFTBInstanceForge(const QString &version, DerpFTBInstance *inst, QObject *parent = 0) :
 		Task(parent), instance(inst), version("Forge " + version)
 	{
 	}
@@ -38,7 +38,7 @@ public:
 			fjob = new NetJob("Forge download");
 			fjob->addNetAction(CacheDownload::make(forgeVersion->installer_url, entry));
 			connect(fjob, &NetJob::failed, [this](){emitFailed(m_failReason);});
-			connect(fjob, &NetJob::succeeded, this, &OneSixFTBInstanceForge::installForge);
+			connect(fjob, &NetJob::succeeded, this, &DerpFTBInstanceForge::installForge);
 			connect(fjob, &NetJob::progress, [this](qint64 c, qint64 total){ setProgress(100 * c / total); });
 			fjob->start();
 		}
@@ -60,8 +60,6 @@ slots:
 			emitFailed(tr("Couldn't load the version config"));
 			return;
 		}
-		instance->revertCustomVersion();
-		instance->customizeVersion();
 		auto version = instance->getFullVersion();
 		if (!forge.apply(version))
 		{
@@ -72,41 +70,41 @@ slots:
 	}
 
 private:
-	OneSixFTBInstance *instance;
+	DerpFTBInstance *instance;
 	QString version;
 	ForgeVersionPtr forgeVersion;
 	MetaEntryPtr entry;
 	NetJob *fjob;
 };
 
-OneSixFTBInstance::OneSixFTBInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) :
-	OneSixInstance(rootDir, settings, parent)
+DerpFTBInstance::DerpFTBInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) :
+	DerpInstance(rootDir, settings, parent)
 {
 	QFile f(QDir(minecraftRoot()).absoluteFilePath("pack.json"));
 	if (f.open(QFile::ReadOnly))
 	{
 		QString data = QString::fromUtf8(f.readAll());
 		QRegularExpressionMatch match = QRegularExpression("net.minecraftforge:minecraftforge:[\\.\\d]*").match(data);
-		m_forge.reset(new OneSixLibrary(match.captured()));
+		m_forge.reset(new DerpLibrary(match.captured()));
 		m_forge->finalize();
 	}
 }
 
-QString OneSixFTBInstance::id() const
+QString DerpFTBInstance::id() const
 {
 	return "FTB/" + BaseInstance::id();
 }
 
-QString OneSixFTBInstance::getStatusbarDescription()
+QString DerpFTBInstance::getStatusbarDescription()
 {
-	return "OneSix FTB: " + intendedVersionId();
+	return "Derp FTB: " + intendedVersionId();
 }
-bool OneSixFTBInstance::menuActionEnabled(QString action_name) const
+bool DerpFTBInstance::menuActionEnabled(QString action_name) const
 {
 	return false;
 }
 
-std::shared_ptr<Task> OneSixFTBInstance::doUpdate(bool only_prepare)
+std::shared_ptr<Task> DerpFTBInstance::doUpdate(bool only_prepare)
 {
 	std::shared_ptr<SequentialTask> task;
 	task.reset(new SequentialTask(this));
@@ -114,12 +112,12 @@ std::shared_ptr<Task> OneSixFTBInstance::doUpdate(bool only_prepare)
 	{
 		task->addTask(std::shared_ptr<Task>(MMC->forgelist()->getLoadTask()));
 	}
-	task->addTask(OneSixInstance::doUpdate(only_prepare));
-	task->addTask(std::shared_ptr<Task>(new OneSixFTBInstanceForge(m_forge->version(), this, this)));
+	task->addTask(DerpInstance::doUpdate(only_prepare));
+	task->addTask(std::shared_ptr<Task>(new DerpFTBInstanceForge(m_forge->version(), this, this)));
 	//FIXME: yes. this may appear dumb. but the previous step can change the list, so we do it all again.
 	//TODO: Add a graph task. Construct graphs of tasks so we may capture the logic properly.
-	task->addTask(OneSixInstance::doUpdate(only_prepare));
+	task->addTask(DerpInstance::doUpdate(only_prepare));
 	return task;
 }
 
-#include "OneSixFTBInstance.moc"
+#include "DerpFTBInstance.moc"
diff --git a/logic/OneSixFTBInstance.h b/logic/DerpFTBInstance.h
index dc028819..c16998bf 100644
--- a/logic/OneSixFTBInstance.h
+++ b/logic/DerpFTBInstance.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include "OneSixInstance.h"
+#include "DerpInstance.h"
 
-class OneSixLibrary;
+class DerpLibrary;
 
-class OneSixFTBInstance : public OneSixInstance
+class DerpFTBInstance : public DerpInstance
 {
 	Q_OBJECT
 public:
-	explicit OneSixFTBInstance(const QString &rootDir, SettingsObject *settings,
+	explicit DerpFTBInstance(const QString &rootDir, SettingsObject *settings,
 							QObject *parent = 0);
 	virtual QString getStatusbarDescription();
 	virtual bool menuActionEnabled(QString action_name) const;
@@ -18,5 +18,5 @@ public:
 	virtual QString id() const;
 
 private:
-	std::shared_ptr<OneSixLibrary> m_forge;
+	std::shared_ptr<DerpLibrary> m_forge;
 };
diff --git a/logic/OneSixInstance.cpp b/logic/DerpInstance.cpp
index ab87a1db..672ba6c4 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/DerpInstance.cpp
@@ -13,37 +13,35 @@
  * limitations under the License.
  */
 
+#include "DerpInstance.h"
+
+#include <QIcon>
+
+#include "DerpInstance_p.h"
+#include "DerpUpdate.h"
+#include "DerpVersion.h"
+#include "pathutils.h"
+#include "logger/QsLog.h"
+#include "assets/AssetsUtils.h"
 #include "MultiMC.h"
-#include "OneSixInstance.h"
-#include "OneSixInstance_p.h"
-#include "OneSixUpdate.h"
+#include "icons/IconList.h"
 #include "MinecraftProcess.h"
-#include "OneSixVersion.h"
-#include "JavaChecker.h"
-#include "logic/icons/IconList.h"
-
-#include <setting.h>
-#include <pathutils.h>
-#include <cmdutils.h>
-#include <JlCompress.h>
-#include "gui/dialogs/OneSixModEditDialog.h"
-#include "logger/QsLog.h"
-#include "logic/assets/AssetsUtils.h"
-#include <QIcon>
+#include "gui/dialogs/DerpModEditDialog.h"
 
-OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *setting_obj,
-							   QObject *parent)
-	: BaseInstance(new OneSixInstancePrivate(), rootDir, setting_obj, parent)
+DerpInstance::DerpInstance(const QString &rootDir, SettingsObject *settings, QObject *parent)
+	: BaseInstance(new DerpInstancePrivate(), rootDir, settings, parent)
 {
-	I_D(OneSixInstance);
+	I_D(DerpInstance);
 	d->m_settings->registerSetting("IntendedVersion", "");
 	d->m_settings->registerSetting("ShouldUpdate", false);
+	d->version.reset(new DerpVersion(this, this));
 	reloadFullVersion();
 }
 
-std::shared_ptr<Task> OneSixInstance::doUpdate(bool only_prepare)
+
+std::shared_ptr<Task> DerpInstance::doUpdate(bool only_prepare)
 {
-	return std::shared_ptr<Task>(new OneSixUpdate(this, only_prepare));
+	return std::shared_ptr<Task>(new DerpUpdate(this, only_prepare));
 }
 
 QString replaceTokensIn(QString text, QMap<QString, QString> with)
@@ -70,7 +68,7 @@ QString replaceTokensIn(QString text, QMap<QString, QString> with)
 	return result;
 }
 
-QDir OneSixInstance::reconstructAssets(std::shared_ptr<OneSixVersion> version)
+QDir DerpInstance::reconstructAssets(std::shared_ptr<DerpVersion> version)
 {
 	QDir assetsDir = QDir("assets/");
 	QDir indexDir = QDir(PathCombine(assetsDir.path(), "indexes"));
@@ -130,9 +128,9 @@ QDir OneSixInstance::reconstructAssets(std::shared_ptr<OneSixVersion> version)
 	return virtualRoot;
 }
 
-QStringList OneSixInstance::processMinecraftArgs(MojangAccountPtr account)
+QStringList DerpInstance::processMinecraftArgs(MojangAccountPtr account)
 {
-	I_D(OneSixInstance);
+	I_D(DerpInstance);
 	auto version = d->version;
 	QString args_pattern = version->minecraftArguments;
 
@@ -182,9 +180,9 @@ QStringList OneSixInstance::processMinecraftArgs(MojangAccountPtr account)
 	return parts;
 }
 
-MinecraftProcess *OneSixInstance::prepareForLaunch(MojangAccountPtr account)
+MinecraftProcess *DerpInstance::prepareForLaunch(MojangAccountPtr account)
 {
-	I_D(OneSixInstance);
+	I_D(DerpInstance);
 
 	QIcon icon = MMC->icons()->getIcon(iconKey());
 	auto pixmap = icon.pixmap(128, 128);
@@ -244,16 +242,16 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(MojangAccountPtr account)
 	return proc;
 }
 
-void OneSixInstance::cleanupAfterRun()
+void DerpInstance::cleanupAfterRun()
 {
 	QString target_dir = PathCombine(instanceRoot(), "natives/");
 	QDir dir(target_dir);
 	dir.removeRecursively();
 }
 
-std::shared_ptr<ModList> OneSixInstance::loaderModList()
+std::shared_ptr<ModList> DerpInstance::loaderModList()
 {
-	I_D(OneSixInstance);
+	I_D(DerpInstance);
 	if (!d->loader_mod_list)
 	{
 		d->loader_mod_list.reset(new ModList(loaderModsDir()));
@@ -262,9 +260,9 @@ std::shared_ptr<ModList> OneSixInstance::loaderModList()
 	return d->loader_mod_list;
 }
 
-std::shared_ptr<ModList> OneSixInstance::resourcePackList()
+std::shared_ptr<ModList> DerpInstance::resourcePackList()
 {
-	I_D(OneSixInstance);
+	I_D(DerpInstance);
 	if (!d->resource_pack_list)
 	{
 		d->resource_pack_list.reset(new ModList(resourcePacksDir()));
@@ -273,34 +271,32 @@ std::shared_ptr<ModList> OneSixInstance::resourcePackList()
 	return d->resource_pack_list;
 }
 
-QDialog *OneSixInstance::createModEditDialog(QWidget *parent)
+QDialog *DerpInstance::createModEditDialog(QWidget *parent)
 {
-	return new OneSixModEditDialog(this, parent);
+	return new DerpModEditDialog(this, parent);
 }
 
-bool OneSixInstance::setIntendedVersionId(QString version)
+bool DerpInstance::setIntendedVersionId(QString version)
 {
 	settings().set("IntendedVersion", version);
 	setShouldUpdate(true);
-	auto pathCustom = PathCombine(instanceRoot(), "custom.json");
 	auto pathOrig = PathCombine(instanceRoot(), "version.json");
-	QFile::remove(pathCustom);
 	QFile::remove(pathOrig);
 	reloadFullVersion();
 	return true;
 }
 
-QString OneSixInstance::intendedVersionId() const
+QString DerpInstance::intendedVersionId() const
 {
 	return settings().get("IntendedVersion").toString();
 }
 
-void OneSixInstance::setShouldUpdate(bool val)
+void DerpInstance::setShouldUpdate(bool val)
 {
 	settings().set("ShouldUpdate", val);
 }
 
-bool OneSixInstance::shouldUpdate() const
+bool DerpInstance::shouldUpdate() const
 {
 	QVariant var = settings().get("ShouldUpdate");
 	if (!var.isValid() || var.toBool() == false)
@@ -310,94 +306,53 @@ bool OneSixInstance::shouldUpdate() const
 	return true;
 }
 
-bool OneSixInstance::versionIsCustom()
+bool DerpInstance::versionIsCustom()
 {
-	QString verpath_custom = PathCombine(instanceRoot(), "custom.json");
-	QFile versionfile(verpath_custom);