From ed166ea72020ff07e6cda82a340ba9efd89cb07a Mon Sep 17 00:00:00 2001
From: Steven Jackson <failcoder@gmail.com>
Date: Sun, 7 Sep 2014 17:54:22 -0500
Subject: [PATCH] other odds n ends i missed

---
 Interface/AddOns/SVUI/packages/dock/SVDock.lua     |    2 +-
 Interface/AddOns/SVUI/scripts/mounts.lua           |   17 +-
 Interface/AddOns/SVUI/system/installer.lua         |   10 +-
 .../SVUI_AnsweringService.lua                      |    7 +-
 .../SVUI_ConfigOMatic/modules/units/_load.xml      |    1 +
 .../SVUI_ConfigOMatic/modules/units/core.lua       |   60 +------
 .../SVUI_ConfigOMatic/modules/units/grid.lua       |  172 ++++++++++++++++++++
 .../SVUI_ConfigOMatic/modules/units/party.lua      |   24 ---
 .../SVUI_ConfigOMatic/modules/units/raid.lua       |   28 +---
 .../SVUI_ConfigOMatic/modules/units/target.lua     |    8 +-
 .../AddOns/SVUI_StyleOMatic/addons/petbattle.lua   |    7 +-
 .../AddOns/SVUI_StyleOMatic/addons/petjournal.lua  |    5 +-
 12 files changed, 216 insertions(+), 125 deletions(-)
 create mode 100644 Interface/AddOns/SVUI_ConfigOMatic/modules/units/grid.lua

diff --git a/Interface/AddOns/SVUI/packages/dock/SVDock.lua b/Interface/AddOns/SVUI/packages/dock/SVDock.lua
index a54747f..282815b 100644
--- a/Interface/AddOns/SVUI/packages/dock/SVDock.lua
+++ b/Interface/AddOns/SVUI/packages/dock/SVDock.lua
@@ -559,7 +559,7 @@ function MOD:CreateDockPanels()
 	local bottomanchor = CreateFrame("Frame", "SuperDockBottomDataAnchor", SuperVillain.UIParent)
 	bottomanchor:Size(statBarWidth - 2, buttonsize - 8)
 	bottomanchor:Point("BOTTOM", SuperVillain.UIParent, "BOTTOM", 0, 2)
-	SuperVillain:AddToDisplayAudit(bottomanchor)
+	--SuperVillain:AddToDisplayAudit(bottomanchor)
 
 	local bottomleftdata = CreateFrame("Frame", "BottomLeftDataPanel", bottomanchor)
 	bottomleftdata:Size((statBarWidth * 0.5) - 1, buttonsize - 8)
diff --git a/Interface/AddOns/SVUI/scripts/mounts.lua b/Interface/AddOns/SVUI/scripts/mounts.lua
index 0016565..20945b1 100644
--- a/Interface/AddOns/SVUI/scripts/mounts.lua
+++ b/Interface/AddOns/SVUI/scripts/mounts.lua
@@ -247,11 +247,14 @@ local function SetMountCheckButtons()
 				["SPECIAL"] = ""
 			}	
 		} 
-	end 
+	end
+
 	UpdateMountCache()
+
 	local scrollFrame = MountJournal.ListScrollFrame;
 	local scrollBar = _G["MountJournalListScrollFrameScrollBar"]
     local buttons = scrollFrame.buttons;
+
 	for i = 1, #buttons do
 		local button = buttons[i]
 		local barWidth = button:GetWidth()
@@ -262,11 +265,9 @@ local function SetMountCheckButtons()
 		local buttonBar = CreateFrame("Frame", barName, button)
 		buttonBar:SetPoint("BOTTOMLEFT", button, "BOTTOMLEFT", 0, 0)
 		buttonBar:SetSize(barWidth, height + 8)
-		buttonBar:SetFrameStrata("HIGH")
-		buttonBar:SetFrameLevel(99)
 
 		--[[ CREATE CHECKBOXES ]]--
