Bug tickets fixed

diff --git a/Interface/AddOns/SVUI/assets/artwork/Unitframe/UNIT-FRIENDSHIP.blp b/Interface/AddOns/SVUI/assets/artwork/Unitframe/UNIT-FRIENDSHIP.blp
new file mode 100644
index 0000000..05e83b4
Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Unitframe/UNIT-FRIENDSHIP.blp differ
diff --git a/Interface/AddOns/SVUI/assets/artwork/Unitframe/UNIT-STUNNED.blp b/Interface/AddOns/SVUI/assets/artwork/Unitframe/UNIT-STUNNED.blp
index 861744a..fef5a9f 100644
Binary files a/Interface/AddOns/SVUI/assets/artwork/Unitframe/UNIT-STUNNED.blp and b/Interface/AddOns/SVUI/assets/artwork/Unitframe/UNIT-STUNNED.blp differ
diff --git a/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua b/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua
index b324737..e2c1ca3 100644
--- a/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua
+++ b/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua
@@ -1051,6 +1051,7 @@ local function RemoveDefaults()
 	IconIntroTracker:UnregisterAllEvents()
 	IconIntroTracker:Hide()
 	IconIntroTracker:SetParent(removalManager)
+
 	InterfaceOptionsCombatPanelActionButtonUseKeyDown:SetScale(0.0001)
 	InterfaceOptionsCombatPanelActionButtonUseKeyDown:SetAlpha(0)
 	InterfaceOptionsActionBarsPanelAlwaysShowActionBars:EnableMouse(false)
diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua
index 564c2ec..f6e5c1e 100644
--- a/Interface/AddOns/SVUI/packages/map/SVMap.lua
+++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua
@@ -109,13 +109,11 @@ end;

 function MOD:RefreshMiniMap()
 	MOD:UpdateSizing()
-
 	if(SVUI_MinimapFrame and SVUI_MinimapFrame:IsShown()) then
 		SVUI_MinimapFrame:Size(MM_WIDTH, MM_HEIGHT)
 		SVUI_MinimapFrame.backdrop:SetGradient(unpack(MM_COLOR))
 		Minimap:Size(MM_SIZE,MM_SIZE)
 		if MOD.db.customshape then
-			Minimap:SetHitRectInsets(0, 0, -50, 50)
 			Minimap:SetPoint("BOTTOMLEFT", SVUI_MinimapFrame, "BOTTOMLEFT", MM_BRDR, -(MM_OFFSET_BOTTOM - MM_BRDR))
 			Minimap:SetPoint("TOPRIGHT", SVUI_MinimapFrame, "TOPRIGHT", -MM_BRDR, (MM_OFFSET_TOP - MM_BRDR))
 			Minimap:SetMaskTexture('Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP_MASK_RECTANGLE')
diff --git a/Interface/AddOns/SVUI/packages/unit/common/actionpanel.lua b/Interface/AddOns/SVUI/packages/unit/common/actionpanel.lua
index 3370203..ec26a23 100644
--- a/Interface/AddOns/SVUI/packages/unit/common/actionpanel.lua
+++ b/Interface/AddOns/SVUI/packages/unit/common/actionpanel.lua
@@ -261,19 +261,18 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText)
 			frame.ActionPanel.special:SetAlpha(0.7)
 			frame.ActionPanel.special:Hide()
 		else
-			frame.LossOfControl = CreateFrame("Frame", nil, frame)
+			frame.LossOfControl = CreateFrame("Frame", nil, frame.InfoPanel)
 			frame.LossOfControl:SetAllPoints(frame)
 			frame.LossOfControl:SetFrameStrata("DIALOG")
 			frame.LossOfControl:SetFrameLevel(99)

 			local stunned = frame.LossOfControl:CreateTexture(nil, "OVERLAY", nil, 1)
-			stunned:SetAllPoints()
+			stunned:SetPoint("CENTER", frame, "CENTER", 0, 0)
+			stunned:SetSize(96, 96)
 			stunned:SetTexture(STUNNED_ANIM)
-			stunned:SetVertexColor(1, 1, 0)
-			stunned:SetBlendMode("BLEND")
-			SuperVillain.Animate:Sprite(stunned, 0.15, false, true)
+			stunned:SetBlendMode("ADD")
+			SuperVillain.Animate:Sprite(stunned, 0.12, false, true)
 			stunned:Hide()
