diff --git a/.gitignore b/.gitignore
index 01243452..7e3f2419 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,5 @@
 /Minecraft.World/x64_Debug
 /Minecraft.World/x64_Release
 MinecraftConsoles.opensdf
-MinecraftConsoles.v11.suo
\ No newline at end of file
+MinecraftConsoles.v11.suo
+MinecraftConsoles.sdf
diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp
index 9f78f6e1..64ff960e 100644
--- a/Minecraft.Client/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Common/Consoles_App.cpp
@@ -2386,7 +2386,7 @@ void CMinecraftApp::ClearGameSettingsChangedFlag(int iPad)
 // Remove the debug settings in the content package build
 //
 ////////////////////////////
-#ifndef _DEBUG
+#ifdef _DEBUG
 unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlayer) //bOverridePlayer is to force the send for the server to get the read options
 {
 	return 0;
@@ -5186,7 +5186,7 @@ void CMinecraftApp::UpsellReturnedCallback(LPVOID pParam, eUpsellType type, eUps
 	TelemetryManager->RecordUpsellResponded(ProfileManager.GetPrimaryPad(), eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID, senResponse);
 }
 
-#ifdef _DEBUG
+#ifdef _DEBUG_MENUS_ENABLED
 bool CMinecraftApp::DebugArtToolsOn()
 {
 	return DebugSettingsOn() && (GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_ArtTools)) != 0;
diff --git a/Minecraft.Client/Common/Postbuilds/Xbox-postbuild.ps1 b/Minecraft.Client/Common/Postbuilds/Xbox-postbuild.ps1
index 284e2236..42fc4062 100644
--- a/Minecraft.Client/Common/Postbuilds/Xbox-postbuild.ps1
+++ b/Minecraft.Client/Common/Postbuilds/Xbox-postbuild.ps1
@@ -1 +1,52 @@
-// Currently a stub as we dont know what would go here
\ No newline at end of file
+param(
+    [string]$OutDir,
+    [string]$ProjectDir
+)
+
+Write-Host "Xbox Postbuild script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
+
+$directories = @(
+    "res",
+    "Tutorial"
+)
+
+foreach ($dir in $directories) {
+    New-Item -ItemType Directory -Path (Join-Path $OutDir $dir) -Force | Out-Null
+}
+
+$copies = @(
+    @{ Source = "Common\res";      Dest = "res" }
+)
+
+foreach ($copy in $copies) {
+    $src = Join-Path $ProjectDir $copy.Source
+    $dst = Join-Path $OutDir $copy.Dest
+
+    if (Test-Path $src) {
+        xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
+    }
+}
+
+$fileCopies = @(
+    @{ Source = "Xbox\kinect\speech\nuisp1031"; Dest = "nuisp1031" },
+	@{ Source = "Xbox\kinect\speech\nuisp1033"; Dest = "nuisp1033" },
+	@{ Source = "Xbox\kinect\speech\nuisp1036"; Dest = "nuisp1036" },
+	@{ Source = "Xbox\kinect\speech\nuisp1041"; Dest = "nuisp1040" },
+	@{ Source = "Xbox\kinect\speech\nuisp1041"; Dest = "nuisp1041" },
+	@{ Source = "Xbox\kinect\speech\nuisp2057"; Dest = "nuisp2057" },
+	@{ Source = "Xbox\kinect\speech\nuisp2058"; Dest = "nuisp2058" },
+	@{ Source = "Xbox\kinect\speech\nuisp3081"; Dest = "nuisp3081" },
+	@{ Source = "Xbox\kinect\speech\nuisp3082"; Dest = "nuisp3082" },
+	@{ Source = "Xbox\kinect\speech\nuisp3084"; Dest = "nuisp3084" },
+	@{ Source = "XboxMedia\AvatarAwards"; Dest = "AvatarAwards" },
+	@{ Source = "XboxMedia\XZP\TMSFiles.xzp"; Dest = "TMSFiles.xzp" },
+	@{ Source = "Common\Tutorial\Tutorial"; Dest = "Tutorial\Tutorial" }
+)
+
+foreach ($copy in $fileCopies) {
+    $src = Join-Path $ProjectDir $copy.Source
+    $dst = Join-Path $OutDir $copy.Dest
+    if (Test-Path $src) {
+        Copy-Item -Path $src -Destination $dst -Force
+	}
+}
\ No newline at end of file
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj
index 50b32d0f..21e7b4b0 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj
+++ b/Minecraft.Client/Minecraft.Client.vcxproj
@@ -608,14 +608,14 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
     <LinkIncremental>true</LinkIncremental>
-    <ImageXexOutput>$(OutDir)$(ProjectName)_D.xex</ImageXexOutput>
+    <ImageXexOutput>$(SolutionDir)x360_$(Configuration)\$(ProjectName).xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)x360_$(Configuration)\</OutDir>
     <IntDir>x360_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
-    <ImageXexOutput>$(OutDir)$(ProjectName).xex</ImageXexOutput>
+    <ImageXexOutput>$(SolutionDir)x360_$(Configuration)\$(ProjectName).xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)x360_$(Configuration)\</OutDir>
     <IntDir>x360_$(Configuration)\</IntDir>
@@ -968,7 +968,14 @@
     <Deploy>
       <DeploymentType>CopyToHardDrive</DeploymentType>
       <DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\res=Common\res;$(RemoteRoot)=XboxMedia\AvatarAwards;$(RemoteRoot)\Tutorial=Common\Tutorial\Tutorial;$(RemoteRoot)=XboxMedia\584111F70AAAAAAA;$(RemoteRoot)=Xbox\kinect\speech;$(RemoteRoot)=XboxMedia\XZP\TMSFiles.xzp;$(RemoteRoot)\DummyTexturePack=Common\DummyTexturePack</DeploymentFiles>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </Deploy>
+    <PostBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Run Xbox postbuild script</Message>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
     <ClCompile>
@@ -1017,7 +1024,12 @@
     <Deploy>
       <DeploymentType>CopyToHardDrive</DeploymentType>
       <DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\res=Common\res;$(RemoteRoot)=XboxMedia\AvatarAwards;$(RemoteRoot)\Tutorial=Common\Tutorial\Tutorial;$(RemoteRoot)=XboxMedia\584111F70AAAAAAA;$(RemoteRoot)=Xbox\kinect\speech;$(RemoteRoot)=XboxMedia\XZP\TMSFiles.xzp;$(RemoteRoot)\DummyTexturePack=Common\DummyTexturePack</DeploymentFiles>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </Deploy>
+    <PostBuildEvent>
+      <Message>Run Xbox postbuild script</Message>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">
     <ClCompile>
diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp
index 7d6502bc..40a440c5 100644
--- a/Minecraft.Client/Minecraft.cpp
+++ b/Minecraft.Client/Minecraft.cpp
@@ -3464,7 +3464,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
 
 		if (player->missTime > 0) player->missTime--;
 
-#ifdef _DEBUG_MENUS_ENABLED
+#ifdef _DEBUG
 		if(app.DebugSettingsOn())
 		{
 #ifndef __PSVITA__
diff --git a/MinecraftConsoles.sdf b/MinecraftConsoles.sdf
deleted file mode 100644
index 75774544..00000000
Binary files a/MinecraftConsoles.sdf and /dev/null differ