-		buttonBar["GROUND"] = CreateFrame("CheckButton", nil, buttonBar, "UICheckButtonTemplate")
+		buttonBar["GROUND"] = CreateFrame("CheckButton", ("%s_GROUND"):format(barName), buttonBar, "UICheckButtonTemplate")
 		buttonBar["GROUND"]:SetSize(width,height)
 		buttonBar["GROUND"]:SetPoint("BOTTOMLEFT", buttonBar, "BOTTOMLEFT", 6, 4)
 		buttonBar["GROUND"]:Formula409()
@@ -283,7 +284,7 @@ local function SetMountCheckButtons()
 		buttonBar["GROUND"]:SetScript("OnEnter", CheckButton_OnEnter)
 		buttonBar["GROUND"]:SetScript("OnLeave", CheckButton_OnLeave)
 
-	    buttonBar["FLYING"] = CreateFrame("CheckButton", nil, buttonBar, "UICheckButtonTemplate")
+	    buttonBar["FLYING"] = CreateFrame("CheckButton", ("%s_FLYING"):format(barName), buttonBar, "UICheckButtonTemplate")
 		buttonBar["FLYING"]:SetSize(width,height)
 		buttonBar["FLYING"]:SetPoint("BOTTOMLEFT", buttonBar["GROUND"], "BOTTOMRIGHT", 2, 0)
 		buttonBar["FLYING"]:Formula409()
@@ -300,7 +301,7 @@ local function SetMountCheckButtons()
 		buttonBar["FLYING"]:SetScript("OnEnter", CheckButton_OnEnter)
 		buttonBar["FLYING"]:SetScript("OnLeave", CheckButton_OnLeave)
 
-	    buttonBar["SWIMMING"] = CreateFrame("CheckButton", nil, buttonBar, "UICheckButtonTemplate")
+	    buttonBar["SWIMMING"] = CreateFrame("CheckButton", ("%s_SWIMMING"):format(barName), buttonBar, "UICheckButtonTemplate")
 		buttonBar["SWIMMING"]:SetSize(width,height)
 		buttonBar["SWIMMING"]:SetPoint("BOTTOMLEFT", buttonBar["FLYING"], "BOTTOMRIGHT", 2, 0)
 		buttonBar["SWIMMING"]:Formula409()
@@ -317,7 +318,7 @@ local function SetMountCheckButtons()
 		buttonBar["SWIMMING"]:SetScript("OnEnter", CheckButton_OnEnter)
 		buttonBar["SWIMMING"]:SetScript("OnLeave", CheckButton_OnLeave)
 
-		buttonBar["SPECIAL"] = CreateFrame("CheckButton", nil, buttonBar, "UICheckButtonTemplate")
+		buttonBar["SPECIAL"] = CreateFrame("CheckButton", ("%s_SPECIAL"):format(barName), buttonBar, "UICheckButtonTemplate")
 		buttonBar["SPECIAL"]:SetSize(width,height)
 		buttonBar["SPECIAL"]:SetPoint("BOTTOMLEFT", buttonBar["SWIMMING"], "BOTTOMRIGHT", 2, 0)
 		buttonBar["SPECIAL"]:Formula409()
@@ -383,7 +384,7 @@ function SVUILetsRide()
 	if(IsSwimming() and IbelieveIcantFly and not letsSeahorse) then
 		letsSwim = true
 	end
-	if(IsControlKeyDown() or IsShiftKeyDown()) then
+	if(IsModifierKeyDown()) then
 		if(checkList["SPECIAL"]) then
 			CallCompanion("MOUNT", checkList["SPECIAL"])
 			return
diff --git a/Interface/AddOns/SVUI/system/installer.lua b/Interface/AddOns/SVUI/system/installer.lua
index 360e907..f505822 100644
--- a/Interface/AddOns/SVUI/system/installer.lua
+++ b/Interface/AddOns/SVUI/system/installer.lua
@@ -79,7 +79,7 @@ local function forceCVars()
 end
 
 local function ShowLayout(show40)