-
 			frame.LossOfControl.stunned = stunned

 			LossOfControlFrame:HookScript("OnShow", function()
diff --git a/Interface/AddOns/SVUI/packages/unit/common/misc.lua b/Interface/AddOns/SVUI/packages/unit/common/misc.lua
index 8b2a8b2..4daa09b 100644
--- a/Interface/AddOns/SVUI/packages/unit/common/misc.lua
+++ b/Interface/AddOns/SVUI/packages/unit/common/misc.lua
@@ -31,6 +31,8 @@ local AURA_FONTSIZE = 10
 local AURA_OUTLINE = "OUTLINE"
 local LML_ICON_FILE = [[Interface\Addons\SVUI\assets\artwork\Unitframe\UNIT-LML]]
 local ROLE_ICON_FILE = [[Interface\Addons\SVUI\assets\artwork\Unitframe\UNIT-ROLES]]
+local BUDDY_ICON = [[Interface\Addons\SVUI\assets\artwork\Unitframe\UNIT-FRIENDSHIP]]
+
 local ROLE_ICON_DATA = {
 	["TANK"] = {0,0.5,0,0.5, 0.5,0.75,0.5,0.75},
 	["HEALER"] = {0,0.5,0.5,1, 0.5,0.75,0.75,1},
@@ -146,10 +148,17 @@ function MOD:CreateCombatant(frame)
 end

 function MOD:CreateFriendshipBar(frame)
-	local buddy = CreateFrame("StatusBar", nil, frame)
+	local buddy = CreateFrame("StatusBar", nil, frame.Power)
     buddy:SetAllPoints(frame.Power)
     buddy:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Bars\DEFAULT]])
     buddy:SetStatusBarColor(1,0,0)
+    local bg = buddy:CreateTexture(nil, "BACKGROUND")
+	bg:SetAllPoints(buddy)
+	bg:SetTexture(0.2,0,0)
+	local icon = buddy:CreateTexture(nil, "OVERLAY")
+	icon:SetPoint("LEFT", buddy, "LEFT", -11, 0)
+	icon:SetSize(22,22)
+	icon:SetTexture(BUDDY_ICON)

 	return buddy
 end
diff --git a/Interface/AddOns/SVUI/packages/unit/frames/units.lua b/Interface/AddOns/SVUI/packages/unit/frames/units.lua
index 9c4cd1c..ed7cdfa 100644
--- a/Interface/AddOns/SVUI/packages/unit/frames/units.lua
+++ b/Interface/AddOns/SVUI/packages/unit/frames/units.lua
@@ -90,6 +90,8 @@ local UpdatePlayerFrame = function(self)

     self.colors = oUF_SuperVillain.colors;
     self:Size(UNIT_WIDTH, UNIT_HEIGHT)
+    local lossSize = UNIT_WIDTH * 0.6
+    self.LossOfControl.stunned:SetSize(lossSize, lossSize)
     _G[self:GetName().."_MOVE"]:Size(self:GetSize())

     MOD:RefreshUnitLayout(self, "player")
diff --git a/Interface/AddOns/SVUI/scripts/_load.xml b/Interface/AddOns/SVUI/scripts/_load.xml
index 5cc2910..8effc80 100644
--- a/Interface/AddOns/SVUI/scripts/_load.xml
+++ b/Interface/AddOns/SVUI/scripts/_load.xml
@@ -8,5 +8,5 @@
 	<Script file='totems.lua'/>
 	<Script file='raid.lua'/>
 	<Script file='reactions.lua'/>
-	<!-- <Script file='pvp.lua'/> -->
+	<Script file='pvp.lua'/>
 </Ui>
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI/system/installer.lua b/Interface/AddOns/SVUI/system/installer.lua
index 4bf9568..183f7e2 100644
--- a/Interface/AddOns/SVUI/system/installer.lua
+++ b/Interface/AddOns/SVUI/system/installer.lua
@@ -40,14 +40,14 @@ local CURRENT_PAGE, MAX_PAGE, XOFF = 0, 8, (GetScreenWidth() * 0.025)
 local okToResetMOVE = false
 local mungs = false;
 local user_music_vol;
-local musicIsPlaying = false;
+local musicIsPlaying;
 --[[
 ##########################################################
 LOCAL FUNCTIONS
 ##########################################################
 ]]--
 local function SetInstallButton(button)
-    if(not button) then return end;
+    if(not button) then return end
     button.Left:SetAlpha(0)
     button.Middle:SetAlpha(0)
     button.Right:SetAlpha(0)
@@ -57,7 +57,7 @@ local function SetInstallButton(button)
     button:SetDisabledTexture("")
     button:Formula409()
     button:SetFrameLevel(button:GetFrameLevel() + 1)
-end;
+end

 local function forceCVars()
 	SetCVar("alternateResourceText",1)
@@ -77,7 +77,7 @@ local function forceCVars()
 	SetCVar('SpamFilter',0)
 	InterfaceOptionsActionBarsPanelPickupActionKeyDropDown:SetValue('SHIFT')
 	InterfaceOptionsActionBarsPanelPickupActionKeyDropDown:RefreshValue()
-end;
+end

 local function BarShuffle()
 	local bar2 = SuperVillain.db.SVBar.Bar2.enable;
@@ -98,7 +98,7 @@ local function BarShuffle()
 		SuperVillain.db.framelocations.SVUI_PetActionBar_MOVE = "BOTTOMLEFTSVUI_ActionBar1TOPLEFT04"
 		SuperVillain.db.framelocations.SVUI_StanceBar_MOVE = "BOTTOMRIGHTSVUI_ActionBar1TOPRIGHT04";
 	end
-end;
+end

 local function UFMoveBottomQuadrant(toggle)
 	if not SuperVillain.db.framelocations then SuperVillain.db.framelocations = {} end
