@@ -4,6 +4,7 @@ GlueCreditsSoundKits[2] = "Menu-Credits0
 GlueCreditsSoundKits[3] = "Menu-Credits03";
 GlueCreditsSoundKits[4] = "Menu-Credits04";
 GlueCreditsSoundKits[5] = "Menu-Credits05";
+GlueCreditsSoundKits[6] = "Menu-Credits06";
 
 
 GlueScreenInfo = { };
@@ -96,7 +97,7 @@ EXPANSION_LOGOS = {
 	[2] = "Interface\\Glues\\Common\\Glues-WoW-WotLKLogo",
 	[3] = "Interface\\Glues\\Common\\Glues-WoW-CCLogo",
 	[4] = "Interface\\Glues\\Common\\Glues-WoW-MPLogo",
-	[5] = "Interface\\Glues\\Common\\Glues-WoW-MPLogo",
+	[5] = "Interface\\Glues\\Common\\GLUES-WOW-WODLOGO",
 	--When adding entries to here, make sure to update the zhTW and zhCN localization files.
 };
 
@@ -107,7 +108,7 @@ EXPANSION_GLUE_MUSIC = {
 	[2] = "GS_Cataclysm",
 	[3] = "GS_Cataclysm",
 	[4] = "MUS_50_HeartofPandaria_MainTitle",
-	[5] = "MUS_50_HeartofPandaria_MainTitle",
+	[5] = "MUS_60_MainTitle",
 }
 
 --Backgrounds
@@ -117,7 +118,7 @@ EXPANSION_HIGH_RES_BG = {
 	[2] = "Interface\\Glues\\Models\\UI_MainMenu_Cataclysm\\UI_MainMenu_Cataclysm.m2",
 	[3] = "Interface\\Glues\\Models\\UI_MainMenu_Cataclysm\\UI_MainMenu_Cataclysm.m2",
 	[4] = "Interface\\Glues\\Models\\UI_MainMenu_Pandaria\\UI_MainMenu_Pandaria.m2",
-	[5] = "Interface\\Glues\\Models\\UI_MainMenu_Pandaria\\UI_MainMenu_Pandaria.m2",
+	[5] = "Interface\\Glues\\Models\\UI_MAINMENU\\UI_MainMenu.m2",
 }
 
 EXPANSION_LOW_RES_BG = {
@@ -126,7 +127,7 @@ EXPANSION_LOW_RES_BG = {
 	[2] =  "Interface\\Glues\\Models\\UI_MainMenu_Cata_LowBandwidth\\UI_MainMenu_Cata_LowBandwidth.m2",
 	[3] =  "Interface\\Glues\\Models\\UI_MainMenu_Cata_LowBandwidth\\UI_MainMenu_Cata_LowBandwidth.m2",
 	[4] =  "Interface\\Glues\\Models\\UI_MainMenu_LowBandwidth\\UI_MainMenu_LowBandwidth.m2",
-	[5] =  "Interface\\Glues\\Models\\UI_MainMenu_LowBandwidth\\UI_MainMenu_LowBandwidth.m2",
+	[5] =  "Interface\\Glues\\Models\\UI_MAINMENU\\UI_MainMenu.m2",
 }
 
 --Credits titles
@@ -136,6 +137,7 @@ CREDITS_TITLES = { --Note: These are off
 	CREDITS_WOW_LK,
 	CREDITS_WOW_CC,
 	CREDITS_WOW_MOP,
+	CREDITS_WOW_WOD,
 }
 
 -- replace the C functions with local lua versions
@@ -228,13 +230,7 @@ function GlueParent_OnEvent(event, arg1,
 	elseif ( event == "DISCONNECTED_FROM_SERVER" ) then
 		TokenEntry_Cancel(TokenEnterDialog);
 		SetGlueScreen("login");
-		if ( arg1 == 4 ) then
-			GlueDialog_Show("PARENTAL_CONTROL");
-		elseif ( arg1 == 5 ) then
-			GlueDialog_Show("STREAMING_ERROR");
-		else
-			GlueDialog_Show("DISCONNECTED");
-		end
+		GlueDialog_Show(arg1);
 		AddonList:Hide();
 	elseif ( event == "GET_PREFERRED_REALM_INFO" ) then
 		if( arg1 == 1) then
@@ -466,18 +462,18 @@ function TriStateCheckbox_SetState(check
 	end
 	if ( not checked or checked == 0 ) then
 		-- nil or 0 means not checked
-		checkButton:SetChecked(nil);
+		checkButton:SetChecked(false);
 		checkButton.state = 0;
 	elseif ( checked == 2 ) then
 		-- 2 is a normal
-		checkButton:SetChecked(1);
+		checkButton:SetChecked(true);
 		checkedTexture:SetVertexColor(1, 1, 1);
-		checkedTexture:SetDesaturated(0);
+		checkedTexture:SetDesaturated(false);
 		checkButton.state = 2;
 	else
 		-- 1 is a gray check
-		checkButton:SetChecked(1);
-		checkedTexture:SetDesaturated(1);
+		checkButton:SetChecked(true);
+		checkedTexture:SetDesaturated(true);
 		checkButton.state = 1;
 	end
 end
@@ -508,6 +504,10 @@ function SetLoginScreenModel(model)
 	model:SetModel(background, 1);	
 end
 
+function InGlue()
+	return true;
+end
+
 function SecureCapsuleGet(name)
 	return _G[name];
 end