-	if(show40 and _G["SVUI_Raid40"].forceShow == true) then return end
+	if(not _G["SVUI_Raid40"] or (show40 and _G["SVUI_Raid40"].forceShow == true)) then return end
 	if(not show40 and _G["SVUI_Raid40"].forceShow ~= true) then return end
 	SuperVillain.SVUnit:UpdateGroupConfig(_G["SVUI_Raid40"], show40)
 end
@@ -112,8 +112,8 @@ local function UFMoveBottomQuadrant(toggle)
 		SuperVillain.db.framelocations.SVUI_PlayerCastbar_MOVE = "BOTTOMSVUIParentBOTTOM-278122"
 		SuperVillain.db.framelocations.SVUI_Target_MOVE = "BOTTOMSVUIParentBOTTOM278182"
 		SuperVillain.db.framelocations.SVUI_TargetCastbar_MOVE = "BOTTOMSVUIParentBOTTOM278122"
-		SuperVillain.db.framelocations.SVUI_Pet_MOVE = "BOTTOMSVUIParentBOTTOM0182"
-		SuperVillain.db.framelocations.SVUI_TargetTarget_MOVE = "BOTTOMSVUIParentBOTTOM0225"
+		SuperVillain.db.framelocations.SVUI_Pet_MOVE = "BOTTOMSVUIParentBOTTOM0181"
+		SuperVillain.db.framelocations.SVUI_TargetTarget_MOVE = "BOTTOMSVUIParentBOTTOM0214"
 		SuperVillain.db.framelocations.SVUI_Focus_MOVE = "BOTTOMSVUIParentBOTTOM310432"
 		SuperVillain.db.framelocations.SVUI_ThreatBar_MOVE = "BOTTOMRIGHTSVUIParentBOTTOMRIGHT-495182"
 	elseif toggle == "shift" then
@@ -121,8 +121,8 @@ local function UFMoveBottomQuadrant(toggle)
 		SuperVillain.db.framelocations.SVUI_PlayerCastbar_MOVE = "BOTTOMSVUIParentBOTTOM-278150"
 		SuperVillain.db.framelocations.SVUI_Target_MOVE = "BOTTOMSVUIParentBOTTOM278210"
 		SuperVillain.db.framelocations.SVUI_TargetCastbar_MOVE = "BOTTOMSVUIParentBOTTOM278150"
-		SuperVillain.db.framelocations.SVUI_Pet_MOVE = "BOTTOMSVUIParentBOTTOM0210"
-		SuperVillain.db.framelocations.SVUI_TargetTarget_MOVE = "BOTTOMSVUIParentBOTTOM0253"
+		SuperVillain.db.framelocations.SVUI_Pet_MOVE = "BOTTOMSVUIParentBOTTOM0209"
+		SuperVillain.db.framelocations.SVUI_TargetTarget_MOVE = "BOTTOMSVUIParentBOTTOM0242"
 		SuperVillain.db.framelocations.SVUI_Focus_MOVE = "BOTTOMSVUIParentBOTTOM310432"
 		SuperVillain.db.framelocations.SVUI_ThreatBar_MOVE = "BOTTOMRIGHTSVUIParentBOTTOMRIGHT-495210"
 	else
diff --git a/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua b/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua
index 6170d1c..48a2531 100644
--- a/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua
+++ b/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua
@@ -815,13 +815,13 @@ function PLUGIN:PhoneTimeUpdate()
 	end
 end
 
-function PLUGIN:CHAT_MSG_IGNORED(inbound_message, caller, ...)
+function PLUGIN:CHAT_MSG_IGNORED(event, inbound_message, caller, ...)
 	if(PhoneLines[caller] and PhoneLines[caller].InUse) then
 		self:HangUp(caller,true)
 	end
 end
 