@@ -133,7 +133,7 @@ local function UFMoveBottomQuadrant(toggle)
 		SuperVillain.db.framelocations.SVUI_Focus_MOVE = "BOTTOMSVUIParentBOTTOM"..c..""..(d + 150);
 		SuperVillain.db.framelocations.SVUI_ThreatBar_MOVE = "BOTTOMRIGHTSVUIParentBOTTOMRIGHT-495"..d;
 	end
-end;
+end

 local function UFMoveLeftQuadrant(toggle)
 	if not SuperVillain.db.framelocations then SuperVillain.db.framelocations = {} end
@@ -154,7 +154,7 @@ local function UFMoveLeftQuadrant(toggle)
 		SuperVillain.db.framelocations.SVUI_Raid10_MOVE = "BOTTOMLEFTSVUIParentBOTTOMLEFT4300"
 		SuperVillain.db.framelocations.SVUI_Raid25_MOVE = "BOTTOMLEFTSVUIParentBOTTOMLEFT4300"
 	end
-end;
+end

 local function UFMoveTopQuadrant(toggle)
 	if not SuperVillain.db.framelocations then SuperVillain.db.framelocations = {} end
@@ -171,7 +171,7 @@ local function UFMoveTopQuadrant(toggle)
 		SuperVillain.db.framelocations.LossOfControlFrame_MOVE = "BOTTOMSVUIParentBOTTOM0443"
 		SuperVillain.db.framelocations.BNET_MOVE = "TOPRIGHTSVUIParentTOPRIGHT-4-248"
 	end
-end;
+end

 local function UFMoveRightQuadrant(toggle)
 	if not SuperVillain.db.framelocations then SuperVillain.db.framelocations = {} end
@@ -185,7 +185,7 @@ local function UFMoveRightQuadrant(toggle)
 		SuperVillain.db.framelocations.SVUI_ArenaHolder_MOVE = "RIGHTSVUIParentRIGHT-1050"
 		SuperVillain.db.framelocations.Tooltip_MOVE = "BOTTOMRIGHTSVUIParentBOTTOMRIGHT-284"..dH;
 	end
-end;
+end

 local function initChat(mungs)
 	forceCVars()
@@ -203,7 +203,7 @@ local function initChat(mungs)
 			chat:ClearAllPoints()
 			chat:Point("BOTTOMLEFT", LeftSuperDock, "BOTTOMLEFT", 5, 5)
 			chat:Point("TOPRIGHT", LeftSuperDock, "TOPRIGHT", -5, -10)
-		end;
+		end
 		FCF_SavePositionAndDimensions(chat)
 		FCF_StopDragging(chat)
 		FCF_SetChatWindowFontSize(nil, chat, 12)
@@ -214,7 +214,7 @@ local function initChat(mungs)
 		elseif i == 3 then
 			FCF_SetWindowName(chat, LOOT)
 		end
-	end;
+	end
 	ChatFrame_RemoveAllMessageGroups(ChatFrame1)
 	ChatFrame_AddMessageGroup(ChatFrame1, "SAY")
 	ChatFrame_AddMessageGroup(ChatFrame1, "EMOTE")
@@ -298,12 +298,12 @@ local function initChat(mungs)
 	if not mungs then
 		if SuperVillain.Chat then
 			SuperVillain.Chat:ReLoad(true)
-			if SVUI_Cache["Dock"].RightSuperDockFaded  == true then RightSuperDockToggleButton:Click()end;
+			if SVUI_Cache["Dock"].RightSuperDockFaded  == true then RightSuperDockToggleButton:Click()end
 			if SVUI_Cache["Dock"].LeftSuperDockFaded  == true then LeftSuperDockToggleButton:Click()end
 		end
 		SuperVillain:SavedPopup()
 	end
