diff --git a/app/src/main/assets/ClassWrapper.jar b/app/src/main/assets/ClassWrapper.jar
index 16714ae02..9111faee4 100644
Binary files a/app/src/main/assets/ClassWrapper.jar and b/app/src/main/assets/ClassWrapper.jar differ
diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
index ca39f583f..d146dfd7b 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
@@ -156,7 +156,7 @@ public class PojavLauncherActivity extends AppCompatActivity
         
         ArrayAdapter<String> adapterAcc = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, accountList);
         adapterAcc.setDropDownViewResource(android.R.layout.simple_list_item_single_choice);
-        accountSelector = (Spinner) findViewById(R.id.launcherMainSelectVersion);
+        accountSelector = (Spinner) findViewById(R.id.launchermain_spinner_account);
         accountSelector.setAdapter(adapterAcc);
         accountSelector.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener(){
 
@@ -195,7 +195,7 @@ public class PojavLauncherActivity extends AppCompatActivity
 
         ArrayAdapter<String> adapterVer = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, availableVersions);
         adapterVer.setDropDownViewResource(android.R.layout.simple_list_item_single_choice);
-        versionSelector = (Spinner) findViewById(R.id.launcherMainSelectVersion);
+        versionSelector = (Spinner) findViewById(R.id.launchermain_spinner_version);
         versionSelector.setAdapter(adapterVer);
 
         launchProgress = (ProgressBar) findViewById(R.id.progressDownloadBar);
diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index 3d4956090..e7aa513cb 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -321,10 +321,11 @@ public class PojavLoginActivity extends AppCompatActivity
 		mkdirs(Tools.mpProfiles);
         
         mkdirs(Tools.MAIN_PATH);
+        mkdirs(Tools.MAIN_PATH + "/lwjgl3");
+        mkdirs(Tools.MAIN_PATH + "/mods");
+        
         mkdirs(Tools.CTRLMAP_PATH);
 		
-        mkdirs(Tools.MAIN_PATH + "/mods");
-
 		try {
 			new CustomControls(this).save(Tools.CTRLDEF_FILE);
 			
@@ -333,6 +334,8 @@ public class PojavLoginActivity extends AppCompatActivity
 			// Extract launcher_profiles.json
 			// TODO: Remove after implement.
 			Tools.copyAssetFile(this, "launcher_profiles.json", Tools.MAIN_PATH, false);
+            
+            Tools.copyAssetFile(this, "ClassWrapper.jar", Tools.MAIN_PATH + "/lwjgl3", false);
 			
 			// Yep, the codebase from v1.0.3:
 			//FileAccess.copyAssetToFolderIfNonExist(this, "1.0.jar", Tools.versnDir + "/1.0");
diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java
index f6b610266..897631d48 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java
@@ -103,10 +103,17 @@ public final class Tools
             
             getJavaArgs(ctx, javaArgList);
             
+            javaArgList.add("-cp");
+            javaArgList.add(Tools.MAIN_PATH + "/lwjgl3/ClassWrapper.jar");
+            javaArgList.add(launchClassPath);
+            javaArgList.add(versionInfo.mainClass);
+			javaArgList.addAll(Arrays.asList(launchArgs));
+/*
 			javaArgList.add("-cp");
 			javaArgList.add(launchClassPath);
 			javaArgList.add(versionInfo.mainClass);
 			javaArgList.addAll(Arrays.asList(launchArgs));
+*/
 		}
 		
 		if (LAUNCH_TYPE == LTYPE_PROCESS) {
diff --git a/app/src/main/res/layout/launcher_main_v3.xml b/app/src/main/res/layout/launcher_main_v3.xml
index 5ed6120d1..0a894b503 100644
--- a/app/src/main/res/layout/launcher_main_v3.xml
+++ b/app/src/main/res/layout/launcher_main_v3.xml
@@ -123,7 +123,7 @@
 						<Spinner
 							android:layout_width="match_parent"
 							android:layout_height="40dp"
-							android:id="@+id/launcherMainSelectVersion"/>
+							android:id="@+id/launchermain_spinner_version"/>
 
 					</LinearLayout>