Quantcast

4.7

Steven Jackson [09-30-14 - 02:53]
4.7
Filename
Interface/AddOns/SVUI/SVUI.lua
Interface/AddOns/SVUI/docs/schema.lua
Interface/AddOns/SVUI/language/chinese_ui.lua
Interface/AddOns/SVUI/language/english_ui.lua
Interface/AddOns/SVUI/language/french_ui.lua
Interface/AddOns/SVUI/language/german_ui.lua
Interface/AddOns/SVUI/language/italian_ui.lua
Interface/AddOns/SVUI/language/korean_ui.lua
Interface/AddOns/SVUI/language/portuguese_ui.lua
Interface/AddOns/SVUI/language/russian_ui.lua
Interface/AddOns/SVUI/language/spanish_ui.lua
Interface/AddOns/SVUI/language/taiwanese_ui.lua
Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua
Interface/AddOns/SVUI/packages/actionbar/KeyBind.lua
Interface/AddOns/SVUI/packages/actionbar/SVBar.lua
Interface/AddOns/SVUI/packages/aura/SVAura.lua
Interface/AddOns/SVUI/packages/bag/SVBag.lua
Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua
Interface/AddOns/SVUI/packages/bag/tools/sorting.lua
Interface/AddOns/SVUI/packages/chat/SVChat.lua
Interface/AddOns/SVUI/packages/dock/SVDock.lua
Interface/AddOns/SVUI/packages/gear/SVGear.lua
Interface/AddOns/SVUI/packages/henchmen/SVHenchmen.lua
Interface/AddOns/SVUI/packages/map/SVMap.lua
Interface/AddOns/SVUI/packages/override/SVOverride.lua
Interface/AddOns/SVUI/packages/plates/SVPlate.lua
Interface/AddOns/SVUI/packages/stats/SVStats.lua
Interface/AddOns/SVUI/packages/stats/stats/bags.lua
Interface/AddOns/SVUI/packages/stats/stats/cta.lua
Interface/AddOns/SVUI/packages/stats/stats/dps.lua
Interface/AddOns/SVUI/packages/stats/stats/durability.lua
Interface/AddOns/SVUI/packages/stats/stats/experience.lua
Interface/AddOns/SVUI/packages/stats/stats/friends.lua
Interface/AddOns/SVUI/packages/stats/stats/gold.lua
Interface/AddOns/SVUI/packages/stats/stats/guild.lua
Interface/AddOns/SVUI/packages/stats/stats/hps.lua
Interface/AddOns/SVUI/packages/stats/stats/reputation.lua
Interface/AddOns/SVUI/packages/stats/stats/system.lua
Interface/AddOns/SVUI/packages/stats/stats/time.lua
Interface/AddOns/SVUI/packages/stats/stats/tokens.lua
Interface/AddOns/SVUI/packages/tip/SVTip.lua
Interface/AddOns/SVUI/packages/unit/SVUnit.lua
Interface/AddOns/SVUI/packages/unit/elements/auras.lua
Interface/AddOns/SVUI/packages/unit/elements/castbar.lua
Interface/AddOns/SVUI/packages/unit/elements/essentials.lua
Interface/AddOns/SVUI/packages/unit/elements/misc.lua
Interface/AddOns/SVUI/packages/unit/elements/tags.lua
Interface/AddOns/SVUI/packages/unit/frames.lua
Interface/AddOns/SVUI/packages/unit/resources/deathknight.lua
Interface/AddOns/SVUI/packages/unit/resources/druid.lua
Interface/AddOns/SVUI/packages/unit/resources/hunter.lua
Interface/AddOns/SVUI/packages/unit/resources/mage.lua
Interface/AddOns/SVUI/packages/unit/resources/monk.lua
Interface/AddOns/SVUI/packages/unit/resources/paladin.lua
Interface/AddOns/SVUI/packages/unit/resources/priest.lua
Interface/AddOns/SVUI/packages/unit/resources/rogue.lua
Interface/AddOns/SVUI/packages/unit/resources/shaman.lua
Interface/AddOns/SVUI/packages/unit/resources/warlock.lua
Interface/AddOns/SVUI/packages/unit/resources/warrior.lua
Interface/AddOns/SVUI/scripts/comix.lua
Interface/AddOns/SVUI/scripts/ego.lua
Interface/AddOns/SVUI/scripts/misc.lua
Interface/AddOns/SVUI/scripts/mounts.lua
Interface/AddOns/SVUI/scripts/questwatch.lua
Interface/AddOns/SVUI/scripts/raid.lua
Interface/AddOns/SVUI/scripts/reactions.lua
Interface/AddOns/SVUI/scripts/spellbind.lua
Interface/AddOns/SVUI/setup/installer.lua
Interface/AddOns/SVUI/setup/presets.lua
Interface/AddOns/SVUI/system/alerts.lua
Interface/AddOns/SVUI/system/animate.lua
Interface/AddOns/SVUI/system/common.lua
Interface/AddOns/SVUI/system/load.lua
Interface/AddOns/SVUI/system/media.lua
Interface/AddOns/SVUI/system/mentalo.lua
Interface/AddOns/SVUI/system/moveable.lua
Interface/AddOns/SVUI/system/slash.lua
Interface/AddOns/SVUI/system/timers.lua
Interface/AddOns/SVUI/system/utilities.lua
Interface/AddOns/SVUI/system/visibility.lua
Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua
Interface/AddOns/SVUI_ArtOfWar/SVUI_ArtOfWar.lua
Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua
Interface/AddOns/SVUI_ConfigOMatic/language/generic.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/aura.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/bag.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/bar.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/chat.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/dock.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/dynamic.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/filter.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/henchmen.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/map.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/mode.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/plate.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/profiles.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/stat.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/tip.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/units/focus.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/units/grid.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/units/other.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/units/party.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/units/pet.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/units/player.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/units/raid.lua
Interface/AddOns/SVUI_ConfigOMatic/modules/units/target.lua
Interface/AddOns/SVUI_Laborer/SVUI_Laborer.lua
Interface/AddOns/SVUI_Laborer/modes/archaeology.lua
Interface/AddOns/SVUI_Laborer/modes/cooking.lua
Interface/AddOns/SVUI_Laborer/modes/farming.lua
Interface/AddOns/SVUI_Laborer/modes/fishing.lua
Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua
Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua
Interface/AddOns/SVUI_StyleOMatic/addons/alert.lua
Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua
Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua
Interface/AddOns/SVUI_StyleOMatic/addons/barbershop.lua
Interface/AddOns/SVUI_StyleOMatic/addons/battlefield.lua
Interface/AddOns/SVUI_StyleOMatic/addons/blackmarket.lua
Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua
Interface/AddOns/SVUI_StyleOMatic/addons/challenges.lua
Interface/AddOns/SVUI_StyleOMatic/addons/character.lua
Interface/AddOns/SVUI_StyleOMatic/addons/chat.lua
Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua
Interface/AddOns/SVUI_StyleOMatic/addons/encounterjournal.lua
Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua
Interface/AddOns/SVUI_StyleOMatic/addons/gossip.lua
Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua
Interface/AddOns/SVUI_StyleOMatic/addons/help.lua
Interface/AddOns/SVUI_StyleOMatic/addons/inspect.lua
Interface/AddOns/SVUI_StyleOMatic/addons/itemsocketing.lua
Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua
Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua
Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua
Interface/AddOns/SVUI_StyleOMatic/addons/loothistory.lua
Interface/AddOns/SVUI_StyleOMatic/addons/lossofcontrol.lua
Interface/AddOns/SVUI_StyleOMatic/addons/macro.lua
Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua
Interface/AddOns/SVUI_StyleOMatic/addons/merchant.lua
Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua
Interface/AddOns/SVUI_StyleOMatic/addons/petition.lua
Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua
Interface/AddOns/SVUI_StyleOMatic/addons/petstable.lua
Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua
Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua
Interface/AddOns/SVUI_StyleOMatic/addons/raid.lua
Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua
Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua
Interface/AddOns/SVUI_StyleOMatic/addons/store.lua
Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua
Interface/AddOns/SVUI_StyleOMatic/addons/system.lua
Interface/AddOns/SVUI_StyleOMatic/addons/tabard.lua
Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua
Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/ACP.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AdiBags.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Altoholic.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AtlasLoot.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AuctionLite.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/BigWigs.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Bugsack.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Clique.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Cooline.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DBM.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DXE.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/LightHeaded.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Mogit.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Outfitter.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Postal.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Quartz.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Recount.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/SexyCooldown.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TomTom.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TradeSkillDW.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/VEM.lua
Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua
Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua
Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua
Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua
Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua
Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua
Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua
Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua
Interface/AddOns/SVUI_StyleOMatic/addons/worldstate.lua
Interface/AddOns/SVUI_StyleOMatic/common/methods.lua
Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua
diff --git a/Interface/AddOns/SVUI/SVUI.lua b/Interface/AddOns/SVUI/SVUI.lua
index 55a5fca..5d55510 100644
--- a/Interface/AddOns/SVUI/SVUI.lua
+++ b/Interface/AddOns/SVUI/SVUI.lua
@@ -53,7 +53,7 @@ local twipe, tsort, tconcat = table.wipe, table.sort, table.concat;

 --[[ GET THE REGISTRY LIB ]]--

-local SVLib = LibStub("LibSuperVillain-1.0");
+local SVLib = LibSuperVillain;

 --[[ LOCALS ]]--

diff --git a/Interface/AddOns/SVUI/docs/schema.lua b/Interface/AddOns/SVUI/docs/schema.lua
index 8b878db..a89fc2e 100644
--- a/Interface/AddOns/SVUI/docs/schema.lua
+++ b/Interface/AddOns/SVUI/docs/schema.lua
@@ -42,7 +42,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #

 ]]--

-local lib = LibStub("LibSuperVillain-1.0")
+local lib = LibSuperVillain
 local PKG = {};

 --Here you would build your package object, then...
diff --git a/Interface/AddOns/SVUI/language/chinese_ui.lua b/Interface/AddOns/SVUI/language/chinese_ui.lua
index c9730fa..696746b 100644
--- a/Interface/AddOns/SVUI/language/chinese_ui.lua
+++ b/Interface/AddOns/SVUI/language/chinese_ui.lua
@@ -1,5 +1,5 @@
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang("zhCN");
+local L = LibSuperVillain:Lang("zhCN");
 if not L then return end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/english_ui.lua b/Interface/AddOns/SVUI/language/english_ui.lua
index fabf5c2..11a1479 100644
--- a/Interface/AddOns/SVUI/language/english_ui.lua
+++ b/Interface/AddOns/SVUI/language/english_ui.lua
@@ -1,5 +1,5 @@
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang("enUS", true);
+local L = LibSuperVillain:Lang("enUS", true);
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/french_ui.lua b/Interface/AddOns/SVUI/language/french_ui.lua
index c3c0ff7..e04f100 100644
--- a/Interface/AddOns/SVUI/language/french_ui.lua
+++ b/Interface/AddOns/SVUI/language/french_ui.lua
@@ -1,5 +1,5 @@
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang("frFR");
+local L = LibSuperVillain:Lang("frFR");
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/german_ui.lua b/Interface/AddOns/SVUI/language/german_ui.lua
index 26b6391..d011d04 100644
--- a/Interface/AddOns/SVUI/language/german_ui.lua
+++ b/Interface/AddOns/SVUI/language/german_ui.lua
@@ -1,5 +1,5 @@
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang("deDE");
+local L = LibSuperVillain:Lang("deDE");
 if not L then return end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/italian_ui.lua b/Interface/AddOns/SVUI/language/italian_ui.lua
index 356b973..f9b8568 100644
--- a/Interface/AddOns/SVUI/language/italian_ui.lua
+++ b/Interface/AddOns/SVUI/language/italian_ui.lua
@@ -1,5 +1,5 @@
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang("itIT");
+local L = LibSuperVillain:Lang("itIT");
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/korean_ui.lua b/Interface/AddOns/SVUI/language/korean_ui.lua
index d4cb309..6a7406c 100644
--- a/Interface/AddOns/SVUI/language/korean_ui.lua
+++ b/Interface/AddOns/SVUI/language/korean_ui.lua
@@ -1,5 +1,5 @@
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang("koKR");
+local L = LibSuperVillain:Lang("koKR");
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/portuguese_ui.lua b/Interface/AddOns/SVUI/language/portuguese_ui.lua
index 5047dee..52312bd 100644
--- a/Interface/AddOns/SVUI/language/portuguese_ui.lua
+++ b/Interface/AddOns/SVUI/language/portuguese_ui.lua
@@ -1,5 +1,5 @@
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang("ptBR");
+local L = LibSuperVillain:Lang("ptBR");
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/russian_ui.lua b/Interface/AddOns/SVUI/language/russian_ui.lua
index 7fec36f..70076dc 100644
--- a/Interface/AddOns/SVUI/language/russian_ui.lua
+++ b/Interface/AddOns/SVUI/language/russian_ui.lua
@@ -1,5 +1,5 @@
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang("ruRU");
+local L = LibSuperVillain:Lang("ruRU");
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/spanish_ui.lua b/Interface/AddOns/SVUI/language/spanish_ui.lua
index ca80ca3..966a553 100644
--- a/Interface/AddOns/SVUI/language/spanish_ui.lua
+++ b/Interface/AddOns/SVUI/language/spanish_ui.lua
@@ -1,7 +1,7 @@
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang("esES");
+local L = LibSuperVillain:Lang("esES");
 if not L then
-	L = LibStub("LibSuperVillain-1.0"):Lang("esMX")
+	L = LibSuperVillain:Lang("esMX")
 end
 if not L then return; end
 --[[REACTION TEXTS]]--
diff --git a/Interface/AddOns/SVUI/language/taiwanese_ui.lua b/Interface/AddOns/SVUI/language/taiwanese_ui.lua
index 4ee6b5f..8e4663b 100644
--- a/Interface/AddOns/SVUI/language/taiwanese_ui.lua
+++ b/Interface/AddOns/SVUI/language/taiwanese_ui.lua
@@ -1,5 +1,5 @@
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang("zhTW");
+local L = LibSuperVillain:Lang("zhTW");
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua
index ff3fcf0..ac60d58 100644
--- a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua
+++ b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua
@@ -25,48 +25,46 @@ core add-ins functioning outside of the core object.
 --]]

 --[[ LOCALIZED GLOBALS ]]--
-
+local _G            = getfenv(0);
 --LUA
-local unpack        = unpack;
-local select        = select;
-local pairs         = pairs;
-local type          = type;
-local rawset        = rawset;
-local rawget        = rawget;
-local tostring      = tostring;
-local error         = error;
-local next          = next;
-local pcall         = pcall;
-local getmetatable  = getmetatable;
-local setmetatable  = setmetatable;
-local assert        = assert;
+local unpack        = _G.unpack;
+local select        = _G.select;
+local pairs         = _G.pairs;
+local type          = _G.type;
+local rawset        = _G.rawset;
+local rawget        = _G.rawget;
+local tostring      = _G.tostring;
+local error         = _G.error;
+local next          = _G.next;
+local pcall         = _G.pcall;
+local getmetatable  = _G.getmetatable;
+local setmetatable  = _G.setmetatable;
+local assert        = _G.assert;
 --BLIZZARD
-local _G            = _G;
 local tinsert       = _G.tinsert;
 local tremove       = _G.tremove;
 local twipe         = _G.wipe;
 --STRING
-local string        = string;
+local string        = _G.string;
 local upper         = string.upper;
 local format        = string.format;
 local find          = string.find;
 local match         = string.match;
 local gsub          = string.gsub;
 --MATH
-local math          = math;
+local math          = _G.math;
 local floor         = math.floor
 --TABLE
-local table         = table;
+local table         = _G.table;
 local tsort         = table.sort;
 local tconcat       = table.concat;

 --[[ LIB CONSTRUCT ]]--
-
-assert(LibStub, "LibSuperVillain-1.0 requires LibStub")
-
-local lib = LibStub:NewLibrary("LibSuperVillain-1.0", 1)
-
-if not lib then return end
+local lib = _G["LibSuperVillain"]
+if not lib then
+    _G["LibSuperVillain"] = {}
+    lib = _G["LibSuperVillain"]
+end

 --[[ ADDON DATA ]]--

@@ -567,14 +565,15 @@ core add-ins functioning outside of the core object.

 --REGISTRY LOCAL HELPERS
 local changeDBVar = function(self, value, key, sub1, sub2, sub3)
-    if((sub1 and sub2 and sub3) and (self.db[sub1] and self.db[sub1][sub2] and self.db[sub1][sub2][sub3])) then
-        self.db[sub1][sub2][sub3][key] = value
-    elseif((sub1 and sub2) and (self.db[sub1] and self.db[sub1][sub2])) then
-        self.db[sub1][sub2][key] = value
-    elseif(sub1 and self.db[sub1]) then
-        self.db[sub1][key] = value
+    local db = self.db or CoreObject.db[self.Schema]
+    if((sub1 and sub2 and sub3) and (db[sub1] and db[sub1][sub2] and db[sub1][sub2][sub3])) then
+        db[sub1][sub2][sub3][key] = value
+    elseif((sub1 and sub2) and (db[sub1] and db[sub1][sub2])) then
+        db[sub1][sub2][key] = value
+    elseif(sub1 and db[sub1]) then
+        db[sub1][key] = value
     else
-        self.db[key] = value
+        db[key] = value
     end

     if(self.UpdateLocals) then
@@ -675,7 +674,7 @@ local function SetPluginString(addonName)
     return INFO_FORMAT:format(name, version, author)
 end

-local function SetInternalModule(obj, schema, header)
+local function SetInternalModule(obj, schema, noCopy)
     local addonmeta = {}
     local oldmeta = getmetatable(obj)
     if oldmeta then
@@ -688,9 +687,9 @@ local function SetInternalModule(obj, schema, header)

     obj.NameID = addonName
     obj.Schema = schema
-    obj.TitleID = header
+    obj.TitleID = schema

-    if not obj.db then obj.db = {} end
+    if(not noCopy and (not obj.db)) then obj.db = {} end

     obj.initialized = false
     obj.CombatLocked = false
@@ -761,17 +760,17 @@ function lib:NewScript(fn)
     end
 end