-end;
+end
 --[[
 ##########################################################
 GLOBAL/MODULE FUNCTIONS
@@ -314,7 +314,7 @@ function SuperVillain:SetUserScreen(rez, preserve)
 		if okToResetMOVE then
 			self:ResetMovables("")
 			okToResetMOVE = false;
-		end;
+		end
 		self.db:SetDefault("SVUnit")
 	end

@@ -345,7 +345,7 @@ function SuperVillain:SetUserScreen(rez, preserve)
 			self.db.SVUnit.boss.castbar.width = 200;
 			self.db.SVUnit.arena.width = 200;
 			self.db.SVUnit.arena.castbar.width = 200
-		end;
+		end
 		if not mungs then
 			UFMoveBottomQuadrant(true)
 			UFMoveLeftQuadrant(true)
@@ -363,7 +363,7 @@ function SuperVillain:SetUserScreen(rez, preserve)
 			UFMoveRightQuadrant()
 		end
 		self.ghettoMonitor = nil
-	end;
+	end

 	if(not preserve and not mungs) then
 		BarShuffle()
@@ -373,7 +373,7 @@ function SuperVillain:SetUserScreen(rez, preserve)
 		self.Registry:Update('SVUnit')
 		SuperVillain:SavedPopup()
 	end
-end;
+end

 function SuperVillain:SetColorTheme(style, preserve)
 	style = style or "default";
@@ -389,7 +389,7 @@ function SuperVillain:SetColorTheme(style, preserve)
 		self.db.SVUnit.healthclass = true;
 	else
 		self.db.SVUnit.healthclass = false;
-	end;
+	end

 	if(not mungs) then
 		self:MediaUpdate()
@@ -399,7 +399,7 @@ function SuperVillain:SetColorTheme(style, preserve)
 			SuperVillain:SavedPopup()
 		end
 	end
-end;
+end

 function SuperVillain:SetUnitframeLayout(style, preserve)
 	style = style or "default";
@@ -420,7 +420,7 @@ function SuperVillain:SetUnitframeLayout(style, preserve)

 	if(self.db.SAFEDATA.mediastyle == "default") then
 		self.db.SVUnit.healthclass = true;
-	end;
+	end

 	if(not mungs) then
 		if(not preserve) then
@@ -437,19 +437,19 @@ function SuperVillain:SetUnitframeLayout(style, preserve)
 			SuperVillain:SavedPopup()
 		end
 	end
-end;
+end

 function SuperVillain:SetupBarLayout(style, preserve)
 	style = style or "default";

-	if not SuperVillain.db.framelocations then SuperVillain.db.framelocations={} end;
+	if not SuperVillain.db.framelocations then SuperVillain.db.framelocations={} end
 	if not preserve then
 		self.db:SetDefault("SVBar")
 		if okToResetMOVE then
 			self:ResetMovables('')
 			okToResetMOVE=false
 		end
-	end;
+	end

 	local presets = self:LoadPresetData("bars", style)
 	self.db.SAFEDATA.barstyle = style;
@@ -472,7 +472,7 @@ function SuperVillain:SetupBarLayout(style, preserve)
 			SuperVillain:SavedPopup()
 		end
 	end
-end;
+end

 function SuperVillain:SetupAuralayout(style, preserve)
 	style = style or "default";
@@ -487,7 +487,17 @@ function SuperVillain:SetupAuralayout(style, preserve)
 			SuperVillain:SavedPopup()
 		end
 	end
-end;
+end
+
+local function PlayThemeSong()
+	if(not musicIsPlaying) then
+		SetCVar("Sound_MusicVolume", 100)
+		SetCVar("Sound_EnableMusic", 1)
+		StopMusic()
+		PlayMusic([[Interface\AddOns\SVUI\assets\sounds\SuperVillain.mp3]])
+		musicIsPlaying = true
+	end
+end

 local function InstallComplete()
 	SVUI_Profile.SAFEDATA.install_version = SuperVillain.version;
@@ -495,7 +505,7 @@ local function InstallComplete()
 	SetCVar("Sound_MusicVolume",user_music_vol)
 	okToResetMOVE = false;
 	ReloadUI()
-end;
+end

 local function InstallMungsChoice()
 	mungs = true;
@@ -512,7 +522,7 @@ local function InstallMungsChoice()
 	StopMusic()
 	SetCVar("Sound_MusicVolume",user_music_vol)
 	ReloadUI()
-end;
+end

 local function ResetAll()
 	SVUI_InstallNextButton:Disable()
@@ -523,6 +533,9 @@ local function ResetAll()
 	SVUI_InstallOption02Button:Hide()
 	SVUI_InstallOption02Button:SetScript("OnClick",nil)
 	SVUI_InstallOption02Button:SetText("")
+	SVUI_InstallOption03Button:Hide()
+	SVUI_InstallOption03Button:SetScript("OnClick",nil)
+	SVUI_InstallOption03Button:SetText("")
 	SVUI_InstallOption1Button:Hide()
 	SVUI_InstallOption1Button:SetScript("OnClick",nil)
 	SVUI_InstallOption1Button:SetText("")
@@ -540,7 +553,7 @@ local function ResetAll()
 	SVUI_SetupHolder.Desc2:SetText("")
 	SVUI_SetupHolder.Desc3:SetText("")
 	SVUI_SetupHolder:Size(550,400)
-end;
+end

 local function SetPage(newPage)
 	CURRENT_PAGE = newPage;
@@ -550,12 +563,11 @@ local function SetPage(newPage)
 	if newPage  ~= MAX_PAGE then
 		SVUI_InstallNextButton:Enable()
 		SVUI_InstallNextButton:Show()
-	end;
+	end
 	if newPage  ~= 1 then
 		SVUI_InstallPrevButton:Enable()
 		SVUI_InstallPrevButton:Show()
-	end;
-
+	end
 	--[[
 		more useful globalstrings

@@ -570,6 +582,7 @@ local function SetPage(newPage)
 	]]--

 	if newPage == 1 then
+		local hasOldConfig = SVUI_Profile.SAFEDATA.install_version
 		SVUI_InstallPrevButton:Disable()
 		SVUI_InstallPrevButton:Hide()
 		okToResetMOVE = true
@@ -580,9 +593,17 @@ local function SetPage(newPage)
 		SVUI_InstallOption01Button:Show()
 		SVUI_InstallOption01Button:SetScript("OnClick", InstallMungsChoice)
 		SVUI_InstallOption01Button:SetText(USE.."\n"..DEFAULT.."\n"..SETTINGS)
+
 		SVUI_InstallOption02Button:Show()
 		SVUI_InstallOption02Button:SetScript("OnClick", InstallComplete)
-		SVUI_InstallOption02Button:SetText(CANCEL.."\n"..SETTINGS)
+		SVUI_InstallOption02Button:SetText("PRETEND YOU\nDID THIS\nALREADY")
+
+		if(hasOldConfig) then
+			SVUI_InstallOption03Button:Show()
+			SVUI_InstallOption03Button:SetScript("OnClick", InstallComplete)
+			SVUI_InstallOption03Button:SetText("Keep\nSaved\n"..SETTINGS)
+		end
+
 	elseif newPage == 2 then
 		setupFrame.SubTitle:SetText(CHAT)
 		setupFrame.Desc1:SetText(L["Whether you want to or not, you will be needing a communicator so other villains can either update you on their doings-of-evil or inform you about the MANY abilities of Chuck Norris"])
@@ -593,13 +614,7 @@ local function SetPage(newPage)
 			initChat(false)
 		end)
 		SVUI_InstallOption1Button:SetText(CHAT_DEFAULTS)
-		if(not musicIsPlaying) then
-			SetCVar("Sound_MusicVolume", 100)
-			SetCVar("Sound_EnableMusic", 1)
-			StopMusic()
-			PlayMusic([[Interface\AddOns\SVUI\assets\sounds\SuperVillain.mp3]])
-			musicIsPlaying = true
-		end
+
 	elseif newPage == 3 then
 		local rez = GetCVar("gxResolution")
 		setupFrame.SubTitle:SetText(RESOLUTION)
@@ -610,7 +625,7 @@ local function SetPage(newPage)
 		else
 			setupFrame.Desc2:SetText(L["This resolution doesn't require that you change settings for the UI to fit on your screen."].." "..L["Click the button below to resize your chat frames, unitframes, and reposition your actionbars."].." "..L["This is completely optional."])
 			setupFrame.Desc3:SetText(L["CHOOSE_OR_DIE"])
-		end;
+		end
 		SVUI_InstallOption1Button:Show()
 		SVUI_InstallOption1Button:SetScript("OnClick", function()
 			SuperVillain:SetUserScreen("high")
@@ -627,13 +642,7 @@ local function SetPage(newPage)
 			SVUI_SetupHolder.Desc3:SetText(L["Enjoy the ONE incredible pixel that fits on this screen."])
 		end)
 		SVUI_InstallOption2Button:SetText(LOW)
-		if(not musicIsPlaying) then
-			SetCVar("Sound_MusicVolume", 100)
-			SetCVar("Sound_EnableMusic", 1)
-			StopMusic()
-			PlayMusic([[Interface\AddOns\SVUI\assets\sounds\SuperVillain.mp3]])
-			musicIsPlaying = true
-		end
+
 	elseif newPage == 4 then
 		setupFrame.SubTitle:SetText(COLOR.." "..SETTINGS)
 		setupFrame.Desc1:SetText(L["Choose a theme layout you wish to use for your initial setup."])
@@ -671,13 +680,7 @@ local function SetPage(newPage)
 			SVUI_SetupHolder.Desc3:SetText(CONTINUED..L["you don't need fancyness to kick some ass!"])
 		end)
 		SVUI_InstallOption4Button:SetText(L["Vintage"])
