5.4.1899x

diff --git a/Interface/AddOns/SVUI/packages/bar/SVBar.lua b/Interface/AddOns/SVUI/packages/bar/SVBar.lua
index 5f47038..f6a3f87 100644
--- a/Interface/AddOns/SVUI/packages/bar/SVBar.lua
+++ b/Interface/AddOns/SVUI/packages/bar/SVBar.lua
@@ -1244,7 +1244,7 @@ end

 local CreateExtraBar = function(self)
 	local specialBar = CreateFrame("Frame", "SVUI_SpecialAbility", SV.Screen)
-	specialBar:SetPointToScale("BOTTOM", SV.Screen, "BOTTOM", 0, 250)
+	specialBar:SetPointToScale("BOTTOM", SV.Screen, "BOTTOM", 0, 360)
 	specialBar:SetSizeToScale(ExtraActionBarFrame:GetSize())
 	ExtraActionBarFrame:SetParent(specialBar)
 	ExtraActionBarFrame:ClearAllPoints()
diff --git a/Interface/AddOns/SVUI/packages/bar/SVBar.xml b/Interface/AddOns/SVUI/packages/bar/SVBar.xml
index c55ea29..3d40549 100644
--- a/Interface/AddOns/SVUI/packages/bar/SVBar.xml
+++ b/Interface/AddOns/SVUI/packages/bar/SVBar.xml
@@ -1,8 +1,8 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/">
 	<Frame name="SVUI_DraenorButtonHolder" parent="UIParent" hidden="true">
-        <Size x="64" y="64"/>
+        <Size x="50" y="50"/>
         <Anchors>
-            <Anchor point="BOTTOM" x="0" y="160"/>
+            <Anchor point="BOTTOM" x="0" y="275"/>
         </Anchors>
     </Frame>

diff --git a/Interface/AddOns/SVUI/packages/bar/components/zone.lua b/Interface/AddOns/SVUI/packages/bar/components/zone.lua
index 4a6f4b7..f2bfd58 100644
--- a/Interface/AddOns/SVUI/packages/bar/components/zone.lua
+++ b/Interface/AddOns/SVUI/packages/bar/components/zone.lua
@@ -132,19 +132,6 @@ end
 ZONE BUTTON CONSTRUCT
 ##########################################################
 ]]--
-local Button_OnShow = function(self)
-    if(self.Artwork) then
-        self.Artwork:SetTexture(self.ArtFile or NO_ART);
-        self.Artwork:FadeIn()
-    end
-end
-
-local Button_OnHide = function(self)
-    if(self.Artwork) then
-        self.Artwork:FadeOut();
-    end
-end
-
 local UpdateSpellCooldown = function(self)
     if(self:IsShown() and self.spellName) then
         local start, duration, enable = GetSpellCooldown(self.spellName)
@@ -210,7 +197,7 @@ local SetButtonSpell = function(self, spellID, spellName, texture)
         self:UpdateCooldown()
     end

-    return true
+    self:FadeIn()
 end

 local ClearButtonSpell = function(self)
@@ -240,11 +227,15 @@ function MOD:InitializeZoneButton()
     draenor.UpdateCooldown = UpdateSpellCooldown;
     draenor.Update = DraenorButtonUpdate

+    local texture = DraenorZoneAbilityFrame.SpellButton.Style:GetTexture();
+    if(SV.Allegiance == 'Horde') then
+        texture = "Interface\\ExtraButton\\GarrZoneAbility-BarracksHorde";
+    end
+
     local Artwork = draenor.Panel:CreateTexture('$parentArtwork', 'BACKGROUND')
     Artwork:SetPoint('CENTER', -2, 2)
-    Artwork:SetSizeToScale(size, size)
-    Artwork:SetTexture(NO_ART)
-    Artwork:SetAlpha(0)
+    Artwork:SetSizeToScale(size * 4.2, size * 2.1)
+    Artwork:SetTexture(texture)
     draenor.Artwork = Artwork

     local Icon = draenor:CreateTexture('$parentIcon', 'BACKGROUND')
@@ -267,9 +258,8 @@ function MOD:InitializeZoneButton()
     draenor:SetAttribute('type', 'spell');
     draenor:SetAttribute('_onattributechanged', [[
         if(name == 'spell') then
-            if(value) then
-                if(not self:IsShown()) then self:Show() end
-                self:CallMethod('FadeIn')
+            if(value and not self:IsShown()) then
+                self:Show()
             elseif(not value) then
                 self:Hide()
             end
@@ -292,11 +282,9 @@ function MOD:InitializeZoneButton()

     draenor:SetScript('OnEnter', SpellButton_OnEnter);
     draenor:SetScript('OnLeave', GameTooltip_Hide);
-    draenor:SetScript('OnShow', Button_OnShow);
-    draenor:SetScript('OnHide', Button_OnHide);
 	draenor:RegisterForDrag("LeftButton");
 	draenor:SetScript('OnDragStart', DraenorButton_OnDrag);
-	draenor:SetScript('OnEvent', DraenorButton_OnEvent)
+
 	draenor:RegisterUnitEvent("UNIT_AURA", "player");
 	draenor:RegisterEvent("SPELL_UPDATE_COOLDOWN");
 	draenor:RegisterEvent("SPELL_UPDATE_USABLE");
@@ -304,6 +292,9 @@ function MOD:InitializeZoneButton()
 	draenor:RegisterEvent("SPELLS_CHANGED");
 	draenor:RegisterEvent("ACTIONBAR_SLOT_CHANGED");
 	draenor:RegisterEvent("UPDATE_BINDINGS");
+    draenor:SetScript('OnEvent', DraenorButton_OnEvent);
+
+    SV.Mentalo:Add(draenor, L["Zone Ability Button"]);

 	DraenorZoneAbilityFrame:UnregisterAllEvents()
 end
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI/packages/override/SVOverride.lua b/Interface/AddOns/SVUI/packages/override/SVOverride.lua
index dbf1028..adf2242 100644
--- a/Interface/AddOns/SVUI/packages/override/SVOverride.lua
+++ b/Interface/AddOns/SVUI/packages/override/SVOverride.lua
@@ -176,7 +176,7 @@ function MOD:Load()
 	SVUI_BailOut:Hide()

 	LossOfControlFrame:ClearAllPoints()
-	LossOfControlFrame:SetPointToScale("CENTER", SV.Screen, "CENTER", 0, 50)
+	LossOfControlFrame:SetPointToScale("CENTER", SV.Screen, "CENTER", -146, -40)
 	SV.Mentalo:Add(LossOfControlFrame, L["Loss Control Icon"], nil, nil, "LoC")

 	self:RegisterEvent("CHAT_MSG_BG_SYSTEM_HORDE", PVPRaidNoticeHandler)
diff --git a/Interface/AddOns/SVUI/system/core.lua b/Interface/AddOns/SVUI/system/core.lua
index 05c0b0a..8801450 100644
--- a/Interface/AddOns/SVUI/system/core.lua
+++ b/Interface/AddOns/SVUI/system/core.lua
@@ -237,6 +237,7 @@ local SVUI = SVLib:NewCore("SVUI_Global", "SVUI_Errors", "SVUI_Profile", "SVUI_C

 SVUI.ConfigID           = "SVUI_ConfigOMatic";
 SVUI.class              = playerClass;
+SVUI.Allegiance         = UnitFactionGroup("player");
 SVUI.ClassRole          = "";
 SVUI.UnitRole           = "NONE";
 SVUI.ConfigurationMode  = false;