-function lib:NewPackage(obj, schema, defaults)
+function lib:NewPackage(obj, schema, noCopy)
     if(CoreObject[schema]) then return end

     ModuleQueue[#ModuleQueue+1] = schema
     Modules[#Modules+1] = schema
     AllowedIndexes.P[schema] = true

-    CoreObject[schema] = SetInternalModule(obj, schema)
+    CoreObject[schema] = SetInternalModule(obj, schema, noCopy)

     if(CoreObject.AddonLaunched and not CoreObject[schema].initialized) then
-        self:NewDatabase(CoreObject[schema])
+        if(CoreObject[schema].db) then self:NewDatabase(CoreObject[schema]) end
         if(CoreObject[schema].Load) then
             CoreObject[schema]:Load()
         end
@@ -890,13 +889,22 @@ function lib:LoadQueuedModules()
             if obj and not obj.initialized then
                 obj.initialized = true;
                 local halt = false
-                --print(schema .. " LoadQueuedModules")
-                self:NewDatabase(obj)
-                if(obj.db.incompatible) then
-                    for addon,_ in pairs(obj.db.incompatible) do
-                        if IsAddOnLoaded(addon) then halt = true end
+
+                if(obj.db) then
+                    self:NewDatabase(obj)
+                    if(obj.db.incompatible) then
+                        for addon,_ in pairs(obj.db.incompatible) do
+                            if IsAddOnLoaded(addon) then halt = true end
+                        end
+                    end
+                else
+                    if(CoreObject.db[schema].incompatible) then
+                        for addon,_ in pairs(CoreObject.db[schema].incompatible) do
+                            if IsAddOnLoaded(addon) then halt = true end
+                        end
                     end
                 end
+
                 if obj.Load then
                     if(not halt) then
                         obj:Load()
diff --git a/Interface/AddOns/SVUI/packages/actionbar/KeyBind.lua b/Interface/AddOns/SVUI/packages/actionbar/KeyBind.lua
index 62e5506..4c16d47 100644
--- a/Interface/AddOns/SVUI/packages/actionbar/KeyBind.lua
+++ b/Interface/AddOns/SVUI/packages/actionbar/KeyBind.lua
@@ -37,7 +37,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVBar;

 local _G = getfenv(0);
diff --git a/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua b/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua
index 61e07c7..1a018a3 100644
--- a/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua
+++ b/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua
@@ -34,7 +34,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()

 local LSM = LibStub("LibSharedMedia-3.0")
@@ -104,8 +104,8 @@ end
 local function RefreshMicrobar()
 	if not SVUI_MicroBar then return end
 	local lastParent = SVUI_MicroBar;
-	local buttonSize =  MOD.db.Micro.buttonsize or 30;
-	local spacing =  MOD.db.Micro.buttonspacing or 1;
+	local buttonSize =  SV.db.SVBar.Micro.buttonsize or 30;
+	local spacing =  SV.db.SVBar.Micro.buttonspacing or 1;
 	local barWidth = (buttonSize + spacing) * 13;
 	SVUI_MicroBar_MOVE:Size(barWidth, buttonSize + 6)
 	SVUI_MicroBar:SetAllPoints(SVUI_MicroBar_MOVE)
@@ -115,7 +115,7 @@ local function RefreshMicrobar()
 		if(button) then
 			button:ClearAllPoints()
 			button:Size(buttonSize, buttonSize + 28)
-			button._fade = MOD.db.Micro.mouseover
+			button._fade = SV.db.SVBar.Micro.mouseover
 			if lastParent == SVUI_MicroBar then
 				button:SetPoint("BOTTOMLEFT",lastParent,"BOTTOMLEFT",1,1)
 			else
@@ -187,7 +187,7 @@ local MicroButton_OnLeave = function(self)
 end

 local MicroButton_OnUpdate = function()
-	if(not MOD.db.Micro.mouseover) then
+	if(not SV.db.SVBar.Micro.mouseover) then
 		SVUI_MicroBar:SetAlpha(1)
 		SVUI_MicroBar.screenMarker:SetAlpha(0)
 	else
@@ -262,7 +262,7 @@ end
 local function SaveActionButton(parent)
 	local button = parent:GetName()
 	local cooldown = _G[button.."Cooldown"]
-	cooldown.SizeOverride = MOD.db.cooldownSize
+	cooldown.SizeOverride = SV.db.SVBar.cooldownSize
 	MOD:FixKeybindText(parent)
 	if not MOD.ButtonCache[parent] then
 		SV.Timers:AddCooldown(cooldown)
@@ -339,7 +339,7 @@ local function ModifyActionButton(parent)
 	local pushed = parent:GetPushedTexture()
 	local checked = parent:GetCheckedTexture()
 	if cooldown then
-		cooldown.SizeOverride = MOD.db.cooldownSize
+		cooldown.SizeOverride = SV.db.SVBar.cooldownSize
 		--cooldown:SetAlpha(0)
 	end
 	if highlight then
@@ -369,7 +369,7 @@ local function ModifyActionButton(parent)
 		count:ClearAllPoints()
 		count:SetPoint("BOTTOMRIGHT",1,1)
 		count:SetShadowOffset(1,-1)
-		count:SetFontTemplate(LSM:Fetch("font",MOD.db.countFont),MOD.db.countFontSize,MOD.db.countFontOutline)
+		count:SetFontTemplate(LSM:Fetch("font",SV.db.SVBar.countFont),SV.db.SVBar.countFontSize,SV.db.SVBar.countFontOutline)
 	end
 	if icon then
 		icon:SetTexCoord(.1,.9,.1,.9)
@@ -377,10 +377,10 @@ local function ModifyActionButton(parent)
 		icon:FillInner()
 	end
 	if shine then shine:SetAllPoints()end
-	if MOD.db.hotkeytext then
+	if SV.db.SVBar.hotkeytext then
 		hotkey:ClearAllPoints()
 		hotkey:SetAllPoints()
-		hotkey:SetFontTemplate(LSM:Fetch("font",MOD.db.font),MOD.db.fontSize,MOD.db.fontOutline)
+		hotkey:SetFontTemplate(LSM:Fetch("font",SV.db.SVBar.font),SV.db.SVBar.fontSize,SV.db.SVBar.fontOutline)
 		hotkey:SetJustifyH("RIGHT")
     	hotkey:SetJustifyV("TOP")
 		hotkey:SetShadowOffset(1,-1)
@@ -479,7 +479,7 @@ function MOD:UpdateBarBindings(pet, stance)
 	  		local name = ("SVUI_StanceBarButton%s"):format(i)
 	  		local hkname = ("SVUI_StanceBarButton%sHotKey"):format(i)
 			local hotkey = _G[hkname]
-		    if self.db.hotkeytext then
+		    if SV.db.SVBar.hotkeytext then
 		    	local key = bindText:format(i);
 		    	local binding = GetBindingKey(key)
 		      	hotkey:Show()
@@ -498,7 +498,7 @@ function MOD:UpdateBarBindings(pet, stance)
 	  		local name = ("PetActionButton%s"):format(i)
 	  		local hkname = ("PetActionButton%sHotKey"):format(i)
 			local hotkey = _G[hkname]
-		    if self.db.hotkeytext then
+		    if SV.db.SVBar.hotkeytext then
 		      	local key = bindText:format(i);
 		    	local binding = GetBindingKey(key)
 		      	hotkey:Show()
@@ -540,7 +540,7 @@ function MOD:UpdateAllBindings(event)
 end

 function MOD:SetBarConfigData(bar)
-	local db = self.db
+	local db = SV.db.SVBar
 	local thisBinding = bar.binding;
 	local buttonList = bar.buttons;
 	local config = bar.config
@@ -567,7 +567,7 @@ end

 function MOD:UpdateBarPagingDefaults()
 	local parse, custom;
-	if self.db.Bar6.enable then
+	if SV.db.SVBar.Bar6.enable then
 		parse = "[vehicleui,mod:alt,mod:ctrl] %d; [possessbar] %d; [overridebar] %d; [form,noform] 0; [shapeshift] 13; [bar:3] 3; [bar:4] 4; [bar:5] 5; [bar:6] 6; %s";
 	else
 		parse = "[vehicleui,mod:alt,mod:ctrl] %d; [possessbar] %d; [overridebar] %d; [form,noform] 0; [shapeshift] 13; [bar:2] 2; [bar:3] 3; [bar:4] 4; [bar:5] 5; [bar:6] 6; %s";
@@ -575,8 +575,8 @@ function MOD:UpdateBarPagingDefaults()

 	local mainbar = _G["SVUI_ActionBar1"]
 	if(mainbar) then
-		if self.db.Bar1.useCustomPaging then
-			custom = self.db.Bar1.customPaging[SV.class];
+		if SV.db.SVBar.Bar1.useCustomPaging then
+			custom = SV.db.SVBar.Bar1.customPaging[SV.class];
 		else
 			custom = ""
 		end
@@ -587,26 +587,26 @@ function MOD:UpdateBarPagingDefaults()
 	for i=2, 6 do
 		local id = ("Bar%d"):format(i)
 		local bar = _G["SVUI_Action" .. id]
-		if(bar and self.db[id].useCustomPaging) then
-			bar.conditions = self.db[id].customPaging[SV.class];
+		if(bar and SV.db.SVBar[id].useCustomPaging) then
+			bar.conditions = SV.db.SVBar[id].customPaging[SV.class];
 		end
 	end

-	if((not self.db.enable or InCombatLockdown()) or not self.isInitialized) then return end
+	if((not SV.db.SVBar.enable or InCombatLockdown()) or not self.isInitialized) then return end
 	local Bar2Option = InterfaceOptionsActionBarsPanelBottomRight
 	local Bar3Option = InterfaceOptionsActionBarsPanelBottomLeft
 	local Bar4Option = InterfaceOptionsActionBarsPanelRightTwo
 	local Bar5Option = InterfaceOptionsActionBarsPanelRight

-	if (self.db.Bar2.enable and not Bar2Option:GetChecked()) or (not self.db.Bar2.enable and Bar2Option:GetChecked())  then
+	if (SV.db.SVBar.Bar2.enable and not Bar2Option:GetChecked()) or (not SV.db.SVBar.Bar2.enable and Bar2Option:GetChecked())  then
 		Bar2Option:Click()
 	end

-	if (self.db.Bar3.enable and not Bar3Option:GetChecked()) or (not self.db.Bar3.enable and Bar3Option:GetChecked())  then
+	if (SV.db.SVBar.Bar3.enable and not Bar3Option:GetChecked()) or (not SV.db.SVBar.Bar3.enable and Bar3Option:GetChecked())  then
 		Bar3Option:Click()
 	end

-	if not self.db.Bar5.enable and not self.db.Bar4.enable then
+	if not SV.db.SVBar.Bar5.enable and not SV.db.SVBar.Bar4.enable then
 		if Bar4Option:GetChecked() then
 			Bar4Option:Click()
 		end
@@ -614,7 +614,7 @@ function MOD:UpdateBarPagingDefaults()
 		if Bar5Option:GetChecked() then
 			Bar5Option:Click()
 		end
-	elseif not self.db.Bar5.enable then
+	elseif not SV.db.SVBar.Bar5.enable then
 		if not Bar5Option:GetChecked() then
 			Bar5Option:Click()
 		end
@@ -622,9 +622,9 @@ function MOD:UpdateBarPagingDefaults()
 		if not Bar4Option:GetChecked() then
 			Bar4Option:Click()
 		end
-	elseif (self.db.Bar4.enable and not Bar4Option:GetChecked()) or (not self.db.Bar4.enable and Bar4Option:GetChecked()) then
+	elseif (SV.db.SVBar.Bar4.enable and not Bar4Option:GetChecked()) or (not SV.db.SVBar.Bar4.enable and Bar4Option:GetChecked()) then
 		Bar4Option:Click()
-	elseif (self.db.Bar5.enable and not Bar5Option:GetChecked()) or (not self.db.Bar5.enable and Bar5Option:GetChecked()) then
+	elseif (SV.db.SVBar.Bar5.enable and not Bar5Option:GetChecked()) or (not SV.db.SVBar.Bar5.enable and Bar5Option:GetChecked()) then
 		Bar5Option:Click()
 	end
 end
@@ -736,7 +736,7 @@ do
 	end

 	local function _getPage(bar, defaultPage, condition)
-		local page = MOD.db[bar].customPaging[SV.class]
+		local page = SV.db.SVBar[bar].customPaging[SV.class]
 		if not condition then condition = '' end
 		if not page then page = '' end
 		if page then
@@ -751,7 +751,7 @@ do

 		local bar
 		local isPet, isStance = false, false
-		local db = self.db[id]
+		local db = SV.db.SVBar[id]

 		if(id == "Pet") then
 			bar = _G["SVUI_PetActionBar"]
@@ -883,15 +883,15 @@ end

 local Vehicle_Updater = function()
 	local bar = _G["SVUI_ActionBar1"]
-	local space = MOD.db["Bar1"].buttonspacing
-	local total = MOD.db["Bar1"].buttons;
-	local rows = MOD.db["Bar1"].buttonsPerRow;
-	local size = MOD.db["Bar1"].buttonsize
-	local point = MOD.db["Bar1"].point;
+	local space = SV.db.SVBar["Bar1"].buttonspacing
+	local total = SV.db.SVBar["Bar1"].buttons;
+	local rows = SV.db.SVBar["Bar1"].buttonsPerRow;
+	local size = SV.db.SVBar["Bar1"].buttonsize
+	local point = SV.db.SVBar["Bar1"].point;
 	local columns = ceil(total / rows)
 	if (HasOverrideActionBar() or HasVehicleActionBar()) and total == 12 then
 		bar.backdrop:ClearAllPoints()
-		bar.backdrop:Point(MOD.db["Bar1"].point, bar, MOD.db["Bar1"].point)
+		bar.backdrop:Point(SV.db.SVBar["Bar1"].point, bar, SV.db.SVBar["Bar1"].point)
 		bar.backdrop:Width(space + ((size * rows) + (space * (rows - 1)) + space))
 		bar.backdrop:Height(space + ((size * columns) + (space * (columns - 1)) + space))
 		bar.backdrop:SetFrameLevel(0);
@@ -961,7 +961,7 @@ CreateActionBars = function(self)
 		local barName = ("SVUI_Action%s"):format(barID)
 		local buttonMax = NUM_ACTIONBAR_BUTTONS

-		local space = MOD.db["Bar"..i].buttonspacing
+		local space = SV.db.SVBar["Bar"..i].buttonspacing

 		local thisBar = NewActionBar(barName)
 		thisBar.binding = barBindingIndex[i]
@@ -1055,7 +1055,7 @@ do
 			local cd = _G["SVUI_StanceBarButton"..i.."Cooldown"]
 			if i <= maxForms then
 				texture, name, isActive, isCastable = GetShapeshiftFormInfo(i)
-				if texture == "Interface\\Icons\\Spell_Nature_WispSplode" and MOD.db.Stance.style == "darkenInactive" then
+				if texture == "Interface\\Icons\\Spell_Nature_WispSplode" and SV.db.SVBar.Stance.style == "darkenInactive" then
 					_, _, texture = GetSpellInfo(name)
 				end

@@ -1082,7 +1082,7 @@ do
 						if button.checked then
 							button.checked:SetAlpha(1)
 						end
-						if MOD.db.Stance.style == "darkenInactive" then
+						if SV.db.SVBar.Stance.style == "darkenInactive" then
 							icon:SetVertexColor(0.25, 0.25, 0.25)
 						else
 							icon:SetVertexColor(1, 1, 1)
@@ -1156,7 +1156,7 @@ do
 	  local barID = "Stance";
 	  local parent = _G["SVUI_ActionBar1"]
 	  local maxForms = GetNumShapeshiftForms();
-	  if self.db["Bar2"].enable then
+	  if SV.db.SVBar["Bar2"].enable then
 		parent = _G["SVUI_ActionBar2"]
 	  end

@@ -1267,7 +1267,7 @@ do
 	CreatePetBar = function(self)
 		local barID = "Pet";
 		local parent = _G["SVUI_ActionBar1"]
-		if self.db["Bar2"].enable then
+		if SV.db.SVBar["Bar2"].enable then
 			parent = _G["SVUI_ActionBar2"]
 		end

@@ -1314,8 +1314,8 @@ do
 end

 CreateMicroBar = function(self)
-	local buttonSize = self.db.Micro.buttonsize or 30;
-	local spacing =  self.db.Micro.buttonspacing or 1;
+	local buttonSize = SV.db.SVBar.Micro.buttonsize or 30;
+	local spacing =  SV.db.SVBar.Micro.buttonspacing or 1;
 	local barWidth = (buttonSize + spacing) * 13;
 	local microBar = NewFrame('Frame','SVUI_MicroBar',SV.UIParent)
 	microBar:Size(barWidth,buttonSize + 6)
@@ -1357,7 +1357,7 @@ CreateMicroBar = function(self)
 				buttonMask.icon:SetTexCoord(data[2],data[3],data[4],data[5])
 				buttonMask.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1)
 				button.overlay = buttonMask;
-				button._fade = self.db.Micro.mouseover
+				button._fade = SV.db.SVBar.Micro.mouseover
 				button:HookScript('OnEnter', MicroButton_OnEnter)
 				button:HookScript('OnLeave', MicroButton_OnLeave)
 				button:Show()
@@ -1555,7 +1555,7 @@ function MOD:ReLoad()
 end

 function MOD:Load()
-	if not self.db.enable then return end
+	if not SV.db.SVBar.enable then return end
 	RemoveDefaults();

 	self:UpdateBarPagingDefaults()
@@ -1586,4 +1586,4 @@ function MOD:Load()
 	self.IsLoaded = true
 end

-SVLib:NewPackage(MOD, "SVBar")
\ No newline at end of file
+SVLib:NewPackage(MOD, "SVBar", true)
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI/packages/aura/SVAura.lua b/Interface/AddOns/SVUI/packages/aura/SVAura.lua
index bcd22d2..962b3fe 100644
--- a/Interface/AddOns/SVUI/packages/aura/SVAura.lua
+++ b/Interface/AddOns/SVUI/packages/aura/SVAura.lua
@@ -43,7 +43,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local LSM = LibStub("LibSharedMedia-3.0")
 local MOD = {};
@@ -291,16 +291,16 @@ do
 			end
 			aura.Skinned = true
 		end
-		local font = LSM:Fetch("font", MOD.db.font)
+		local font = LSM:Fetch("font", SV.db.SVAura.font)
 		aura.texture = aura:CreateTexture(nil, "BORDER")
 		aura.texture:FillInner(aura, 2, 2)
 		aura.texture:SetTexCoord(0.1, 0.9, 0.1, 0.9)
 		aura.count = aura:CreateFontString(nil, "ARTWORK")
-		aura.count:SetPoint("BOTTOMRIGHT", (-1 + MOD.db.countOffsetH), (1 + MOD.db.countOffsetV))
-		aura.count:SetFontTemplate(font, MOD.db.fontSize, MOD.db.fontOutline)
+		aura.count:SetPoint("BOTTOMRIGHT", (-1 + SV.db.SVAura.countOffsetH), (1 + SV.db.SVAura.countOffsetV))
+		aura.count:SetFontTemplate(font, SV.db.SVAura.fontSize, SV.db.SVAura.fontOutline)
 		aura.time = aura:CreateFontString(nil, "ARTWORK")
-		aura.time:SetPoint("TOP", aura, "BOTTOM", 1 + MOD.db.timeOffsetH, 0 + MOD.db.timeOffsetV)
-		aura.time:SetFontTemplate(font, MOD.db.fontSize, MOD.db.fontOutline)
+		aura.time:SetPoint("TOP", aura, "BOTTOM", 1 + SV.db.SVAura.timeOffsetH, 0 + SV.db.SVAura.timeOffsetV)
+		aura.time:SetFontTemplate(font, SV.db.SVAura.fontSize, SV.db.SVAura.fontOutline)
 		aura.highlight = aura:CreateTexture(nil, "HIGHLIGHT")
 		aura.highlight:SetTexture(0, 0, 0, 0.45)
 		aura.highlight:FillInner()
@@ -383,7 +383,7 @@ do
 	end

 	function MOD:ToggleConsolidatedBuffs()
-		if MOD.db.hyperBuffs.enable then
+		if SV.db.SVAura.hyperBuffs.enable then
 			CB_HEIGHT = Minimap:GetHeight()
 			CB_WIDTH = (CB_HEIGHT / 5) + 4
 			SVUI_AurasAnchor:SetSize(CB_WIDTH, CB_HEIGHT)
@@ -427,7 +427,7 @@ do
 	function MOD:Update_ConsolidatedBuffsSettings(event)
 		SVUI_ConsolidatedBuffs:SetAllPoints(SVUI_AurasAnchor)
 		local swapIndex1, swapIndex2, hideIndex1, hideIndex2
-		if MOD.db.hyperBuffs.filter then
+		if SV.db.SVAura.hyperBuffs.filter then
 			if SV.ClassRole == 'C' then
 				swapIndex1 = 4
 				hideIndex1 = 3
@@ -483,12 +483,12 @@ end
 function MOD:UpdateAuraHeader(auraHeader, auraType)
 	if(InCombatLockdown() or not auraHeader) then return end

-	local db = self.db[auraType]
+	local db = SV.db.SVAura[auraType]
 	local showBy = db.showBy
-	local font = LSM:Fetch("font", self.db.font)
+	local font = LSM:Fetch("font", SV.db.SVAura.font)

 	if auraType == "buffs" then
-		auraHeader:SetAttribute("consolidateTo", self.db.hyperBuffs.enable == true and 1 or 0)
+		auraHeader:SetAttribute("consolidateTo", SV.db.SVAura.hyperBuffs.enable == true and 1 or 0)
 		auraHeader:SetAttribute("weaponTemplate", ("SVUI_AuraTemplate%d"):format(db.size))
 	end

@@ -527,9 +527,9 @@ function MOD:UpdateAuraHeader(auraHeader, auraType)
 		end
 		if(auraChild.time) then
 			auraChild.time:ClearAllPoints()
-			auraChild.time:SetPoint("TOP", auraChild, "BOTTOM", 1 + self.db.timeOffsetH, self.db.timeOffsetV)
+			auraChild.time:SetPoint("TOP", auraChild, "BOTTOM", 1 + SV.db.SVAura.timeOffsetH, SV.db.SVAura.timeOffsetV)
 			auraChild.count:ClearAllPoints()
-			auraChild.count:SetPoint("BOTTOMRIGHT", -1 + self.db.countOffsetH, self.db.countOffsetV)
+			auraChild.count:SetPoint("BOTTOMRIGHT", -1 + SV.db.SVAura.countOffsetH, SV.db.SVAura.countOffsetV)
 		end
 		if (i > (db.maxWraps * db.wrapAfter) and auraChild:IsShown()) then
 			auraChild:Hide()
@@ -561,7 +561,7 @@ function MOD:ReLoad()
 	CB_HEIGHT = Minimap:GetHeight()
 	CB_WIDTH = (CB_HEIGHT / 5) + 4
 	SVUI_AurasAnchor:SetSize(CB_WIDTH, CB_HEIGHT)
-	AURA_FADE_TIME = MOD.db.fadeBy
+	AURA_FADE_TIME = SV.db.SVAura.fadeBy
 	MOD:UpdateAuraHeader(SVUI_PlayerBuffs, "buffs");
 	MOD:UpdateAuraHeader(SVUI_PlayerDebuffs, "debuffs");
 end
@@ -569,8 +569,8 @@ end
 function MOD:Load()
 	CB_HEIGHT = Minimap:GetHeight()
 	CB_WIDTH = (CB_HEIGHT / 5) + 4
-	if not self.db.enable then return end
-	if self.db.disableBlizzard then
+	if not SV.db.SVAura.enable then return end
+	if SV.db.SVAura.disableBlizzard then
 		BuffFrame:Die()
 		ConsolidatedBuffs:Die()
 		TemporaryEnchantFrame:Die()
@@ -601,4 +601,4 @@ end
 DEFINE CONFIG AND REGISTER
 ##########################################################
 ]]--
-SVLib:NewPackage(MOD, "SVAura")
\ No newline at end of file
+SVLib:NewPackage(MOD, "SVAura", true)
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua
index 81af5ec..43c5200 100644
--- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua
+++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua
@@ -41,7 +41,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local MOD = {};
 local TTIP = SV.SVTip;
