diff --git a/README.md b/README.md
index e47d4be7..afb5e4cf 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ Instead, ModShot now makes use of meson, bash, and make, in a fairly simple setu
 
 Because of this, compiling with Visual Studio as was standard before is no longer supported, and instead compiling using the msys2 toolset is required.
 The main upshot of this, of course, is remaining on par with ruby in terms of gem support. (at least for windows)
+With some hacking, you could probably get this setup working with Visual Studio, but it's honestly not worth the effort.
 
 Previously, C extensions were very jank with ModShot, **however** now you can use a C extension right from your own Ruby install!
 (Provided the version is the same, and the msys2 evironment is the same. I'll get back to this later.)
@@ -45,7 +46,7 @@ You will then need to pass `-Dfmod=true` as an option.
 ModShot should handle everything from there, it's up to you to follow the FMOD license.
 
 FMOD bindings also do not supply the `Audio` module. You may create wrapper functions for that if you wish.
-AL Effect bndings are not supplied as well for obvious reasons.
+AL Effect bindings are not supplied as well for obvious reasons.
 
 Functions will always return an array of values (usually two) in the order of `[result, values...]`.
 This means you can do `result, value = FMOD.some_func()`, which is pretty neat, right? If a result is not `FMOD_OK` (0) there will be no return value. Keep that in mind!
@@ -148,9 +149,9 @@ This should create a folder called `out` with your build of ModShot all ready to
 
 ## Configuration
 
-*ModShot* reads configuration data from the file "oneshot.conf". The format is ini-style. Do *not* use quotes around file paths (spaces won't break). Lines starting with '#' are comments. See 'oneshot.conf.sample' for a list of accepted entries.
+*ModShot* reads configuration data from the file "modshot.toml". It's a toml file, because toml is cool.
 
-All option entries can alternatively be specified as command line options. Any options that are not arrays (eg. preloaded scripts) specified as command line options will override entries in oneshot.conf. Note that you will have to wrap values containing spaces in quotes (unlike in oneshot.conf).
+All option entries can alternatively be specified as command line options. Any options that are not arrays (eg. preloaded scripts) specified as command line options will override entries in modshot.toml. Note that you will have to wrap values containing spaces in quotes.
 
 The syntax is: `--<option>=<value>`
 
diff --git a/binding-mri/algorithm-binding.cpp b/binding-mri/algorithm-binding.cpp
new file mode 100644
index 00000000..ec6be288
--- /dev/null
+++ b/binding-mri/algorithm-binding.cpp
@@ -0,0 +1,34 @@
+#include "algorithm.h"
+#include "binding-util.h"
+
+RB_METHOD(algorithmPointDistance)
+{
+    double x1, y1, x2,  y2;
+    rb_get_args(argc, argv, "ffff", &x1, &y1, &x2, &y2 RB_ARG_END);
+
+    return DBL2NUM(point_distance(x1, y1, x2, y2));
+}
+
+RB_METHOD(algorithmCircleDistance)
+{
+    double x1, y1, x2,  y2, radius;
+    rb_get_args(argc, argv, "fffff", &x1, &y1, &x2, &y2, &radius RB_ARG_END);
+
+    return DBL2NUM(point_distance(x1, y1, x2, y2));
+}
+
+RB_METHOD(algorithmRectangleDistance)
+{
+    double x1, y1, x2,  y2, width, height;
+    rb_get_args(argc, argv, "fffff", &x1, &y1, &x2, &y2, &width, &height RB_ARG_END);
+
+    return DBL2NUM(rectangle_distance(x1, y1, x2, y2, width, height));
+}
+
+void algorithmBindingInit() 
+{
+    VALUE module = rb_define_module("Algorithm");
+    _rb_define_module_function(module, "point_distance", algorithmPointDistance);
+    _rb_define_module_function(module, "circle_distance", algorithmCircleDistance);
+    _rb_define_module_function(module, "rectangle_distance", algorithmRectangleDistance);
+}
\ No newline at end of file
diff --git a/binding-mri/binding-mri.cpp b/binding-mri/binding-mri.cpp
index 91d86ac3..f8bd04b9 100644
--- a/binding-mri/binding-mri.cpp
+++ b/binding-mri/binding-mri.cpp
@@ -59,11 +59,10 @@ static void mriBindingTerminate();
 static void mriBindingReset();
 
 ScriptBinding scriptBindingImpl =
-{
-	mriBindingExecute,
-	mriBindingTerminate,
-	mriBindingReset
-};
+	{
+		mriBindingExecute,
+		mriBindingTerminate,
+		mriBindingReset};
 
 ScriptBinding *scriptBinding = &scriptBindingImpl;
 
@@ -101,6 +100,7 @@ void fmodCoreBindingInit();
 void fmodStudioBindingInit();
 #endif
 void screenBindingInit();
+void algorithmBindingInit();
 RB_METHOD(mriPrint);
 RB_METHOD(mriP);
 RB_METHOD(mkxpDataDirectory);
@@ -136,29 +136,31 @@ static void mriBindingInit()
 	oneshotBindingInit();
 	modshotBindingInit();
 	steamBindingInit();
-	#ifndef USE_FMOD
+#ifndef USE_FMOD
 	audioBindingInit();
 	aleffectBindingInit();
-	#else
+#else
 	fmodCoreBindingInit();
 	fmodStudioBindingInit();
-	#endif
+#endif
 	screenBindingInit();
+	algorithmBindingInit();
+
 	rb_define_global_const("MODSHOT_VERSION", rb_str_new_cstr(MODSHOT_VERSION));
 	if (rgssVer >= 3)
 	{
 		_rb_define_module_function(rb_mKernel, "rgss_main", mriRgssMain);
 		_rb_define_module_function(rb_mKernel, "rgss_stop", mriRgssStop);
 
-		_rb_define_module_function(rb_mKernel, "msgbox",    mriPrint);
-		_rb_define_module_function(rb_mKernel, "msgbox_p",  mriP);
+		_rb_define_module_function(rb_mKernel, "msgbox", mriPrint);
+		_rb_define_module_function(rb_mKernel, "msgbox_p", mriP);
 
 		rb_define_global_const("RGSS_VERSION", rb_str_new_cstr("3.0.1"));
 	}
 	else
 	{
 		_rb_define_module_function(rb_mKernel, "print", mriPrint);
-		_rb_define_module_function(rb_mKernel, "p",     mriP);
+		_rb_define_module_function(rb_mKernel, "p", mriP);
 
 		rb_define_alias(rb_singleton_class(rb_mKernel), "_mkxp_kernel_caller_alias", "caller");
 		_rb_define_module_function(rb_mKernel, "caller", _kernelCaller);
@@ -166,9 +168,9 @@ static void mriBindingInit()
 
 	rb_eval_string(module_rpg1);
 
-	#ifdef USE_FMOD
+#ifdef USE_FMOD
 	rb_eval_string(fmod_enums);
-	#endif
+#endif
 
 	VALUE mod = rb_define_module("MKXP");
 	_rb_define_module_function(mod, "data_directory", mkxpDataDirectory);
@@ -193,14 +195,12 @@ static void mriBindingInit()
 	rb_eval_string(
 		"if ENV['SSL_CERT_FILE'].nil?\n"
 		"    ENV['SSL_CERT_FILE'] = './lib/cacert.pem'\n"
-		"end\n"
-	);
+		"end\n");
 
 #ifdef __WIN32
-    if (shState->config().winConsole)
-        configureWindowsStreams();
+	if (shState->config().game.console)
+		configureWindowsStreams();
 #endif
-
 }
 
 static void
@@ -214,7 +214,7 @@ showMsg(const std::string &msg)
 }
 
 static void printP(int argc, VALUE *argv,
-                   const char *convMethod, const char *sep)
+				   const char *convMethod, const char *sep)
 {
 	VALUE dispString = rb_str_buf_new(128);
 	ID conv = rb_intern(convMethod);
@@ -229,8 +229,7 @@ static void printP(int argc, VALUE *argv,
 	}
 
 	shState->oneshot().msgbox(
-		0, RSTRING_PTR(dispString), shState->config().game.title.data()
-	);
+		0, RSTRING_PTR(dispString), shState->config().game.title.data());
 	// showMsg(RSTRING_PTR(dispString));
 }
 
@@ -256,7 +255,7 @@ RB_METHOD(mkxpDataDirectory)
 {
 	RB_UNUSED_PARAM;
 
-	const std::string &path = shState->config().customDataPath;
+	const std::string &path = shState->config().paths.customDataPath;
 	const char *s = path.empty() ? "." : path.c_str();
 
 	return rb_str_new_cstr(s);
@@ -291,7 +290,8 @@ RB_METHOD(mkxpMouseInWindow)
 	return rb_bool_new(EventThread::mouseState.inWindow);
 }
 
-RB_METHOD(mkxpAllowForceQuit) {
+RB_METHOD(mkxpAllowForceQuit)
+{
 	RB_UNUSED_PARAM;
 	shState->rtData().allowForceQuit.set();
 	return Qnil;
@@ -305,7 +305,7 @@ static VALUE rgssMainCb(VALUE block)
 
 static VALUE rgssMainRescue(VALUE arg, VALUE exc)
 {
-	VALUE *excRet = (VALUE*) arg;
+	VALUE *excRet = (VALUE *)arg;
 
 	*excRet = exc;
 
@@ -315,13 +315,13 @@ static VALUE rgssMainRescue(VALUE arg, VALUE exc)
 static void processReset()
 {
 	shState->graphics().reset();
-	#ifndef USE_FMOD
+#ifndef USE_FMOD
 	shState->audio().reset();
-	#endif
+#endif
 
 	shState->rtData().rqReset.clear();
 	shState->graphics().repaintWait(shState->rtData().rqResetFinish,
-	                                false);
+									false);
 }
 
 RB_METHOD(mriRgssMain)
@@ -333,12 +333,12 @@ RB_METHOD(mriRgssMain)
 		VALUE exc = Qnil;
 
 #if RAPI_FULL < 270
-        rb_rescue2((VALUE(*)(ANYARGS))rgssMainCb, rb_block_proc(),
-                   (VALUE(*)(ANYARGS))rgssMainRescue, (VALUE)&exc, rb_eException,
-                   (VALUE)0);
+		rb_rescue2((VALUE(*)(ANYARGS))rgssMainCb, rb_block_proc(),
+				   (VALUE(*)(ANYARGS))rgssMainRescue, (VALUE)&exc, rb_eException,
+				   (VALUE)0);
 #else
-        rb_rescue2(rgssMainCb, rb_block_proc(), rgssMainRescue, (VALUE)&exc,
-                   rb_eException, (VALUE)0);
+		rb_rescue2(rgssMainCb, rb_block_proc(), rgssMainRescue, (VALUE)&exc,
+				   rb_eException, (VALUE)0);
 #endif
 
 		if (NIL_P(exc))
@@ -389,8 +389,8 @@ RB_METHOD(_kernelCaller)
 		return trace;
 
 	/* RMXP does this, not sure if specific or 1.8 related */
-	VALUE args[] = { rb_str_new_cstr(":in `<main>'"), rb_str_new_cstr("") };
-	rb_funcall2(rb_ary_entry(trace, len-1), rb_intern("gsub!"), 2, args);
+	VALUE args[] = {rb_str_new_cstr(":in `<main>'"), rb_str_new_cstr("")};
+	rb_funcall2(rb_ary_entry(trace, len - 1), rb_intern("gsub!"), 2, args);
 
 	return trace;
 }
@@ -408,14 +408,14 @@ struct evalArg
 
 static VALUE evalHelper(evalArg *arg)
 {
-	VALUE argv[] = { arg->string, Qnil, arg->filename };
+	VALUE argv[] = {arg->string, Qnil, arg->filename};
 	return rb_funcall2(Qnil, rb_intern("eval"), ARRAY_SIZE(argv), argv);
 }
 
 static VALUE evalString(VALUE string, VALUE filename, int *state)
 {
-	evalArg arg = { string, filename };
-	return rb_protect((VALUE (*)(VALUE))evalHelper, (VALUE)&arg, state);
+	evalArg arg = {string, filename};
+	return rb_protect((VALUE(*)(VALUE))evalHelper, (VALUE)&arg, state);
 }
 
 static void runCustomScript(const std::string &filename)
@@ -429,7 +429,7 @@ static void runCustomScript(const std::string &filename)
 	}
 
 	evalString(newStringUTF8(scriptData.c_str(), scriptData.size()),
-	           newStringUTF8(filename.c_str(), filename.size()), NULL);
+			   newStringUTF8(filename.c_str(), filename.size()), NULL);
 }
 
 VALUE kernelLoadDataInt(const char *filename, bool rubyExc);
@@ -480,7 +480,7 @@ static void runRMXPScripts(BacktraceData &btData)
 	}
 
 	/* Set the debug flag */
-	rb_gv_set("$debug", conf.debugMode ? Qtrue : Qfalse);
+	rb_gv_set("$debug", conf.game.debugMode ? Qtrue : Qfalse);
 
 	rb_gv_set("$RGSS_SCRIPTS", scriptArray);
 
@@ -496,7 +496,7 @@ static void runRMXPScripts(BacktraceData &btData)
 		if (!RB_TYPE_P(script, RUBY_T_ARRAY))
 			continue;
 
-		VALUE scriptName   = rb_ary_entry(script, 1);
+		VALUE scriptName = rb_ary_entry(script, 1);
 		VALUE scriptString = rb_ary_entry(script, 2);
 
 		int result = Z_OK;
@@ -505,28 +505,28 @@ static void runRMXPScripts(BacktraceData &btData)
 		while (true)
 		{
 			unsigned char *bufferPtr =
-			        reinterpret_cast<unsigned char*>(const_cast<char*>(decodeBuffer.c_str()));
+				reinterpret_cast<unsigned char *>(const_cast<char *>(decodeBuffer.c_str()));
 			const unsigned char *sourcePtr =
-			        reinterpret_cast<const unsigned char*>(RSTRING_PTR(scriptString));
+				reinterpret_cast<const unsigned char *>(RSTRING_PTR(scriptString));
 
 			bufferLen = decodeBuffer.length();
 
 			result = uncompress(bufferPtr, &bufferLen,
-			                    sourcePtr, RSTRING_LEN(scriptString));
+								sourcePtr, RSTRING_LEN(scriptString));
 
 			bufferPtr[bufferLen] = '\0';
 
 			if (result != Z_BUF_ERROR)
 				break;
 
-			decodeBuffer.resize(decodeBuffer.size()*2);
+			decodeBuffer.resize(decodeBuffer.size() * 2);
 		}
 
 		if (result != Z_OK)
 		{
 			static char buffer[256];
 			snprintf(buffer, sizeof(buffer), "Error decoding script %ld: '%s'",
-			         i, RSTRING_PTR(scriptName));
+					 i, RSTRING_PTR(scriptName));
 
 			showMsg(buffer);
 
@@ -537,9 +537,8 @@ static void runRMXPScripts(BacktraceData &btData)
 	}
 
 	/* Execute preloaded scripts */
-	for (std::set<std::string>::iterator i = conf.preloadScripts.begin();
-	     i != conf.preloadScripts.end(); ++i)
-		runCustomScript(*i);
+	for (auto &i : conf.game.preloadScripts)
+		runCustomScript(i);
 
 	VALUE exc = rb_gv_get("$!");
 	if (exc != Qnil)
@@ -552,7 +551,7 @@ static void runRMXPScripts(BacktraceData &btData)
 			VALUE script = rb_ary_entry(scriptArray, i);
 			VALUE scriptDecoded = rb_ary_entry(script, 3);
 			VALUE string = newStringUTF8(RSTRING_PTR(scriptDecoded),
-			                             RSTRING_LEN(scriptDecoded));
+										 RSTRING_LEN(scriptDecoded));
 
 			VALUE fname;
 			const char *scriptName = RSTRING_PTR(rb_ary_entry(script, 1));
@@ -586,7 +585,7 @@ static void showExc(VALUE exc, const BacktraceData &btData)
 	VALUE name = rb_class_path(rb_obj_class(exc));
 
 	VALUE ds = rb_sprintf("%" PRIsVALUE ": %" PRIsVALUE " (%" PRIsVALUE ")",
-	                      bt0, exc, name);
+						  bt0, exc, name);
 	/* omit "useless" last entry (from ruby:1:in `eval') */
 	for (long i = 1, btlen = RARRAY_LEN(bt) - 1; i < btlen; ++i)
 		rb_str_catf(ds, "\n\tfrom %" PRIsVALUE, rb_ary_entry(bt, i));
@@ -614,8 +613,8 @@ static void showExc(VALUE exc, const BacktraceData &btData)
 	 * SectionXXX:YY: in 'blabla' */
 
 	*e = '\0';
-	strncpy(line, *p ? p+1 : p, sizeof(line));
-	line[sizeof(line)-1] = '\0';
+	strncpy(line, *p ? p + 1 : p, sizeof(line));
+	line[sizeof(line) - 1] = '\0';
 	*e = ':';
 	e = p;
 
@@ -632,7 +631,7 @@ static void showExc(VALUE exc, const BacktraceData &btData)
 
 	std::string ms(640, '\0');
 	snprintf(&ms[0], ms.size(), "Script '%s' line %s: %s occured.\n\n%s",
-	         file.c_str(), line, RSTRING_PTR(name), RSTRING_PTR(msg));
+			 file.c_str(), line, RSTRING_PTR(name), RSTRING_PTR(msg));
 
 	showMsg(ms);
 }
@@ -653,8 +652,7 @@ static void mriBindingExecute()
 	// setup ruby library paths
 	rb_eval_string(
 		"$LOAD_PATH.unshift(File.join(Dir.pwd, 'lib', 'ruby'))\n"
-		"$LOAD_PATH.unshift(File.join(Dir.pwd, 'lib', 'ruby', RUBY_PLATFORM))\n"
-	);
+		"$LOAD_PATH.unshift(File.join(Dir.pwd, 'lib', 'ruby', RUBY_PLATFORM))\n");
 
 	// we probably should only be calling this if we are a ruby executable
 	// but we need to initialize things like the prelude (provides important library functions like IO#read_nonblock
@@ -663,53 +661,60 @@ static void mriBindingExecute()
 	// the three arguments are the executable name, and the '-e ""' is to tell ruby to run an empty file
 	// otherwise (since this parses options for the ruby executable) it's gonna wait on stdin for code
 	// --jit enables the jit i think
-	std::vector<const char*> rubyArgsC{"oneshot"};
+	std::vector<const char *> rubyArgsC{"oneshot"};
 	rubyArgsC.push_back("-e ");
 	void *node;
