diff --git a/Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1
index dde24d99..cab17aef 100644
--- a/Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1
@@ -62,7 +62,9 @@ foreach ($copy in $fileCopies) {
 }
 
 $deleteDirs = @(
-    "Common\Media\font\RU"
+    "Common\Media\font\RU",
+    "Common\res\TitleUpdate\DLC",
+    "Common\res\TitleUpdate\Audio"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -74,13 +76,14 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
 	"Common\Media\font",
-	"Common\Media\font\*"
+	"Common\Media\font\*",
+    "Common\res\TitleUpdate\GameRules"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1
index 297ab077..3400aafe 100644
--- a/Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1
@@ -76,7 +76,9 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PS4_GAME\Common\Media\font\RU"
+    "PS4_GAME\Common\Media\font\RU",
+    "PS4_GAME\Common\res\TitleUpdate\DLC",
+    "PS4_GAME\Common\res\TitleUpdate\Audio"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -88,13 +90,14 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
 	"PS4_GAME\Common\Media\font",
-	"PS4_GAME\Common\Media\font\*"
+	"PS4_GAME\Common\Media\font\*",
+    "PS4_GAME\Common\res\TitleUpdate\GameRules"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }
diff --git a/Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1
index 888a1bfa..f084a46d 100644
--- a/Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1
@@ -85,7 +85,9 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PS3_GAME\USRDIR\Common\Media\font\RU"
+    "PS3_GAME\USRDIR\Common\Media\font\RU",
+    "PS3_GAME\USRDIR\Common\res\TitleUpdate\DLC",
+    "PS3_GAME\USRDIR\Common\res\TitleUpdate\Audio"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -97,13 +99,14 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
     "PS3_GAME\USRDIR\Common\Media\font",
-    "PS3_GAME\USRDIR\Common\Media\font\*"
+    "PS3_GAME\USRDIR\Common\Media\font\*",
+    "PS3_GAME\USRDIR\Common\res\TitleUpdate\GameRules"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1
index c00249b8..7b439549 100644
--- a/Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1
@@ -73,7 +73,9 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PSVITA_GAME\Common\Media\font\RU" 
+    "PSVITA_GAME\Common\Media\font\RU",
+    "PSVITA_GAME\Common\res\TitleUpdate\DLC",
+    "PSVITA_GAME\Common\res\TitleUpdate\Audio"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -85,13 +87,14 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
 	"PSVITA_GAME\Common\Media\font",
-	"PSVITA_GAME\Common\Media\font\*"
+	"PSVITA_GAME\Common\Media\font\*",
+    "PSVITA_GAME\Common\res\TitleUpdate\GameRules"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }
diff --git a/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1
index 8bd1aa72..8c43fa05 100644
--- a/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1
@@ -60,7 +60,9 @@ foreach ($copy in $fileCopies) {
 }
 
 $deleteDirs = @(
-    "Common\Media\font\RU" #str1k3r - russian font?
+    "Common\Media\font\RU", #str1k3r - russian font?
+    "Common\res\TitleUpdate\DLC",
+    "Common\res\TitleUpdate\Audio"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -72,13 +74,14 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
 	"Common\Media\font",
-	"Common\Media\font\*"
+	"Common\Media\font\*",
+    "Common\res\TitleUpdate\GameRules"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1
index 8da63f72..ff4ec9ec 100644
--- a/Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1
@@ -45,6 +45,17 @@ $fileCopies = @(
 	@{ Source = "Common\Tutorial\Tutorial";     Dest = "Tutorial\Tutorial" }
 )
 
+$deleteDirs = @(
+    "Common\res\TitleUpdate\GameRules"
+)
+
+foreach ($dir in $deleteDirs) {
+    $path = Join-Path $OutDir $dir
+    if (Test-Path $path) {
+        Remove-Item $path -Recurse -Force -ErrorAction SilentlyContinue
+    }
+}
+
 foreach ($copy in $fileCopies) {
     $src = Join-Path $ProjectDir $copy.Source
     $dst = Join-Path $OutDir $copy.Dest
diff --git a/Minecraft.Client/Extrax64Stubs.cpp b/Minecraft.Client/Extrax64Stubs.cpp
index 3db51280..7c58a4da 100644
--- a/Minecraft.Client/Extrax64Stubs.cpp
+++ b/Minecraft.Client/Extrax64Stubs.cpp
@@ -443,8 +443,6 @@ void				C_4JProfile::Initialise( DWORD dwTitleID,
 }
 void				C_4JProfile::SetTrialTextStringTable(CXuiStringTable *pStringTable,int iAccept,int iReject) {}
 void				C_4JProfile::SetTrialAwardText(eAwardType AwardType,int iTitle,int iText) {}
-int					C_4JProfile::GetLockedProfile() { return 0; }
-void				C_4JProfile::SetLockedProfile(int iProf) {}
 UINT				C_4JProfile::RequestSignInUI(bool bFromInvite,bool bLocalGame,bool bNoGuestsAllowed,bool bMultiplayerSignIn,bool bAddUser, int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant) { return 0; }
 UINT				C_4JProfile::DisplayOfflineProfile(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant)  { return 0; }
 UINT				C_4JProfile::RequestConvertOfflineToGuestUI(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant) { return 0; }
diff --git a/Minecraft.Client/Windows64/4JLibs b/Minecraft.Client/Windows64/4JLibs
index 54a04f92..f2d81a0b 160000
--- a/Minecraft.Client/Windows64/4JLibs
+++ b/Minecraft.Client/Windows64/4JLibs
@@ -1 +1 @@
-Subproject commit 54a04f921440ba5bc6f7b9a25ae5ae2fba82e5e2
+Subproject commit f2d81a0bc699278375118ef5cdb8ccba149f8d60
diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
index 1e36fcf8..2f23e39c 100644
--- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
+++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
@@ -103,6 +103,8 @@ static Windows64LaunchArgs ParseLaunchArgs()
 		} 
 		else if (_wcsicmp(argv[i], L"-name") == 0)
 		{
+			args.name = true;
+
 			if (i + 1 < argc) 
 			{
 				app.CopyWideArgToAnsi(argv[i + 1], g_Username, sizeof(g_Username));
@@ -794,6 +796,9 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	InputManager.SetJoypadMapVal(0,0);
 	InputManager.SetKeyRepeatRate(0.3f,0.2f);
 
+	//str1k3r - load username.txt if we havent ran the -name arg
+	if(!launchArgs.name) ProfileManager.LoadGamertag();
+
 	// Initialise the profile manager with the game Title ID, Offer ID, a profile version number, and the number of profile values and settings
 	ProfileManager.Initialise(TITLEID_MINECRAFT,
 		app.m_dwOfferID,
diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.h b/Minecraft.Client/Windows64/Windows64_Minecraft.h
index 8089671b..bd1a4658 100644
--- a/Minecraft.Client/Windows64/Windows64_Minecraft.h
+++ b/Minecraft.Client/Windows64/Windows64_Minecraft.h
@@ -19,4 +19,5 @@ struct Windows64LaunchArgs
 	bool fullscreen;
 	int resolution;
 	bool vsync;
+	bool name;
 };
\ No newline at end of file