diff --git a/Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua b/Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua
index 91ea628..146dc67 100644
--- a/Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua
+++ b/Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua
@@ -33,7 +33,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVBag;
 local TTIP = SV.SVTip;
 --[[
diff --git a/Interface/AddOns/SVUI/packages/bag/tools/sorting.lua b/Interface/AddOns/SVUI/packages/bag/tools/sorting.lua
index 1aa1574..56f07cf 100644
--- a/Interface/AddOns/SVUI/packages/bag/tools/sorting.lua
+++ b/Interface/AddOns/SVUI/packages/bag/tools/sorting.lua
@@ -43,7 +43,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVBag;
 --[[
 ##########################################################
@@ -436,7 +436,7 @@ do
 		if not sorter then sorter = reverse and ReverseSort or DefaultSort end
 		if not itemTypes then BuildSortOrder() end
 		twipe(blackListedSlots)
-		local ignoreItems = MOD.db.ignoreItems
+		local ignoreItems = SV.db.SVBag.ignoreItems
 		ignoreItems = ignoreItems:gsub(',%s', ',')
 		SetBlockedCache(split(",", ignoreItems))
 		for i, bag, slot in IterateBagsForSorting(bags, nil, 'both') do
@@ -510,14 +510,14 @@ do
 				if bagType ~= 'Normal' then
 					MOD.Stack(sortedBags, sortedBags, IsPartial)
 					MOD.Stack(sortingCache[1]['Normal'], sortedBags)
-					SortFiller(sortingCache[1]['Normal'], sortedBags, MOD.db.sortInverted)
-					Sorter(sortedBags, nil, MOD.db.sortInverted)
+					SortFiller(sortingCache[1]['Normal'], sortedBags, SV.db.SVBag.sortInverted)
+					Sorter(sortedBags, nil, SV.db.SVBag.sortInverted)
 					twipe(sortedBags)
 				end
 			end
 			if sortingCache[1]['Normal'] then
 				MOD.Stack(sortingCache[1]['Normal'], sortingCache[1]['Normal'], IsPartial)
-				Sorter(sortingCache[1]['Normal'], nil, MOD.db.sortInverted)
+				Sorter(sortingCache[1]['Normal'], nil, SV.db.SVBag.sortInverted)
 				twipe(sortingCache[1]['Normal'])
 			end
 			twipe(sortingCache[1])
diff --git a/Interface/AddOns/SVUI/packages/chat/SVChat.lua b/Interface/AddOns/SVUI/packages/chat/SVChat.lua
index cfad2bf..2ad257d 100644
--- a/Interface/AddOns/SVUI/packages/chat/SVChat.lua
+++ b/Interface/AddOns/SVUI/packages/chat/SVChat.lua
@@ -35,7 +35,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local LSM = LibStub("LibSharedMedia-3.0")
 local MOD = {};
@@ -173,7 +173,7 @@ do

 	local function SetEmoticon(text)
 		if not text then return end
-		if (not MOD.db.smileys or text:find(" / run") or text:find(" / dump") or text:find(" / script")) then
+		if (not SV.db.SVChat.smileys or text:find(" / run") or text:find(" / dump") or text:find(" / script")) then
 			return text
 		end
 		local result = "";
@@ -665,7 +665,7 @@ do
 	end

 	function MOD:RefreshChatFrames(forced)
-		if (not MOD.db.enable) then return; end
+		if (not SV.db.SVChat.enable) then return; end
 		if ((not forced) and refreshLocked and (IsMouseButtonDown("LeftButton") or InCombatLockdown())) then return; end

 		for i,name in pairs(CHAT_FRAMES)do
diff --git a/Interface/AddOns/SVUI/packages/dock/SVDock.lua b/Interface/AddOns/SVUI/packages/dock/SVDock.lua
index 6555e17..e0c47e4 100644
--- a/Interface/AddOns/SVUI/packages/dock/SVDock.lua
+++ b/Interface/AddOns/SVUI/packages/dock/SVDock.lua
@@ -34,7 +34,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local MOD, DOCKLET_CACHE, TOOL_CACHE, SAFETY_CACHE = {}, {}, {}, {};
 local PREV_TOOL, DEFAULT_DOCKLET;
@@ -88,7 +88,7 @@ local function CycleDocklets()
 end

 local AlertActivate = function(self, child)
-	local size = MOD.db.buttonSize or 22;
+	local size = SV.db.SVDock.buttonSize or 22;
 	self:Height(size)
 	child:ClearAllPoints()
 	child:SetAllPoints(self)
@@ -238,7 +238,7 @@ local AddonDockletToggle = function(self)
 		end
 		self:Deactivate()
 	end
-	if MOD.db.docklets.enableExtra and SuperDockletExtra.FrameName and _G[SuperDockletExtra.FrameName] then
+	if SV.db.SVDock.docklets.enableExtra and SuperDockletExtra.FrameName and _G[SuperDockletExtra.FrameName] then
 		if not _G[SuperDockletExtra.FrameName]:IsShown() then
 			if not InCombatLockdown() and not SuperDockletExtra:IsShown()then
 				SuperDockletExtra:Show()
@@ -854,7 +854,7 @@ function SV:RegisterMainDocklet(name)
 	local frame = _G[name];
 	if (frame and (frame.IsObjectType and frame:IsObjectType("Frame")) and (frame.IsProtected and not frame:IsProtected())) then
 		SuperDockletMain.FrameName = name;
-		MOD.db.docklets.MainWindow = name;
+		SV.db.SVDock.docklets.MainWindow = name;
 		frame:ClearAllPoints()
 		frame:SetParent(SuperDockletMain)
 		frame:SetAllPoints(SuperDockletMain)
@@ -873,7 +873,7 @@ function SV:RegisterExtraDocklet(name)
 	local frame = _G[name];
 	if (frame and (frame.IsObjectType and frame:IsObjectType("Frame")) and (frame.IsProtected and not frame:IsProtected())) then
 		SuperDockletExtra.FrameName = name;
-		MOD.db.docklets.ExtraWindow = name;
+		SV.db.SVDock.docklets.ExtraWindow = name;
 		frame:ClearAllPoints()
 		frame:SetParent(SuperDockletExtra)
 		frame:SetAllPoints(SuperDockletExtra)
diff --git a/Interface/AddOns/SVUI/packages/gear/SVGear.lua b/Interface/AddOns/SVUI/packages/gear/SVGear.lua
index 4a346b4..24a47eb 100644
--- a/Interface/AddOns/SVUI/packages/gear/SVGear.lua
+++ b/Interface/AddOns/SVUI/packages/gear/SVGear.lua
@@ -33,7 +33,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local MOD = {};
 --[[
@@ -123,10 +123,10 @@ local function GetActiveGear()
 	local count = GetNumEquipmentSets()
 	local resultSpec = GetActiveSpecGroup()
 	local resultSet
-	EQUIP_SET = MOD.db.equipmentset
+	EQUIP_SET = SV.db.SVGear.equipmentset
 	SPEC_SET = nil
 	if(resultSpec and GetSpecializationInfo(resultSpec)) then
-		SPEC_SET = resultSpec == 1 and MOD.db.primary or MOD.db.secondary
+		SPEC_SET = resultSpec == 1 and SV.db.SVGear.primary or SV.db.SVGear.secondary
 	end
 	if(count == 0) then
 		return resultSpec,false
@@ -237,7 +237,7 @@ local function GearSwap()
 	if(InCombatLockdown()) then return; end
 	local gearSpec, gearSet = GetActiveGear()
 	if(not gearSet) then return; end
-	if MOD.db.battleground.enable then
+	if SV.db.SVGear.battleground.enable then
 		local inDungeon,dungeonType = IsInInstance()
 		if(inDungeon and dungeonType == "pvp" or dungeonType == "arena") then
 			if EQUIP_SET ~= "none" and EQUIP_SET ~= gearSet then
diff --git a/Interface/AddOns/SVUI/packages/henchmen/SVHenchmen.lua b/Interface/AddOns/SVUI/packages/henchmen/SVHenchmen.lua
index a7d98d1..96debda 100644
--- a/Interface/AddOns/SVUI/packages/henchmen/SVHenchmen.lua
+++ b/Interface/AddOns/SVUI/packages/henchmen/SVHenchmen.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local MOD = {}
 --[[
@@ -279,12 +279,12 @@ local function CreateMinionOptions(i)
 	end

 	local setting = options[4];
-	local dbSet = MOD.db[setting];
+	local dbSet = SV.db.SVHenchmen[setting];
 	option.setting = function(toggle)
 		if(toggle == nil) then
-			return MOD.db[setting]
+			return SV.db.SVHenchmen[setting]
 		else
-			MOD.db[setting] = toggle;
+			SV.db.SVHenchmen[setting] = toggle;
 		end
 	end
 	SV.Animate:Slide(option,-500,-500)
@@ -631,7 +631,7 @@ MAIL HELPER
 ##########################################################
 ]]--
 function MOD:ToggleMailMinions()
-	if not MOD.db.mailOpener then
+	if not SV.db.SVHenchmen.mailOpener then
 		SVUI_MailMinion:Hide()
 	else
 		SVUI_MailMinion:Show()
@@ -952,14 +952,14 @@ function MOD:Load()
 	skippy:RegisterEvent("CINEMATIC_START")
 	skippy:SetScript("OnEvent", function(_, event)
 		if event == "CINEMATIC_START" then
-			if(MOD.db.skipcinematics) then
+			if(SV.db.SVHenchmen.skipcinematics) then
 				CinematicFrame_CancelCinematic()
 			end
 		end
 	end)
 	local PlayMovie_hook = MovieFrame_PlayMovie
 	MovieFrame_PlayMovie = function(...)
-		if(MOD.db.skipcinematics) then
+		if(SV.db.SVHenchmen.skipcinematics) then
 			GameMovieFinished()
 		else
 			PlayMovie_hook(...)
diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua
index 6be534a..2867584 100644
--- a/Interface/AddOns/SVUI/packages/map/SVMap.lua
+++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua
@@ -37,7 +37,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local MOD = {};
 MOD.MinimapButtons = {}
@@ -87,7 +87,7 @@ local MM_HEIGHT = (MM_SIZE - (MM_OFFSET_TOP + MM_OFFSET_BOTTOM) + (MM_BRDR * 2))
 |_______/  \______/    |__/     |__/  \______/ |__/  \__/ \______/
 --]]
 local MMB_OnEnter = function(self)
-	if(not MOD.db.minimapbar.mouseover or MOD.db.minimapbar.styleType == "NOANCHOR") then return end
+	if(not SV.db.SVMap.minimapbar.mouseover or SV.db.SVMap.minimapbar.styleType == "NOANCHOR") then return end
 	UIFrameFadeIn(SVUI_MiniMapButtonBar, 0.2, SVUI_MiniMapButtonBar:GetAlpha(), 1)
 	if self:GetName() ~= "SVUI_MiniMapButtonBar" then
 		self:SetBackdropBorderColor(.7, .7, 0)
@@ -95,7 +95,7 @@ local MMB_OnEnter = function(self)
 end

 local MMB_OnLeave = function(self)
-	if(not MOD.db.minimapbar.mouseover or MOD.db.minimapbar.styleType == "NOANCHOR") then return end
+	if(not SV.db.SVMap.minimapbar.mouseover or SV.db.SVMap.minimapbar.styleType == "NOANCHOR") then return end
 	UIFrameFadeOut(SVUI_MiniMapButtonBar, 0.2, SVUI_MiniMapButtonBar:GetAlpha(), 0)
 	if self:GetName() ~= "SVUI_MiniMapButtonBar" then
 		self:SetBackdropBorderColor(0, 0, 0)
@@ -106,11 +106,11 @@ do
 	local reserved = {"Node", "Tab", "Pin", "SVUI_ConsolidatedBuffs", "GameTimeframe", "HelpOpenTicketButton", "SVUI_MinimapFrame", "SVUI_EnhancedMinimap", "QueueStatusMinimapButton", "TimeManagerClockButton", "Archy", "GatherMatePin", "GatherNote", "GuildInstance", "HandyNotesPin", "MinimMap", "Spy_MapNoteList_mini", "ZGVMarker"}

 	local function UpdateMinimapButtons()
-		if(not MOD.db.minimapbar.enable) then return end
+		if(not SV.db.SVMap.minimapbar.enable) then return end

 		MMBBar:SetPoint("CENTER", MMBHolder, "CENTER", 0, 0)
-		MMBBar:Height(MOD.db.minimapbar.buttonSize + 4)
-		MMBBar:Width(MOD.db.minimapbar.buttonSize + 4)
+		MMBBar:Height(SV.db.SVMap.minimapbar.buttonSize + 4)
+		MMBBar:Width(SV.db.SVMap.minimapbar.buttonSize + 4)

 		local lastButton, anchor, relative, xPos, yPos;
 		local list  = MOD.MinimapButtons
@@ -118,7 +118,7 @@ do

 		for name,btn in pairs(list) do
 			local preset = btn.preset;
-			if(MOD.db.minimapbar.styleType == "NOANCHOR") then
+			if(SV.db.SVMap.minimapbar.styleType == "NOANCHOR") then
 				btn:SetParent(preset.Parent)
 				if preset.DragStart then
 					btn:SetScript("OnDragStart", preset.DragStart)
@@ -141,8 +141,8 @@ do
 				btn:ClearAllPoints()
 				btn:SetFrameStrata("LOW")
 				btn:SetFrameLevel(20)
-				btn:Size(MOD.db.minimapbar.buttonSize)
-				if MOD.db.minimapbar.styleType == "HORIZONTAL"then
+				btn:Size(SV.db.SVMap.minimapbar.buttonSize)
+				if SV.db.SVMap.minimapbar.styleType == "HORIZONTAL"then
 					anchor = "RIGHT"
 					relative = "LEFT"
 					xPos = -2;
@@ -162,11 +162,11 @@ do
 			lastButton = btn
 			count = count + 1
 		end
-		if (MOD.db.minimapbar.styleType ~= "NOANCHOR" and (count > 0)) then
-			if MOD.db.minimapbar.styleType == "HORIZONTAL" then
-				MMBBar:Width((MOD.db.minimapbar.buttonSize * count) + count * 2)
+		if (SV.db.SVMap.minimapbar.styleType ~= "NOANCHOR" and (count > 0)) then
+			if SV.db.SVMap.minimapbar.styleType == "HORIZONTAL" then
+				MMBBar:Width((SV.db.SVMap.minimapbar.buttonSize * count) + count * 2)
 			else
-				MMBBar:Height((MOD.db.minimapbar.buttonSize * count) + count * 2)
+				MMBBar:Height((SV.db.SVMap.minimapbar.buttonSize * count) + count * 2)
 			end
 			MMBHolder:SetSize(MMBBar:GetSize())
 			MMBBar:Show()
@@ -254,7 +254,7 @@ do

 		UpdateMinimapButtons()

-		if MOD.db.minimapbar.mouseover then
+		if SV.db.SVMap.minimapbar.mouseover then
 			MMBBar:SetAlpha(0)
 		else
 			MMBBar:SetAlpha(1)
@@ -262,7 +262,7 @@ do
 	end

 	function MOD:UpdateMinimapButtonSettings(notimer)
-		if(not self.db.minimapbar.enable or not MMBBar:IsShown()) then return end
+		if(not SV.db.SVMap.minimapbar.enable or not MMBBar:IsShown()) then return end
 		if(notimer) then
 			StyleMinimapButtons()
 		else
@@ -274,7 +274,7 @@ end
 local function CheckMovement()
 	if(not WorldMapFrame:IsShown()) then return end
 	if GetUnitSpeed("player") ~= 0 then
-		WorldMapFrame:SetAlpha(MOD.db.mapAlpha)
+		WorldMapFrame:SetAlpha(SV.db.SVMap.mapAlpha)
 	else
 		WorldMapFrame:SetAlpha(1)
 	end
@@ -325,7 +325,7 @@ local function UpdateMapCoords()
 			SVUI_WorldMapCoords.playerCoords:SetText("")
 		end
 	end
-	if(MOD.db.mapAlpha < 100) then
+	if(SV.db.SVMap.mapAlpha < 100) then
 		CheckMovement()
 	end
 end
@@ -344,7 +344,7 @@ end
 local function SetLargeWorldMap()
 	if InCombatLockdown() then return end

-	if MOD.db.tinyWorldMap == true then
+	if SV.db.SVMap.tinyWorldMap == true then
 		WorldMapFrame:SetParent(SV.UIParent)
 		WorldMapFrame:EnableMouse(false)
 		WorldMapFrame:EnableKeyboard(false)
@@ -364,7 +364,7 @@ end
 local function SetQuestWorldMap()
 	if InCombatLockdown() then return end

-	if MOD.db.tinyWorldMap == true then
+	if SV.db.SVMap.tinyWorldMap == true then
 		WorldMapFrame:SetParent(SV.UIParent)
 		WorldMapFrame:EnableMouse(false)
 		WorldMapFrame:EnableKeyboard(false)
@@ -390,7 +390,7 @@ end

 local function AdjustMapSize()
 	if InCombatLockdown() then return end
-	if MOD.db.tinyWorldMap == true then
+	if SV.db.SVMap.tinyWorldMap == true then
 		if WORLDMAP_SETTINGS.size == WORLDMAP_FULLMAP_SIZE then
 			SetLargeWorldMap()
 		elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then
@@ -576,7 +576,7 @@ CORE FUNCTIONS
 ##########################################################
 ]]--
 function MOD:RefreshMiniMap()
-	if(not self.db.enable) then return; end
+	if(not SV.db.SVMap.enable) then return; end
 	if(InCombatLockdown()) then
 		self.CombatLocked = true
 		return
@@ -592,7 +592,7 @@ function MOD:RefreshMiniMap()
 		self.Holder:Size(MM_WIDTH, MM_HEIGHT)
 		self.Holder.backdrop:SetGradient(unpack(MM_COLOR))
 		Minimap:Size(MM_SIZE,MM_SIZE)
-		if MOD.db.customshape then
+		if SV.db.SVMap.customshape then
 			Minimap:SetPoint("BOTTOMLEFT", self.Holder, "BOTTOMLEFT", MM_BRDR, -(MM_OFFSET_BOTTOM - MM_BRDR))
 			Minimap:SetPoint("TOPRIGHT", self.Holder, "TOPRIGHT", -MM_BRDR, (MM_OFFSET_TOP - MM_BRDR))
 			Minimap:SetMaskTexture('Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP_MASK_RECTANGLE')
@@ -704,7 +704,7 @@ BUILD FUNCTION / UPDATE
 ##########################################################
 ]]--
 function MOD:UpdateLocals()
-	local db = self.db
+	local db = SV.db.SVMap
 	if not db then return end

 	MM_XY_COORD = db.playercoords;
@@ -720,12 +720,12 @@ function MOD:UpdateLocals()
 end

 function MOD:ReLoad()
-	if(not self.db.enable) then return; end
+	if(not SV.db.SVMap.enable) then return; end
 	self:RefreshMiniMap()
 end

 function MOD:Load()
-	if(not self.db.enable) then
+	if(not SV.db.SVMap.enable) then
 		Minimap:SetMaskTexture('Textures\\MinimapMask')
 		return
 	end
@@ -882,7 +882,7 @@ function MOD:Load()
 		WorldMapZoneDropDownButton:HookScript('OnClick', _hook_WorldMapZoneDropDownButton_OnClick)
 	end

-	if(self.db.tinyWorldMap) then
+	if(SV.db.SVMap.tinyWorldMap) then
 		setfenv(WorldMapFrame_OnShow, setmetatable({ UpdateMicroButtons = SV.fubar }, { __index = _G }))
 		WorldMapFrame:SetParent(SV.UIParent)
 		WorldMapFrame:SetFrameLevel(4)
@@ -962,7 +962,7 @@ function MOD:Load()
 	trackingButton:SetScript("OnLeave", Basic_OnLeave)
 	trackingButton:SetScript("OnClick", Tracking_OnClick)

-	if(self.db.minimapbar.enable == true) then
+	if(SV.db.SVMap.minimapbar.enable == true) then
 		MMBHolder = CreateFrame("Frame", "SVUI_MiniMapButtonHolder", mapHolder)
 		MMBHolder:Point("TOPRIGHT", SVUI_MiniMapCoords, "BOTTOMRIGHT", 0, -4)
 		MMBHolder:Size(mapHolder:GetWidth(), 32)
@@ -992,4 +992,4 @@ end
 DEFINE CONFIG AND REGISTER
 ##########################################################
 ]]--
-SVLib:NewPackage(MOD, "SVMap")
\ No newline at end of file
+SVLib:NewPackage(MOD, "SVMap", true)
\ 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 0b27674..0470d60 100644
--- a/Interface/AddOns/SVUI/packages/override/SVOverride.lua
+++ b/Interface/AddOns/SVUI/packages/override/SVOverride.lua
@@ -34,7 +34,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local LSM = LibStub("LibSharedMedia-3.0")
 local MOD = {};
diff --git a/Interface/AddOns/SVUI/packages/plates/SVPlate.lua b/Interface/AddOns/SVUI/packages/plates/SVPlate.lua
index b96ac10..1787263 100644
--- a/Interface/AddOns/SVUI/packages/plates/SVPlate.lua
+++ b/Interface/AddOns/SVUI/packages/plates/SVPlate.lua
@@ -50,7 +50,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local LSM = LibStub("LibSharedMedia-3.0")
 local MOD = {};
diff --git a/Interface/AddOns/SVUI/packages/stats/SVStats.lua b/Interface/AddOns/SVUI/packages/stats/SVStats.lua
index 7cbc2b2..1ff86b4 100644
--- a/Interface/AddOns/SVUI/packages/stats/SVStats.lua
+++ b/Interface/AddOns/SVUI/packages/stats/SVStats.lua
@@ -34,7 +34,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local LSM = LibStub("LibSharedMedia-3.0")
 local LDB = LibStub("LibDataBroker-1.1")