-	if (conf.mjitEnabled) {
-		std::string verboseLevel("--mjit-verbose="); verboseLevel += std::to_string(conf.mjitVerbosity);
-        std::string maxCache("--mjit-max-cache="); maxCache += std::to_string(conf.mjitMaxCache);
-        std::string minCalls("--mjit-min-calls="); minCalls += std::to_string(conf.mjitMinCalls);
-        rubyArgsC.push_back("--mjit");
-        rubyArgsC.push_back(verboseLevel.c_str());
-        rubyArgsC.push_back(maxCache.c_str());
-        rubyArgsC.push_back(minCalls.c_str());
+	if (conf.mjit.enabled)
+	{
+		std::string verboseLevel("--mjit-verbose=");
+		verboseLevel += std::to_string(conf.mjit.verbosity);
+		std::string maxCache("--mjit-max-cache=");
+		maxCache += std::to_string(conf.mjit.maxCache);
+		std::string minCalls("--mjit-min-calls=");
+		minCalls += std::to_string(conf.mjit.minCalls);
+		rubyArgsC.push_back("--mjit");
+		rubyArgsC.push_back(verboseLevel.c_str());
+		rubyArgsC.push_back(maxCache.c_str());
+		rubyArgsC.push_back(minCalls.c_str());
 	}
 
-	if (conf.yjitEnabled) {
-		std::string callThreshold("--yjit-call-threshold="); callThreshold += std::to_string(conf.yjitCallThreshold);
-		std::string maxVersions("--yjit-max-versions="); maxVersions += std::to_string(conf.yjitMaxVersions);
-		std::string greedyVersioning("--yjit-greedy-versioning"); greedyVersioning += std::to_string(conf.yjitGreedyVersioning);
+	if (conf.yjit.enabled)
+	{
+		std::string callThreshold("--yjit-call-threshold=");
+		callThreshold += std::to_string(conf.yjit.callThreshold);
+		std::string maxVersions("--yjit-max-versions=");
+		maxVersions += std::to_string(conf.yjit.maxVersions);
+		std::string greedyVersioning("--yjit-greedy-versioning");
+		greedyVersioning += std::to_string(conf.yjit.greedyVersioning);
 		rubyArgsC.push_back("--yjit");
 		rubyArgsC.push_back(callThreshold.c_str());
 		rubyArgsC.push_back(maxVersions.c_str());
 		rubyArgsC.push_back(greedyVersioning.c_str());
 	}
 
-	node = ruby_options(rubyArgsC.size(), const_cast<char**>(rubyArgsC.data()));
+	node = ruby_options(rubyArgsC.size(), const_cast<char **>(rubyArgsC.data()));
 
-    int state;
-    bool valid = ruby_executable_node(node, &state);
-    if (valid)
-        state = ruby_exec_node(node);
-    if (state || !valid) {
-        showMsg("An error occurred while initializing Ruby. (Invalid JIT settings?)");
-        ruby_cleanup(state);
-        shState->rtData().rqTermAck.set();
-        return;
-    }
+	int state;
+	bool valid = ruby_executable_node(node, &state);
+	if (valid)
+		state = ruby_exec_node(node);
+	if (state || !valid)
+	{
+		showMsg("An error occurred while initializing Ruby. (Invalid JIT settings?)");
+		ruby_cleanup(state);
+		shState->rtData().rqTermAck.set();
+		return;
+	}
 
 	rb_enc_set_default_external(rb_enc_from_encoding(rb_utf8_encoding()));
 
-	if (!conf.rubyLoadpaths.empty())
+	if (!conf.paths.rubyLoadpaths.empty())
 	{
 		/* Setup custom load paths */
 		VALUE lpaths = rb_gv_get(":");
 
-		for (size_t i = 0; i < conf.rubyLoadpaths.size(); ++i)
+		for (auto &path : conf.paths.rubyLoadpaths)
 		{
-			std::string &path = conf.rubyLoadpaths[i];
-
 			VALUE pathv = rb_str_new(path.c_str(), path.size());
 			rb_ary_push(lpaths, pathv);
 		}
diff --git a/binding-mri/binding-util.cpp b/binding-mri/binding-util.cpp
index 2936c9b4..30d6962c 100644
--- a/binding-mri/binding-util.cpp
+++ b/binding-mri/binding-util.cpp
@@ -31,7 +31,7 @@
 
 RbData *getRbData()
 {
-	return static_cast<RbData*>(shState->bindingData());
+	return static_cast<RbData *>(shState->bindingData());
 }
 
 struct
@@ -39,18 +39,17 @@ struct
 	RbException id;
 	const char *name;
 } static customExc[] =
-{
-	{ MKXP,   "MKXPError"   },
-	{ PHYSFS, "PHYSFSError" },
-	{ SDL,    "SDLError"    }
-};
+	{
+		{MKXP, "MKXPError"},
+		{PHYSFS, "PHYSFSError"},
+		{SDL, "SDLError"}};
 
 RbData::RbData()
 {
 	for (size_t i = 0; i < ARRAY_SIZE(customExc); ++i)
 		exc[customExc[i].id] = rb_define_class(customExc[i].name, rb_eException);
 
-	exc[RGSS]  = rb_define_class("RGSSError", rb_eStandardError);
+	exc[RGSS] = rb_define_class("RGSSError", rb_eStandardError);
 	exc[Reset] = rb_define_class(rgssVer >= 3 ? "RGSSReset" : "Reset", rb_eException);
 
 	exc[ErrnoENOENT] = rb_const_get(rb_const_get(rb_cObject, rb_intern("Errno")), rb_intern("ENOENT"));
@@ -61,22 +60,21 @@ RbData::RbData()
 
 RbData::~RbData()
 {
-
 }
 
 /* Indexed with Exception::Type */
 static const RbException excToRbExc[] =
-{
-    RGSS,        /* RGSSError   */
-    ErrnoENOENT, /* NoFileError */
-    IOError,
+	{
+		RGSS,		 /* RGSSError   */
+		ErrnoENOENT, /* NoFileError */
+		IOError,
 
-    TypeError,
-    ArgumentError,
+		TypeError,
+		ArgumentError,
 
-    PHYSFS,      /* PHYSFSError */
-    SDL,         /* SDLError    */
-    MKXP         /* MKXPError   */
+		PHYSFS, /* PHYSFSError */
+		SDL,	/* SDLError    */
+		MKXP	/* MKXPError   */
 };
 
 void raiseRbExc(const Exception &exc)
@@ -87,8 +85,7 @@ void raiseRbExc(const Exception &exc)
 	rb_raise(excClass, "%s", exc.msg.c_str());
 }
 
-void
-raiseDisposedAccess(VALUE self)
+void raiseDisposedAccess(VALUE self)
 {
 	const char *klassName = RTYPEDDATA_TYPE(self)->wrap_struct_name;
 	char buf[32];
@@ -99,6 +96,7 @@ raiseDisposedAccess(VALUE self)
 	rb_raise(getRbData()->exc[RGSS], "disposed %s", buf);
 }
 
+/*
 int rb_get_args(int argc, VALUE *argv, const char *format, ...) {
 	int arg_count = 0;
 	int opt_count = 0;
@@ -198,221 +196,221 @@ int rb_get_args(int argc, VALUE *argv, const char *format, ...) {
 
 	return arg_count;
 }
+*/
+
+int rb_get_args(int argc, VALUE *argv, const char *format, ...)
+{
+	char c;
+	VALUE *arg = argv;
+	va_list ap;
+	bool opt = false;
+	int argI = 0;
+
+	va_start(ap, format);
+
+	while ((c = *format++))
+	{
+		switch (c)
+		{
+		case '|':
+			break;
+		default:
+			// FIXME print num of needed args vs provided
+			if (argc <= argI && !opt)
+				rb_raise(rb_eArgError, "wrong number of arguments");
+
+			break;
+		}
+
+		if (argI >= argc)
+			break;
+
+		switch (c)
+		{
+		case 'o':
+		{
+			if (argI >= argc)
+				break;
+
+			VALUE *obj = va_arg(ap, VALUE *);
+
+			*obj = *arg++;
+			++argI;
+
+			break;
+		}
+
+		case 'S':
+		{
+			if (argI >= argc)
+				break;
+
+			VALUE *str = va_arg(ap, VALUE *);
+			VALUE tmp = *arg;
+
+			tmp = rb_str_to_str(tmp);
+
+			*str = tmp;
+			++argI;
+
+			break;
+		}
+
+		case 's':
+		{
+			if (argI >= argc)
+				break;
+
+			const char **s = va_arg(ap, const char **);
+			int *len = va_arg(ap, int *);
+
+			VALUE tmp = *arg;
+
+			tmp = rb_str_to_str(tmp);
+
+			*s = RSTRING_PTR(tmp);
+			*len = RSTRING_LEN(tmp);
+			++argI;
+
+			break;
+		}
+
+		case 'z':
+		{
+			if (argI >= argc)
+				break;
+
+			const char **s = va_arg(ap, const char **);
+
+			VALUE tmp = *arg++;
+
+			tmp = rb_str_to_str(tmp);
+
+			*s = RSTRING_PTR(tmp);
+			++argI;
+
+			break;
+		}
+
+		case 'f':
+		{
+			if (argI >= argc)
+				break;
+
+			double *f = va_arg(ap, double *);
+			VALUE fVal = *arg++;
 
-//int
-//rb_get_args(int argc, VALUE *argv, const char *format, ...)
-//{
-//	char c;
-//	VALUE *arg = argv;
-//	va_list ap;
-//	bool opt = false;
-//	int argI = 0;
-//
-//	va_start(ap, format);
-//
-//	while ((c = *format++))
-//	{
-//		switch (c)
-//		{
-//	    case '|' :
-//			break;
-//	    default:
-//		// FIXME print num of needed args vs provided
-//			if (argc <= argI && !opt)
-//				rb_raise(rb_eArgError, "wrong number of arguments");
-//
-//			break;
-//	    }
-//
-//		if (argI >= argc)
-//			break;
-//
-//		switch (c)
-//		{
-//		case 'o' :
-//		{
-//			if (argI >= argc)
-//				break;
-//
-//			VALUE *obj = va_arg(ap, VALUE*);
-//
-//			*obj = *arg++;
-//			++argI;
-//
-//			break;
-//		}
-//
-//		case 'S' :
-//		{
-//			if (argI >= argc)
-//				break;
-//
-//			VALUE *str = va_arg(ap, VALUE*);
-//			VALUE tmp = *arg;
-//
-//			tmp = rb_str_to_str(tmp);
-//
-//			*str = tmp;
-//			++argI;
-//
-//			break;
-//		}
-//
-//		case 's' :
-//		{
-//			if (argI >= argc)
-//				break;
-//
-//			const char **s = va_arg(ap, const char**);
-//			int *len = va_arg(ap, int*);
-//
-//			VALUE tmp = *arg;
-//
-//			tmp = rb_str_to_str(tmp);
-//
-//			*s = RSTRING_PTR(tmp);
-//			*len = RSTRING_LEN(tmp);
-//			++argI;
-//
-//			break;
-//		}
-//
-//		case 'z' :
-//		{
-//			if (argI >= argc)
-//				break;
-//
-//			const char **s = va_arg(ap, const char**);
-//
-//			VALUE tmp = *arg++;
-//
-//			tmp = rb_str_to_str(tmp);
-//
-//			*s = RSTRING_PTR(tmp);
-//			++argI;
-//
-//			break;
-//		}
-//
-//		case 'f' :
-//		{
-//			if (argI >= argc)
-//				break;
-//
-//			double *f = va_arg(ap, double*);
-//			VALUE fVal = *arg++;
-//
-//			rb_float_arg(fVal, f, argI);
-//
-//			++argI;
-//			break;
-//		}
-//
-//		case 'i' :
-//		{
-//			if (argI >= argc)
-//				break;
-//
-//			int *i = va_arg(ap, int*);
-//			VALUE iVal = *arg++;
-//
-//			rb_int_arg(iVal, i, argI);
-//
-//			++argI;
-//			break;
-//		}
-//
-//		case 'b' :
-//		{
-//			if (argI >= argc)
-//				break;
-//
-//			bool *b = va_arg(ap, bool*);
-//			VALUE bVal = *arg++;
-//
-//			rb_bool_arg(bVal, b, argI);
-//
-//			++argI;
-//			break;
-//		}
-//
-//		case 'n' :
-//		{
-//			if (argI >= argc)
-//				break;
-//
-//			ID *sym = va_arg(ap, ID*);
-//
-//			VALUE symVal = *arg++;
-//
-//			if (!SYMBOL_P(symVal))
-//				rb_raise(rb_eTypeError, "Argument %d: Expected symbol", argI);
-//
-//			*sym = SYM2ID(symVal);
-//			++argI;
-//
-//			break;
-//		}
-//
-//		case '|' :
-//			opt = true;
-//			break;
-//
-//		default:
-//			rb_raise(rb_eFatal, "invalid argument specifier %c", c);
-//		}
-//	}
-//
-//#ifndef NDEBUG
-//
-//	/* Pop remaining arg pointers off
-//	 * the stack to check for RB_ARG_END */
-//	format--;
-//
-//	while ((c = *format++))
-//	{
-//		switch (c)
-//		{
-//		case 'o' :
-//		case 'S' :
-//			va_arg(ap, VALUE*);
-//			break;
-//
-//		case 's' :
-//			va_arg(ap, const char**);
-//			va_arg(ap, int*);
-//			break;
-//
-//		case 'z' :
-//			va_arg(ap, const char**);
-//			break;
-//
-//		case 'f' :
-//			va_arg(ap, double*);
-//			break;
-//
-//		case 'i' :
-//			va_arg(ap, int*);
-//			break;
-//
-//		case 'b' :
-//			va_arg(ap, bool*);
-//			break;
-//		}
-//	}
-//
-//	// FIXME print num of needed args vs provided
-//	if (!c && argc > argI)
-//		rb_raise(rb_eArgError, "wrong number of arguments");
-//
-//	/* Verify correct termination */
-//	void *argEnd = va_arg(ap, void*);
-//	(void) argEnd;
-//	assert(argEnd == RB_ARG_END_VAL);
-//
-//#endif
-//
-//	va_end(ap);
-//
-//	return argI;
-//}
+			rb_float_arg(fVal, f, argI);
+
+			++argI;
+			break;
+		}
+
+		case 'i':
+		{
+			if (argI >= argc)
+				break;
+
+			int *i = va_arg(ap, int *);
+			VALUE iVal = *arg++;
+
+			rb_int_arg(iVal, i, argI);
+
+			++argI;
+			break;
+		}
+
+		case 'b':
+		{
+			if (argI >= argc)
+				break;
+
+			bool *b = va_arg(ap, bool *);
+			VALUE bVal = *arg++;
+
+			rb_bool_arg(bVal, b, argI);
+
+			++argI;
+			break;
+		}
+
+		case 'n':
+		{
+			if (argI >= argc)
+				break;
+
+			ID *sym = va_arg(ap, ID *);
+
+			VALUE symVal = *arg++;
+
+			if (!SYMBOL_P(symVal))
+				rb_raise(rb_eTypeError, "Argument %d: Expected symbol", argI);
+
+			*sym = SYM2ID(symVal);
+			++argI;
+
+			break;
+		}
+
+		case '|':
+			opt = true;
+			break;
+
+		default:
+			rb_raise(rb_eFatal, "invalid argument specifier %c", c);
+		}
+	}
+
+#ifndef NDEBUG
+
+	/* Pop remaining arg pointers off
+	 * the stack to check for RB_ARG_END */
+	format--;
+
+	while ((c = *format++))
+	{
+		switch (c)
+		{
+		case 'o':
+		case 'S':
+			va_arg(ap, VALUE *);
+			break;
+
+		case 's':
+			va_arg(ap, const char **);
+			va_arg(ap, int *);
+			break;
+
+		case 'z':
+			va_arg(ap, const char **);
+			break;
+
+		case 'f':
+			va_arg(ap, double *);
+			break;
+
+		case 'i':
+			va_arg(ap, int *);
+			break;
+
+		case 'b':
+			va_arg(ap, bool *);
+			break;
+		}
+	}
+
+	// FIXME print num of needed args vs provided
+	if (!c && argc > argI)
+		rb_raise(rb_eArgError, "wrong number of arguments");
+
+	/* Verify correct termination */
+	void *argEnd = va_arg(ap, void *);
+	(void)argEnd;
+	assert(argEnd == RB_ARG_END_VAL);
+
+#endif
+
+	va_end(ap);
+
+	return argI;
+}
diff --git a/binding-mri/meson.build b/binding-mri/meson.build
index 50ce9e1a..2f591bb8 100644
--- a/binding-mri/meson.build
+++ b/binding-mri/meson.build
@@ -12,6 +12,7 @@ endif
 global_include_dirs += include_directories('.')
 
 binding_source = [files(
+    'algorithm-binding.cpp',
     'binding-mri.cpp',
     'binding-util.cpp',
     'bitmap-binding.cpp',
diff --git a/binding-mri/modshot-binding.cpp b/binding-mri/modshot-binding.cpp
index 40d0a001..d8084a4e 100644
--- a/binding-mri/modshot-binding.cpp
+++ b/binding-mri/modshot-binding.cpp
@@ -9,8 +9,6 @@
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_image.h>
-//#include <SDL2/SDL_syswm.h>
-#include <boost/crc.hpp>
 
 #ifdef _WIN32
 	#define WIN32_LEAN_AND_MEAN
diff --git a/binding-mri/oneshot-binding.cpp b/binding-mri/oneshot-binding.cpp
index ec870edb..3ecca67e 100644
--- a/binding-mri/oneshot-binding.cpp
+++ b/binding-mri/oneshot-binding.cpp
@@ -6,7 +6,6 @@
 #include "eventthread.h"
 
 #include <SDL2/SDL.h>
-#include <boost/crc.hpp>
 
 RB_METHOD(oneshotSetYesNo)
 {
@@ -90,13 +89,12 @@ RB_METHOD(oneshotShake)
 
 RB_METHOD(oneshotCRC32)
 {
-	RB_UNUSED_PARAM;
 	VALUE string;
-	boost::crc_32_type result;
-	rb_get_args(argc, argv, "S", &string RB_ARG_END);
-	std::string str = std::string(RSTRING_PTR(string), RSTRING_LEN(string));
-	result.process_bytes(str.data(), str.length());
-	return UINT2NUM(result.checksum());
+	rb_get_args(argc, argv, "o", &string RB_ARG_END);
+
+	rb_raise(rb_eNotImpError, "Oneshot.crc32 is depreceated. Please require zlib and use Zilb.crc32 instead.");
+
+	return Qnil;
 }
 
 void oneshotBindingInit()
diff --git a/binding-mri/screen-binding.cpp b/binding-mri/screen-binding.cpp
index 9b42e950..ad0cf396 100644
--- a/binding-mri/screen-binding.cpp
+++ b/binding-mri/screen-binding.cpp
@@ -6,61 +6,82 @@
 #include "sharedstate.h"
 #include "pipe.h"
 
-static Pipe ipc;
-
-static void start()
+struct ScreenImage
 {
-	ipc.open("oneshot-pipe", Pipe::Write);
+	Pipe ipc;
+
+	ScreenImage(const char *name) : ipc()
+	{
+		ipc.open(name, Pipe::Write);
 
-	// Create process
+		// Create process
 #if defined _WIN32
-	WCHAR path[MAX_PATH];
-	WCHAR gameFolder[MAX_PATH];
-	MultiByteToWideChar(CP_UTF8, 0, shState->config().gameFolder.c_str(), -1, gameFolder, MAX_PATH);
-	GetModuleFileNameW(NULL, path, MAX_PATH);
-	STARTUPINFOW si;
-	memset(&si, 0, sizeof(si));
-	si.cb = sizeof(si);
-	PROCESS_INFORMATION pi;
-	std::wstring argString = std::wstring(L"oneshot.exe \"--gameFolder=") + gameFolder + L"\" --screenMode=true";
-	WCHAR *args = new WCHAR[argString.size() + 1];
-	memcpy(args, argString.c_str(), (argString.size() + 1) * sizeof(WCHAR));
-	CreateProcessW(path, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
-	delete [] args;
+		WCHAR path[MAX_PATH];
+		WCHAR gameFolder[MAX_PATH];
+		WCHAR exePath[MAX_PATH];
+		MultiByteToWideChar(CP_UTF8, 0, shState->config().game.folder.c_str(), -1, gameFolder, MAX_PATH);
+		MultiByteToWideChar(CP_UTF8, 0, shState->config().paths.exeName.c_str(), -1, gameFolder, MAX_PATH);
+		GetModuleFileNameW(NULL, path, MAX_PATH);
+		STARTUPINFOW si;
+		memset(&si, 0, sizeof(si));
+		si.cb = sizeof(si);
+		PROCESS_INFORMATION pi;
+		std::wstring argString = std::wstring(exePath + L".exe") + L"--gameFolder \"" + gameFolder + L"\" --screenMode";
+		WCHAR *args = new WCHAR[argString.size() + 1];
+		memcpy(args, argString.c_str(), (argString.size() + 1) * sizeof(WCHAR));
+		CreateProcessW(path, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
+		delete[] args;
 #else
 #if defined __linux
-	char path[PATH_MAX];
-	ssize_t len = readlink("/proc/self/exe", path, PATH_MAX);
-	if (len == -1)
-		rb_raise(rb_eRuntimeError, "Cannot determine path of running executable");
-	std::string exename = std::string(path, len);
+		char path[PATH_MAX];
+		ssize_t len = readlink("/proc/self/exe", path, PATH_MAX);
+		if (len == -1)
+			rb_raise(rb_eRuntimeError, "Cannot determine path of running executable");
+		std::string exename = std::string(path, len);
 #else
 #endif
 
-	pid_t pid = fork();
-	if (pid == 0) {
-		execl(exename.c_str(), "oneshot",
-		      (std::string("--gameFolder=") + shState->config().gameFolder).c_str(),
-		      "--screenMode=true", NULL);
-		exit(1);
-	}
+		pid_t pid = fork();
+		if (pid == 0)
+		{
+			execl(exename.c_str(), shState->config().paths.exeName.c_str(),
+				  "-sn", name, 
+				  "-sm", NULL);
+			exit(1);
+		}
 #endif
 
-	ipc.connect();
-}
+		ipc.connect();
+	}
+
+	~ScreenImage()
+	{
+		ipc.close();
+	}
+};
 
-RB_METHOD(screenStart)
+DEF_TYPE(ScreenImage);
+
+RB_METHOD(screenInitialize)
 {
-	RB_UNUSED_PARAM;
-	start();
-	return Qnil;
+	const char *name;
+	rb_get_args(argc, argv, "z", &name RB_ARG_END);
+
+	ScreenImage *s = new ScreenImage(name);
+	setPrivateData(self, s);
+
+	return self;
 }
 
 RB_METHOD(screenFinish)
 {
 	RB_UNUSED_PARAM;
-	ipc.write("END", sizeof("END"));
-	ipc.close();
+
+	ScreenImage *s = getPrivateData<ScreenImage>(self);
+
+	s->ipc.write("END", sizeof("END"));
+	s->ipc.close();
+
 	return Qnil;
 }
 
@@ -69,16 +90,34 @@ RB_METHOD(screenSet)
 	RB_UNUSED_PARAM;
 	const char *imageName;
 	rb_get_args(argc, argv, "z", &imageName RB_ARG_END);
-	if (!ipc.isOpen())
-		start();
-	ipc.write(imageName, strlen(imageName) + 1);
+
+	ScreenImage *s = getPrivateData<ScreenImage>(self);
+
+	s->ipc.write((std::string(imageName) + '\n').c_str(), strlen(imageName) + 1);
+
+	return Qnil;
+}
+
+RB_METHOD(screenMove)
+{
+	int x, y;
+	rb_get_args(argc, argv, "ii", &x, &y);
+
+	ScreenImage *s = getPrivateData<ScreenImage>(self);
+
+	std::string str = "MOV";
+	str += std::to_string(x) + ";" + std::to_string(y) + '\n';
+	s->ipc.write(str.c_str(), str.size());
+
 	return Qnil;
 }
 
 void screenBindingInit()
 {
-    VALUE module = rb_define_module("Screen");
-    _rb_define_module_function(module, "start", screenStart);
-    _rb_define_module_function(module, "finish", screenFinish);
-	_rb_define_module_function(module, "set", screenSet);
+	VALUE klass = rb_define_class("ScreenImage", rb_cObject);
+	_rb_define_method(klass, "initialize", screenInitialize);
+	_rb_define_method(klass, "finish", screenFinish);
+	_rb_define_method(klass, "set", screenSet);
+	_rb_define_method(klass, "move", screenMove);
+	rb_define_alloc_func(klass, classAllocate<&ScreenImageType>);
 }
diff --git a/binding-mri/wallpaper-binding.cpp b/binding-mri/wallpaper-binding.cpp
index 66674b1c..35dbe008 100644
--- a/binding-mri/wallpaper-binding.cpp
+++ b/binding-mri/wallpaper-binding.cpp
@@ -3,8 +3,7 @@
 #include <fstream>
 #include <vector>
 #include <map>
-
-#include <boost/algorithm/string/replace.hpp>
+#include <regex>
 
 #include "etc.h"
 #include "sharedstate.h"
@@ -15,155 +14,198 @@
 #include "debugwriter.h"
 
 #ifdef _WIN32
-	#include <windows.h>
-	static WCHAR szStyle[8] = {0};
-	static WCHAR szTile[8] = {0};
-	static WCHAR szFile[MAX_PATH+1] = {0};
-	static DWORD oldcolor = 0;
-	static DWORD szStyleSize = sizeof(szStyle) - 1;
-	static DWORD szTileSize = sizeof(szTile) - 1;
-	static bool setStyle = false;
-	static bool setTile = false;
-	static bool isCached = false;
+#include <windows.h>
+static WCHAR szStyle[8] = {0};
+static WCHAR szTile[8] = {0};
+static WCHAR szFile[MAX_PATH + 1] = {0};
+static DWORD oldcolor = 0;
+static DWORD szStyleSize = sizeof(szStyle) - 1;
+static DWORD szTileSize = sizeof(szTile) - 1;
+static bool setStyle = false;
+static bool setTile = false;
+static bool isCached = false;
+#else
+#ifdef __APPLE__
+#include "mac-desktop.h"
+static bool isCached = false;
 #else
-	#ifdef __APPLE__
-		#include "mac-desktop.h"
-		static bool isCached = false;
-	#else
-		#include <gio/gio.h>
-		#include <xfconf/xfconf.h>
-		#include <unistd.h>
-		#include <algorithm>
-		#include <iostream>
-		#include <string>
-		#include <sstream>
-		static std::string desktop = "uninitialized";
-		// GNOME settings
-		static GSettings *bgsetting;
-		static std::string defPictureURI, defPictureOptions, defPrimaryColor, defColorShading;
-		// XFCE settings
-		static XfconfChannel* bgchannel;
-		static int defPictureStyle;
-		static int defColorStyle;
-		static GValue defColor = G_VALUE_INIT;
-		static bool defColorExists;
-		static std::string optionImage, optionColor, optionImageStyle, optionColorStyle;
-		// KDE settings
-		static std::map<std::string, std::string> defPlugins, defPictures, defColors, defModes;
-		static std::map<std::string, bool> defBlurs;
-		// Fallback settings
-		static std::string fallbackPath;
-	#endif
+#include <gio/gio.h>
+#include <xfconf/xfconf.h>
+#include <unistd.h>
+#include <algorithm>
+#include <iostream>
+#include <string>
+#include <sstream>
+static std::string desktop = "uninitialized";
+// GNOME settings
+static GSettings *bgsetting;
+static std::string defPictureURI, defPictureOptions, defPrimaryColor, defColorShading;
+// XFCE settings
+static XfconfChannel *bgchannel;
+static int defPictureStyle;
+static int defColorStyle;
+static GValue defColor = G_VALUE_INIT;
+static bool defColorExists;
+static std::string optionImage, optionColor, optionImageStyle, optionColorStyle;
+// KDE settings
+static std::map<std::string, std::string> defPlugins, defPictures, defColors, defModes;
+static std::map<std::string, bool> defBlurs;
+// Fallback settings
+static std::string fallbackPath;
+#endif
 #endif
 
 #ifdef __linux__
-	void desktopEnvironmentInit()
+void desktopEnvironmentInit()
+{
+	if (desktop != "uninitialized")
 	{
-		if (desktop != "uninitialized") {
-			return;
+		return;
+	}
+	desktop = shState->oneshot().desktopEnv;
+	if (desktop == "cinnamon" || desktop == "gnome" || desktop == "mate" || desktop == "deepin")
+	{
+		if (desktop == "cinnamon" || desktop == "gnome" || desktop == "deepin")
+		{
+			if (desktop == "cinnamon")
+				bgsetting = g_settings_new("org.cinnamon.desktop.background");
+			else if (desktop == "deepin")
+				bgsetting = g_settings_new("com.deepin.wrap.gnome.desktop.background");
+			else
+				bgsetting = g_settings_new("org.gnome.desktop.background");
+			defPictureURI = g_settings_get_string(bgsetting, "picture-uri");
 		}
-		desktop = shState->oneshot().desktopEnv;
-		if (desktop == "cinnamon" || desktop == "gnome" || desktop == "mate" || desktop == "deepin") {
-			if (desktop == "cinnamon" || desktop == "gnome" || desktop == "deepin") {
-				if (desktop == "cinnamon") bgsetting = g_settings_new("org.cinnamon.desktop.background");
-				else if (desktop == "deepin") bgsetting = g_settings_new("com.deepin.wrap.gnome.desktop.background");
-				else bgsetting = g_settings_new("org.gnome.desktop.background");
-				defPictureURI = g_settings_get_string(bgsetting, "picture-uri");
-			} else {
-				bgsetting = g_settings_new("org.mate.background");
-				defPictureURI = g_settings_get_string(bgsetting, "picture-filename");
-			}
-			defPictureOptions = g_settings_get_string(bgsetting, "picture-options");
-			defPrimaryColor = g_settings_get_string(bgsetting, "primary-color");
-			defColorShading = g_settings_get_string(bgsetting, "color-shading-type");
-		} else if (desktop == "xfce") {
-			GError *xferror = NULL;
-			if (xfconf_init(&xferror)) {
-				bgchannel = xfconf_channel_get("xfce4-desktop");
-				std::string optionPrefix = "/backdrop/screen0/monitor0/workspace0/";
-				optionImage = optionPrefix + "last-image";
-				optionColor = optionPrefix + "color1";
-				optionImageStyle = optionPrefix + "image-style";
-				optionColorStyle = optionPrefix + "color-style";
-				defPictureURI = xfconf_channel_get_string(bgchannel, optionImage.c_str(), "");
-				defPictureStyle = xfconf_channel_get_int(bgchannel, optionImageStyle.c_str(), -1);
-				defColorExists = xfconf_channel_get_property(bgchannel, optionColor.c_str(), &defColor);
-				defColorStyle = xfconf_channel_get_int(bgchannel, optionColorStyle.c_str(), -1);
-			} else {
-				// Configuration failed to initialize, we won't set the wallpaper
-				desktop = "xfce_error";
-				g_error_free(xferror);
-			}
-		} else if (desktop == "kde") {
-			std::ifstream configFile;
-			configFile.open(std::string(getenv("HOME")) + "/.config/plasma-org.kde.plasma.desktop-appletsrc", std::ios::in);
-			if (configFile.is_open()) {
-				std::string line;
-				std::vector<std::string> sections;
-				std::size_t undefined = 999999999;
-				bool readPlugin = false, readOther = false;
-				std::string containment;
-				while (getline(configFile, line)) {
-					std::size_t index = undefined, lastIndex = undefined;
-					if (line.size() == 0) {
-						readPlugin = false;
-						readOther = false;
-					} else if (readPlugin) {
-						index = line.find('=');
-						if (line.substr(0, index) == "wallpaperplugin") {
-							defPlugins[containment] = line.substr(index + 1);
-						}
-					} else if (readOther) {
-						index = line.find('=');
-						std::string key = line.substr(0, index);
-						std::string val = line.substr(index + 1);
-						if (key == "Image") {
-							defPictures[containment] = val;
-						} else if (key == "Color") {
-							defColors[containment] = val;
-						} else if (key == "FillMode") {
-							defModes[containment] = val;
-						} else if (key == "Blur") {
-							defBlurs[containment] = (val == "true");
+		else
+		{
+			bgsetting = g_settings_new("org.mate.background");
+			defPictureURI = g_settings_get_string(bgsetting, "picture-filename");
+		}
+		defPictureOptions = g_settings_get_string(bgsetting, "picture-options");
+		defPrimaryColor = g_settings_get_string(bgsetting, "primary-color");
+		defColorShading = g_settings_get_string(bgsetting, "color-shading-type");
+	}
+	else if (desktop == "xfce")
+	{
+		GError *xferror = NULL;
+		if (xfconf_init(&xferror))
+		{
+			bgchannel = xfconf_channel_get("xfce4-desktop");
+			std::string optionPrefix = "/backdrop/screen0/monitor0/workspace0/";
+			optionImage = optionPrefix + "last-image";
+			optionColor = optionPrefix + "color1";
+			optionImageStyle = optionPrefix + "image-style";
+			optionColorStyle = optionPrefix + "color-style";
+			defPictureURI = xfconf_channel_get_string(bgchannel, optionImage.c_str(), "");
+			defPictureStyle = xfconf_channel_get_int(bgchannel, optionImageStyle.c_str(), -1);
+			defColorExists = xfconf_channel_get_property(bgchannel, optionColor.c_str(), &defColor);
+			defColorStyle = xfconf_channel_get_int(bgchannel, optionColorStyle.c_str(), -1);
+		}
+		else
+		{
+			// Configuration failed to initialize, we won't set the wallpaper
+			desktop = "xfce_error";
+			g_error_free(xferror);
+		}
+	}
+	else if (desktop == "kde")
+	{
+		std::ifstream configFile;
+		configFile.open(std::string(getenv("HOME")) + "/.config/plasma-org.kde.plasma.desktop-appletsrc", std::ios::in);
+		if (configFile.is_open())
+		{
+			std::string line;
+			std::vector<std::string> sections;
+			std::size_t undefined = 999999999;
+			bool readPlugin = false, readOther = false;
+			std::string containment;
+			while (getline(configFile, line))
+			{
+				std::size_t index = undefined, lastIndex = undefined;
+				if (line.size() == 0)
+				{
+					readPlugin = false;
+					readOther = false;
+				}
+				else if (readPlugin)
+				{
+					index = line.find('=');
+					if (line.substr(0, index) == "wallpaperplugin")
+					{
+						defPlugins[containment] = line.substr(index + 1);
+					}
+				}
+				else if (readOther)
+				{
+					index = line.find('=');
+					std::string key = line.substr(0, index);
+					std::string val = line.substr(index + 1);
+					if (key == "Image")
+					{
+						defPictures[containment] = val;
+					}
+					else if (key == "Color")
+					{
+						defColors[containment] = val;
+					}
+					else if (key == "FillMode")
+					{
+						defModes[containment] = val;
+					}
+					else if (key == "Blur")
+					{
+						defBlurs[containment] = (val == "true");
+					}
+				}
+				else if (line.at(0) == '[')
+				{
+					sections.clear();
+					while (true)
+					{
+						index = line.find(lastIndex == undefined ? '[' : ']', index == undefined ? 0 : index);
+						if (index == std::string::npos)
+						{
+							break;
 						}
-					} else if (line.at(0) == '[') {
-						sections.clear();
-						while (true) {
-							index = line.find(lastIndex == undefined ? '[' : ']', index == undefined ? 0 : index);
-							if (index == std::string::npos) {
-								break;
-							}
-							if (lastIndex == undefined) {
-								lastIndex = index;
-							} else {
-								sections.push_back(line.substr(lastIndex + 1, index - lastIndex - 1));
-								lastIndex = undefined;
-							}
+						if (lastIndex == undefined)
+						{
+							lastIndex = index;
 						}
-						if (sections.size() == 2 && sections[0] == "Containments") {
-							readPlugin = true;
-							containment = sections[1];
-						} else if (
-							sections.size() == 5 &&
-							sections[0] == "Containments" &&
-							sections[2] == "Wallpaper" &&
-							sections[3] == "org.kde.image" &&
-							sections[4] == "General"
-						) {
-							readOther = true;
-							containment = sections[1];
+						else
+						{
+							sections.push_back(line.substr(lastIndex + 1, index - lastIndex - 1));
+							lastIndex = undefined;
 						}
 					}
+					if (sections.size() == 2 && sections[0] == "Containments")
+					{
+						readPlugin = true;
+						containment = sections[1];
+					}
+					else if (
+						sections.size() == 5 &&
+						sections[0] == "Containments" &&
+						sections[2] == "Wallpaper" &&
+						sections[3] == "org.kde.image" &&
+						sections[4] == "General")
+					{
+						readOther = true;
+						containment = sections[1];
+					}
 				}
-				configFile.close();
-			} else {
-				Debug() << "FATAL: Cannot find desktop configuration!";
-				desktop = "kde_error";
 			}
-		} else {
-			fallbackPath = std::string(getenv("HOME")) + "/Desktop/ONESHOT_hint.png";
+			configFile.close();
+		}
+		else
+		{
+			Debug() << "FATAL: Cannot find desktop configuration!";
+			desktop = "kde_error";
 		}
 	}
+	else
+	{
+		fallbackPath = std::string(getenv("HOME")) + "/Desktop/ONESHOT_hint.png";
+	}
+}
 #endif
 
 RB_METHOD(wallpaperSet)
@@ -179,7 +221,8 @@ RB_METHOD(wallpaperSet)
 	Debug() << "Setting wallpaper to" << path;
 	// Crapify the slashes
 	size_t index = 0;
-	for (;;) {
+	for (;;)
+	{
 		index = path.find("/", index);
 		if (index == std::string::npos)
 			break;
@@ -191,7 +234,6 @@ RB_METHOD(wallpaperSet)
 	MultiByteToWideChar(CP_UTF8, 0, path.c_str(), -1, imgnameW, MAX_PATH);
 	GetFullPathNameW(imgnameW, MAX_PATH, imgnameFull, NULL);
 
-
 	int colorId = COLOR_BACKGROUND;
 	WCHAR zero[2] = L"0";
 	DWORD zeroSize = 4;
@@ -200,7 +242,8 @@ RB_METHOD(wallpaperSet)
 	if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_READ, &hKey) != ERROR_SUCCESS)
 		goto end;
 
-	if (!isCached) {
+	if (!isCached)
+	{
 		// QUERY
 
 		// Style
@@ -227,10 +270,10 @@ RB_METHOD(wallpaperSet)
 	// SET
 
 	// Set the style
-	if (RegSetValueExW(hKey, L"WallpaperStyle", 0, REG_SZ, (const BYTE*)zero, zeroSize) != ERROR_SUCCESS)
+	if (RegSetValueExW(hKey, L"WallpaperStyle", 0, REG_SZ, (const BYTE *)zero, zeroSize) != ERROR_SUCCESS)
 		goto end;
 
-	if (RegSetValueExW(hKey, L"TileWallpaper", 0, REG_SZ, (const BYTE*)zero, zeroSize) != ERROR_SUCCESS)
+	if (RegSetValueExW(hKey, L"TileWallpaper", 0, REG_SZ, (const BYTE *)zero, zeroSize) != ERROR_SUCCESS)
 		goto end;
 
 	// Set the wallpaper
@@ -246,118 +289,129 @@ RB_METHOD(wallpaperSet)
 #else
 	std::string nameFix(name);
 	std::size_t found = nameFix.find("w32");
-	if (found != std::string::npos) {
-		nameFix.replace(nameFix.end()-3, nameFix.end(), "unix");
+	if (found != std::string::npos)
+	{
+		nameFix.replace(nameFix.end() - 3, nameFix.end(), "unix");
 	}
 	path = "/Wallpaper/" + nameFix + ".png";
 
 	Debug() << "Setting wallpaper to " << path;
 
-	#ifdef __APPLE__
-		if (!isCached) {
-			MacDesktop::CacheCurrentBackground();
-			isCached = true;
+#ifdef __APPLE__
+	if (!isCached)
+	{
+		MacDesktop::CacheCurrentBackground();
+		isCached = true;
+	}
+	MacDesktop::ChangeBackground(shState->config().gameFolder + path, ((color >> 16) & 0xFF) / 255.0, ((color >> 8) & 0xFF) / 255.0, (color & 0xFF) / 255.0);
+#else
+	char gameDir[PATH_MAX];
+	if (getcwd(gameDir, sizeof(gameDir)) == NULL)
+	{
+		return Qnil;
+	}
+	std::string gameDirStr(gameDir);
+	desktopEnvironmentInit();
+	if (desktop == "cinnamon" || desktop == "gnome" || desktop == "mate" || desktop == "deepin")
+	{
+		std::stringstream hexColor;
+		hexColor << "#" << std::hex << color;
+		g_settings_set_string(bgsetting, "picture-options", "scaled");
+		g_settings_set_string(bgsetting, "primary-color", hexColor.str().c_str());
+		g_settings_set_string(bgsetting, "color-shading-type", "solid");
+		if (desktop == "cinnamon" || desktop == "gnome" || desktop == "deepin")
+		{
+			g_settings_set_string(bgsetting, "picture-uri", ("file://" + gameDirStr + path).c_str());
 		}
-		MacDesktop::ChangeBackground(shState->config().gameFolder + path, ((color >> 16) & 0xFF) / 255.0, ((color >> 8) & 0xFF) / 255.0, (color & 0xFF) / 255.0);
-	#else
-		char gameDir[PATH_MAX];
-		if (getcwd(gameDir, sizeof(gameDir)) == NULL) {
-			return Qnil;
+		else
+		{
+			g_settings_set_string(bgsetting, "picture-filename", (gameDirStr + path).c_str());
 		}
-		std::string gameDirStr(gameDir);
-		desktopEnvironmentInit();
-		if (desktop == "cinnamon" || desktop == "gnome" || desktop == "mate" || desktop == "deepin") {
-			std::stringstream hexColor;
-			hexColor << "#" << std::hex << color;
-			g_settings_set_string(bgsetting, "picture-options", "scaled");
-			g_settings_set_string(bgsetting, "primary-color", hexColor.str().c_str());
-			g_settings_set_string(bgsetting, "color-shading-type", "solid");
-			if (desktop == "cinnamon" || desktop == "gnome" || desktop == "deepin") {
-				g_settings_set_string(bgsetting, "picture-uri", ("file://" + gameDirStr + path).c_str());
-			} else {
-				g_settings_set_string(bgsetting, "picture-filename", (gameDirStr + path).c_str());
-			}
-		} else if (desktop == "xfce") {
-			int r = (color >> 16) & 0xFF;
-			int g = (color >> 8) & 0xFF;
-			int b = color & 0xFF;
-			unsigned int ur = r * 256 + r;
-			unsigned int ug = g * 256 + g;
-			unsigned int ub = b * 256 + b;
-			unsigned int alpha = 65535;
-			std::string concatPath(gameDirStr + path);
-			xfconf_channel_set_string(bgchannel, optionImage.c_str(), concatPath.c_str());
-			xfconf_channel_set_int(bgchannel, optionColorStyle.c_str(), 0);
-			xfconf_channel_set_int(bgchannel, optionImageStyle.c_str(), 4);
-			GValue colorValue = G_VALUE_INIT;
-			GPtrArray *colorArr = g_ptr_array_sized_new(4);
-			GType colorArrType = g_type_from_name("GPtrArray_GValue_");
-			if (!colorArrType) {
-				std::stringstream colorCommand;
-				colorCommand << "xfconf-query -c xfce4-desktop -n -p " << optionColor
-							 << " -t uint -t uint -t uint -t uint -s " << ub
-							 << " -s " << ug << " -s " << ub << " -s " << alpha;
-				int colorCommandRes = system(colorCommand.str().c_str());
-				defColorExists = xfconf_channel_get_property(bgchannel, optionColor.c_str(), &defColor);
-				colorArrType = g_type_from_name("GPtrArray_GValue_");
-				if (!colorArrType) {
-					// Let's do some debug output here and skip changing the color
-					Debug() << "WALLPAPER ERROR: xfconf-query call returned" << colorCommandRes;
-					return Qnil;
-				}
+	}
+	else if (desktop == "xfce")
+	{
+		int r = (color >> 16) & 0xFF;
+		int g = (color >> 8) & 0xFF;
+		int b = color & 0xFF;
+		unsigned int ur = r * 256 + r;
+		unsigned int ug = g * 256 + g;
+		unsigned int ub = b * 256 + b;
+		unsigned int alpha = 65535;
+		std::string concatPath(gameDirStr + path);
+		xfconf_channel_set_string(bgchannel, optionImage.c_str(), concatPath.c_str());
+		xfconf_channel_set_int(bgchannel, optionColorStyle.c_str(), 0);
+		xfconf_channel_set_int(bgchannel, optionImageStyle.c_str(), 4);
+		GValue colorValue = G_VALUE_INIT;
+		GPtrArray *colorArr = g_ptr_array_sized_new(4);
+		GType colorArrType = g_type_from_name("GPtrArray_GValue_");
+		if (!colorArrType)
+		{
+			std::stringstream colorCommand;
+			colorCommand << "xfconf-query -c xfce4-desktop -n -p " << optionColor
+						 << " -t uint -t uint -t uint -t uint -s " << ub
+						 << " -s " << ug << " -s " << ub << " -s " << alpha;
+			int colorCommandRes = system(colorCommand.str().c_str());
+			defColorExists = xfconf_channel_get_property(bgchannel, optionColor.c_str(), &defColor);
+			colorArrType = g_type_from_name("GPtrArray_GValue_");
+			if (!colorArrType)
+			{
+				// Let's do some debug output here and skip changing the color
+				Debug() << "WALLPAPER ERROR: xfconf-query call returned" << colorCommandRes;
+				return Qnil;
 			}
-			g_value_init(&colorValue, colorArrType);
-			GValue *vr = g_new0(GValue, 1);
-			GValue *vg = g_new0(GValue, 1);
-			GValue *vb = g_new0(GValue, 1);
-			GValue *va = g_new0(GValue, 1);
-			g_value_init(vr, G_TYPE_UINT);
-			g_value_init(vg, G_TYPE_UINT);
-			g_value_init(vb, G_TYPE_UINT);
-			g_value_init(va, G_TYPE_UINT);
-			g_value_set_uint(vr, ur);
-			g_value_set_uint(vg, ug);
-			g_value_set_uint(vb, ub);
-			g_value_set_uint(va, alpha);
-			g_ptr_array_add(colorArr, vr);
-			g_ptr_array_add(colorArr, vg);
-			g_ptr_array_add(colorArr, vb);
-			g_ptr_array_add(colorArr, va);
-			g_value_set_boxed(&colorValue, colorArr);
-			xfconf_channel_set_property(bgchannel, optionColor.c_str(), &colorValue);
-		} else if (desktop == "kde") {
-			std::stringstream command;
-			std::string concatPath(gameDirStr + path);
-			boost::replace_all(concatPath, "\\", "\\\\");
-			boost::replace_all(concatPath, "\"", "\\\"");
-			boost::replace_all(concatPath, "'", "\\x27");
-			command << "qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'string:" <<
-				"var allDesktops = desktops();" <<
-				"for (var i = 0, l = allDesktops.length; i < l; ++i) {" <<
-					"var d = allDesktops[i];" <<
-					"d.wallpaperPlugin = \"org.kde.image\";" <<
-					"d.currentConfigGroup = [\"Wallpaper\", \"org.kde.image\", \"General\"];" <<
-					"d.writeConfig(\"Image\", \"file://" << concatPath << "\");" <<
-					"d.writeConfig(\"FillMode\", \"6\");" <<
-					"d.writeConfig(\"Blur\", false);" <<
-					"d.writeConfig(\"Color\", [\"" <<
-						std::to_string((color >> 16) & 0xFF) << "\", \"" <<
-						std::to_string((color >> 8) & 0xFF) << "\", \"" <<
-						std::to_string(color & 0xFF) <<
-					"\"]);" <<
-				"}" <<
-			"'";
-			Debug() << "Wallpaper command:" << command.str();
-			int result = system(command.str().c_str());
-			Debug() << "Result:" << result;
-		} else {
-			std::ifstream srcHint(gameDirStr + path);
-			std::ofstream dstHint(fallbackPath);
-			dstHint << srcHint.rdbuf();
-			srcHint.close();
-			dstHint.close();
 		}
-	#endif
+		g_value_init(&colorValue, colorArrType);
+		GValue *vr = g_new0(GValue, 1);
+		GValue *vg = g_new0(GValue, 1);
+		GValue *vb = g_new0(GValue, 1);
+		GValue *va = g_new0(GValue, 1);
+		g_value_init(vr, G_TYPE_UINT);
+		g_value_init(vg, G_TYPE_UINT);
+		g_value_init(vb, G_TYPE_UINT);
+		g_value_init(va, G_TYPE_UINT);
+		g_value_set_uint(vr, ur);
+		g_value_set_uint(vg, ug);
+		g_value_set_uint(vb, ub);
+		g_value_set_uint(va, alpha);
+		g_ptr_array_add(colorArr, vr);
+		g_ptr_array_add(colorArr, vg);
+		g_ptr_array_add(colorArr, vb);
+		g_ptr_array_add(colorArr, va);
+		g_value_set_boxed(&colorValue, colorArr);
+		xfconf_channel_set_property(bgchannel, optionColor.c_str(), &colorValue);
+	}
+	else if (desktop == "kde")
+	{
+		std::stringstream command;
+		std::string concatPath(gameDirStr + path);
+		std::regex_replace(concatPath, std::regex("\\\\"), "\\\\");
+		std::regex_replace(concatPath, std::regex("\""), "\\\"");
+		std::regex_replace(concatPath, std::regex("'"), "\\x27");
+		command << "qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'string:"
+				<< "var allDesktops = desktops();"
+				<< "for (var i = 0, l = allDesktops.length; i < l; ++i) {"
+				<< "var d = allDesktops[i];"
+				<< "d.wallpaperPlugin = \"org.kde.image\";"
+				<< "d.currentConfigGroup = [\"Wallpaper\", \"org.kde.image\", \"General\"];"
+				<< "d.writeConfig(\"Image\", \"file://" << concatPath << "\");"
+				<< "d.writeConfig(\"FillMode\", \"6\");"
+				<< "d.writeConfig(\"Blur\", false);"
+				<< "d.writeConfig(\"Color\", [\"" << std::to_string((color >> 16) & 0xFF) << "\", \"" << std::to_string((color >> 8) & 0xFF) << "\", \"" << std::to_string(color & 0xFF) << "\"]);"
+				<< "}"
+				<< "'";
+		Debug() << "Wallpaper command:" << command.str();
+		int result = system(command.str().c_str());
+		Debug() << "Result:" << result;
+	}
+	else
+	{
+		std::ifstream srcHint(gameDirStr + path);
+		std::ofstream dstHint(fallbackPath);
+		dstHint << srcHint.rdbuf();
+		srcHint.close();
+		dstHint.close();
+	}
+#endif
 #endif
 	return Qnil;
 }
@@ -366,7 +420,8 @@ RB_METHOD(wallpaperReset)
 {
 	RB_UNUSED_PARAM;
 #ifdef _WIN32
-	if (isCached) {
+	if (isCached)
+	{
 		int colorId = COLOR_BACKGROUND;
 		HKEY hKey = NULL;
 		if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_WRITE, &hKey) != ERROR_SUCCESS)
@@ -374,10 +429,10 @@ RB_METHOD(wallpaperReset)
 
 		// Set the style
 		if (setStyle)
-			RegSetValueExW(hKey, L"WallpaperStyle", 0, REG_SZ, (const BYTE*)szStyle, szStyleSize);
+			RegSetValueExW(hKey, L"WallpaperStyle", 0, REG_SZ, (const BYTE *)szStyle, szStyleSize);
 
 		if (setTile)
-			RegSetValueExW(hKey, L"TileWallpaper", 0, REG_SZ, (const BYTE*)szTile, szTileSize);
+			RegSetValueExW(hKey, L"TileWallpaper", 0, REG_SZ, (const BYTE *)szTile, szTileSize);
 
 		// Set the wallpaper
 		if (!SystemParametersInfoW(SPI_SETDESKWALLPAPER, 0, (PVOID)szFile, SPIF_UPDATEINIFILE))
@@ -391,96 +446,124 @@ RB_METHOD(wallpaperReset)
 			RegCloseKey(hKey);
 	}
 #else
-	#ifdef __APPLE__
-		MacDesktop::ResetBackground();
-	#else
-		desktopEnvironmentInit();
-		if (desktop == "cinnamon" || desktop == "gnome" || desktop == "mate" || desktop == "deepin") {
-			if (desktop == "cinnamon" || desktop == "gnome" || desktop == "deepin") {
-				g_settings_set_string(bgsetting, "picture-uri", defPictureURI.c_str());
-			} else {
-				g_settings_set_string(bgsetting, "picture-filename", defPictureURI.c_str());
-			}
-			g_settings_set_string(bgsetting, "picture-options", defPictureOptions.c_str());
-			g_settings_set_string(bgsetting, "primary-color", defPrimaryColor.c_str());
-			g_settings_set_string(bgsetting, "color-shading-type", defColorShading.c_str());
-		} else if (desktop == "xfce") {
-			if (defColorExists) {
-				xfconf_channel_set_property(bgchannel, optionColor.c_str(), &defColor);
-			} else {
-				xfconf_channel_reset_property(bgchannel, optionColor.c_str(), false);
-			}
-			if (defPictureURI == "") {
-				xfconf_channel_reset_property(bgchannel, optionImage.c_str(), false);
-			} else {
-				xfconf_channel_set_string(bgchannel, optionImage.c_str(), defPictureURI.c_str());
-			}
-			if (defPictureStyle == -1) {
-				xfconf_channel_reset_property(bgchannel, optionImageStyle.c_str(), false);
-			} else {
-				xfconf_channel_set_int(bgchannel, optionImageStyle.c_str(), defPictureStyle);
+#ifdef __APPLE__
+	MacDesktop::ResetBackground();
+#else
+	desktopEnvironmentInit();
+	if (desktop == "cinnamon" || desktop == "gnome" || desktop == "mate" || desktop == "deepin")
+	{
+		if (desktop == "cinnamon" || desktop == "gnome" || desktop == "deepin")
+		{
+			g_settings_set_string(bgsetting, "picture-uri", defPictureURI.c_str());
+		}
+		else
+		{
+			g_settings_set_string(bgsetting, "picture-filename", defPictureURI.c_str());
+		}
+		g_settings_set_string(bgsetting, "picture-options", defPictureOptions.c_str());
+		g_settings_set_string(bgsetting, "primary-color", defPrimaryColor.c_str());
+		g_settings_set_string(bgsetting, "color-shading-type", defColorShading.c_str());
+	}
+	else if (desktop == "xfce")
+	{
+		if (defColorExists)
+		{
+			xfconf_channel_set_property(bgchannel, optionColor.c_str(), &defColor);
+		}
+		else
+		{
+			xfconf_channel_reset_property(bgchannel, optionColor.c_str(), false);
+		}
+		if (defPictureURI == "")
+		{
+			xfconf_channel_reset_property(bgchannel, optionImage.c_str(), false);
+		}
+		else
+		{
+			xfconf_channel_set_string(bgchannel, optionImage.c_str(), defPictureURI.c_str());
+		}
+		if (defPictureStyle == -1)
+		{
+			xfconf_channel_reset_property(bgchannel, optionImageStyle.c_str(), false);
+		}
+		else
+		{
+			xfconf_channel_set_int(bgchannel, optionImageStyle.c_str(), defPictureStyle);
+		}
+		if (defColorStyle == -1)
+		{
+			xfconf_channel_reset_property(bgchannel, optionColorStyle.c_str(), false);
+		}
+		else
+		{
+			xfconf_channel_set_int(bgchannel, optionColorStyle.c_str(), defColorStyle);
+		}
+	}
+	else if (desktop == "kde")
+	{
+		std::stringstream command;
+		command << "qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'string:"
+				<< "var allDesktops = desktops();"
+				<< "var data = {";
+		// Plugin, picture, color, mode, blur
+		for (auto const &x : defPlugins)
+		{
+			command << "\"" << x.first << "\": {"
+					<< "plugin: \"" << x.second << "\"";
+			if (defPictures.find(x.first) != defPictures.end())
+			{
+				std::string picture = defPictures[x.first];
+				std::regex_replace(picture, std::regex("\\\\"), "\\\\");
+				std::regex_replace(picture, std::regex("\""), "\\\"");
+				std::regex_replace(picture, std::regex("'"), "\\x27");
+				command << ", picture: \"" << picture << "\"";
 			}
-			if (defColorStyle == -1) {
-				xfconf_channel_reset_property(bgchannel, optionColorStyle.c_str(), false);
-			} else {
-				xfconf_channel_set_int(bgchannel, optionColorStyle.c_str(), defColorStyle);
+			if (defColors.find(x.first) != defColors.end())
+			{
+				command << ", color: \"" << defColors[x.first] << "\"";
 			}
-		} else if (desktop == "kde") {
-			std::stringstream command;
-			command << "qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'string:" <<
-					"var allDesktops = desktops();" <<
-					"var data = {";
-			// Plugin, picture, color, mode, blur
-			for (auto const& x : defPlugins) {
-				command << "\"" << x.first << "\": {"
-						<< "plugin: \"" << x.second << "\"";
-				if (defPictures.find(x.first) != defPictures.end()) {
-					std::string picture = defPictures[x.first];
-					boost::replace_all(picture, "\\", "\\\\");
-					boost::replace_all(picture, "\"", "\\\"");
-					boost::replace_all(picture, "'", "\\x27");
-					command << ", picture: \"" << picture << "\"";
-				}
-				if (defColors.find(x.first) != defColors.end()) {
-					command << ", color: \"" << defColors[x.first] << "\"";
-				}
-				if (defModes.find(x.first) != defModes.end()) {
-					command << ", mode: \"" << defModes[x.first] << "\"";
-				}
-				if (defBlurs.find(x.first) != defBlurs.end() && defBlurs[x.first]) {
-					command << ", blur: true";
-				}
-				command << "},";
+			if (defModes.find(x.first) != defModes.end())
+			{
+				command << ", mode: \"" << defModes[x.first] << "\"";
 			}
-			command << "\"no\": {}};" <<
-				"for (var i = 0, l = allDesktops.length; i < l; ++i) {" <<
-					"var d = allDesktops[i];" <<
-					"var dat = data[d.id];" <<
-					"d.wallpaperPlugin = dat.plugin;" <<
-					"d.currentConfigGroup = [\"Wallpaper\", \"org.kde.image\", \"General\"];" <<
-					"if (dat.picture) {" <<
-						"d.writeConfig(\"Image\", dat.picture);" <<
-					"}" <<
-					"if (dat.color) {" <<
-						"d.writeConfig(\"Color\", dat.color.split(\",\"));" <<
-					"}" <<
-					"if (dat.mode) {" <<
-						"d.writeConfig(\"FillMode\", dat.mode);" <<
-					"}" <<
-					"if (dat.blur) {" <<
-						"d.writeConfig(\"Blur\", dat.blur);" <<
-					"}" <<
-				"}" <<
-			"'";
-			Debug() << "Reset wallpaper command:" << command.str();
-			int result = system(command.str().c_str());
-			Debug() << "Reset result:" << result;
-		} else {
-			if (remove(fallbackPath.c_str()) != 0) {
-				Debug() << "Failed to delete:" << fallbackPath;
+			if (defBlurs.find(x.first) != defBlurs.end() && defBlurs[x.first])
+			{
+				command << ", blur: true";
 			}
+			command << "},";
+		}
+		command << "\"no\": {}};"
+				<< "for (var i = 0, l = allDesktops.length; i < l; ++i) {"
+				<< "var d = allDesktops[i];"
+				<< "var dat = data[d.id];"
+				<< "d.wallpaperPlugin = dat.plugin;"
+				<< "d.currentConfigGroup = [\"Wallpaper\", \"org.kde.image\", \"General\"];"
+				<< "if (dat.picture) {"
+				<< "d.writeConfig(\"Image\", dat.picture);"
+				<< "}"
+				<< "if (dat.color) {"
+				<< "d.writeConfig(\"Color\", dat.color.split(\",\"));"
+				<< "}"
+				<< "if (dat.mode) {"
+				<< "d.writeConfig(\"FillMode\", dat.mode);"
+				<< "}"
+				<< "if (dat.blur) {"
+				<< "d.writeConfig(\"Blur\", dat.blur);"
+				<< "}"
+				<< "}"
+				<< "'";
+		Debug() << "Reset wallpaper command:" << command.str();
+		int result = system(command.str().c_str());
+		Debug() << "Reset result:" << result;
+	}
+	else
+	{
+		if (remove(fallbackPath.c_str()) != 0)
+		{
+			Debug() << "Failed to delete:" << fallbackPath;
 		}
-	#endif
+	}
+#endif
 #endif
 	return Qnil;
 }
@@ -498,7 +581,8 @@ void wallpaperBindingInit()
 void wallpaperBindingTerminate()
 {
 	// Clean up.
-	if (desktop == "xfce") {
+	if (desktop == "xfce")
+	{
 		xfconf_shutdown();
 	}
 }
diff --git a/linux/Makefile b/linux/Makefile
index bb203768..a018279d 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -9,7 +9,7 @@ LIBDIR := $(BUILD_PREFIX)/lib
 INCLUDEDIR := $(BUILD_PREFIX)/include
 DOWNLOADS := ${PWD}/downloads/$(ARCH)
 NPROC := $(shell nproc)
-CFLAGS := -I$(INCLUDEDIR) -flax-vector-conversions
+CFLAGS := -I$(INCLUDEDIR) -flax-vector-conversions -O3
 LDFLAGS := -L$(LIBDIR)
 CC      := gcc
 PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig
@@ -103,6 +103,22 @@ $(DOWNLOADS)/libnsgif/configure: $(DOWNLOADS)/libnsgif/autogen.sh
 $(DOWNLOADS)/libnsgif/autogen.sh:
 	$(CLONE) $(GITHUB)/jcupitt/libnsgif-autotools $(DOWNLOADS)/libnsgif
 
+argparse: init_dirs ${INCLUDEDIR}/argparse/argparse.hpp
+
+$(INCLUDEDIR)/argparse/argparse.hpp: $(DOWNLOADS)/argparse
+	cp $(DOWNLOADS)/argparse/include/* $(INCLUDEDIR) -r
+
+$(DOWNLOADS)/argparse:
+	$(CLONE) $(GITHUB)/p-ranav/argparse $(DOWNLOADS)/argparse
+
+tomlplusplus: init_dirs ${INCLUDEDIR}/toml++/toml.h
+
+$(INCLUDEDIR)/toml++/toml.h: $(DOWNLOADS)/tomlplusplus
+	cp $(DOWNLOADS)/tomlplusplus/include/* $(INCLUDEDIR) -r
+
+$(DOWNLOADS)/tomlplusplus:
+	$(CLONE) $(GITHUB)/marzer/tomlplusplus $(DOWNLOADS)/tomlplusplus
+
 # ====
 init_dirs:
 	@mkdir -p $(LIBDIR) $(INCLUDEDIR)
@@ -112,5 +128,5 @@ powerwash: clean-downloads
 clean-downloads:
 	-rm -rf downloads
 
-deps-core: sdlsound iconv libnsgif
+deps-core: argparse tomlplusplus sdlsound iconv libnsgif
 everything: deps-core ruby
diff --git a/linux/install.sh b/linux/install.sh
index 6539dba7..8768305b 100644
--- a/linux/install.sh
+++ b/linux/install.sh
@@ -12,7 +12,7 @@ SO_PROCESSED=""
 
 function fail() {
     echo "$1"
-    echo "Please beat the crap out of rkevin until he fixes this issue."
+    echo "Please beat the crap out of Lily until she fixes this issue."
     exit 1
 }
 
@@ -45,9 +45,7 @@ mkdir -p $DESTDIR
 copy_dependencies $BINARY $BINARY
 
 echo "Copying standard library..."
-cp -ar "$RUBY_LIB_DIR/$RUBY_VER.0" "$DESTDIR/ruby"
+cp -ar "$RUBY_LIB_DIR/$RUBY_VER.0/*" "$DESTDIR/ruby"
 echo "Downloading cacert.pem..."
 curl -o "$DESTDIR/cacert.pem" https://curl.se/ca/cacert.pem
-echo "Sym-linking modshot..."
-ln -sf "$DESTDIR/lmodshot" $BINARY
 echo "Done!"
diff --git a/meson.build b/meson.build
index bdc2149a..f32542b2 100644
--- a/meson.build
+++ b/meson.build
@@ -138,7 +138,7 @@ executable(
     cpp_args: global_args,
     objc_args: global_args,
     objcpp_args: global_args,
-    win_subsystem: 'windows',
+    win_subsystem: 'console',
     install: (host_system != 'windows')
 )
 
diff --git a/scripts/meson.build b/scripts/meson.build
index 3b81d86e..376ccae0 100644
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -1,12 +1,12 @@
-global_sources += custom_target('pack scripts',
-    output: 'xScripts.rxdata',
-    command: [
-            ruby,
-            meson.current_source_dir() + '/ruby/rpgscript.rb',
-            '-s', meson.current_source_dir() + '/rgss',
-            '-o', '@OUTPUT@'
-        ],
-    install: true,
-    install_dir: 'Data',
-    build_always_stale: true
-)
+# global_sources += custom_target('pack scripts',
+#     output: 'xScripts.rxdata',
+#     command: [
+#             ruby,
+#             meson.current_source_dir() + '/ruby/rpgscript.rb',
+#             '-s', meson.current_source_dir() + '/rgss',
+#             '-o', '@OUTPUT@'
+#         ],
+#     install: true,
+#     install_dir: 'Data',
+#     build_always_stale: true
+# )
diff --git a/scripts/rgss/Main.rb b/scripts/rgss/Main.rb
index fe0e154b..48d95f25 100644
--- a/scripts/rgss/Main.rb
+++ b/scripts/rgss/Main.rb
@@ -4,6 +4,11 @@
 #  After defining each class, actual processing begins here.
 #==============================================================================
 
+require "benchmark"
+
+puts Benchmark.measure { 1000.times { Algorithm.rectangle_distance(0.0, 0.0, 1.0, 1.0, 1.0, 2.0) } }
+puts Benchmark.measure { 1000.times { dx = [0.0, 0.0 - 1.0 - (1.0 / 2.0)].max; dy = [0.0, 0.0 - 1.0 - (2.0 / 2.0)].max; Math.sqrt(dx * dx + dy * dy) - 1.0 } }
+
 at_exit do
   Wallpaper.reset
   save unless $game_switches[99] || ($game_system.map_interpreter.running? || !$scene.is_a?(Scene_Map))
diff --git a/scripts/rgss/i18n_Language.rb b/scripts/rgss/i18n_Language.rb
index 9f7ae9a2..688e9173 100644
--- a/scripts/rgss/i18n_Language.rb
+++ b/scripts/rgss/i18n_Language.rb
@@ -3,11 +3,12 @@
 
 # for debug REMOVE BEFORE COMMITTING / BUILDING
 # require "zlib"
+require "zlib"
 
 class Language
   FONT_WESTERN = 'Terminus (TTF)'
   FONT_J = 'HigashiOme Gothic regular'
-  LANGUAGES = []
+  LANGUAGES = ['en']
   class << self
     def set(lc)
       dbg_print(lc.lang)
@@ -45,7 +46,7 @@ def load_pot(path)
             #unescape the string
             eval("msgstr = " + line)
             if !(msgid.nil? || msgid.empty?)
-              @data[Oneshot::crc32(msgid)] = msgstr
+              @data[Zlib.crc32(msgid)] = msgstr
             end
           end
         end
@@ -56,7 +57,7 @@ def load_pot(path)
     def tr(string)
       #dbg_print(caller_locations(1, 1).first.tap{|loc| puts "#{loc.path}:#{loc.lineno}"})
       if @data
-        rv = @data[Oneshot::crc32(string)] || string
+        rv = @data[Zlib.crc32(string)] || string
       else
         rv = string
       end
diff --git a/setup.sh b/setup.sh
index ebd7d6d9..bb0f7b01 100755
--- a/setup.sh
+++ b/setup.sh
@@ -10,7 +10,7 @@ if [[ $OSTYPE == msys ]]; then
     pacboy -S git: vim: libtool: autoconf: automake: gcc:p make:p cmake:p \
     ruby:p bison: doxygen:p SDL2:p SDL2_image:p SDL2_ttf:p openal:p \
     freetype:p physfs:p pixman:p libwebp:p zlib:p meson:p clang:p bzip2:p \
-    libvorbis:p libogg:p zeromq:p libsigc++:p boost:p libpng:p \
+    libvorbis:p libogg:p zeromq:p libsigc++:p libpng:p \
     libjpeg-turbo:p libtiff:p harfbuzz:p --needed --noconfirm
 else 
     if [[ "$(cat /etc/issue)" == Debian* || "$(cat /etc/issue)" == Ubuntu* ]];
@@ -20,7 +20,7 @@ else
         sudo apt install -y gcc make cmake vim ruby bison doxygen meson \
         libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libopenal-dev \
         libphysfs-dev libpixman-1-dev libwebp-dev libbz2-dev libvorbis-dev \
-        libogg-dev libsodium-dev libboost-dev libpng-dev libjpeg-dev \
+        libogg-dev libsodium-dev libpng-dev libjpeg-dev \
         libtiff-dev libsigc++-2.0-dev libgtk-3-dev libxfconf-0-dev \
         libfreetype-dev libharfbuzz-dev
     fi
@@ -33,7 +33,7 @@ else
         doxygen sdl2 openal pixman libwebp bzip2 libvorbis libogg libsodium \
         libpng libjpeg libtiff zeromq mm-common base-devel gtk3
         echo " * Installing dependencies with pamac..."
-        sudo pamac install sdl2_image sdl2_ttf physfs boost boost-libs \
+        sudo pamac install sdl2_image sdl2_ttf physfs \
         libsigc++ sdl_sound m4 meson freetype harfbuzz --no-confirm
     fi
 
@@ -48,7 +48,7 @@ else
         libjpeg-turbo-devel libogg libogg-devel libtiff libtiff-devel \
         libsodium libsodium-devel zeromq zeromq-devel physfs physfs-devel \
         pixman pixman-devel bzip2 openal-soft speex speex-devel libmodplug \
-        libmodplug-devel boost boost-devel openal-soft-devel xfconf \
+        libmodplug-devel openal-soft-devel xfconf \
         xfconf-devel gtk3 gtk3-devel libsigc++-devel harfbuzz-devel
     fi
 fi
diff --git a/src/al/source/audio.cpp b/src/al/source/audio.cpp
index 6a1ece25..e09a065c 100644
--- a/src/al/source/audio.cpp
+++ b/src/al/source/audio.cpp
@@ -77,8 +77,8 @@ struct AudioPrivate
 	      bgs(ALStream::Looped, "bgs"),
 	      me(ALStream::NotLooped, "me"),
 	      se(rtData.config),
-		  lch(ALStream::Looped, "lch", rtData.config.audioChannels),
-		  ch(ALStream::NotLooped, "ch", rtData.config.audioChannels),
+		  lch(ALStream::Looped, "lch", rtData.config.audio.audioChannels),
+		  ch(ALStream::NotLooped, "ch", rtData.config.audio.audioChannels),
 	      syncPoint(rtData.syncPoint)
 	{
 		bgm_volume = 100;
diff --git a/src/al/source/soundemitter.cpp b/src/al/source/soundemitter.cpp
index 63d99708..7b8396a3 100644
--- a/src/al/source/soundemitter.cpp
+++ b/src/al/source/soundemitter.cpp
@@ -90,7 +90,7 @@ arrayPushBack(std::vector<size_t> &array, size_t size, size_t index)
 
 SoundEmitter::SoundEmitter(const Config &conf)
     : bufferBytes(0),
-      srcCount(conf.SE.sourceCount),
+      srcCount(conf.audio.sourceCount),
       alSrcs(srcCount),
       atchBufs(srcCount),
       srcPrio(srcCount)
diff --git a/src/filesystem/headers/rgssad.h b/src/filesystem/headers/rgssad.h
deleted file mode 100644
index 96f9695b..00000000
--- a/src/filesystem/headers/rgssad.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-** rgssad.h
-**
-** This file is part of mkxp.
-**
-** Copyright (C) 2014 Jonas Kulla <Nyocurio@gmail.com>
-**
-** mkxp is free software: you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation, either version 2 of the License, or
-** (at your option) any later version.
-**
-** mkxp is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef RGSSAD_H
-#define RGSSAD_H
-
-#include <physfs.h>
-
-extern const PHYSFS_Archiver RGSS1_Archiver;
-extern const PHYSFS_Archiver RGSS2_Archiver;
-extern const PHYSFS_Archiver RGSS3_Archiver;
-
-#endif // RGSSAD_H
diff --git a/src/filesystem/source/filesystem.cpp b/src/filesystem/source/filesystem.cpp
index 87dc3908..99b86e5d 100644
--- a/src/filesystem/source/filesystem.cpp
+++ b/src/filesystem/source/filesystem.cpp
@@ -21,7 +21,6 @@
 
 #include "filesystem.h"
 
-#include "rgssad.h"
 #include "font.h"
 #include "util.h"
 #include "exception.h"
@@ -319,10 +318,6 @@ FileSystem::FileSystem(bool allowSymlinks)
 	p = new FileSystemPrivate;
 	p->havePathCache = false;
 
-	PHYSFS_registerArchiver(&RGSS1_Archiver);
-	PHYSFS_registerArchiver(&RGSS2_Archiver);
-	PHYSFS_registerArchiver(&RGSS3_Archiver);
-
 	if (allowSymlinks)
 		PHYSFS_permitSymbolicLinks(1);
 }
diff --git a/src/filesystem/source/rgssad.cpp b/src/filesystem/source/rgssad.cpp
deleted file mode 100644
index ac8772a1..00000000
--- a/src/filesystem/source/rgssad.cpp
+++ /dev/null
@@ -1,641 +0,0 @@
-/*
-** rgssad.cpp
-**
-** This file is part of mkxp.
-**
-** Copyright (C) 2014 Jonas Kulla <Nyocurio@gmail.com>
-**
-** mkxp is free software: you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation, either version 2 of the License, or
-** (at your option) any later version.
-**
-** mkxp is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "rgssad.h"
-#include "boost-hash.h"
-
-#include <stdint.h>
-#include <string.h>
-
-struct RGSS_entryData
-{
-	int64_t offset;
-	uint64_t size;
-	uint32_t startMagic;
-};
-
-struct RGSS_entryHandle
-{
-	const RGSS_entryData data;
-	uint32_t currentMagic;
-	uint64_t currentOffset;
-	PHYSFS_Io *io;
-
-	RGSS_entryHandle(const RGSS_entryData &data, PHYSFS_Io *archIo)
-	    : data(data),
-	      currentMagic(data.startMagic),
-	      currentOffset(0)
-	{
-		io = archIo->duplicate(archIo);
-	}
-
-	~RGSS_entryHandle()
-	{
-		io->destroy(io);
-	}
-};
-
-struct RGSS_archiveData
-{
-	PHYSFS_Io *archiveIo;
-
-	/* Maps: file path
-	 * to:   entry data */
-	BoostHash<std::string, RGSS_entryData> entryHash;
-
-	/* Maps: directory path,
-	 * to:   list of contained entries */
-	BoostHash<std::string, BoostSet<std::string> > dirHash;
-};
-
-static bool
-readUint32(PHYSFS_Io *io, uint32_t &result)
-{
-	char buff[4];
-	PHYSFS_sint64 count = io->read(io, buff, 4);
-
-	result = ((buff[0] << 0x00) & 0x000000FF) |
-	         ((buff[1] << 0x08) & 0x0000FF00) |
-	         ((buff[2] << 0x10) & 0x00FF0000) |
-	         ((buff[3] << 0x18) & 0xFF000000) ;
-
-	return (count == 4);
-}
-
-#define RGSS_HEADER "RGSSAD"
-#define RGSS_MAGIC 0xDEADCAFE
-
-#define PHYSFS_ALLOC(type) \
-	static_cast<type*>(PHYSFS_getAllocator()->Malloc(sizeof(type)))
-
-#define IO_READ(io, dest, size) (io->read(io, dest, size) == size)
-
-static inline uint32_t
-advanceMagic(uint32_t &magic)
-{
-	uint32_t old = magic;
-
-	magic = magic * 7 + 3;
-
-	return old;
-}
-
-static PHYSFS_sint64
-RGSS_ioRead(PHYSFS_Io *self, void *buffer, PHYSFS_uint64 len)
-{
-	RGSS_entryHandle *entry = static_cast<RGSS_entryHandle*>(self->opaque);
-
-	PHYSFS_Io *io = entry->io;
-
-	uint64_t toRead = std::min<uint64_t>(entry->data.size - entry->currentOffset, len);
-	uint64_t offs = entry->currentOffset;
-
-	io->seek(io, entry->data.offset + offs);
-
-	/* We divide up the bytes to be read in 3 categories:
-	 *
-	 * preAlign: If the current read address is not dword
-	 *   aligned, this is the number of bytes to read til
-	 *   we reach alignment again (therefore can only be
-	 *   3 or less).
-	 *
-	 * align: The number of aligned dwords we can read
-	 *   times 4 (= number of bytes).
-	 *
-	 * postAlign: The number of bytes to read after the
-	 *   last aligned dword. Always 3 or less.
-	 *
-	 * Treating the pre- and post aligned reads specially,
-	 * we can read all aligned dwords in one syscall directly
-	 * into the write buffer and then run the xor chain on
-	 * it afterwards. */
-
-	uint8_t preAlign = 4 - (offs % 4);
-
-	if (preAlign == 4)
-		preAlign = 0;
-	else
-		preAlign = std::min<uint64_t>(preAlign, len);
-
-	uint8_t postAlign = (len > preAlign) ? (offs + len) % 4 : 0;
-
-	uint64_t align = len - (preAlign + postAlign);
-
-	/* Byte buffer pointer */
-	uint8_t *bBufferP = static_cast<uint8_t*>(buffer);
-
-	if (preAlign > 0)
-	{
-		uint32_t dword;
-		io->read(io, &dword, preAlign);
-
-		/* Need to align the bytes with the
-		 * magic before xoring */
-		dword <<= 8 * (offs % 4);
-		dword ^= entry->currentMagic;
-
-		/* Shift them back to normal */
-		dword >>= 8 * (offs % 4);
-		memcpy(bBufferP, &dword, preAlign);
-
-		bBufferP += preAlign;
-
-		/* Only advance the magic if we actually
-		 * reached the next alignment */
-		if ((offs+preAlign) % 4 == 0)
-			advanceMagic(entry->currentMagic);
-	}
-
-	if (align > 0)
-	{
-		/* Double word buffer pointer */
-		uint32_t *dwBufferP = reinterpret_cast<uint32_t*>(bBufferP);
-
-		/* Read aligned dwords in one go */
-		io->read(io, bBufferP, align);
-
-		/* Then xor them */
-		for (uint64_t i = 0; i < (align / 4); ++i)
-			dwBufferP[i] ^= advanceMagic(entry->currentMagic);
-
-		bBufferP += align;
-	}
-
-	if (postAlign > 0)
-	{
-		uint32_t dword;
-		io->read(io, &dword, postAlign);
-
-		/* Bytes are already aligned with magic */
-		dword ^= entry->currentMagic;
-		memcpy(bBufferP, &dword, postAlign);
-	}
-
-	entry->currentOffset += toRead;
-
-	return toRead;
-}
-
-static int
-RGSS_ioSeek(PHYSFS_Io *self, PHYSFS_uint64 offset)
-{
-	RGSS_entryHandle *entry = static_cast<RGSS_entryHandle*>(self->opaque);
-
-	if (offset == entry->currentOffset)
-		return 1;
-
-	if (offset > entry->data.size-1)
-		return 0;
-
-	/* If rewinding, we need to rewind to begining */
-	if (offset < entry->currentOffset)
-	{
-		entry->currentOffset = 0;
-		entry->currentMagic = entry->data.startMagic;
-	}
-
-	/* For each overstepped alignment, advance magic */
-	uint64_t currentDword = entry->currentOffset / 4;
-	uint64_t targetDword  = offset / 4;
-	uint64_t dwordsSought = targetDword - currentDword;
-
-	for (uint64_t i = 0; i < dwordsSought; ++i)
-		advanceMagic(entry->currentMagic);
-
-	entry->currentOffset = offset;
-	entry->io->seek(entry->io, entry->data.offset + entry->currentOffset);
-
-	return 1;
-}
-
-static PHYSFS_sint64
-RGSS_ioTell(PHYSFS_Io *self)
-{
-	const RGSS_entryHandle *entry = static_cast<RGSS_entryHandle*>(self->opaque);
-
-	return entry->currentOffset;
-}
-
-static PHYSFS_sint64
-RGSS_ioLength(PHYSFS_Io *self)
-{
-	const RGSS_entryHandle *entry = static_cast<RGSS_entryHandle*>(self->opaque);
-
-	return entry->data.size;
-}
-
-static PHYSFS_Io*
-RGSS_ioDuplicate(PHYSFS_Io *self)
-{
-	const RGSS_entryHandle *entry = static_cast<RGSS_entryHandle*>(self->opaque);
-	RGSS_entryHandle *entryDup = new RGSS_entryHandle(*entry);
-
-	PHYSFS_Io *dup = PHYSFS_ALLOC(PHYSFS_Io);
-	*dup = *self;
-	dup->opaque = entryDup;
-
-	return dup;
-}
-
-static void
-RGSS_ioDestroy(PHYSFS_Io *self)
-{
-	RGSS_entryHandle *entry = static_cast<RGSS_entryHandle*>(self->opaque);
-
-	delete entry;
-
-	PHYSFS_getAllocator()->Free(self);
-}
-
-static const PHYSFS_Io RGSS_IoTemplate =
-{
-    0, /* version */
-    0, /* opaque */
-    RGSS_ioRead,
-    0, /* write */
-    RGSS_ioSeek,
-    RGSS_ioTell,
-    RGSS_ioLength,
-    RGSS_ioDuplicate,
-    0, /* flush */
-    RGSS_ioDestroy
-};
-
-static void
-processDirectories(RGSS_archiveData *data, BoostSet<std::string> &topLevel,
-                   char *nameBuf, uint32_t nameLen)
-{
-	/* Check for top level entries */
-	for (uint32_t i = 0; i < nameLen; ++i)
-	{
-		bool slash = nameBuf[i] == '/';
-		if (!slash && i+1 < nameLen)
-			continue;
-
-		if (slash)
-			nameBuf[i] = '\0';
-
-		topLevel.insert(nameBuf);
-
-		if (slash)
-			nameBuf[i] = '/';
-
-		break;
-	}
-
-	/* Check for more entries */
-	for (uint32_t i = nameLen; i > 0; i--)
-		if (nameBuf[i] == '/')
-		{
-			nameBuf[i] = '\0';
-
-			const char *dir = nameBuf;
-			const char *entry = &nameBuf[i+1];
-
-			BoostSet<std::string> &entryList = data->dirHash[dir];
-			entryList.insert(entry);
-		}
-}
-
-static bool
-verifyHeader(PHYSFS_Io *io, char version)
-{
-	char header[8];
-
-	if (!IO_READ(io, header, sizeof(header)))
-		return false;
-
-	if (strcmp(header, RGSS_HEADER))
-		return false;
-
-	if (header[7] != version)
-		return false;
-
-	return true;
-}
-
-static void*
-RGSS_openArchive(PHYSFS_Io *io, const char *, int forWrite, int *claimed)
-{
-	if (forWrite)
-		return NULL;
-
-	/* Version 1 */
-	if (!verifyHeader(io, 1))
-		return NULL;
-	else
-		*claimed = 1;
-
-	RGSS_archiveData *data = new RGSS_archiveData;
-	data->archiveIo = io;
-
-	uint32_t magic = RGSS_MAGIC;
-
-	/* Top level entry list */
-	BoostSet<std::string> &topLevel = data->dirHash[""];
-
-	while (true)
-	{
-		/* Read filename length,
-         * if nothing was read, no files remain */
-		uint32_t nameLen;
-
-		if (!readUint32(io, nameLen))
-			break;
-
-		nameLen ^= advanceMagic(magic);
-
-		static char nameBuf[512];
-		for (uint32_t i = 0; i < nameLen; ++i)
-		{
-			char c;
-			io->read(io, &c, 1);
-			nameBuf[i] = c ^ (advanceMagic(magic) & 0xFF);
-			if (nameBuf[i] == '\\')
-				nameBuf[i] = '/';
-		}
-
-		nameBuf[nameLen] = '\0';
-
-		uint32_t entrySize;
-		readUint32(io, entrySize);
-		entrySize ^= advanceMagic(magic);
-
-		RGSS_entryData entry;
-		entry.offset = io->tell(io);
-		entry.size = entrySize;
-		entry.startMagic = magic;
-
-		data->entryHash.insert(nameBuf, entry);
-		processDirectories(data, topLevel, nameBuf, nameLen);
-
-		io->seek(io, entry.offset + entry.size);
-	}
-
-	return data;
-}
-
-static PHYSFS_EnumerateCallbackResult
-RGSS_enumerateFiles(void *opaque, const char *dirname,
-                    PHYSFS_EnumerateCallback cb,
-                    const char *origdir, void *callbackdata)
-{
-	RGSS_archiveData *data = static_cast<RGSS_archiveData*>(opaque);
-
-	std::string _dirname(dirname);
-
-	if (!data->dirHash.contains(_dirname))
-		return PHYSFS_ENUM_STOP;
-
-	const BoostSet<std::string> &entries = data->dirHash[_dirname];
-
-	BoostSet<std::string>::const_iterator iter;
-	for (iter = entries.cbegin(); iter != entries.cend(); ++iter)
-		cb(callbackdata, origdir, iter->c_str());
-
-	return PHYSFS_ENUM_OK;
-}
-
-static PHYSFS_Io*
-RGSS_openRead(void *opaque, const char *filename)
-{
-	RGSS_archiveData *data = static_cast<RGSS_archiveData*>(opaque);
-
-	if (!data->entryHash.contains(filename))
-		return 0;
-
-	RGSS_entryHandle *entry =
-	        new RGSS_entryHandle(data->entryHash[filename], data->archiveIo);
-
-	PHYSFS_Io *io = PHYSFS_ALLOC(PHYSFS_Io);
-
-	*io = RGSS_IoTemplate;
-	io->opaque = entry;
-
-	return io;
-}
-
-static int
-RGSS_stat(void *opaque, const char *filename, PHYSFS_Stat *stat)
-{
-	RGSS_archiveData *data = static_cast<RGSS_archiveData*>(opaque);
-
-	bool hasFile = data->entryHash.contains(filename);
-	bool hasDir  = data->dirHash.contains(filename);
-
-	if (!hasFile && !hasDir)
-	{
-		PHYSFS_setErrorCode(PHYSFS_ERR_NOT_FOUND);
-		return 0;
-	}
-
-	stat->modtime    =
-	stat->createtime =
-	stat->accesstime = 0;
-	stat->readonly   = 1;
-
-	if (hasFile)
-	{
-		const RGSS_entryData &entry = data->entryHash[filename];
-
-		stat->filesize = entry.size;
-		stat->filetype = PHYSFS_FILETYPE_REGULAR;
-	}
-	else
-	{
-		stat->filesize = 0;
-		stat->filetype = PHYSFS_FILETYPE_DIRECTORY;
-	}
-
-	return 1;
-}
-
-static void
-RGSS_closeArchive(void *opaque)
-{
-	RGSS_archiveData *data = static_cast<RGSS_archiveData*>(opaque);
-
-	delete data;
-}
-
-static PHYSFS_Io*
-RGSS_noop1(void*, const char*)
-{
-	return 0;
-}
-
-static int
-RGSS_noop2(void*, const char*)
-{
-	return 0;
-}
-
-const PHYSFS_Archiver RGSS1_Archiver =
-{
-	0,
-	{
-		"RGSSAD",
-		"RGSS encrypted archive format",
-		"", /* Author */
-		"", /* Website */
-		0 /* symlinks not supported */
-	},
-	RGSS_openArchive,
-	RGSS_enumerateFiles,
-	RGSS_openRead,
-	RGSS_noop1, /* openWrite */
-	RGSS_noop1, /* openAppend */
-	RGSS_noop2, /* remove */
-	RGSS_noop2, /* mkdir */
-	RGSS_stat,
-	RGSS_closeArchive
-};
-
-const PHYSFS_Archiver RGSS2_Archiver =
-{
-	0,
-	{
-		"RGSS2A",
-		"RGSS2 encrypted archive format",
-		"", /* Author */
-		"", /* Website */
-		0 /* symlinks not supported */
-	},
-	RGSS_openArchive,
-	RGSS_enumerateFiles,
-	RGSS_openRead,
-	RGSS_noop1, /* openWrite */
-	RGSS_noop1, /* openAppend */
-	RGSS_noop2, /* remove */
-	RGSS_noop2, /* mkdir */
-	RGSS_stat,
-	RGSS_closeArchive
-};
-
-static bool
-readUint32AndXor(PHYSFS_Io *io, uint32_t &result, uint32_t key)
-{
-	if (!readUint32(io, result))
-		return false;
-
-	result ^= key;
-
-	return true;
-}
-
-static void*
-RGSS3_openArchive(PHYSFS_Io *io, const char *, int forWrite, int *claimed)
-{
-	if (forWrite)
-		return NULL;
-
-	/* Version 3 */
-	if (!verifyHeader(io, 3))
-		return NULL;
-	else
-		*claimed = 1;
-
-	uint32_t baseMagic;
-
-	if (!readUint32(io, baseMagic))
-		return NULL;
-
-	baseMagic = (baseMagic * 9) + 3;
-
-	RGSS_archiveData *data = new RGSS_archiveData;
-	data->archiveIo = io;
-
-	/* Top level entry list */
-	BoostSet<std::string> &topLevel = data->dirHash[""];
-
-	while (true)
-	{
-		uint32_t offset, size, magic, nameLen;
-
-		if (!readUint32AndXor(io, offset, baseMagic))
-			goto error;
-
-		/* Zero offset means entry list has ended */
-		if (offset == 0)
-			break;
-
-		if (!readUint32AndXor(io, size, baseMagic))
-			goto error;
-
-		if (!readUint32AndXor(io, magic, baseMagic))
-			goto error;
-
-		if (!readUint32AndXor(io, nameLen, baseMagic))
-			goto error;
-
-		char nameBuf[512];
-
-		if (!IO_READ(io, nameBuf, nameLen))
-			goto error;
-
-		for (uint32_t i = 0; i < nameLen; ++i)
-		{
-			nameBuf[i] ^= ((baseMagic >> 8*(i%4)) & 0xFF);
-
-			if (nameBuf[i] == '\\')
-				nameBuf[i] = '/';
-		}
-
-		nameBuf[nameLen] = '\0';
-
-		RGSS_entryData entry;
-		entry.offset = offset;
-		entry.size = size;
-		entry.startMagic = magic;
-
-		data->entryHash.insert(nameBuf, entry);
-		processDirectories(data, topLevel, nameBuf, nameLen);
-
-		continue;
-
-	error:
-		delete data;
-		return NULL;
-	}
-
-	return data;
-}
-
-const PHYSFS_Archiver RGSS3_Archiver =
-{
-	0,
-	{
-		"RGSS3A",
-		"RGSS3 encrypted archive format",
-		"", /* Author */
-		"", /* Website */
-		0 /* symlinks not supported */
-	},
-	RGSS3_openArchive,
-	RGSS_enumerateFiles,
-	RGSS_openRead,
-	RGSS_noop1, /* openWrite */
-	RGSS_noop1, /* openAppend */
-	RGSS_noop2, /* remove */
-	RGSS_noop2, /* mkdir */
-	RGSS_stat,
-	RGSS_closeArchive
-};
diff --git a/src/graphics/source/bitmap.cpp b/src/graphics/source/bitmap.cpp
index 0c31792f..7625aa29 100644
--- a/src/graphics/source/bitmap.cpp
+++ b/src/graphics/source/bitmap.cpp
@@ -391,7 +391,7 @@ void Bitmap::stretchBlt(const IntRect &destRect,
 
 	SDL_Surface *srcSurf = source.megaSurface();
 
-	if (srcSurf && shState->config().subImageFix)
+	if (srcSurf && shState->config().graphics.subImageFix)
 	{
 		/* Blit from software surface, for broken GL drivers */
 		Vec2i gpTexSize;
@@ -1053,7 +1053,7 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
 
 	SDL_Surface *txtSurf;
 
-	if (shState->rtData().config.solidFonts)
+	if (shState->rtData().config.graphics.solidFonts)
 		txtSurf = TTF_RenderUTF8_Solid(font, str, c);
 	else
 		txtSurf = TTF_RenderUTF8_Blended(font, str, c);
@@ -1074,7 +1074,7 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
 		SDL_Surface *outline;
 		/* set the next font render to render the outline */
 		TTF_SetFontOutline(font, OUTLINE_SIZE);
-		if (shState->rtData().config.solidFonts)
+		if (shState->rtData().config.graphics.solidFonts)
 			outline = TTF_RenderUTF8_Solid(font, str, co);
 		else
 			outline = TTF_RenderUTF8_Blended(font, str, co);
@@ -1126,7 +1126,7 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
 
 	if (fastBlit)
 	{
-		if (squeeze == 1.0f && !shState->config().subImageFix)
+		if (squeeze == 1.0f && !shState->config().graphics.subImageFix)
 		{
 			/* Even faster: upload directly to bitmap texture.
 			 * We have to make sure the posRect lies within the texture
diff --git a/src/graphics/source/font.cpp b/src/graphics/source/font.cpp
index 6cef6564..b0e89e04 100644
--- a/src/graphics/source/font.cpp
+++ b/src/graphics/source/font.cpp
@@ -64,9 +64,9 @@ SharedFontState::SharedFontState(const Config &conf)
 	p = new SharedFontStatePrivate;
 
 	/* Parse font substitutions */
-	for (size_t i = 0; i < conf.fontSubs.size(); ++i)
+	for (size_t i = 0; i < conf.paths.fontSubs.size(); ++i)
 	{
-		const std::string &raw = conf.fontSubs[i];
+		const std::string &raw = conf.paths.fontSubs[i];
 		size_t sepPos = raw.find_first_of('>');
 
 		if (sepPos == std::string::npos)
diff --git a/src/graphics/source/graphics.cpp b/src/graphics/source/graphics.cpp
index 797006fd..ceeefef9 100644
--- a/src/graphics/source/graphics.cpp
+++ b/src/graphics/source/graphics.cpp
@@ -693,7 +693,7 @@ struct GraphicsPrivate
 	GraphicsPrivate(RGSSThreadData *rtData)
 	    : scRes(DEF_SCREEN_W, DEF_SCREEN_H),
 	      scSize(scRes),
-	      winSize(rtData->config.defScreenW, rtData->config.defScreenH),
+	      winSize(rtData->config.graphics.defScreenW, rtData->config.graphics.defScreenH),
 	      screen(scRes.x, scRes.y),
 	      threadData(rtData),
 	      glCtx(SDL_GL_GetCurrentContext()),
@@ -741,7 +741,7 @@ struct GraphicsPrivate
 	{
 		scSize = winSize;
 
-		if (!rtData->config.fixedAspectRatio)
+		if (!rtData->config.graphics.fixedAspectRatio)
 		{
 			scOffset = Vec2i(0, 0);
 			return;
@@ -812,7 +812,7 @@ struct GraphicsPrivate
 	{
 		GLMeta::blitRectangle(IntRect(0, 0, scRes.x, scRes.y),
 		                      IntRect(scOffset.x, scSize.y+scOffset.y, scSize.x, -scSize.y),
-		                      threadData->config.smoothScaling);
+		                      threadData->config.graphics.smoothScaling);
 	}
 
 	void redrawScreen()
@@ -856,16 +856,16 @@ Graphics::Graphics(RGSSThreadData *data)
 {
 	p = new GraphicsPrivate(data);
 
-	if (data->config.syncToRefreshrate)
+	if (data->config.graphics.syncToRefreshrate)
 	{
 		p->frameRate = data->refreshRate;
 		p->fpsLimiter.disabled = true;
 	}
-	else if (data->config.fixedFramerate > 0)
+	else if (data->config.graphics.fixedFramerate > 0)
 	{
-		p->fpsLimiter.setDesiredFPS(data->config.fixedFramerate);
+		p->fpsLimiter.setDesiredFPS(data->config.graphics.fixedFramerate);
 	}
-	else if (data->config.fixedFramerate < 0)
+	else if (data->config.graphics.fixedFramerate < 0)
 	{
 		p->fpsLimiter.disabled = true;
 	}
@@ -888,7 +888,7 @@ void Graphics::update(bool limitFps)
 	{
 		if (p->fpsLimiter.frameSkipRequired())
 		{
-			if (p->threadData->config.frameSkip)
+			if (p->threadData->config.graphics.frameSkip)
 			{
 				/* Skip frame */
 				p->fpsLimiter.delay();
@@ -1063,10 +1063,10 @@ void Graphics::setFrameRate(int value)
 {
 	p->frameRate = clamp(value, 10, 120);
 
-	if (p->threadData->config.syncToRefreshrate)
+	if (p->threadData->config.graphics.syncToRefreshrate)
 		return;
 
-	if (p->threadData->config.fixedFramerate > 0)
+	if (p->threadData->config.graphics.fixedFramerate > 0)
 		return;
 
 	p->fpsLimiter.setDesiredFPS(p->frameRate);
@@ -1238,22 +1238,22 @@ void Graphics::setFullscreen(bool value)
 
 bool Graphics::getSmooth() const
 {
-	return p->threadData->config.smoothScaling;
+	return p->threadData->config.graphics.smoothScaling;
 }
 
 void Graphics::setSmooth(bool value)
 {
-	p->threadData->config.smoothScaling = value;
+	p->threadData->config.graphics.smoothScaling = value;
 }
 
 bool Graphics::getFrameskip() const
 {
-	return p->threadData->config.frameSkip;
+	return p->threadData->config.graphics.frameSkip;
 }
 
 void Graphics::setFrameskip(bool value)
 {
-	p->threadData->config.frameSkip = value;
+	p->threadData->config.graphics.frameSkip = value;
 }
 
 bool Graphics::getShowCursor() const
diff --git a/src/graphics/source/tilemap.cpp b/src/graphics/source/tilemap.cpp
index f4d8967e..9621b4c8 100644
--- a/src/graphics/source/tilemap.cpp
+++ b/src/graphics/source/tilemap.cpp
@@ -555,7 +555,7 @@ struct TilemapPrivate
 			/* Mega surface tileset */
 			SDL_Surface *tsSurf = tileset->megaSurface();
 
-			if (shState->config().subImageFix)
+			if (shState->config().graphics.subImageFix)
 			{
 				/* Implementation for broken GL drivers */
 				FBO::bind(atlas.gl.fbo);
diff --git a/src/input/source/keybindings.cpp b/src/input/source/keybindings.cpp
index b0459b0e..317a74f0 100644
--- a/src/input/source/keybindings.cpp
+++ b/src/input/source/keybindings.cpp
@@ -207,10 +207,10 @@ static bool writeBindings(const BDescVec &d, const std::string &dir)
 
 void storeBindings(const BDescVec &d, const Config &conf)
 {
-	if (writeBindings(d, conf.customDataPath))
+	if (writeBindings(d, conf.paths.customDataPath))
 		return;
 
-	writeBindings(d, conf.commonDataPath);
+	writeBindings(d, conf.paths.commonDataPath);
 }
 
 #define READ(ptr, size, n, f) if (fread(ptr, size, n, f) < n) return false
@@ -309,10 +309,10 @@ BDescVec loadBindings(const Config &conf)
 {
 	BDescVec d;
 
-	if (readBindings(d, conf.customDataPath))
+	if (readBindings(d, conf.paths.customDataPath))
 		return d;
 
-	if (readBindings(d, conf.commonDataPath))
+	if (readBindings(d, conf.paths.commonDataPath))
 		return d;
 
 	return genDefaultBindings();
diff --git a/src/main.cpp b/src/main.cpp
index 18a74ff5..8241a411 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -75,10 +75,10 @@ rgssThreadError(RGSSThreadData *rtData, const std::string &msg)
 	rtData->rqTermAck.set();
 }
 
-static inline const char*
+static inline const char *
 glGetStringInt(GLenum name)
 {
-	return (const char*) gl.GetString(name);
+	return (const char *)gl.GetString(name);
 }
 
 static void
@@ -92,7 +92,7 @@ printGLInfo()
 
 int rgssThreadFun(void *userdata)
 {
-	RGSSThreadData *threadData = static_cast<RGSSThreadData*>(userdata);
+	RGSSThreadData *threadData = static_cast<RGSSThreadData *>(userdata);
 	const Config &conf = threadData->config;
 	SDL_Window *win = threadData->window;
 	SDL_GLContext glCtx;
@@ -124,23 +124,24 @@ int rgssThreadFun(void *userdata)
 		return 0;
 	}
 
-	if (!conf.enableBlitting)
+	if (!conf.graphics.enableBlitting)
 		gl.BlitFramebuffer = 0;
 
 	gl.ClearColor(0, 0, 0, 1);
 	gl.Clear(GL_COLOR_BUFFER_BIT);
 	SDL_GL_SwapWindow(win);
 
+	Debug() << "ModShot version" << MODSHOT_VERSION;
 	printGLInfo();
 
-	bool vsync = conf.vsync || conf.syncToRefreshrate;
+	bool vsync = conf.graphics.vsync || conf.graphics.syncToRefreshrate;
 	SDL_GL_SetSwapInterval(vsync ? 1 : 0);
 
 #ifndef NDEBUG
 	GLDebugLogger dLogger;
 #endif
 
-	#ifndef USE_FMOD
+#ifndef USE_FMOD
 	/* Setup AL context */
 	ALCcontext *alcCtx = alcCreateContext(threadData->alcDev, 0);
 
@@ -153,7 +154,7 @@ int rgssThreadFun(void *userdata)
 	}
 
 	alcMakeContextCurrent(alcCtx);
-	#endif
+#endif
 
 	try
 	{
@@ -162,9 +163,9 @@ int rgssThreadFun(void *userdata)
 	catch (const Exception &exc)
 	{
 		rgssThreadError(threadData, exc.msg);
-		#ifndef USE_FMOD
+#ifndef USE_FMOD
 		alcDestroyContext(alcCtx);
-		#endif
+#endif
 		SDL_GL_DeleteContext(glCtx);
 
 		return 0;
@@ -178,9 +179,9 @@ int rgssThreadFun(void *userdata)
 
 	SharedState::finiInstance();
 
-	#ifndef USE_FMOD
+#ifndef USE_FMOD
 	alcDestroyContext(alcCtx);
-	#endif
+#endif
 	SDL_GL_DeleteContext(glCtx);
 
 	return 0;
@@ -196,10 +197,10 @@ static void setupWindowIcon(const Config &conf, SDL_Window *win)
 {
 	SDL_RWops *iconSrc;
 
-	if (conf.iconPath.empty())
+	if (conf.paths.iconPath.empty())
 		iconSrc = SDL_RWFromConstMem(___assets_icon_png, ___assets_icon_png_len);
 	else
-		iconSrc = SDL_RWFromFile(conf.iconPath.c_str(), "rb");
+		iconSrc = SDL_RWFromFile(conf.paths.iconPath.c_str(), "rb");
 
 	SDL_Surface *iconImg = IMG_Load_RW(iconSrc, SDL_TRUE);
 
@@ -211,17 +212,19 @@ static void setupWindowIcon(const Config &conf, SDL_Window *win)
 }
 
 // mainly doing this so journal app knows where to load images from
-static void setGamePathInRegistry() {
+static void setGamePathInRegistry()
+{
 
 #if defined WIN32
 	// this logic is currently windows specific
-	char* dataDir = SDL_GetBasePath();
+	char *dataDir = SDL_GetBasePath();
 	if (dataDir)
 	{
 		HKEY key;
 		long keyOpenError = RegOpenKey(HKEY_CURRENT_USER, TEXT("Software\\OneShot\\"), &key);
 
-		if (keyOpenError != ERROR_SUCCESS) {
+		if (keyOpenError != ERROR_SUCCESS)
+		{
 			// try creating the key first
 			long keyCreateError = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Software\\OneShot\\"), 0L, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, NULL);
 
@@ -229,7 +232,8 @@ static void setGamePathInRegistry() {
 			{
 				showInitError("Unable to create key in registry.");
 			}
-			else {
+			else
+			{
 				keyOpenError = ERROR_SUCCESS;
 			}
 		}
@@ -238,7 +242,8 @@ static void setGamePathInRegistry() {
 		{
 			showInitError("Unable to open registry.");
 		}
-		else {
+		else
+		{
 			DWORD dataSize = (strlen(dataDir) + 1) * sizeof(char);
 			if (RegSetValueEx(key, TEXT("GameDirectory"), 0, REG_SZ, (LPBYTE)dataDir, dataSize) != ERROR_SUCCESS)
 			{
@@ -249,17 +254,18 @@ static void setGamePathInRegistry() {
 		SDL_free(dataDir);
 	}
 #endif
-	//TODO handle this for Linux/Mac
+	// TODO handle this for Linux/Mac
 }
 #ifdef _WIN32
 #include <windows.h>
-int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) {
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
+{
 	auto argc = __argc;
 	auto argv = __argv;
 #else
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
 #endif
-	Debug() << "ModShot version" << MODSHOT_VERSION;
 	SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0");
 	SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
 	SDL_SetHint(SDL_HINT_VIDEO_HIGHDPI_DISABLED, "1");
@@ -306,36 +312,44 @@ int main(int argc, char *argv[]) {
 
 	/* now we load the config */
 	Config conf;
-	conf.read(argc, argv);
+	conf.read(argc, argv, &showInitError);
 
-	if (!conf.gameFolder.empty())
-		if (chdir(conf.gameFolder.c_str()) != 0)
+	if (!conf.game.folder.empty())
+		if (chdir(conf.game.folder.c_str()) != 0)
 		{
-			showInitError(std::string("Unable to switch into gameFolder ") + conf.gameFolder);
+			showInitError(std::string("Unable to switch into game folder ") + conf.game.folder);
 			return 0;
 		}
 
 #ifdef __WIN32
-    // Create a debug console in debug mode
-    if (conf.winConsole) {
-      if (setupWindowsConsole()) {
-        reopenWindowsStreams();
-      } else {
-        char buf[200];
-        snprintf(buf, sizeof(buf), "Error allocating console: %lu",
-                GetLastError());
-        showInitError(std::string(buf));
-      }
-    }
+	// Create a debug console in debug mode
+	if (!conf.game.console)
+	{
+		/*if(!AttachConsole(ATTACH_PARENT_PROCESS)) {
+			if (setupWindowsConsole())
+			{
+				reopenWindowsStreams();
+			}
+			else
+			{
+				char buf[200];
+				snprintf(buf, sizeof(buf), "Error allocating console: %lu",
+						 GetLastError());
+				showInitError(std::string(buf));
+			}	
+		} else {
+			reopenWindowsStreams();
+		}*/
+		FreeConsole();
+	}
 #endif
 
-
-	extern int screenMain(Config &conf);
-	if (conf.screenMode)
+	extern int screenMain(Config & conf);
+	if (conf.screen_mode.enabled)
 		return screenMain(conf);
 
-	if (conf.windowTitle.empty())
-		conf.windowTitle = conf.game.title;
+	if (conf.game.windowTitle.empty())
+		conf.game.windowTitle = conf.game.title;
 
 	int imgFlags = IMG_INIT_PNG;
 	if (IMG_Init(imgFlags) != imgFlags)
@@ -355,7 +369,7 @@ int main(int argc, char *argv[]) {
 		return 0;
 	}
 
-	#ifndef USE_FMOD
+#ifndef USE_FMOD
 	if (Sound_Init() == 0)
 	{
 		showInitError(std::string("Error initializing SDL_sound: ") + Sound_GetError());
@@ -365,7 +379,7 @@ int main(int argc, char *argv[]) {
 
 		return 0;
 	}
-	#endif
+#endif
 
 	SDL_Window *win;
 	Uint32 winFlags = SDL_WINDOW_OPENGL | SDL_WINDOW_INPUT_FOCUS; //| SDL_WINDOW_ALLOW_HIGHDPI;
@@ -374,12 +388,12 @@ int main(int argc, char *argv[]) {
 	// 	winFlags |= SDL_WINDOW_RESIZABLE;
 	// #endif
 
-	if (conf.fullscreen)
+	if (conf.graphics.fullscreen)
 		winFlags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
 
-	win = SDL_CreateWindow(conf.windowTitle.c_str(),
-	                       SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
-	                       conf.defScreenW, conf.defScreenH, winFlags);
+	win = SDL_CreateWindow(conf.game.windowTitle.c_str(),
+						   SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
+						   conf.graphics.defScreenW, conf.graphics.defScreenH, winFlags);
 
 	if (!win)
 	{
@@ -392,10 +406,10 @@ int main(int argc, char *argv[]) {
 #ifdef __LINUX__
 	setupWindowIcon(conf, win);
 #else
-	(void) setupWindowIcon;
+	(void)setupWindowIcon;
 #endif
 
-	#ifndef USE_FMOD
+#ifndef USE_FMOD
 
 	ALCdevice *alcDev = alcOpenDevice(0);
 
@@ -410,46 +424,33 @@ int main(int argc, char *argv[]) {
 		return 0;
 	}
 
-	if(alcIsExtensionPresent(alcDev, "ALC_EXT_EFX") != ALC_TRUE) {
+	if (alcIsExtensionPresent(alcDev, "ALC_EXT_EFX") != ALC_TRUE)
+	{
 		showInitError("OpenAL device does not support Effects extension.");
 	}
-	#else
-	//FMOD_RESULT result;
-	//FMOD_STUDIO_SYSTEM *system = NULL;
-	//
-	//result = FMOD_Studio_System_Create(&system, FMOD_VERSION);
-	//if (result != FMOD_OK) {
-	//	showInitError(std::string("Error creating FMOD system: ") + FMOD_ErrorString(result));
-	//	return 0;
-	//}
-
-	//result = FMOD_Studio_System_Initialize(system, conf.maxFmodChannels, FMOD_STUDIO_INIT_NORMAL, FMOD_INIT_NORMAL, 0);
-	//if (result != FMOD_OK) {
-	//	showInitError(std::string("Error initializing FMOD system: ") + FMOD_ErrorString(result));
-	//	return 0;
-	//}
-	#endif
+
+#endif
 
 	SDL_DisplayMode mode;
 	SDL_GetDisplayMode(0, 0, &mode);
 
 	/* Can't sync to display refresh rate if its value is unknown */
 	if (!mode.refresh_rate)
-		conf.syncToRefreshrate = false;
+		conf.graphics.syncToRefreshrate = false;
 
 	EventThread eventThread;
 	RGSSThreadData rtData(&eventThread, win,
-						  #ifndef USE_FMOD
-	                      alcDev,
-						  #else
-						  // system,
-						  #endif
+#ifndef USE_FMOD
+						  alcDev,
+#else
+// system,
+#endif
 						  mode.refresh_rate, conf);
 
 #ifndef STEAM
 	/* Add controller bindings from embedded controller DB */
 	SDL_RWops *controllerDB = SDL_RWFromConstMem(___assets_gamecontrollerdb_txt,
-	                                             ___assets_gamecontrollerdb_txt_len);
+												 ___assets_gamecontrollerdb_txt_len);
 	SDL_GameControllerAddMappingsFromRW(controllerDB, 1);
 #endif
 
@@ -464,12 +465,13 @@ int main(int argc, char *argv[]) {
 
 	/* Start RGSS thread */
 	SDL_Thread *rgssThread =
-	        SDL_CreateThread(rgssThreadFun, "rgss", &rtData);
+		SDL_CreateThread(rgssThreadFun, "rgss", &rtData);
 
 	/* Start event processing */
 	eventThread.process(rtData);
 
-	if(!EventThread::forceTerminate) {
+	if (!EventThread::forceTerminate)
+	{
 		/* Request RGSS thread to stop */
 		rtData.rqTerm.set();
 
@@ -479,7 +481,7 @@ int main(int argc, char *argv[]) {
 			/* We can stop waiting when the request was ack'd */
 			if (rtData.rqTermAck)
 			{
-				Debug() << "RGSS thread ack'd request after" << i*10 << "ms";
+				Debug() << "RGSS thread ack'd request after" << i * 10 << "ms";
 				break;
 			}
 
@@ -489,18 +491,18 @@ int main(int argc, char *argv[]) {
 
 		Debug() << "Waiting for shutdown";
 		/* If RGSS thread ack'd request, wait for it to shutdown,
-		* otherwise abandon hope and just end the process as is. */
+		 * otherwise abandon hope and just end the process as is. */
 		if (rtData.rqTermAck)
 			SDL_WaitThread(rgssThread, 0);
 		else
-			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.windowTitle.c_str(),
-									"The RGSS script seems to be stuck and OneShot will now force quit", win);
+			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.game.windowTitle.c_str(),
+									 "The RGSS script seems to be stuck and OneShot will now force quit", win);
 
 		if (!rtData.rgssErrorMsg.empty())
 		{
 			Debug() << rtData.rgssErrorMsg;
-			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.windowTitle.c_str(),
-									rtData.rgssErrorMsg.c_str(), win);
+			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.game.windowTitle.c_str(),
+									 rtData.rgssErrorMsg.c_str(), win);
 		}
 	}
 
@@ -514,14 +516,14 @@ int main(int argc, char *argv[]) {
 	unloadLocale();
 	unloadLanguageMetadata();
 
-	#ifndef USE_FMOD
+#ifndef USE_FMOD
 	alcCloseDevice(alcDev);
-	#endif
+#endif
 	SDL_DestroyWindow(win);
 
-	#ifndef USE_FMOD
+#ifndef USE_FMOD
 	Sound_Quit();
-	#endif
+#endif
 	TTF_Quit();
 	IMG_Quit();
 	SDL_Quit();
diff --git a/src/meson.build b/src/meson.build
index 80793e0c..da50a6a8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,4 +1,3 @@
-boost = dependency('boost', version: '>=1.49', modules: ['program_options'], static: build_static)
 physfs = dependency('physfs', version: '>=2.1', static: build_static)
 sdl2 = dependency('SDL2', static: build_static)
 freetype = dependency('freetype2', static: build_static)
@@ -95,7 +94,7 @@ global_include_dirs += include_directories('.',
     'util/headers'
 )
 
-global_dependencies += [boost, bz2, zlib, sdl2, pixman, physfs, iconv, sdl2_ttf, sigcxx, sdl2_image, png, jpeg, nsgif, freetype, tiff, webp, harfbuzz]
+global_dependencies += [bz2, zlib, sdl2, pixman, physfs, iconv, sdl2_ttf, sigcxx, sdl2_image, png, jpeg, nsgif, freetype, tiff, webp, harfbuzz]
 
 if host_system == 'windows'
     global_dependencies += compilers['cpp'].find_library('wsock32')
@@ -107,7 +106,6 @@ endif
 
 main_source = files(
 	'filesystem/source/filesystem.cpp',
-	'filesystem/source/rgssad.cpp',
 	'graphics/source/autotiles.cpp',
 	'graphics/source/bitmap.cpp',
 	'graphics/source/graphics.cpp',
@@ -138,6 +136,7 @@ main_source = files(
 	'rgss/source/etc.cpp',
 	'thread/source/eventthread.cpp',
 	'thread/source/sharedstate.cpp',
+	'util/source/algorithm.cpp',
 	'util/source/config.cpp',
 	'util/source/win-consoleutils.cpp',
 	'main.cpp'
diff --git a/src/modshot/source/crash-handler.cpp b/src/modshot/source/crash-handler.cpp
index 89ff5e02..e69de29b 100644
--- a/src/modshot/source/crash-handler.cpp
+++ b/src/modshot/source/crash-handler.cpp
@@ -1,61 +0,0 @@
-/**
-#include "crash-handler.h"
-#include <stdexcept>
-
-#include "debugwriter.h"
-
-#include <boost/asio.hpp>
-
-using boost::asio::ip::tcp;
-
-void LowLevelCrashHandler::GenerateCrashReport(exception ex) {
-
-}
-
-void LowLevelCrashHandler::upload(char* message) {
-    Debug() << "[Crash Handler] Uploading crash to Discord...";
-    try {
-        boost::asio::io_service ioService;
-
-    tcp::resolver resolver(ioService);
-    tcp::resolver::query query("discord.com", "http"); // Get Discord's IP.
-    tcp::resolver::iterator endpointIterator = resolver.resolve(query); // -resolve it.
-
-    tcp::socket socket(ioService); // Create socket.
-    boost::asio::connect(socket, endpointIterator); // Connect to Discord.
-
-    // Sending a request.
-    boost::asio::streambuf request;
-    ostream requestStream(&request);
-    requestStream << "POST /api/webhooks/842787202957836329/-tHKhNJPkTgnO1Nz14_BPJWRimeAmgkOIc2ZLaSrlpcUQl_WkZsN2F05mAHs9-UAHvWV HTTP/1.1\r\n";
-    requestStream << "Host: discord.com\r\n";
-    requestStream << "Accept: *\/*\r\n";
-    requestStream << "Connection: close\r\n";
-    requestStream << "{\"avatar_url\": \"https://raw.githubusercontent.com/Speak2Erase/OSFM-Crash-Messages/main/pfps/10.png\"  \"content\": \"Something weird happened, MKXP has crashed.\nPlease, inform `Pancakes#9697` if it was your crash, he may be able to assist you.\", \"embeds\": [{ \"title\": \"C++ Side StackTrace:\", \"description\": \"```" << message << "```\" }] }\r\n";
-
-    boost::asio::write(socket, request);
-
-    // Getting response.
-    boost::asio::streambuf response;
-    istream responseStream(&response);
-    string httpver;
-    responseStream >> httpver;
-    unsigned int statuscode;
-    responseStream >> statuscode;
-    string statusmessage;
-    getline(responseStream, statusmessage);
-    if(!responseStream || httpver.substr(0,5) != "HTTP/") {
-        Debug() << "[Crash Handler] ...server sent invalid response.";
-    }
-    Debug() << "[Crash Handler] Response Code: " << statuscode;
-
-    boost::asio::read_until(socket, response, "\r\n\r\n");
-    string header;
-    while(getline(responseStream, header) && header != "\r")
-        Debug() << header;
-    } catch(exception ex) {
-        // Debug() << ex.what();
-        Debug() << "[Crash Handler] Socket has experienced failure.";
-    }
-}
-**/
\ No newline at end of file
diff --git a/src/oneshot/source/oneshot.cpp b/src/oneshot/source/oneshot.cpp
index 31ee6523..d0c8b523 100644
--- a/src/oneshot/source/oneshot.cpp
+++ b/src/oneshot/source/oneshot.cpp
@@ -179,7 +179,7 @@ Oneshot::Oneshot(RGSSThreadData &threadData) :
 {
 	p = new OneshotPrivate();
 	p->window = threadData.window;
-	p->savePath = threadData.config.commonDataPath.substr(0, threadData.config.commonDataPath.size() - 1);
+	p->savePath = threadData.config.paths.commonDataPath.substr(0, threadData.config.paths.commonDataPath.size() - 1);
 	p->obscuredMap.resize(640 * 480, 255);
 	obscuredDirty = true;
 	p->winX = 0;
diff --git a/src/oneshot/source/screen.cpp b/src/oneshot/source/screen.cpp
index 4accd68f..f11a1eed 100644
--- a/src/oneshot/source/screen.cpp
+++ b/src/oneshot/source/screen.cpp
@@ -2,9 +2,9 @@
 #include <SDL2/SDL_shape.h>
 #include <SDL2/SDL_image.h>
 
-#define FPS 60
-#define DEFAULT_WIDTH 320
-#define DEFAULT_HEIGHT 240
+#define FPS 120
+#define DEFAULT_WIDTH 640
+#define DEFAULT_HEIGHT 480
 
 #include "config.h"
 #include "debugwriter.h"
@@ -14,30 +14,31 @@
 static void showInitError(const std::string &msg)
 {
 	Debug() << msg;
-	SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OneShot", msg.c_str(), 0);
+	SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Screen Mode", msg.c_str(), 0);
 }
 
-static bool readMessage(Pipe &ipc, char *buf, size_t size)
+static void readMessage(Pipe &ipc, std::vector<std::string> *vector)
 {
-	size_t index = 0;
-	while (index < size - 1) {
-		if (ipc.read(buf + index)) {
-			++index;
-		} else {
-			break;
+	char buf[256];
+	int index = 0;
+
+	while (ipc.read(buf + index))
+	{
+		if (buf[index] == '\n')
+		{
+			vector->push_back(std::string(buf, index));
+			index = 0;
+			continue;
 		}
+		index++;
 	}
-	buf[index] = 0;
-
-	return index > 0;
 }
 
 int screenMain(Config &conf)
 {
-	const SDL_Color colorKey = {0x00, 0xFF, 0x00, 0xFF};
 	const SDL_Color black = {0x00, 0x00, 0x00, 0xFF};
 
-	Pipe ipc("oneshot-pipe", Pipe::Read);
+	Pipe ipc(conf.screen_mode.name.c_str(), Pipe::Read);
 
 	int imgFlags = IMG_INIT_PNG;
 	if (IMG_Init(imgFlags) != imgFlags)
@@ -49,9 +50,11 @@ int screenMain(Config &conf)
 	}
 
 	SDL_Window *win;
-	win = SDL_CreateShapedWindow("The Journal",
-	                             SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
-	                             DEFAULT_WIDTH, DEFAULT_HEIGHT, 0);
+	win = SDL_CreateShapedWindow(conf.screen_mode.name.c_str(),
+						   SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+						   DEFAULT_WIDTH, DEFAULT_HEIGHT, SDL_WINDOW_ALWAYS_ON_TOP);
+	if (conf.screen_mode.titlebar)
+		SDL_SetWindowBordered(win, SDL_TRUE);
 
 	if (!win)
 	{
@@ -60,51 +63,83 @@ int screenMain(Config &conf)
 	}
 
 	SDL_WindowShapeMode shapeMode;
-	shapeMode.mode = ShapeModeColorKey;
-	shapeMode.parameters.colorKey = colorKey;
+	shapeMode.mode = ShapeModeBinarizeAlpha;
+	shapeMode.parameters.binarizationCutoff = 255;
 
 	SDL_Surface *shape = SDL_CreateRGBSurface(0, DEFAULT_WIDTH, DEFAULT_HEIGHT, 8, 0, 0, 0, 0);
 	SDL_SetPaletteColors(shape->format->palette, &black, 0, 1);
 
-	char messageBuf[256];
+	SDL_Renderer *renderer = SDL_CreateRenderer(win, -1.0, 0);
+	SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer, shape);
+	SDL_Rect dimensions {
+		x: 0,
+		y: 0,
+		w: shape->w,
+		h: shape->h
+	};
 
-	std::string filePath =  "./Graphics/Journal/";
+	std::vector<std::string> messages = std::vector<std::string>();
 
-	unsigned int ticks = SDL_GetTicks();
-	for (;;) {
+	uint64_t ticks = SDL_GetTicks64();
+	for (;;)
+	{
 		// Handle events
 		SDL_Event e;
-		while (SDL_PollEvent(&e)) {
-			switch (e.type) {
+		while (SDL_PollEvent(&e))
+		{
+			switch (e.type)
+			{
 			case SDL_QUIT:
 				return 0;
 			}
 		}
-
+		readMessage(ipc, &messages);
 		// Change shape
-		if (readMessage(ipc, messageBuf, sizeof(messageBuf))) {
-			if (strcmp(messageBuf, "END") == 0)
+		for (const std::string &str : messages)
+		{
+			if (str.find("MOV") != std::string::npos)
+			{
+				size_t delimiter = str.find(";");
+				int x = stoi(str.substr(3, delimiter - 3));
+				int y = stoi(str.substr(delimiter + 1, str.length()));
+				SDL_SetWindowPosition(win, x, y);
+				continue;
+			}
+
+			if (str == "END")
 				break;
-			std::string imgname = filePath + messageBuf + ".png";
+
+			std::string imgname = conf.screen_mode.imagePath + str + ".png";
 			SDL_FreeSurface(shape);
-			if ((shape = IMG_Load(imgname.c_str())) == NULL) {
+			SDL_DestroyTexture(texture);
+			if ((shape = IMG_Load(imgname.c_str())) == NULL)
+			{
 				std::string error = "Unable to find image ";
-				SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OneShot", (error + imgname).c_str(), 0);
+				SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Screen Mode", (error + imgname).c_str(), 0);
+				Debug() << error + imgname;
 				break;
 			}
 			SDL_SetWindowSize(win, shape->w, shape->h);
 			SDL_SetWindowShape(win, shape, &shapeMode);
+			dimensions.w = shape->w;
+			dimensions.h = shape->h;
+			texture = SDL_CreateTextureFromSurface(renderer, shape);
 		}
+		messages.clear();
 
 		// Redraw
-		SDL_BlitSurface(shape, NULL, SDL_GetWindowSurface(win), NULL);
-		SDL_UpdateWindowSurface(win);
+		SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0x00, 0x00);
+		SDL_RenderClear(renderer);
+
+		SDL_RenderCopy(renderer, texture, &dimensions, &dimensions);
+
+		SDL_RenderPresent(renderer);
 
 		// Regulate framerate
-	    unsigned int ticksDelta = SDL_GetTicks() - ticks;
-	    if (ticksDelta < 1000 / FPS)
-	        SDL_Delay(1000 / FPS - ticksDelta);
-	    ticks = SDL_GetTicks();
+		int64_t ticksDelta = SDL_GetTicks64() - ticks;
+		if (ticksDelta < 1000 / FPS)
+			SDL_Delay(1000 / FPS - ticksDelta);
+		ticks = SDL_GetTicks64();
 	}
 
 	SDL_FreeSurface(shape);
diff --git a/src/opengl/source/glstate.cpp b/src/opengl/source/glstate.cpp
index a63b530d..b99b802c 100644
--- a/src/opengl/source/glstate.cpp
+++ b/src/opengl/source/glstate.cpp
@@ -123,6 +123,6 @@ GLState::GLState(const Config &conf)
 	scissorBox.init(IntRect(0, 0, 640, 480));
 	program.init(0);
 
-	if (conf.maxTextureSize > 0)
-		caps.maxTexSize = conf.maxTextureSize;
+	if (conf.graphics.maxTextureSize > 0)
+		caps.maxTexSize = conf.graphics.maxTextureSize;
 }
diff --git a/src/thread/headers/sharedstate.h b/src/thread/headers/sharedstate.h
index 7fc5a50b..60e7a55e 100644
--- a/src/thread/headers/sharedstate.h
+++ b/src/thread/headers/sharedstate.h
@@ -78,9 +78,6 @@ struct SharedState
 	Input &input() const;
 	#ifndef USE_FMOD
 	Audio &audio() const;
-	#else
-	//FMOD_STUDIO_SYSTEM* studio_system() const;
-	//FMOD_SYSTEM* core_system() const;
 	#endif
 
 	Oneshot &oneshot() const;
diff --git a/src/thread/source/eventthread.cpp b/src/thread/source/eventthread.cpp
index f5510156..9d671de8 100644
--- a/src/thread/source/eventthread.cpp
+++ b/src/thread/source/eventthread.cpp
@@ -51,17 +51,17 @@
 #include <iostream>
 
 #ifdef _WIN32
-	#include <windows.h>
-	#include <SDL2/SDL_syswm.h>
+#include <windows.h>
+#include <SDL2/SDL_syswm.h>
 #endif
 
 #define KEYCODE_TO_SCUFFEDCODE(keycode) (((keycode & 0xff) | ((keycode & 0x180) == 0x100 ? 0x180 : 0)) + SDL_NUM_SCANCODES)
 
 #ifndef USE_FMOD
-typedef void (ALC_APIENTRY *LPALCDEVICEPAUSESOFT) (ALCdevice *device);
-typedef void (ALC_APIENTRY *LPALCDEVICERESUMESOFT) (ALCdevice *device);
+typedef void(ALC_APIENTRY *LPALCDEVICEPAUSESOFT)(ALCdevice *device);
+typedef void(ALC_APIENTRY *LPALCDEVICERESUMESOFT)(ALCdevice *device);
 
-#define AL_DEVICE_PAUSE_FUN \
+#define AL_DEVICE_PAUSE_FUN                   \
 	AL_FUN(DevicePause, LPALCDEVICEPAUSESOFT) \
 	AL_FUN(DeviceResume, LPALCDEVICERESUMESOFT)
 
@@ -80,7 +80,7 @@ initALCFunctions(ALCdevice *alcDev)
 
 	Debug() << "ALC_SOFT_pause_device present";
 
-#define AL_FUN(name, type) alc. name = (type) alcGetProcAddress(alcDev, "alc" #name "SOFT");
+#define AL_FUN(name, type) alc.name = (type)alcGetProcAddress(alcDev, "alc" #name "SOFT");
 	AL_DEVICE_PAUSE_FUN;
 #undef AL_FUN
 }
@@ -117,16 +117,17 @@ bool EventThread::allocUserEvents()
 {
 	usrIdStart = SDL_RegisterEvents(EVENT_COUNT);
 
-	if (usrIdStart == (uint32_t) -1)
+	if (usrIdStart == (uint32_t)-1)
 		return false;
 
 	return true;
 }
 
 EventThread::EventThread()
-    : fullscreen(false),
-      showCursor(true)
-{}
+	: fullscreen(false),
+	  showCursor(true)
+{
+}
 
 void EventThread::process(RGSSThreadData &rtData)
 {
@@ -135,51 +136,55 @@ void EventThread::process(RGSSThreadData &rtData)
 	UnidirMessage<Vec2i> &windowSizeMsg = rtData.windowSizeMsg;
 
 #ifdef _WIN32
-    // receive SDL WM events
-    SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
+	// receive SDL WM events
+	SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
 #endif
 
-	#ifndef USE_FMOD
+#ifndef USE_FMOD
 	initALCFunctions(rtData.alcDev);
-	#endif
+#endif
 
-	// XXX this function breaks input focus on OSX
-	#ifndef __APPLE__
-		SDL_SetEventFilter(eventFilter, &rtData);
-	#endif
+// XXX this function breaks input focus on OSX
+#ifndef __APPLE__
+	SDL_SetEventFilter(eventFilter, &rtData);
+#endif
 
-	fullscreen = rtData.config.fullscreen;
+	fullscreen = rtData.config.graphics.fullscreen;
 
 	fps.lastFrame = SDL_GetPerformanceCounter();
 	fps.displayCounter = 0;
 	fps.acc = 0;
 	fps.accDiv = 0;
 
-	if (rtData.config.printFPS)
+	if (rtData.config.graphics.printFPS)
 		fps.sendUpdates.set();
 
 	bool displayingFPS = false;
 
 	bool cursorInWindow = false;
 	/* Will be updated eventually */
-	SDL_Rect gameScreen = { 0, 0, 0, 0 };
+	SDL_Rect gameScreen = {0, 0, 0, 0};
 
 	/* SDL doesn't send an initial FOCUS_GAINED event */
 	bool windowFocused = true;
 
 	bool terminate = false;
 
-	std::map<int, SDL_GameController*> controllers;
-	std::map<int, SDL_Joystick*> joysticks;
+	std::map<int, SDL_GameController *> controllers;
+	std::map<int, SDL_Joystick *> joysticks;
 
-	for (int i = 0; i < SDL_NumJoysticks(); ++i) {
-		if (SDL_IsGameController(i)) {
-			//Load as game controller
+	for (int i = 0; i < SDL_NumJoysticks(); ++i)
+	{
+		if (SDL_IsGameController(i))
+		{
+			// Load as game controller
 			SDL_GameController *gc = SDL_GameControllerOpen(i);
 			int id = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(gc));
 			controllers[id] = gc;
-		} else {
-			//Fall back to joystick
+		}
+		else
+		{
+			// Fall back to joystick
 			SDL_Joystick *js = SDL_JoystickOpen(i);
 			joysticks[SDL_JoystickInstanceID(js)] = js;
 		}
@@ -197,8 +202,8 @@ void EventThread::process(RGSSThreadData &rtData)
 	SDL_Joystick *js;
 	SDL_GameController *gc;
 	int id;
-	std::map<int, SDL_Joystick*>::iterator jsit;
-	std::map<int, SDL_GameController*>::iterator gcit;
+	std::map<int, SDL_Joystick *>::iterator jsit;
+	std::map<int, SDL_GameController *>::iterator gcit;
 
 	SDL_GetWindowSize(win, &winW, &winH); // SDL_GL_GetDrawableSize(win, &winW, &winH);
 
@@ -206,16 +211,21 @@ void EventThread::process(RGSSThreadData &rtData)
 
 	while (true)
 	{
-		#ifdef _WIN32
+#ifdef _WIN32
 		SDL_WaitEvent(&event);
-		#elif __linux__
+#elif __linux__
 		if (!SDL_WaitEvent(&event))
 		{
-			Debug() << "EventThread: Event error";
-			Debug() << SDL_GetError();
-			break;
+			const char *error = SDL_GetError();
+			// Was there *actually* an error?
+			if (!strcmp(error, "\n"))
+			{
+				Debug() << "EventThread: Event error";
+				Debug() << SDL_GetError();
+				break;
+			}
 		}
-		#endif
+#endif
 
 		if (sMenu && sMenu->onEvent(event, joysticks))
 		{
@@ -233,16 +243,16 @@ void EventThread::process(RGSSThreadData &rtData)
 		/* Preselect and discard unwanted events here */
 		switch (event.type)
 		{
-		case SDL_MOUSEBUTTONDOWN :
-		case SDL_MOUSEBUTTONUP :
-		case SDL_MOUSEMOTION :
+		case SDL_MOUSEBUTTONDOWN:
+		case SDL_MOUSEBUTTONUP:
+		case SDL_MOUSEMOTION:
 			if (event.button.which == SDL_TOUCH_MOUSEID)
 				continue;
 			break;
 
-		case SDL_FINGERDOWN :
-		case SDL_FINGERUP :
-		case SDL_FINGERMOTION :
+		case SDL_FINGERDOWN:
+		case SDL_FINGERUP:
+		case SDL_FINGERMOTION:
 			if (event.tfinger.fingerId >= MAX_FINGERS)
 				continue;
 			break;
@@ -256,82 +266,85 @@ void EventThread::process(RGSSThreadData &rtData)
 			if (event.syswm.msg->msg.win.msg == 32769) // from WM_APP + 1 (32769)
 			{
 				int lParam = event.syswm.msg->msg.win.lParam;
-				//int uID = event.syswm.msg->msg.win.wParam;
+				// int uID = event.syswm.msg->msg.win.wParam;
 
 				switch (lParam)
 				{
-					case WM_LBUTTONUP:
-						Debug() << "[Tray Icon] was pressed";
-						// Switch to OneShot Window
-						SwitchToThisWindow(event.syswm.msg->msg.win.hwnd, true);
-						break;
-					case WM_RBUTTONDOWN:
-					case WM_CONTEXTMENU:
-						Debug() << "[Tray Icon] called context menu";
-						// Switch to OneShot Window
-						SwitchToThisWindow(event.syswm.msg->msg.win.hwnd, true);
-						break;
-					case WM_USER + 2: // NIN_BALLOONSHOW
-						Debug() << "[Balloon] was shown";
-						break;
-					case WM_USER + 3: // NIN_BALLOONHIDE
-						Debug() << "[Balloon] was hidden";
-						break;
-					case WM_USER + 4: // NIN_BALLOONTIMEOUT
-						Debug() << "[Balloon] was timeouted";
-						break;
-					case WM_USER + 5: // NIN_BALLOONUSERCLICK
-						Debug() << "[Balloon] was clicked";
-						// Switch to OneShot Window
-						SwitchToThisWindow(event.syswm.msg->msg.win.hwnd, true);
-						break;
+				case WM_LBUTTONUP:
+					Debug() << "[Tray Icon] was pressed";
+					// Switch to OneShot Window
+					SwitchToThisWindow(event.syswm.msg->msg.win.hwnd, true);
+					break;
+				case WM_RBUTTONDOWN:
+				case WM_CONTEXTMENU:
+					Debug() << "[Tray Icon] called context menu";
+					// Switch to OneShot Window
+					SwitchToThisWindow(event.syswm.msg->msg.win.hwnd, true);
+					break;
+				case WM_USER + 2: // NIN_BALLOONSHOW
+					Debug() << "[Balloon] was shown";
+					break;
+				case WM_USER + 3: // NIN_BALLOONHIDE
+					Debug() << "[Balloon] was hidden";
+					break;
+				case WM_USER + 4: // NIN_BALLOONTIMEOUT
+					Debug() << "[Balloon] was timeouted";
+					break;
+				case WM_USER + 5: // NIN_BALLOONUSERCLICK
+					Debug() << "[Balloon] was clicked";
+					// Switch to OneShot Window
+					SwitchToThisWindow(event.syswm.msg->msg.win.hwnd, true);
+					break;
 				}
 			}
 			break;
 #endif
-		case SDL_WINDOWEVENT :
+		case SDL_WINDOWEVENT:
 			switch (event.window.event)
 			{
-			case SDL_WINDOWEVENT_SIZE_CHANGED :
+			case SDL_WINDOWEVENT_SIZE_CHANGED:
 				winW = event.window.data1;
 				winH = event.window.data2;
 
-				//SDL_GL_GetDrawableSize(win, &winW, &winH);
+				// SDL_GL_GetDrawableSize(win, &winW, &winH);
 
 				windowSizeMsg.post(Vec2i(winW, winH));
 				resetInputStates();
 				break;
 
-			case SDL_WINDOWEVENT_ENTER :
+			case SDL_WINDOWEVENT_ENTER:
 				cursorInWindow = true;
 				mouseState.inWindow = true;
 				updateCursorState(cursorInWindow && windowFocused && !sMenu, gameScreen);
 
 				break;
 
-			case SDL_WINDOWEVENT_LEAVE :
+			case SDL_WINDOWEVENT_LEAVE:
 				cursorInWindow = false;
 				mouseState.inWindow = false;
 				updateCursorState(cursorInWindow && windowFocused && !sMenu, gameScreen);
 
 				break;
 
-			case SDL_WINDOWEVENT_CLOSE :
-				if (rtData.allowExit) {
+			case SDL_WINDOWEVENT_CLOSE:
+				if (rtData.allowExit)
+				{
 					terminate = true;
-				} else {
+				}
+				else
+				{
 					rtData.triedExit.set();
 				}
 
 				break;
 
-			case SDL_WINDOWEVENT_FOCUS_GAINED :
+			case SDL_WINDOWEVENT_FOCUS_GAINED:
 				windowFocused = true;
 				updateCursorState(cursorInWindow && windowFocused && !sMenu, gameScreen);
 
 				break;
 
-			case SDL_WINDOWEVENT_FOCUS_LOST :
+			case SDL_WINDOWEVENT_FOCUS_LOST:
 				windowFocused = false;
 				updateCursorState(cursorInWindow && windowFocused && !sMenu, gameScreen);
 				resetInputStates();
@@ -339,20 +352,23 @@ void EventThread::process(RGSSThreadData &rtData)
 				break;
 			}
 
-			#ifdef __APPLE__
-				case SDL_WINDOWEVENT_MOVED:
-					if (shState != NULL && event.window.data1 && event.window.data2)
-						shState->oneshot().setWindowPos(event.window.data1, event.window.data2);
-					break;
-			#endif
+#ifdef __APPLE__
+		case SDL_WINDOWEVENT_MOVED:
+			if (shState != NULL && event.window.data1 && event.window.data2)
+				shState->oneshot().setWindowPos(event.window.data1, event.window.data2);
+			break;
+#endif
 
 			break;
 
-		case SDL_QUIT :
-			if (rtData.allowExit) {
+		case SDL_QUIT:
+			if (rtData.allowExit)
+			{
 				terminate = true;
 				Debug() << "EventThread termination requested";
-			} else {
+			}
+			else
+			{
 				rtData.triedExit.set();
 			}
 
@@ -360,7 +376,8 @@ void EventThread::process(RGSSThreadData &rtData)
 
 		case SDL_TEXTINPUT:
 			SDL_LockMutex(inputMut);
-			if (rtData.acceptingTextInput && rtData.inputText.length() + strlen(event.text.text) < (size_t)(rtData.inputTextLimit)) rtData.inputText += event.text.text;
+			if (rtData.acceptingTextInput && rtData.inputText.length() + strlen(event.text.text) < (size_t)(rtData.inputTextLimit))
+				rtData.inputText += event.text.text;
 			SDL_UnlockMutex(inputMut);
 			break;
 
@@ -392,25 +409,25 @@ void EventThread::process(RGSSThreadData &rtData)
 				{
 					displayingFPS = false;
 
-					if (!rtData.config.printFPS)
+					if (!rtData.config.graphics.printFPS)
 						fps.sendUpdates.clear();
 
 					if (fullscreen)
 					{
 						/* Prevent fullscreen flicker */
-						strncpy(pendingTitle, rtData.config.windowTitle.c_str(),
-						        sizeof(pendingTitle));
+						strncpy(pendingTitle, rtData.config.game.windowTitle.c_str(),
+								sizeof(pendingTitle));
 						break;
 					}
 
-					SDL_SetWindowTitle(win, rtData.config.windowTitle.c_str());
+					SDL_SetWindowTitle(win, rtData.config.game.windowTitle.c_str());
 				}
 
 				break;
 			}
 
-
-			if (event.key.keysym.scancode == SDL_SCANCODE_F3 && rtData.allowForceQuit) {
+			if (event.key.keysym.scancode == SDL_SCANCODE_F3 && rtData.allowForceQuit)
+			{
 				// ModShot addition: force quit the game, no prompting or saving
 				Debug() << "Force terminating ModShot";
 				terminate = true;
@@ -420,7 +437,7 @@ void EventThread::process(RGSSThreadData &rtData)
 
 			if (event.key.keysym.scancode == SDL_SCANCODE_F12)
 			{
-				if (!rtData.config.debugMode)
+				if (!rtData.config.game.debugMode)
 					break;
 
 				if (resetting)
@@ -432,13 +449,16 @@ void EventThread::process(RGSSThreadData &rtData)
 				break;
 			}
 
-			if (rtData.acceptingTextInput && event.key.keysym.sym == SDLK_BACKSPACE) {
+			if (rtData.acceptingTextInput && event.key.keysym.sym == SDLK_BACKSPACE)
+			{
 				// remove one unicode character
 				SDL_LockMutex(inputMut);
-				while (rtData.inputText.length() != 0 && rtData.inputText.back() & 0xc0 == 0x80) {
+				while (rtData.inputText.length() != 0 && rtData.inputText.back() & 0xc0 == 0x80)
+				{
 					rtData.inputText.pop_back();
 				}
-				if (rtData.inputText.length() != 0) {
+				if (rtData.inputText.length() != 0)
+				{
 					rtData.inputText.pop_back();
 				}
 				SDL_UnlockMutex(inputMut);
@@ -448,14 +468,14 @@ void EventThread::process(RGSSThreadData &rtData)
 			SDL_UnlockMutex(inputMut);
 			break;
 
-		case SDL_KEYUP :
+		case SDL_KEYUP:
 			SDL_LockMutex(inputMut);
 			keyStates[KEYCODE_TO_SCUFFEDCODE(event.key.keysym.sym)] = false;
 			SDL_UnlockMutex(inputMut);
 			modkeys = event.key.keysym.mod;
 			if (event.key.keysym.scancode == SDL_SCANCODE_F12)
 			{
-				if (!rtData.config.debugMode)
+				if (!rtData.config.game.debugMode)
 					break;
 
 				resetting = false;
@@ -502,35 +522,35 @@ void EventThread::process(RGSSThreadData &rtData)
 			SDL_GameControllerClose(gcit->second);
 			break;
 
-		case SDL_JOYBUTTONDOWN :
+		case SDL_JOYBUTTONDOWN:
 			if (joysticks.find(event.jbutton.which) != joysticks.end())
 				SDL_LockMutex(inputMut);
-				joyState.buttons[event.jbutton.button] = true;
-				SDL_UnlockMutex(inputMut);
+			joyState.buttons[event.jbutton.button] = true;
+			SDL_UnlockMutex(inputMut);
 			break;
 
-		case SDL_JOYBUTTONUP :
+		case SDL_JOYBUTTONUP:
 			if (joysticks.find(event.jbutton.which) != joysticks.end())
 				SDL_LockMutex(inputMut);
-				joyState.buttons[event.jbutton.button] = false;
-				SDL_UnlockMutex(inputMut);
+			joyState.buttons[event.jbutton.button] = false;
+			SDL_UnlockMutex(inputMut);
 			break;
 
-		case SDL_JOYHATMOTION :
+		case SDL_JOYHATMOTION:
 			if (joysticks.find(event.jbutton.which) != joysticks.end())
 				SDL_LockMutex(inputMut);
-				joyState.hats[event.jhat.hat] = event.jhat.value;
-				SDL_UnlockMutex(inputMut);
+			joyState.hats[event.jhat.hat] = event.jhat.value;
+			SDL_UnlockMutex(inputMut);
 			break;
 
-		case SDL_JOYAXISMOTION :
+		case SDL_JOYAXISMOTION:
 			if (joysticks.find(event.jbutton.which) != joysticks.end())
 				SDL_LockMutex(inputMut);
-				joyState.axes[event.jaxis.axis] = event.jaxis.value;
-				SDL_UnlockMutex(inputMut);
+			joyState.axes[event.jaxis.axis] = event.jaxis.value;
+			SDL_UnlockMutex(inputMut);
 			break;
 
-		case SDL_JOYDEVICEADDED :
+		case SDL_JOYDEVICEADDED:
 			if (SDL_IsGameController(event.jdevice.which))
 				break;
 			js = SDL_JoystickOpen(event.jdevice.which);
@@ -539,9 +559,10 @@ void EventThread::process(RGSSThreadData &rtData)
 			SDL_UnlockMutex(inputMut);
 			break;
 
-		case SDL_JOYDEVICEREMOVED :
+		case SDL_JOYDEVICEREMOVED:
 			jsit = joysticks.find(event.jdevice.which);
-			if (jsit != joysticks.end()) {
+			if (jsit != joysticks.end())
+			{
 				SDL_LockMutex(inputMut);
 				SDL_JoystickClose(jsit->second);
 				resetInputStates();
@@ -550,19 +571,19 @@ void EventThread::process(RGSSThreadData &rtData)
 			}
 			break;
 
-		case SDL_MOUSEBUTTONDOWN :
+		case SDL_MOUSEBUTTONDOWN:
 			SDL_LockMutex(inputMut);
 			mouseState.buttons[event.button.button] = true;
 			SDL_UnlockMutex(inputMut);
 			break;
 
-		case SDL_MOUSEBUTTONUP :
+		case SDL_MOUSEBUTTONUP:
 			SDL_LockMutex(inputMut);
 			mouseState.buttons[event.button.button] = false;
 			SDL_UnlockMutex(inputMut);
 			break;
 
-		case SDL_MOUSEMOTION :
+		case SDL_MOUSEMOTION:
 			SDL_LockMutex(inputMut);
 			mouseState.x = event.motion.x;
 			mouseState.y = event.motion.y;
@@ -570,14 +591,14 @@ void EventThread::process(RGSSThreadData &rtData)
 			updateCursorState(cursorInWindow, gameScreen);
 			break;
 
-		case SDL_FINGERDOWN :
+		case SDL_FINGERDOWN:
 			i = event.tfinger.fingerId;
 			SDL_LockMutex(inputMut);
 			touchState.fingers[i].down = true;
 			SDL_UnlockMutex(inputMut);
 			/* falls through */
 
-		case SDL_FINGERMOTION :
+		case SDL_FINGERMOTION:
 			i = event.tfinger.fingerId;
 			SDL_LockMutex(inputMut);
 			touchState.fingers[i].x = event.tfinger.x * winW;
@@ -585,47 +606,47 @@ void EventThread::process(RGSSThreadData &rtData)
 			SDL_UnlockMutex(inputMut);
 			break;
 
-		case SDL_FINGERUP :
+		case SDL_FINGERUP:
 			i = event.tfinger.fingerId;
 			SDL_LockMutex(inputMut);
 			memset(&touchState.fingers[i], 0, sizeof(touchState.fingers[0]));
 			SDL_UnlockMutex(inputMut);
 			break;
 
-		default :
+		default:
 			/* Handle user events */
-			switch(event.type - usrIdStart)
+			switch (event.type - usrIdStart)
 			{
-			case REQUEST_SETFULLSCREEN :
+			case REQUEST_SETFULLSCREEN:
 				setFullscreen(win, static_cast<bool>(event.user.code));
 				break;
 
-			case REQUEST_WINRESIZE :
+			case REQUEST_WINRESIZE:
 				SDL_SetWindowSize(win, event.window.data1, event.window.data2);
 				break;
 
-			case REQUEST_MESSAGEBOX :
+			case REQUEST_MESSAGEBOX:
 				SDL_ShowSimpleMessageBox(event.user.code,
-				                         rtData.config.windowTitle.c_str(),
-				                         (const char*) event.user.data1, win);
+										 rtData.config.game.windowTitle.c_str(),
+										 (const char *)event.user.data1, win);
 				free(event.user.data1);
 				msgBoxDone.set();
 				break;
 
-			case REQUEST_SETCURSORVISIBLE :
+			case REQUEST_SETCURSORVISIBLE:
 				showCursor = event.user.code;
 				updateCursorState(cursorInWindow, gameScreen);
 				break;
 
-			case UPDATE_FPS :
-				if (rtData.config.printFPS)
+			case UPDATE_FPS:
+				if (rtData.config.graphics.printFPS)
 					Debug() << "FPS:" << event.user.code;
 
 				if (!fps.sendUpdates)
 					break;
 
 				snprintf(buffer, sizeof(buffer), "%s - %d FPS",
-				         rtData.config.windowTitle.c_str(), event.user.code);
+						 rtData.config.game.windowTitle.c_str(), event.user.code);
 
 				/* Updating the window title in fullscreen
 				 * mode seems to cause flickering */
@@ -638,7 +659,7 @@ void EventThread::process(RGSSThreadData &rtData)
 				SDL_SetWindowTitle(win, buffer);
 				break;
 
-			case UPDATE_SCREEN_RECT :
+			case UPDATE_SCREEN_RECT:
 				gameScreen.x = event.user.windowID;
 				gameScreen.y = event.user.code;
 				gameScreen.w = reinterpret_cast<intptr_t>(event.user.data1);
@@ -666,47 +687,47 @@ void EventThread::process(RGSSThreadData &rtData)
 
 int EventThread::eventFilter(void *data, SDL_Event *event)
 {
-	RGSSThreadData &rtData = *static_cast<RGSSThreadData*>(data);
+	RGSSThreadData &rtData = *static_cast<RGSSThreadData *>(data);
 
 	switch (event->type)
 	{
-	case SDL_APP_WILLENTERBACKGROUND :
+	case SDL_APP_WILLENTERBACKGROUND:
 		Debug() << "SDL_APP_WILLENTERBACKGROUND";
 
-		#ifndef USE_FMOD
+#ifndef USE_FMOD
 		if (HAVE_ALC_DEVICE_PAUSE)
 			alc.DevicePause(rtData.alcDev);
-		#endif
+#endif
 
 		rtData.syncPoint.haltThreads();
 
 		return 0;
 
-	case SDL_APP_DIDENTERBACKGROUND :
+	case SDL_APP_DIDENTERBACKGROUND:
 		Debug() << "SDL_APP_DIDENTERBACKGROUND";
 		return 0;
 
-	case SDL_APP_WILLENTERFOREGROUND :
+	case SDL_APP_WILLENTERFOREGROUND:
 		Debug() << "SDL_APP_WILLENTERFOREGROUND";
 		return 0;
 
-	case SDL_APP_DIDENTERFOREGROUND :
+	case SDL_APP_DIDENTERFOREGROUND:
 		Debug() << "SDL_APP_DIDENTERFOREGROUND";
 
-		#ifndef USE_FMOD
+#ifndef USE_FMOD
 		if (HAVE_ALC_DEVICE_PAUSE)
 			alc.DeviceResume(rtData.alcDev);
-		#endif
+#endif
 
 		rtData.syncPoint.resumeThreads();
 
 		return 0;
 
-	case SDL_APP_TERMINATING :
+	case SDL_APP_TERMINATING:
 		Debug() << "SDL_APP_TERMINATING";
 		return 0;
 
-	case SDL_APP_LOWMEMORY :
+	case SDL_APP_LOWMEMORY:
 		Debug() << "SDL_APP_LOWMEMORY";
 		return 0;
 
@@ -734,7 +755,6 @@ void EventThread::cleanup()
 	while (SDL_PollEvent(&event))
 		if ((event.type - usrIdStart) == REQUEST_MESSAGEBOX)
 			free(event.user.data1);
-
 }
 
 void EventThread::resetInputStates()
@@ -749,15 +769,14 @@ void EventThread::resetInputStates()
 
 void EventThread::setFullscreen(SDL_Window *win, bool mode)
 {
-	SDL_SetWindowFullscreen
-	        (win, mode ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
+	SDL_SetWindowFullscreen(win, mode ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
 	fullscreen = mode;
 }
 
 void EventThread::updateCursorState(bool inWindow,
-                                    const SDL_Rect &screen)
+									const SDL_Rect &screen)
 {
-	SDL_Point pos = { mouseState.x, mouseState.y };
+	SDL_Point pos = {mouseState.x, mouseState.y};
 	bool inScreen = inWindow && SDL_PointInRect(&pos, &screen);
 
 	if (inScreen)
@@ -846,7 +865,7 @@ void EventThread::notifyFrame()
 
 	static uint64_t freq = SDL_GetPerformanceFrequency();
 
-	double currFPS = (double) freq / diff;
+	double currFPS = (double)freq / diff;
 	fps.acc += currFPS;
 	++fps.accDiv;
 
@@ -874,8 +893,8 @@ void EventThread::notifyGameScreenChange(const SDL_Rect &screen)
 	event.type = usrIdStart + UPDATE_SCREEN_RECT;
 	event.user.windowID = screen.x;
 	event.user.code = screen.y;
-	event.user.data1 = reinterpret_cast<void*>(screen.w);
-	event.user.data2 = reinterpret_cast<void*>(screen.h);
+	event.user.data1 = reinterpret_cast<void *>(screen.w);
+	event.user.data2 = reinterpret_cast<void *>(screen.h);
 	SDL_PushEvent(&event);
 }
 
diff --git a/src/thread/source/sharedstate.cpp b/src/thread/source/sharedstate.cpp
index dfaad6c5..de333937 100644
--- a/src/thread/source/sharedstate.cpp
+++ b/src/thread/source/sharedstate.cpp
@@ -105,7 +105,7 @@ struct SharedStatePrivate
 	SharedStatePrivate(RGSSThreadData *threadData)
 	    : bindingData(0),
 	      sdlWindow(threadData->window),
-	      fileSystem(threadData->config.allowSymlinks),
+	      fileSystem(threadData->config.paths.allowSymlinks),
 	      eThread(*threadData->ethread),
 	      rtData(*threadData),
 	      config(threadData->config),
@@ -127,7 +127,7 @@ struct SharedStatePrivate
 
 		fileSystem.addPath(".");
 
-		if (config.pathCache)
+		if (config.paths.pathCache)
 			fileSystem.createPathCache();
 
 		fileSystem.initFontSets(fontState);
@@ -168,7 +168,7 @@ void SharedState::initInstance(RGSSThreadData *threadData)
 	 * SharedState depends on GlobalIBO existing,
 	 * Font depends on SharedState existing */
 
-	rgssVersion = threadData->config.rgssVersion;
+	rgssVersion = threadData->config.game.rgssVersion;
 
 	_globalIBO = new GlobalIBO();
 	_globalIBO->ensureSize(1);
diff --git a/src/util/headers/algorithm.h b/src/util/headers/algorithm.h
new file mode 100644
index 00000000..d0091ebf
--- /dev/null
+++ b/src/util/headers/algorithm.h
@@ -0,0 +1,27 @@
+#ifndef ALGORITHM_H
+#define ALGORITHM_H
+
+#include "table.h"
+#include <cmath>
+#include <algorithm>
+
+constexpr double over_two = 1.0 / 2.0;
+
+static inline double point_distance(double x1, double y1, double x2, double y2)
+{
+    return sqrt(pow(x1 - x2, 2.0) + pow(y1 - y2, 2.0));
+}
+
+static inline double circle_distance(double x1, double y1, double x2, double y2, double radius)
+{
+    return std::max(point_distance(x1, y1, x2, y2) - radius, 0.0);
+}
+
+static inline double rectangle_distance(double x1, double y1, double x2, double y2, double width, double height)
+{
+    double dx = std::max(x1 - x2 - (width * over_two), 0.0);
+    double dy = std::max(y1 - y2 - (height * over_two), 0.0);
+    return sqrt(dx * dx + dy * dy) - 1.0;
+}
+
+#endif
\ No newline at end of file
diff --git a/src/util/headers/boost-hash.h b/src/util/headers/boost-hash.h
index 3ce746a6..14ba7135 100644
--- a/src/util/headers/boost-hash.h
+++ b/src/util/headers/boost-hash.h
@@ -22,24 +22,19 @@
 #ifndef BOOSTHASH_H
 #define BOOSTHASH_H
 
-#include <boost/unordered/unordered_map.hpp>
-#include <boost/unordered/unordered_set.hpp>
+// I would like to use unordered but it doesn't play nice with pair or some of the other things provided :/
+#include <map>
+#include <set>
 
 #include <utility>
-
-/* Wrappers around the boost unordered template classes,
- * exposing an interface similar to Qt's QHash/QSet */
-
 template<typename K, typename V>
 class BoostHash
 {
 private:
-	typedef boost::unordered_map<K, V> BoostType;
-	typedef std::pair<K, V> PairType;
-	BoostType p;
+    std::map<K, V> p = {};
 
 public:
-	typedef typename BoostType::const_iterator const_iterator;
+	typedef typename std::map<K, V>::const_iterator const_iterator;
 
 	inline bool contains(const K &key) const
 	{
@@ -50,7 +45,8 @@ class BoostHash
 
 	inline void insert(const K &key, const V &value)
 	{
-		p.insert(PairType(key, value));
+        p[key] = value;
+        //p.insert(std::pair<K, V>(key, value));
 	}
 
 	inline void remove(const K &key)
@@ -92,17 +88,22 @@ class BoostHash
 	{
 		return p.cend();
 	}
+    
+    inline void clear()
+    {
+        p.clear();
+    }
 };
 
 template<typename K>
 class BoostSet
 {
 private:
-	typedef boost::unordered_set<K> BoostType;
-	BoostType p;
+	//typedef std::unordered_set<K> BoostType;
+	std::set<K> p;
 
 public:
-	typedef typename BoostType::const_iterator const_iterator;
+	typedef typename std::set<K>::const_iterator const_iterator;
 
 	inline bool contains(const K &key)
 	{
diff --git a/src/util/headers/config.h b/src/util/headers/config.h
index 1d3005e4..053ae22c 100644
--- a/src/util/headers/config.h
+++ b/src/util/headers/config.h
@@ -28,112 +28,101 @@
 
 struct Config
 {
-	int rgssVersion;
-
-	bool debugMode;
-	bool screenMode;
-	bool printFPS;
-
-	bool fullscreen;
-	bool fixedAspectRatio;
-	bool smoothScaling;
-	bool vsync;
-
-	int defScreenW;
-	int defScreenH;
-	std::string windowTitle;
-
-	int fixedFramerate;
-	bool frameSkip;
-	bool syncToRefreshrate;
-
-	bool solidFonts;
-
-	bool subImageFix;
-	bool enableBlitting;
-	int maxTextureSize;
-
-	std::string gameFolder;
-	bool allowSymlinks;
-	bool pathCache;
-
-	/*
-	MJIT options (experimental):
-	  --mjit-warnings Enable printing JIT warnings
-	  --mjit-debug    Enable JIT debugging (very slow), or add cflags if specified
-	  --mjit-wait     Wait until JIT compilation finishes every time (for testing)
-	  --mjit-save-temps
-	                  Save JIT temporary files in $TMP or /tmp (for testing)
-	  --mjit-verbose=num
-	                  Print JIT logs of level num or less to stderr (default: 0)
-	  --mjit-max-cache=num
-	                  Max number of methods to be JIT-ed in a cache (default: 10000)
-	  --mjit-min-calls=num
-	                  Number of calls to trigger JIT (for testing, default: 10000)
-
-	YJIT options (experimental):
-	  --yjit-exec-mem-size=num
-	                  Size of executable memory block in MiB (default: 256)
-	  --yjit-call-threshold
-	                  Number of calls to trigger JIT (default: 10)
-	  --yjit-max-versions
-	                  Maximum number of versions per basic block (default: 4)
-	  --yjit-greedy-versioning
-	                  Greedy versioning mode (default: disabled)
-	*/
-
-	bool mjitEnabled;
-	int mjitVerbosity;
-	int mjitMaxCache;
-	int mjitMinCalls;
-
-	bool yjitEnabled;
-	int yjitCallThreshold;
-	int yjitMaxVersions;
-	bool yjitGreedyVersioning;
-
-	bool winConsole;
-
-	//int maxFmodChannels;
-
-	std::string iconPath;
+	struct
+	{
+		bool printFPS = false;
+		bool fullscreen = false;
+		bool fixedAspectRatio = true;
+		bool smoothScaling = false;
+		bool vsync = true;
+		bool subImageFix = false;
+		bool enableBlitting = true;
+		bool frameSkip = true;
+		bool syncToRefreshrate = false;
+		bool solidFonts = false;
+
+		int64_t defScreenW = 640;
+		int64_t defScreenH = 480;
+		int64_t maxTextureSize = 0;
+		int64_t fixedFramerate = 0;
+	} graphics;
+
+	struct
+	{
+		bool enabled = false;
+
+		int64_t verbosity = 0;
+		int64_t maxCache = 100;
+		int64_t minCalls = 10000;
+	} mjit;
 
 	struct
 	{
-		int sourceCount;
-	} SE;
+		bool enabled = false;
+		bool greedyVersioning = false;
 
-	int audioChannels;
+		int64_t callThreshold = 10;
+		int64_t maxVersions = 4;
+	} yjit;
 
-	bool useScriptNames;
+	struct
+	{
+		int64_t sourceCount = 64;
+		int64_t audioChannels = 0;
+	} audio;
 
-	std::string customScript;
-	std::set<std::string> preloadScripts;
-	std::vector<std::string> rtps;
+	struct
+	{
+		std::vector<std::string> rtps;
+		std::vector<std::string> fontSubs;
+		std::vector<std::string> rubyLoadpaths;
 
-	std::vector<std::string> fontSubs;
+		std::string customDataPath;
+		std::string commonDataPath = "OneShot";
+		std::string iconPath = "";
+		std::string exeName = "modshot";
 
-	std::vector<std::string> rubyLoadpaths;
+		bool useScriptNames;
+		bool allowSymlinks = false;
+		bool pathCache = true;
+	} paths;
 
 	/* Editor flags */
-	struct {
-		bool debug;
-		bool battleTest;
+	struct
+	{
+		bool debug = false;
+		bool battleTest = false;
 	} editor;
 
 	/* Game INI contents */
-	struct {
-		std::string scripts;
-		std::string title;
+	struct
+	{
+		std::string scripts = "Data/xScripts.rxdata";
+		std::string title = "OneShot";
+		std::string folder = "..";
+		std::string windowTitle = "";
+		std::string customScript;
+
+		std::set<std::string> preloadScripts;
+
+		int64_t rgssVersion = 1;
+
+		bool console = false;
+		bool debugMode = false;
 	} game;
 
-	/* Internal */
-	std::string customDataPath;
-	std::string commonDataPath;
+	struct {
+		bool enabled = false;
+		bool titlebar = false;
+		std::string name = "The Journal";
+		std::string imagePath = "./Graphics/Journal/";
+	} screen_mode;
 
 	Config();
 
-	void read(int argc, char *argv[]);
+	void read(int argc, char *argv[], void (*errorFunc)(const std::string &));
+	void read_config_file(void (*errorFunc)(const std::string &));
+	void read_arguments(int argc, char *argv[], void (*errorFunc)(const std::string &));
 };
 
 #endif // CONFIG_H
diff --git a/src/util/headers/debugwriter.h b/src/util/headers/debugwriter.h
index ebf3bdd5..7185e98b 100644
--- a/src/util/headers/debugwriter.h
+++ b/src/util/headers/debugwriter.h
@@ -26,11 +26,6 @@
 #include <sstream>
 #include <vector>
 
-#ifdef __ANDROID__
-#include <android/log.h>
-#endif
-
-
 /* A cheap replacement for qDebug() */
 
 class Debug
@@ -61,11 +56,7 @@ class Debug
 
 	~Debug()
 	{
-#ifdef __ANDROID__
-		__android_log_write(ANDROID_LOG_DEBUG, "mkxp", buf.str().c_str());
-#else
 		std::cout << buf.str() << std::endl;
-#endif
 	}
 
 private:
diff --git a/src/util/source/algorithm.cpp b/src/util/source/algorithm.cpp
new file mode 100644
index 00000000..ebb56b42
--- /dev/null
+++ b/src/util/source/algorithm.cpp
@@ -0,0 +1 @@
+#include "algorithm.h"
\ No newline at end of file
diff --git a/src/util/source/config.cpp b/src/util/source/config.cpp
index 25b334a3..d0ead539 100644
--- a/src/util/source/config.cpp
+++ b/src/util/source/config.cpp
@@ -20,32 +20,15 @@
 */
 
 #include "config.h"
-
-#include <boost/program_options/options_description.hpp>
-#include <boost/program_options/parsers.hpp>
-#include <boost/program_options/variables_map.hpp>
-
-#include <physfs.h>
-
-#include <fstream>
-#include <stdint.h>
-#include <cstdlib>
-
-#include "debugwriter.h"
 #include "util.h"
+#include "debugwriter.h"
 #include "sdl-util.h"
-
-namespace std
-{
-	std::ostream& operator<<(std::ostream &os, const std::vector<std::string> &vec)
-	{
-		for (auto item : vec)
-		{
-			os << item << " ";
-		}
-		return os;
-	}
-}
+#include "version.h"
+#include <physfs.h>
+#include <toml++/toml.h>
+#include <argparse/argparse.hpp>
+#include <sstream>
+#include <filesystem>
 
 static std::string prefPath(const char *org, const char *app)
 {
@@ -57,154 +40,171 @@ static std::string prefPath(const char *org, const char *app)
 	return path;
 }
 
-template<typename T>
-std::set<T> setFromVec(const std::vector<T> &vec)
+#define CONF_FILE "../modshot.toml"
+
+Config::Config()
 {
-	return std::set<T>(vec.begin(), vec.end());
 }
 
-typedef std::vector<std::string> StringVec;
-namespace po = boost::program_options;
+#define READ_VALUE_CAST(type, path, location, cast)                        \
+	if (node[#location])                                                   \
+	{                                                                      \
+		if (node[#location].is_##type())                                   \
+			path = (cast)*node[#location].as_##type();                     \
+		else                                                               \
+			Debug() << "Invalid type for" << #path << "expected" << #type; \
+	}
 
-#define CONF_FILE "../modshot.conf"
+#define READ_BOOL(path, location) READ_VALUE_CAST(boolean, path, location, bool);
+#define READ_INT(path, location) READ_VALUE_CAST(integer, path, location, int64_t);
 
-Config::Config()
-{}
-
-void Config::read(int argc, char *argv[])
+void Config::read(int argc, char *argv[], void (*errorFunc)(const std::string &))
 {
-#define PO_DESC_ALL \
-	PO_DESC(debugMode, bool, false) \
-	PO_DESC(screenMode, bool, false) \
-	PO_DESC(printFPS, bool, false) \
-	PO_DESC(fullscreen, bool, false) \
-	PO_DESC(fixedAspectRatio, bool, true) \
-	PO_DESC(smoothScaling, bool, false) \
-	PO_DESC(vsync, bool, true) \
-	PO_DESC(defScreenW, int, 0) \
-	PO_DESC(defScreenH, int, 0) \
-	PO_DESC(windowTitle, std::string, "") \
-	PO_DESC(fixedFramerate, int, 0) \
-	PO_DESC(frameSkip, bool, true) \
-	PO_DESC(syncToRefreshrate, bool, false) \
-	PO_DESC(solidFonts, bool, false) \
-	PO_DESC(subImageFix, bool, false) \
-	PO_DESC(enableBlitting, bool, true) \
-	PO_DESC(maxTextureSize, int, 0) \
-	PO_DESC(gameFolder, std::string, ".") \
-	PO_DESC(allowSymlinks, bool, false) \
-	PO_DESC(iconPath, std::string, "") \
-	PO_DESC(SE.sourceCount, int, 6) \
-	PO_DESC(audioChannels, int, 30) \
-	PO_DESC(pathCache, bool, true) \
-	PO_DESC(mjitEnabled, bool, false) \
-	PO_DESC(mjitVerbosity, int, 0) \
-	PO_DESC(mjitMaxCache, int, 100) \
-	PO_DESC(mjitMinCalls, int, 10000) \
-	PO_DESC(yjitEnabled, bool, false) \
-	PO_DESC(yjitCallThreshold, int, 10) \
-	PO_DESC(yjitMaxVersions, int, 4) \
-	PO_DESC(yjitGreedyVersioning, bool, false) \
-	PO_DESC(winConsole, bool, false)
-	//PO_DESC(maxFmodChannels, int, 512)
-
-// Not gonna take your shit boost
-#define GUARD_ALL( exp ) try { exp } catch(...) {}
-
-	editor.debug = false;
-	editor.battleTest = false;
-
-	/* Read arguments sent from the editor */
-	if (argc > 1)
-	{
-		std::string argv1 = argv[1];
-		/* RGSS1 uses "debug", 2 and 3 use "test" */
-		if (argv1 == "debug" || argv1 == "test")
-			editor.debug = true;
-		else if (argv1 == "btest")
-			editor.battleTest = true;
-
-		/* Fix offset */
-		if (editor.debug || editor.battleTest)
-		{
-			argc--;
-			argv++;
-		}
-	}
+	read_config_file(errorFunc);
 
-#define PO_DESC(key, type, def) (#key, po::value< type >()->default_value(def))
+	read_arguments(argc, argv, errorFunc);
 
-	po::options_description podesc;
-	podesc.add_options()
-	        PO_DESC_ALL
-	        ("preloadScript", po::value<StringVec>()->composing()->default_value(StringVec()))
-	        ("fontSub", po::value<StringVec>()->composing()->default_value(StringVec()))
-	        ("rubyLoadpath", po::value<StringVec>()->composing()->default_value(StringVec()))
-	        ;
+	paths.commonDataPath = prefPath(".", paths.commonDataPath.c_str());
+}
 
-	po::variables_map vm;
+void Config::read_arguments(int argc, char *argv[], void (*errorFunc)(const std::string &))
+{
+	argparse::ArgumentParser program("modshot", MODSHOT_VERSION);
+
+	program.add_argument("--printFPS", "-pfps")
+		.help("print fps in the window titlebar")
+		.nargs(0)
+		.action([&](const std::string &value)
+				{ graphics.printFPS = true; });
+
+	program.add_argument("--fullscreen", "-f")
+		.help("start modshot in fullscreen")
+		.nargs(0)
+		.action([&](const std::string &value)
+				{ graphics.fullscreen = true; });
+
+	program.add_argument("--fixedAspectRatio", "-far")
+		.help("force a fixed aspect ratio")
+		.nargs(0)
+		.action([&](const std::string &value)
+				{ graphics.fixedAspectRatio = true; });
+
+	program.add_argument("--screenMode", "-sm")
+		.help("launch with screen mode")
+		.nargs(0)
+		.action([&](const std::string &value)
+				{ screen_mode.enabled = true; });
+
+	program.add_argument("--screenTitlebar", "-stb")
+		.help("enable the screen mode titlebar")
+		.nargs(0)
+		.action([&](const std::string &value)
+				{ screen_mode.titlebar = true; });
+
+	program.add_argument("--screenName", "-sn")
+		.help("screen mode window name")
+		.nargs(1)
+		.action([&](const std::string &value)
+				{ screen_mode.name = value; });
+
+	program.add_argument("--screenFolder", "-sf")
+		.help("screen mode folder path")
+		.nargs(1)
+		.action([&](const std::string &value)
+				{ screen_mode.imagePath = value; });
+
+	program.add_argument("--gameFolder", "-gf")
+		.help("game folder path")
+		.nargs(1)
+		.default_value("..")
+		.action([&](const std::string &value)
+				{ game.folder = value; });
 
-	/* Parse command line options */
 	try
 	{
-		po::parsed_options cmdPo =
-			po::command_line_parser(argc, argv).options(podesc).run();
-		po::store(cmdPo, vm);
+		program.parse_args(argc, argv);
 	}
-	catch (po::error &error)
+	catch (const std::exception &e)
 	{
-		Debug() << "Command line:" << error.what();
+		std::cerr << e.what() << '\n';
+		std::cerr << program;
+		std::exit(1);
 	}
+}
 
-	/* Parse configuration file */
-	SDLRWStream confFile(CONF_FILE, "r");
-
-	if (confFile)
+void Config::read_config_file(void (*errorFunc)(const std::string &))
+{
+	if (std::filesystem::exists(CONF_FILE))
 	{
+		toml::table table;
 		try
 		{
-			po::store(po::parse_config_file(confFile.stream(), podesc, true), vm);
-			po::notify(vm);
+			table = toml::parse_file(CONF_FILE);
+			if (table["graphics"])
+			{
+				auto node = table["graphics"];
+
+				READ_BOOL(graphics.printFPS, printFPS)
+				READ_BOOL(graphics.fullscreen, fullscreen)
+				READ_BOOL(graphics.fixedAspectRatio, fixedAspectRatio)
+				READ_BOOL(graphics.smoothScaling, smoothScaling)
+				READ_BOOL(graphics.vsync, vsync)
+				READ_BOOL(graphics.subImageFix, subImageFix)
+				READ_BOOL(graphics.enableBlitting, enableBlitting)
+				READ_BOOL(graphics.frameSkip, frameSkip)
+				READ_BOOL(graphics.solidFonts, solidFonts)
+
+				READ_INT(graphics.defScreenW, defScreenW)
+				READ_INT(graphics.defScreenH, defScreenH)
+				READ_INT(graphics.maxTextureSize, maxTextureSize)
+				READ_INT(graphics.fixedFramerate, fixedFramerate)
+			}
+
+			if (table["mjit"])
+			{
+				auto node = table["mjit"];
+
+				READ_BOOL(mjit.enabled, enabled)
+
+				READ_INT(mjit.verbosity, verbosity)
+				READ_INT(mjit.maxCache, maxCache)
+				READ_INT(mjit.minCalls, minCalls)
+			}
+
+			if (table["yjit"])
+			{
+				auto node = table["yjit"];
+
+				READ_BOOL(yjit.enabled, enabled)
+				READ_BOOL(yjit.greedyVersioning, greedyVersioning)
+
+				READ_INT(yjit.callThreshold, callThreshold)
+				READ_INT(yjit.maxVersions, maxVersion)
+			}
+
+			if (table["audio"])
+			{
+				auto node = table["audio"];
+
+				READ_INT(audio.sourceCount, sourceCount)
+				READ_INT(audio.audioChannels, audioChannels)
+			}
+
+			if (table["game"])
+			{
+				auto node = table["game"];
+
+				READ_INT(game.rgssVersion, rgssVersion)
+
+				READ_BOOL(game.console, console)
+				READ_BOOL(game.debugMode, debugMode)
+			}
 		}
-		catch (po::error &error)
+		catch (const toml::parse_error &error)
 		{
-			Debug() << CONF_FILE":" << error.what();
+			std::stringstream ss("Config file parsing failed:\n");
+			ss << error;
+			errorFunc(ss.str());
 		}
 	}
-
-#undef PO_DESC
-#define PO_DESC(key, type, def) GUARD_ALL( key = vm[#key].as< type >(); )
-
-	PO_DESC_ALL;
-
-	GUARD_ALL( preloadScripts = setFromVec(vm["preloadScript"].as<StringVec>()); );
-
-	GUARD_ALL( fontSubs = vm["fontSub"].as<StringVec>(); );
-
-	GUARD_ALL( rubyLoadpaths = vm["rubyLoadpath"].as<StringVec>(); );
-
-#undef PO_DESC
-#undef PO_DESC_ALL
-
-	SE.sourceCount = clamp(SE.sourceCount, 1, 64);
-
-	commonDataPath = prefPath(".", "OneShot");
-
-	//Hardcode some ini/version settings
-	rgssVersion = 1;
-	game.title = "OneShot";
-	game.scripts = "Data/xScripts.rxdata";
-	gameFolder = "..";
-
-	defScreenW = 640;
-	defScreenH = 480;
-
-#ifdef STEAM
-	/* Override fullscreen config if Big Picture */
-	if (const char *env = std::getenv("SteamTenfoot"))
-	{
-		if (!strcmp(env, "1"))
-			fullscreen = true;
-	}
-#endif
 }
diff --git a/src/version.h b/src/version.h
index 9723d39f..ec6484f4 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,4 +1,4 @@
 #ifndef MODSHOT_VERSION
-#define MODSHOT_VERSION "setup.sh 1.0.0 beta"
+#define MODSHOT_VERSION "meson-build 1.1"
 #endif
 
diff --git a/windows/Makefile b/windows/Makefile
index ecd5b719..aae59b21 100644
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -21,7 +21,7 @@ LIBDIR := $(BUILD_PREFIX)/lib
 INCLUDEDIR := $(BUILD_PREFIX)/include
 DOWNLOADS := ${PWD}/downloads/$(ARCH)
 NPROC := $(shell nproc)
-CFLAGS := -I$(INCLUDEDIR)
+CFLAGS := -I$(INCLUDEDIR) -O3
 LDFLAGS := -L$(LIBDIR)
 CC      := gcc
 PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig
@@ -99,6 +99,22 @@ $(DOWNLOADS)/libnsgif/configure: $(DOWNLOADS)/libnsgif/autogen.sh
 $(DOWNLOADS)/libnsgif/autogen.sh:
 	$(CLONE) $(GITHUB)/jcupitt/libnsgif-autotools $(DOWNLOADS)/libnsgif
 
+argparse: init_dirs ${INCLUDEDIR}/argparse/argparse.hpp
+
+$(INCLUDEDIR)/argparse/argparse.hpp: $(DOWNLOADS)/argparse
+	cp $(DOWNLOADS)/argparse/include/* $(INCLUDEDIR) -r
+
+$(DOWNLOADS)/argparse:
+	$(CLONE) $(GITHUB)/p-ranav/argparse $(DOWNLOADS)/argparse
+
+tomlplusplus: init_dirs ${INCLUDEDIR}/toml++/toml.h
+
+$(INCLUDEDIR)/toml++/toml.h: $(DOWNLOADS)/tomlplusplus
+	cp $(DOWNLOADS)/tomlplusplus/include/* $(INCLUDEDIR) -r
+
+$(DOWNLOADS)/tomlplusplus:
+	$(CLONE) $(GITHUB)/marzer/tomlplusplus $(DOWNLOADS)/tomlplusplus
+
 # ====
 init_dirs:
 	@mkdir -p $(LIBDIR) $(INCLUDEDIR)
@@ -108,5 +124,5 @@ powerwash: clean-downloads
 clean-downloads:
 	-rm -rf downloads
 
-deps-core: sdlsound libnsgif
+deps-core: argparse tomlplusplus sdlsound libnsgif
 everything: deps-core ruby
diff --git a/windows/install.sh b/windows/install.sh
index 2dceeb9d..f8995228 100644
--- a/windows/install.sh
+++ b/windows/install.sh
@@ -10,7 +10,7 @@ RUBY_LIB_DIR="$DIR/build-${MODSHOT_PREFIX}/lib/ruby"
 
 function fail() {
     echo "$1"
-    echo "Please beat the crap out of Pancakes until he fixes this issue."
+    echo "Please beat the crap out of Linux until she fixes this issue."
     exit 1
 }