diff --git a/2/3/4/5/6/7/ElvUI/Libraries/LibElvUIPlugin-1.0/LibElvUIPlugin-1.0.lua b/2/3/4/5/6/7/ElvUI/Libraries/LibElvUIPlugin-1.0/LibElvUIPlugin-1.0.lua
index 5b9f030..23a2105 100644
--- a/2/3/4/5/6/7/ElvUI/Libraries/LibElvUIPlugin-1.0/LibElvUIPlugin-1.0.lua
+++ b/2/3/4/5/6/7/ElvUI/Libraries/LibElvUIPlugin-1.0/LibElvUIPlugin-1.0.lua
@@ -5,7 +5,7 @@ if not lib then return end
 --Cache global variables
 --Lua functions
 local pairs, tonumber = pairs, tonumber
-local format, gsub, strmatch, strsplit = format, gsub, strmatch, strsplit
+local format, gsub, strmatch, strsplit = string.format, string.gsub, string.match, string.split
 --WoW API / Variables
 local CreateFrame = CreateFrame
 local GetAddOnMetadata = GetAddOnMetadata
diff --git a/2/3/4/5/6/7/ElvUI/Libraries/LibItemSearch-1.2/CustomSearch-1.0/CustomSearch-1.0.lua b/2/3/4/5/6/7/ElvUI/Libraries/LibItemSearch-1.2/CustomSearch-1.0/CustomSearch-1.0.lua
index 56cde13..610654e 100644
--- a/2/3/4/5/6/7/ElvUI/Libraries/LibItemSearch-1.2/CustomSearch-1.0/CustomSearch-1.0.lua
+++ b/2/3/4/5/6/7/ElvUI/Libraries/LibItemSearch-1.2/CustomSearch-1.0/CustomSearch-1.0.lua
@@ -23,7 +23,7 @@ if not Lib then
 	return
 end
 
-local lower = string.lower
+local find, gmatch, lower, match = string.find, string.gmatch, string.lower, string.match
 
 --[[ Parsing ]]--
 
diff --git a/2/3/4/5/6/7/ElvUI/Libraries/LibItemSearch-1.2/LibItemSearch-1.2.lua b/2/3/4/5/6/7/ElvUI/Libraries/LibItemSearch-1.2/LibItemSearch-1.2.lua
index f1ae943..a33470f 100644
--- a/2/3/4/5/6/7/ElvUI/Libraries/LibItemSearch-1.2/LibItemSearch-1.2.lua
+++ b/2/3/4/5/6/7/ElvUI/Libraries/LibItemSearch-1.2/LibItemSearch-1.2.lua
@@ -12,25 +12,25 @@ else
 	return;
 end
 
-local strmatch, lower = string.match, string.lower
+local match, lower = string.match, string.lower
 
 --[[ User API ]]--
 
 function Lib:Matches(link, search)
-	return Search(link, search, self.Filters);
+	return Search(link, search, this.Filters);
 end
 
 function Lib:Tooltip(link, search)
-	return link and strmatch(self.Filters.tip, link, nil, search);
+	return link and match(self.Filters.tip, link, nil, search);
 end
 
 function Lib:TooltipPhrase(link, search)
-	return link and strmatch(self.Filters.tipPhrases, link, nil, search);
+	return link and match(self.Filters.tipPhrases, link, nil, search);
 end
 
 function Lib:InSet(link, search)
 	if(IsEquippableItem(link)) then
-		local id = tonumber(strmatch(link, "item:(%-?%d+)"));
+		local id = tonumber(match(link, "item:(%-?%d+)"));
 		return self:BelongsToSet(id, lower(search or ""));
 	end
 end
@@ -45,7 +45,7 @@ Lib.Filters.name = {
 	end,
 
 	match = function(self, item, _, search)
-		local name = strmatch(item, "%[(.-)%]");
+		local name = match(item, "%[(.-)%]");
 		return Search:Find(search, name);
 	end
 };