@@ -116,7 +116,7 @@ local function GrabPlot(parent, slot, max)
 end

 local UpdateAnchor = function()
-	local backdrops, width, height = MOD.db.showBackground
+	local backdrops, width, height = SV.db.SVStats.showBackground
 	for _, anchor in pairs(MOD.Anchors) do
 		if(anchor.vertical) then
 			width = anchor:GetWidth() - 4;
@@ -208,7 +208,7 @@ function MOD:NewAnchor(parent, maxCount, tipAnchor, isTop, customTemplate, isVer
 			parent.holders[position] = CreateFrame("Button", "DataText"..i, parent)
 			parent.holders[position]:RegisterForClicks("AnyUp")
 			parent.holders[position].barframe = CreateFrame("Frame", nil, parent.holders[position])
-			if(MOD.db.showBackground) then
+			if(SV.db.SVStats.showBackground) then
 				parent.holders[position].barframe:Point("TOPLEFT", parent.holders[position], "TOPLEFT", 24, -2)
 				parent.holders[position].barframe:Point("BOTTOMRIGHT", parent.holders[position], "BOTTOMRIGHT", -2, 2)
 				parent.holders[position]:SetFramedButtonTemplate(template)
@@ -251,12 +251,12 @@ function MOD:NewAnchor(parent, maxCount, tipAnchor, isTop, customTemplate, isVer
 			parent.holders[position].textframe:SetFrameStrata(strata)
 			parent.holders[position].text = parent.holders[position].textframe:CreateFontString(nil, "OVERLAY", nil, 7)
 			parent.holders[position].text:SetAllPoints()
-			if(MOD.db.showBackground) then
-				parent.holders[position].text:SetFontTemplate(LSM:Fetch("font", MOD.db.font), MOD.db.fontSize, "NONE", "CENTER", "MIDDLE")
+			if(SV.db.SVStats.showBackground) then
+				parent.holders[position].text:SetFontTemplate(LSM:Fetch("font", SV.db.SVStats.font), SV.db.SVStats.fontSize, "NONE", "CENTER", "MIDDLE")
 				parent.holders[position].text:SetShadowColor(0, 0, 0, 0.5)
 				parent.holders[position].text:SetShadowOffset(2, -4)
 			else
-				parent.holders[position].text:SetFontTemplate(LSM:Fetch("font", MOD.db.font), MOD.db.fontSize, MOD.db.fontOutline)
+				parent.holders[position].text:SetFontTemplate(LSM:Fetch("font", SV.db.SVStats.font), SV.db.SVStats.fontSize, SV.db.SVStats.fontOutline)
 				parent.holders[position].text:SetJustifyH("CENTER")
 				parent.holders[position].text:SetJustifyV("MIDDLE")
 			end
@@ -563,7 +563,7 @@ do
 		local instance, groupType = IsInInstance()
 		local anchorTable = self.Anchors
 		local statTable = self.Statistics
-		local db = self.db
+		local db = SV.db.SVStats
 		local allowPvP = (db.battleground and not ForceHideBGStats) or false
 		for place, parent in pairs(anchorTable) do
 			local pvpTable = allowPvP and self.BGPanels[place]
@@ -720,4 +720,4 @@ end
 DEFINE CONFIG AND REGISTER
 ##########################################################
 ]]--
