diff --git a/ModMii Installer__SOURCE.au3 b/ModMii Installer__SOURCE.au3
deleted file mode 100644
index a3ba882..0000000
--- a/ModMii Installer__SOURCE.au3	
+++ /dev/null
@@ -1,62 +0,0 @@
-#cs ----------------------------------------------------------------------------
-
- AutoIt Version: 3.3.8.0
- Author:         person66
-
- Script Function:
-	Move the ModMii skin window.
-
- Script Version: 1.4
-
-#ce ----------------------------------------------------------------------------
-
-#include <Process.au3>
-
-AutoItSetOption("TrayIconHide", 1)
-dim $WinPos, $WinPosBak, $WaitTime, $AlreadyOpen = 0, $ProcessName, $ProcessList, $run, $args, $HasArgs = "True"
-
-;--------------------------------------------------------------
-$WaitTime = 10 ;Time to wait for next ModMii window (in seconds)
-;--------------------------------------------------------------
-
-;Check and kill other instances of this script (skips if other ModMii windows are open)
-if $AlreadyOpen = 0 then
-	$ProcessName = _ProcessGetName(@AutoItPID)
-	$ProcessList = ProcessList($ProcessName)
-	For $i = 1 To $ProcessList[0][0]
-		if $ProcessList[$i][1] <> @AutoItPID then
-			ProcessClose($ProcessList[$i][1])
-		endif
-	Next
-EndIf
-
-;Main part
-ShellExecute(@ComSpec, '/c call "' & @ScriptDir & '\ModMii Installer.bat"')
-
-$run = WinWait("ModMii Installer", "by XFlak", $WaitTime)
-if $run = 0 then 
-	exit
-endif
-
-While 1
-	While 1
-		if WinExists($run) <> 1 then
-			exitloop
-		else
-			$WinPos = WinGetPos($run)
-			if $WinPos <> 0 then
-				$WinPosBak = $WinPos
-			else
-				$WinPos = $WinPosBak
-				exitloop
-			endif
-		endif
-	WEnd
-	$run = WinWait("ModMii Installer", "by XFlak", $WaitTime)
-	if $run = 0 then 
-		exit
-	else
-		WinMove($run, "", $WinPos[0], $WinPos[1])
-		WinActivate($run)
-	endif
-WEnd
\ No newline at end of file
diff --git a/ModMiiSkin__SOURCE.au3 b/ModMiiSkin__SOURCE.au3
index ef41530..09aa6a9 100644
--- a/ModMiiSkin__SOURCE.au3
+++ b/ModMiiSkin__SOURCE.au3
@@ -2,6 +2,7 @@
 #AutoIt3Wrapper_icon=D:\ModMii\Support\icon.ico
 #AutoIt3Wrapper_outfile=ModMiiSkin.exe
 #AutoIt3Wrapper_UseX64=N
+#AutoIt3Wrapper_UseUpx=Y
 #AutoIt3Wrapper_Res_Description=ModMii Skin Launcher
 #AutoIt3Wrapper_Res_Fileversion=1.0.0.0
 #AutoIt3Wrapper_Res_LegalCopyright=ModMii by XFlak, Launcher by person66
@@ -10,19 +11,19 @@
 #EndRegion ;**** Directives created by AutoIt3Wrapper_GUI ****
 #cs ----------------------------------------------------------------------------
 
- AutoIt Version: 3.3.8.1
+ AutoIt Version: 3.3.14.5
  Author:         person66
 
  Script Function:
 	Move the ModMii skin window.
 
- Script Version: 1.8
+ Script Version: 2.2
 
 #ce ----------------------------------------------------------------------------
 