-function PLUGIN:CHAT_MSG_WHISPER(inbound_message, caller)
+function PLUGIN:CHAT_MSG_WHISPER(event, inbound_message, caller)
 	if not UnitIsAFK("player") and not UnitIsDND("player") then
 		if (not PhoneLines[caller]) then
 			self:AddCaller(caller)
@@ -830,7 +830,8 @@ function PLUGIN:CHAT_MSG_WHISPER(inbound_message, caller)
 	end
 end
 
-function PLUGIN:CHAT_MSG_BN_WHISPER(inbound_message, sender, _, _, _, _, _, _, _, _, _, _, presenceID)
+function PLUGIN:CHAT_MSG_BN_WHISPER(event, inbound_message, sender, _, _, _, _, _, _, _, _, _, _, presenceID)
+	if(not presenceID) then return end
 	if not UnitIsAFK("player") and not UnitIsDND("player") then
 		local _, bnToon = BNGetToonInfo(presenceID);
 		local caller = bnToon or sender;
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/_load.xml b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/_load.xml
index 6c99aea..e835fb5 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/_load.xml
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/_load.xml
@@ -7,4 +7,5 @@
 	<Script file='party.lua'/>
 	<Script file='raid.lua'/>
 	<Script file='other.lua'/>
+	<Script file='grid.lua'/>
 </Ui>
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua
index 5acdbc1..4c908b0 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua
@@ -1545,61 +1545,9 @@ SuperVillain.Options.args.SVUnit = {
 							end
 						},
 					}