-SVLib:NewPackage(MOD, "SVStats")
\ No newline at end of file
+SVLib:NewPackage(MOD, "SVStats", true)
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI/packages/stats/stats/bags.lua b/Interface/AddOns/SVUI/packages/stats/stats/bags.lua
index dea4390..3d000ef 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/bags.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/bags.lua
@@ -50,7 +50,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local MOD = SV.SVStats;
 --[[
diff --git a/Interface/AddOns/SVUI/packages/stats/stats/cta.lua b/Interface/AddOns/SVUI/packages/stats/stats/cta.lua
index 020ed42..65f045e 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/cta.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/cta.lua
@@ -50,7 +50,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local MOD = SV.SVStats;
 --[[
diff --git a/Interface/AddOns/SVUI/packages/stats/stats/dps.lua b/Interface/AddOns/SVUI/packages/stats/stats/dps.lua
index caea669..eeb4aa0 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/dps.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/dps.lua
@@ -32,7 +32,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local MOD = SV.SVStats;
 --[[
diff --git a/Interface/AddOns/SVUI/packages/stats/stats/durability.lua b/Interface/AddOns/SVUI/packages/stats/stats/durability.lua
index 70a32e4..9e6401b 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/durability.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/durability.lua
@@ -50,7 +50,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local LSM = LibStub("LibSharedMedia-3.0")
 local MOD = SV.SVStats;
@@ -86,7 +86,7 @@ local function Durability_OnEvent(self, ...)
 		self.text:SetAllPoints(self)
 		self.text:SetJustifyH("CENTER")
 		self.barframe:Hide()
-		self.text:SetFontTemplate(LSM:Fetch("font",MOD.db.font),MOD.db.fontSize,MOD.db.fontOutline)
+		self.text:SetFontTemplate(LSM:Fetch("font",SV.db.SVStats.font),SV.db.SVStats.fontSize,SV.db.SVStats.fontOutline)
 	end
 	for slot,name in pairs(inventoryMap)do
 		local slotID = GetInventorySlotInfo(slot)
@@ -107,7 +107,7 @@ local function DurabilityBar_OnEvent(self, ...)
 	if not self.barframe:IsShown() then
 		self.barframe:Show()
 		self.barframe.icon.texture:SetTexture("Interface\\Addons\\SVUI\\assets\\artwork\\Icons\\STAT-DUR")
-		self.text:SetFontTemplate(LSM:Fetch("font",MOD.db.font),MOD.db.fontSize,"NONE")
+		self.text:SetFontTemplate(LSM:Fetch("font",SV.db.SVStats.font),SV.db.SVStats.fontSize,"NONE")
 	end
 	for slot,name in pairs(inventoryMap)do
 		local slotID = GetInventorySlotInfo(slot)
diff --git a/Interface/AddOns/SVUI/packages/stats/stats/experience.lua b/Interface/AddOns/SVUI/packages/stats/stats/experience.lua
index 3d28a5b..b0bc7f3 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/experience.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/experience.lua
@@ -33,7 +33,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local LSM = LibStub("LibSharedMedia-3.0")
 local MOD = SV.SVStats;
 --[[
diff --git a/Interface/AddOns/SVUI/packages/stats/stats/friends.lua b/Interface/AddOns/SVUI/packages/stats/stats/friends.lua
index 1a51468..b4372bd 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/friends.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/friends.lua
@@ -50,7 +50,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local MOD = SV.SVStats;
 --[[
diff --git a/Interface/AddOns/SVUI/packages/stats/stats/gold.lua b/Interface/AddOns/SVUI/packages/stats/stats/gold.lua
index 5b8d727..28d931d 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/gold.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/gold.lua
@@ -50,7 +50,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVStats;
 --[[
 ##########################################################
@@ -108,7 +108,7 @@ local function Gold_OnEvent(self, event,...)
 	else
 		gains = gains + adjusted
 	end
-	self.text:SetText(FormatCurrency(current, MOD.db.shortGold))
+	self.text:SetText(FormatCurrency(current, SV.db.SVStats.shortGold))
 	MOD.Accountant[playerRealm]["gold"][playerName] = GetMoney()
 end

diff --git a/Interface/AddOns/SVUI/packages/stats/stats/guild.lua b/Interface/AddOns/SVUI/packages/stats/stats/guild.lua
index 675aab6..4c0573b 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/guild.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/guild.lua
@@ -37,7 +37,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local MOD = SV.SVStats;
 --[[
diff --git a/Interface/AddOns/SVUI/packages/stats/stats/hps.lua b/Interface/AddOns/SVUI/packages/stats/stats/hps.lua
index bc9bf17..7389d6e 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/hps.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/hps.lua
@@ -33,7 +33,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local MOD = SV.SVStats;
 --[[
diff --git a/Interface/AddOns/SVUI/packages/stats/stats/reputation.lua b/Interface/AddOns/SVUI/packages/stats/stats/reputation.lua
index c735793..934db63 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/reputation.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/reputation.lua
@@ -34,7 +34,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVStats;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/packages/stats/stats/system.lua b/Interface/AddOns/SVUI/packages/stats/stats/system.lua
index 6e380aa..e7ecd28 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/system.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/system.lua
@@ -38,7 +38,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang();
 local MOD = SV.SVStats;
 --[[
@@ -84,8 +84,9 @@ local function RebuildAddonList()
 	memoryTable = {}
 	cpuTable = {}
 	for i = 1, addOnCount do
-		memoryTable[i] = { i, select(2, GetAddOnInfo(i)), 0, IsAddOnLoaded(i) }
-		cpuTable[i] = { i, select(2, GetAddOnInfo(i)), 0, IsAddOnLoaded(i) }
+		local addonName = select(2, GetAddOnInfo(i))
+		memoryTable[i] = { i, addonName, 0, IsAddOnLoaded(i) }
+		cpuTable[i] = { i, addonName, 0, IsAddOnLoaded(i) }
 	end
 end

@@ -214,27 +215,43 @@ local function OnLeave(self)
 	MOD.tooltip:Hide()
 end

-local function Update(self, t)
-	int = int - t
-	int2 = int2 - t
-
-	if int < 0 then
-		RebuildAddonList()
-		int = 10
+local Update
+if(SV.DebugMode) then
+	Update = function(self, t)
+		int = int - t
+		if int < 0 then
+			UpdateAddOnMemoryUsage()
+			local svuiRAMout = formatMem(GetAddOnMemoryUsage("SVUI"))
+			self.text:SetFormattedText("RAM: %s%s|r", statusColors[1], svuiRAMout)
+			int = 1
+			if enteredFrame then
+				OnEnter(self)
+			end
+		end
 	end
-	if int2 < 0 then
-		local framerate = floor(GetFramerate())
-		local latency = select(4, GetNetStats())
-
-		self.text:SetFormattedText("FPS: %s%d|r MS: %s%d|r",
-			statusColors[framerate >= 30 and 1 or (framerate >= 20 and framerate < 30) and 2 or (framerate >= 10 and framerate < 20) and 3 or 4],
-			framerate,
-			statusColors[latency < 150 and 1 or (latency >= 150 and latency < 300) and 2 or (latency >= 300 and latency < 500) and 3 or 4],
-			latency)
-		int2 = 1
-		if enteredFrame then
-			OnEnter(self)
-		end
+else
+	Update = function(self, t)
+		int = int - t
+		int2 = int2 - t
+
+		if int < 0 then
+			RebuildAddonList()
+			int = 10
+		end
+		if int2 < 0 then
+			local framerate = floor(GetFramerate())
+			local latency = select(4, GetNetStats())
+
+			self.text:SetFormattedText("FPS: %s%d|r MS: %s%d|r",
+				statusColors[framerate >= 30 and 1 or (framerate >= 20 and framerate < 30) and 2 or (framerate >= 10 and framerate < 20) and 3 or 4],
+				framerate,
+				statusColors[latency < 150 and 1 or (latency >= 150 and latency < 300) and 2 or (latency >= 300 and latency < 500) and 3 or 4],
+				latency)
+			int2 = 1
+			if enteredFrame then
+				OnEnter(self)
+			end
+		end
 	end
 end

diff --git a/Interface/AddOns/SVUI/packages/stats/stats/time.lua b/Interface/AddOns/SVUI/packages/stats/stats/time.lua
index f61e803..fee8ae4 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/time.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/time.lua
@@ -36,7 +36,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local MOD = SV.SVStats;
 --[[
@@ -74,7 +74,7 @@ end

 local function ConvertTime(h, m)
 	local AmPm
-	if MOD.db.time24 == true then
+	if SV.db.SVStats.time24 == true then
 		return h, m, -1
 	else
 		if h >= 12 then
@@ -89,7 +89,7 @@ local function ConvertTime(h, m)
 end

 local function CalculateTimeValues(tooltip)
-	if (tooltip and MOD.db.localtime) or (not tooltip and not MOD.db.localtime) then
+	if (tooltip and SV.db.SVStats.localtime) or (not tooltip and not SV.db.SVStats.localtime) then
 		return ConvertTime(GetGameTime())
 	else
 		local	dateTable =	date("*t")
@@ -177,10 +177,10 @@ local function OnEnter(self)

 	MOD.tooltip:AddLine(" ")
 	if AmPm == -1 then
-		MOD.tooltip:AddDoubleLine(MOD.db.localtime and TIMEMANAGER_TOOLTIP_REALMTIME or TIMEMANAGER_TOOLTIP_LOCALTIME,
+		MOD.tooltip:AddDoubleLine(SV.db.SVStats.localtime and TIMEMANAGER_TOOLTIP_REALMTIME or TIMEMANAGER_TOOLTIP_LOCALTIME,
 			format(europeDisplayFormat_nocolor, Hr, Min), 1, 1, 1, lockoutColorNormal.r, lockoutColorNormal.g, lockoutColorNormal.b)
 	else
-		MOD.tooltip:AddDoubleLine(MOD.db.localtime and TIMEMANAGER_TOOLTIP_REALMTIME or TIMEMANAGER_TOOLTIP_LOCALTIME,
+		MOD.tooltip:AddDoubleLine(SV.db.SVStats.localtime and TIMEMANAGER_TOOLTIP_REALMTIME or TIMEMANAGER_TOOLTIP_LOCALTIME,
 			format(ukDisplayFormat_nocolor, Hr, Min, APM[AmPm]), 1, 1, 1, lockoutColorNormal.r, lockoutColorNormal.g, lockoutColorNormal.b)
 	end

diff --git a/Interface/AddOns/SVUI/packages/stats/stats/tokens.lua b/Interface/AddOns/SVUI/packages/stats/stats/tokens.lua
index 6ecdfd2..e3e34fe 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/tokens.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/tokens.lua
@@ -32,7 +32,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVStats;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/packages/tip/SVTip.lua b/Interface/AddOns/SVUI/packages/tip/SVTip.lua
index 5e92b92..451a544 100644
--- a/Interface/AddOns/SVUI/packages/tip/SVTip.lua
+++ b/Interface/AddOns/SVUI/packages/tip/SVTip.lua
@@ -37,7 +37,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local LSM = LibStub("LibSharedMedia-3.0")
 local MOD = {};
@@ -276,8 +276,8 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self)
 	self.SuperBorder:ClearMaskColors()
 	local unit = select(2, self:GetUnit())
 	local TamablePet;
-	if self:GetOwner()  ~= UIParent and MOD.db.visibility.unitFrames  ~= "NONE" then
-		local vis = MOD.db.visibility.unitFrames;
+	if self:GetOwner()  ~= UIParent and SV.db.SVTip.visibility.unitFrames  ~= "NONE" then
+		local vis = SV.db.SVTip.visibility.unitFrames;
 		if vis == "ALL" or not (vis == "SHIFT" and IsShiftKeyDown() or vis == "CTRL" and IsControlKeyDown() or vis == "ALT" and IsAltKeyDown()) then
 			self:Hide()
 			return
@@ -308,7 +308,7 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self)

 		self.SuperBorder:SetBurstColor(burst.r, burst.g, burst.b)

-		if MOD.db.playerTitles and pvpName then
+		if SV.db.SVTip.playerTitles and pvpName then
 			unitName = pvpName
 		end
 		if unitRealm and unitRealm ~= "" then
@@ -334,7 +334,7 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self)
 				guildName = guildName.."-"..guildRealm
 			end

-			if guildRankName and MOD.db.guildRanks then
+			if guildRankName and SV.db.SVTip.guildRanks then
 				GameTooltipTextLeft2:SetText(("<|cff00ff10%s|r> [|cff00ff10%s|r]"):format(guildName, guildRankName))
 			else
 				GameTooltipTextLeft2:SetText(("<|cff00ff10%s|r>"):format(guildName))
@@ -354,7 +354,7 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self)
 			lvlLine:SetFormattedText("|cff%02x%02x%02x%s|r %s |c%s%s|r", qColor.r * 255, qColor.g * 255, qColor.b * 255, unitLevel > 0 and unitLevel or SKULL_ICON, race or "", colors.colorStr, className)
 		end

-		if(not IsAddOnLoaded("HealBot") and (MOD.db.inspectInfo or isShiftKeyDown)) then
+		if(not IsAddOnLoaded("HealBot") and (SV.db.SVTip.inspectInfo or isShiftKeyDown)) then
 			ShowInspectInfo(self, unit, unitLevel, colors.r, colors.g, colors.b, 0)
 		end
 	else
@@ -405,7 +405,7 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self)
 	if(TamablePet) then
 		GameTooltip:AddLine(TAMABLE_INDICATOR)
 	end
-	if MOD.db.targetInfo then
+	if SV.db.SVTip.targetInfo then
 		local unitTarget = unit.."target"
 		if(unit ~= "player" and UnitExists(unitTarget)) then
 			if UnitIsPlayer(unitTarget) and not UnitHasVehicleUI(unitTarget) then
@@ -438,7 +438,7 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self)
 end

 local _hook_GameTooltipStatusBar_OnValueChanged = function(self, value)
-	if not value or not MOD.db.healthBar.text or not self.text then return end
+	if not value or not SV.db.SVTip.healthBar.text or not self.text then return end
 	local unit = select(2,self:GetParent():GetUnit())
 	if not unit then
 		local mFocus = GetMouseFocus()
@@ -470,7 +470,7 @@ local _hook_GameTooltip_OnTooltipSetItem = function(self)
 		end
 		local left = "";
 		local right = "";
-		if itemID ~= nil and MOD.db.spellID then
+		if itemID ~= nil and SV.db.SVTip.spellID then
 			left = "|cFFCA3C3CSpell ID: |r"
 			right = ("|cFFCA3C3C%s|r %s"):format(ID,itemID):match(":(%w+)")
 		end
@@ -508,7 +508,7 @@ end

 local _hook_OnSetUnitAura = function(self, unit, index, filter)
 	local _, _, _, _, _, _, _, caster, _, _, spellID = UnitAura(unit, index, filter)
-	if spellID and MOD.db.spellID then
+	if spellID and SV.db.SVTip.spellID then
 		self.SuperBorder:ClearMaskColors()
 		if caster then
 			local name = UnitName(caster)
@@ -566,14 +566,14 @@ local _hook_GameTooltip_OnTooltipSetSpell = function(self)
 end

 local _hook_GameTooltip_SetDefaultAnchor = function(self, parent)
-	if MOD.db.enable ~= true then return end
+	if SV.db.SVTip.enable ~= true then return end
 	if(self:GetAnchorType() ~= "ANCHOR_NONE") then return end
-	if InCombatLockdown() and MOD.db.visibility.combat then
+	if InCombatLockdown() and SV.db.SVTip.visibility.combat then
 		self:Hide()
 		return
 	end
 	if parent then
-		if(MOD.db.cursorAnchor) then
+		if(SV.db.SVTip.cursorAnchor) then
 			self:SetOwner(parent, "ANCHOR_CURSOR")
 			return
 		else
@@ -688,7 +688,7 @@ local _hook_OnTipHide = function(self)
 end

 local function ApplyTooltipSkins()
-	local barHeight = MOD.db.healthBar.height
+	local barHeight = SV.db.SVTip.healthBar.height

 	for i, tooltip in pairs(tooltips) do
 		if(not tooltip) then return end
@@ -858,7 +858,7 @@ function MOD:Load()
 	BNToastFrame:Point("TOPRIGHT", SVUI_MinimapFrame, "BOTTOMLEFT", 0, -10)
 	SV.Mentalo:Add(BNToastFrame, L["BNet Frame"], nil, nil, nil, nil, "BNET")
 	NewHook(BNToastFrame, "SetPoint", _hook_BNToastOnShow)
-	if not self.db.enable then return end
+	if not SV.db.SVTip.enable then return end

 	local anchor = CreateFrame("Frame", "SVUI_ToolTip", SV.UIParent)
 	anchor:Point("BOTTOMRIGHT", RightSuperDock, "TOPRIGHT", 0, 60)
@@ -866,7 +866,7 @@ function MOD:Load()
 	anchor:SetFrameLevel(anchor:GetFrameLevel()  +  50)
 	SV.Mentalo:Add(anchor, L["Tooltip"])

-	local barHeight = self.db.healthBar.height
+	local barHeight = SV.db.SVTip.healthBar.height

 	ApplyTooltipSkins()

@@ -877,7 +877,7 @@ function MOD:Load()
 	GameTooltipStatusBar:SetPoint("BOTTOMRIGHT", GameTooltip.SuperBorder, "BOTTOMRIGHT", -3, 3)
 	GameTooltipStatusBar.text = GameTooltipStatusBar:CreateFontString(nil, "OVERLAY")
 	GameTooltipStatusBar.text:Point("CENTER", GameTooltipStatusBar, "CENTER", 0, 0)
-	GameTooltipStatusBar.text:SetFontTemplate(LSM:Fetch("font", MOD.db.healthBar.font), MOD.db.healthBar.fontSize, "OUTLINE")
+	GameTooltipStatusBar.text:SetFontTemplate(LSM:Fetch("font", SV.db.SVTip.healthBar.font), SV.db.SVTip.healthBar.fontSize, "OUTLINE")

 	if not GameTooltipStatusBar.border then
 		local border = CreateFrame("Frame", nil, GameTooltipStatusBar)
@@ -898,7 +898,7 @@ function MOD:Load()
 	NewHook(GameTooltip, "SetUnitDebuff", _hook_OnSetUnitAura)
 	NewHook(GameTooltip, "SetUnitConsolidatedBuff", _hook_OnSetHyperUnitAura)

-	if self.db.spellID then
+	if SV.db.SVTip.spellID then
 		NewHook("SetItemRef", _hook_OnItemRef)
 		GameTooltip:HookScript("OnTooltipSetSpell", _hook_GameTooltip_OnTooltipSetSpell)
 	end
@@ -914,4 +914,4 @@ end
 DEFINE CONFIG AND REGISTER
 ##########################################################
 ]]--
-SVLib:NewPackage(MOD, "SVTip")
\ No newline at end of file
+SVLib:NewPackage(MOD, "SVTip", true)
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua
index b9db340..a02bfc4 100644
--- a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua
+++ b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua
@@ -57,7 +57,7 @@ local oUF_Villain = SV.oUF

 assert(oUF_Villain, "SVUI was unable to locate oUF.")

-local SVLib = LibStub("LibSuperVillain-1.0");
+local SVLib = LibSuperVillain;
 local L = SVLib:Lang();
 local LSM = LibStub("LibSharedMedia-3.0");
 --[[
@@ -170,7 +170,7 @@ do
 	end

 	function oUF_Villain:DisableBlizzard(unit)
-		if(not MOD.db.enable) then return end
+		if(not SV.db.SVUnit.enable) then return end
 		if (not unit) or InCombatLockdown() then return end

 		if (unit == "player") then
@@ -232,8 +232,8 @@ end
 function MOD:GetActiveSize(db)
 	local width, height, best = 0,0,0

-	if(self.db.grid.enable and db.gridAllowed) then
-		width = self.db.grid.size
+	if(SV.db.SVUnit.grid.enable and db.gridAllowed) then
+		width = SV.db.SVUnit.grid.size
 		height = width
 		best = width
 	else
@@ -303,7 +303,7 @@ function MOD:RestrictChildren(parentFrame, ...)

 	for i=1,select("#",...) do
 		local childFrame = select(i,...)
-		childFrame:RegisterForClicks(MOD.db.fastClickTarget and 'AnyDown' or 'AnyUp')
+		childFrame:RegisterForClicks(SV.db.SVUnit.fastClickTarget and 'AnyDown' or 'AnyUp')
 		childFrame.TargetGlow:SetAlpha(1)
 		self:RestrictElement(childFrame)
 	end
@@ -336,16 +336,16 @@ function MOD:RefreshUnitColors()
 	local r, g, b = db.health[1], db.health[2], db.health[3]
 	oUF_Villain.colors.smooth = {1, 0, 0, 1, 1, 0, r, g, b}

-	oUF_Villain.SVConfigs.classbackdrop = self.db.classbackdrop
-	oUF_Villain.SVConfigs.healthclass = self.db.healthclass
-	oUF_Villain.SVConfigs.colorhealthbyvalue = self.db.colorhealthbyvalue
+	oUF_Villain.SVConfigs.classbackdrop = SV.db.SVUnit.classbackdrop
+	oUF_Villain.SVConfigs.healthclass = SV.db.SVUnit.healthclass
+	oUF_Villain.SVConfigs.colorhealthbyvalue = SV.db.SVUnit.colorhealthbyvalue
 end

 function MOD:RefreshAllUnitMedia()
-	if(not self.db or (self.db and self.db.enable ~= true)) then return end
+	if(not SV.db.SVUnit or (SV.db.SVUnit and SV.db.SVUnit.enable ~= true)) then return end
 	self:RefreshUnitColors()
 	for unit,frame in pairs(self.Units)do
-		if self.db[frame.___key].enable then
+		if SV.db.SVUnit[frame.___key].enable then
 			frame:MediaUpdate()
 			frame:UpdateAllElements()
 		end
@@ -360,7 +360,7 @@ function MOD:RefreshUnitFrames()
 	if(InCombatLockdown()) then self:RegisterEvent("PLAYER_REGEN_ENABLED"); return end
 	self:RefreshUnitColors()
 	for unit,frame in pairs(self.Units)do
-		if(self.db.enable == true and self.db[frame.___key].enable) then
+		if(SV.db.SVUnit.enable == true and SV.db.SVUnit[frame.___key].enable) then
 			frame:Enable()
 			frame:Update()
 		else
@@ -384,14 +384,14 @@ function MOD:RefreshUnitFrames()
 		  group:SetConfigEnvironment()
 		end
 	end
-	if self.db.disableBlizzard then
+	if SV.db.SVUnit.disableBlizzard then
 		oUF_Villain:DisableBlizzard('party')
 	end
 	collectgarbage("collect")
 end

 function MOD:RefreshUnitMedia(unitName)
-    local db = MOD.db
+    local db = SV.db.SVUnit
     local key = unitName or self.___key
     if(not (db and db.enable) or not self) then return end
     local CURRENT_BAR_TEXTURE = LSM:Fetch("statusbar", db.statusbar)
@@ -450,7 +450,7 @@ function MOD:RefreshUnitMedia(unitName)
             ab.textOutline = db.auraFontOutline
             ab.buffColor = oUF_Villain.colors.buff_bars

-			if MOD.db.auraBarByType then
+			if SV.db.SVUnit.auraBarByType then
 				ab.debuffColor = nil;
 				ab.defaultDebuffColor = oUF_Villain.colors.debuff_bars
 			else
@@ -479,7 +479,7 @@ function MOD:RefreshUnitMedia(unitName)
 end

 function MOD:RefreshUnitLayout(frame, template)
-	local db = self.db[template]
+	local db = SV.db.SVUnit[template]

 	local TOP_ANCHOR1, TOP_ANCHOR2, TOP_MODIFIER = "TOPRIGHT", "TOPLEFT", 1;
 	local BOTTOM_ANCHOR1, BOTTOM_ANCHOR2, BOTTOM_MODIFIER = "BOTTOMLEFT", "BOTTOMRIGHT", -1;
@@ -495,8 +495,8 @@ function MOD:RefreshUnitLayout(frame, template)
 	local UNIT_WIDTH, UNIT_HEIGHT, BEST_SIZE = self:GetActiveSize(db)
 	local POWER_HEIGHT = (db.power and db.power.enable) and (db.power.height - 1) or 1;
 	local PORTRAIT_WIDTH = (1 * TOP_MODIFIER)
-	local GRID_MODE = (self.db.grid.enable and db.gridAllowed) or false
-	local MINI_GRID = (GRID_MODE and self.db.grid.size < 26) or false
+	local GRID_MODE = (SV.db.SVUnit.grid.enable and db.gridAllowed) or false
+	local MINI_GRID = (GRID_MODE and SV.db.SVUnit.grid.size < 26) or false

 	local healthPanel = frame.HealthPanel
 	local infoPanel = frame.InfoPanel
@@ -508,7 +508,7 @@ function MOD:RefreshUnitLayout(frame, template)
 			PORTRAIT_WIDTH = ((db.portrait.width * TOP_MODIFIER) + (1 * TOP_MODIFIER))
 		else
 			portraitOverlay = true
-			overlayAnimation = self.db.overlayAnimation
+			overlayAnimation = SV.db.SVUnit.overlayAnimation
 		end
 	end

@@ -570,7 +570,7 @@ function MOD:RefreshUnitLayout(frame, template)
 	if(infoPanel.Name and db.name) then
 		local nametext = infoPanel.Name
 		if(GRID_MODE) then
-			if(self.db.grid.shownames and self.db.grid.size >= 30) then
+			if(SV.db.SVUnit.grid.shownames and SV.db.SVUnit.grid.size >= 30) then
 				if(not nametext:IsShown()) then nametext:Show() end
 				nametext:Point("CENTER", frame, "CENTER", 0, 0)
 				nametext:SetJustifyH("CENTER")
@@ -662,7 +662,7 @@ function MOD:RefreshUnitLayout(frame, template)
 			health.fillInverted = false
 		end

-		health.Smooth = self.db.smoothbars;
+		health.Smooth = SV.db.SVUnit.smoothbars;
 		health.colorSmooth = nil;
 		health.colorHealth = nil;
 		health.colorClass = nil;
@@ -673,21 +673,21 @@ function MOD:RefreshUnitLayout(frame, template)
 		if(not GRID_MODE and frame.HealPrediction) then
 			frame.HealPrediction["frequentUpdates"] = health.frequentUpdates
 		end
-		if(not GRID_MODE and portraitOverlay and self.db.forceHealthColor) then
+		if(not GRID_MODE and portraitOverlay and SV.db.SVUnit.forceHealthColor) then
 			health.colorOverlay = true;
 		else
 			if(GRID_MODE or (db.colorOverride and db.colorOverride == "FORCE_ON")) then
 				health.colorClass = true;
 				health.colorReaction = true
 			elseif(db.colorOverride and db.colorOverride == "FORCE_OFF") then
-				if self.db.colorhealthbyvalue == true then
+				if SV.db.SVUnit.colorhealthbyvalue == true then
 					health.colorSmooth = true
 				else
 					health.colorHealth = true
 				end
 			else
-				if(not self.db.healthclass) then
-					if self.db.colorhealthbyvalue == true then
+				if(not SV.db.SVUnit.healthclass) then
+					if SV.db.SVUnit.colorhealthbyvalue == true then
 						health.colorSmooth = true
 					else
 						health.colorHealth = true
@@ -721,12 +721,12 @@ function MOD:RefreshUnitLayout(frame, template)
 					power:Show()
 				end

-				power.Smooth = self.db.smoothbars;
+				power.Smooth = SV.db.SVUnit.smoothbars;

 				power.colorClass = nil;
 				power.colorReaction = nil;
 				power.colorPower = nil;
-				if self.db.powerclass then
+				if SV.db.SVUnit.powerclass then
 					power.colorClass = true;
 					power.colorReaction = true
 				else
@@ -765,7 +765,7 @@ function MOD:RefreshUnitLayout(frame, template)
 				altPower:Point(TOP_ANCHOR2, frame, TOP_ANCHOR2, PORTRAIT_WIDTH, -1)
 				altPower:Point(TOP_ANCHOR1, frame, TOP_ANCHOR1, (1 * BOTTOM_MODIFIER), -1)
 				altPower:SetHeight(POWER_HEIGHT)
-				altPower.Smooth = self.db.smoothbars;
+				altPower.Smooth = SV.db.SVUnit.smoothbars;
 				altPower:HookScript("OnShow", Alt_OnShow)
 				altPower:HookScript("OnHide", Alt_OnHide)
 			else
@@ -1027,7 +1027,7 @@ function MOD:RefreshUnitLayout(frame, template)
 			end
 			auraBar.buffColor = oUF_Villain.colors.buff_bars

-			if self.db.auraBarByType then
+			if SV.db.SVUnit.auraBarByType then
 				auraBar.debuffColor = nil;
 				auraBar.defaultDebuffColor = oUF_Villain.colors.debuff_bars
 			else
@@ -1145,7 +1145,7 @@ function MOD:RefreshUnitLayout(frame, template)
 	--[[ DEBUFF HIGHLIGHT LAYOUT ]]--

 	if frame.Afflicted then
-		if self.db.debuffHighlighting then
+		if SV.db.SVUnit.debuffHighlighting then
 			if(template ~= "player" and template ~= "target" and template ~= "focus") then
 				frame.Afflicted:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]])
 			end
@@ -1159,9 +1159,9 @@ function MOD:RefreshUnitLayout(frame, template)

 	if frame.Range then
 		if(template:find("raid") or template:find("party")) then
-			frame.Range.outsideAlpha = self.db.groupOORAlpha or 1
+			frame.Range.outsideAlpha = SV.db.SVUnit.groupOORAlpha or 1
 		else
-			frame.Range.outsideAlpha = self.db.OORAlpha or 1
+			frame.Range.outsideAlpha = SV.db.SVUnit.OORAlpha or 1
 		end

 		if db.rangeCheck then
@@ -1256,7 +1256,7 @@ local function ChangeGroupIndex(self)

 	local max = MAX_RAID_MEMBERS;
 	local key = self.___groupkey
-	local db = MOD.db[key]
+	local db = SV.db.SVUnit[key]

 	local newIndex = db.customSorting and -(min(db.groupCount * (db.gRowCol * 5), max) + 1 ) or -4;
 	if self:GetAttribute("startingIndex") ~= newIndex then
@@ -1292,7 +1292,7 @@ function MOD:UpdateGroupConfig(headerFrame, setForced)

 	SetProxyEnv()
 	local key = headerFrame.___groupkey
-	local db = self.db[key]
+	local db = SV.db.SVUnit[key]
 	headerFrame.forceShow = setForced;
 	headerFrame.forceShowAuras = setForced;
 	headerFrame.isForced = setForced;
@@ -1441,12 +1441,12 @@ BUILD FUNCTION / UPDATE
 ##########################################################
 ]]--
 function MOD:ReLoad()
-	if(not self.db.enable) then return end
+	if(not SV.db.SVUnit.enable) then return end
 	self:RefreshUnitFrames()
 end

 function MOD:Load()
-	if(not self.db.enable) then return end
+	if(not SV.db.SVUnit.enable) then return end
 	self:RefreshUnitColors()

 	local SVUI_UnitFrameParent = CreateFrame("Frame", "SVUI_UnitFrameParent", SV.UIParent, "SecureHandlerStateTemplate")
@@ -1456,7 +1456,7 @@ function MOD:Load()
 	self:RegisterEvent("PLAYER_ENTERING_WORLD")
 	self:RegisterEvent("PLAYER_REGEN_DISABLED")

-	if(self.db.disableBlizzard) then
+	if(SV.db.SVUnit.disableBlizzard) then
 		self:KillBlizzardRaidFrames()
 		NewHook("CompactUnitFrame_RegisterEvents", CompactUnitFrame_UnregisterEvents)
 		NewHook("UnitFrameThreatIndicator_Initialize", UnitFrameThreatIndicator_Hook)
@@ -1503,4 +1503,4 @@ end
 DEFINE CONFIG AND REGISTER
 ##########################################################
 ]]--
-SVLib:NewPackage(MOD, "SVUnit")
\ No newline at end of file
+SVLib:NewPackage(MOD, "SVUnit", true)
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI/packages/unit/elements/auras.lua b/Interface/AddOns/SVUI/packages/unit/elements/auras.lua
index 1e6660f..8d3365f 100644
--- a/Interface/AddOns/SVUI/packages/unit/elements/auras.lua
+++ b/Interface/AddOns/SVUI/packages/unit/elements/auras.lua
@@ -58,7 +58,7 @@ local oUF_Villain = SV.oUF

 assert(oUF_Villain, "SVUI was unable to locate oUF.");

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local LSM = LibStub("LibSharedMedia-3.0")
 local MOD = SV.SVUnit
 if(not MOD) then return end
@@ -297,7 +297,7 @@ do
 	end

 	CustomAuraFilter = function(self, unit, icon, name, _, _, _, debuffType, duration, _, caster, isStealable, shouldConsolidate, spellID, canApplyAura, isBossAura)
-		local db = MOD.db[self.db]
+		local db = SV.db.SVUnit[self.unitKey]
 		local auraType = self.type;
 		if(not auraType) then return true end
 		if((not db) or (db and not db[auraType]) or (spellID == 65148)) then
@@ -384,7 +384,7 @@ do

 	CustomBarFilter = function(self, unit, name, _, _, _, debuffType, duration, _, caster, isStealable, shouldConsolidate, spellID)
 		local key = self.___key
-		local db = MOD.db[key]
+		local db = SV.db.SVUnit[key]
 		if((not db) or (db and not db.aurabar) or (spellID == 65148)) then
 			return false;
 		end
@@ -457,31 +457,31 @@ BUILD FUNCTION
 ]]--
 function MOD:CreateBuffs(frame, unit)
 	local aura = CreateFrame("Frame", nil, frame)
-	aura.db = unit
+	aura.unitKey = unit
 	aura.spacing = 2;
 	aura.PostCreateIcon = PostCreateAuraIcon;
 	aura.PostUpdateIcon = PostUpdateAuraIcon;
 	aura.CustomFilter = CustomAuraFilter;
 	aura:SetFrameLevel(10)
 	aura.type = "buffs"
-	aura.textFont = LSM:Fetch("font", MOD.db.auraFont)
-	aura.textSize = MOD.db.auraFontSize
-	aura.textOutline = MOD.db.auraFontOutline
+	aura.textFont = LSM:Fetch("font", SV.db.SVUnit.auraFont)
+	aura.textSize = SV.db.SVUnit.auraFontSize
+	aura.textOutline = SV.db.SVUnit.auraFontOutline
 	return aura
 end

 function MOD:CreateDebuffs(frame, unit)
 	local aura = CreateFrame("Frame", nil, frame)
-	aura.db = unit
+	aura.unitKey = unit
 	aura.spacing = 2;
 	aura.PostCreateIcon = PostCreateAuraIcon;
 	aura.PostUpdateIcon = PostUpdateAuraIcon;
 	aura.CustomFilter = CustomAuraFilter;
 	aura.type = "debuffs"
 	aura:SetFrameLevel(10)
-	aura.textFont = LSM:Fetch("font", MOD.db.auraFont)
-	aura.textSize = MOD.db.auraFontSize
-	aura.textOutline = MOD.db.auraFontOutline
+	aura.textFont = LSM:Fetch("font", SV.db.SVUnit.auraFont)
+	aura.textSize = SV.db.SVUnit.auraFontSize
+	aura.textOutline = SV.db.SVUnit.auraFontOutline
 	return aura
 end

@@ -505,17 +505,17 @@ function MOD:CreateAuraBarHeader(frame, unitName)
 	auraBarParent.spark = true;
 	auraBarParent.filter = CustomBarFilter;
 	auraBarParent.PostUpdate = ColorizeAuraBars;
-	auraBarParent.barTexture = LSM:Fetch("statusbar", MOD.db.auraBarStatusbar)
+	auraBarParent.barTexture = LSM:Fetch("statusbar", SV.db.SVUnit.auraBarStatusbar)
 	auraBarParent.timeFont = LSM:Fetch("font", "Roboto")
-	auraBarParent.textFont = LSM:Fetch("font", MOD.db.auraFont)
-	auraBarParent.textSize = MOD.db.auraFontSize
-	auraBarParent.textOutline = MOD.db.auraFontOutline
+	auraBarParent.textFont = LSM:Fetch("font", SV.db.SVUnit.auraFont)
+	auraBarParent.textSize = SV.db.SVUnit.auraFontSize
+	auraBarParent.textOutline = SV.db.SVUnit.auraFontOutline
 	return auraBarParent
 end

 function MOD:SmartAuraDisplay()
 	local unit = self.unit;
-	local db = MOD.db[unit];
+	local db = SV.db.SVUnit[unit];
 	if not db or not db.smartAuraDisplay or db.smartAuraDisplay == 'DISABLED' or not UnitExists(unit) then return end
 	local buffs = self.Buffs;
 	local debuffs = self.Debuffs;
@@ -568,8 +568,8 @@ UPDATE
 local WATCH_CACHE = {}
 function MOD:UpdateAuraWatch(frame, key, override)
 	local AW = frame.AuraWatch
-	if not self.db[key] then return end
-	local db = self.db[key].auraWatch
+	if not SV.db.SVUnit[key] then return end
+	local db = SV.db.SVUnit[key].auraWatch
 	if not db then return end

 	if not db.enable then
@@ -619,9 +619,9 @@ function MOD:UpdateAuraWatch(frame, key, override)
 		end
 	end

-	local fontFile = LSM:Fetch("font", self.db.auraFont)
-	local fontSize = self.db.auraFontSize
-	local fontOutline = self.db.auraFontOutline
+	local fontFile = LSM:Fetch("font", SV.db.SVUnit.auraFont)
+	local fontSize = SV.db.SVUnit.auraFontSize
+	local fontOutline = SV.db.SVUnit.auraFontOutline

 	for i = 1, #WATCH_CACHE do
 		if WATCH_CACHE[i].id then
diff --git a/Interface/AddOns/SVUI/packages/unit/elements/castbar.lua b/Interface/AddOns/SVUI/packages/unit/elements/castbar.lua
index dd5ebd7..acfa654 100644
--- a/Interface/AddOns/SVUI/packages/unit/elements/castbar.lua
+++ b/Interface/AddOns/SVUI/packages/unit/elements/castbar.lua
@@ -59,7 +59,7 @@ local oUF_Villain = SV.oUF
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.");

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVUnit
 if(not MOD) then return end
 --[[
@@ -727,7 +727,7 @@ UPDATE
 ]]--
 function MOD:PostCastStart(unit, index, ...)
 	if unit == "vehicle" then unit = "player" end
-	local db = MOD.db
+	local db = SV.db.SVUnit
 	if(not db or not(db and db[unit] and db[unit].castbar)) then return end
 	local unitDB = db[unit].castbar
 	if unitDB.displayTarget and self.curTarget then
@@ -749,14 +749,14 @@ end

 function MOD:PostChannelUpdate(unit, index)
 	if unit == "vehicle" then unit = "player" end
-	local db = MOD.db[unit];
+	local db = SV.db.SVUnit[unit];
 	if(not db or not db.castbar or not(unit == "player")) then return end
 	CustomChannelUpdate(self, unit, index, db.castbar.ticks)
 end

 function MOD:PostCastInterruptible(unit)
 	if unit == "vehicle" or unit == "player" then return end
-	CustomInterruptible(self, unit, MOD.db.castClassColor)
+	CustomInterruptible(self, unit, SV.db.SVUnit.castClassColor)
 end

 function MOD:PostCastNotInterruptible(unit)
diff --git a/Interface/AddOns/SVUI/packages/unit/elements/essentials.lua b/Interface/AddOns/SVUI/packages/unit/elements/essentials.lua
index 6289a85..15e5dc6 100644
--- a/Interface/AddOns/SVUI/packages/unit/elements/essentials.lua
+++ b/Interface/AddOns/SVUI/packages/unit/elements/essentials.lua
@@ -36,7 +36,7 @@ local oUF_Villain = SV.oUF
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.");

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local LSM = LibStub("LibSharedMedia-3.0")
 local MOD = SV.SVUnit
 if(not MOD) then return end
@@ -305,9 +305,9 @@ local function CreateActionPanel(frame, offset)
 end

 local function CreateNameText(frame, unitName)
-	local db = MOD.db
-	if(MOD.db[unitName] and MOD.db[unitName].name) then
-		db = MOD.db[unitName].name
+	local db = SV.db.SVUnit
+	if(SV.db.SVUnit[unitName] and SV.db.SVUnit[unitName].name) then
+		db = SV.db.SVUnit[unitName].name
 	end
 	local name = frame:CreateFontString(nil, "OVERLAY")
 	name:SetFont(LSM:Fetch("font", db.font), db.fontSize, db.fontOutline)
@@ -418,7 +418,7 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText)

 	if(not noHealthText) then
 		frame.InfoPanel.Health = frame.InfoPanel:CreateFontString(nil, "OVERLAY")
-		frame.InfoPanel.Health:SetFont(LSM:Fetch("font", MOD.db.font), MOD.db.fontSize, MOD.db.fontOutline)
+		frame.InfoPanel.Health:SetFont(LSM:Fetch("font", SV.db.SVUnit.font), SV.db.SVUnit.fontSize, SV.db.SVUnit.fontOutline)
 		offset = reverse and 2 or -2;
 		direction = reverse and "LEFT" or "RIGHT";
 		frame.InfoPanel.Health:Point(direction, frame.InfoPanel, direction, offset, 0)
@@ -426,7 +426,7 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText)

 	if(not noPowerText) then
 		frame.InfoPanel.Power = frame.InfoPanel:CreateFontString(nil, "OVERLAY")
-		frame.InfoPanel.Power:SetFont(LSM:Fetch("font", MOD.db.font), MOD.db.fontSize, MOD.db.fontOutline)
+		frame.InfoPanel.Power:SetFont(LSM:Fetch("font", SV.db.SVUnit.font), SV.db.SVUnit.fontSize, SV.db.SVUnit.fontOutline)
 		offset = reverse and -2 or 2;
 		direction = reverse and "RIGHT" or "LEFT";
 		frame.InfoPanel.Power:Point(direction, frame.InfoPanel, direction, offset, 0)
@@ -434,7 +434,7 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText)

 	if(not noMiscText) then
 		frame.InfoPanel.Misc = frame.InfoPanel:CreateFontString(nil, "OVERLAY")
-		frame.InfoPanel.Misc:SetFont(LSM:Fetch("font", MOD.db.font), MOD.db.fontSize, MOD.db.fontOutline)
+		frame.InfoPanel.Misc:SetFont(LSM:Fetch("font", SV.db.SVUnit.font), SV.db.SVUnit.fontSize, SV.db.SVUnit.fontOutline)
 		frame.InfoPanel.Misc:Point("CENTER", frame, "CENTER", 0, 0)
 	end

@@ -585,13 +585,13 @@ function MOD:CreateAltPowerBar(frame)
 	altPower.text = altPower:CreateFontString(nil, "OVERLAY")
 	altPower.text:SetPoint("CENTER")
 	altPower.text:SetJustifyH("CENTER")
-	altPower.text:SetFont(LSM:Fetch("font", MOD.db.font), MOD.db.fontSize, MOD.db.fontOutline)
+	altPower.text:SetFont(LSM:Fetch("font", SV.db.SVUnit.font), SV.db.SVUnit.fontSize, SV.db.SVUnit.fontOutline)
 	altPower.PostUpdate = PostUpdateAltPower;
 	return altPower
 end

 function MOD:PostUpdatePower(unit, value, max)
-	local db = MOD.db[unit]
+	local db = SV.db.SVUnit[unit]
 	local powerType, _, _, _, _ = UnitPowerType(unit)
 	local parent = self:GetParent()
 	if parent.isForced then
diff --git a/Interface/AddOns/SVUI/packages/unit/elements/misc.lua b/Interface/AddOns/SVUI/packages/unit/elements/misc.lua
index 8ff8c49..a938728 100644
--- a/Interface/AddOns/SVUI/packages/unit/elements/misc.lua
+++ b/Interface/AddOns/SVUI/packages/unit/elements/misc.lua
@@ -25,7 +25,7 @@ local oUF_Villain = SV.oUF

 assert(oUF_Villain, "SVUI was unable to locate oUF.");

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVUnit
 if(not MOD) then return end
 --[[
@@ -184,7 +184,7 @@ end

 local UpdateRoleIcon = function(self)
 	local key = self.___key
-	local db = MOD.db[key]
+	local db = SV.db.SVUnit[key]
 	if(not db or not db.icons or (db.icons and not db.icons.roleIcon)) then return end
 	local lfd = self.LFDRole
 	if(not db.icons.roleIcon.enable) then lfd:Hide() return end
@@ -251,7 +251,7 @@ function MOD:RaidRoleUpdate()
 	local looterIcon = frame.MasterLooter;
 	if not leaderIcon or not looterIcon then return end
 		local key = frame.___key;
-		local db = MOD.db[key];
+		local db = SV.db.SVUnit[key];
 		local leaderShown = leaderIcon:IsShown()
 		local looterShown = looterIcon:IsShown()
 		leaderIcon:ClearAllPoints()
@@ -312,7 +312,7 @@ local ExRep_OnEnter = function(self)if self:IsShown() then UIFrameFadeIn(self,.1
 local ExRep_OnLeave = function(self)if self:IsShown() then UIFrameFadeOut(self,.2,1,0) end end

 function MOD:CreateExperienceRepBar(frame)
-	local db = MOD.db.player;
+	local db = SV.db.SVUnit.player;

 	if db.playerExpBar then
 		local xp = CreateFrame("StatusBar", "PlayerFrameExperienceBar", frame.Power)
diff --git a/Interface/AddOns/SVUI/packages/unit/elements/tags.lua b/Interface/AddOns/SVUI/packages/unit/elements/tags.lua
index 685abc0..a76006d 100644
--- a/Interface/AddOns/SVUI/packages/unit/elements/tags.lua
+++ b/Interface/AddOns/SVUI/packages/unit/elements/tags.lua
@@ -32,7 +32,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local oUF_Villain = SV.oUF

 assert(oUF_Villain, "SVUI was unable to locate oUF.")
diff --git a/Interface/AddOns/SVUI/packages/unit/frames.lua b/Interface/AddOns/SVUI/packages/unit/frames.lua
index 0541516..e4d8d7b 100644
--- a/Interface/AddOns/SVUI/packages/unit/frames.lua
+++ b/Interface/AddOns/SVUI/packages/unit/frames.lua
@@ -52,7 +52,7 @@ local oUF_Villain = SV.oUF

 assert(oUF_Villain, "SVUI was unable to locate oUF.")

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local LSM = LibStub("LibSharedMedia-3.0")
 local MOD = SV.SVUnit

@@ -161,7 +161,7 @@ PLAYER
 ##########################################################
 ]]--
 local UpdatePlayerFrame = function(self)
-    local db = MOD.db["player"]
+    local db = SV.db.SVUnit["player"]
     local UNIT_WIDTH = db.width;
     local UNIT_HEIGHT = db.height;
     local USE_CLASSBAR = db.classbar.enable;
@@ -169,7 +169,7 @@ local UpdatePlayerFrame = function(self)
     local classBarWidth = db.width * 0.4;
     local healthPanel = self.HealthPanel
     local iconDB = db.icons
-    self:RegisterForClicks(MOD.db.fastClickTarget and "AnyDown" or "AnyUp")
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and "AnyDown" or "AnyUp")

     MOD.RefreshUnitMedia(self, "player")

@@ -333,7 +333,7 @@ CONSTRUCTORS["player"] = function(self, unit)
     self.Resting = MOD:CreateRestingIndicator(self)
     self.Combat = MOD:CreateCombatIndicator(self)
     self.PvPText = self.InfoPanel:CreateFontString(nil,'OVERLAY')
-    self.PvPText:SetFontTemplate(LSM:Fetch("font", MOD.db.font), MOD.db.fontSize, MOD.db.fontOutline)
+    self.PvPText:SetFontTemplate(LSM:Fetch("font", SV.db.SVUnit.font), SV.db.SVUnit.fontSize, SV.db.SVUnit.fontOutline)
     self.Afflicted = MOD:CreateAfflicted(self)
     self.HealPrediction = MOD:CreateHealPrediction(self, true)
     self.AuraBars = MOD:CreateAuraBarHeader(self, key)
@@ -352,12 +352,12 @@ TARGET
 ##########################################################
 ]]--
 local UpdateTargetFrame = function(self)
-    local db = MOD.db["target"]
+    local db = SV.db.SVUnit["target"]
     local UNIT_WIDTH = db.width;
     local UNIT_HEIGHT = db.height;
     local USE_COMBOBAR = db.combobar.enable;
     local comboBarHeight = db.combobar.height;
-    self:RegisterForClicks(MOD.db.fastClickTarget and "AnyDown" or "AnyUp")
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and "AnyDown" or "AnyUp")

     MOD.RefreshUnitMedia(self, "target")
     self.colors = oUF_Villain.colors;
@@ -371,7 +371,7 @@ local UpdateTargetFrame = function(self)
     end
     MOD:RefreshUnitLayout(self, "target")

-    if(MOD.db.xrayFocus) then
+    if(SV.db.SVUnit.xrayFocus) then
         self.XRay:Show()
     else
         self.XRay:Hide()
@@ -442,7 +442,7 @@ CONSTRUCTORS["target"] = function(self, unit)
     self:RegisterEvent("PLAYER_TARGET_CHANGED", MOD.SmartAuraDisplay)

     self.RaidIcon = MOD:CreateRaidIcon(self)
-    local isSmall = MOD.db[key].combobar.smallIcons
+    local isSmall = SV.db.SVUnit[key].combobar.smallIcons
     if(SV.class == "ROGUE") then
         self.HyperCombo = MOD:CreateRogueCombobar(self, isSmall)
     elseif(SV.class == "DRUID") then
@@ -467,10 +467,10 @@ TARGET OF TARGET
 ##########################################################
 ]]--
 local UpdateTargetTargetFrame = function(self)
