diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ea7b8c..37a1827 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,29 @@
 cmake_minimum_required(VERSION 3.28.3)
 project(oneshot)
-## Setup options ##
-set(CMAKE_DISABLE_IN_SOURCE_BUILD TRUE)
-set(VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION "5.1.2600.0")
 include(FindPackageHandleStandardArgs)
 
+# Options
 option(STEAM "Build for Steam" OFF)
-set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder")
 option(DEBUG "Debug mode" OFF)
-#For paranoicws:3
+option(FORCE32 "Force 32bit compile on 64bit OS" OFF) # from MKXP
 option(EXTRA_SECURITY "Extra security" OFF)
+
+set(CMAKE_DISABLE_IN_SOURCE_BUILD TRUE)
+set(VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION "5.1.2600.0")
+set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder")
 set(ZLIB_USE_STATIC_LIBS ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+# from MKXP
+if(FORCE32)
+	if(APPLE)
+		set(CMAKE_OSX_ARCHITECTURES "i386")
+	else()
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+	endif()
+endif()
+
 if(DEBUG)
 	# Debug stuff
 	if (MSVC)
diff --git a/src/font.cpp b/src/font.cpp
index 8900950..70a85af 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -340,48 +340,27 @@ const std::vector<std::string> &Font::getInitialDefaultNames(){
 
 void Font::initDynAttribs(){
 	p->color = new Color(p->colorTmp);
-
-	if (rgssVer >= 3)
-		p->outColor = new Color(p->outColorTmp);;
 }
 
 void Font::initDefaultDynAttribs(){
 	FontPrivate::defaultColor = new Color(FontPrivate::defaultColorTmp);
-
-	if (rgssVer >= 3)
-		FontPrivate::defaultOutColor = new Color(FontPrivate::defaultOutColorTmp);
 }
 
 void Font::initDefaults(const SharedFontState &sfs){
 	std::vector<std::string> &names = FontPrivate::initialDefaultNames;
 	
-	switch (rgssVer){
-	case 1 :
-		// FIXME: Japanese version has "MS PGothic" instead
-		names.push_back("Arial");
-		break;
-
-	case 2 :
-		names.push_back("UmePlus Gothic");
-		names.push_back("MS Gothic");
-		names.push_back("Courier New");
-		break;
-
-	default:
-	case 3 :
-		names.push_back("VL Gothic");
-	}
+	// FIXME: Japanese version has "MS PGothic" instead
+	names.push_back("Arial");
 
 	setDefaultName(names, sfs);
 
-	FontPrivate::defaultOutline = (rgssVer >= 3 ? true : false);
-	FontPrivate::defaultShadow  = (rgssVer == 2 ? true : false);
+	FontPrivate::defaultOutline = false;
+	FontPrivate::defaultShadow  = false;
 }
 
 TTF_Font *Font::getSdlFont(){
 	if (!p->sdlFont)
-		p->sdlFont = shState->fontState().getFont(p->name.c_str(),
-		                                          p->size);
+		p->sdlFont = shState->fontState().getFont(p->name.c_str(), p->size);
 
 	int style = TTF_STYLE_NORMAL;
 
diff --git a/src/main.cpp b/src/main.cpp
index 19f82ad..6035f19 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -112,9 +112,9 @@ int rgssThreadFun(void *userdata){
 	SDL_GL_SwapWindow(win);
 
 	Debug() << "[main] GL Vendor    :" << glGetStringInt(GL_VENDOR);
-        Debug() << "[main] GL Renderer  :" << glGetStringInt(GL_RENDERER);
-        Debug() << "[main] GL Version   :" << glGetStringInt(GL_VERSION);
-        Debug() << "[main] GLSL Version :" << glGetStringInt(GL_SHADING_LANGUAGE_VERSION);
+    Debug() << "[main] GL Renderer  :" << glGetStringInt(GL_RENDERER);
+    Debug() << "[main] GL Version   :" << glGetStringInt(GL_VERSION);
+    Debug() << "[main] GLSL Version :" << glGetStringInt(GL_SHADING_LANGUAGE_VERSION);
 
 	bool vsync = conf.vsync || conf.syncToRefreshrate;
 	SDL_GL_SetSwapInterval(vsync ? 1 : 0);
@@ -198,7 +198,7 @@ static void setGamePathInRegistry() {
 		}
 
 		if (keyOpenError != ERROR_SUCCESS){
-			WatnMsg("Unable to open registry.");
+			WarnMsg("Unable to open registry.");
 		}
 		else {
 			DWORD dataSize = (strlen(dataDir) + 1) * sizeof(char);
diff --git a/src/oneshot.cpp b/src/oneshot.cpp
index 4bc5522..0d83453 100644
--- a/src/oneshot.cpp
+++ b/src/oneshot.cpp
@@ -17,7 +17,6 @@
 
 // OS-Specific code
 #if defined(_WIN32)
-    #define WIN32_LEAN_AND_MEAN
     #define SECURITY_WIN32
     #include <windows.h>
     #include <mmsystem.h>