-				},
-				gridGroup = {
-					order = 2, 
-					type = "group", 
-					guiInline = true, 
-					name = L["Grid Mode"], 
-					args = {
-						enable = {
-							order = 1, 
-							name = L["Enable Grid Mode"], 
-							desc = L["Converts party, party pet, raid, raid pet, tank and assist frames into symmetrical squares. Ideal for healers."], 
-							type = "toggle", 
-							get = function(key)
-								return SuperVillain.db.SVUnit.grid.enable 
-							end, 
-							set = function(key, value)
-								MOD:ChangeDBVar(value, "enable", "grid");
-								MOD:RefreshUnitFrames();
-							end
-						},
-						shownames = {
-							order = 2, 
-							name = L["Show Grid Names"], 
-							desc = L["Grid frames will show name texts."],
-							type = "toggle", 
-							get = function(key)
-								return SuperVillain.db.SVUnit.grid.shownames 
-							end, 
-							set = function(key, value)
-								if(SuperVillain.db.SVUnit.grid.size < 30) then MOD:ChangeDBVar(30, "size", "grid"); end
-								MOD:ChangeDBVar(value, "shownames", "grid");
-								MOD:RefreshUnitFrames();
-							end
-						},
-						size = {
-							order = 3, 
-							name = L["Grid Size"], 
-							desc = L["The universal size of grid squares."], 
-							type = "range", 
-							min = 10, 
-							max = 70, 
-							step = 1, 
-							width = "full",
-							get = function(key)
-								return SuperVillain.db.SVUnit.grid.size 
-							end, 
-							set = function(key, value)
-								MOD:ChangeDBVar(value, "size", "grid");
-								MOD:RefreshUnitFrames();
-							end
-						},
-					}
 				}, 
 				backgroundGroup = {
-					order = 3, 
+					order = 2, 
 					type = "group", 
 					guiInline = true, 
 					name = "Unit Backgrounds (3D Portraits Only)", 
@@ -1628,7 +1576,7 @@ SuperVillain.Options.args.SVUnit = {
 					}
 				}, 
 				barGroup = {
-					order = 4, 
+					order = 3, 
 					type = "group", 
 					guiInline = true, 
 					name = L["Bars"],
@@ -1665,7 +1613,7 @@ SuperVillain.Options.args.SVUnit = {
 					}
 				},
 				fontGroup = {
-					order = 5, 
+					order = 4, 
 					type = "group", 
 					guiInline = true, 
 					name = L["Fonts"],
@@ -1741,7 +1689,7 @@ SuperVillain.Options.args.SVUnit = {
 					}
 				},
 				allColorsGroup = {
-					order = 6, 
+					order = 5, 
 					type = "group", 
 					guiInline = true, 
 					name = L["Colors"],
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/grid.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/grid.lua
new file mode 100644
index 0000000..30c636d
--- /dev/null
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/grid.lua
@@ -0,0 +1,172 @@
+--[[
+##############################################################################
+_____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_       #
+ ___/\\\/////////\\\_\/\\\_______\/\\\_\/\\\_______\/\\\_\/////\\\///__      #
+  __\//\\\______\///__\//\\\______/\\\__\/\\\_______\/\\\_____\/\\\_____     #
+   ___\////\\\__________\//\\\____/\\\___\/\\\_______\/\\\_____\/\\\_____    #
+    ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____   #
+     _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____  #
+      __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ #
+       _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_#
+        ___\///////////___________\///___________\/////////_____\///////////_#
+##############################################################################
+S U P E R - V I L L A I N - U I   By: Munglunch                              #
+##############################################################################
+########################################################## 
+LOCALIZED LUA FUNCTIONS
+##########################################################
+]]--
+--[[ GLOBALS ]]--
+local _G = _G;
+local unpack 	 =  _G.unpack;
+local pairs 	 =  _G.pairs;
+local tinsert 	 =  _G.tinsert;
+local table 	 =  _G.table;
+--[[ TABLE METHODS ]]--
+local tsort = table.sort;
+--[[ 
+########################################################## 
+GET ADDON DATA
+##########################################################
+]]--
+local SuperVillain, L = unpack(SVUI);
+local MOD = SuperVillain.SVUnit
+if(not MOD) then return end 
+local _, ns = ...
+--[[
+##################################################################################################
+##################################################################################################
+##################################################################################################
+]]
+SuperVillain.Options.args.SVUnit.args.grid = {
+	name = L["Grid Frames"], 
+	type = "group", 
+	order = 1200, 
+	childGroups = "tab", 
+	args = {
+		configureToggle = {
+			order = 1, 
+			type = "execute", 
+			name = L["Display Frames"], 
+			func = function()MOD:UpdateGroupConfig(_G["SVUI_Raid40"], _G["SVUI_Raid40"].forceShow ~= true or nil)end, 
+		},
+		gridCommon = {
+			order = 2, 
+			type = "group", 
+			guiInline = true, 
+			name = L["General Settings"],
+			get = function(key)
+				return SuperVillain.db.SVUnit.grid[key[#key]] 
+			end, 
+			set = function(key, value)
+				MOD:ChangeDBVar(value, key[#key] , "grid");
+				MOD:RefreshUnitFrames();
+			end,
+			args = {
+				enable = {
+					order = 1, 
+					name = L["Enable Grid Mode"], 
+					desc = L["Converts party, party pet, raid, raid pet, tank and assist frames into symmetrical squares. Ideal for healers."], 
+					type = "toggle"
+				},
+				shownames = {
+					order = 2, 
+					name = L["Show Grid Names"], 
+					desc = L["Grid frames will show name texts."],
+					type = "toggle",
+					set = function(key, value)
+						if(SuperVillain.db.SVUnit.grid.size < 30) then MOD:ChangeDBVar(30, "size", "grid"); end
+						MOD:ChangeDBVar(value, "shownames", "grid");
+						MOD:RefreshUnitFrames();
+					end
+				},
+				size = {
+					order = 3, 
+					name = L["Grid Size"], 
+					desc = L["The universal size of grid squares."], 
+					type = "range", 
+					min = 10, 
+					max = 70, 
+					step = 1, 
+					width = "full"
+				},
+			}
+		},
+		gridAllowed = {
+			order = 3, 
+			type = "group", 
+			guiInline = true, 
+			name = L["Allowed Frames"],
+			get = function(key)
+				return SuperVillain.db.SVUnit.grid[key[#key]] 
+			end, 
+			set = function(key, value)
+				MOD:ChangeDBVar(value, key[#key] , "grid");
+				MOD:RefreshUnitFrames();
+			end,
+			args = {
+				party = {
+					type = 'toggle',
+					order = 1,
+					name = L['Party Grid'],
+					desc = L['If grid-mode is enabled, these units will be changed.'],
+					get = function(key) return SuperVillain.db.SVUnit.party.gridAllowed end,
+					set = function(key, value) SuperVillain.db.SVUnit.party.gridAllowed = value; MOD:SetGroupFrame("party") end,
+				},
+				partypets = {
+					type = 'toggle',
+					order = 2,
+					name = L['Party Pets Grid'],
+					desc = L['If grid-mode is enabled, these units will be changed.'],
+					get = function(key) return SuperVillain.db.SVUnit.party.petsGroup.gridAllowed end,
+					set = function(key, value) SuperVillain.db.SVUnit.party.petsGroup.gridAllowed = value; MOD:SetGroupFrame("party") end,
+				},
+				partytargets = {
+					type = 'toggle',
+					order = 3,
+					name = L['Party Targets Grid'],
+					desc = L['If grid-mode is enabled, these units will be changed.'],
+					get = function(key) return SuperVillain.db.SVUnit.party.targetsGroup.gridAllowed end,
+					set = function(key, value) SuperVillain.db.SVUnit.party.targetsGroup.gridAllowed = value; MOD:SetGroupFrame("party") end,
+				},
+				raid10 = {
+					type = 'toggle',
+					order = 4,
+					name = L['Raid 10 Grid'],
+					desc = L['If grid-mode is enabled, these units will be changed.'],
+					get = function(key) return SuperVillain.db.SVUnit.raid10.gridAllowed end,
+					set = function(key, value) SuperVillain.db.SVUnit.raid10.gridAllowed = value; MOD:SetGroupFrame("raid10") end,
+				},
+				raid25 = {
+					type = 'toggle',
+					order = 5,
+					name = L['Raid 25 Grid'],
+					desc = L['If grid-mode is enabled, these units will be changed.'],
+					get = function(key) return SuperVillain.db.SVUnit.raid25.gridAllowed end,
+					set = function(key, value) SuperVillain.db.SVUnit.raid25.gridAllowed = value; MOD:SetGroupFrame("raid25") end,
+				},
+				raid40 = {
+					type = 'toggle',
+					order = 6,
+					name = L['Raid 40 Grid'],
+					desc = L['If grid-mode is enabled, these units will be changed.'],
+					get = function(key) return SuperVillain.db.SVUnit.raid40.gridAllowed end,
+					set = function(key, value) SuperVillain.db.SVUnit.raid40.gridAllowed = value; MOD:SetGroupFrame("raid40") end,
+				},
+				raidpet = {
+					type = 'toggle',
+					order = 4,
+					name = L['Raid Pet Grid'],
+					desc = L['If grid-mode is enabled, these units will be changed.'],
+					get = function(key) return SuperVillain.db.SVUnit.raidpet.gridAllowed end,
+					set = function(key, value) SuperVillain.db.SVUnit.raidpet.gridAllowed = value; MOD:SetGroupFrame("raidpet") end,
+				},
+			}
+		},
+	}
+}
+--[[
+##################################################################################################
+##################################################################################################
+##################################################################################################
+]]
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/party.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/party.lua
index e3e5bdd..fbf36ec 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/party.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/party.lua
@@ -73,14 +73,6 @@ SuperVillain.Options.args.SVUnit.args.party = {
 					type = 'group',
 					name = L['General'],
 					args = {
-						gridAllowed = {
-							type = 'toggle',
-							order = 1,
-							name = L['Grid Mode Allowed'],
-							desc = L['If grid-mode is enabled, these units will be changed.'],
-							get = function(l)return SuperVillain.db.SVUnit['party'].gridAllowed end,
-							set = function(l, m) SuperVillain.db.SVUnit['party'].gridAllowed = m; MOD:SetGroupFrame('party') end,
-						},
 						hideonnpc = {
 							type = 'toggle',
 							order = 2,
@@ -356,14 +348,6 @@ SuperVillain.Options.args.SVUnit.args.party = {
 							name = L['Enable'],
 							order = 1,
 						},
-						gridAllowed = {
-							type = 'toggle',
-							order = 2,
-							name = L['Grid Mode Allowed'],
-							desc = L['If grid-mode is enabled, these units will be changed.'],
-							get = function(l)return SuperVillain.db.SVUnit['party']['petsGroup'].gridAllowed end,
-							set = function(l, m) SuperVillain.db.SVUnit['party']['petsGroup'].gridAllowed = m; MOD:SetGroupFrame('party') end,
-						},
 						width = {
 							order = 3,
 							name = L['Width'],
@@ -435,14 +419,6 @@ SuperVillain.Options.args.SVUnit.args.party = {
 							name = L['Enable'],
 							order = 1,
 						},
-						gridAllowed = {
-							type = 'toggle',
-							order = 2,
-							name = L['Grid Mode Allowed'],
-							desc = L['If grid-mode is enabled, these units will be changed.'],
-							get = function(l)return SuperVillain.db.SVUnit['party']['targetsGroup'].gridAllowed end,
-							set = function(l, m) SuperVillain.db.SVUnit['party']['targetsGroup'].gridAllowed = m; MOD:SetGroupFrame('party') end,
-						},
 						width = {
 							order = 3,
 							name = L['Width'],
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/raid.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/raid.lua
index 8b2ba25..7fa0f8c 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/raid.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/raid.lua
@@ -74,48 +74,40 @@ for w=10,40,15 do
 						type = "group", 
 						name = L["General Settings"], 
 						args = {
-							gridAllowed = {
-								type = 'toggle',
-								order = 1,
-								name = L['Grid Mode Allowed'],
-								desc = L['If grid-mode is enabled, these units will be changed.'],
-								get = function(l)return SuperVillain.db.SVUnit["raid" .. w].gridAllowed end,
-								set = function(l, m) SuperVillain.db.SVUnit["raid" .. w].gridAllowed = m; MOD:SetGroupFrame("raid" .. w) end,
-							},
 							hideonnpc = 
 							{
 								type = "toggle", 
-								order = 2, 
+								order = 1, 
 								name = L["Text Toggle On NPC"], 
 								desc = L["Power text will be hidden on NPC targets, in addition the name text will be repositioned to the power texts anchor point."], 
 								get = function(l)return SuperVillain.db.SVUnit["raid" .. w]["power"].hideonnpc end, 
 								set = function(l, m)SuperVillain.db.SVUnit["raid" .. w]["power"].hideonnpc = m;MOD:SetGroupFrame("raid" .. w)end, 
 							},
 							rangeCheck = {
-								order = 3, 
+								order = 2, 
 								name = L["Range Check"], 
 								desc = L["Check if you are in range to cast spells on this specific unit."], 
 								type = "toggle", 
 							},
 							gps = {
-								order = 4, 
+								order = 3, 
 								name = "GPS Tracking", 
 								desc = "Show an arrow giving the direction and distance to the frames unit.", 
 								type = "toggle", 
 							}, 
 							predict = {
-								order = 5, 
+								order = 4, 
 								name = L["Heal Prediction"], 
 								desc = L["Show a incomming heal prediction bar on the unitframe. Also display a slightly different colored bar for incoming overheals."], 
 								type = "toggle", 
 							}, 
 							threatEnabled = {
 								type = "toggle", 
-								order = 6, 
+								order = 5, 
 								name = L["Show Threat"], 
 							}, 
 							colorOverride = {
-								order = 7, 
+								order = 6, 
 								name = L["Class Color Override"], 
 								desc = L["Override the default class color setting."], 
 								type = "select", 
@@ -467,14 +459,6 @@ SuperVillain.Options.args.SVUnit.args.raidpet ={
 					type='group',
 					name=L['General Settings'],
 					args={
-						gridAllowed = {
-							type = 'toggle',
-							order = 1,
-							name = L['Grid Mode Allowed'],
-							desc = L['If grid-mode is enabled, these units will be changed.'],
-							get = function(l)return SuperVillain.db.SVUnit["raidpet"].gridAllowed end,
-							set = function(l, m) SuperVillain.db.SVUnit["raidpet"].gridAllowed = m; MOD:SetGroupFrame("raidpet") end,
-						},
 						rangeCheck ={
 							order = 3,
 							name = L["Range Check"],
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/target.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/target.lua
index afdc215..f311a2b 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/target.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/target.lua
@@ -39,10 +39,10 @@ local _, ns = ...
 ##################################################################################################
 ]]
 SuperVillain.Options.args.SVUnit.args.target={
-	name=L['Target Frame'],
-	type='group',
-	order=6,
-	childGroups="tab",
+	name = L['Target Frame'],
+	type = 'group',
+	order = 6,
+	childGroups = "tab",
 	get=function(l)return SuperVillain.db.SVUnit['target'][l[#l]]end,
 	set=function(l,m)MOD:ChangeDBVar(m, l[#l], "target");MOD:SetUnitFrame('target')end,
 	args={
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua
index 8155c19..15012ad 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua
@@ -167,7 +167,12 @@ local function PetBattleStyle()
 	PetBattleActionBar:SetFrameLevel(0)
 	PetBattleActionBar:SetFrameStrata('BACKGROUND')
 	PetBattleActionBar:SetFixedPanelTemplate("Inset")
-	PetBattleActionBar:SetPoint("BOTTOM", SuperVillain.UIParent, "BOTTOM", 0, 4)
+
+	if(SuperDockBottomDataAnchor) then
+		PetBattleActionBar:SetPoint("BOTTOM", SuperDockBottomDataAnchor, "TOP", 0, 4)
+	else
+		PetBattleActionBar:SetPoint("BOTTOM", SuperVillain.UIParent, "BOTTOM", 0, 4)
+	end
 
 	PetBattleFrame.TopVersusText:ClearAllPoints()
 	PetBattleFrame.TopVersusText:SetPoint("TOP", PetBattleFrame, "TOP", 0, -42)
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua
index ae7cda6..901947b 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua
@@ -106,13 +106,16 @@ local function PetJournalStyle()
 	MountJournalSearchBox:SetEditboxTemplate()
 	STYLE:ApplyScrollFrameStyle(MountJournalListScrollFrameScrollBar)
 	MountJournal.MountDisplay:SetFixedPanelTemplate("Comic")
+
 	for i = 1, #MountJournal.ListScrollFrame.buttons do
 		local button = _G["MountJournalListScrollFrameButton"..i]
-
 		if(button) then
 			STYLE:ApplyItemButtonStyle(button, nil, true, true)
+			local bar = _G["SVUI_MountSelectBar"..i]
+			if(bar) then bar:SetParent(button.Panel) end
 		end
 	end
+
 	hooksecurefunc("MountJournal_UpdateMountList", PetJournal_UpdateMounts)
 	MountJournalListScrollFrame:HookScript("OnVerticalScroll", PetJournal_UpdateMounts)
 	MountJournalListScrollFrame:HookScript("OnMouseWheel", PetJournal_UpdateMounts)
-- 
1.7.9.5