-    local db = MOD.db["targettarget"]
+    local db = SV.db.SVUnit["targettarget"]
     local UNIT_WIDTH = db.width
     local UNIT_HEIGHT = db.height
-    self:RegisterForClicks(MOD.db.fastClickTarget and "AnyDown" or "AnyUp")
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and "AnyDown" or "AnyUp")
     MOD.RefreshUnitMedia(self, "targettarget")
     self.colors = oUF_Villain.colors;
     self:Size(UNIT_WIDTH, UNIT_HEIGHT)
@@ -509,10 +509,10 @@ PET
 ##########################################################
 ]]--
 local UpdatePetFrame = function(self)
-    local db = MOD.db["pet"]
+    local db = SV.db.SVUnit["pet"]
     local UNIT_WIDTH = db.width;
     local UNIT_HEIGHT = db.height;
-    self:RegisterForClicks(MOD.db.fastClickTarget and "AnyDown" or "AnyUp")
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and "AnyDown" or "AnyUp")
     MOD.RefreshUnitMedia(self, "pet")
     self.colors = oUF_Villain.colors;
     self:Size(UNIT_WIDTH, UNIT_HEIGHT)
@@ -559,10 +559,10 @@ TARGET OF PET
 ##########################################################
 ]]--
 local UpdatePetTargetFrame = function(self)
-    local db = MOD.db["pettarget"]
+    local db = SV.db.SVUnit["pettarget"]
     local UNIT_WIDTH = db.width;
     local UNIT_HEIGHT = db.height;
-    self:RegisterForClicks(MOD.db.fastClickTarget and "AnyDown" or "AnyUp")
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and "AnyDown" or "AnyUp")
     MOD.RefreshUnitMedia(self, "pettarget")
     self.colors = oUF_Villain.colors;
     self:Size(UNIT_WIDTH, UNIT_HEIGHT)
@@ -604,17 +604,17 @@ FOCUS
 ##########################################################
 ]]--
 local UpdateFocusFrame = function(self)
-    local db = MOD.db["focus"]
+    local db = SV.db.SVUnit["focus"]
     local UNIT_WIDTH = db.width;
     local UNIT_HEIGHT = db.height;
-    self:RegisterForClicks(MOD.db.fastClickTarget and "AnyDown" or "AnyUp")
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and "AnyDown" or "AnyUp")
     MOD.RefreshUnitMedia(self, "focus")
     self.colors = oUF_Villain.colors;
     self:Size(UNIT_WIDTH, UNIT_HEIGHT)
     _G[self:GetName().."_MOVE"]:Size(self:GetSize())
     MOD:RefreshUnitLayout(self, "focus")

-    if(MOD.db.xrayFocus) then
+    if(SV.db.SVUnit.xrayFocus) then
         self.XRay:Show()
     else
         self.XRay:Hide()
@@ -668,10 +668,10 @@ TARGET OF FOCUS
 ##########################################################
 ]]--
 local UpdateFocusTargetFrame = function(self)
-    local db = MOD.db["focustarget"]
+    local db = SV.db.SVUnit["focustarget"]
     local UNIT_WIDTH = db.width;
     local UNIT_HEIGHT = db.height;
-    self:RegisterForClicks(MOD.db.fastClickTarget and "AnyDown" or "AnyUp")
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and "AnyDown" or "AnyUp")
     MOD.RefreshUnitMedia(self, "focustarget")
     self.colors = oUF_Villain.colors;
     self:Size(UNIT_WIDTH, UNIT_HEIGHT)
@@ -709,7 +709,7 @@ BOSS
 ##########################################################
 ]]--
 local UpdateBossFrame = function(self)
-    local db = MOD.db["boss"]
+    local db = SV.db.SVUnit["boss"]
     local INDEX = self:GetID() or 1;
     local holder = _G["SVUI_Boss_MOVE"]
     local UNIT_WIDTH = db.width;
@@ -738,7 +738,7 @@ local UpdateBossFrame = function(self)
         end
     end

-    self:RegisterForClicks(MOD.db.fastClickTarget and "AnyDown" or "AnyUp")
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and "AnyDown" or "AnyUp")
     MOD:RefreshUnitLayout(self, "boss")
     self:UpdateAllElements()
 end
@@ -830,7 +830,7 @@ local function CreatePrepFrame(frameName, parentFrame, parentID)
 end

 local UpdateArenaFrame = function(self)
-    local db = MOD.db["arena"]
+    local db = SV.db.SVUnit["arena"]
     local INDEX = self:GetID() or 1;
     local holder = _G["SVUI_Arena_MOVE"]
     local UNIT_WIDTH = db.width;
@@ -840,7 +840,7 @@ local UpdateArenaFrame = function(self)

     self.colors = oUF_Villain.colors;
     self:Size(UNIT_WIDTH, UNIT_HEIGHT)
-    self:RegisterForClicks(MOD.db.fastClickTarget and "AnyDown" or "AnyUp")
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and "AnyDown" or "AnyUp")

     self:ClearAllPoints()

@@ -956,7 +956,7 @@ local ArenaPrepHandler = CreateFrame("Frame")
 local ArenaPrepHandler_OnEvent = function(self, event)
     local prepframe
     local _, instanceType = IsInInstance()
-    if(not MOD.db.arena or not MOD.db.arena.enable or instanceType ~= "arena") then return end
+    if(not SV.db.SVUnit.arena or not SV.db.SVUnit.arena.enable or instanceType ~= "arena") then return end
     if event == "PLAYER_LOGIN" then
         for i = 1, 5 do
             prepframe = _G["SVUI_Arena"..i.."PrepFrame"]
@@ -1043,7 +1043,7 @@ function MOD:SetUnitFrame(key)
     if frame:GetParent() ~= SVUI_UnitFrameParent then
         frame:SetParent(SVUI_UnitFrameParent)
     end
-    if(self.db.enable and self.db[key].enable) then
+    if(SV.db.SVUnit.enable and SV.db.SVUnit[key].enable) then
         frame:Enable()
         frame:Update()
     else
@@ -1073,7 +1073,7 @@ function MOD:SetEnemyFrames(key, maxCount)
         if frame.isForced then
             self:AllowElement(frame)
         end
-        if(self.db.enable and self.db[key].enable) then
+        if(SV.db.SVUnit.enable and SV.db.SVUnit[key].enable) then
             frame:Enable()
             frame:Update()
         else
@@ -1118,8 +1118,8 @@ RAID 10, 25, 40
 ##########################################################
 ]]--
 local Raid10Visibility = function(self, event)
-    local db = MOD.db["raid10"]
-    if (not db or (db and not db.enable) or (MOD.db and not MOD.db.smartRaidFilter) or self.isForced) then return end
+    local db = SV.db.SVUnit["raid10"]
+    if (not db or (db and not db.enable) or (SV.db.SVUnit and not SV.db.SVUnit.smartRaidFilter) or self.isForced) then return end

     local instance, instanceType = IsInInstance()
     local _, _, _, _, maxPlayers, _, _ = GetInstanceInfo()
@@ -1143,8 +1143,8 @@ local Raid10Visibility = function(self, event)
 end

 local Raid25Visibility = function(self, event)
-    local db = MOD.db["raid25"]
-    if (not db or (db and not db.enable) or (MOD.db and not MOD.db.smartRaidFilter) or self.isForced) then return end
+    local db = SV.db.SVUnit["raid25"]
+    if (not db or (db and not db.enable) or (SV.db.SVUnit and not SV.db.SVUnit.smartRaidFilter) or self.isForced) then return end

     local instance, instanceType = IsInInstance()
     local _, _, _, _, maxPlayers, _, _ = GetInstanceInfo()
@@ -1168,8 +1168,8 @@ local Raid25Visibility = function(self, event)
 end

 local Raid40Visibility = function(self, event)
-    local db = MOD.db["raid40"]
-    if (not db or (db and not db.enable) or (MOD.db and not MOD.db.smartRaidFilter) or self.isForced) then return end
+    local db = SV.db.SVUnit["raid40"]
+    if (not db or (db and not db.enable) or (SV.db.SVUnit and not SV.db.SVUnit.smartRaidFilter) or self.isForced) then return end

     local instance, instanceType = IsInInstance()
     local _, _, _, _, maxPlayers, _, _ = GetInstanceInfo()
@@ -1194,7 +1194,7 @@ end

 local UpdateRaidSubUnit = function(self, key, db)
     self.colors = oUF_Villain.colors;
-    self:RegisterForClicks(MOD.db.fastClickTarget and "AnyDown" or "AnyUp")
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and "AnyDown" or "AnyUp")
     local UNIT_WIDTH, UNIT_HEIGHT = MOD:GetActiveSize(db)
     if not InCombatLockdown() then
         self:Size(UNIT_WIDTH, UNIT_HEIGHT)
@@ -1236,7 +1236,7 @@ GROUP_UPDATES["raid10"] = function(self)
     end
     Raid10Visibility(frame)
     local key = "raid10"
-    local db = MOD.db[key]
+    local db = SV.db.SVUnit[key]
     local index = 1;
     local childFrame = self:GetAttribute("child"..index)
     while childFrame do
@@ -1265,7 +1265,7 @@ GROUP_UPDATES["raid25"] = function(self)
     end
     Raid25Visibility(frame)
     local key = "raid25"
-    local db = MOD.db[key]
+    local db = SV.db.SVUnit[key]
     local index = 1;
     local childFrame = self:GetAttribute("child"..index)
     while childFrame do
@@ -1294,7 +1294,7 @@ GROUP_UPDATES["raid40"] = function(self)
     end
     Raid40Visibility(frame)
     local key = "raid40"
-    local db = MOD.db[key]
+    local db = SV.db.SVUnit[key]
     local index = 1;
     local childFrame = self:GetAttribute("child"..index)
     while childFrame do
@@ -1355,6 +1355,7 @@ CONSTRUCTORS["raid10"] = function(self, unit)
     self.___key = key
     MOD:SetActionPanel(self, key)
     self.Health = MOD:CreateHealthBar(self, true)
+    self.Health.frequentUpdates = false
     self.Power = MOD:CreatePowerBar(self, true)
     self.Power.frequentUpdates = false
     self.Buffs = MOD:CreateBuffs(self, key)
@@ -1369,6 +1370,7 @@ CONSTRUCTORS["raid25"] = function(self, unit)
     self.___key = key
     MOD:SetActionPanel(self, key)
     self.Health = MOD:CreateHealthBar(self, true)
+    self.Health.frequentUpdates = false
     self.Power = MOD:CreatePowerBar(self, true)
     self.Power.frequentUpdates = false
     self.Buffs = MOD:CreateBuffs(self, key)