-		if(not musicIsPlaying) then
-			SetCVar("Sound_MusicVolume", 100)
-			SetCVar("Sound_EnableMusic", 1)
-			StopMusic()
-			PlayMusic([[Interface\AddOns\SVUI\assets\sounds\SuperVillain.mp3]])
-			musicIsPlaying = true
-		end
+
 	elseif newPage == 5 then
 		setupFrame.SubTitle:SetText(UNITFRAME_LABEL.." "..SETTINGS)
 		setupFrame.Desc1:SetText(L["You can now choose what primary unitframe style you wish to use."])
@@ -710,13 +713,7 @@ local function SetPage(newPage)
 			SVUI_SetupHolder.Desc3:SetText(CONTINUED..L["you dont need no fanciness getting in the way of world domination do you?"])
 		end)
 		SVUI_InstallOption3Button:SetText(L["Compact"])
-		if(not musicIsPlaying) then
-			SetCVar("Sound_MusicVolume", 100)
-			SetCVar("Sound_EnableMusic", 1)
-			StopMusic()
-			PlayMusic([[Interface\AddOns\SVUI\assets\sounds\SuperVillain.mp3]])
-			musicIsPlaying = true
-		end
+
 	elseif newPage == 6 then
 		setupFrame.SubTitle:SetText(ACTIONBAR_LABEL.." "..SETTINGS)
 		setupFrame.Desc1:SetText(L["Choose a layout for your action bars."])
@@ -758,13 +755,7 @@ local function SetPage(newPage)
 			SVUI_SetupHolder.Desc3:SetText(L["Double your bars then double their size for maximum button goodness!"])
 		end)
 		SVUI_InstallOption4Button:SetText(L["2 Big" .. "\n" .. "Rows"])
-		if(not musicIsPlaying) then
-			SetCVar("Sound_MusicVolume", 100)
-			SetCVar("Sound_EnableMusic", 1)
-			StopMusic()
-			PlayMusic([[Interface\AddOns\SVUI\assets\sounds\SuperVillain.mp3]])
-			musicIsPlaying = true
-		end
+
 	elseif newPage == 7 then
 		setupFrame.SubTitle:SetText(AURAS.." "..SETTINGS)
 		setupFrame.Desc1:SetText(L["Select an aura layout. \"Icons\" will display only icons and aurabars won't be used. \"Bars\" will display only aurabars and icons won't be used (duh). \"The Works!\" does just what it says.... icons, bars and awesomeness."])