-;REMEMBER TO COMPILE WITH AUTOIT3WRAPPER.EXE
-;(http://www.autoitscript.com/autoit3/scite/download/AutoIt3Wrapper.exe)
-;AND CHANGE THE LINES BELOW TO MEET YOUR NEEDS
+;REMEMBER TO COMPILE WITH AUTOIT3WRAPPER
+;https://www.autoitscript.com/site/autoit-script-editor/downloads/
+
 
 #AutoIt3Wrapper_Autoit3Dir="C:\Program Files (x86)\AutoIt3"
 
@@ -65,7 +66,7 @@ if $AlreadyOpen = 0 then
 endif
 
 ;Main part
-ShellExecute(@ComSpec, '/c call "' & @ScriptDir & '\Support\ModMiiSkin.bat"', "", "", @SW_HIDE)
+Run("Support\ModMiiSkin.bat", @ScriptDir, @SW_HIDE)
 
 $run = WinWait("ModMii Skin", "by XFlak", $WaitTime)
 if $run = 0 then 
@@ -89,11 +90,13 @@ while 1
 		endif
 		sleep(10)
 	wend
-	$run = WinWait("ModMii Skin", "by XFlak", $WaitTime)
-	if $run = 0 then 
-		exit
-	else
-		WinMove($run, "", $WinPos[0], $WinPos[1])
-		WinActivate($run)
-	endif
+    $run = WinWait("ModMii Skin", "by XFlak", $WaitTime)
+    if $run = 0 then
+        exit
+    else
+        if $WinPos <> 0 then
+            WinMove($run, "", $WinPos[0], $WinPos[1])
+        endif
+        WinActivate($run)
+    endif
 wend
\ No newline at end of file
diff --git a/ModMii_Launcher/source/ModMii_Launcher/Program.cs b/ModMii_Launcher/source/ModMii_Launcher/Program.cs
index 0d3ce17..dad1ce0 100644
--- a/ModMii_Launcher/source/ModMii_Launcher/Program.cs
+++ b/ModMii_Launcher/source/ModMii_Launcher/Program.cs
@@ -54,8 +54,8 @@ namespace ModMii_Launcher
         {
             Console.Title = "ModMii";
             Process p = new Process();
-            p.StartInfo.FileName = Environment.GetEnvironmentVariable("COMSPEC");
-            p.StartInfo.Arguments = " /c call " + "\"" + Application.StartupPath + "/Support/ModMii.bat\" " + string.Join(" ", args);
+            p.StartInfo.FileName = Application.StartupPath + "/Support/ModMii.bat";
+            p.StartInfo.Arguments = string.Join(" ", args);
             p.StartInfo.WorkingDirectory = Application.StartupPath + "/Support/";
             p.StartInfo.UseShellExecute = false;
             p.Start();
diff --git a/ModMii_Launcher/source/ModMii_Launcher/bin/Debug/ModMii_Launcher.exe.config b/ModMii_Launcher/source/ModMii_Launcher/bin/Debug/ModMii_Launcher.exe.config
deleted file mode 100644
index 8494f72..0000000
--- a/ModMii_Launcher/source/ModMii_Launcher/bin/Debug/ModMii_Launcher.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
diff --git a/ModMii_Launcher/source/ModMii_Launcher/bin/Debug/ModMii_Launcher.vshost.exe.config b/ModMii_Launcher/source/ModMii_Launcher/bin/Debug/ModMii_Launcher.vshost.exe.config
deleted file mode 100644
index 8494f72..0000000
--- a/ModMii_Launcher/source/ModMii_Launcher/bin/Debug/ModMii_Launcher.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
diff --git a/ModMii_Launcher/source/ModMii_Launcher/bin/Debug/ModMii_Launcher.vshost.exe.manifest b/ModMii_Launcher/source/ModMii_Launcher/bin/Debug/ModMii_Launcher.vshost.exe.manifest
deleted file mode 100644
index f96b1d6..0000000
--- a/ModMii_Launcher/source/ModMii_Launcher/bin/Debug/ModMii_Launcher.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git a/ModMii_Launcher/source/ModMii_Launcher/bin/Release/ModMii_Launcher.pdb b/ModMii_Launcher/source/ModMii_Launcher/bin/Release/ModMii_Launcher.pdb
index b8513c9..1c050a4 100644
Binary files a/ModMii_Launcher/source/ModMii_Launcher/bin/Release/ModMii_Launcher.pdb and b/ModMii_Launcher/source/ModMii_Launcher/bin/Release/ModMii_Launcher.pdb differ
diff --git a/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 1064398..0000000
Binary files a/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ
diff --git a/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Debug/ModMii_Launcher.csproj.FileListAbsolute.txt b/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Debug/ModMii_Launcher.csproj.FileListAbsolute.txt
deleted file mode 100644
index 58c57bc..0000000
--- a/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Debug/ModMii_Launcher.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1 +0,0 @@
-C:\ModMii\tests\ModMii_Launcher\bin\Debug\ModMii_Launcher.exe.config
diff --git a/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Release/ModMii_Launcher.csproj.CoreCompileInputs.cache b/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Release/ModMii_Launcher.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..0811255
--- /dev/null
+++ b/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Release/ModMii_Launcher.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+2648b9ad14b65453e86ed063f162bdb642e1bca7
diff --git a/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Release/ModMii_Launcher.csproj.FileListAbsolute.txt b/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Release/ModMii_Launcher.csproj.FileListAbsolute.txt
index 77a22b4..81ff4a4 100644
--- a/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Release/ModMii_Launcher.csproj.FileListAbsolute.txt
+++ b/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Release/ModMii_Launcher.csproj.FileListAbsolute.txt
@@ -4,3 +4,9 @@ C:\ModMii\tests\ModMii_Launcher\bin\Release\ModMii_Launcher.pdb
 C:\ModMii\tests\ModMii_Launcher\obj\x86\Release\ResolveAssemblyReference.cache
 C:\ModMii\tests\ModMii_Launcher\obj\x86\Release\ModMii_Launcher.exe
 C:\ModMii\tests\ModMii_Launcher\obj\x86\Release\ModMii_Launcher.pdb
+C:\Users\mzolo\Downloads\modmii.github.io-ModMii-Shortcut-er\ModMii_Launcher\source\ModMii_Launcher\bin\Release\ModMii_Launcher.exe.config
+C:\Users\mzolo\Downloads\modmii.github.io-ModMii-Shortcut-er\ModMii_Launcher\source\ModMii_Launcher\bin\Release\ModMii_Launcher.exe
+C:\Users\mzolo\Downloads\modmii.github.io-ModMii-Shortcut-er\ModMii_Launcher\source\ModMii_Launcher\bin\Release\ModMii_Launcher.pdb
+C:\Users\mzolo\Downloads\modmii.github.io-ModMii-Shortcut-er\ModMii_Launcher\source\ModMii_Launcher\obj\x86\Release\ModMii_Launcher.csproj.CoreCompileInputs.cache
+C:\Users\mzolo\Downloads\modmii.github.io-ModMii-Shortcut-er\ModMii_Launcher\source\ModMii_Launcher\obj\x86\Release\ModMii_Launcher.exe
+C:\Users\mzolo\Downloads\modmii.github.io-ModMii-Shortcut-er\ModMii_Launcher\source\ModMii_Launcher\obj\x86\Release\ModMii_Launcher.pdb
diff --git a/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Release/ModMii_Launcher.pdb b/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Release/ModMii_Launcher.pdb
index b8513c9..1c050a4 100644
Binary files a/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Release/ModMii_Launcher.pdb and b/ModMii_Launcher/source/ModMii_Launcher/obj/x86/Release/ModMii_Launcher.pdb differ