@@ -1383,6 +1385,7 @@ CONSTRUCTORS["raid40"] = function(self, unit)
     self.___key = key
     MOD:SetActionPanel(self, key)
     self.Health = MOD:CreateHealthBar(self, true)
+    self.Health.frequentUpdates = false
     self.Power = MOD:CreatePowerBar(self, true)
     self.Power.frequentUpdates = false
     self.Buffs = MOD:CreateBuffs(self, key)
@@ -1396,8 +1399,8 @@ RAID PETS
 ##########################################################
 ]]--
 local RaidPetVisibility = function(self, event)
-    local db = MOD.db["raidpet"]
-    if (not db or (db and not db.enable) or (MOD.db and not MOD.db.smartRaidFilter) or self.isForced) then return end
+    local db = SV.db.SVUnit["raidpet"]
+    if (not db or (db and not db.enable) or (SV.db.SVUnit and not SV.db.SVUnit.smartRaidFilter) or self.isForced) then return end
     local inInstance, instanceType = IsInInstance()
     if event == "PLAYER_REGEN_ENABLED" then self:UnregisterEvent("PLAYER_REGEN_ENABLED") end

@@ -1427,7 +1430,7 @@ GROUP_UPDATES["raidpet"] = function(self)
     end
     RaidPetVisibility(raidPets)
     local key = "raidpet"
-    local db = MOD.db[key]
+    local db = SV.db.SVUnit[key]
     local index = 1;
     local childFrame = self:GetAttribute("child"..index)
     while childFrame do
@@ -1488,8 +1491,8 @@ PARTY
 ##########################################################
 ]]--
 local PartyVisibility = function(self, event)
-    local db = MOD.db["party"]
-    if (not db or (db and not db.enable) or (MOD.db and not MOD.db.smartRaidFilter) or self.isForced) then return end
+    local db = SV.db.SVUnit["party"]
+    if (not db or (db and not db.enable) or (SV.db.SVUnit and not SV.db.SVUnit.smartRaidFilter) or self.isForced) then return end
     local instance, instanceType = IsInInstance()
     if(event == "PLAYER_REGEN_ENABLED") then
         self:UnregisterEvent("PLAYER_REGEN_ENABLED")
@@ -1508,7 +1511,7 @@ end

 local UpdatePartySubUnit = function(self, key, db)
     self.colors = oUF_Villain.colors;
-    self:RegisterForClicks(MOD.db.fastClickTarget and 'AnyDown' or 'AnyUp')
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and 'AnyDown' or 'AnyUp')
     MOD.RefreshUnitMedia(self, key)
     if self.isChild then
         local altDB = db.petsGroup;
@@ -1571,7 +1574,7 @@ GROUP_UPDATES["party"] = function(self)
     end
     PartyVisibility(group)
     local key = "party"
-    local db = MOD.db[key]
+    local db = SV.db.SVUnit[key]
     local index = 1;
     local childFrame = self:GetAttribute("child"..index)

@@ -1650,7 +1653,7 @@ TANK
 ]]--
 local UpdateTankSubUnit = function(self, key, db)
     self.colors = oUF_Villain.colors;
-    self:RegisterForClicks(MOD.db.fastClickTarget and "AnyDown" or "AnyUp")
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and "AnyDown" or "AnyUp")
     MOD.RefreshUnitMedia(self, key)
     if self.isChild and self.originalParent then
         local targets = db.targetsGroup;
@@ -1687,7 +1690,7 @@ end

 local UpdateTankFrame = function(self)
     local key = "tank"
-    local db = MOD.db[key]
+    local db = SV.db.SVUnit[key]
     if db.enable ~= true then
         UnregisterAttributeDriver(self, "state-visibility")
         self:Hide()
@@ -1727,7 +1730,7 @@ end

 CONSTRUCTORS["tank"] = function(self, unit)
     local key = "tank"
-    local db = MOD.db[key]
+    local db = SV.db.SVUnit[key]
     self.unit = unit
     self.___key = key
     self:SetScript("OnEnter", UnitFrame_OnEnter)
@@ -1748,7 +1751,7 @@ ASSIST
 ]]--
 local UpdateAssistSubUnit = function(self, key, db)
     self.colors = oUF_Villain.colors;
-    self:RegisterForClicks(MOD.db.fastClickTarget and "AnyDown" or "AnyUp")
+    self:RegisterForClicks(SV.db.SVUnit.fastClickTarget and "AnyDown" or "AnyUp")
     MOD.RefreshUnitMedia(self, key)
     if self.isChild and self.originalParent then
         local targets = db.targetsGroup;
@@ -1787,7 +1790,7 @@ end

 local UpdateAssistFrame = function(self)
     local key = "assist"
-    local db = MOD.db[key]
+    local db = SV.db.SVUnit[key]
     self:Hide()
     DetachSubFrames(self:GetChildren())
     self:SetAttribute("startingIndex", -1)
@@ -1822,7 +1825,7 @@ end

 CONSTRUCTORS["assist"] = function(self, unit)
     local key = "assist"
-    local db = MOD.db[key]
+    local db = SV.db.SVUnit[key]
     self.unit = unit
     self.___key = key
     self:SetScript("OnEnter", UnitFrame_OnEnter)
@@ -1843,7 +1846,7 @@ GROUP HEADER METHODS
 ]]--
 local GroupSetConfigEnvironment = function(self)
     local key = self.___groupkey
-    local db = MOD.db[key]
+    local db = SV.db.SVUnit[key]
     local UNIT_WIDTH, UNIT_HEIGHT = MOD:GetActiveSize(db)
     local anchorPoint;
     local sorting = db.showBy
@@ -1950,7 +1953,7 @@ end

 local GroupHeaderUpdate = function(self)
     local key = self.___groupkey
-    if MOD.db[key].enable ~= true then
+    if SV.db.SVUnit[key].enable ~= true then
         UnregisterAttributeDriver(self, "state-visibility")
         self:Hide()
         return
@@ -1969,7 +1972,7 @@ end
 local GroupSetActiveState = function(self)
     if not self.isForced then
         local key = self.___groupkey
-        local db = MOD.db[key]
+        local db = SV.db.SVUnit[key]
         if(db) then
             for i=1,#self.groups do
                 local frame = self.groups[i]
@@ -2018,7 +2021,7 @@ local SecureHeaderClear = function(self)
 end

 function MOD:ConstructGroupHeader(parentFrame, filter, styleName, headerName, template1, groupName, template2, updateFunc)
-    local db = self.db[groupName]
+    local db = SV.db.SVUnit[groupName]
     local UNIT_WIDTH, UNIT_HEIGHT = self:GetActiveSize(db)

     oUF_Villain:SetActiveStyle(styleName)
@@ -2047,8 +2050,8 @@ LOAD/UPDATE METHOD
 ]]--
 function MOD:SetGroupFrame(key, filter, template1, forceUpdate, template2)
     if(InCombatLockdown()) then self:RegisterEvent("PLAYER_REGEN_ENABLED"); return end
-    if(not self.db.enable or not self.db[key]) then return end
-    local db = self.db[key]
+    if(not SV.db.SVUnit.enable or not SV.db.SVUnit[key]) then return end
+    local db = SV.db.SVUnit[key]
     local realName = key:gsub("(.)", upper, 1)
     local styleName = "SVUI_"..realName
     local frame, groupName
diff --git a/Interface/AddOns/SVUI/packages/unit/resources/deathknight.lua b/Interface/AddOns/SVUI/packages/unit/resources/deathknight.lua
index 61abcd4..55aeda8 100644
--- a/Interface/AddOns/SVUI/packages/unit/resources/deathknight.lua
+++ b/Interface/AddOns/SVUI/packages/unit/resources/deathknight.lua
@@ -41,7 +41,7 @@ local oUF_Villain = SV.oUF
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.")

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 if(SV.class ~= "DEATHKNIGHT") then return end
 local MOD = SV.SVUnit
 if(not MOD) then return end
@@ -64,7 +64,7 @@ POSITIONING
 ##########################################################
 ]]--
 local Reposition = function(self)
-	local db = MOD.db.player
+	local db = SV.db.SVUnit.player
 	local bar = self.Runes;
 	local max = self.MaxClassPower;
 	local size = db.classbar.height
diff --git a/Interface/AddOns/SVUI/packages/unit/resources/druid.lua b/Interface/AddOns/SVUI/packages/unit/resources/druid.lua
index 3253000..8730a52 100644
--- a/Interface/AddOns/SVUI/packages/unit/resources/druid.lua
+++ b/Interface/AddOns/SVUI/packages/unit/resources/druid.lua
@@ -41,7 +41,7 @@ local oUF_Villain = SV.oUF
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.")

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local LSM = LibStub("LibSharedMedia-3.0")
 if(SV.class ~= "DRUID") then return end
 local MOD = SV.SVUnit
@@ -95,7 +95,7 @@ local function CreateAltMana(playerFrame, eclipse)
 	bar.bg.multiplier = 0.3;
 	bar.Text = bar.ManaBar:CreateFontString(nil, "OVERLAY")
 	bar.Text:SetAllPoints(bar.ManaBar)
-	bar.Text:SetFont(LSM:Fetch("font", MOD.db.font), MOD.db.fontSize, MOD.db.fontOutline)
+	bar.Text:SetFont(LSM:Fetch("font", SV.db.SVUnit.font), SV.db.SVUnit.fontSize, SV.db.SVUnit.fontOutline)
 	return bar
 end
 --[[
@@ -105,7 +105,7 @@ POSITIONING
 ]]--
 local Reposition = function(self)
 	local bar = self.EclipseBar
-	local db = MOD.db.player
+	local db = SV.db.SVUnit.player
 	if not bar or not db then print("Error") return end
 	local height = db.classbar.height
 	local offset = (height - 10)
@@ -315,7 +315,7 @@ local HideSmallPoint = function(self)
 end

 local RepositionCombo = function(self)
-	local db = MOD.db.target
+	local db = SV.db.SVUnit.target
 	local bar = self.HyperCombo.CPoints;
 	local max = MAX_COMBO_POINTS;
 	local height = db.combobar.height
diff --git a/Interface/AddOns/SVUI/packages/unit/resources/hunter.lua b/Interface/AddOns/SVUI/packages/unit/resources/hunter.lua
index ddd809e..a873c14 100644
--- a/Interface/AddOns/SVUI/packages/unit/resources/hunter.lua
+++ b/Interface/AddOns/SVUI/packages/unit/resources/hunter.lua
@@ -31,7 +31,7 @@ local oUF_Villain = SV.oUF
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.")

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 if(SV.class ~= "HUNTER") then return end
 local MOD = SV.SVUnit
 if(not MOD) then return end
diff --git a/Interface/AddOns/SVUI/packages/unit/resources/mage.lua b/Interface/AddOns/SVUI/packages/unit/resources/mage.lua
index e141394..eb696bd 100644
--- a/Interface/AddOns/SVUI/packages/unit/resources/mage.lua
+++ b/Interface/AddOns/SVUI/packages/unit/resources/mage.lua
@@ -41,7 +41,7 @@ local oUF_Villain = SV.oUF
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.")

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 if(SV.class ~= "MAGE") then return end
 local MOD = SV.SVUnit
 if(not MOD) then return end
@@ -51,7 +51,7 @@ POSITIONING
 ##########################################################
 ]]--
 local Reposition = function(self)
-	local db = MOD.db.player
+	local db = SV.db.SVUnit.player
 	local bar = self.ArcaneChargeBar;
 	local max = self.MaxClassPower;
 	local size = db.classbar.height
diff --git a/Interface/AddOns/SVUI/packages/unit/resources/monk.lua b/Interface/AddOns/SVUI/packages/unit/resources/monk.lua
index 53fd729..6d6f7b0 100644
--- a/Interface/AddOns/SVUI/packages/unit/resources/monk.lua
+++ b/Interface/AddOns/SVUI/packages/unit/resources/monk.lua
@@ -41,7 +41,7 @@ local oUF_Villain = SV.oUF
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.")

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 if(SV.class ~= "MONK") then return end
 local MOD = SV.SVUnit
 if(not MOD) then return end
@@ -51,7 +51,7 @@ POSITIONING
 ##########################################################
 ]]--
 local Reposition = function(self)
-	local db = MOD.db.player
+	local db = SV.db.SVUnit.player
 	local bar = self.MonkHarmony;
 	local max = self.MaxClassPower;
 	local size = db.classbar.height
diff --git a/Interface/AddOns/SVUI/packages/unit/resources/paladin.lua b/Interface/AddOns/SVUI/packages/unit/resources/paladin.lua
index 1d4f554..1b0fbd8 100644
--- a/Interface/AddOns/SVUI/packages/unit/resources/paladin.lua
+++ b/Interface/AddOns/SVUI/packages/unit/resources/paladin.lua
@@ -41,7 +41,7 @@ local oUF_Villain = SV.oUF
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.")

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 if(SV.class ~= "PALADIN") then return end
 local MOD = SV.SVUnit
 if(not MOD) then return end
@@ -57,7 +57,7 @@ POSITIONING
 ##########################################################
 ]]--
 local Reposition = function(self)
-	local db = MOD.db.player
+	local db = SV.db.SVUnit.player
 	local bar = self.HolyPower;
 	local max = self.MaxClassPower;
 	local size = db.classbar.height
diff --git a/Interface/AddOns/SVUI/packages/unit/resources/priest.lua b/Interface/AddOns/SVUI/packages/unit/resources/priest.lua
index 315144b..ca3a44d 100644
--- a/Interface/AddOns/SVUI/packages/unit/resources/priest.lua
+++ b/Interface/AddOns/SVUI/packages/unit/resources/priest.lua
@@ -41,7 +41,7 @@ local oUF_Villain = SV.oUF
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.")

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 if(SV.class ~= "PRIEST") then return end
 local MOD = SV.SVUnit
 if(not MOD) then return end
@@ -53,7 +53,7 @@ POSITIONING
 ##########################################################
 ]]--
 local Reposition = function(self)
-	local db = MOD.db.player
+	local db = SV.db.SVUnit.player
 	local bar = self.PriestOrbs;
 	local max = self.MaxClassPower;
 	local size = db.classbar.height
diff --git a/Interface/AddOns/SVUI/packages/unit/resources/rogue.lua b/Interface/AddOns/SVUI/packages/unit/resources/rogue.lua
index 92df5ba..87eee9e 100644
--- a/Interface/AddOns/SVUI/packages/unit/resources/rogue.lua
+++ b/Interface/AddOns/SVUI/packages/unit/resources/rogue.lua
@@ -41,7 +41,7 @@ local oUF_Villain = SV.oUF
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.")

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 if(SV.class ~= "ROGUE") then return end
 local MOD = SV.SVUnit
 if(not MOD) then return end
@@ -71,7 +71,7 @@ POSITIONING
 ##########################################################
 ]]--
 local Reposition = function(self)
-	local db = MOD.db.target
+	local db = SV.db.SVUnit.target
 	local bar = self.HyperCombo.CPoints;
 	local max = MAX_COMBO_POINTS;
 	local height = db.combobar.height
@@ -171,7 +171,7 @@ ROGUE COMBO TRACKER
 ##########################################################
 ]]--
 local RepositionTracker = function(self)
-	local db = MOD.db.player
+	local db = SV.db.SVUnit.player
 	local bar = self.HyperCombo;
 	if not db then return end
 	local size = db.classbar.height
diff --git a/Interface/AddOns/SVUI/packages/unit/resources/shaman.lua b/Interface/AddOns/SVUI/packages/unit/resources/shaman.lua
index ba7b7dc..d728882 100644
--- a/Interface/AddOns/SVUI/packages/unit/resources/shaman.lua
+++ b/Interface/AddOns/SVUI/packages/unit/resources/shaman.lua
@@ -41,7 +41,7 @@ local oUF_Villain = SV.oUF
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.")

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 if(SV.class ~= "SHAMAN") then return end
 local MOD = SV.SVUnit
 if(not MOD) then return end
@@ -64,7 +64,7 @@ POSITIONING
 ##########################################################
 ]]--
 local Reposition = function(self)
-	local db = MOD.db.player
+	local db = SV.db.SVUnit.player
 	local bar = self.TotemBars
 	local size = db.classbar.height
 	local width = size * totemMax
diff --git a/Interface/AddOns/SVUI/packages/unit/resources/warlock.lua b/Interface/AddOns/SVUI/packages/unit/resources/warlock.lua
index d5b30ef..eeed8cd 100644
--- a/Interface/AddOns/SVUI/packages/unit/resources/warlock.lua
+++ b/Interface/AddOns/SVUI/packages/unit/resources/warlock.lua
@@ -41,7 +41,7 @@ local oUF_Villain = SV.oUF
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.")

-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 if(SV.class ~= "WARLOCK") then return end
 local MOD = SV.SVUnit
 if(not MOD) then return end
@@ -79,7 +79,7 @@ POSITIONING
 ##########################################################
 ]]--
 local Reposition = function(self)
-	local db = MOD.db.player
+	local db = SV.db.SVUnit.player
 	local bar = self.WarlockShards;
 	local max = self.MaxClassPower;
 	local size = db.classbar.height