@@ -794,13 +785,7 @@ local function SetPage(newPage)
 			SuperVillain:SetupAuralayout("theworks")
 		end)
 		SVUI_InstallOption4Button:SetText(L["The" .. "\n" .. "Works!"])
-		if(not musicIsPlaying) then
-			SetCVar("Sound_MusicVolume", 100)
-			SetCVar("Sound_EnableMusic", 1)
-			StopMusic()
-			PlayMusic([[Interface\AddOns\SVUI\assets\sounds\SuperVillain.mp3]])
-			musicIsPlaying = true
-		end
+
 	elseif newPage == 8 then
 		SVUI_InstallNextButton:Disable()
 		SVUI_InstallNextButton:Hide()
@@ -811,22 +796,22 @@ local function SetPage(newPage)
 		SVUI_InstallOption1Button:SetScript("OnClick", InstallComplete)
 		SVUI_InstallOption1Button:SetText(L["THE_BUTTON_BELOW"])
 		SVUI_SetupHolder:Size(550, 350)
-	end
-end;
+	end
+end

 local function NextPage()
 	if CURRENT_PAGE ~= MAX_PAGE then
 		CURRENT_PAGE = CURRENT_PAGE + 1;
 		SetPage(CURRENT_PAGE)
-	end
-end;
+	end
+end

 local function PreviousPage()
 	if CURRENT_PAGE ~= 1 then
 		CURRENT_PAGE = CURRENT_PAGE - 1;
 		SetPage(CURRENT_PAGE)
 	end
-end;
+end

 function SuperVillain:ResetInstallation()
 	mungs = true;
@@ -866,19 +851,13 @@ function SuperVillain:ResetInstallation()
 	SVUI_Profile.SAFEDATA.install_version = SuperVillain.version;
 	SuperVillain:ResetMovables('')
 	ReloadUI()
-end;
+end

 function SuperVillain:Install(autoLoaded)
 	if(not user_music_vol) then
 		user_music_vol = GetCVar("Sound_MusicVolume")
 	end
-	if(not musicIsPlaying) then
-		SetCVar("Sound_MusicVolume", 100)
-		SetCVar("Sound_EnableMusic", 1)
-		StopMusic()
-		PlayMusic([[Interface\AddOns\SVUI\assets\sounds\SuperVillain.mp3]])
-		musicIsPlaying = true
-	end
+
 	-- frame
 	if not SVUI_SetupHolder then
 		local frame = CreateFrame("Button", "SVUI_SetupHolder", UIParent)
@@ -973,12 +952,12 @@ function SuperVillain:Install(autoLoaded)

 		frame.Option02 = CreateFrame("Button", "SVUI_InstallOption02Button", frame, "UIPanelButtonTemplate")
 		frame.Option02:Formula409()
-		frame.Option02:Size(120, 30)
+		frame.Option02:Size(130, 30)
 		frame.Option02:Point("BOTTOMLEFT", frame, "BOTTOM", 4, 15)
 		frame.Option02:SetText("")
 		SetInstallButton(frame.Option02)
 		frame.Option02.texture = frame.Option02:CreateTexture(nil, "BORDER")
-		frame.Option02.texture:Size(120, 110)
+		frame.Option02.texture:Size(130, 110)
 		frame.Option02.texture:Point("CENTER", frame.Option02, "BOTTOM", 0, -15)
 		frame.Option02.texture:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Template\\OPTION")
 		frame.Option02.texture:SetGradient("VERTICAL", 0.3, 0, 0, 0.7, 0, 0)
@@ -993,7 +972,7 @@ function SuperVillain:Install(autoLoaded)
 			g.texture:Point("CENTER", g, "BOTTOM", 0, -(h * 0.09))
 		end)
 		frame.Option02:SetScript("OnShow", function()
-			frame.Option01:SetWidth(120)
+			frame.Option01:SetWidth(130)
 			frame.Option01:ClearAllPoints()
 			frame.Option01:Point("BOTTOMRIGHT", frame, "BOTTOM", -4, 15)
 		end)
@@ -1005,6 +984,46 @@ function SuperVillain:Install(autoLoaded)
 		frame.Option02:SetFrameLevel(frame.Option01:GetFrameLevel() + 10)
 		frame.Option02:Hide()