@@ -179,7 +179,7 @@ Lib.Filters.tipPhrases = {
 	end,
 
 	match = function(self, link, _, search)
-		local id = strmatch(link, "item:(%d+)");
+		local id = match(link, "item:(%d+)");
 		if(not id) then
 			return;
 		end
diff --git a/2/3/4/5/6/7/ElvUI/Modules/Bags/Bags.lua b/2/3/4/5/6/7/ElvUI/Modules/Bags/Bags.lua
index 6a03cf3..8b7a00e 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Bags/Bags.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Bags/Bags.lua
@@ -1,7 +1,7 @@
-local E, L, V, P, G = unpack(ElvUI)
-local B = E:NewModule("Bags", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0")
-local Search = LibStub("LibItemSearch-1.2")
--- local LIP = LibStub("ItemPrice-1.1", true)
+local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
+local B = E:NewModule("Bags", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0");
+local Search = LibStub("LibItemSearch-1.2");
+-- local LIP = LibStub("ItemPrice-1.1", true);
 
 --Cache global variables
 --Lua functions
@@ -9,7 +9,7 @@ local _G = _G
 local type, ipairs, pairs, unpack, select, assert = type, ipairs, pairs, unpack, select, assert
 local tinsert = table.insert
 local floor, ceil = math.floor, math.ceil
-local len, sub, find = string.len, string.sub, string.find
+local len, gsub, sub, find = string.len, string.gsub, string.sub, string.find
 --WoW API / Variables
 local BankFrameItemButton_Update = BankFrameItemButton_Update
 local BankFrameItemButton_UpdateLocked = BankFrameItemButton_UpdateLocked
diff --git a/2/3/4/5/6/7/ElvUI/Modules/Bags/Sort.lua b/2/3/4/5/6/7/ElvUI/Modules/Bags/Sort.lua
index 17758ef..e37c191 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Bags/Sort.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Bags/Sort.lua
@@ -676,7 +676,7 @@ function B:DoMove(move)
 		end
 	end
 
-	local stackSize = select(8, GetItemInfo(sourceItemID))
+	local stackSize = select(7, GetItemInfo(sourceItemID))
 	if (sourceItemID == targetItemID) and (targetCount ~= stackSize) and ((targetCount + sourceCount) > stackSize) then
 		B:SplitItem(sourceBag, sourceSlot, stackSize - targetCount)
 	else
diff --git a/2/3/4/5/6/7/ElvUI/Modules/DataTexts/AttackPower.lua b/2/3/4/5/6/7/ElvUI/Modules/DataTexts/AttackPower.lua
index 02b6d89..b932e53 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/DataTexts/AttackPower.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/DataTexts/AttackPower.lua
@@ -1,67 +1,66 @@
-local E, L, V, P, G = unpack(ElvUI);
+local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
 local DT = E:GetModule("DataTexts");
 
-local max = math.max;
+--Cache global variables
+--Lua functions
+local max = math.max
 local format, join, sub = string.format, string.join, string.sub
-
-local ComputePetBonus = ComputePetBonus;
-local UnitAttackPower = UnitAttackPower;
-local UnitRangedAttackPower = UnitRangedAttackPower;
-local ATTACK_POWER_COLON = ATTACK_POWER_COLON;
-local ATTACK_POWER_MAGIC_NUMBER = ATTACK_POWER_MAGIC_NUMBER;
-local MELEE_ATTACK_POWER = MELEE_ATTACK_POWER;
-local MELEE_ATTACK_POWER_TOOLTIP = MELEE_ATTACK_POWER_TOOLTIP;
-local PET_BONUS_TOOLTIP_RANGED_ATTACK_POWER = PET_BONUS_TOOLTIP_RANGED_ATTACK_POWER;
-local PET_BONUS_TOOLTIP_SPELLDAMAGE = PET_BONUS_TOOLTIP_SPELLDAMAGE;
-local RANGED_ATTACK_POWER = RANGED_ATTACK_POWER;
-local RANGED_ATTACK_POWER_TOOLTIP = RANGED_ATTACK_POWER_TOOLTIP;
+--WoW API / Variables
+local UnitAttackPower = UnitAttackPower
+local UnitRangedAttackPower = UnitRangedAttackPower
+local ATTACK_POWER_COLON = ATTACK_POWER_COLON
+local ATTACK_POWER_MAGIC_NUMBER = ATTACK_POWER_MAGIC_NUMBER
+local MELEE_ATTACK_POWER = MELEE_ATTACK_POWER
+local MELEE_ATTACK_POWER_TOOLTIP = MELEE_ATTACK_POWER_TOOLTIP
+local RANGED_ATTACK_POWER = RANGED_ATTACK_POWER
+local RANGED_ATTACK_POWER_TOOLTIP = RANGED_ATTACK_POWER_TOOLTIP
 local ATTACK_POWER_TOOLTIP = ATTACK_POWER_TOOLTIP
 
 local ATTACK_POWER = sub(ATTACK_POWER_COLON, 1, -2)
 
-local base, posBuff, negBuff, effective, Rbase, RposBuff, RnegBuff, Reffective, pwr;
-local displayNumberString = "";
-local lastPanel;
+local base, posBuff, negBuff, effective, Rbase, RposBuff, RnegBuff, Reffective, pwr
+local displayNumberString = ""
+local lastPanel
 
 local function OnEvent(self)
 	if(E.myclass == "HUNTER") then
-		Rbase, RposBuff, RnegBuff = UnitRangedAttackPower("player");
-		Reffective = Rbase + RposBuff + RnegBuff;
-		pwr = Reffective;
+		Rbase, RposBuff, RnegBuff = UnitRangedAttackPower("player")
+		Reffective = Rbase + RposBuff + RnegBuff
+		pwr = Reffective
 	else
-		base, posBuff, negBuff = UnitAttackPower("player");
-		effective = base + posBuff + negBuff;
-		pwr = effective;
+		base, posBuff, negBuff = UnitAttackPower("player")
+		effective = base + posBuff + negBuff
+		pwr = effective
 	end
 
-	self.text:SetText(format(displayNumberString, ATTACK_POWER, pwr));
-	lastPanel = self;
+	self.text:SetText(format(displayNumberString, ATTACK_POWER, pwr))
+	lastPanel = self
 end
 
 local function OnEnter(self)
-	DT:SetupTooltip(self);
+	DT:SetupTooltip(self)
 
 	if(E.myclass == "HUNTER") then
-		DT.tooltip:AddDoubleLine(RANGED_ATTACK_POWER, pwr, 1, 1, 1);
+		DT.tooltip:AddDoubleLine(RANGED_ATTACK_POWER, pwr, 1, 1, 1)
 
-		local line = format(RANGED_ATTACK_POWER_TOOLTIP, max((pwr), 0) / ATTACK_POWER_MAGIC_NUMBER);
+		local line = format(RANGED_ATTACK_POWER_TOOLTIP, max((pwr), 0) / ATTACK_POWER_MAGIC_NUMBER)
 
-		DT.tooltip:AddLine(line, nil, nil, nil, true);
+		DT.tooltip:AddLine(line, nil, nil, nil, true)
 	else
-		DT.tooltip:AddDoubleLine(MELEE_ATTACK_POWER, pwr, 1, 1, 1);
-		DT.tooltip:AddLine(format(MELEE_ATTACK_POWER_TOOLTIP, max((base + posBuff + negBuff), 0) / ATTACK_POWER_MAGIC_NUMBER), nil, nil, nil, true);
+		DT.tooltip:AddDoubleLine(MELEE_ATTACK_POWER, pwr, 1, 1, 1)
+		DT.tooltip:AddLine(format(MELEE_ATTACK_POWER_TOOLTIP, max((base + posBuff + negBuff), 0) / ATTACK_POWER_MAGIC_NUMBER), nil, nil, nil, true)
 	end
 
-	DT.tooltip:Show();
+	DT.tooltip:Show()
 end
 
 local function ValueColorUpdate(hex)
-	displayNumberString = join("", "%s: ", hex, "%d|r");
+	displayNumberString = join("", "%s: ", hex, "%d|r")
 
 	if(lastPanel ~= nil) then
-		OnEvent(lastPanel);
+		OnEvent(lastPanel)
 	end
 end
-E["valueColorUpdateFuncs"][ValueColorUpdate] = true;
+E["valueColorUpdateFuncs"][ValueColorUpdate] = true
 
 DT:RegisterDatatext("Attack Power", {"UNIT_ATTACK_POWER", "UNIT_RANGED_ATTACK_POWER"}, OnEvent, nil, nil, OnEnter, nil, ATTACK_POWER_TOOLTIP)
\ No newline at end of file
diff --git a/2/3/4/5/6/7/ElvUI/Settings/Profile.lua b/2/3/4/5/6/7/ElvUI/Settings/Profile.lua
index 5abf101..33df2d0 100644
--- a/2/3/4/5/6/7/ElvUI/Settings/Profile.lua
+++ b/2/3/4/5/6/7/ElvUI/Settings/Profile.lua
@@ -455,13 +455,14 @@ P["datatexts"] = {
 		["TopLeftMiniPanel"] = "",
 	},
 	["battleground"] = true,
-	["panelTransparency"] = false,
 	["panelBackdrop"] = true,
+	["panelTransparency"] = false,
 
 	--Datatext Options
 	--General
 	["goldFormat"] = "BLIZZARD",
 	["goldCoins"] = false,
+
 	--Time Datatext
 	["timeFormat"] = "%I:%M",
 	["dateFormat"] = "",