diff --git a/Interface/AddOns/SVUI/packages/unit/resources/warrior.lua b/Interface/AddOns/SVUI/packages/unit/resources/warrior.lua
index a75f100..d0e88f6 100644
--- a/Interface/AddOns/SVUI/packages/unit/resources/warrior.lua
+++ b/Interface/AddOns/SVUI/packages/unit/resources/warrior.lua
@@ -30,7 +30,7 @@ local oUF_Villain = SV.oUF
 --[[ MUNGLUNCH's FASTER ASSERT FUNCTION ]]--
 local assert = assert;
 assert(oUF_Villain, "SVUI was unable to locate oUF.")
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 if(SV.class ~= "WARRIOR") then return end
 local MOD = SV.SVUnit
 if(not MOD) then return end
diff --git a/Interface/AddOns/SVUI/scripts/comix.lua b/Interface/AddOns/SVUI/scripts/comix.lua
index 2a70266..9a712b8 100644
--- a/Interface/AddOns/SVUI/scripts/comix.lua
+++ b/Interface/AddOns/SVUI/scripts/comix.lua
@@ -29,7 +29,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local Comix = CreateFrame("Frame");
 --[[
diff --git a/Interface/AddOns/SVUI/scripts/ego.lua b/Interface/AddOns/SVUI/scripts/ego.lua
index c300f57..d499646 100644
--- a/Interface/AddOns/SVUI/scripts/ego.lua
+++ b/Interface/AddOns/SVUI/scripts/ego.lua
@@ -29,7 +29,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()

 local EgoFrame = CreateFrame("Frame", "EgoFrame", UIParent);
diff --git a/Interface/AddOns/SVUI/scripts/misc.lua b/Interface/AddOns/SVUI/scripts/misc.lua
index 4dfd981..92d10e8 100644
--- a/Interface/AddOns/SVUI/scripts/misc.lua
+++ b/Interface/AddOns/SVUI/scripts/misc.lua
@@ -32,7 +32,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local toonclass = select(2, UnitClass('player'))
 --[[
diff --git a/Interface/AddOns/SVUI/scripts/mounts.lua b/Interface/AddOns/SVUI/scripts/mounts.lua
index 1dc8adb..4efd278 100644
--- a/Interface/AddOns/SVUI/scripts/mounts.lua
+++ b/Interface/AddOns/SVUI/scripts/mounts.lua
@@ -34,7 +34,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 -- MountCache.types
 -- MountCache.names
diff --git a/Interface/AddOns/SVUI/scripts/questwatch.lua b/Interface/AddOns/SVUI/scripts/questwatch.lua
index 7374e5c..e90e764 100644
--- a/Interface/AddOns/SVUI/scripts/questwatch.lua
+++ b/Interface/AddOns/SVUI/scripts/questwatch.lua
@@ -52,7 +52,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local QuestDocklet = CreateFrame("Frame", "SVQuestFrameEventListener", UIParent)
 --[[
diff --git a/Interface/AddOns/SVUI/scripts/raid.lua b/Interface/AddOns/SVUI/scripts/raid.lua
index ce85636..2377df6 100644
--- a/Interface/AddOns/SVUI/scripts/raid.lua
+++ b/Interface/AddOns/SVUI/scripts/raid.lua
@@ -27,7 +27,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/scripts/reactions.lua b/Interface/AddOns/SVUI/scripts/reactions.lua
index ce7a82b..7548547 100644
--- a/Interface/AddOns/SVUI/scripts/reactions.lua
+++ b/Interface/AddOns/SVUI/scripts/reactions.lua
@@ -33,7 +33,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/scripts/spellbind.lua b/Interface/AddOns/SVUI/scripts/spellbind.lua
index 0451c15..7f75675 100644
--- a/Interface/AddOns/SVUI/scripts/spellbind.lua
+++ b/Interface/AddOns/SVUI/scripts/spellbind.lua
@@ -26,7 +26,7 @@ local type 		= _G.type;
 local tinsert 	= _G.tinsert;
 local string 	= _G.string;

-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 --[[
 ##########################################################
 Simple click2cast spell SpellBinder(sBinder by Fernir)
diff --git a/Interface/AddOns/SVUI/setup/installer.lua b/Interface/AddOns/SVUI/setup/installer.lua
index 5431c03..a669208 100644
--- a/Interface/AddOns/SVUI/setup/installer.lua
+++ b/Interface/AddOns/SVUI/setup/installer.lua
@@ -31,7 +31,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0");
+local SVLib = LibSuperVillain;
 local L = SVLib:Lang();
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/setup/presets.lua b/Interface/AddOns/SVUI/setup/presets.lua
index 37a24e8..c1b859c 100644
--- a/Interface/AddOns/SVUI/setup/presets.lua
+++ b/Interface/AddOns/SVUI/setup/presets.lua
@@ -31,7 +31,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang();
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/system/alerts.lua b/Interface/AddOns/SVUI/system/alerts.lua
index 630b4fd..143188f 100644
--- a/Interface/AddOns/SVUI/system/alerts.lua
+++ b/Interface/AddOns/SVUI/system/alerts.lua
@@ -42,7 +42,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0");
+local SVLib = LibSuperVillain;
 local L = SVLib:Lang();
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/system/animate.lua b/Interface/AddOns/SVUI/system/animate.lua
index a85ea8e..2ebbf69 100644
--- a/Interface/AddOns/SVUI/system/animate.lua
+++ b/Interface/AddOns/SVUI/system/animate.lua
@@ -26,7 +26,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/system/common.lua b/Interface/AddOns/SVUI/system/common.lua
index 09554e6..9417a91 100644
--- a/Interface/AddOns/SVUI/system/common.lua
+++ b/Interface/AddOns/SVUI/system/common.lua
@@ -43,7 +43,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/system/load.lua b/Interface/AddOns/SVUI/system/load.lua
index 75432d1..a4bd3ec 100644
--- a/Interface/AddOns/SVUI/system/load.lua
+++ b/Interface/AddOns/SVUI/system/load.lua
@@ -36,7 +36,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 --[[
 ##########################################################
@@ -243,4 +243,19 @@ end

 SV.UIParent:RegisterEvent("ADDON_LOADED")
 SV.UIParent:RegisterEvent("PLAYER_LOGIN")
-SV.UIParent:SetScript("OnEvent", SVUISystem_OnEvent)
\ No newline at end of file
+SV.UIParent:SetScript("OnEvent", SVUISystem_OnEvent)
+--[[
+##########################################################
+THE CLEANING LADY
+##########################################################
+]]--
+local LemonPledge = 0;
+local Consuela = CreateFrame("Frame")
+Consuela:RegisterAllEvents()
+Consuela:SetScript("OnEvent", function(self, event)
+	LemonPledge = LemonPledge  +  1
+	if(not InCombatLockdown() and (LemonPledge > 10000)) then
+		collectgarbage("collect");
+		LemonPledge = 0;
+	end
+end)
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI/system/media.lua b/Interface/AddOns/SVUI/system/media.lua
index ba227b1..27114bc 100644
--- a/Interface/AddOns/SVUI/system/media.lua
+++ b/Interface/AddOns/SVUI/system/media.lua
@@ -38,7 +38,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local LSM = LibStub("LibSharedMedia-3.0")
 --[[
diff --git a/Interface/AddOns/SVUI/system/mentalo.lua b/Interface/AddOns/SVUI/system/mentalo.lua
index 3f3e9a1..772e13a 100644
--- a/Interface/AddOns/SVUI/system/mentalo.lua
+++ b/Interface/AddOns/SVUI/system/mentalo.lua
@@ -34,7 +34,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang();

 local Mentalo = {}
diff --git a/Interface/AddOns/SVUI/system/moveable.lua b/Interface/AddOns/SVUI/system/moveable.lua
index 93b44d4..07a401a 100644
--- a/Interface/AddOns/SVUI/system/moveable.lua
+++ b/Interface/AddOns/SVUI/system/moveable.lua
@@ -34,7 +34,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang();

 local Movable = CreateFrame("Frame", nil)
diff --git a/Interface/AddOns/SVUI/system/slash.lua b/Interface/AddOns/SVUI/system/slash.lua
index 493bd8f..9955b09 100644
--- a/Interface/AddOns/SVUI/system/slash.lua
+++ b/Interface/AddOns/SVUI/system/slash.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 --[[
 ##########################################################
 LOCAL VARS
diff --git a/Interface/AddOns/SVUI/system/timers.lua b/Interface/AddOns/SVUI/system/timers.lua
index bd040d7..ab8e44b 100644
--- a/Interface/AddOns/SVUI/system/timers.lua
+++ b/Interface/AddOns/SVUI/system/timers.lua
@@ -37,7 +37,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 --[[
 ##########################################################
 LOCAL VARS
@@ -79,20 +79,6 @@ local ExeTimerManager_OnUpdate = function(self, elapsed)
 	end
 end

-local function CallbackCheck(id)
-	return function() return Timers.Queue[id] == nil end
-end
-
-function Timers:ExecuteCallbackTimer(timeOutFunction, duration)
-	if(type(duration) == "number" and type(timeOutFunction) == "function") then
-		self.TimerCount = self.TimerCount + 1
-		local id = "LOOP" .. self.TimerCount;
-		self.Queue[id] = {t = duration, f = timeOutFunction}
-		return CallbackCheck(id)
-	end
-	return false
-end
-
 function Timers:ExecuteTimer(timeOutFunction, duration, idCheck)
 	if(type(duration) == "number" and type(timeOutFunction) == "function") then
 		if(idCheck and self.Queue[idCheck]) then
@@ -137,6 +123,17 @@ function Timers:ClearAllTimers()
 	self:SetScript("OnUpdate", ExeTimerManager_OnUpdate)
 end

+local Timers_EventHandler = function(self, event)
+	if(event == "PLAYER_REGEN_DISABLED") then
+		self:SetScript("OnUpdate", nil)
+	else
+		self:SetScript("OnUpdate", ExeTimerManager_OnUpdate)
+	end
+end
+
+Timers:RegisterEvent('PLAYER_REGEN_ENABLED')
+Timers:RegisterEvent('PLAYER_REGEN_DISABLED')
+Timers:SetScript("OnEvent", Timers_EventHandler)
 Timers:SetScript("OnUpdate", ExeTimerManager_OnUpdate)
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/system/utilities.lua b/Interface/AddOns/SVUI/system/utilities.lua
index 55729ec..c3080ed 100644
--- a/Interface/AddOns/SVUI/system/utilities.lua
+++ b/Interface/AddOns/SVUI/system/utilities.lua
@@ -38,7 +38,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang()
+local L = LibSuperVillain:Lang()
 --[[
 ##########################################################
 MISC UTILITY FUNCTIONS
diff --git a/Interface/AddOns/SVUI/system/visibility.lua b/Interface/AddOns/SVUI/system/visibility.lua
index 59463c0..be6b39b 100644
--- a/Interface/AddOns/SVUI/system/visibility.lua
+++ b/Interface/AddOns/SVUI/system/visibility.lua
@@ -27,7 +27,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUI_ADDON_NAME, SV = ...
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 --[[
 ##########################################################
 LOCALS
diff --git a/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua b/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua
index 7a9f217..84dac60 100644
--- a/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua
+++ b/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua
@@ -49,7 +49,7 @@ GET ADDON DATA
 ]]--
 local SVUIAddOnName, PLUGIN = ...;
 local SV = SVUI
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local NewHook = hooksecurefunc;

diff --git a/Interface/AddOns/SVUI_ArtOfWar/SVUI_ArtOfWar.lua b/Interface/AddOns/SVUI_ArtOfWar/SVUI_ArtOfWar.lua
index ca4db9e..4301228 100644
--- a/Interface/AddOns/SVUI_ArtOfWar/SVUI_ArtOfWar.lua
+++ b/Interface/AddOns/SVUI_ArtOfWar/SVUI_ArtOfWar.lua
@@ -55,7 +55,7 @@ GET ADDON DATA
 ]]--
 local SVUIAddOnName, PLUGIN = ...;
 local SV = SVUI
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local NewHook = hooksecurefunc;

diff --git a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua
index 842198d..9e4e64f 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local Ace3Config = LibStub("AceConfig-3.0");
 local Ace3ConfigDialog = LibStub("AceConfigDialog-3.0");
 Ace3Config:RegisterOptionsTable(SV.NameID, SV.Options);
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/language/generic.lua b/Interface/AddOns/SVUI_ConfigOMatic/language/generic.lua
index 4328a6c..6346151 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/language/generic.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/language/generic.lua
@@ -17,7 +17,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local gameLocale = GetLocale()
 if gameLocale == "enUS" then
 	L["AURAS_DESC"] = "Configure the aura icons that appear near the minimap."
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/aura.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/aura.lua
index 1cb3b47..6924b5f 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/aura.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/aura.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVAura;
 local MAP = SV.SVMap;
 --[[
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/bag.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/bag.lua
index a74d4a7..9d0f39b 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/bag.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/bag.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();

 local MOD = SV.SVBag

diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/bar.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/bar.lua
index dfdb9f7..91de22a 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/bar.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/bar.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local SVLib = LibStub("LibSuperVillain-1.0");
+local SVLib = LibSuperVillain;
 local L = SVLib:Lang();
 local MOD = SV.SVBar;
 --[[
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/chat.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/chat.lua
index 2231dff..c210897 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/chat.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/chat.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVChat;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/dock.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/dock.lua
index e60c9a5..c3af16e 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/dock.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/dock.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVDock
 local CHAT = SV.SVChat
 local BAG = SV.SVBag
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/dynamic.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/dynamic.lua
index 1572538..1f9e9ba 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/dynamic.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/dynamic.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local queue = SV.DynamicOptions;

 do
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/filter.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/filter.lua
index 4df6d33..2d9655e 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/filter.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/filter.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVUnit
 if(not MOD) then return end
 local _, ns = ...;
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/henchmen.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/henchmen.lua
index d310f4e..38aaa6a 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/henchmen.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/henchmen.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVHenchmen;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/map.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/map.lua
index 20a49b5..a6f0b97 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/map.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/map.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVMap
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/mode.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/mode.lua
index 68fcc2c..7cfb20e 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/mode.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/mode.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVLaborer
 SV.Options.args.SVLaborer = {
 	type = 'group',
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/plate.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/plate.lua
index f073303..347aeba 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/plate.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/plate.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVPlate;
 local _, ns = ...;
 --[[
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/profiles.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/profiles.lua
index e01449a..9953058 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/profiles.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/profiles.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local SVLib = LibStub("LibSuperVillain-1.0");
+local SVLib = LibSuperVillain;
 local L = SVLib:Lang();

 local playerRealm = GetRealmName()
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/stat.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/stat.lua
index be127d2..b388085 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/stat.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/stat.lua
@@ -29,7 +29,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVStats;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/tip.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/tip.lua
index 9461217..315545e 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/tip.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/tip.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVTip;
 local LSM = LibStub("LibSharedMedia-3.0");
 --[[
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua
index e863f9a..896839c 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua
@@ -32,7 +32,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVUnit
 if(not MOD) then return end
 local _, ns = ...;
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/focus.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/focus.lua
index 1707c3b..dde1c89 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/focus.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/focus.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVUnit
 if(not MOD) then return end
 local _, ns = ...
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/grid.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/grid.lua
index b8f313b..df8d2df 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/grid.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/grid.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVUnit
 if(not MOD) then return end
 local _, ns = ...
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/other.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/other.lua
index f6bb01c..6a31822 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/other.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/other.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVUnit
 if(not MOD) then return end
 local _, ns = ...
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/party.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/party.lua
index 2ddde96..3b1bc0e 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/party.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/party.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVUnit
 if(not MOD) then return end
 local _, ns = ...
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/pet.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/pet.lua
index 7d11fc5..60293e7 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/pet.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/pet.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVUnit
 if(not MOD) then return end
 local _, ns = ...
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/player.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/player.lua
index e1f897b..4dab8aa 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/player.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/player.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVUnit
 if(not MOD) then return end
 local _, ns = ...
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/raid.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/raid.lua
index 68d07cb..b6dc2f2 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/raid.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/raid.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVUnit
 if(not MOD) then return end
 local _, ns = ...
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/target.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/target.lua
index d32874d..397a494 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/target.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/target.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = SV.SVUnit
 if(not MOD) then return end
 local _, ns = ...
diff --git a/Interface/AddOns/SVUI_Laborer/SVUI_Laborer.lua b/Interface/AddOns/SVUI_Laborer/SVUI_Laborer.lua
index 1191fce..bae6d5f 100644
--- a/Interface/AddOns/SVUI_Laborer/SVUI_Laborer.lua
+++ b/Interface/AddOns/SVUI_Laborer/SVUI_Laborer.lua
@@ -44,7 +44,7 @@ GET ADDON DATA
 ]]--
 local SVUIAddOnName, PLUGIN = ...;
 local SV = SVUI
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local NewHook = hooksecurefunc;

diff --git a/Interface/AddOns/SVUI_Laborer/modes/archaeology.lua b/Interface/AddOns/SVUI_Laborer/modes/archaeology.lua
index 25d6e2c..6f8d267 100644
--- a/Interface/AddOns/SVUI_Laborer/modes/archaeology.lua
+++ b/Interface/AddOns/SVUI_Laborer/modes/archaeology.lua
@@ -34,7 +34,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = _G.LaborVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_Laborer/modes/cooking.lua b/Interface/AddOns/SVUI_Laborer/modes/cooking.lua
index 4b3586b..76378ab 100644
--- a/Interface/AddOns/SVUI_Laborer/modes/cooking.lua
+++ b/Interface/AddOns/SVUI_Laborer/modes/cooking.lua
@@ -33,7 +33,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = _G.LaborVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_Laborer/modes/farming.lua b/Interface/AddOns/SVUI_Laborer/modes/farming.lua
index 29b0865..8ad898b 100644
--- a/Interface/AddOns/SVUI_Laborer/modes/farming.lua
+++ b/Interface/AddOns/SVUI_Laborer/modes/farming.lua
@@ -33,7 +33,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = _G.LaborVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_Laborer/modes/fishing.lua b/Interface/AddOns/SVUI_Laborer/modes/fishing.lua
index 79cdcba..ac099e6 100644
--- a/Interface/AddOns/SVUI_Laborer/modes/fishing.lua
+++ b/Interface/AddOns/SVUI_Laborer/modes/fishing.lua
@@ -33,7 +33,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local MOD = _G.LaborVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua
index 0dd6b07..3252914 100644
--- a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua
+++ b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua
@@ -39,7 +39,7 @@ GET ADDON DATA
 ]]--
 local SVUIAddOnName, PLUGIN = ...;
 local SV = SVUI
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local NewHook = hooksecurefunc;

diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
index b5c9489..2af5434 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
@@ -39,7 +39,7 @@ GET ADDON DATA
 ]]--
 local SVUIAddOnName, PLUGIN = ...;
 local SV = _G.SVUI
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()
 local NewHook = hooksecurefunc;

diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua
index b3582ec..7236a6c 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/alert.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/alert.lua
index f2c40ce..7d22c28 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/alert.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/alert.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua
index 03128d8..f1b3089 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua
index 81ff9cc..b9c77ce 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/barbershop.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/barbershop.lua
index c64449f..4c6fb91 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/barbershop.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/barbershop.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/battlefield.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/battlefield.lua
index 8cc4ec1..117de87 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/battlefield.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/battlefield.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/blackmarket.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/blackmarket.lua
index 753f6ba..7e2f2ca 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/blackmarket.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/blackmarket.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua
index aa21f3b..4163aa6 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/challenges.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/challenges.lua
index 889c8a6..5a4964e 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/challenges.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/challenges.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/character.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/character.lua
index 4b85c94..2cd582b 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/character.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/character.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/chat.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/chat.lua
index 2f5b265..16df601 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/chat.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/chat.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua
index 93778ee..8f9e312 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/encounterjournal.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/encounterjournal.lua
index c667ef4..de8a6d4 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/encounterjournal.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/encounterjournal.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua
index 1a128f9..5705b58 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/gossip.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/gossip.lua
index d51b1e0..7d8c91f 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/gossip.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/gossip.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua
index 2749dc7..abf2d0f 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/help.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/help.lua
index 8e3081e..edc6f5d 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/help.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/help.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/inspect.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/inspect.lua
index cf73d99..47daa68 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/inspect.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/inspect.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/itemsocketing.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/itemsocketing.lua
index 7bf8e63..919bf10 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/itemsocketing.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/itemsocketing.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua
index fdadf72..5c539a2 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua
index 4183866..3f7c999 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua
index 7440933..1c402be 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/loothistory.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/loothistory.lua
index fdbea43..79d89ce 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/loothistory.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/loothistory.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/lossofcontrol.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/lossofcontrol.lua
index 22c97ba..e72c845 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/lossofcontrol.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/lossofcontrol.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/macro.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/macro.lua
index 76f567c..2ee24c7 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/macro.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/macro.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua
index 2a1e8b5..4250ff4 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/merchant.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/merchant.lua
index 5c7323d..f6d95ba 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/merchant.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/merchant.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua
index 88c5407..40b2ccb 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/petition.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/petition.lua
index 651ce50..4b27106 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/petition.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/petition.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua
index f0d117b..9248ad6 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/petstable.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/petstable.lua
index 88fb1ce..444fdb7 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/petstable.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/petstable.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua
index 523995b..1c80ace 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua
index 3c953c1..df3bb90 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua
@@ -16,7 +16,7 @@ credit: Elv.                      original logic from ElvUI. Adapted to SVUI #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/raid.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/raid.lua
index 425ab99..2176623 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/raid.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/raid.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua
index b8c8ca6..ed6ccf6 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua
index cba9e52..e134e57 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/store.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/store.lua
index a6455d5..7100517 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/store.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/store.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua
index fb2bd0f..4bf07cb 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua
index dddd84a..86c9441 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 local ceil = math.ceil
 --[[
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/tabard.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/tabard.lua
index 1583614..2ecf13f 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/tabard.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/tabard.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua
index 9f90deb..fa0f537 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua
index edd68a1..e00eec4 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/ACP.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/ACP.lua
index 2ab4ece..c4dd143 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/ACP.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/ACP.lua
@@ -27,7 +27,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AdiBags.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AdiBags.lua
index 16de146..f4c48b2 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AdiBags.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AdiBags.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Altoholic.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Altoholic.lua
index 350c8a4..bfa4aa9 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Altoholic.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Altoholic.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AtlasLoot.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AtlasLoot.lua
index 945acbe..6d6c7b9 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AtlasLoot.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AtlasLoot.lua
@@ -27,7 +27,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AuctionLite.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AuctionLite.lua
index a9e823a..b52d15e 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AuctionLite.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AuctionLite.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/BigWigs.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/BigWigs.lua
index f6d2614..25a4451 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/BigWigs.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/BigWigs.lua
@@ -26,7 +26,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Bugsack.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Bugsack.lua
index 0640878..cb1cf98 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Bugsack.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Bugsack.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Clique.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Clique.lua
index 2fc2f73..347e359 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Clique.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Clique.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Cooline.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Cooline.lua
index ea0a8f4..6502047 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Cooline.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Cooline.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DBM.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DBM.lua
index 7b321cf..3f3f3cf 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DBM.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DBM.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DXE.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DXE.lua
index bc0c503..4cffae3 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DXE.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DXE.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 local playerName = UnitName("player");
 local playerRealm = GetRealmName();
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/LightHeaded.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/LightHeaded.lua
index 77f2a2a..fdaa5fd 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/LightHeaded.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/LightHeaded.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Mogit.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Mogit.lua
index c1e83d6..eca7409 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Mogit.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Mogit.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Outfitter.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Outfitter.lua
index 88b2864..adf5158 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Outfitter.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Outfitter.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Postal.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Postal.lua
index 39ba8d7..b9697e6 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Postal.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Postal.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Quartz.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Quartz.lua
index f935d27..b239af3 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Quartz.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Quartz.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Recount.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Recount.lua
index a6469d6..97e7833 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Recount.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Recount.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/SexyCooldown.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/SexyCooldown.lua
index 830817b..09eb99d 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/SexyCooldown.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/SexyCooldown.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua
index 050fc72..57ba57f 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TomTom.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TomTom.lua
index eae38a5..7a718fd 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TomTom.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TomTom.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TradeSkillDW.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TradeSkillDW.lua
index 24ea17e..63c30c7 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TradeSkillDW.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TradeSkillDW.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/VEM.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/VEM.lua
index d77809c..3422ebc 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/VEM.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/VEM.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua
index 3010da0..68ca64e 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua
index 34b5336..176d650 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua
index 0230df9..21e96bb 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua
index 4c28255..bdd96e0 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua
index 67a26bd..d23403b 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua
index 02fca19..ea32382 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua
index 9a92d60..c6c5389 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua
index 0e965a9..702e532 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/worldstate.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/worldstate.lua
index 76184af..abfd1d6 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/worldstate.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/worldstate.lua
@@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #
 ##############################################################################
 --]]
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua b/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua
index 7cd2c58..bb9da49 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua
@@ -36,7 +36,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
+local L = LibSuperVillain:Lang();
 local STYLE = _G.StyleVillain;
 local LSM = LibStub("LibSharedMedia-3.0")
 local NewHook = hooksecurefunc;
diff --git a/Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua b/Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua
index cc83355..35c02d3 100644
--- a/Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua
+++ b/Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua
@@ -49,7 +49,7 @@ GET ADDON DATA
 ]]--
 local SVUIAddOnName, PLUGIN = ...;
 local SV = SVUI
-local SVLib = LibStub("LibSuperVillain-1.0")
+local SVLib = LibSuperVillain
 local L = SVLib:Lang()

 PLUGIN = SVLib:NewPrototype(SVUIAddOnName)