+		frame.Option03 = CreateFrame("Button", "SVUI_InstallOption03Button", frame, "UIPanelButtonTemplate")
+		frame.Option03:Formula409()
+		frame.Option03:Size(130, 30)
+		frame.Option03:Point("BOTTOM", frame, "BOTTOM", 0, 15)
+		frame.Option03:SetText("")
+		SetInstallButton(frame.Option03)
+		frame.Option03.texture = frame.Option03:CreateTexture(nil, "BORDER")
+		frame.Option03.texture:Size(130, 110)
+		frame.Option03.texture:Point("CENTER", frame.Option03, "BOTTOM", 0, -15)
+		frame.Option03.texture:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Template\\OPTION")
+		frame.Option03.texture:SetGradient("VERTICAL", 0, 0.1, 0.3, 0, 0.5, 0.7)
+		frame.Option03:SetScript("OnEnter", function(this)
+			this.texture:SetVertexColor(0.2, 0.5, 1)
+		end)
+		frame.Option03:SetScript("OnLeave", function(this)
+			this.texture:SetGradient("VERTICAL", 0, 0.1, 0.3, 0, 0.5, 0.7)
+		end)
+		hooksecurefunc(frame.Option03, "SetWidth", function(g, h)
+			g.texture:Size(h, h)
+			g.texture:Point("CENTER", g, "BOTTOM", 0, -(h * 0.09))
+		end)
+		frame.Option03:SetScript("OnShow", function(self)
+			self:SetWidth(130)
+			frame.Option01:SetWidth(130)
+			frame.Option01:ClearAllPoints()
+			frame.Option01:Point("RIGHT", self, "LEFT", -8, 0)
+			frame.Option02:SetWidth(130)
+			frame.Option02:ClearAllPoints()
+			frame.Option02:Point("LEFT", self, "RIGHT", 8, 0)
+		end)
+		frame.Option03:SetScript("OnHide", function()
+			frame.Option01:SetWidth(160)
+			frame.Option01:ClearAllPoints()
+			frame.Option01:Point("BOTTOM", 0, 15)
+			frame.Option02:ClearAllPoints()
+			frame.Option02:Point("BOTTOMLEFT", frame, "BOTTOM", 4, 15)
+		end)
+		frame.Option03:SetFrameLevel(frame.Option01:GetFrameLevel() + 10)
+		frame.Option03:Hide()
+
 		frame.Option1 = CreateFrame("Button", "SVUI_InstallOption1Button", frame, "UIPanelButtonTemplate")
 		frame.Option1:Formula409()
 		frame.Option1:Size(160, 30)
@@ -1158,21 +1177,19 @@ function SuperVillain:Install(autoLoaded)
 		frame.tutorialImage:Size(256, 128)
 		frame.tutorialImage:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\SPLASH")
 		frame.tutorialImage:Point("BOTTOM", 0, 70)
-	end;
+	end

 	SVUI_SetupHolder:SetScript("OnHide", function()
 		StopMusic()
 		SetCVar("Sound_MusicVolume", user_music_vol)
-		musicIsPlaying = false
+		musicIsPlaying = nil
 	end)

-	if(not autoLoaded) then
-		SetCVar("Sound_MusicVolume", 100)
-		SetCVar("Sound_EnableMusic", 1)
-		StopMusic()
-		PlayMusic([[Interface\AddOns\SVUI\assets\sounds\SuperVillain.mp3]])
-		musicIsPlaying = true
-	end
 	SVUI_SetupHolder:Show()
 	NextPage()
-end;
\ No newline at end of file
+	if(not autoLoaded) then
+		PlayThemeSong()
+	else
+		SuperVillain:ExecuteTimer(PlayThemeSong, 5)
+	end
+end
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI/system/system.lua b/Interface/AddOns/SVUI/system/system.lua
index 679ab9b..b67af5f 100644
--- a/Interface/AddOns/SVUI/system/system.lua
+++ b/Interface/AddOns/SVUI/system/system.lua
@@ -57,7 +57,6 @@ local SVUINameSpace, SVUICore = ...;
 LOCALS
 ##########################################################
 ]]--
-local minimumVersion = 4.04
 local bld = select(2,GetBuildInfo());
 local toonClass = select(2,UnitClass("player"));
 local rez = GetCVar("gxResolution");
@@ -291,13 +290,9 @@ SYSTEM UPDATES
 ##########################################################
 ]]--
 function SuperVillain:VersionCheck()
-	if(not SVUI_Profile.SAFEDATA.install_version or (SVUI_Profile.SAFEDATA.install_version and type(SVUI_Profile.SAFEDATA.install_version) == "number" and (tonumber(SVUI_Profile.SAFEDATA.install_version) < minimumVersion))) then
-		if(SVUI_Profile.SAFEDATA.install_complete and type(SVUI_Profile.SAFEDATA.install_complete) == "number" and (tonumber(SVUI_Profile.SAFEDATA.install_complete) >= minimumVersion)) then
-			SVUI_Profile.SAFEDATA.install_version = self.version
-			SVUI_Profile.SAFEDATA.install_complete = nil
-		else
-			self:Install()
-		end
+	local minimumVersion = 4.06;
+	if(not SVUI_Profile.SAFEDATA.install_version or (SVUI_Profile.SAFEDATA.install_version and (tonumber(SVUI_Profile.SAFEDATA.install_version) < minimumVersion))) then
+		self:Install(true)
 	end
 end

@@ -344,6 +339,7 @@ local function PreLoad(self)

     if not SVUI_Profile then SVUI_Profile = {} end
     if not SVUI_Profile.SAFEDATA then SVUI_Profile.SAFEDATA = {} end
+    if(SVUI_Profile.SAFEDATA.install_complete) then SVUI_Profile.SAFEDATA.install_complete = nil end

     if SVUI_Filters then SVUI_Filters = nil end
     if not SVUI_AuraFilters then SVUI_AuraFilters = {} end
@@ -406,7 +402,7 @@ local function FullLoad(self)
 	_G["SVUI_Mentalo"]:SetFixedPanelTemplate("Component")
 	_G["SVUI_Mentalo"]:SetPanelColor("yellow")
 	_G["SVUI_MentaloPrecision"]:SetPanelTemplate("Transparent")
-
+
 	Consuela:RegisterAllEvents()
 	Consuela:SetScript("OnEvent", function(self, event)
 		LemonPledge = LemonPledge  +  1
diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
index 4d1cdfd..915d008 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
@@ -130,9 +130,12 @@ function MOD:SaveAddonStyle(addon, fn, force, passive, ...)
 	end
 end;

-function MOD:SaveBlizzardStyle(addon, fn, force, passive)
+function MOD:SaveBlizzardStyle(addon, fn, force, passive, preload)
 	if passive then MOD.PassiveAddons[addon] = true end;
 	if force then
+		if(preload and not IsAddOnLoaded(addon)) then
+			LoadAddOn(addon)
+		end
 		fn()
 		MOD.BlizzardQueue[addon] = nil
 	else
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua
index 046d3ec..170396d 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua
@@ -20,8 +20,14 @@ local MOD = SuperVillain.Registry:Expose("SVStyle");
 ARCHEOLOGYFRAME STYLER
 ##########################################################
 ]]--
+--240 24
+local progressBarHolder = CreateFrame("Frame", nil)
+progressBarHolder:SetSize(240, 24)
+progressBarHolder:SetPoint("BOTTOM", CastingBarFrame, "TOP", 0, 10)
+SuperVillain:SetSVMovable(progressBarHolder, "ArcheologyProgressBar_MOVE", "Archeology Progress Bar")
+
 local function ArchaeologyStyle()
-	if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.archaeology ~= true then return end;ArchaeologyFrame:Formula409()
+	if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.archaeology ~= true then return end ArchaeologyFrame:Formula409()
 	ArchaeologyFrameInset:Formula409()
 	ArchaeologyFrame:SetPanelTemplate("Transparent")
 	ArchaeologyFrame.Panel:SetAllPoints()
@@ -54,7 +60,7 @@ local function ArchaeologyStyle()
 			_G["ArchaeologyFrameCompletedPageArtifact"..b.."Icon"].backdrop:SetFrameLevel(c:GetFrameLevel()-2)
 			_G["ArchaeologyFrameCompletedPageArtifact"..b.."Icon"]:SetDrawLayer("OVERLAY")
 		end
-	end;
+	end
 	ArchaeologyFrameArtifactPageIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
 	ArchaeologyFrameArtifactPageIcon.backdrop = CreateFrame("Frame", nil, ArchaeologyFrameArtifactPage)
 	ArchaeologyFrameArtifactPageIcon.backdrop:SetFixedPanelTemplate("Default")
@@ -63,11 +69,9 @@ local function ArchaeologyStyle()
 	ArchaeologyFrameArtifactPageIcon:SetParent(ArchaeologyFrameArtifactPageIcon.backdrop)
 	ArchaeologyFrameArtifactPageIcon:SetDrawLayer("OVERLAY")
 	MOD:ApplyCloseButtonStyle(ArchaeologyFrameCloseButton)
-	-- ArcheologyDigsiteProgressBar:Formula409()
-	-- ArcheologyDigsiteProgressBar.BarBackground:SetTexture([[Interface\Archeology\ArcheologyToast]])
-	-- ArcheologyDigsiteProgressBar.BarBorderAndOverlay:SetTexture([[Interface\Archeology\ArcheologyToast]])
-	SuperVillain:SetSVMovable(ArcheologyDigsiteProgressBar, "ArcheologyProgressBar_MOVE", "Archeology Progress Bar")
-end;
+	ArcheologyDigsiteProgressBar:SetAllPoints(progressBarHolder)
+	progressBarHolder:SetParent(ArcheologyDigsiteProgressBar)
+end
 --[[
 ##########################################################
 STYLE LOADING
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua
index a105e8f..e9a05a0 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua
@@ -20,7 +20,8 @@ local MOD = SuperVillain.Registry:Expose("SVStyle");
 PVP STYLER
 ##########################################################
 ]]--
-LoadAddOn("Blizzard_PVPUI")
+-- LoadAddOn("Blizzard_PVPUI")
+
 local function PVPFrameStyle()
 	if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.pvp ~= true then
 		return
@@ -138,8 +139,6 @@ local function PVPFrameStyle()
 		if P == "ARENA" then
 			self:SetHeight(100)
 		end
-		self:Formula409()
-		self:SetPanelTemplate("Pattern")
 	end)
 end;
 --[[
@@ -147,6 +146,6 @@ end;
 STYLE LOADING
 ##########################################################
 ]]--
-MOD:SaveBlizzardStyle('Blizzard_PVPUI',PVPFrameStyle, true)
+MOD:SaveBlizzardStyle('Blizzard_PVPUI', PVPFrameStyle, true, nil, true)

 -- /script StaticPopupSpecial_Show(PVPReadyDialog)
\ No newline at end of file