From bbf9af1e3fdc141aacb608fb036609b22a8adf0e Mon Sep 17 00:00:00 2001
From: wutname1 <jeremy12@gmail.com>
Date: Fri, 28 Jun 2019 00:55:25 -0500
Subject: [PATCH] "The mass migration"

I am sure this broke... everything.
---
 Components/{LoadAll.xml => Loader.xml}        |   26 +-
 Components/Minimap.lua                        |   10 +-
 Components/Nameplates.lua                     |    2 +-
 Components/TauntWatcher.lua                   |   23 -
 Components/Tooltips.lua                       |   10 +-
 Core/Common.lua                               |  245 ++++
 Core/FontHandler.lua                          |   27 +-
 Core/Framework.lua                            | 1226 -----------------
 Core/Options.lua                              |   50 +-
 Core/{Framework.xml => SUI-Core.xml}          |  175 ++-
 Core/SUIWindow.lua                            |    8 +-
 Core/SetupWizard.lua                          |    4 +-
 Core/WhatsNew.lua                             |    2 +-
 Modules/Artwork/SpartanUI_Artwork.lua         |   10 +-
 .../Artwork/Themes/Classic/Module-Minimap.lua |    4 +-
 Modules/Style_Fel/Module-Artwork.lua          |    6 +-
 Modules/Style_Fel/Module-UnitFrames.lua       |   12 +-
 Modules/Style_Fel/Style-Setup.lua             |  266 ----
 Modules/Style_Fel/Style.xml                   |    1 -
 Modules/Style_Minimal/Framework.lua           |    6 +-
 Modules/Style_Minimal/Style-Setup.lua         |  195 ---
 Modules/Style_Minimal/Style.xml               |    1 -
 Modules/Style_Minimal/UnitFrames.lua          |    2 +-
 .../Style_Transparent/Global-Framework.lua    |    6 +-
 .../Style_Transparent/Module-UnitFrames.lua   |   10 +-
 Modules/Style_Transparent/Style-Setup.lua     |  268 ----
 Modules/Style_Transparent/Style.xml           |    1 -
 Modules/Style_War/Module-Artwork.lua          |    2 +-
 Modules/Style_War/Module-UnitFrames.lua       |    4 +-
 Modules/Style_War/Style-Setup.lua             |  266 ----
 Modules/Style_War/Style.xml                   |    1 -
 Modules/UnitFrames/Legacy-Style-Classic.lua   |  220 +--
 media/font-cognosis.ttf => fonts/Cognosis.ttf |  Bin
 media/font-myriad.ttf => fonts/Myriad.ttf     |  Bin
 {media => fonts}/NotoSans-Bold.ttf            |  Bin
 {media => fonts}/Roboto-Bold.ttf              |  Bin
 {media => fonts}/Roboto-Medium.ttf            |  Bin
 {media => images}/HealthBar.blp               |  Bin
 {media => images}/Smoothv2.blp                |  Bin
 {media => images}/Spartan-Helm.blp            |  Bin
 {media => images}/UI-World-Icon-Pushed.BLP    |  Bin
 {media => images}/UI-World-Icon.BLP           |  Bin
 {media => images}/WorldMap-Icon-Pushed.BLP    |  Bin
 {media => images}/WorldMap-Icon.BLP           |  Bin
 {media => images}/blank.tga                   |  Bin
 .../flat_classicons/deathknight.blp           |  Bin
 .../flat_classicons/demonhunter.blp           |  Bin
 .../flat_classicons/druid.blp                 |  Bin
 .../flat_classicons/hunter.blp                |  Bin
 .../flat_classicons/mage.blp                  |  Bin
 .../flat_classicons/monk.blp                  |  Bin
 .../flat_classicons/paladin.blp               |  Bin
 .../flat_classicons/priest.blp                |  Bin
 .../flat_classicons/rogue.blp                 |  Bin
 .../flat_classicons/shaman.blp                |  Bin
 .../flat_classicons/warlock.blp               |  Bin
 .../flat_classicons/warrior.blp               |  Bin
 {media => images}/icon_class.tga              |  Bin
 {media => images}/icon_role.tga               |  Bin
 {media => images}/metal.blp                   |  Bin
 .../minimap/circle-overlay.blp                |  Bin
 .../minimap/circle.tga                        |  Bin
 .../minimap/square-overlay-large.tga          |  Bin
 .../minimap/square-overlay.tga                |  Bin
 {media => images/setup}/Setup-Fonts.blp       |  Bin
 {media => images/setup}/Style_Digital.blp     |  Bin
 {media => images/setup}/Style_Fel.blp         |  Bin
 .../setup}/Style_Frames_Classic.tga           |  Bin
 .../setup}/Style_Frames_Digital.tga           |  Bin
 {media => images/setup}/Style_Frames_Fel.tga  |  Bin
 .../setup}/Style_Frames_Minimal.tga           |  Bin
 .../setup}/Style_Frames_Transparent.tga       |  Bin
 {media => images/setup}/Style_Minimal.blp     |  Bin
 {media => images/setup}/Style_Transparent.blp |  Bin
 {media => images/setup}/Style_War.blp         |  Bin
 {media => images}/smoke.blp                   |  Bin
 {media => images}/texture.tga                 |  Bin
 .../LoadAll.xml => sUF_Plugins/Loader.xml}    |   18 +-
 .../oUF_AuraWatch.lua                         |  652 ++++-----
 .../oUF_Dispellable.lua                       |    0
 .../oUF_RaidDebuffs.lua                       |  372 ++---
 .../oUF_Smooth.lua                            |  106 +-
 .../oUF_Trinkets.lua                          |  224 +--
 83 files changed, 1137 insertions(+), 3324 deletions(-)
 rename Components/{LoadAll.xml => Loader.xml} (97%)
 delete mode 100644 Components/TauntWatcher.lua
 create mode 100644 Core/Common.lua
 delete mode 100644 Core/Framework.lua
 rename Core/{Framework.xml => SUI-Core.xml} (97%)
 delete mode 100644 Modules/Style_Fel/Style-Setup.lua
 delete mode 100644 Modules/Style_Minimal/Style-Setup.lua
 delete mode 100644 Modules/Style_Transparent/Style-Setup.lua
 delete mode 100644 Modules/Style_War/Style-Setup.lua
 rename media/font-cognosis.ttf => fonts/Cognosis.ttf (100%)
 rename media/font-myriad.ttf => fonts/Myriad.ttf (100%)
 rename {media => fonts}/NotoSans-Bold.ttf (100%)
 rename {media => fonts}/Roboto-Bold.ttf (100%)
 rename {media => fonts}/Roboto-Medium.ttf (100%)
 rename {media => images}/HealthBar.blp (100%)
 rename {media => images}/Smoothv2.blp (100%)
 rename {media => images}/Spartan-Helm.blp (100%)
 rename {media => images}/UI-World-Icon-Pushed.BLP (100%)
 rename {media => images}/UI-World-Icon.BLP (100%)
 rename {media => images}/WorldMap-Icon-Pushed.BLP (100%)
 rename {media => images}/WorldMap-Icon.BLP (100%)
 rename {media => images}/blank.tga (100%)
 rename media/flat_classicons/wow_flat_deathknight.blp => images/flat_classicons/deathknight.blp (100%)
 rename media/flat_classicons/wow_flat_demonhunter.blp => images/flat_classicons/demonhunter.blp (100%)
 rename media/flat_classicons/wow_flat_druid.blp => images/flat_classicons/druid.blp (100%)
 rename media/flat_classicons/wow_flat_hunter.blp => images/flat_classicons/hunter.blp (100%)
 rename media/flat_classicons/wow_flat_mage.blp => images/flat_classicons/mage.blp (100%)
 rename media/flat_classicons/wow_flat_monk.blp => images/flat_classicons/monk.blp (100%)
 rename media/flat_classicons/wow_flat_paladin.blp => images/flat_classicons/paladin.blp (100%)
 rename media/flat_classicons/wow_flat_priest.blp => images/flat_classicons/priest.blp (100%)
 rename media/flat_classicons/wow_flat_rogue.blp => images/flat_classicons/rogue.blp (100%)
 rename media/flat_classicons/wow_flat_shaman.blp => images/flat_classicons/shaman.blp (100%)
 rename media/flat_classicons/wow_flat_warlock.blp => images/flat_classicons/warlock.blp (100%)
 rename media/flat_classicons/wow_flat_warrior.blp => images/flat_classicons/warrior.blp (100%)
 rename {media => images}/icon_class.tga (100%)
 rename {media => images}/icon_role.tga (100%)
 rename {media => images}/metal.blp (100%)
 rename media/map-circle-overlay.blp => images/minimap/circle-overlay.blp (100%)
 rename media/map-circle.tga => images/minimap/circle.tga (100%)
 rename media/map-square-overlay-large.tga => images/minimap/square-overlay-large.tga (100%)
 rename media/map-square-overlay.tga => images/minimap/square-overlay.tga (100%)
 rename {media => images/setup}/Setup-Fonts.blp (100%)
 rename {media => images/setup}/Style_Digital.blp (100%)
 rename {media => images/setup}/Style_Fel.blp (100%)
 rename {media => images/setup}/Style_Frames_Classic.tga (100%)
 rename {media => images/setup}/Style_Frames_Digital.tga (100%)
 rename {media => images/setup}/Style_Frames_Fel.tga (100%)
 rename {media => images/setup}/Style_Frames_Minimal.tga (100%)
 rename {media => images/setup}/Style_Frames_Transparent.tga (100%)
 rename {media => images/setup}/Style_Minimal.blp (100%)
 rename {media => images/setup}/Style_Transparent.blp (100%)
 rename {media => images/setup}/Style_War.blp (100%)
 rename {media => images}/smoke.blp (100%)
 rename {media => images}/texture.tga (100%)
 rename libs/{oUF_Plugins/LoadAll.xml => sUF_Plugins/Loader.xml} (96%)
 rename libs/{oUF_Plugins => sUF_Plugins}/oUF_AuraWatch.lua (96%)
 rename libs/{oUF_Plugins => sUF_Plugins}/oUF_Dispellable.lua (100%)
 rename libs/{oUF_Plugins => sUF_Plugins}/oUF_RaidDebuffs.lua (95%)
 rename libs/{oUF_Plugins => sUF_Plugins}/oUF_Smooth.lua (95%)
 rename libs/{oUF_Plugins => sUF_Plugins}/oUF_Trinkets.lua (96%)

diff --git a/Components/LoadAll.xml b/Components/Loader.xml
similarity index 97%
rename from Components/LoadAll.xml
rename to Components/Loader.xml
index bf93642a..fe0b541c 100644
--- a/Components/LoadAll.xml
+++ b/Components/Loader.xml
@@ -1,13 +1,13 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\..\FrameXML\UI.xsd">
-	<Script file="AutoTurnIn.lua" />
-	<Script file="AutoSell.lua" />
-	<Script file="Buffs.lua" />
-	<Script file="Minimap.lua" />
-	<Script file="Objectives.lua" />
-	<Script file="Tooltips.lua" />
-	<Script file="MailOpenAll.lua" />
-	<Script file="Nameplates.lua" />
-	<Script file="CombatLog.lua" />
-	<Script file="InterruptAnnounce.lua" />
-</Ui>
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\..\FrameXML\UI.xsd">
+	<Script file="AutoTurnIn.lua" />
+	<Script file="AutoSell.lua" />
+	<Script file="Buffs.lua" />
+	<Script file="Minimap.lua" />
+	<Script file="Objectives.lua" />
+	<Script file="Tooltips.lua" />
+	<Script file="MailOpenAll.lua" />
+	<Script file="Nameplates.lua" />
+	<Script file="CombatLog.lua" />
+	<Script file="InterruptAnnounce.lua" />
+</Ui>
diff --git a/Components/Minimap.lua b/Components/Minimap.lua
index aa07184e..e7d33769 100644
--- a/Components/Minimap.lua
+++ b/Components/Minimap.lua
@@ -99,7 +99,7 @@ function module:ShapeChange(shape)
 			MiniMapTracking:SetPoint('TOPLEFT', Minimap, 'TOPLEFT', -5, 5)
 		end
 	else
-		Minimap:SetMaskTexture('Interface\\AddOns\\SpartanUI\\media\\map-circle-overlay')
+		Minimap:SetMaskTexture('Interface\\AddOns\\SpartanUI\\images\\minimap\\circle-overlay')
 		if MiniMapTracking then
 			MiniMapTracking:ClearAllPoints()
 			MiniMapTracking:SetPoint('TOPLEFT', Minimap, 'TOPLEFT', -5, -5)
@@ -291,7 +291,7 @@ function module:ModifyMinimapLayout()
 			end
 
 			Minimap.overlay = Minimap:CreateTexture(nil, 'OVERLAY')
-			Minimap.overlay:SetTexture('Interface\\AddOns\\SpartanUI\\Media\\map-square-overlay')
+			Minimap.overlay:SetTexture('Interface\\AddOns\\SpartanUI\\images\\minimap\\square-overlay')
 			Minimap.overlay:SetAllPoints(Minimap)
 			Minimap.overlay:SetBlendMode('ADD')
 
@@ -305,7 +305,7 @@ function module:ModifyMinimapLayout()
 				MiniMapTracking:SetPoint('TOPLEFT', Minimap, 'TOPLEFT', 0, 0)
 			end
 		else
-			Minimap:SetMaskTexture('Interface\\AddOns\\SpartanUI\\media\\map-circle-overlay')
+			Minimap:SetMaskTexture('Interface\\AddOns\\SpartanUI\\images\\minimap\\circle-overlay')
 
 			if not SUI.IsClassic then
 				MiniMapTracking:ClearAllPoints()
@@ -372,8 +372,8 @@ function module:ModifyMinimapLayout()
 	MiniMapWorldMapButton:SetPushedTexture(nil)
 	MiniMapWorldMapButton:SetHighlightTexture(nil)
 	--	-- Create new textures
-	MiniMapWorldMapButton:SetNormalTexture('Interface\\AddOns\\SpartanUI\\media\\WorldMap-Icon.png')
-	MiniMapWorldMapButton:SetPushedTexture('Interface\\AddOns\\SpartanUI\\media\\WorldMap-Icon-Pushed.png')
+	MiniMapWorldMapButton:SetNormalTexture('Interface\\AddOns\\SpartanUI\\images\\WorldMap-Icon.png')
+	MiniMapWorldMapButton:SetPushedTexture('Interface\\AddOns\\SpartanUI\\images\\WorldMap-Icon-Pushed.png')
 	MiniMapWorldMapButton:SetHighlightTexture('Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight')
 	MiniMapWorldMapButton:ClearAllPoints()
 	MiniMapWorldMapButton:SetPoint('TOPRIGHT', Minimap, -20, 12)
diff --git a/Components/Nameplates.lua b/Components/Nameplates.lua
index 521879b3..56af5ceb 100644
--- a/Components/Nameplates.lua
+++ b/Components/Nameplates.lua
@@ -22,7 +22,7 @@ local Images = {
 		}
 	}
 }
-local BarTexture = 'Interface\\AddOns\\SpartanUI\\media\\Smoothv2.tga'
+local BarTexture = 'Interface\\AddOns\\SpartanUI\\images\\Smoothv2.tga'
 local Timers = {}
 
 local pvpIconWar = function(self, event, unit)
diff --git a/Components/TauntWatcher.lua b/Components/TauntWatcher.lua
deleted file mode 100644
index 72ebfb49..00000000
--- a/Components/TauntWatcher.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-local SUI = SUI
-local module = SUI:NewModule('Component_TauntWatcher')
-local L = SUI.L
-module.DisplayName = 'Taunt watcher'
-----------------------------------------------------------------------------------------------------
-
-
-function module:OnInitialize()
-	local Defaults = {
-		FirstLaunch = true,
-		debug = false
-	}
-	if not SUI.DB.TauntWatcher then
-		SUI.DB.EnabledComponents.TauntWatcher = false
-		SUI.DB.TauntWatcher = Defaults
-	else
-		SUI.DB.TauntWatcher = SUI:MergeData(SUI.DB.CombatLog, Defaults, false)
-	end
-end
-
-function module:OnEnable()
-
-end
\ No newline at end of file
diff --git a/Components/Tooltips.lua b/Components/Tooltips.lua
index 63a2c352..ab686912 100644
--- a/Components/Tooltips.lua
+++ b/Components/Tooltips.lua
@@ -39,26 +39,26 @@ local tooltips = {
 	EventTraceTooltip,
 	ItemSocketingDescription
 }
-local whitebg = {bgFile = 'Interface\\AddOns\\SpartanUI\\media\\blank.tga', tile = false, edgeSize = 3}
+local whitebg = {bgFile = 'Interface\\AddOns\\SpartanUI\\images\\blank.tga', tile = false, edgeSize = 3}
 
 function module:OnInitialize()
 	if SUI.DB.Tooltips == nil then
 		SUI.DB.Tooltips = {
 			Styles = {
 				metal = {
-					bgFile = 'Interface\\AddOns\\SpartanUI\\media\\metal.tga',
+					bgFile = 'Interface\\AddOns\\SpartanUI\\images\\metal.tga',
 					tile = false
 				},
 				smooth = {
-					bgFile = 'Interface\\AddOns\\SpartanUI\\media\\Smoothv2.tga',
+					bgFile = 'Interface\\AddOns\\SpartanUI\\images\\Smoothv2.tga',
 					tile = false
 				},
 				smoke = {
-					bgFile = 'Interface\\AddOns\\SpartanUI\\media\\smoke.tga',
+					bgFile = 'Interface\\AddOns\\SpartanUI\\images\\smoke.tga',
 					tile = false
 				},
 				none = {
-					bgFile = 'Interface\\AddOns\\SpartanUI\\media\\blank.tga',
+					bgFile = 'Interface\\AddOns\\SpartanUI\\images\\blank.tga',
 					tile = false
 				}
 			},
diff --git a/Core/Common.lua b/Core/Common.lua
new file mode 100644
index 00000000..8a91e6ae
--- /dev/null
+++ b/Core/Common.lua
@@ -0,0 +1,245 @@
+local SUI, L = SUI, SUI.L
+local type, pairs = type, pairs
+----------------------------------------------------------------------------------------------------
+
+function SUI:BT4ProfileAttach(msg)
+	PageData = {
+		title = 'SpartanUI',
+		Desc1 = msg,
+		-- Desc2 = Desc2,
+		width = 400,
+		height = 150,
+		Display = function()
+			SUI_Win:ClearAllPoints()
+			SUI_Win:SetPoint('TOP', 0, -20)
+			SUI_Win:SetSize(400, 150)
+			SUI_Win.Status:Hide()
+
+			SUI_Win.Skip:SetText('DO NOT ATTACH')
+			SUI_Win.Skip:SetSize(110, 25)
+			SUI_Win.Skip:ClearAllPoints()
+			SUI_Win.Skip:SetPoint('BOTTOMRIGHT', SUI_Win, 'BOTTOM', -15, 15)
+
+			SUI_Win.Next:SetText('ATTACH')
+			SUI_Win.Next:ClearAllPoints()
+			SUI_Win.Next:SetPoint('BOTTOMLEFT', SUI_Win, 'BOTTOM', 15, 15)
+		end,
+		Next = function()
+			SUI.DBG.Bartender4[SUI.DB.BT4Profile] = {
+				Style = SUI.DBMod.Artwork.Style
+			}
+			-- Catch if Movedbars is not initalized
+			if SUI.DB.Styles[SUI.DBMod.Artwork.Style].MovedBars then
+				SUI.DB.Styles[SUI.DBMod.Artwork.Style].MovedBars = {}
+			end
+			--Setup profile
+			SUI:GetModule('Artwork_Core'):SetupProfile(Bartender4.db:GetCurrentProfile())
+			ReloadUI()
+		end,
+		Skip = function()
+			-- ReloadUI()
+		end
+	}
+	local SetupWindow = SUI:GetModule('SUIWindow')
+	SetupWindow:DisplayPage(PageData)
+end
+
+function SUI:BT4RefreshConfig()
+	if SUI.DBG.BartenderChangesActive or SUI.DBMod.Artwork.FirstLoad then
+		return
+	end
+	-- if SUI.DB.Styles[SUI.DBMod.Artwork.Style].BT4Profile == Bartender4.db:GetCurrentProfile() then return end -- Catch False positive)
+	SUI.DB.Styles[SUI.DBMod.Artwork.Style].BT4Profile = Bartender4.db:GetCurrentProfile()
+	SUI.DB.BT4Profile = Bartender4.db:GetCurrentProfile()
+
+	if SUI.DBG.Bartender4 == nil then
+		SUI.DBG.Bartender4 = {}
+	end
+
+	if SUI.DBG.Bartender4[SUI.DB.BT4Profile] then
+		-- We know this profile.
+		if SUI.DBG.Bartender4[SUI.DB.BT4Profile].Style == SUI.DBMod.Artwork.Style then
+			--Profile is for this style, prompt to ReloadUI; usually un needed can uncomment if needed latter
+			-- SUI:reloadui("Your bartender profile has changed, a reload may be required for the bars to appear properly.")
+			-- Catch if Movedbars is not initalized
+			if SUI.DB.Styles[SUI.DBMod.Artwork.Style].MovedBars then
+				SUI.DB.Styles[SUI.DBMod.Artwork.Style].MovedBars = {}
+			end
+		else
+			--Ask if we should change to the correct profile or if we should change the profile to be for this style
+			SUI:BT4ProfileAttach(
+				"This bartender profile is currently attached to the style '" ..
+					SUI.DBG.Bartender4[SUI.DB.BT4Profile].Style ..
+						"' you are currently using " ..
+							SUI.DBMod.Artwork.Style .. ' would you like to reassign the profile to this art skin? '
+			)
+		end
+	else
+		-- We do not know this profile, ask if we should attach it to this style.
+		SUI:BT4ProfileAttach(
+			'This bartender profile is currently NOT attached to any style you are currently using the ' ..
+				SUI.DBMod.Artwork.Style .. ' style would you like to assign the profile to this art skin? '
+		)
+	end
+
+	SUI:Print('Bartender4 Profile changed to: ' .. Bartender4.db:GetCurrentProfile())
+end
+
+function SUI:UpdateModuleConfigs()
+	-- SUI.SpartanUIDB:RegisterDefaults(SUI.DBdefaults)
+
+	-- SUI.DB = SUI.SpartanUIDB.profile.SUIProper
+	-- SUI.DBMod = SUI.SpartanUIDB.profile.Modules
+
+	if Bartender4 then
+		if SUI.DB.Styles[SUI.DBMod.Artwork.Style].BT4Profile then
+			Bartender4.db:SetProfile(SUI.DB.Styles[SUI.DBMod.Artwork.Style].BT4Profile)
+		elseif SUI.DB.Styles[SUI.DBMod.Artwork.Style].BartenderProfile then
+			Bartender4.db:SetProfile(SUI.DB.Styles[SUI.DBMod.Artwork.Style].BartenderProfile)
+		else
+			Bartender4.db:SetProfile(SUI.DB.BT4Profile)
+		end
+	end
+
+	SUI:reloadui()
+end
+
+function SUI:reloadui(Desc2)
+	-- SUI.DB.OpenOptions = true;
+	PageData = {
+		title = 'SpartanUI',
+		Desc1 = 'A reload of your UI is required.',
+		Desc2 = Desc2,
+		width = 400,
+		height = 150,
+		WipePage = true,
+		Display = function()
+			SUI_Win:ClearAllPoints()
+			SUI_Win:SetPoint('TOP', 0, -20)
+			SUI_Win:SetSize(400, 150)
+			SUI_Win.Status:Hide()
+			SUI_Win.Next:SetText('RELOADUI')
+			SUI_Win.Next:ClearAllPoints()
+			SUI_Win.Next:SetPoint('BOTTOM', 0, 30)
+		end,
+		Next = function()
+			ReloadUI()
+		end
+	}
+	local SetupWindow = SUI:GetModule('SUIWindow')
+	SetupWindow:DisplayPage(PageData)
+end
+
+--[[
+	Takes a target table and injects data from the source
+	override allows the source to be put into the target
+	even if its already populated
+]]
+function SUI:MergeData(target, source, override)
+	if type(target) ~= 'table' then
+		target = {}
+	end
+	for k, v in pairs(source) do
+		if type(v) == 'table' then
+			target[k] = self:MergeData(target[k], v, override)
+		else
+			if override then
+				target[k] = v
+			elseif target[k] == nil then
+				target[k] = v
+			end
+		end
+	end
+	return target
+end
+
+function SUI:isPartialMatch(frameName, tab)
+	local result = false
+
+	for _, v in ipairs(tab) do
+		startpos, endpos = strfind(strlower(frameName), strlower(v))
+		if (startpos == 1) then
+			result = true
+		end
+	end
+
+	return result
+end
+
+function SUI:isInTable(tab, frameName)
+	-- local Count = 0
+	-- for Index, Value in pairs( tab ) do
+	-- Count = Count + 1
+	-- end
+	-- print (Count)
+	if tab == nil or frameName == nil then
+		return false
+	end
+	for _, v in ipairs(tab) do
+		if v ~= nil and frameName ~= nil then
+			if (strlower(v) == strlower(frameName)) then
+				return true
+			end
+		end
+	end
+	return false
+end
+
+function SUI:round(num) -- rounds a number to 2 decimal places
+	if num then
+		return floor((num * 10 ^ 2) + 0.5) / (10 ^ 2)
+	end
+end
+
+function SUI:GetiLVL(itemLink)
+	if not itemLink then
+		return 0
+	end
+
+	local scanningTooltip = CreateFrame('GameTooltip', 'AutoTurnInTooltip', nil, 'GameTooltipTemplate')
+	local itemLevelPattern = _G.ITEM_LEVEL:gsub('%%d', '(%%d+)')
+	local itemQuality = select(3, GetItemInfo(itemLink))
+
+	-- if a heirloom return a huge number so we dont replace it.
+	if (itemQuality == 7) then
+		return math.huge
+	end
+
+	-- Scan the tooltip
+	-- Setup the scanning tooltip
+	-- Why do this here and not in OnEnable? If the player is not questing there is no need for this to exsist.
+	scanningTooltip:SetOwner(UIParent, 'ANCHOR_NONE')
+
+	-- If the item is not in the cache populate it.
+	-- if not ilevel then
+	-- Load tooltip
+	scanningTooltip:SetHyperlink(itemLink)
+
+	-- Find the iLVL inthe tooltip
+	for i = 2, scanningTooltip:NumLines() do
+		local line = _G['AutoTurnInTooltipTextLeft' .. i]
+		if line:GetText():match(itemLevelPattern) then
+			return tonumber(line:GetText():match(itemLevelPattern))
+		end
+	end
+	return 0
+end
+
+function SUI:GoldFormattedValue(rawValue)
+	local gold = math.floor(rawValue / 10000)
+	local silver = math.floor((rawValue % 10000) / 100)
+	local copper = (rawValue % 10000) % 100
+
+	return format(
+		GOLD_AMOUNT_TEXTURE .. ' ' .. SILVER_AMOUNT_TEXTURE .. ' ' .. COPPER_AMOUNT_TEXTURE,
+		gold,
+		0,
+		0,
+		silver,
+		0,
+		0,
+		copper,
+		0,
+		0
+	)
+end
diff --git a/Core/FontHandler.lua b/Core/FontHandler.lua
index 72ee0201..97f2c8c2 100644
--- a/Core/FontHandler.lua
+++ b/Core/FontHandler.lua
@@ -6,6 +6,7 @@ local FontFaces = {
 	['SpartanUI'] = 'Cognosis',
 	['Roboto'] = 'Roboto',
 	['Roboto-Bold'] = 'Roboto Bold',
+	['Myriad'] = 'Myriad',
 	['SUI4'] = 'NotoSans',
 	['SUI4cn'] = 'NotoSans (zhCN)',
 	['FrizQuadrata'] = 'Friz Quadrata',
@@ -63,13 +64,15 @@ end
 function SUI:GetFontFace(Module)
 	if Module then
 		if SUI.DB.font.Modules[Module].Face == 'SpartanUI' then
-			return 'Interface\\AddOns\\SpartanUI\\media\\font-cognosis.ttf'
+			return 'Interface\\AddOns\\SpartanUI\\fonts\\Cognosis.ttf'
 		elseif SUI.DB.font.Modules[Module].Face == 'SUI4' then
-			return 'Interface\\AddOns\\SpartanUI\\media\\NotoSans-Bold.ttf'
+			return 'Interface\\AddOns\\SpartanUI\\fonts\\NotoSans-Bold.ttf'
 		elseif SUI.DB.font.Modules[Module].Face == 'Roboto' then
-			return 'Interface\\AddOns\\SpartanUI\\media\\Roboto-Medium.ttf'
+			return 'Interface\\AddOns\\SpartanUI\\fonts\\Roboto-Medium.ttf'
 		elseif SUI.DB.font.Modules[Module].Face == 'Roboto-Bold' then
-			return 'Interface\\AddOns\\SpartanUI\\media\\Roboto-Bold.ttf'
+			return 'Interface\\AddOns\\SpartanUI\\fonts\\Roboto-Bold.ttf'
+		elseif SUI.DB.font.Modules[Module].Face == 'Myriad' then
+			return 'Interface\\AddOns\\SpartanUI\\fonts\\myriad.ttf'
 		elseif SUI.DB.font.Modules[Module].Face == 'FrizQuadrata' then
 			return 'Fonts\\FRIZQT__.TTF'
 		elseif SUI.DB.font.Modules[Module].Face == 'Arial' then
@@ -86,7 +89,7 @@ function SUI:GetFontFace(Module)
 	end
 
 	--Failsafe, no module should be undefined as of 5.0
-	return 'Interface\\AddOns\\SpartanUI\\media\\Roboto-Bold.ttf'
+	return 'Interface\\AddOns\\SpartanUI\\fonts\\Roboto-Bold.ttf'
 end
 
 function SUI:FormatFont(element, size, Module, UpdateOnly)
@@ -140,6 +143,7 @@ function module:FontSetupWizard()
 	local fontlist = {
 		'RobotoBold',
 		'Roboto',
+		'Myriad',
 		'Cognosis',
 		'NotoSans',
 		'FrizQuadrata',
@@ -148,6 +152,7 @@ function module:FontSetupWizard()
 	local fontnames = {
 		['RobotoBold'] = 'Roboto-Bold',
 		['Roboto'] = 'Roboto',
+		['Myriad'] = 'Myriad',
 		['Cognosis'] = 'SpartanUI',
 		['NotoSans'] = 'SUI4',
 		['FrizQuadrata'] = 'FrizQuadrata',
@@ -178,7 +183,7 @@ function module:FontSetupWizard()
 
 			--RobotoBold
 			control = gui:Create('Icon')
-			control:SetImage('interface\\addons\\SpartanUI\\media\\Setup-Fonts', 0, 0.421875, 0, 0.3125)
+			control:SetImage('interface\\addons\\SpartanUI\\images\\setup\\Setup-Fonts', 0, 0.421875, 0, 0.3125)
 			control:SetImageSize(180, 60)
 			control:SetPoint('TOPLEFT', SUI_Win.FontFace, 'TOPLEFT', 55, -55)
 			control:SetCallback('OnClick', RadioButtons)
@@ -203,7 +208,7 @@ function module:FontSetupWizard()
 
 			--Roboto
 			control = gui:Create('Icon')
-			control:SetImage('interface\\addons\\SpartanUI\\media\\Setup-Fonts', 0, 0.421875, 0.34375, 0.65625)
+			control:SetImage('interface\\addons\\SpartanUI\\images\\setup\\Setup-Fonts', 0, 0.421875, 0.34375, 0.65625)
 			control:SetImageSize(180, 60)
 			control:SetPoint('LEFT', SUI_Win.FontFace.RobotoBold.frame, 'RIGHT', 80, 0)
 			control:SetCallback('OnClick', RadioButtons)
@@ -228,7 +233,7 @@ function module:FontSetupWizard()
 
 			--Cognosis
 			control = gui:Create('Icon')
-			control:SetImage('interface\\addons\\SpartanUI\\media\\Setup-Fonts', 0, 0.421875, 0.6875, 1)
+			control:SetImage('interface\\addons\\SpartanUI\\images\\setup\\Setup-Fonts', 0, 0.421875, 0.6875, 1)
 			control:SetImageSize(180, 60)
 			control:SetPoint('LEFT', SUI_Win.FontFace.Roboto.frame, 'RIGHT', 80, 0)
 			control:SetCallback('OnClick', RadioButtons)
@@ -253,7 +258,7 @@ function module:FontSetupWizard()
 
 			--NotoSans
 			control = gui:Create('Icon')
-			control:SetImage('interface\\addons\\SpartanUI\\media\\Setup-Fonts', 0.578125, 1, 0, 0.3125)
+			control:SetImage('interface\\addons\\SpartanUI\\images\\setup\\Setup-Fonts', 0.578125, 1, 0, 0.3125)
 			control:SetImageSize(180, 60)
 			control:SetPoint('TOP', SUI_Win.FontFace.RobotoBold.radio.frame, 'BOTTOM', 0, -20)
 			control:SetCallback('OnClick', RadioButtons)
@@ -278,7 +283,7 @@ function module:FontSetupWizard()
 
 			--FrizQuadrata
 			control = gui:Create('Icon')
-			control:SetImage('interface\\addons\\SpartanUI\\media\\Setup-Fonts', 0.578125, 1, 0.34375, 0.65625)
+			control:SetImage('interface\\addons\\SpartanUI\\images\\setup\\Setup-Fonts', 0.578125, 1, 0.34375, 0.65625)
 			control:SetImageSize(180, 60)
 			control:SetPoint('LEFT', SUI_Win.FontFace.NotoSans.frame, 'RIGHT', 80, 0)
 			control:SetCallback('OnClick', RadioButtons)
@@ -303,7 +308,7 @@ function module:FontSetupWizard()
 
 			--ArialNarrow
 			control = gui:Create('Icon')
-			control:SetImage('interface\\addons\\SpartanUI\\media\\Setup-Fonts', 0.578125, 1, 0.6875, 1)
+			control:SetImage('interface\\addons\\SpartanUI\\images\\setup\\Setup-Fonts', 0.578125, 1, 0.6875, 1)
 			control:SetImageSize(180, 60)
 			control:SetPoint('LEFT', SUI_Win.FontFace.FrizQuadrata.frame, 'RIGHT', 80, 0)
 			control:SetCallback('OnClick', RadioButtons)
diff --git a/Core/Framework.lua b/Core/Framework.lua
deleted file mode 100644
index 112f44e8..00000000
--- a/Core/Framework.lua
+++ /dev/null
@@ -1,1226 +0,0 @@
-local _, SUI = ...
-SUI = LibStub('AceAddon-3.0'):NewAddon(SUI, 'SpartanUI', 'AceEvent-3.0', 'AceConsole-3.0')
-local StdUi = LibStub('StdUi'):NewInstance()
-_G.SUI = SUI
-
-local AceConfig = LibStub('AceConfig-3.0')
-local AceConfigDialog = LibStub('AceConfigDialog-3.0')
-local L = LibStub('AceLocale-3.0'):GetLocale('SpartanUI', true)
-SUI.L = L
-
-local _G = _G
-local type, pairs = type, pairs
-local SUIChatCommands = {}
-SUI.Version = GetAddOnMetadata('SpartanUI', 'Version')
-SUI.BuildNum = GetAddOnMetadata('SpartanUI', 'X-Build')
-SUI.IsClassic = select(4, GetBuildInfo()) < 20000
-
-if not SUI.BuildNum then
-	SUI.BuildNum = 0
-end
-----------------------------------------------------------------------------------------------------
-SUI.opt = {
-	name = 'SpartanUI ' .. SUI.Version,
-	type = 'group',
-	childGroups = 'tree',
-	args = {
-		General = {name = L['General'], type = 'group', order = 0, args = {}},
-		Artwork = {name = L['Artwork'], type = 'group', args = {}},
-		PlayerFrames = {name = L['PlayerFrames'], type = 'group', args = {}},
-		PartyFrames = {name = L['PartyFrames'], type = 'group', args = {}},
-		RaidFrames = {name = L['RaidFrames'], type = 'group', args = {}}
-	}
-}
-
----------------		Database		-------------------------------
-
-local MovedDefault = {moved = false, point = '', relativeTo = nil, relativePoint = '', xOffset = 0, yOffset = 0}
-local frameDefault1 = {
-	movement = MovedDefault,
-	AuraDisplay = true,
-	display = true,
-	Debuffs = 'all',
-	buffs = 'all',
-	style = 'large',
-	moved = false,
-	Anchors = {}
-}
-local frameDefault2 = {
-	AuraDisplay = true,
-	display = true,
-	Debuffs = 'all',
-	buffs = 'all',
-	style = 'medium',
-	moved = false,
-	Anchors = {}
-}
-
-local DBdefault = {
-	SUIProper = {
-		Version = '0',
-		Bartender4Version = 0,
-		SetupDone = false,
-		HVer = '',
-		yoffset = 0,
-		xOffset = 0,
-		yoffsetAuto = true,
-		scale = .92,
-		alpha = 1,
-		viewport = true,
-		EnabledComponents = {},
-		Styles = {
-			['**'] = {
-				Artwork = false,
-				PlayerFrames = false,
-				PartyFrames = false,
-				RaidFrames = false,
-				Movable = {
-					Minimap = true,
-					PlayerFrames = true,
-					PartyFrames = true,
-					RaidFrames = true
-				},
-				Frames = {
-					player = {
-						Buffs = {
-							Display = true,
-							Number = 10,
-							size = 20,
-							spacing = 1,
-							showType = true,
-							onlyShowPlayer = false,
-							Mode = 'both'
-						},
-						Debuffs = {
-							Display = true,
-							Number = 10,
-							size = 20,
-							spacing = 1,
-							showType = true,
-							onlyShowPlayer = true,
-							Mode = 'both'
-						}
-					},
-					target = {
-						Buffs = {
-							Display = true,
-							Number = 10,
-							size = 20,
-							spacing = 1,
-							showType = true,
-							onlyShowPlayer = false,
-							Mode = 'both'
-						},
-						Debuffs = {
-							Display = true,
-							Number = 10,
-							size = 20,
-							spacing = 1,
-							showType = true,
-							onlyShowPlayer = true,
-							Mode = 'bars'
-						}
-					},
-					targettarget = {
-						Buffs = {
-							Display = false,
-							Number = 10,
-							size = 20,
-							spacing = 1,
-							showType = true,
-							onlyShowPlayer = false,
-							Mode = 'disabled'
-						},
-						Debuffs = {
-							Display = true,
-							Number = 10,
-							size = 20,
-							spacing = 1,
-							showType = true,
-							onlyShowPlayer = true,
-							Mode = 'icons'
-						}
-					},
-					pet = {
-						Buffs = {
-							Display = true,
-							Number = 10,
-							size = 15,
-							spacing = 1,
-							showType = true,
-							onlyShowPlayer = false,
-							Mode = 'icons'
-						},
-						Debuffs = {
-							Display = true,
-							Number = 10,
-							size = 15,
-							spacing = 1,
-							showType = true,
-							onlyShowPlayer = false,
-							Mode = 'icons'
-						}
-					},
-					focus = {
-						Buffs = {
-							Display = true,
-							Number = 10,
-							size = 20,
-							spacing = 1,
-							showType = true,
-							onlyShowPlayer = false,
-							Mode = 'icons'
-						},
-						Debuffs = {
-							Display = true,
-							Number = 10,
-							size = 20,
-							spacing = 1,
-							showType = true,
-							onlyShowPlayer = true,
-							Mode = 'icons'
-						}
-					},
-					focustarget = {
-						Buffs = {
-							Display = false,
-							Number = 10,
-							size = 20,
-							spacing = 1,
-							showType = true,
-							onlyShowPlayer = false,
-							Mode = 'disabled'
-						},
-						Debuffs = {
-							Display = false,
-							Number = 10,
-							size = 20,
-							spacing = 1,
-							showType = true,
-							onlyShowPlayer = true,
-							Mode = 'disabled'
-						}
-					}
-				},
-				Minimap = {
-					shape = 'circle',
-					size = {width = 140, height = 140}
-				},
-				StatusBars = {
-					XP = false,
-					REP = false,
-					AP = false
-				},
-				MovedBars = {},
-				TooltipLoc = false,
-				BuffLoc = false
-			},
-			Classic = {
-				Artwork = true,
-				PlayerFrames = true,
-				PartyFrames = true,
-				RaidFrames = true,
-				BartenderProfile = 'SpartanUI - Classic',
-				BartenderSettings = {
-					-- actual settings being inserted into our custom profile
-					ActionBars = {
-						actionbars = {
-							-- following settings are bare minimum, so that anything not defined is retained between resets
-							{
-								enabled = true,
-								buttons = 12,
-								rows = 1,
-								padding = 3,
-								skin = {Zoom = true},
-								position = {
-									point = 'LEFT',
-									parent = 'SUI_ActionBarPlate',
-									x = 0,
-									y = 36,
-									scale = 0.85,
-									growHorizontal = 'RIGHT'
-								}
-							}, -- 1
-							{
-								enabled = true,
-								buttons = 12,
-								rows = 1,
-								padding = 3,
-								skin = {Zoom = true},
-								position = {
-									point = 'LEFT',
-									parent = 'SUI_ActionBarPlate',
-									x = 0,
-									y = -4,
-									scale = 0.85,
-									growHorizontal = 'RIGHT'
-								}
-							}, -- 2
-							{
-								enabled = true,
-								buttons = 12,
-								rows = 1,
-								padding = 3,
-								skin = {Zoom = true},
-								position = {
-									point = 'RIGHT',
-									parent = 'SUI_ActionBarPlate',
-									x = -402,
-									y = 36,
-									scale = 0.85,
-									growHorizontal = 'RIGHT'
-								}
-							}, -- 3
-							{
-								enabled = true,
-								buttons = 12,
-								rows = 1,
-								padding = 3,
-								skin = {Zoom = true},
-								position = {
-									point = 'RIGHT',
-									parent = 'SUI_ActionBarPlate',
-									x = -402,
-									y = -4,
-									scale = 0.85,
-									growHorizontal = 'RIGHT'
-								}
-							}, -- 4
-							{
-								enabled = true,
-								buttons = 12,
-								rows = 3,
-								padding = 4,
-								skin = {Zoom = true},
-								position = {
-									point = 'LEFT',
-									parent = 'SUI_ActionBarPlate',
-									x = -135,
-									y = 36,
-									scale = 0.80,
-									growHorizontal = 'RIGHT'
-								}
-							}, -- 5
-							{
-								enabled = true,
-								buttons = 12,
-								rows = 3,
-								padding = 4,
-								skin = {Zoom = true},
-								position = {
-									point = 'RIGHT',
-									parent = 'SUI_ActionBarPlate',
-									x = 3,
-									y = 36,
-									scale = 0.80,
-									growHorizontal = 'RIGHT'
-								}
-							}, -- 6
-							{
-								enabled = false,
-								buttons = 12,
-								rows = 1,
-								padding = 3,
-								skin = {Zoom = true},
-								position = {parent = 'SUI_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-							}, -- 7
-							{
-								enabled = false,
-								buttons = 12,
-								rows = 1,
-								padding = 3,
-								skin = {Zoom = true},
-								position = {parent = 'SUI_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-							}, -- 8
-							{
-								enabled = false,
-								buttons = 12,
-								rows = 1,
-								padding = 3,
-								skin = {Zoom = true},
-								position = {parent = 'SUI_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-							}, -- 9
-							{
-								enabled = false,
-								buttons = 12,
-								rows = 1,
-								padding = 3,
-								skin = {Zoom = true},
-								position = {parent = 'SUI_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-							} -- 10
-						}
-					},
-					BagBar = {
-						enabled = true,
-						padding = 0,
-						position = {
-							point = 'TOPRIGHT',
-							parent = 'SUI_ActionBarPlate',
-							x = -6,
-							y = -2,
-							scale = 0.70,
-							growHorizontal = 'LEFT'
-						},
-						rows = 1,
-						onebag = false,
-						keyring = true
-					},
-					MicroMenu = {
-						enabled = true,
-						padding = -3,
-						position = {
-							point = 'TOPLEFT',
-							parent = 'SUI_ActionBarPlate',
-							x = 603,
-							y = 0,
-							scale = 0.80,
-							growHorizontal = 'RIGHT'
-						}
-					},
-					PetBar = {
-						enabled = true,
-						padding = 1,
-						position = {
-							point = 'TOPLEFT',
-							parent = 'SUI_ActionBarPlate',
-							x = 5,
-							y = -6,
-							scale = 0.70,
-							growHorizontal = 'RIGHT'
-						},
-						rows = 1,
-						skin = {Zoom = true}
-					},
-					StanceBar = {
-						enabled = true,
-						padding = 1,
-						position = {
-							point = 'TOPRIGHT',
-							parent = 'SUI_ActionBarPlate',
-							x = -605,
-							y = -2,
-							scale = 0.85,
-							growHorizontal = 'LEFT'
-						},
-						rows = 1
-					},
-					MultiCast = {
-						enabled = true,
-						position = {point = 'TOPRIGHT', parent = 'SUI_ActionBarPlate', x = -777, y = -4, scale = 0.75}
-					},
-					Vehicle = {
-						enabled = false,
-						padding = 3,
-						position = {point = 'CENTER', parent = 'SUI_ActionBarPlate', x = -15, y = 213, scale = 0.85}
-					},
-					ExtraActionBar = {enabled = true, position = {point = 'CENTER', parent = 'SUI_ActionBarPlate', x = -32, y = 240}},
-					BlizzardArt = {enabled = false},
-					XPBar = {enabled = false},
-					RepBar = {enabled = false},
-					APBar = {enabled = false},
-					blizzardVehicle = true
-				},
-				Frames = {
-					player = {
-						Buffs = {Mode = 'icons'},
-						Debuffs = {Mode = 'icons'}
-					},
-					target = {
-						Buffs = {Mode = 'icons'},
-						Debuffs = {Mode = 'bars'}
-					},
-					pet = {Buffs = {Mode = 'icons'}, Debuffs = {Mode = 'icons'}},
-					targettarget = {Buffs = {Mode = 'icons'}, Debuffs = {Mode = 'icons'}},
-					focus = {Buffs = {Mode = 'icons'}, Debuffs = {Mode = 'icons'}}
-				},
-				Movable = {
-					Minimap = false,
-					PlayerFrames = true,
-					PartyFrames = true,
-					RaidFrames = true
-				},
-				Minimap = {
-					shape = 'circle',
-					size = {width = 140, height = 140}
-				},
-				StatusBars = {
-					XP = true,
-					REP = true,
-					AP = true
-				},
-				TooltipLoc = true
-			}
-		},
-		ChatSettings = {
-			enabled = true
-		},
-		BuffSettings = {
-			disableblizz = true,
-			enabled = true,
-			Manualoffset = false,
-			offset = 0
-		},
-		PopUP = {
-			popup1enable = true,
-			popup2enable = true,
-			popup1alpha = 100,
-			popup2alpha = 100,
-			popup1anim = true,
-			popup2anim = true
-		},
-		MiniMap = {
-			northTag = false,
-			ManualAllowUse = false,
-			ManualAllowPrompt = '',
-			AutoDetectAllowUse = true,
-			MapButtons = true,
-			MouseIsOver = false,
-			MapZoomButtons = true,
-			DisplayMapCords = true,
-			DisplayZoneName = true,
-			Shape = 'square',
-			BlizzStyle = 'mouseover',
-			OtherStyle = 'mouseover',
-			Moved = false,
-			lockminimap = true,
-			Position = nil,
-			-- frames = {},
-			-- IgnoredFrames = {},
-			SUIMapChangesActive = false
-		},
-		ActionBars = {
-			Allalpha = 100,
-			Allenable = true,
-			popup1 = {anim = true, alpha = 100, enable = true},
-			popup2 = {anim = true, alpha = 100, enable = true},
-			bar1 = {alpha = 100, enable = true},
-			bar2 = {alpha = 100, enable = true},
-			bar3 = {alpha = 100, enable = true},
-			bar4 = {alpha = 100, enable = true},
-			bar5 = {alpha = 100, enable = true},
-			bar6 = {alpha = 100, enable = true}
-		},
-		font = {
-			NumberSeperator = ',',
-			Path = '',
-			Modules = {
-				['**'] = {
-					Size = 0,
-					Face = 'Roboto-Bold',
-					Type = 'outline'
-				}
-			}
-		},
-		Components = {}
-	},
-	Modules = {
-		StatusBars = {
-			default = {
-				size = {256, 36},
-				Grow = 'LEFT',
-				bgTooltip = 'Interface\\Addons\\SpartanUI_Artwork\\Images\\status-tooltip',
-				texCordsTooltip = {0.103515625, 0.8984375, 0.1796875, 0.8203125},
-				TooltipSize = {300, 100},
-				TooltipTextSize = {230, 60},
-				TooltipTextWidth = 300,
-				tooltipAnchor = 'TOP',
-				FontSize = 9,
-				TextColor = {1, 1, 1, 1},
-				MaxWidth = 0,
-				GlowAnchor = 'RIGHT',
-				GlowPoint = {x = 0, y = 0},
-				GlowHeight = 20,
-				GlowImage = 'Interface\\AddOns\\SpartanUI_Artwork\\Images\\status-glow',
-				texCords = {0, 1, 0, 1}
-			},
-			['**'] = {
-				display = 'disabled',
-				ToolTip = 'hover',
-				text = true,
-				AutoColor = true,
-				Color = {0, 0, 0, 1},
-				FontSize = 10,
-				GlowAnchor = 'RIGHT',
-				GlowHeight = 20,
-				texCords = {0, 1, 0, 1},
-				CustomColor2 = {
-					r = 0,
-					g = 0,
-					b = 0,
-					a = 1
-				},
-				CustomColor = {
-					r = 0,
-					g = 0,
-					b = 0,
-					a = 1
-				}
-			},
-			[1] = {
-				display = 'xp'
-			},
-			[2] = {
-				display = 'honor'
-			}
-		},
-		Artwork = {
-			Style = '',
-			TopOffset = 0,
-			TopOffsetAuto = true,
-			BottomOffset = 0,
-			BottomOffsetAuto = true,
-			FirstLoad = true,
-			VehicleUI = true,
-			Viewport = {
-				enabled = true,
-				offset = {top = 0, bottom = 2.3, left = 0, right = 0}
-			},
-			SlidingTrays = {
-				['**'] = {
-					collapsed = false
-				}
-			}
-		},
-		SpinCam = {
-			enable = true,
-			speed = 8
-		},
-		FilmEffects = {
-			enable = false,
-			animationInterval = 0,
-			anim = '',
-			vignette = nil
-		},
-		PartyFrames = {
-			Style = 'Classic',
-			Portrait3D = true,
-			threat = true,
-			preset = 'dps',
-			FrameStyle = 'large',
-			showAuras = true,
-			partyLock = true,
-			showClass = true,
-			partyMoved = false,
-			castbar = true,
-			castbartext = true,
-			showPartyInRaid = false,
-			showParty = true,
-			showPlayer = true,
-			showSolo = false,
-			Portrait = true,
-			scale = 1,
-			Auras = {
-				NumBuffs = 0,
-				NumDebuffs = 10,
-				size = 16,
-				spacing = 1,
-				showType = true
-			},
-			Anchors = {
-				point = 'TOPLEFT',
-				relativeTo = 'UIParent',
-				relativePoint = 'TOPLEFT',
-				xOfs = 10,
-				yOfs = -20
-			},
-			bars = {health = {textstyle = 'dynamic', textmode = 1}, mana = {textstyle = 'dynamic', textmode = 1}},
-			display = {pet = true, target = true, mana = true}
-		},
-		PlayerFrames = {
-			Style = 'Classic',
-			Portrait3D = true,
-			showClass = true,
-			focusMoved = false,
-			PetPortrait = true,
-			global = frameDefault1,
-			player = frameDefault1,
-			target = frameDefault1,
-			targettarget = frameDefault2,
-			pet = frameDefault2,
-			focus = frameDefault2,
-			focustarget = frameDefault2,
-			boss = frameDefault2,
-			arena = frameDefault2,
-			bars = {
-				health = {textstyle = 'dynamic', textmode = 1},
-				mana = {textstyle = 'longfor', textmode = 1},
-				player = {color = 'dynamic'},
-				target = {color = 'reaction'},
-				targettarget = {color = 'dynamic', style = 'large'},
-				pet = {color = 'happiness'},
-				focus = {color = 'dynamic'},
-				focustarget = {color = 'dynamic'}
-			},
-			Castbar = {
-				player = 1,
-				target = 1,
-				targettarget = 1,
-				pet = 1,
-				focus = 1,
-				text = {player = 1, target = 1, targettarget = 1, pet = 1, focus = 1}
-			},
-			BossFrame = {movement = MovedDefault, display = true, scale = 1},
-			ArenaFrame = {movement = MovedDefault, display = true, scale = 1},
-			ClassBar = {scale = 1, movement = MovedDefault},
-			TotemFrame = {movement = MovedDefault},
-			AltManaBar = {movement = MovedDefault}
-		},
-		RaidFrames = {
-			Style = 'Classic',
-			HideBlizzFrames = true,
-			threat = true,
-			mode = 'ASSIGNEDROLE',
-			preset = 'dps',
-			FrameStyle = 'small',
-			showAuras = true,
-			showClass = true,
-			moved = false,
-			showRaid = true,
-			maxColumns = 4,
-			unitsPerColumn = 10,
-			columnSpacing = 5,
-			scale = 1,
-			Anchors = {
-				point = 'TOPLEFT',
-				relativeTo = 'UIParent',
-				relativePoint = 'TOPLEFT',
-				xOfs = 10,
-				yOfs = -20
-			},
-			bars = {
-				health = {textstyle = 'dynamic', textmode = 1},
-				mana = {textstyle = 'dynamic', textmode = 1}
-			},
-			debuffs = {display = true},
-			Auras = {size = 10, spacing = 1, showType = true}
-		}
-	}
-}
-
-local DBdefaults = {char = DBdefault, profile = DBdefault}
--- local SUI.DBGs = {Version = SUI.Version}
-
-function SUI:ResetConfig()
-	SUI.DB:ResetProfile(false, true)
-	ReloadUI()
-end
-
-function SUI:OnInitialize()
-	SUI.SpartanUIDB = LibStub('AceDB-3.0'):New('SpartanUIDB', DBdefaults)
-	--If we have not played in a long time reset the database, make sure it is all good.
-	local ver = SUI.SpartanUIDB.profile.SUIProper.Version
-	if (ver ~= '0' and ver < '4.0.0') then
-		SUI.SpartanUIDB:ResetDB()
-	end
-
-	-- New SUI.DB Access
-	SUI.DBG = SUI.SpartanUIDB.global
-	SUI.DB = SUI.SpartanUIDB.profile.SUIProper
-	SUI.DBMod = SUI.SpartanUIDB.profile.Modules
-
-	--Check for any SUI.DB changes
-	if SUI.DB.SetupDone and (SUI.Version ~= SUI.DB.Version) then
-		SUI:DBUpgrades()
-	end
-
-	-- Add Addon-Wide Bar textures
-	SUI.BarTextures = {
-		smooth = 'Interface\\AddOns\\SpartanUI\\media\\Smoothv2.tga'
-	}
-
-	-- Add Profiles to Options
-	SUI.opt.args['Profiles'] = LibStub('AceDBOptions-3.0'):GetOptionsTable(SUI.SpartanUIDB)
-
-	-- Add dual-spec support
-	local LibDualSpec = LibStub('LibDualSpec-1.0', true)
-	if not SUI.IsClassic and LibDualSpec then
-		LibDualSpec:EnhanceDatabase(self.SpartanUIDB, 'SpartanUI')
-		LibDualSpec:EnhanceOptions(SUI.opt.args['Profiles'], self.SpartanUIDB)
-		SUI.opt.args['Profiles'].order = 999
-	end
-
-	-- Spec Setup
-	SUI.SpartanUIDB.RegisterCallback(SUI, 'OnNewProfile', 'InitializeProfile')
-	SUI.SpartanUIDB.RegisterCallback(SUI, 'OnProfileChanged', 'UpdateModuleConfigs')
-	SUI.SpartanUIDB.RegisterCallback(SUI, 'OnProfileCopied', 'UpdateModuleConfigs')
-	SUI.SpartanUIDB.RegisterCallback(SUI, 'OnProfileReset', 'UpdateModuleConfigs')
-
-	--Bartender4
-	if SUI.DBG.Bartender4 == nil then
-		SUI.DBG.Bartender4 = {}
-	end
-	if SUI.DBG.BartenderChangesActive then
-		SUI.DBG.BartenderChangesActive = false
-	end
-	if Bartender4 then
-		--Update to the current profile
-		SUI.DB.BT4Profile = Bartender4.db:GetCurrentProfile()
-		Bartender4.db.RegisterCallback(SUI, 'OnProfileChanged', 'BT4RefreshConfig')
-		Bartender4.db.RegisterCallback(SUI, 'OnProfileCopied', 'BT4RefreshConfig')
-		Bartender4.db.RegisterCallback(SUI, 'OnProfileReset', 'BT4RefreshConfig')
-	end
-
-	-- Initalize setup of Fonts
-	SUI:FontSetup()
-
-	--First Time Setup Actions
-	if not SUI.DB.SetupDone then
-		if _G.LARGE_NUMBER_SEPERATOR == '.' then
-			SUI.DB.font.NumberSeperator = '.'
-		elseif _G.LARGE_NUMBER_SEPERATOR == '' then
-			SUI.DB.font.NumberSeperator = ''
-		end
-	end
-end
-
-function SUI:DBUpgrades()
-	if SUI.DBMod.Artwork.Style == '' and SUI.DBMod.Artwork.SetupDone then
-		SUI.DBMod.Artwork.Style = 'Classic'
-	end
-
-	-- 5.0.0 Upgrades
-	if SUI.DB.Version < '5.0.0' then
-		SUI.DB.font.SetupDone = true
-		SUI.DBMod.Objectives.SetupDone = true
-		SUI.DB.SetupWizard.FirstLaunch = false
-		SUI.DB.AutoTurnIn.FirstLaunch = false
-		SUI.DB.AutoSell.FirstLaunch = false
-		SUI.DB.SetupWizard.FirstLaunch = false
-	end
-
-	SUI.DB.Version = SUI.Version
-end
-
-function SUI:InitializeProfile()
-	SUI.DB:RegisterDefaults(SUI.DBdefaults)
-
-	SUI.DBG = SUI.SpartanUIDB.global
-	SUI.DB = SUI.SpartanUIDB.profile.SUIProper
-	SUI.DBMod = SUI.SpartanUIDB.profile.Modules
-
-	SUI:reloadui()
-end
-
----------------		Misc Backend		-------------------------------
-
-function SUI:GetiLVL(itemLink)
-	if not itemLink then
-		return 0
-	end
-
-	local scanningTooltip = CreateFrame('GameTooltip', 'AutoTurnInTooltip', nil, 'GameTooltipTemplate')
-	local itemLevelPattern = _G.ITEM_LEVEL:gsub('%%d', '(%%d+)')
-	local itemQuality = select(3, GetItemInfo(itemLink))
-
-	-- if a heirloom return a huge number so we dont replace it.
-	if (itemQuality == 7) then
-		return math.huge
-	end
-
-	-- Scan the tooltip
-	-- Setup the scanning tooltip
-	-- Why do this here and not in OnEnable? If the player is not questing there is no need for this to exsist.
-	scanningTooltip:SetOwner(UIParent, 'ANCHOR_NONE')
-
-	-- If the item is not in the cache populate it.
-	-- if not ilevel then
-	-- Load tooltip
-	scanningTooltip:SetHyperlink(itemLink)
-
-	-- Find the iLVL inthe tooltip
-	for i = 2, scanningTooltip:NumLines() do
-		local line = _G['AutoTurnInTooltipTextLeft' .. i]
-		if line:GetText():match(itemLevelPattern) then
-			return tonumber(line:GetText():match(itemLevelPattern))
-		end
-	end
-	return 0
-end
-
-function SUI:GoldFormattedValue(rawValue)
-	local gold = math.floor(rawValue / 10000)
-	local silver = math.floor((rawValue % 10000) / 100)
-	local copper = (rawValue % 10000) % 100
-
-	return format(
-		GOLD_AMOUNT_TEXTURE .. ' ' .. SILVER_AMOUNT_TEXTURE .. ' ' .. COPPER_AMOUNT_TEXTURE,
-		gold,
-		0,
-		0,
-		silver,
-		0,
-		0,
-		copper,
-		0,
-		0
-	)
-end
-
-function SUI:BT4ProfileAttach(msg)
-	PageData = {
-		title = 'SpartanUI',
-		Desc1 = msg,
-		-- Desc2 = Desc2,
-		width = 400,
-		height = 150,
-		Display = function()
-			SUI_Win:ClearAllPoints()
-			SUI_Win:SetPoint('TOP', 0, -20)
-			SUI_Win:SetSize(400, 150)
-			SUI_Win.Status:Hide()
-
-			SUI_Win.Skip:SetText('DO NOT ATTACH')
-			SUI_Win.Skip:SetSize(110, 25)
-			SUI_Win.Skip:ClearAllPoints()
-			SUI_Win.Skip:SetPoint('BOTTOMRIGHT', SUI_Win, 'BOTTOM', -15, 15)
-
-			SUI_Win.Next:SetText('ATTACH')
-			SUI_Win.Next:ClearAllPoints()
-			SUI_Win.Next:SetPoint('BOTTOMLEFT', SUI_Win, 'BOTTOM', 15, 15)
-		end,
-		Next = function()
-			SUI.DBG.Bartender4[SUI.DB.BT4Profile] = {
-				Style = SUI.DBMod.Artwork.Style
-			}
-			-- Catch if Movedbars is not initalized
-			if SUI.DB.Styles[SUI.DBMod.Artwork.Style].MovedBars then
-				SUI.DB.Styles[SUI.DBMod.Artwork.Style].MovedBars = {}
-			end
-			--Setup profile
-			SUI:GetModule('Artwork_Core'):SetupProfile(Bartender4.db:GetCurrentProfile())
-			ReloadUI()
-		end,
-		Skip = function()
-			-- ReloadUI()
-		end
-	}
-	local SetupWindow = SUI:GetModule('SUIWindow')
-	SetupWindow:DisplayPage(PageData)
-end
-
-function SUI:BT4RefreshConfig()
-	if SUI.DBG.BartenderChangesActive or SUI.DBMod.Artwork.FirstLoad then
-		return
-	end
-	-- if SUI.DB.Styles[SUI.DBMod.Artwork.Style].BT4Profile == Bartender4.db:GetCurrentProfile() then return end -- Catch False positive)
-	SUI.DB.Styles[SUI.DBMod.Artwork.Style].BT4Profile = Bartender4.db:GetCurrentProfile()
-	SUI.DB.BT4Profile = Bartender4.db:GetCurrentProfile()
-
-	if SUI.DBG.Bartender4 == nil then
-		SUI.DBG.Bartender4 = {}
-	end
-
-	if SUI.DBG.Bartender4[SUI.DB.BT4Profile] then
-		-- We know this profile.
-		if SUI.DBG.Bartender4[SUI.DB.BT4Profile].Style == SUI.DBMod.Artwork.Style then
-			--Profile is for this style, prompt to ReloadUI; usually un needed can uncomment if needed latter
-			-- SUI:reloadui("Your bartender profile has changed, a reload may be required for the bars to appear properly.")
-			-- Catch if Movedbars is not initalized
-			if SUI.DB.Styles[SUI.DBMod.Artwork.Style].MovedBars then
-				SUI.DB.Styles[SUI.DBMod.Artwork.Style].MovedBars = {}
-			end
-		else
-			--Ask if we should change to the correct profile or if we should change the profile to be for this style
-			SUI:BT4ProfileAttach(
-				"This bartender profile is currently attached to the style '" ..
-					SUI.DBG.Bartender4[SUI.DB.BT4Profile].Style ..
-						"' you are currently using " ..
-							SUI.DBMod.Artwork.Style .. ' would you like to reassign the profile to this art skin? '
-			)
-		end
-	else
-		-- We do not know this profile, ask if we should attach it to this style.
-		SUI:BT4ProfileAttach(
-			'This bartender profile is currently NOT attached to any style you are currently using the ' ..
-				SUI.DBMod.Artwork.Style .. ' style would you like to assign the profile to this art skin? '
-		)
-	end
-
-	SUI:Print('Bartender4 Profile changed to: ' .. Bartender4.db:GetCurrentProfile())
-end
-
-function SUI:UpdateModuleConfigs()
-	-- SUI.SpartanUIDB:RegisterDefaults(SUI.DBdefaults)
-
-	-- SUI.DB = SUI.SpartanUIDB.profile.SUIProper
-	-- SUI.DBMod = SUI.SpartanUIDB.profile.Modules
-
-	if Bartender4 then
-		if SUI.DB.Styles[SUI.DBMod.Artwork.Style].BT4Profile then
-			Bartender4.db:SetProfile(SUI.DB.Styles[SUI.DBMod.Artwork.Style].BT4Profile)
-		elseif SUI.DB.Styles[SUI.DBMod.Artwork.Style].BartenderProfile then
-			Bartender4.db:SetProfile(SUI.DB.Styles[SUI.DBMod.Artwork.Style].BartenderProfile)
-		else
-			Bartender4.db:SetProfile(SUI.DB.BT4Profile)
-		end
-	end
-
-	SUI:reloadui()
-end
-
-function SUI:reloadui(Desc2)
-	-- SUI.DB.OpenOptions = true;
-	PageData = {
-		title = 'SpartanUI',
-		Desc1 = 'A reload of your UI is required.',
-		Desc2 = Desc2,
-		width = 400,
-		height = 150,
-		WipePage = true,
-		Display = function()
-			SUI_Win:ClearAllPoints()
-			SUI_Win:SetPoint('TOP', 0, -20)
-			SUI_Win:SetSize(400, 150)
-			SUI_Win.Status:Hide()
-			SUI_Win.Next:SetText('RELOADUI')
-			SUI_Win.Next:ClearAllPoints()
-			SUI_Win.Next:SetPoint('BOTTOM', 0, 30)
-		end,
-		Next = function()
-			ReloadUI()
-		end
-	}
-	local SetupWindow = SUI:GetModule('SUIWindow')
-	SetupWindow:DisplayPage(PageData)
-end
-
-function SUI:OnEnable()
-	if not SUI.DB.SetupDone then
-	end
-	AceConfig:RegisterOptionsTable(
-		'SpartanUIBliz',
-		{
-			name = 'SpartanUI',
-			type = 'group',
-			args = {
-				n3 = {
-					type = 'description',
-					fontSize = 'medium',
-					order = 3,
-					width = 'full',
-					name = L['Options can be accessed by the button below or by typing /sui']
-				},
-				Close = {
-					name = 'Launch Options',
-					width = 'full',
-					type = 'execute',
-					order = 50,
-					func = function()
-						InterfaceOptionsFrame:Hide()
-						AceConfigDialog:SetDefaultSize('SpartanUI', 850, 600)
-						AceConfigDialog:Open('SpartanUI')
-					end
-				}
-			}
-		}
-	)
-	AceConfigDialog:AddToBlizOptions('SpartanUIBliz', 'SpartanUI')
-
-	AceConfig:RegisterOptionsTable('SpartanUI', SUI.opt)
-	if not SUI:GetModule('Artwork_Core', true) then
-		SUI.opt.args['Artwork'].disabled = true
-	end
-	if not SUI:GetModule('PartyFrames', true) then
-		SUI.opt.args['PartyFrames'].disabled = true
-	end
-	if not SUI:GetModule('PlayerFrames', true) then
-		SUI.opt.args['PlayerFrames'].disabled = true
-	end
-	if not SUI:GetModule('RaidFrames', true) then
-		SUI.opt.args['RaidFrames'].disabled = true
-	end
-
-	self:RegisterChatCommand('sui', 'ChatCommand')
-	self:RegisterChatCommand('suihelp', 'suihelp')
-	self:RegisterChatCommand('spartanui', 'ChatCommand')
-	self:RegisterChatCommand('suimove', 'SUIMove')
-
-	--Reopen options screen if flagged to do so after a reloadui
-	local LaunchOpt = CreateFrame('Frame')
-	LaunchOpt:SetScript(
-		'OnEvent',
-		function(self, ...)
-			if SUI.DB.OpenOptions then
-				SUI:ChatCommand()
-				SUI.DB.OpenOptions = false
-			end
-		end
-	)
-	LaunchOpt:RegisterEvent('PLAYER_ENTERING_WORLD')
-	if (not select(4, GetAddOnInfo('Bartender4')) and not SUI.DB.BT4Warned) then
-		local cnt = 1
-		local BT4Warning = CreateFrame('Frame')
-		BT4Warning:SetScript('OnEvent', function()
-			if cnt <= 10 then
-				StdUi:Dialog(L['Warning'], L['Bartender4 not detected! Please download and install Bartender4.'] ..' Warning ' .. cnt .. ' of 10')
-			else
-				SUI.DB.BT4Warned = true
-			end
-			cnt = cnt + 1
-		end)
-		BT4Warning:RegisterEvent('PLAYER_LOGIN')
-		BT4Warning:RegisterEvent('PLAYER_ENTERING_WORLD')
-		BT4Warning:RegisterEvent('ZONE_CHANGED')
-		BT4Warning:RegisterEvent('ZONE_CHANGED_INDOORS')
-		BT4Warning:RegisterEvent('ZONE_CHANGED_NEW_AREA')
-		
-	end
-end
-
-function SUI:suihelp(input)
-	AceConfigDialog:SetDefaultSize('SpartanUI', 850, 600)
-	AceConfigDialog:Open('SpartanUI', 'Help')
-end
-
-function SUI:SUIMove(input)
-	SUI:Print(
-		'Sorry, /suimove has been removed due to conflicts with other systems. It will be back and better than before in a SUI 5.x build. In the meantime you can move frames and the minimap by holding alt and dragging.'
-	)
-end
-
-local ResetDBWarning = false
-function SUI:ChatCommand(input)
-	if input == 'resetfulldb' then
-		if ResetDBWarning then
-			Bartender4.db:ResetDB()
-			SUI.SpartanUIDB:ResetDB()
-		else
-			ResetDBWarning = true
-			SUI:Print('|cffff0000Warning')
-			SUI:Print(
-				L[
-					'This will reset the full SpartanUI & Bartender4 database. If you wish to continue perform the chat command again.'
-				]
-			)
-		end
-	elseif input == 'resetbartender' then
-		SUI.opt.args['General'].args['Bartender'].args['ResetActionBars']:func()
-	elseif input == 'resetdb' then
-		if ResetDBWarning then
-			SUI.SpartanUIDB:ResetDB()
-		else
-			ResetDBWarning = true
-			SUI:Print('|cffff0000Warning')
-			SUI:Print(L['This will reset the SpartanUI Database. If you wish to continue perform the chat command again.'])
-		end
-	elseif input == 'setup' then
-		SUI:GetModule('SetupWizard'):SetupWizard()
-	elseif input == 'help' then
-		SUI:suihelp()
-	elseif input == 'version' then
-		SUI:Print(L['Version'] .. ' ' .. GetAddOnMetadata('SpartanUI', 'Version'))
-		SUI:Print(L['Build'] .. ' ' .. GetAddOnMetadata('SpartanUI', 'X-Build'))
-		SUI:Print(L['Bartender4 version'] .. ' ' .. SUI.DB.Bartender4Version)
-	else
-		if SUIChatCommands[input] then
-			SUIChatCommands[input]()
-		elseif string.find(input, ' ') then
-			for i in string.gmatch(input, "%S+") do
-				local arg, _ = string.gsub(input, i .. ' ', '')
-				if SUIChatCommands[i] then
-					SUIChatCommands[i](arg)
-				end
-			 end
-		else
-			AceConfigDialog:SetDefaultSize('SpartanUI', 850, 600)
-			AceConfigDialog:Open('SpartanUI')
-		end
-	end
-end
-
-function SUI:AddChatCommand(arg, func)
-	SUIChatCommands[arg] = func
-end
-
-function SUI:Err(mod, err)
-	SUI:Print('|cffff0000Error detected')
-	SUI:Print("An error has been captured in the Component '" .. mod .. "'")
-	SUI:Print('Details: ' .. err)
-	SUI:Print('Please submit a bug at |cff3370FFhttp://bugs.spartanui.net/')
-end
-
---[[
-	Takes a target table and injects data from the source
-	override allows the source to be put into the target
-	even if its already populated
-]]
-function SUI:MergeData(target, source, override)
-	if type(target) ~= 'table' then
-		target = {}
-	end
-	for k, v in pairs(source) do
-		if type(v) == 'table' then
-			target[k] = self:MergeData(target[k], v, override)
-		else
-			if override then
-				target[k] = v
-			elseif target[k] == nil then
-				target[k] = v
-			end
-		end
-	end
-	return target
-end
-
----------------		Math and Comparison FUNCTIONS		-------------------------------
-
---[[
-	Takes a target table and injects data from the source
-	override allows the source to be put into the target
-	even if its already populated
-]]
-function SUI:MergeData(target, source, override)
-	if type(target) ~= 'table' then
-		target = {}
-	end
-	for k, v in pairs(source) do
-		if type(v) == 'table' then
-			target[k] = self:MergeData(target[k], v, override)
-		else
-			if override then
-				target[k] = v
-			elseif target[k] == nil then
-				target[k] = v
-			end
-		end
-	end
-	return target
-end
-
-function SUI:isPartialMatch(frameName, tab)
-	local result = false
-
-	for _, v in ipairs(tab) do
-		startpos, endpos = strfind(strlower(frameName), strlower(v))
-		if (startpos == 1) then
-			result = true
-		end
-	end
-
-	return result
-end
-
-function SUI:isInTable(tab, frameName)
-	-- local Count = 0
-	-- for Index, Value in pairs( tab ) do
-	-- Count = Count + 1
-	-- end
-	-- print (Count)
-	if tab == nil or frameName == nil then
-		return false
-	end
-	for _, v in ipairs(tab) do
-		if v ~= nil and frameName ~= nil then
-			if (strlower(v) == strlower(frameName)) then
-				return true
-			end
-		end
-	end
-	return false
-end
-
-function SUI:round(num) -- rounds a number to 2 decimal places
-	if num then
-		return floor((num * 10 ^ 2) + 0.5) / (10 ^ 2)
-	end
-end
diff --git a/Core/Options.lua b/Core/Options.lua
index 33256cd6..0a145125 100644
--- a/Core/Options.lua
+++ b/Core/Options.lua
@@ -73,7 +73,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Fel', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Fel', 120, 60
 						end,
 						func = function()
 							SUI.DBMod.Artwork.Style = 'Fel'
@@ -89,7 +89,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Transparent', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Transparent', 120, 60
 						end,
 						func = function()
 							SUI.DBMod.Artwork.Style = 'Transparent'
@@ -104,7 +104,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Minimal', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Minimal', 120, 60
 						end,
 						func = function()
 							SUI.DBMod.Artwork.Style = 'Minimal'
@@ -119,7 +119,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Digital', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Digital', 120, 60
 						end,
 						func = function()
 							SUI.DBMod.Artwork.Style = 'Fel'
@@ -135,7 +135,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_War', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_War', 120, 60
 						end,
 						func = function()
 							SUI.DBMod.Artwork.Style = 'War'
@@ -168,7 +168,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Fel', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Fel', 120, 60
 						end,
 						func = function()
 							SUI.DBMod.Artwork.Style = 'Fel'
@@ -181,7 +181,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Transparent', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Transparent', 120, 60
 						end,
 						func = function()
 							SUI.DBMod.Artwork.Style = 'Transparent'
@@ -193,7 +193,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Minimal', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Minimal', 120, 60
 						end,
 						func = function()
 							SUI.DBMod.Artwork.Style = 'Minimal'
@@ -205,7 +205,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Digital', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Digital', 120, 60
 						end,
 						func = function()
 							SUI.DBMod.Artwork.Style = 'Minimal'
@@ -218,7 +218,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_War', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_War', 120, 60
 						end,
 						func = function()
 							SUI.DBMod.Artwork.Style = 'War'
@@ -236,7 +236,7 @@ function module:OnInitialize()
 						name = 'Classic',
 						type = 'execute',
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Classic', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Classic', 120, 60
 						end,
 						imageCoords = function()
 							return {0, .5, 0, .5}
@@ -251,7 +251,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Fel', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Fel', 120, 60
 						end,
 						imageCoords = function()
 							return {.1, .5, .1, .5}
@@ -266,7 +266,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Fel', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Fel', 120, 60
 						end,
 						imageCoords = function()
 							return {.1, .5, .1, .5}
@@ -281,7 +281,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Transparent', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Transparent', 120, 60
 						end,
 						imageCoords = function()
 							return {0, .5, 0, .5}
@@ -296,7 +296,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Minimal', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Minimal', 120, 60
 						end,
 						imageCoords = function()
 							return {0, .5, 0, .5}
@@ -317,7 +317,7 @@ function module:OnInitialize()
 						name = 'Classic',
 						type = 'execute',
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Classic', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Classic', 120, 60
 						end,
 						imageCoords = function()
 							return {.1, .5, .5, 1}
@@ -332,7 +332,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Fel', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Fel', 120, 60
 						end,
 						imageCoords = function()
 							return {0, .5, .5, 1}
@@ -347,7 +347,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Fel', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Fel', 120, 60
 						end,
 						imageCoords = function()
 							return {0, .5, .5, 1}
@@ -362,7 +362,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Transparent', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Transparent', 120, 60
 						end,
 						imageCoords = function()
 							return {.6, .9, .1, .4}
@@ -377,7 +377,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Minimal', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Minimal', 120, 60
 						end,
 						imageCoords = function()
 							return {0, .5, .5, 1}
@@ -398,7 +398,7 @@ function module:OnInitialize()
 						name = 'Classic',
 						type = 'execute',
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Classic', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Classic', 120, 60
 						end,
 						imageCoords = function()
 							return {.6, .9, .1, .4}
@@ -413,7 +413,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Fel', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Fel', 120, 60
 						end,
 						imageCoords = function()
 							return {.6, .9, .1, .4}
@@ -428,7 +428,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Fel', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Fel', 120, 60
 						end,
 						imageCoords = function()
 							return {.6, .9, .1, .4}
@@ -443,7 +443,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Transparent', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Transparent', 120, 60
 						end,
 						imageCoords = function()
 							return {.6, .9, .1, .4}
@@ -458,7 +458,7 @@ function module:OnInitialize()
 						type = 'execute',
 						disabled = true,
 						image = function()
-							return 'interface\\addons\\SpartanUI\\media\\Style_Frames_Minimal', 120, 60
+							return 'interface\\addons\\SpartanUI\\images\\setup\\Style_Frames_Minimal', 120, 60
 						end,
 						imageCoords = function()
 							return {.6, .9, .1, .4}
diff --git a/Core/Framework.xml b/Core/SUI-Core.xml
similarity index 97%
rename from Core/Framework.xml
rename to Core/SUI-Core.xml
index 996b26e0..24a8a0b2 100644
--- a/Core/Framework.xml
+++ b/Core/SUI-Core.xml
@@ -1,88 +1,87 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\..\FrameXML\UI.xsd">
-	<!-- frameStrata Parameters:  BACKGROUND, LOW, MEDIUM, HIGH, DIALOG, FULLSCREEN, FULLSCREEN_DIALOG, TOOLTIP  -->
-	<!-- Layer level Parameters:  BACKGROUND, BORDER, ARTWORK, OVERLAY, HIGHLIGHT -->
-	<Script file="FontHandler.lua" />
-	<Script file="Options.lua" />
-	
-	<!-- SUI_PartyMemberTemplate -->
-	<Button name="SUI_SecFrameTemplate" inherits="SecureUnitButtonTemplate" hidden="true" virtual="true">
-		<Frames>
-		</Frames>
-	</Button>
-	
-	<!-- SUI_Font's -->
-	<Font name="SUI_FontOutline22custom" outline="NORMAL" virtual="true">
-		<FontHeight><AbsValue val="22"/></FontHeight>
-	</Font>
-	<Font name="SUI_FontOutline22" outline="MONOCHROME" virtual="true">
-		<FontHeight><AbsValue val="22"/></FontHeight>
-        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
-	</Font>
-	<Font name="SUI_FontOutline18" outline="MONOCHROME" virtual="true">
-		<FontHeight><AbsValue val="18"/></FontHeight>
-        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
-	</Font>
-	<Font name="SUI_FontOutline16" outline="MONOCHROME" virtual="true">
-		<FontHeight><AbsValue val="16"/></FontHeight>
-        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
-	</Font>
-	<Font name="SUI_FontOutline13"  outline="MONOCHROME" virtual="true">
-		<FontHeight><AbsValue val="13"/></FontHeight>
-        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
-	</Font>
-	<Font name="SUI_FontOutline12"  outline="MONOCHROME" virtual="true">
-		<FontHeight><AbsValue val="12"/></FontHeight>
-        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
-	</Font>
-	<Font name="SUI_FontOutline11" outline="MONOCHROME" virtual="true">
-		<FontHeight><AbsValue val="11"/></FontHeight>
-        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
-	</Font>
-	<Font name="SUI_FontOutline10" outline="MONOCHROME" virtual="true">
-		<FontHeight><AbsValue val="10"/></FontHeight>
-        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
-	</Font>
-	<Font name="SUI_FontOutline9" outline="MONOCHROME" virtual="true">
-		<FontHeight><AbsValue val="9"/></FontHeight>
-        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
-	</Font>
-	<Font name="SUI_FontOutline8" outline="MONOCHROME" virtual="true">
-		<FontHeight><AbsValue val="8"/></FontHeight>
-        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
-	</Font>
-	<Font name="SUI_Font10"  outline="MONOCHROME" virtual="true">
-		<FontHeight><AbsValue val="10"/></FontHeight>
-        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
-	</Font>
-	<Font name="SUI_Font9"  outline="MONOCHROME" virtual="true">
-		<FontHeight><AbsValue val="9"/></FontHeight>
-        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
-	</Font>
-	<Font name="SUI_Font8"  outline="MONOCHROME" virtual="true">
-		<FontHeight><AbsValue val="8"/></FontHeight>
-        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
-	</Font>	
-	<!-- SUI_AncherFrame -->
-	<Frame name="SUI_FramesBase" frameStrata="BACKGROUND" parent="UIParent">
-		<Anchors>
-			<Anchor point="BOTTOMLEFT" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-1"/></Offset></Anchor>
-			<Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-1"/></Offset></Anchor>
-		</Anchors>
-	</Frame>
-	
-	<Frame name="SUI_FramesAnchor" frameStrata="BACKGROUND" parent="UIParent">
-		<Anchors>
-			<Anchor point="BOTTOMLEFT" relativeTo="SUI_FramesBase" relativePoint="TOPLEFT" />
-			<Anchor point="TOPRIGHT" relativeTo="SUI_FramesBase" relativePoint="TOPRIGHT">
-				<Offset><AbsDimension x="0" y="153"/></Offset>
-			</Anchor>
-		</Anchors>
-	</Frame>
-	
-	<Script file="SUF.lua" />
-	<Script file="SUIWindow.lua" />
-	<Script file="SetupWizard.lua" />
-	<Script file="WhatsNew.lua" />
-	<Script file="Skin-Options.lua" />
-</Ui>
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\..\FrameXML\UI.xsd">
+	<!-- frameStrata Parameters:  BACKGROUND, LOW, MEDIUM, HIGH, DIALOG, FULLSCREEN, FULLSCREEN_DIALOG, TOOLTIP  -->
+	<!-- Layer level Parameters:  BACKGROUND, BORDER, ARTWORK, OVERLAY, HIGHLIGHT -->
+	<Script file="FontHandler.lua" />
+	<Script file="Options.lua" />
+	
+	<!-- SUI_PartyMemberTemplate -->
+	<Button name="SUI_SecFrameTemplate" inherits="SecureUnitButtonTemplate" hidden="true" virtual="true">
+		<Frames>
+		</Frames>
+	</Button>
+	
+	<!-- SUI_Font's -->
+	<Font name="SUI_FontOutline22custom" outline="NORMAL" virtual="true">
+		<FontHeight><AbsValue val="22"/></FontHeight>
+	</Font>
+	<Font name="SUI_FontOutline22" outline="MONOCHROME" virtual="true">
+		<FontHeight><AbsValue val="22"/></FontHeight>
+        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
+	</Font>
+	<Font name="SUI_FontOutline18" outline="MONOCHROME" virtual="true">
+		<FontHeight><AbsValue val="18"/></FontHeight>
+        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
+	</Font>
+	<Font name="SUI_FontOutline16" outline="MONOCHROME" virtual="true">
+		<FontHeight><AbsValue val="16"/></FontHeight>
+        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
+	</Font>
+	<Font name="SUI_FontOutline13"  outline="MONOCHROME" virtual="true">
+		<FontHeight><AbsValue val="13"/></FontHeight>
+        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
+	</Font>
+	<Font name="SUI_FontOutline12"  outline="MONOCHROME" virtual="true">
+		<FontHeight><AbsValue val="12"/></FontHeight>
+        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
+	</Font>
+	<Font name="SUI_FontOutline11" outline="MONOCHROME" virtual="true">
+		<FontHeight><AbsValue val="11"/></FontHeight>
+        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
+	</Font>
+	<Font name="SUI_FontOutline10" outline="MONOCHROME" virtual="true">
+		<FontHeight><AbsValue val="10"/></FontHeight>
+        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
+	</Font>
+	<Font name="SUI_FontOutline9" outline="MONOCHROME" virtual="true">
+		<FontHeight><AbsValue val="9"/></FontHeight>
+        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
+	</Font>
+	<Font name="SUI_FontOutline8" outline="MONOCHROME" virtual="true">
+		<FontHeight><AbsValue val="8"/></FontHeight>
+        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
+	</Font>
+	<Font name="SUI_Font10"  outline="MONOCHROME" virtual="true">
+		<FontHeight><AbsValue val="10"/></FontHeight>
+        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
+	</Font>
+	<Font name="SUI_Font9"  outline="MONOCHROME" virtual="true">
+		<FontHeight><AbsValue val="9"/></FontHeight>
+        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
+	</Font>
+	<Font name="SUI_Font8"  outline="MONOCHROME" virtual="true">
+		<FontHeight><AbsValue val="8"/></FontHeight>
+        <Shadow><Color a="1" r="0" g="0" b="0"/><Offset x="1" y="-1"/></Shadow>
+	</Font>	
+	<!-- SUI_AncherFrame -->
+	<Frame name="SUI_FramesBase" frameStrata="BACKGROUND" parent="UIParent">
+		<Anchors>
+			<Anchor point="BOTTOMLEFT" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-1"/></Offset></Anchor>
+			<Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-1"/></Offset></Anchor>
+		</Anchors>
+	</Frame>
+	
+	<Frame name="SUI_FramesAnchor" frameStrata="BACKGROUND" parent="UIParent">
+		<Anchors>
+			<Anchor point="BOTTOMLEFT" relativeTo="SUI_FramesBase" relativePoint="TOPLEFT" />
+			<Anchor point="TOPRIGHT" relativeTo="SUI_FramesBase" relativePoint="TOPRIGHT">
+				<Offset><AbsDimension x="0" y="153"/></Offset>
+			</Anchor>
+		</Anchors>
+	</Frame>
+	
+	<Script file="SUIWindow.lua" />
+	<Script file="SetupWizard.lua" />
+	<Script file="WhatsNew.lua" />
+	<Script file="Skin-Options.lua" />
+</Ui>
diff --git a/Core/SUIWindow.lua b/Core/SUIWindow.lua
index d28c823e..d0e51982 100644
--- a/Core/SUIWindow.lua
+++ b/Core/SUIWindow.lua
@@ -177,7 +177,7 @@ function module:CreateWindow(FrameName, width, height, FrameLabel)
 
 	Window.bg = Window:CreateTexture(nil, 'BORDER')
 	Window.bg:SetAllPoints(Window)
-	Window.bg:SetTexture('Interface\\AddOns\\SpartanUI\\media\\Smoothv2.tga')
+	Window.bg:SetTexture('Interface\\AddOns\\SpartanUI\\images\\Smoothv2.tga')
 	Window.bg:SetVertexColor(0, 0, 0, .7)
 
 	Window.border = Window:CreateTexture(nil, 'BORDER')
@@ -185,7 +185,7 @@ function module:CreateWindow(FrameName, width, height, FrameLabel)
 	Window.border:SetPoint('LEFT', -10, 0)
 	Window.border:SetPoint('RIGHT', 10, 0)
 	Window.border:SetPoint('BOTTOM', 0, -10)
-	Window.border:SetTexture('Interface\\AddOns\\SpartanUI\\media\\smoke.tga')
+	Window.border:SetTexture('Interface\\AddOns\\SpartanUI\\images\\smoke.tga')
 	Window.border:SetVertexColor(0, 0, 0, .7)
 
 	Window.Status = Window:CreateFontString(nil, 'OVERLAY', 'SUI_FontOutline12')
@@ -241,7 +241,7 @@ function module:CreateWindow(FrameName, width, height, FrameLabel)
 
 	Window.Next.texture = Window.Next:CreateTexture(nil, 'BORDER')
 	Window.Next.texture:SetAllPoints(Window.Next)
-	Window.Next.texture:SetTexture('Interface\\AddOns\\SpartanUI\\media\\Smoothv2.tga')
+	Window.Next.texture:SetTexture('Interface\\AddOns\\SpartanUI\\images\\Smoothv2.tga')
 	Window.Next.texture:SetVertexColor(0, 0.5, 1)
 
 	-- Window.Next.parent = frame
@@ -293,7 +293,7 @@ function module:CreateWindow(FrameName, width, height, FrameLabel)
 
 	Window.Skip.texture = Window.Skip:CreateTexture(nil, 'BORDER')
 	Window.Skip.texture:SetAllPoints(Window.Skip)
-	Window.Skip.texture:SetTexture('Interface\\AddOns\\SpartanUI\\media\\Smoothv2.tga')
+	Window.Skip.texture:SetTexture('Interface\\AddOns\\SpartanUI\\images\\Smoothv2.tga')
 	Window.Skip.texture:SetVertexColor(.75, 0, 0)
 
 	Window.Skip:SetScript(
diff --git a/Core/SetupWizard.lua b/Core/SetupWizard.lua
index 7e497eb3..cd396a8c 100644
--- a/Core/SetupWizard.lua
+++ b/Core/SetupWizard.lua
@@ -24,7 +24,7 @@ local ReloadPage = {
 		module.window.content.WelcomePage:SetAllPoints(module.window.content)
 
 		module.window.content.WelcomePage.Helm =
-			StdUi:Texture(module.window.content.WelcomePage, 150, 150, 'Interface\\AddOns\\SpartanUI\\media\\Spartan-Helm')
+			StdUi:Texture(module.window.content.WelcomePage, 150, 150, 'Interface\\AddOns\\SpartanUI\\images\\Spartan-Helm')
 		module.window.content.WelcomePage.Helm:SetPoint('CENTER')
 		module.window.content.WelcomePage.Helm:SetAlpha(.6)
 
@@ -364,7 +364,7 @@ function module:WelcomePage()
 			WelcomePage:SetParent(module.window.content)
 			WelcomePage:SetAllPoints(module.window.content)
 
-			WelcomePage.Helm = StdUi:Texture(WelcomePage, 150, 150, 'Interface\\AddOns\\SpartanUI\\media\\Spartan-Helm')
+			WelcomePage.Helm = StdUi:Texture(WelcomePage, 150, 150, 'Interface\\AddOns\\SpartanUI\\images\\Spartan-Helm')
 			WelcomePage.Helm:SetPoint('CENTER', 0, 35)
 			WelcomePage.Helm:SetAlpha(.6)
 
diff --git a/Core/WhatsNew.lua b/Core/WhatsNew.lua
index 6d7f07f4..2ba63d4b 100644
--- a/Core/WhatsNew.lua
+++ b/Core/WhatsNew.lua
@@ -15,7 +15,7 @@ function SUI:WhatsNew()
 
 			-- Fel Style
 			local control = gui:Create('Icon')
-			control:SetImage('interface\\addons\\SpartanUI\\media\\Style_Digital')
+			control:SetImage('interface\\addons\\SpartanUI\\images\\setup\\Style_Digital')
 			control:SetImageSize(240, 120)
 			control:SetPoint('TOP', SUI_Win.Desc1, 'BOTTOM', 0, -15)
 			control:SetCallback(
diff --git a/Modules/Artwork/SpartanUI_Artwork.lua b/Modules/Artwork/SpartanUI_Artwork.lua
index 59e28d98..00f85f18 100644
--- a/Modules/Artwork/SpartanUI_Artwork.lua
+++ b/Modules/Artwork/SpartanUI_Artwork.lua
@@ -275,7 +275,7 @@ function Artwork_Core:FirstTime()
 			--Fel
 			control = StdUi:HighlightButton(SUI_Win.Artwork, 120, 60, '')
 			control:SetScript('OnClick', RadioButtons)
-			control:SetNormalTexture('interface\\addons\\SpartanUI\\media\\Style_Fel')
+			control:SetNormalTexture('interface\\addons\\SpartanUI\\images\\setup\\Style_Fel')
 
 			control.radio = StdUi:Radio(SUI_Win.Artwork, 'Fel', 'SUIArtwork', 120, 20)
 			control.radio:SetValue('Fel')
@@ -286,7 +286,7 @@ function Artwork_Core:FirstTime()
 			--War
 			control = StdUi:HighlightButton(SUI_Win.Artwork, 120, 60, '')
 			control:SetScript('OnClick', RadioButtons)
-			control:SetNormalTexture('interface\\addons\\SpartanUI\\media\\Style_War')
+			control:SetNormalTexture('interface\\addons\\SpartanUI\\images\\setup\\Style_War')
 
 			control.radio = StdUi:Radio(SUI_Win.Artwork, 'War', 'SUIArtwork', 120, 20)
 			control.radio:SetValue('War')
@@ -297,7 +297,7 @@ function Artwork_Core:FirstTime()
 			--Digital
 			control = StdUi:HighlightButton(SUI_Win.Artwork, 120, 60, '')
 			control:SetScript('OnClick', RadioButtons)
-			control:SetNormalTexture('interface\\addons\\SpartanUI\\media\\Style_Digital')
+			control:SetNormalTexture('interface\\addons\\SpartanUI\\images\\setup\\Style_Digital')
 
 			control.radio = StdUi:Radio(SUI_Win.Artwork, 'Digital', 'SUIArtwork', 120, 20)
 			control.radio:SetValue('Digital')
@@ -308,7 +308,7 @@ function Artwork_Core:FirstTime()
 			--Transparent
 			control = StdUi:HighlightButton(SUI_Win.Artwork, 120, 60, '')
 			control:SetScript('OnClick', RadioButtons)
-			control:SetNormalTexture('interface\\addons\\SpartanUI\\media\\Style_Transparent')
+			control:SetNormalTexture('interface\\addons\\SpartanUI\\images\\setup\\Style_Transparent')
 
 			control.radio = StdUi:Radio(SUI_Win.Artwork, 'Transparent', 'SUIArtwork', 120, 20)
 			control.radio:SetValue('Transparent')
@@ -319,7 +319,7 @@ function Artwork_Core:FirstTime()
 			--Minimal
 			control = StdUi:HighlightButton(SUI_Win.Artwork, 120, 60, '')
 			control:SetScript('OnClick', RadioButtons)
-			control:SetNormalTexture('interface\\addons\\SpartanUI\\media\\Style_Minimal')
+			control:SetNormalTexture('interface\\addons\\SpartanUI\\images\\setup\\Style_Minimal')
 
 			control.radio = StdUi:Radio(SUI_Win.Artwork, 'Minimal', 'SUIArtwork', 120, 20)
 			control.radio:SetValue('Minimal')
diff --git a/Modules/Artwork/Themes/Classic/Module-Minimap.lua b/Modules/Artwork/Themes/Classic/Module-Minimap.lua
index 62e08d68..b01c09d7 100644
--- a/Modules/Artwork/Themes/Classic/Module-Minimap.lua
+++ b/Modules/Artwork/Themes/Classic/Module-Minimap.lua
@@ -37,7 +37,7 @@ function module:MiniMap()
 			-- Minimap:SetQuestBlobRingScalar(0)
 
 			Minimap.overlay = Minimap:CreateTexture(nil, 'OVERLAY')
-			Minimap.overlay:SetTexture('Interface\\AddOns\\SpartanUI\\Media\\map-square-overlay')
+			Minimap.overlay:SetTexture('Interface\\AddOns\\SpartanUI\\images\\minimap\\square-overlay')
 			Minimap.overlay:SetAllPoints(Minimap)
 			Minimap.overlay:SetBlendMode('ADD')
 
@@ -50,7 +50,7 @@ function module:MiniMap()
 			MiniMapTracking:ClearAllPoints()
 			MiniMapTracking:SetPoint('TOPLEFT', Minimap, 'TOPLEFT', 0, 0)
 		else
-			Minimap:SetMaskTexture('Interface\\AddOns\\SpartanUI\\media\\map-circle-overlay')
+			Minimap:SetMaskTexture('Interface\\AddOns\\SpartanUI\\images\\minimap\\circle-overlay')
 			MiniMapTracking:ClearAllPoints()
 			MiniMapTracking:SetPoint('TOPLEFT', Minimap, 'TOPLEFT', -5, -5)
 			if Minimap.overlay then
diff --git a/Modules/Style_Fel/Module-Artwork.lua b/Modules/Style_Fel/Module-Artwork.lua
index 5fae683e..3c384d82 100644
--- a/Modules/Style_Fel/Module-Artwork.lua
+++ b/Modules/Style_Fel/Module-Artwork.lua
@@ -1,7 +1,11 @@
 local _G, SUI = _G, SUI
 local Artwork_Core = SUI:GetModule('Artwork_Core')
-local module = SUI:GetModule('Style_Fel')
+local module = SUI:NewModule('Style_Fel')
 ----------------------------------------------------------------------------------------------------
+if not SUI.DBG.Bartender4[SUI.DB.Styles.Minimal.BartenderProfile] then
+	SUI.DBG.Bartender4[SUI.DB.Styles.Minimal.BartenderProfile] = {Style = 'Fel'}
+end
+
 module.Trays = {}
 local CurScale
 local petbattle = CreateFrame('Frame')
diff --git a/Modules/Style_Fel/Module-UnitFrames.lua b/Modules/Style_Fel/Module-UnitFrames.lua
index cebeeeb8..26c2299e 100644
--- a/Modules/Style_Fel/Module-UnitFrames.lua
+++ b/Modules/Style_Fel/Module-UnitFrames.lua
@@ -3,16 +3,16 @@ local L = SUI.L
 local module = SUI:GetModule('Style_Fel')
 local PlayerFrames, PartyFrames = nil
 ----------------------------------------------------------------------------------------------------
-local Smoothv2 = 'Interface\\AddOns\\SpartanUI\\media\\Smoothv2.tga'
+local Smoothv2 = 'Interface\\AddOns\\SpartanUI_PlayerFrames\\media\\Smoothv2.tga'
 local square = 'Interface\\AddOns\\SpartanUI_Style_Transparent\\Images\\square.tga'
-local lfdrole = 'Interface\\AddOns\\SpartanUI\\media\\icon_role.tga'
+local lfdrole = 'Interface\\AddOns\\SpartanUI\\images\\icon_role.tga'
 local Images
 
 function module:ImageSetup()
 	if SUI.DB.Styles.Fel.SubTheme == 'Digital' then
 		Images = {
 			bg = {
-				Texture = 'Interface\\addons\\SpartanUI_UnitFrames\\Images\\digital\\Fel-Box',
+				Texture = 'Interface\\addons\\SpartanUI_Style_Fel\\Digital\\Fel-Box',
 				Coords = {0.0234375, 0.9765625, 0.265625, 0.7734375} --left, right, top, bottom
 			},
 			smallbg = {
@@ -20,11 +20,11 @@ function module:ImageSetup()
 				Coords = {0.017578125, 0.3203125, 0.4609375, 0.564453125} --left, right, top, bottom
 			},
 			flair = {
-				Texture = 'Interface\\addons\\SpartanUI_UnitFrames\\Images\\digital\\Fel-Box',
+				Texture = 'Interface\\addons\\SpartanUI_Style_Fel\\Digital\\Fel-Box',
 				Coords = {0, 0.1, 0, 0.2}
 			},
 			flair2 = {
-				Texture = 'Interface\\addons\\SpartanUI_UnitFrames\\Images\\digital\\Fel-Box',
+				Texture = 'Interface\\addons\\SpartanUI_Style_Fel\\Digital\\Fel-Box',
 				Coords = {0, 0.1, 0, 0.2}
 			}
 		}
@@ -43,7 +43,7 @@ function module:ImageSetup()
 				Coords = {0.140625, 0.615234375, 0, 0.265625}
 			},
 			flair2 = {
-				Texture = 'Interface\\Addons\\SpartanUI_UnitFrames\\Images\\fel\\Party-Frame',
+				Texture = 'Interface\\Addons\\SpartanUI_Style_Fel\\Images\\Party-Frame',
 				Coords = {0.1953125, 0.8046875, 0.1328125, 0.859375}
 			}
 		}
diff --git a/Modules/Style_Fel/Style-Setup.lua b/Modules/Style_Fel/Style-Setup.lua
deleted file mode 100644
index 48052947..00000000
--- a/Modules/Style_Fel/Style-Setup.lua
+++ /dev/null
@@ -1,266 +0,0 @@
-local SUI = SUI
-----------------------------------------------------------------------------------------------------
---First Lets make the Module
-local module = SUI:NewModule('Style_Fel')
-
-module.Settings = {}
-
---Now lets setup the initial Database settings
-local Defaults = {
-	Artwork = {
-		Allenable = true,
-		Allalpha = 100,
-		bar1 = {enable = true, alpha = 100},
-		bar2 = {enable = true, alpha = 100},
-		bar3 = {enable = true, alpha = 100},
-		bar4 = {enable = true, alpha = 100},
-		Stance = {enable = true, alpha = 100},
-		MenuBar = {enable = true, alpha = 100}
-	},
-	Frames = {
-		player = {Buffs = {Mode = 'both'}, Debuffs = {Mode = 'both'}},
-		target = {Buffs = {Mode = 'both', onlyShowPlayer = true}, Debuffs = {Mode = 'bars'}}
-	},
-	PlayerFrames = {},
-	PartyFrames = {
-		FrameStyle = 'medium'
-	},
-	RaidFrames = {
-		FrameStyle = 'small'
-	},
-	Movable = {
-		Minimap = true
-	},
-	Minimap = {
-		Engulfed = true
-	},
-	SlidingTrays = {
-		left = {
-			enabled = true,
-			collapsed = false
-		},
-		right = {
-			enabled = true,
-			collapsed = false
-		}
-	},
-	TalkingHeadUI = {
-		point = 'TOP',
-		relPoint = 'TOP',
-		x = 0,
-		y = -30,
-		scale = .8
-	},
-	BartenderProfile = 'SpartanUI - Fel',
-	BartenderSettings = {
-		ActionBars = {
-			actionbars = {
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'Fel_ActionBarPlate',
-						x = -510,
-						y = 36,
-						scale = 0.85,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 1
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'Fel_ActionBarPlate',
-						x = -510,
-						y = -8,
-						scale = 0.85,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 2
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'Fel_ActionBarPlate',
-						x = 108,
-						y = 36,
-						scale = 0.85,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 3
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'Fel_ActionBarPlate',
-						x = 108,
-						y = -8,
-						scale = 0.85,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 4
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 3,
-					padding = 4,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'Fel_ActionBarPlate',
-						x = -645,
-						y = 35,
-						scale = 0.80,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 5
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 3,
-					padding = 4,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'Fel_ActionBarPlate',
-						x = 514,
-						y = 35,
-						scale = 0.80,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 6
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {parent = 'Fel_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 7
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {parent = 'Fel_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 8
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {parent = 'Fel_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 9
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {parent = 'Fel_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-				} -- 10
-			}
-		},
-		BagBar = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			padding = 0,
-			position = {point = 'TOP', parent = 'Fel_ActionBarPlate', x = 503, y = 2, scale = 0.70, growHorizontal = 'LEFT'},
-			rows = 1,
-			onebag = false,
-			keyring = true
-		},
-		MicroMenu = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			padding = -3,
-			position = {point = 'TOP', parent = 'Fel_ActionBarPlate', x = 114, y = 4, scale = 0.70, growHorizontal = 'RIGHT'}
-		},
-		PetBar = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			padding = 1,
-			position = {point = 'TOP', parent = 'Fel_ActionBarPlate', x = -497, y = 2, scale = 0.70, growHorizontal = 'RIGHT'},
-			rows = 1,
-			skin = {Zoom = true}
-		},
-		StanceBar = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			padding = 1,
-			position = {point = 'TOP', parent = 'Fel_ActionBarPlate', x = -115, y = 2, scale = 0.70, growHorizontal = 'LEFT'},
-			rows = 1
-		},
-		MultiCast = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			position = {point = 'TOPRIGHT', parent = 'Fel_ActionBarPlate', x = -777, y = -4, scale = 0.75}
-		},
-		Vehicle = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = false,
-			padding = 3,
-			position = {point = 'CENTER', parent = 'Fel_ActionBarPlate', x = -15, y = 213, scale = 0.85}
-		},
-		ExtraActionBar = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			position = {point = 'CENTER', parent = 'Fel_ActionBarPlate', x = -32, y = 240}
-		},
-		ZoneAbilityBar = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			position = {point = 'CENTER', parent = 'Fel_ActionBarPlate', x = -32, y = 240}
-		},
-		BlizzardArt = {enabled = false},
-		XPBar = {enabled = false},
-		RepBar = {enabled = false},
-		APBar = {enabled = false},
-		blizzardVehicle = SUI.DBMod.Artwork.VehicleUI
-	},
-	TooltipLoc = true,
-	SubTheme = 'Fel',
-	BuffLoc = true
-}
-if not SUI.DB.Styles.Fel.Artwork then
-	SUI.DB.Styles.Fel = SUI:MergeData(SUI.DB.Styles.Fel, Defaults, true)
-else
-	SUI.DB.Styles.Fel = SUI:MergeData(SUI.DB.Styles.Fel, Defaults, false)
-end
-if not SUI.DBG.Bartender4[SUI.DB.Styles.Fel.BartenderProfile] then
-	SUI.DBG.Bartender4[SUI.DB.Styles.Fel.BartenderProfile] = {Style = 'Fel'}
-end
diff --git a/Modules/Style_Fel/Style.xml b/Modules/Style_Fel/Style.xml
index a73ce044..8d64f7b2 100644
--- a/Modules/Style_Fel/Style.xml
+++ b/Modules/Style_Fel/Style.xml
@@ -2,7 +2,6 @@
 ..\..\FrameXML\UI.xsd">
 	<!-- frameStrata Parameters:  BACKGROUND, LOW, MEDIUM, HIGH, DIALOG, FULLSCREEN, FULLSCREEN_DIALOG, TOOLTIP  -->
 	<!-- Layer level Parameters:  BACKGROUND, BORDER, ARTWORK, OVERLAY, HIGHLIGHT -->
-	<Script file="Style-Setup.lua" />
 
 	<!-- SpartanUI -->
 	<Frame name="Fel_SpartanUI" frameStrata="BACKGROUND" parent="UIParent">
diff --git a/Modules/Style_Minimal/Framework.lua b/Modules/Style_Minimal/Framework.lua
index fc111bb4..b974ed53 100644
--- a/Modules/Style_Minimal/Framework.lua
+++ b/Modules/Style_Minimal/Framework.lua
@@ -1,9 +1,13 @@
 local _G, SUI = _G, SUI
 local Artwork_Core = SUI:GetModule('Artwork_Core')
-local module = SUI:GetModule('Style_Minimal')
+local module = SUI:NewModule('Style_Minimal')
 ----------------------------------------------------------------------------------------------------
 local anchor, frame = Minimal_AnchorFrame, Minimal_SpartanUI
 
+if not SUI.DBG.Bartender4[SUI.DB.Styles.Minimal.BartenderProfile] then
+	SUI.DBG.Bartender4[SUI.DB.Styles.Minimal.BartenderProfile] = {Style = 'Minimal'}
+end
+
 function module:updateScale() -- scales SpartanUI based on setting or screen size
 	if (not SUI.DB.scale) then -- make sure the variable exists, and auto-configured based on screen size
 		local Resolution = ''
diff --git a/Modules/Style_Minimal/Style-Setup.lua b/Modules/Style_Minimal/Style-Setup.lua
deleted file mode 100644
index 830c0454..00000000
--- a/Modules/Style_Minimal/Style-Setup.lua
+++ /dev/null
@@ -1,195 +0,0 @@
-local SUI = SUI
-----------------------------------------------------------------------------------------------------
---First Lets make the Module
-SUI:NewModule('Style_Minimal')
-
---Now lets setup the initial Database settings
-local Defaults = {
-	Artwork = {},
-	PlayerFrames = {},
-	PartyFrames = {},
-	RaidFrames = {},
-	Movable = {
-		Minimap = true,
-		PlayerFrames = true,
-		PartyFrames = true,
-		RaidFrames = true
-	},
-	TooltipLoc = true,
-	Minimap = {
-		shape = 'square',
-		size = {width = 140, height = 140}
-	},
-	BartenderProfile = 'SpartanUI - Minimal',
-	BartenderSettings = {
-		ActionBars = {
-			actionbars = {
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {point = 'BOTTOM', x = -200, y = 102, scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 1
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {point = 'BOTTOM', x = -200, y = 70, scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 2
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {point = 'BOTTOM', x = -200, y = 35, scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 3
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 4
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 3,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {point = 'BOTTOM', x = -317, y = 98, scale = 0.75, growHorizontal = 'RIGHT'}
-				}, -- 5
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 3,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {point = 'BOTTOM', x = 199, y = 98, scale = 0.75, growHorizontal = 'RIGHT'}
-				}, -- 6
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 7
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 8
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 9
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {scale = 0.85, growHorizontal = 'RIGHT'}
-				} -- 10
-			}
-		},
-		BagBar = {
-			version = 3,
-			enabled = true,
-			padding = 0,
-			position = {point = 'TOP', x = 490, y = -1, scale = 0.70, growHorizontal = 'LEFT'},
-			rows = 1,
-			onebag = false,
-			keyring = true
-		},
-		MicroMenu = {
-			version = 3,
-			enabled = true,
-			padding = -3,
-			position = {point = 'TOP', x = 160, y = -1, scale = 0.70, growHorizontal = 'RIGHT'}
-		},
-		PetBar = {
-			version = 3,
-			enabled = true,
-			padding = 1,
-			position = {point = 'TOP', x = -492, y = -1, scale = 0.70, growHorizontal = 'RIGHT'},
-			rows = 1,
-			skin = {Zoom = true}
-		},
-		StanceBar = {
-			version = 3,
-			enabled = true,
-			padding = 1,
-			position = {point = 'TOP', x = -163, y = -1, scale = 0.70, growHorizontal = 'LEFT'},
-			rows = 1
-		},
-		MultiCast = {
-			fadeoutalpha = .25,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			position = {point = 'TOPRIGHT', x = -777, y = -4, scale = 0.75}
-		},
-		Vehicle = {
-			version = 3,
-			enabled = false,
-			padding = 3,
-			position = {point = 'BOTTOM', x = -200, y = 155, scale = 0.85}
-		},
-		ExtraActionBar = {
-			fadeoutalpha = .25,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			position = {point = 'BOTTOM', x = -32, y = 275}
-		},
-		ZoneAbilityBar = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			position = {point = 'BOTTOM', x = -32, y = 275}
-		},
-		BlizzardArt = {enabled = false},
-		XPBar = {enabled = false},
-		RepBar = {enabled = false},
-		APBar = {enabled = false},
-		blizzardVehicle = true
-	},
-	Color = {
-		0.6156862745098039,
-		0.1215686274509804,
-		0.1215686274509804,
-		0.9
-	},
-	TalkingHeadUI = {
-		point = 'BOTTOM',
-		relPoint = 'TOP',
-		x = 0,
-		y = -30,
-		scale = .8
-	},
-	PartyFramesSize = 'large',
-	HideCenterGraphic = false
-}
-if not SUI.DB.Styles.Minimal.Artwork then
-	SUI.DB.Styles.Minimal = SUI:MergeData(SUI.DB.Styles.Minimal, Defaults, true)
-else
-	SUI.DB.Styles.Minimal = SUI:MergeData(SUI.DB.Styles.Minimal, Defaults, false)
-end
-if not SUI.DBG.Bartender4[SUI.DB.Styles.Minimal.BartenderProfile] then
-	SUI.DBG.Bartender4[SUI.DB.Styles.Minimal.BartenderProfile] = {Style = 'Minimal'}
-end
diff --git a/Modules/Style_Minimal/Style.xml b/Modules/Style_Minimal/Style.xml
index 0827d8fe..a1b5ad19 100644
--- a/Modules/Style_Minimal/Style.xml
+++ b/Modules/Style_Minimal/Style.xml
@@ -2,7 +2,6 @@
 ..\..\FrameXML\UI.xsd">
 	<!-- frameStrata Parameters:  BACKGROUND, LOW, MEDIUM, HIGH, DIALOG, FULLSCREEN, FULLSCREEN_DIALOG, TOOLTIP  -->
 	<!-- Layer level Parameters:  BACKGROUND, BORDER, ARTWORK, OVERLAY, HIGHLIGHT -->
-	<Script file="Style-Setup.lua" />
 
 	<!-- Minimal_AnchorFrame -->
 	<Frame name="Minimal_AnchorFrame" frameStrata="BACKGROUND" parent="UIParent">
diff --git a/Modules/Style_Minimal/UnitFrames.lua b/Modules/Style_Minimal/UnitFrames.lua
index 69f71af3..47f49d10 100644
--- a/Modules/Style_Minimal/UnitFrames.lua
+++ b/Modules/Style_Minimal/UnitFrames.lua
@@ -14,7 +14,7 @@ local FramesList = {
 local Smoothv2 = 'Interface\\AddOns\\SpartanUI\\media\\Smoothv2.tga'
 
 --Interface/WorldStateFrame/ICONS-CLASSES
-local lfdrole = 'Interface\\AddOns\\SpartanUI\\media\\icon_role.tga'
+local lfdrole = 'Interface\\AddOns\\SpartanUI\\images\\icon_role.tga'
 
 local classFileName = select(2, UnitClass('player'))
 local colors = setmetatable({}, {__index = SUIUF.colors})
diff --git a/Modules/Style_Transparent/Global-Framework.lua b/Modules/Style_Transparent/Global-Framework.lua
index 8a625048..ed007fcc 100644
--- a/Modules/Style_Transparent/Global-Framework.lua
+++ b/Modules/Style_Transparent/Global-Framework.lua
@@ -1,7 +1,11 @@
 local _G, SUI = _G, SUI
 local Artwork_Core = SUI:GetModule('Artwork_Core')
-local module = SUI:GetModule('Style_Transparent')
+local module = SUI:NewModule('Style_Transparent')
 ----------------------------------------------------------------------------------------------------
+if not SUI.DBG.Bartender4[SUI.DB.Styles.Transparent.BartenderProfile] then
+	SUI.DBG.Bartender4[SUI.DB.Styles.Transparent.BartenderProfile] = {Style = 'Transparent'}
+end
+
 local anchor, frame = Transparent_AnchorFrame, Transparent_SpartanUI
 local FramesList = {
 	[1] = 'pet',
diff --git a/Modules/Style_Transparent/Module-UnitFrames.lua b/Modules/Style_Transparent/Module-UnitFrames.lua
index e60616c0..67b303f4 100644
--- a/Modules/Style_Transparent/Module-UnitFrames.lua
+++ b/Modules/Style_Transparent/Module-UnitFrames.lua
@@ -10,14 +10,14 @@ local FramesList = {
 	[5] = 'focustarget',
 	[6] = 'player'
 }
-local base_plate1 = 'Interface\\AddOns\\SpartanUI_UnitFrames\\Images\\transparent\\base_plate1.tga' -- Player and Target
-local base_plate2 = 'Interface\\AddOns\\SpartanUI_UnitFrames\\Images\\transparent\\base_plate2.blp' -- Focus and Focus Target
+local base_plate1 = 'Interface\\AddOns\\SpartanUI_Style_Transparent\\Images\\base_plate1.tga' -- Player and Target
+local base_plate2 = 'Interface\\AddOns\\SpartanUI_Style_Transparent\\Images\\base_plate2.blp' -- Focus and Focus Target
 local square = 'Interface\\AddOns\\SpartanUI_Style_Transparent\\Images\\square.tga'
 
-local Smoothv2 = 'Interface\\AddOns\\SpartanUI\\media\\Smoothv2.tga'
+local Smoothv2 = 'Interface\\AddOns\\SpartanUI_PlayerFrames\\media\\Smoothv2.tga'
 
 --Interface/WorldStateFrame/ICONS-CLASSES
-local lfdrole = 'Interface\\AddOns\\SpartanUI\\media\\icon_role.tga'
+local lfdrole = 'Interface\\AddOns\\SpartanUI\\images\\icon_role.tga'
 
 local _, classFileName = UnitClass('player')
 local colors = setmetatable({}, {__index = SUIUF.colors})
@@ -344,7 +344,7 @@ local CreatePlayerFrame = function(self, unit)
 			health:SetFrameStrata('BACKGROUND')
 			health:SetFrameLevel(2)
 			health:SetStatusBarTexture(Smoothv2)
-			-- health:AnimateTexCoords("Interface\\AddOns\\SpartanUI_UnitFrames\\images\\HealthBar.blp", 256, 256, 80, 16, 40, elapsed, 0.08);
+			-- health:AnimateTexCoords("Interface\\AddOns\\SpartanUI_PlayerFrames\\media\\HealthBar.blp", 256, 256, 80, 16, 40, elapsed, 0.08);
 			health:SetSize(self.Castbar:GetWidth(), 24)
 			health:SetPoint('TOPLEFT', self.Castbar, 'BOTTOMLEFT', 0, -2)
 
diff --git a/Modules/Style_Transparent/Style-Setup.lua b/Modules/Style_Transparent/Style-Setup.lua
deleted file mode 100644
index 8244a91f..00000000
--- a/Modules/Style_Transparent/Style-Setup.lua
+++ /dev/null
@@ -1,268 +0,0 @@
-local SUI = SUI
-----------------------------------------------------------------------------------------------------
---First Lets make the Module
-SUI:NewModule('Style_Transparent')
-
---Now lets setup the initial Database settings
-local Defaults = {
-	Artwork = {},
-	PlayerFrames = {},
-	PartyFrames = {},
-	RaidFrames = {},
-	Movable = {
-		Minimap = false,
-		PlayerFrames = true,
-		PartyFrames = true,
-		RaidFrames = true
-	},
-	Minimap = {
-		shape = 'square',
-		size = {width = 140, height = 140}
-	},
-	Color = {
-		Art = {0, .8, .9, .7},
-		PlayerFrames = {0, .8, .9, .7},
-		PartyFrames = {0, .8, .9, .7},
-		RaidFrames = {0, .8, .9, .7}
-	},
-	TalkingHeadUI = {point = 'TOP', relPoint = 'TOP', x = 0, y = -30, scale = .8},
-	BartenderProfile = 'SpartanUI - Transparent',
-	BartenderSettings = {
-		ActionBars = {
-			actionbars = {
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'Transparent_ActionBarPlate',
-						x = -501,
-						y = 16,
-						scale = 0.85,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 1
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'Transparent_ActionBarPlate',
-						x = -501,
-						y = -29,
-						scale = 0.85,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 2
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'Transparent_ActionBarPlate',
-						x = 98,
-						y = 16,
-						scale = 0.85,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 3
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'Transparent_ActionBarPlate',
-						x = 98,
-						y = -29,
-						scale = 0.85,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 4
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 3,
-					padding = 4,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'Transparent_ActionBarPlate',
-						x = -635,
-						y = 35,
-						scale = 0.80,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 5
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 3,
-					padding = 4,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'Transparent_ActionBarPlate',
-						x = 504,
-						y = 35,
-						scale = 0.80,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 6
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {parent = 'Transparent_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 7
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {parent = 'Transparent_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 8
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {parent = 'Transparent_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 9
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {parent = 'Transparent_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-				} -- 10
-			}
-		},
-		BagBar = {
-			fadeoutalpha = .25,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			padding = 0,
-			position = {
-				point = 'TOP',
-				parent = 'Transparent_ActionBarPlate',
-				x = 494,
-				y = -15,
-				scale = 0.70,
-				growHorizontal = 'LEFT'
-			},
-			rows = 1,
-			onebag = false,
-			keyring = true
-		},
-		MicroMenu = {
-			fadeoutalpha = .25,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			padding = -3,
-			position = {
-				point = 'TOP',
-				parent = 'Transparent_ActionBarPlate',
-				x = 105,
-				y = -15,
-				scale = 0.70,
-				growHorizontal = 'RIGHT'
-			}
-		},
-		PetBar = {
-			fadeoutalpha = .25,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			padding = 1,
-			position = {
-				point = 'TOP',
-				parent = 'Transparent_ActionBarPlate',
-				x = -493,
-				y = -15,
-				scale = 0.70,
-				growHorizontal = 'RIGHT'
-			},
-			rows = 1,
-			skin = {Zoom = true}
-		},
-		StanceBar = {
-			fadeoutalpha = .25,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			padding = 1,
-			position = {
-				point = 'TOP',
-				parent = 'Transparent_ActionBarPlate',
-				x = -105,
-				y = -15,
-				scale = 0.70,
-				growHorizontal = 'LEFT'
-			},
-			rows = 1
-		},
-		MultiCast = {
-			fadeoutalpha = .25,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			position = {point = 'TOPRIGHT', parent = 'Transparent_ActionBarPlate', x = -777, y = -4, scale = 0.75}
-		},
-		Vehicle = {
-			fadeoutalpha = .25,
-			version = 3,
-			fadeout = true,
-			enabled = false,
-			padding = 3,
-			position = {point = 'CENTER', parent = 'Transparent_ActionBarPlate', x = -15, y = 213, scale = 0.85}
-		},
-		ExtraActionBar = {
-			fadeoutalpha = .25,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			position = {point = 'CENTER', parent = 'Transparent_ActionBarPlate', x = -32, y = 240}
-		},
-		ZoneAbilityBar = {
-			fadeoutalpha = .25,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			position = {point = 'CENTER', parent = 'Transparent_ActionBarPlate', x = -32, y = 240}
-		},
-		BlizzardArt = {enabled = false},
-		XPBar = {enabled = false},
-		RepBar = {enabled = false},
-		APBar = {enabled = false},
-		blizzardVehicle = SUI.DBMod.Artwork.VehicleUI
-	},
-	TooltipLoc = true,
-	BuffLoc = true
-}
-if not SUI.DB.Styles.Transparent.Artwork then
-	SUI.DB.Styles.Transparent = SUI:MergeData(SUI.DB.Styles.Transparent, Defaults, true)
-else
-	SUI.DB.Styles.Transparent = SUI:MergeData(SUI.DB.Styles.Transparent, Defaults, false)
-end
-if not SUI.DBG.Bartender4[SUI.DB.Styles.Transparent.BartenderProfile] then
-	SUI.DBG.Bartender4[SUI.DB.Styles.Transparent.BartenderProfile] = {Style = 'Transparent'}
-end
diff --git a/Modules/Style_Transparent/Style.xml b/Modules/Style_Transparent/Style.xml
index 4120bff2..e7134865 100644
--- a/Modules/Style_Transparent/Style.xml
+++ b/Modules/Style_Transparent/Style.xml
@@ -2,7 +2,6 @@
 ..\..\FrameXML\UI.xsd">
 	<!-- frameStrata Parameters:  BACKGROUND, LOW, MEDIUM, HIGH, DIALOG, FULLSCREEN, FULLSCREEN_DIALOG, TOOLTIP  -->
 	<!-- Layer level Parameters:  BACKGROUND, BORDER, ARTWORK, OVERLAY, HIGHLIGHT -->
-	<Script file="Style-Setup.lua" />
 
 	<!-- Transparent_AnchorFrame -->
 	<Frame name="Transparent_AnchorFrame" frameStrata="BACKGROUND" parent="UIParent">
diff --git a/Modules/Style_War/Module-Artwork.lua b/Modules/Style_War/Module-Artwork.lua
index 2ff5fb83..efb19051 100644
--- a/Modules/Style_War/Module-Artwork.lua
+++ b/Modules/Style_War/Module-Artwork.lua
@@ -1,6 +1,6 @@
 local _G, SUI = _G, SUI
 local Artwork_Core = SUI:GetModule('Artwork_Core')
-local module = SUI:GetModule('Style_War')
+local module = SUI:NewModule('Style_War')
 ----------------------------------------------------------------------------------------------------
 module.Trays = {}
 module.StatusBarSettings = {
diff --git a/Modules/Style_War/Module-UnitFrames.lua b/Modules/Style_War/Module-UnitFrames.lua
index a61ccbbf..a5a1bcb7 100644
--- a/Modules/Style_War/Module-UnitFrames.lua
+++ b/Modules/Style_War/Module-UnitFrames.lua
@@ -5,7 +5,7 @@ local PlayerFrames, PartyFrames = nil
 ----------------------------------------------------------------------------------------------------
 local Smoothv2 = SUI.BarTextures.smooth
 local square = 'Interface\\AddOns\\SpartanUI_Style_Transparent\\Images\\square.tga'
-local lfdrole = 'Interface\\AddOns\\SpartanUI\\media\\icon_role.tga'
+local lfdrole = 'Interface\\AddOns\\SpartanUI\\images\\icon_role.tga'
 local Images
 local PlayerFaction = UnitFactionGroup('Player')
 
@@ -283,7 +283,7 @@ local CreateLargeFrame = function(self, unit)
 
 		self.artwork.bgNeutral = self.artwork:CreateTexture(nil, 'BORDER')
 		self.artwork.bgNeutral:SetAllPoints(self)
-		self.artwork.bgNeutral:SetTexture('Interface\\AddOns\\SpartanUI\\media\\Smoothv2.tga')
+		self.artwork.bgNeutral:SetTexture('Interface\\AddOns\\SpartanUI\\images\\Smoothv2.tga')
 		self.artwork.bgNeutral:SetVertexColor(0, 0, 0, .6)
 
 		self.artwork.bgAlliance = self.artwork:CreateTexture(nil, 'BACKGROUND')
diff --git a/Modules/Style_War/Style-Setup.lua b/Modules/Style_War/Style-Setup.lua
deleted file mode 100644
index 7e277053..00000000
--- a/Modules/Style_War/Style-Setup.lua
+++ /dev/null
@@ -1,266 +0,0 @@
-local SUI = SUI
-----------------------------------------------------------------------------------------------------
---First Lets make the Module
-local module = SUI:NewModule('Style_War')
-
-module.Settings = {}
-
---Now lets setup the initial Database settings
-local Defaults = {
-	Artwork = {
-		Allenable = true,
-		Allalpha = 100,
-		bar1 = {enable = true, alpha = 100},
-		bar2 = {enable = true, alpha = 100},
-		bar3 = {enable = true, alpha = 100},
-		bar4 = {enable = true, alpha = 100},
-		Stance = {enable = true, alpha = 100},
-		MenuBar = {enable = true, alpha = 100}
-	},
-	Frames = {
-		player = {Buffs = {Mode = 'both'}, Debuffs = {Mode = 'both'}},
-		target = {Buffs = {Mode = 'both', onlyShowPlayer = true}, Debuffs = {Mode = 'bars'}},
-		pet = {Buffs = {Mode = 'icons'}, Debuffs = {Mode = 'icons'}},
-		targettarget = {Buffs = {Mode = 'icons'}, Debuffs = {Mode = 'icons'}},
-		focus = {Buffs = {Mode = 'icons'}, Debuffs = {Mode = 'icons'}}
-	},
-	PlayerFrames = {},
-	PartyFrames = {
-		FrameStyle = 'medium'
-	},
-	RaidFrames = {
-		FrameStyle = 'small'
-	},
-	Movable = {
-		Minimap = true
-	},
-	Minimap = {
-		Engulfed = true
-	},
-	SlidingTrays = {
-		left = {
-			enabled = true,
-			collapsed = false
-		},
-		right = {
-			enabled = true,
-			collapsed = false
-		}
-	},
-	TalkingHeadUI = {
-		point = 'TOP',
-		relPoint = 'TOP',
-		x = 0,
-		y = -30,
-		scale = .8
-	},
-	BartenderProfile = 'SpartanUI - War',
-	BartenderSettings = {
-		ActionBars = {
-			actionbars = {
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'War_ActionBarPlate',
-						x = -510,
-						y = 36,
-						scale = 0.85,
-						growHorizontal = 'RIGHT'
-					},
-					states = {
-						stance = {
-							DRUID = {
-								prowl = 0,
-								cat = 0
-							}
-						}
-					}
-				}, -- 1
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'War_ActionBarPlate',
-						x = -510,
-						y = -8,
-						scale = 0.85,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 2
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'War_ActionBarPlate',
-						x = 108,
-						y = 36,
-						scale = 0.85,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 3
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'War_ActionBarPlate',
-						x = 108,
-						y = -8,
-						scale = 0.85,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 4
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 3,
-					padding = 4,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'War_ActionBarPlate',
-						x = -645,
-						y = 35,
-						scale = 0.80,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 5
-				{
-					enabled = true,
-					buttons = 12,
-					rows = 3,
-					padding = 4,
-					skin = {Zoom = true},
-					position = {
-						point = 'CENTER',
-						parent = 'War_ActionBarPlate',
-						x = 514,
-						y = 35,
-						scale = 0.80,
-						growHorizontal = 'RIGHT'
-					}
-				}, -- 6
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {parent = 'War_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 7
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {parent = 'War_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 8
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {parent = 'War_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-				}, -- 9
-				{
-					enabled = false,
-					buttons = 12,
-					rows = 1,
-					padding = 3,
-					skin = {Zoom = true},
-					position = {parent = 'War_ActionBarPlate', scale = 0.85, growHorizontal = 'RIGHT'}
-				} -- 10
-			}
-		},
-		BagBar = {
-			version = 3,
-			enabled = true,
-			padding = 0,
-			position = {point = 'TOP', x = 465, y = -1, scale = 0.6, growHorizontal = 'LEFT'},
-			rows = 1,
-			onebag = false,
-			keyring = true
-		},
-		MicroMenu = {
-			version = 3,
-			enabled = true,
-			padding = -3,
-			position = {point = 'TOP', x = 138, y = -1, scale = 0.65, growHorizontal = 'RIGHT'}
-		},
-		PetBar = {
-			version = 3,
-			enabled = true,
-			padding = 1,
-			position = {point = 'TOP', x = -465, y = -1, scale = 0.65, growHorizontal = 'RIGHT'},
-			rows = 1,
-			skin = {Zoom = true}
-		},
-		StanceBar = {
-			version = 3,
-			enabled = true,
-			padding = 1,
-			position = {point = 'TOP', x = -129, y = -1, scale = 0.6, growHorizontal = 'LEFT'},
-			rows = 1
-		},
-		MultiCast = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			position = {point = 'TOPRIGHT', parent = 'War_ActionBarPlate', x = -777, y = -4, scale = 0.75}
-		},
-		Vehicle = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = false,
-			padding = 3,
-			position = {point = 'CENTER', parent = 'War_ActionBarPlate', x = -15, y = 213, scale = 0.85}
-		},
-		ExtraActionBar = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			position = {point = 'CENTER', parent = 'War_ActionBarPlate', x = -32, y = 240}
-		},
-		ZoneAbilityBar = {
-			fadeoutalpha = .6,
-			version = 3,
-			fadeout = true,
-			enabled = true,
-			position = {point = 'CENTER', parent = 'War_ActionBarPlate', x = -32, y = 240}
-		},
-		BlizzardArt = {enabled = false},
-		XPBar = {enabled = false},
-		RepBar = {enabled = false},
-		APBar = {enabled = false},
-		blizzardVehicle = SUI.DBMod.Artwork.VehicleUI
-	},
-	TooltipLoc = true,
-	BuffLoc = true
-}
-if not SUI.DB.Styles.War.Artwork then
-	SUI.DB.Styles.War = SUI:MergeData(SUI.DB.Styles.War, Defaults, true)
-else
-	SUI.DB.Styles.War = SUI:MergeData(SUI.DB.Styles.War, Defaults, false)
-end
-SUI.DB.Styles.War.BartenderSettings = Defaults.BartenderSettings
diff --git a/Modules/Style_War/Style.xml b/Modules/Style_War/Style.xml
index cc9c6748..89ab7419 100644
--- a/Modules/Style_War/Style.xml
+++ b/Modules/Style_War/Style.xml
@@ -2,7 +2,6 @@
 ..\..\FrameXML\UI.xsd">
 	<!-- frameStrata Parameters:  BACKGROUND, LOW, MEDIUM, HIGH, DIALOG, FULLSCREEN, FULLSCREEN_DIALOG, TOOLTIP  -->
 	<!-- Layer level Parameters:  BACKGROUND, BORDER, ARTWORK, OVERLAY, HIGHLIGHT -->
-	<Script file="Style-Setup.lua" />
 
 	<!-- SpartanUI -->
 	<Frame name="War_SpartanUI" frameStrata="BACKGROUND" parent="UIParent">
diff --git a/Modules/UnitFrames/Legacy-Style-Classic.lua b/Modules/UnitFrames/Legacy-Style-Classic.lua
index 23fe072a..09b178d6 100644
--- a/Modules/UnitFrames/Legacy-Style-Classic.lua
+++ b/Modules/UnitFrames/Legacy-Style-Classic.lua
@@ -271,27 +271,7 @@ local CreatePartyFrame = function(self, unit)
 			self.Health.colorHealth = true
 			self.Health.colorSmooth = true
 
-			-- Position and size
-			local myBars = CreateFrame('StatusBar', nil, self.Health)
-			myBars:SetPoint('TOPLEFT', self.Health:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			myBars:SetPoint('BOTTOMLEFT', self.Health:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			myBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			myBars:SetStatusBarColor(0, 1, 0.5, 0.35)
-
-			local otherBars = CreateFrame('StatusBar', nil, myBars)
-			otherBars:SetPoint('TOPLEFT', myBars:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			otherBars:SetPoint('BOTTOMLEFT', myBars:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			otherBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			otherBars:SetStatusBarColor(0, 0.5, 1, 0.25)
-
-			myBars:SetSize(150, 16)
-			otherBars:SetSize(150, 16)
-
-			self.HealthPrediction = {
-				myBar = myBars,
-				otherBar = otherBars,
-				maxOverflow = 3
-			}
+			SUI:SUF_HealPrediction(self)
 		end
 		do -- power bar
 			if
@@ -1003,27 +983,7 @@ local CreatePlayerFrame = function(self, unit)
 			self.Health.colorHealth = true
 			self.Health.Smooth = true
 
-			-- Position and size
-			local myBars = CreateFrame('StatusBar', nil, self.Health)
-			myBars:SetPoint('TOPLEFT', self.Health:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			myBars:SetPoint('BOTTOMLEFT', self.Health:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			myBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			myBars:SetStatusBarColor(0, 1, 0.5, 0.35)
-
-			local otherBars = CreateFrame('StatusBar', nil, myBars)
-			otherBars:SetPoint('TOPLEFT', myBars:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			otherBars:SetPoint('BOTTOMLEFT', myBars:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			otherBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			otherBars:SetStatusBarColor(0, 0.5, 1, 0.25)
-
-			myBars:SetSize(150, 16)
-			otherBars:SetSize(150, 16)
-
-			self.HealthPrediction = {
-				myBar = myBars,
-				otherBar = otherBars,
-				maxOverflow = 3
-			}
+			SUI:SUF_HealPrediction(self)
 		end
 		do -- power bar
 			local power = CreateFrame('StatusBar', nil, self)
@@ -1259,27 +1219,7 @@ local CreateTargetFrame = function(self, unit)
 			self.colors.smooth = {1, 0, 0, 1, 1, 0, 0, 1, 0}
 			self.Health.colorHealth = true
 
-			-- Position and size
-			local myBars = CreateFrame('StatusBar', nil, self.Health)
-			myBars:SetPoint('TOPLEFT', self.Health:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			myBars:SetPoint('BOTTOMLEFT', self.Health:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			myBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			myBars:SetStatusBarColor(0, 1, 0.5, 0.35)
-
-			local otherBars = CreateFrame('StatusBar', nil, myBars)
-			otherBars:SetPoint('TOPLEFT', myBars:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			otherBars:SetPoint('BOTTOMLEFT', myBars:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			otherBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			otherBars:SetStatusBarColor(0, 0.5, 1, 0.25)
-
-			myBars:SetSize(150, 16)
-			otherBars:SetSize(150, 16)
-
-			self.HealthPrediction = {
-				myBar = myBars,
-				otherBar = otherBars,
-				maxOverflow = 4
-			}
+			SUI:SUF_HealPrediction(self)
 		end
 		do -- power bar
 			local power = CreateFrame('StatusBar', nil, self)
@@ -1487,27 +1427,7 @@ local CreatePetFrame = function(self, unit)
 			self.colors.smooth = {1, 0, 0, 1, 1, 0, 0, 1, 0}
 			self.Health.colorHealth = true
 
-			-- Position and size
-			local myBars = CreateFrame('StatusBar', nil, self.Health)
-			myBars:SetPoint('TOPLEFT', self.Health:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			myBars:SetPoint('BOTTOMLEFT', self.Health:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			myBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			myBars:SetStatusBarColor(0, 1, 0.5, 0.35)
-
-			local otherBars = CreateFrame('StatusBar', nil, myBars)
-			otherBars:SetPoint('TOPLEFT', myBars:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			otherBars:SetPoint('BOTTOMLEFT', myBars:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			otherBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			otherBars:SetStatusBarColor(0, 0.5, 1, 0.25)
-
-			myBars:SetSize(150, 16)
-			otherBars:SetSize(150, 16)
-
-			self.HealthPrediction = {
-				myBar = myBars,
-				otherBar = otherBars,
-				maxOverflow = 4
-			}
+			SUI:SUF_HealPrediction(self)
 		end
 		do -- power bar
 			local power = CreateFrame('StatusBar', nil, self)
@@ -1755,27 +1675,7 @@ local CreateToTFrame = function(self, unit)
 					self.colors.smooth = {1, 0, 0, 1, 1, 0, 0, 1, 0}
 					self.Health.colorHealth = true
 
-					-- Position and size
-					local myBars = CreateFrame('StatusBar', nil, self.Health)
-					myBars:SetPoint('TOPLEFT', self.Health:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-					myBars:SetPoint('BOTTOMLEFT', self.Health:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-					myBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-					myBars:SetStatusBarColor(0, 1, 0.5, 0.35)
-
-					local otherBars = CreateFrame('StatusBar', nil, myBars)
-					otherBars:SetPoint('TOPLEFT', myBars:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-					otherBars:SetPoint('BOTTOMLEFT', myBars:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-					otherBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-					otherBars:SetStatusBarColor(0, 0.5, 1, 0.25)
-
-					myBars:SetSize(150, 16)
-					otherBars:SetSize(150, 16)
-
-					self.HealthPrediction = {
-						myBar = myBars,
-						otherBar = otherBars,
-						maxOverflow = 4
-					}
+					SUI:SUF_HealPrediction(self)
 				end
 				do -- power bar
 					local power = CreateFrame('StatusBar', nil, self)
@@ -1948,27 +1848,7 @@ local CreateToTFrame = function(self, unit)
 					self.colors.smooth = {1, 0, 0, 1, 1, 0, 0, 1, 0}
 					self.Health.colorHealth = true
 
-					-- Position and size
-					local myBars = CreateFrame('StatusBar', nil, self.Health)
-					myBars:SetPoint('TOPLEFT', self.Health:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-					myBars:SetPoint('BOTTOMLEFT', self.Health:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-					myBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-					myBars:SetStatusBarColor(0, 1, 0.5, 0.35)
-
-					local otherBars = CreateFrame('StatusBar', nil, myBars)
-					otherBars:SetPoint('TOPLEFT', myBars:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-					otherBars:SetPoint('BOTTOMLEFT', myBars:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-					otherBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-					otherBars:SetStatusBarColor(0, 0.5, 1, 0.25)
-
-					myBars:SetSize(150, 16)
-					otherBars:SetSize(150, 16)
-
-					self.HealthPrediction = {
-						myBar = myBars,
-						otherBar = otherBars,
-						maxOverflow = 4
-					}
+					SUI:SUF_HealPrediction(self)
 				end
 				do -- power bar
 					local power = CreateFrame('StatusBar', nil, self)
@@ -2092,27 +1972,7 @@ local CreateToTFrame = function(self, unit)
 					self.colors.smooth = {1, 0, 0, 1, 1, 0, 0, 1, 0}
 					self.Health.colorHealth = true
 
-					-- Position and size
-					local myBars = CreateFrame('StatusBar', nil, self.Health)
-					myBars:SetPoint('TOPLEFT', self.Health:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-					myBars:SetPoint('BOTTOMLEFT', self.Health:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-					myBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-					myBars:SetStatusBarColor(0, 1, 0.5, 0.35)
-
-					local otherBars = CreateFrame('StatusBar', nil, myBars)
-					otherBars:SetPoint('TOPLEFT', myBars:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-					otherBars:SetPoint('BOTTOMLEFT', myBars:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-					otherBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-					otherBars:SetStatusBarColor(0, 0.5, 1, 0.25)
-
-					myBars:SetSize(150, 16)
-					otherBars:SetSize(150, 16)
-
-					self.HealthPrediction = {
-						myBar = myBars,
-						otherBar = otherBars,
-						maxOverflow = 4
-					}
+					SUI:SUF_HealPrediction(self)
 				end
 			end
 			do -- setup ring, icons, and text
@@ -2266,27 +2126,7 @@ local CreateFocusFrame = function(self, unit)
 			self.colors.smooth = {1, 0, 0, 1, 1, 0, 0, 1, 0}
 			self.Health.colorHealth = true
 
-			-- Position and size
-			local myBars = CreateFrame('StatusBar', nil, self.Health)
-			myBars:SetPoint('TOPLEFT', self.Health:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			myBars:SetPoint('BOTTOMLEFT', self.Health:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			myBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			myBars:SetStatusBarColor(0, 1, 0.5, 0.35)
-
-			local otherBars = CreateFrame('StatusBar', nil, myBars)
-			otherBars:SetPoint('TOPLEFT', myBars:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			otherBars:SetPoint('BOTTOMLEFT', myBars:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			otherBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			otherBars:SetStatusBarColor(0, 0.5, 1, 0.25)
-
-			myBars:SetSize(150, 16)
-			otherBars:SetSize(150, 16)
-
-			self.HealthPrediction = {
-				myBar = myBars,
-				otherBar = otherBars,
-				maxOverflow = 4
-			}
+			SUI:SUF_HealPrediction(self)
 		end
 		do -- power bar
 			local power = CreateFrame('StatusBar', nil, self)
@@ -2471,27 +2311,7 @@ local CreateBossFrame = function(self, unit)
 			self.colors.smooth = {1, 0, 0, 1, 1, 0, 0, 1, 0}
 			self.Health.colorHealth = true
 
-			-- Position and size
-			local myBars = CreateFrame('StatusBar', nil, self.Health)
-			myBars:SetPoint('TOPLEFT', self.Health:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			myBars:SetPoint('BOTTOMLEFT', self.Health:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			myBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			myBars:SetStatusBarColor(0, 1, 0.5, 0.35)
-
-			local otherBars = CreateFrame('StatusBar', nil, myBars)
-			otherBars:SetPoint('TOPLEFT', myBars:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			otherBars:SetPoint('BOTTOMLEFT', myBars:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			otherBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			otherBars:SetStatusBarColor(0, 0.5, 1, 0.25)
-
-			myBars:SetSize(105, 12)
-			otherBars:SetSize(105, 12)
-
-			self.HealthPrediction = {
-				myBar = myBars,
-				otherBar = otherBars,
-				maxOverflow = 4
-			}
+			SUI:SUF_HealPrediction(self)
 		end
 		do -- power bar
 			local power = CreateFrame('StatusBar', nil, self)
@@ -3110,27 +2930,7 @@ local SpawnRaidFrame = function(self, unit)
 			self.Health.colorHealth = true
 			self.Health.colorSmooth = true
 
-			-- Position and size
-			local myBars = CreateFrame('StatusBar', nil, self.Health)
-			myBars:SetPoint('TOPLEFT', self.Health:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			myBars:SetPoint('BOTTOMLEFT', self.Health:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			myBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			myBars:SetStatusBarColor(0, 1, 0.5, 0.45)
-
-			local otherBars = CreateFrame('StatusBar', nil, myBars)
-			otherBars:SetPoint('TOPLEFT', myBars:GetStatusBarTexture(), 'TOPRIGHT', 0, 0)
-			otherBars:SetPoint('BOTTOMLEFT', myBars:GetStatusBarTexture(), 'BOTTOMRIGHT', 0, 0)
-			otherBars:SetStatusBarTexture('Interface\\TargetingFrame\\UI-StatusBar')
-			otherBars:SetStatusBarColor(0, 0.5, 1, 0.35)
-
-			-- myBars:SetSize(150, health:GetHeight())
-			-- otherBars:SetSize(150, health:GetHeight())
-
-			self.HealthPrediction = {
-				myBar = myBars,
-				otherBar = otherBars,
-				maxOverflow = 3
-			}
+			SUI:SUF_HealPrediction(self)
 		end
 		do -- power bar
 			local power = CreateFrame('StatusBar', nil, self)
diff --git a/media/font-cognosis.ttf b/fonts/Cognosis.ttf
similarity index 100%
rename from media/font-cognosis.ttf
rename to fonts/Cognosis.ttf
diff --git a/media/font-myriad.ttf b/fonts/Myriad.ttf
similarity index 100%
rename from media/font-myriad.ttf
rename to fonts/Myriad.ttf
diff --git a/media/NotoSans-Bold.ttf b/fonts/NotoSans-Bold.ttf
similarity index 100%
rename from media/NotoSans-Bold.ttf
rename to fonts/NotoSans-Bold.ttf
diff --git a/media/Roboto-Bold.ttf b/fonts/Roboto-Bold.ttf
similarity index 100%
rename from media/Roboto-Bold.ttf
rename to fonts/Roboto-Bold.ttf
diff --git a/media/Roboto-Medium.ttf b/fonts/Roboto-Medium.ttf
similarity index 100%
rename from media/Roboto-Medium.ttf
rename to fonts/Roboto-Medium.ttf
diff --git a/media/HealthBar.blp b/images/HealthBar.blp
similarity index 100%
rename from media/HealthBar.blp
rename to images/HealthBar.blp
diff --git a/media/Smoothv2.blp b/images/Smoothv2.blp
similarity index 100%
rename from media/Smoothv2.blp
rename to images/Smoothv2.blp
diff --git a/media/Spartan-Helm.blp b/images/Spartan-Helm.blp
similarity index 100%
rename from media/Spartan-Helm.blp
rename to images/Spartan-Helm.blp
diff --git a/media/UI-World-Icon-Pushed.BLP b/images/UI-World-Icon-Pushed.BLP
similarity index 100%
rename from media/UI-World-Icon-Pushed.BLP
rename to images/UI-World-Icon-Pushed.BLP
diff --git a/media/UI-World-Icon.BLP b/images/UI-World-Icon.BLP
similarity index 100%
rename from media/UI-World-Icon.BLP
rename to images/UI-World-Icon.BLP
diff --git a/media/WorldMap-Icon-Pushed.BLP b/images/WorldMap-Icon-Pushed.BLP
similarity index 100%
rename from media/WorldMap-Icon-Pushed.BLP
rename to images/WorldMap-Icon-Pushed.BLP
diff --git a/media/WorldMap-Icon.BLP b/images/WorldMap-Icon.BLP
similarity index 100%
rename from media/WorldMap-Icon.BLP
rename to images/WorldMap-Icon.BLP
diff --git a/media/blank.tga b/images/blank.tga
similarity index 100%
rename from media/blank.tga
rename to images/blank.tga
diff --git a/media/flat_classicons/wow_flat_deathknight.blp b/images/flat_classicons/deathknight.blp
similarity index 100%
rename from media/flat_classicons/wow_flat_deathknight.blp
rename to images/flat_classicons/deathknight.blp
diff --git a/media/flat_classicons/wow_flat_demonhunter.blp b/images/flat_classicons/demonhunter.blp
similarity index 100%
rename from media/flat_classicons/wow_flat_demonhunter.blp
rename to images/flat_classicons/demonhunter.blp
diff --git a/media/flat_classicons/wow_flat_druid.blp b/images/flat_classicons/druid.blp
similarity index 100%
rename from media/flat_classicons/wow_flat_druid.blp
rename to images/flat_classicons/druid.blp
diff --git a/media/flat_classicons/wow_flat_hunter.blp b/images/flat_classicons/hunter.blp
similarity index 100%
rename from media/flat_classicons/wow_flat_hunter.blp
rename to images/flat_classicons/hunter.blp
diff --git a/media/flat_classicons/wow_flat_mage.blp b/images/flat_classicons/mage.blp
similarity index 100%
rename from media/flat_classicons/wow_flat_mage.blp
rename to images/flat_classicons/mage.blp
diff --git a/media/flat_classicons/wow_flat_monk.blp b/images/flat_classicons/monk.blp
similarity index 100%
rename from media/flat_classicons/wow_flat_monk.blp
rename to images/flat_classicons/monk.blp
diff --git a/media/flat_classicons/wow_flat_paladin.blp b/images/flat_classicons/paladin.blp
similarity index 100%
rename from media/flat_classicons/wow_flat_paladin.blp
rename to images/flat_classicons/paladin.blp
diff --git a/media/flat_classicons/wow_flat_priest.blp b/images/flat_classicons/priest.blp
similarity index 100%
rename from media/flat_classicons/wow_flat_priest.blp
rename to images/flat_classicons/priest.blp
diff --git a/media/flat_classicons/wow_flat_rogue.blp b/images/flat_classicons/rogue.blp
similarity index 100%
rename from media/flat_classicons/wow_flat_rogue.blp
rename to images/flat_classicons/rogue.blp
diff --git a/media/flat_classicons/wow_flat_shaman.blp b/images/flat_classicons/shaman.blp
similarity index 100%
rename from media/flat_classicons/wow_flat_shaman.blp
rename to images/flat_classicons/shaman.blp
diff --git a/media/flat_classicons/wow_flat_warlock.blp b/images/flat_classicons/warlock.blp
similarity index 100%
rename from media/flat_classicons/wow_flat_warlock.blp
rename to images/flat_classicons/warlock.blp
diff --git a/media/flat_classicons/wow_flat_warrior.blp b/images/flat_classicons/warrior.blp
similarity index 100%
rename from media/flat_classicons/wow_flat_warrior.blp
rename to images/flat_classicons/warrior.blp
diff --git a/media/icon_class.tga b/images/icon_class.tga
similarity index 100%
rename from media/icon_class.tga
rename to images/icon_class.tga
diff --git a/media/icon_role.tga b/images/icon_role.tga
similarity index 100%
rename from media/icon_role.tga
rename to images/icon_role.tga
diff --git a/media/metal.blp b/images/metal.blp
similarity index 100%
rename from media/metal.blp
rename to images/metal.blp
diff --git a/media/map-circle-overlay.blp b/images/minimap/circle-overlay.blp
similarity index 100%
rename from media/map-circle-overlay.blp
rename to images/minimap/circle-overlay.blp
diff --git a/media/map-circle.tga b/images/minimap/circle.tga
similarity index 100%
rename from media/map-circle.tga
rename to images/minimap/circle.tga
diff --git a/media/map-square-overlay-large.tga b/images/minimap/square-overlay-large.tga
similarity index 100%
rename from media/map-square-overlay-large.tga
rename to images/minimap/square-overlay-large.tga
diff --git a/media/map-square-overlay.tga b/images/minimap/square-overlay.tga
similarity index 100%
rename from media/map-square-overlay.tga
rename to images/minimap/square-overlay.tga
diff --git a/media/Setup-Fonts.blp b/images/setup/Setup-Fonts.blp
similarity index 100%
rename from media/Setup-Fonts.blp
rename to images/setup/Setup-Fonts.blp
diff --git a/media/Style_Digital.blp b/images/setup/Style_Digital.blp
similarity index 100%
rename from media/Style_Digital.blp
rename to images/setup/Style_Digital.blp
diff --git a/media/Style_Fel.blp b/images/setup/Style_Fel.blp
similarity index 100%
rename from media/Style_Fel.blp
rename to images/setup/Style_Fel.blp
diff --git a/media/Style_Frames_Classic.tga b/images/setup/Style_Frames_Classic.tga
similarity index 100%
rename from media/Style_Frames_Classic.tga
rename to images/setup/Style_Frames_Classic.tga
diff --git a/media/Style_Frames_Digital.tga b/images/setup/Style_Frames_Digital.tga
similarity index 100%
rename from media/Style_Frames_Digital.tga
rename to images/setup/Style_Frames_Digital.tga
diff --git a/media/Style_Frames_Fel.tga b/images/setup/Style_Frames_Fel.tga
similarity index 100%
rename from media/Style_Frames_Fel.tga
rename to images/setup/Style_Frames_Fel.tga
diff --git a/media/Style_Frames_Minimal.tga b/images/setup/Style_Frames_Minimal.tga
similarity index 100%
rename from media/Style_Frames_Minimal.tga
rename to images/setup/Style_Frames_Minimal.tga
diff --git a/media/Style_Frames_Transparent.tga b/images/setup/Style_Frames_Transparent.tga
similarity index 100%
rename from media/Style_Frames_Transparent.tga
rename to images/setup/Style_Frames_Transparent.tga
diff --git a/media/Style_Minimal.blp b/images/setup/Style_Minimal.blp
similarity index 100%
rename from media/Style_Minimal.blp
rename to images/setup/Style_Minimal.blp
diff --git a/media/Style_Transparent.blp b/images/setup/Style_Transparent.blp
similarity index 100%
rename from media/Style_Transparent.blp
rename to images/setup/Style_Transparent.blp
diff --git a/media/Style_War.blp b/images/setup/Style_War.blp
similarity index 100%
rename from media/Style_War.blp
rename to images/setup/Style_War.blp
diff --git a/media/smoke.blp b/images/smoke.blp
similarity index 100%
rename from media/smoke.blp
rename to images/smoke.blp
diff --git a/media/texture.tga b/images/texture.tga
similarity index 100%
rename from media/texture.tga
rename to images/texture.tga
diff --git a/libs/oUF_Plugins/LoadAll.xml b/libs/sUF_Plugins/Loader.xml
similarity index 96%
rename from libs/oUF_Plugins/LoadAll.xml
rename to libs/sUF_Plugins/Loader.xml
index 30772923..3ef92db0 100644
--- a/libs/oUF_Plugins/LoadAll.xml
+++ b/libs/sUF_Plugins/Loader.xml
@@ -1,9 +1,9 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/">
-	<Script file='oUF_Smooth.lua'/>
-	<Script file='oUF_AuraWatch.lua' />
-	<!-- 
-	<Script file='oUF_Trinkets.lua'/>
-	<Script file='oUF_Dispellable.lua'/>
-	<Script file='oUF_RaidDebuffs.lua' />
-	-->
-</Ui>
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file='oUF_Smooth.lua'/>
+	<Script file='oUF_AuraWatch.lua' />
+	<!-- 
+	<Script file='oUF_Trinkets.lua'/>
+	<Script file='oUF_Dispellable.lua'/>
+	<Script file='oUF_RaidDebuffs.lua' />
+	-->
+</Ui>
diff --git a/libs/oUF_Plugins/oUF_AuraWatch.lua b/libs/sUF_Plugins/oUF_AuraWatch.lua
similarity index 96%
rename from libs/oUF_Plugins/oUF_AuraWatch.lua
rename to libs/sUF_Plugins/oUF_AuraWatch.lua
index 7628c80f..02c3ca20 100644
--- a/libs/oUF_Plugins/oUF_AuraWatch.lua
+++ b/libs/sUF_Plugins/oUF_AuraWatch.lua
@@ -1,326 +1,326 @@
---[[------------------------------------------------------------------------------------------------------
-oUF_AuraWatch by Astromech
-Please leave comments, suggestions, and bug reports on this addon's WoWInterface page
-
-To setup, create a table named AuraWatch in your unit frame. There are several options
-you can specify, as explained below.
-	
-	icons 
-		Mandatory!
-		A table of frames to be used as icons. oUF_Aurawatch does not position
-		these frames, so you must do so yourself. Each icon needs a spellID entry,
-		which is the spell ID of the aura to watch. Table should be set up
-		such that values are icon frames, but the keys can be anything.
-		
-		Note each icon can have several options set as well. See below.
-	missingAlpha
-		Default 0.75
-		The alpha value for icons of auras which have faded from the unit.
-	presentAlpha
-		Default 1
-		The alpha value for icons or auras present on the unit.
-	onlyShowMissing
-		Default false
-		If this is true, oUF_AW will hide icons if they are present on the unit.
-	onlyShowPresent
-		Default false
-		If this is true, oUF_AW will hide icons if they have expired from the unit.
-	customIcons
-		Default false
-		If this is true, oUF_AW will not create any frames or textures for your
-		icons. It assumes you will handle it.
-	fromUnits
-		Default {["player"] = true, ["pet"] = true, ["vehicle"] = true}
-		A table of units from which auras can originate. Have the units be the keys
-		and "true" be the values.
-	anyUnit
-		Default false
-		Set to true for oUF_AW to to show an aura no matter what unit it 
-		originates from. This will override any fromUnits setting.
-	PostCreateIcon
-		Default nil
-		A function to call when an icon is created to modify it, such as adding
-		a border or repositioning the count fontstring. Leave as nil to ignore.
-		The arguments are: AuraWatch table, icon, auraSpellID, auraName, unitFrame
-	PostResetIcon
-		Default nil
-		A function to call when an icon is reset, that is an aura has been applied
-		or refreshed. This is passed the AuraWatch frame, the icon, aura stack count,
-		duration, and remaining time, as per a UnitAura call.
-	PostExpireIcon
-		Default nil
-		A function to call when an icon is expired, that is an aura has disappeared.
-		This is passed the AuraWatch frame and the icon.
-	OverrideResetIcon
-		Default nil
-		Provide this function to handle the ResetIcon process yourself.
-	OverrideExpireIcon
-		Default nil
-		Provide this function to handle the ExpireIcon process yourself.
-
-Below are options set on a per icon basis. Set these as fields in the icon frames.
-
-The following settings can be overridden from the AuraWatch table on a per-aura basis:
-	onlyShowMissing
-	onlyShowPresent
-	fromUnits
-	anyUnit
-		
-The following settings are unique to icons:
-	
-	spellID
-		Mandatory!
-		The spell id of the aura, as explained above.
-	
-Here is an example of how to set oUF_AW up:
-
-	local createAuraWatch = function(self, unit)
-		local auras = {}
-		
-		-- A table of spellIDs to create icons for
-		-- To find spellIDs, look up a spell on www.wowhead.com and look at the URL
-		-- http://www.wowhead.com/?spell=SPELL_ID
-		local spellIDs = { ... }
-		
-		auras.presentAlpha = 1
-		auras.missingAlpha = .7
-		auras.PostCreateIcon = myCustomIconSkinnerFunction
-		-- Set any other AuraWatch settings
-		auras.icons = {}
-		for i, sid in pairs(spellIDs) do
-			local icon = CreateFrame("Frame", nil, self)
-			icon.spellID = sid
-			-- set the dimensions and positions
-			icon:SetWidth(24)
-			icon:SetHeight(24)
-			icon:SetPoint("BOTTOM", self, "BOTTOM", 0, 28 * i)
-			auras.icons[sid] = icon
-			-- Set any other AuraWatch icon settings
-		end
-		self.AuraWatch = auras
-	end
------------------------------------------------------------------------------------------------------------]]
-
-local _, ns = ...
-local oUF = (ns.oUF or oUF) or (ns.SUF or SUF)
-assert(oUF, "oUF_AuraWatch cannot find an instance of oUF. If your oUF is embedded into a layout, it may not be embedded properly.")
-
-local UnitAura, UnitGUID = UnitAura, UnitGUID
-local GUIDs = {}
-
-local PLAYER_UNITS = {
-	player = true,
-	vehicle = true,
-	pet = true,
-}
-
-local SetupGUID
-do 
-	local cache = setmetatable({}, {__type = "k"})
-
-	local frame = CreateFrame"Frame"
-	frame:SetScript("OnEvent", function(self, event)
-		for k,t in pairs(GUIDs) do
-			GUIDs[k] = nil
-			wipe(t)
-			cache[t] = true
-		end
-	end)
-	frame:RegisterEvent"PLAYER_REGEN_ENABLED"
-	frame:RegisterEvent"PLAYER_ENTERING_WORLD"
-	
-	function SetupGUID(guid)
-		local t = next(cache)
-		if t then
-			cache[t] = nil
-		else
-			t = {}
-		end
-		GUIDs[guid] = t
-	end
-end
-
-local function DefaultResetIcon(watch, icon, count, duration, expire)
-	if not icon.onlyShowMissing then
-		if icon.cd then
-			if duration and duration > 0 then
-				icon.cd:SetCooldown(expire - duration, duration)
-				icon.cd:Show()
-			else
-				icon.cd:Hide()
-			end
-		end
-		if icon.count then
-			icon.count:SetText(count > 1 and count)
-		end
-		if icon.overlay then
-			icon.overlay:Hide()
-		end
-		icon:SetAlpha(watch.presentAlpha)
-		icon:Show()
-		if watch.PostResetIcon then watch.PostResetIcon(watch, icon) end
-	end
-end
-
-local function ResetIcon(watch, icon, ...)
-	if watch.OverrideResetIcon then
-		watch.OverrideResetIcon(watch, icon, ...)
-	else
-		DefaultResetIcon(watch, icon, ...)
-	end
-end
-
-local function DefaultExpireIcon(watch, icon)
-	if not icon.onlyShowPresent then
-		if icon.cd then 
-			icon.cd:Hide() 
-		end
-		if icon.count then 
-			icon.count:SetText() 
-		end
-		icon:SetAlpha(watch.missingAlpha)
-		if icon.overlay then
-			icon.overlay:Show()
-		end
-		icon:Show()
-		if watch.PostExpireIcon then watch.PostExpireIcon(watch, icon) end
-	end
-end
-
-local function ExpireIcon(watch, icon, ...)
-	if watch.OverrideExpireIcon then
-		watch.OverrideExpireIcon(watch, icon, ...)
-	else
-		DefaultExpireIcon(watch, icon, ...)
-	end
-end
-
-local Update
-do
-	local found = {}
-	function Update(frame, event, unit)
-		if frame.unit ~= unit then return end
-		local watch = frame.AuraWatch
-		local index, icons = 1, watch.watched
-		local _, name, texture, count, duration, expire, caster, key, icon, spellid 
-		local filter = "HELPFUL"
-		local guid = UnitGUID(unit)
-		if not GUIDs[guid] then SetupGUID(guid) end
-		
-		for key, icon in pairs(icons) do
-			icon:Hide()
-		end
-		
-		while true do
-			name, texture, count, _, duration, expire, caster, _, _, spellid = UnitAura(unit, index, filter)
-			if not name then 
-				if filter == "HELPFUL" then
-					filter = "HARMFUL"
-					index = 1
-				else
-					break
-				end
-			else
-				key = spellid
-				icon = icons[key]
-				if icon and not icon.ignore and (icon.anyUnit or (caster and icon.fromUnits[caster])) then
-					ResetIcon(watch, icon, count, duration, expire)
-					GUIDs[guid][key] = true
-					found[key] = true
-				end
-				index = index + 1
-			end
-		end
-		
-		for key in pairs(GUIDs[guid]) do
-			if icons[key] and not found[key] and not icons[key].ignore then
-				ExpireIcon(watch, icons[key])
-			end
-		end
-		
-		wipe(found)
-	end
-end
-
-local function SetupIcons(self)
-
-	local watch = self.AuraWatch
-	local icons = watch.icons
-	watch.watched = {}
-	if not watch.missingAlpha then watch.missingAlpha = 0.75 end
-	if not watch.presentAlpha then watch.presentAlpha = 1 end
-	
-	for _,icon in pairs(icons) do
-	
-		local name, _, image = GetSpellInfo(icon.spellID)
-		if not name then error("oUF_AuraWatch error: no spell with "..tostring(icon.spellID).." spell ID exists") end
-		icon.name = name
-		if not watch.customIcons then
-			local cd = CreateFrame("Cooldown", "$parentCooldown", icon, "CooldownFrameTemplate")
-			cd:SetAllPoints(icon)
-			icon.cd = cd
-
-			local tex = icon:CreateTexture(nil, "BACKGROUND")
-			tex:SetAllPoints(icon)
-			tex:SetTexture(image)
-			icon.icon = tex
-			
-			local overlay = icon:CreateTexture(nil, "OVERLAY")
-			overlay:SetTexture"Interface\\Buttons\\UI-Debuff-Overlays"
-			overlay:SetAllPoints(icon)
-			overlay:SetTexCoord(.296875, .5703125, 0, .515625)
-			overlay:SetVertexColor(1, 0, 0)
-			icon.overlay = overlay
-
-			local count = icon:CreateFontString(nil, "OVERLAY")
-			count:SetFontObject(NumberFontNormal)
-			count:SetPoint("BOTTOMRIGHT", icon, "BOTTOMRIGHT", -1, 0)
-			icon.count = count
-		end
-
-		if icon.onlyShowMissing == nil then
-			icon.onlyShowMissing = watch.onlyShowMissing
-		end
-		if icon.onlyShowPresent == nil then
-			icon.onlyShowPresent = watch.onlyShowPresent
-		end
-		if icon.fromUnits == nil then
-			icon.fromUnits = watch.fromUnits or PLAYER_UNITS
-		end
-		if icon.anyUnit == nil then
-			icon.anyUnit = watch.anyUnit
-		end
-		
-		watch.watched[icon.spellID] = icon
-
-		if watch.PostCreateIcon then watch:PostCreateIcon(icon, icon.spellID, name, self) end
-	end
-end
-
-local function ForceUpdate(element)
-	return Update(element.__owner, "ForceUpdate", element.__owner.unit)
-end
-
-local function Enable(self)
-	if self.AuraWatch then
-		self.AuraWatch.__owner = self
-		self.AuraWatch.ForceUpdate = ForceUpdate
-		
-		self:RegisterEvent("UNIT_AURA", Update)
-		SetupIcons(self)
-		return true
-	else
-		return false
-	end
-end
-
-local function Disable(self)
-	if self.AuraWatch then
-		self:UnregisterEvent("UNIT_AURA", Update)
-		for _,icon in pairs(self.AuraWatch.icons) do
-			icon:Hide()
-		end
-	end
-end
-
-oUF:AddElement("AuraWatch", Update, Enable, Disable)
+--[[------------------------------------------------------------------------------------------------------
+oUF_AuraWatch by Astromech
+Please leave comments, suggestions, and bug reports on this addon's WoWInterface page
+
+To setup, create a table named AuraWatch in your unit frame. There are several options
+you can specify, as explained below.
+	
+	icons 
+		Mandatory!
+		A table of frames to be used as icons. oUF_Aurawatch does not position
+		these frames, so you must do so yourself. Each icon needs a spellID entry,
+		which is the spell ID of the aura to watch. Table should be set up
+		such that values are icon frames, but the keys can be anything.
+		
+		Note each icon can have several options set as well. See below.
+	missingAlpha
+		Default 0.75
+		The alpha value for icons of auras which have faded from the unit.
+	presentAlpha
+		Default 1
+		The alpha value for icons or auras present on the unit.
+	onlyShowMissing
+		Default false
+		If this is true, oUF_AW will hide icons if they are present on the unit.
+	onlyShowPresent
+		Default false
+		If this is true, oUF_AW will hide icons if they have expired from the unit.
+	customIcons
+		Default false
+		If this is true, oUF_AW will not create any frames or textures for your
+		icons. It assumes you will handle it.
+	fromUnits
+		Default {["player"] = true, ["pet"] = true, ["vehicle"] = true}
+		A table of units from which auras can originate. Have the units be the keys
+		and "true" be the values.
+	anyUnit
+		Default false
+		Set to true for oUF_AW to to show an aura no matter what unit it 
+		originates from. This will override any fromUnits setting.
+	PostCreateIcon
+		Default nil
+		A function to call when an icon is created to modify it, such as adding
+		a border or repositioning the count fontstring. Leave as nil to ignore.
+		The arguments are: AuraWatch table, icon, auraSpellID, auraName, unitFrame
+	PostResetIcon
+		Default nil
+		A function to call when an icon is reset, that is an aura has been applied
+		or refreshed. This is passed the AuraWatch frame, the icon, aura stack count,
+		duration, and remaining time, as per a UnitAura call.
+	PostExpireIcon
+		Default nil
+		A function to call when an icon is expired, that is an aura has disappeared.
+		This is passed the AuraWatch frame and the icon.
+	OverrideResetIcon
+		Default nil
+		Provide this function to handle the ResetIcon process yourself.
+	OverrideExpireIcon
+		Default nil
+		Provide this function to handle the ExpireIcon process yourself.
+
+Below are options set on a per icon basis. Set these as fields in the icon frames.
+
+The following settings can be overridden from the AuraWatch table on a per-aura basis:
+	onlyShowMissing
+	onlyShowPresent
+	fromUnits
+	anyUnit
+		
+The following settings are unique to icons:
+	
+	spellID
+		Mandatory!
+		The spell id of the aura, as explained above.
+	
+Here is an example of how to set oUF_AW up:
+
+	local createAuraWatch = function(self, unit)
+		local auras = {}
+		
+		-- A table of spellIDs to create icons for
+		-- To find spellIDs, look up a spell on www.wowhead.com and look at the URL
+		-- http://www.wowhead.com/?spell=SPELL_ID
+		local spellIDs = { ... }
+		
+		auras.presentAlpha = 1
+		auras.missingAlpha = .7
+		auras.PostCreateIcon = myCustomIconSkinnerFunction
+		-- Set any other AuraWatch settings
+		auras.icons = {}
+		for i, sid in pairs(spellIDs) do
+			local icon = CreateFrame("Frame", nil, self)
+			icon.spellID = sid
+			-- set the dimensions and positions
+			icon:SetWidth(24)
+			icon:SetHeight(24)
+			icon:SetPoint("BOTTOM", self, "BOTTOM", 0, 28 * i)
+			auras.icons[sid] = icon
+			-- Set any other AuraWatch icon settings
+		end
+		self.AuraWatch = auras
+	end
+-----------------------------------------------------------------------------------------------------------]]
+
+local _, ns = ...
+local oUF = (ns.oUF or oUF) or (ns.SUF or SUF)
+assert(oUF, "oUF_AuraWatch cannot find an instance of oUF. If your oUF is embedded into a layout, it may not be embedded properly.")
+
+local UnitAura, UnitGUID = UnitAura, UnitGUID
+local GUIDs = {}
+
+local PLAYER_UNITS = {
+	player = true,
+	vehicle = true,
+	pet = true,
+}
+
+local SetupGUID
+do 
+	local cache = setmetatable({}, {__type = "k"})
+
+	local frame = CreateFrame"Frame"
+	frame:SetScript("OnEvent", function(self, event)
+		for k,t in pairs(GUIDs) do
+			GUIDs[k] = nil
+			wipe(t)
+			cache[t] = true
+		end
+	end)
+	frame:RegisterEvent"PLAYER_REGEN_ENABLED"
+	frame:RegisterEvent"PLAYER_ENTERING_WORLD"
+	
+	function SetupGUID(guid)
+		local t = next(cache)
+		if t then
+			cache[t] = nil
+		else
+			t = {}
+		end
+		GUIDs[guid] = t
+	end
+end
+
+local function DefaultResetIcon(watch, icon, count, duration, expire)
+	if not icon.onlyShowMissing then
+		if icon.cd then
+			if duration and duration > 0 then
+				icon.cd:SetCooldown(expire - duration, duration)
+				icon.cd:Show()
+			else
+				icon.cd:Hide()
+			end
+		end
+		if icon.count then
+			icon.count:SetText(count > 1 and count)
+		end
+		if icon.overlay then
+			icon.overlay:Hide()
+		end
+		icon:SetAlpha(watch.presentAlpha)
+		icon:Show()
+		if watch.PostResetIcon then watch.PostResetIcon(watch, icon) end
+	end
+end
+
+local function ResetIcon(watch, icon, ...)
+	if watch.OverrideResetIcon then
+		watch.OverrideResetIcon(watch, icon, ...)
+	else
+		DefaultResetIcon(watch, icon, ...)
+	end
+end
+
+local function DefaultExpireIcon(watch, icon)
+	if not icon.onlyShowPresent then
+		if icon.cd then 
+			icon.cd:Hide() 
+		end
+		if icon.count then 
+			icon.count:SetText() 
+		end
+		icon:SetAlpha(watch.missingAlpha)
+		if icon.overlay then
+			icon.overlay:Show()
+		end
+		icon:Show()
+		if watch.PostExpireIcon then watch.PostExpireIcon(watch, icon) end
+	end
+end
+
+local function ExpireIcon(watch, icon, ...)
+	if watch.OverrideExpireIcon then
+		watch.OverrideExpireIcon(watch, icon, ...)
+	else
+		DefaultExpireIcon(watch, icon, ...)
+	end
+end
+
+local Update
+do
+	local found = {}
+	function Update(frame, event, unit)
+		if frame.unit ~= unit then return end
+		local watch = frame.AuraWatch
+		local index, icons = 1, watch.watched
+		local _, name, texture, count, duration, expire, caster, key, icon, spellid 
+		local filter = "HELPFUL"
+		local guid = UnitGUID(unit)
+		if not GUIDs[guid] then SetupGUID(guid) end
+		
+		for key, icon in pairs(icons) do
+			icon:Hide()
+		end
+		
+		while true do
+			name, texture, count, _, duration, expire, caster, _, _, spellid = UnitAura(unit, index, filter)
+			if not name then 
+				if filter == "HELPFUL" then
+					filter = "HARMFUL"
+					index = 1
+				else
+					break
+				end
+			else
+				key = spellid
+				icon = icons[key]
+				if icon and not icon.ignore and (icon.anyUnit or (caster and icon.fromUnits[caster])) then
+					ResetIcon(watch, icon, count, duration, expire)
+					GUIDs[guid][key] = true
+					found[key] = true
+				end
+				index = index + 1
+			end
+		end
+		
+		for key in pairs(GUIDs[guid]) do
+			if icons[key] and not found[key] and not icons[key].ignore then
+				ExpireIcon(watch, icons[key])
+			end
+		end
+		
+		wipe(found)
+	end
+end
+
+local function SetupIcons(self)
+
+	local watch = self.AuraWatch
+	local icons = watch.icons
+	watch.watched = {}
+	if not watch.missingAlpha then watch.missingAlpha = 0.75 end
+	if not watch.presentAlpha then watch.presentAlpha = 1 end
+	
+	for _,icon in pairs(icons) do
+	
+		local name, _, image = GetSpellInfo(icon.spellID)
+		if not name then error("oUF_AuraWatch error: no spell with "..tostring(icon.spellID).." spell ID exists") end
+		icon.name = name
+		if not watch.customIcons then
+			local cd = CreateFrame("Cooldown", "$parentCooldown", icon, "CooldownFrameTemplate")
+			cd:SetAllPoints(icon)
+			icon.cd = cd
+
+			local tex = icon:CreateTexture(nil, "BACKGROUND")
+			tex:SetAllPoints(icon)
+			tex:SetTexture(image)
+			icon.icon = tex
+			
+			local overlay = icon:CreateTexture(nil, "OVERLAY")
+			overlay:SetTexture"Interface\\Buttons\\UI-Debuff-Overlays"
+			overlay:SetAllPoints(icon)
+			overlay:SetTexCoord(.296875, .5703125, 0, .515625)
+			overlay:SetVertexColor(1, 0, 0)
+			icon.overlay = overlay
+
+			local count = icon:CreateFontString(nil, "OVERLAY")
+			count:SetFontObject(NumberFontNormal)
+			count:SetPoint("BOTTOMRIGHT", icon, "BOTTOMRIGHT", -1, 0)
+			icon.count = count
+		end
+
+		if icon.onlyShowMissing == nil then
+			icon.onlyShowMissing = watch.onlyShowMissing
+		end
+		if icon.onlyShowPresent == nil then
+			icon.onlyShowPresent = watch.onlyShowPresent
+		end
+		if icon.fromUnits == nil then
+			icon.fromUnits = watch.fromUnits or PLAYER_UNITS
+		end
+		if icon.anyUnit == nil then
+			icon.anyUnit = watch.anyUnit
+		end
+		
+		watch.watched[icon.spellID] = icon
+
+		if watch.PostCreateIcon then watch:PostCreateIcon(icon, icon.spellID, name, self) end
+	end
+end
+
+local function ForceUpdate(element)
+	return Update(element.__owner, "ForceUpdate", element.__owner.unit)
+end
+
+local function Enable(self)
+	if self.AuraWatch then
+		self.AuraWatch.__owner = self
+		self.AuraWatch.ForceUpdate = ForceUpdate
+		
+		self:RegisterEvent("UNIT_AURA", Update)
+		SetupIcons(self)
+		return true
+	else
+		return false
+	end
+end
+
+local function Disable(self)
+	if self.AuraWatch then
+		self:UnregisterEvent("UNIT_AURA", Update)
+		for _,icon in pairs(self.AuraWatch.icons) do
+			icon:Hide()
+		end
+	end
+end
+
+oUF:AddElement("AuraWatch", Update, Enable, Disable)
diff --git a/libs/oUF_Plugins/oUF_Dispellable.lua b/libs/sUF_Plugins/oUF_Dispellable.lua
similarity index 100%
rename from libs/oUF_Plugins/oUF_Dispellable.lua
rename to libs/sUF_Plugins/oUF_Dispellable.lua
diff --git a/libs/oUF_Plugins/oUF_RaidDebuffs.lua b/libs/sUF_Plugins/oUF_RaidDebuffs.lua
similarity index 95%
rename from libs/oUF_Plugins/oUF_RaidDebuffs.lua
rename to libs/sUF_Plugins/oUF_RaidDebuffs.lua
index 9a1f9d5c..7338c1ab 100644
--- a/libs/oUF_Plugins/oUF_RaidDebuffs.lua
+++ b/libs/sUF_Plugins/oUF_RaidDebuffs.lua
@@ -1,187 +1,187 @@
--- yleaf (yaroot@gmail.com)
-
-local _, ns = ...
-local oUF = ns.oUF or oUF
-
-local addon = {}
-ns.oUF_RaidDebuffs = addon
-if not _G.oUF_RaidDebuffs then
-	_G.oUF_RaidDebuffs = addon
-end
-
-local debuff_data = {}
-addon.DebuffData = debuff_data
-
-addon.ShowDispelableDebuff = true
-addon.FilterDispellableDebuff = true
-addon.MatchBySpellName = true
-addon.SHAMAN_CAN_DECURSE = true
-
-addon.priority = 10
-
-local function add(spell)
-	if addon.MatchBySpellName and type(spell) == 'number' then
-		spell = GetSpellInfo(spell)
-	end
-	debuff_data[spell] = addon.priority
-	addon.priority = addon.priority + 1
-end
-
-function addon:RegisterDebuffs(t)
-	for _, v in next, t do
-		add(v)
-	end
-end
-
-function addon:ResetDebuffData()
-	wipe(debuff_data)
-	addon.priority = 10
-end
-
-local DispellColor = {
-	['Magic']	= {.2, .6, 1},
-	['Curse']	= {.6, 0, 1},
-	['Disease']	= {.6, .4, 0},
-	['Poison']	= {0, .6, 0},
-	['none'] = {1, 0, 0},
-}
-
-local DispellPriority = {
-	['Magic']	= 4,
-	['Curse']	= 3,
-	['Disease']	= 2,
-	['Poison']	= 1,
-}
-
-local DispellFilter
-do
-	local dispellClasses = {
-		['PRIEST'] = {
-			['Magic'] = true,
-			['Disease'] = true,
-		},
-		['SHAMAN'] = {
-			['Magic'] = true,
-			['Curse'] = true,
-		},
-		['PALADIN'] = {
-			['Poison'] = true,
-			['Magic'] = true,
-			['Disease'] = true,
-		},
-		['DRUID'] = {
-			['Curse'] = true,
-			['Poison'] = true,
-			['Magic'] = true,
-		},
-		['MONK'] = {
-			['Curse'] = true,
-			['Poison'] = true,
-			['Magic'] = true,
-		},
-	}
-	
-	DispellFilter = dispellClasses[select(2, UnitClass('player'))] or {}
-end
-
--- Return true if the talent matching the name of the spell given by (Credit Pitbull4)
--- spellid has at least one point spent in it or false otherwise
-local function CheckForKnownTalent(spellid)
-	return false
-end
-
-local function CheckSpec(self, event, levels)
-	-- Not interested in gained points from leveling	
-	if event == "CHARACTER_POINTS_CHANGED" and levels > 0 then return end
-	
-end
-
-local function UpdateDebuff(self, name, icon, count, debuffType, duration, endTime)
-	local f = self.RaidDebuffs
-	if name then
-		f.icon:SetTexture(icon)
-		f.icon:Show()
-		
-		if f.count then
-			if count and (count > 0) then
-				f.count:SetText(count)
-				f.count:Show()
-			else
-				f.count:Hide()
-			end
-		end
-		
-		if f.cd then
-			if duration and (duration > 0) then
-				f.cd:SetCooldown(endTime - duration, duration)
-				f.cd:Show()
-			else
-				f.cd:Hide()
-			end
-		end
-		
-		local c = DispellColor[debuffType] or DispellColor.none
-		f:SetBackdropColor(c[1], c[2], c[3])
-		
-		f:Show()
-	else
-		f:Hide()
-	end
-end
-
-local function Update(self, event, unit)
-	if unit ~= self.unit then return end
-	local _name, _icon, _count, _dtype, _duration, _endTime
-	local _priority, priority = 0
-	for i = 1, 40 do
-		local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, shouldConsolidate, spellId = UnitAura(unit, i, 'HARMFUL')
-		if (not name) then break end
-		
-		if addon.ShowDispelableDebuff and debuffType then
-			if addon.FilterDispellableDebuff then
-				priority = DispellFilter[debuffType] and DispellPriority[debuffType]
-			else
-				priority = DispellPriority[debuffType]
-			end
-			
-			if priority and (priority > _priority) then
-				_priority, _name, _icon, _count, _dtype, _duration, _endTime = priority, name, icon, count, debuffType, duration, expirationTime
-			end
-		end
-		
-		priority = debuff_data[addon.MatchBySpellName and name or spellId]
-		if priority and (priority > _priority) then
-			_priority, _name, _icon, _count, _dtype, _duration, _endTime = priority, name, icon, count, debuffType, duration, expirationTime
-		end
-	end
-	
-	UpdateDebuff(self, _name, _icon, _count, _dtype, _duration, _endTime)
-	
-	--Reset the DispellPriority
-	DispellPriority = {
-		['Magic']	= 4,
-		['Curse']	= 3,
-		['Disease']	= 2,
-		['Poison']	= 1,
-	}	
-end
-
-local function Enable(self)
-	if self.RaidDebuffs then
-		self:RegisterEvent('UNIT_AURA', Update)
-		return true
-	end
-	self:RegisterEvent("PLAYER_TALENT_UPDATE", CheckSpec)
-	self:RegisterEvent("CHARACTER_POINTS_CHANGED", CheckSpec)
-end
-
-local function Disable(self)
-	if self.RaidDebuffs then
-		self:UnregisterEvent('UNIT_AURA', Update)
-		self.RaidDebuffs:Hide()
-	end
-	self:UnregisterEvent("PLAYER_TALENT_UPDATE", CheckSpec)
-	self:UnregisterEvent("CHARACTER_POINTS_CHANGED", CheckSpec)
-end
-
+-- yleaf (yaroot@gmail.com)
+
+local _, ns = ...
+local oUF = ns.oUF or oUF
+
+local addon = {}
+ns.oUF_RaidDebuffs = addon
+if not _G.oUF_RaidDebuffs then
+	_G.oUF_RaidDebuffs = addon
+end
+
+local debuff_data = {}
+addon.DebuffData = debuff_data
+
+addon.ShowDispelableDebuff = true
+addon.FilterDispellableDebuff = true
+addon.MatchBySpellName = true
+addon.SHAMAN_CAN_DECURSE = true
+
+addon.priority = 10
+
+local function add(spell)
+	if addon.MatchBySpellName and type(spell) == 'number' then
+		spell = GetSpellInfo(spell)
+	end
+	debuff_data[spell] = addon.priority
+	addon.priority = addon.priority + 1
+end
+
+function addon:RegisterDebuffs(t)
+	for _, v in next, t do
+		add(v)
+	end
+end
+
+function addon:ResetDebuffData()
+	wipe(debuff_data)
+	addon.priority = 10
+end
+
+local DispellColor = {
+	['Magic']	= {.2, .6, 1},
+	['Curse']	= {.6, 0, 1},
+	['Disease']	= {.6, .4, 0},
+	['Poison']	= {0, .6, 0},
+	['none'] = {1, 0, 0},
+}
+
+local DispellPriority = {
+	['Magic']	= 4,
+	['Curse']	= 3,
+	['Disease']	= 2,
+	['Poison']	= 1,
+}
+
+local DispellFilter
+do
+	local dispellClasses = {
+		['PRIEST'] = {
+			['Magic'] = true,
+			['Disease'] = true,
+		},
+		['SHAMAN'] = {
+			['Magic'] = true,
+			['Curse'] = true,
+		},
+		['PALADIN'] = {
+			['Poison'] = true,
+			['Magic'] = true,
+			['Disease'] = true,
+		},
+		['DRUID'] = {
+			['Curse'] = true,
+			['Poison'] = true,
+			['Magic'] = true,
+		},
+		['MONK'] = {
+			['Curse'] = true,
+			['Poison'] = true,
+			['Magic'] = true,
+		},
+	}
+	
+	DispellFilter = dispellClasses[select(2, UnitClass('player'))] or {}
+end
+
+-- Return true if the talent matching the name of the spell given by (Credit Pitbull4)
+-- spellid has at least one point spent in it or false otherwise
+local function CheckForKnownTalent(spellid)
+	return false
+end
+
+local function CheckSpec(self, event, levels)
+	-- Not interested in gained points from leveling	
+	if event == "CHARACTER_POINTS_CHANGED" and levels > 0 then return end
+	
+end
+
+local function UpdateDebuff(self, name, icon, count, debuffType, duration, endTime)
+	local f = self.RaidDebuffs
+	if name then
+		f.icon:SetTexture(icon)
+		f.icon:Show()
+		
+		if f.count then
+			if count and (count > 0) then
+				f.count:SetText(count)
+				f.count:Show()
+			else
+				f.count:Hide()
+			end
+		end
+		
+		if f.cd then
+			if duration and (duration > 0) then
+				f.cd:SetCooldown(endTime - duration, duration)
+				f.cd:Show()
+			else
+				f.cd:Hide()
+			end
+		end
+		
+		local c = DispellColor[debuffType] or DispellColor.none
+		f:SetBackdropColor(c[1], c[2], c[3])
+		
+		f:Show()
+	else
+		f:Hide()
+	end
+end
+
+local function Update(self, event, unit)
+	if unit ~= self.unit then return end
+	local _name, _icon, _count, _dtype, _duration, _endTime
+	local _priority, priority = 0
+	for i = 1, 40 do
+		local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, shouldConsolidate, spellId = UnitAura(unit, i, 'HARMFUL')
+		if (not name) then break end
+		
+		if addon.ShowDispelableDebuff and debuffType then
+			if addon.FilterDispellableDebuff then
+				priority = DispellFilter[debuffType] and DispellPriority[debuffType]
+			else
+				priority = DispellPriority[debuffType]
+			end
+			
+			if priority and (priority > _priority) then
+				_priority, _name, _icon, _count, _dtype, _duration, _endTime = priority, name, icon, count, debuffType, duration, expirationTime
+			end
+		end
+		
+		priority = debuff_data[addon.MatchBySpellName and name or spellId]
+		if priority and (priority > _priority) then
+			_priority, _name, _icon, _count, _dtype, _duration, _endTime = priority, name, icon, count, debuffType, duration, expirationTime
+		end
+	end
+	
+	UpdateDebuff(self, _name, _icon, _count, _dtype, _duration, _endTime)
+	
+	--Reset the DispellPriority
+	DispellPriority = {
+		['Magic']	= 4,
+		['Curse']	= 3,
+		['Disease']	= 2,
+		['Poison']	= 1,
+	}	
+end
+
+local function Enable(self)
+	if self.RaidDebuffs then
+		self:RegisterEvent('UNIT_AURA', Update)
+		return true
+	end
+	self:RegisterEvent("PLAYER_TALENT_UPDATE", CheckSpec)
+	self:RegisterEvent("CHARACTER_POINTS_CHANGED", CheckSpec)
+end
+
+local function Disable(self)
+	if self.RaidDebuffs then
+		self:UnregisterEvent('UNIT_AURA', Update)
+		self.RaidDebuffs:Hide()
+	end
+	self:UnregisterEvent("PLAYER_TALENT_UPDATE", CheckSpec)
+	self:UnregisterEvent("CHARACTER_POINTS_CHANGED", CheckSpec)
+end
+
 oUF:AddElement('RaidDebuffs', Update, Enable, Disable)
\ No newline at end of file
diff --git a/libs/oUF_Plugins/oUF_Smooth.lua b/libs/sUF_Plugins/oUF_Smooth.lua
similarity index 95%
rename from libs/oUF_Plugins/oUF_Smooth.lua
rename to libs/sUF_Plugins/oUF_Smooth.lua
index be1284b9..e34b3b3e 100644
--- a/libs/oUF_Plugins/oUF_Smooth.lua
+++ b/libs/sUF_Plugins/oUF_Smooth.lua
@@ -1,53 +1,53 @@
-local _, ns = ...
-local oUF = (ns.oUF or oUF) or (ns.SUF or SUF)
-assert(oUF, "<name> was unable to locate oUF install.")
-
-local smoothing = {}
-local function Smooth(self, value)
-	local _, max = self:GetMinMaxValues()
-	if value == self:GetValue() or (self._max and self._max ~= max) then
-		smoothing[self] = nil
-		self:SetValue_(value)
-	else
-		smoothing[self] = value
-	end
-	self._max = max
-end
-
-local function SmoothBar(self, bar)
-	bar.SetValue_ = bar.SetValue
-	bar.SetValue = Smooth
-end
-
-local function hook(frame)
-	frame.SmoothBar = SmoothBar
-	if frame.Health and frame.Health.Smooth then
-		frame:SmoothBar(frame.Health)
-	end
-	if frame.Power and frame.Power.Smooth then
-		frame:SmoothBar(frame.Power)
-	end
-end
-
-
-for i, frame in ipairs(oUF.objects) do hook(frame) end
-oUF:RegisterInitCallback(hook)
-
-
-local f, min, max = CreateFrame('Frame'), math.min, math.max 
-f:SetScript('OnUpdate', function()
-	local limit = 30/GetFramerate()
-	for bar, value in pairs(smoothing) do
-		local cur = bar:GetValue()
-		local new = cur + min((value-cur)/3, max(value-cur, limit))
-		if new ~= new then
-			-- Mad hax to prevent QNAN.
-			new = value
-		end
-		bar:SetValue_(new)
-		if cur == value or abs(new - value) < 2 then
-			bar:SetValue_(value)
-			smoothing[bar] = nil
-		end
-	end
-end)
+local _, ns = ...
+local oUF = (ns.oUF or oUF) or (ns.SUF or SUF)
+assert(oUF, "<name> was unable to locate oUF install.")
+
+local smoothing = {}
+local function Smooth(self, value)
+	local _, max = self:GetMinMaxValues()
+	if value == self:GetValue() or (self._max and self._max ~= max) then
+		smoothing[self] = nil
+		self:SetValue_(value)
+	else
+		smoothing[self] = value
+	end
+	self._max = max
+end
+
+local function SmoothBar(self, bar)
+	bar.SetValue_ = bar.SetValue
+	bar.SetValue = Smooth
+end
+
+local function hook(frame)
+	frame.SmoothBar = SmoothBar
+	if frame.Health and frame.Health.Smooth then
+		frame:SmoothBar(frame.Health)
+	end
+	if frame.Power and frame.Power.Smooth then
+		frame:SmoothBar(frame.Power)
+	end
+end
+
+
+for i, frame in ipairs(oUF.objects) do hook(frame) end
+oUF:RegisterInitCallback(hook)
+
+
+local f, min, max = CreateFrame('Frame'), math.min, math.max 
+f:SetScript('OnUpdate', function()
+	local limit = 30/GetFramerate()
+	for bar, value in pairs(smoothing) do
+		local cur = bar:GetValue()
+		local new = cur + min((value-cur)/3, max(value-cur, limit))
+		if new ~= new then
+			-- Mad hax to prevent QNAN.
+			new = value
+		end
+		bar:SetValue_(new)
+		if cur == value or abs(new - value) < 2 then
+			bar:SetValue_(value)
+			smoothing[bar] = nil
+		end
+	end
+end)
diff --git a/libs/oUF_Plugins/oUF_Trinkets.lua b/libs/sUF_Plugins/oUF_Trinkets.lua
similarity index 96%
rename from libs/oUF_Plugins/oUF_Trinkets.lua
rename to libs/sUF_Plugins/oUF_Trinkets.lua
index 2adf33f1..6c2c0373 100644
--- a/libs/oUF_Plugins/oUF_Trinkets.lua
+++ b/libs/sUF_Plugins/oUF_Trinkets.lua
@@ -1,112 +1,112 @@
-local _, ns = ...
-local oUF = ns.oUF
-assert(oUF, 'oUF not loaded')
-
-local arenaFrame = {}
-local arenaGUID  = {}
-local usedTrinkets = {}
-local trinketFrame = {}
- 
-local TrinketUpdate = function(self, elapsed)
-	if self.endTime < GetTime() then
-		usedTrinkets[self.guid] = false
-		local unit = arenaGUID[self.guid]
-		if unit and arenaFrame[unit] then
-			if arenaFrame[unit].Trinket.trinketUpAnnounce then
-				SendChatMessage("Trinket ready: "..UnitName(unit).." "..UnitClass(unit), "PARTY")
-			end
-		end
-		self:SetScript("OnUpdate", nil)
-	end
-end
-
-local GetTrinketIcon = function(unit)
-	if UnitFactionGroup(unit) == "Horde" then
-		return UnitLevel(unit) == 80 and "Interface\\Icons\\INV_Jewelry_Necklace_38" or "Interface\\Icons\\INV_Jewelry_TrinketPVP_02"
-	else
-		return UnitLevel(unit) == 80 and "Interface\\Icons\\INV_Jewelry_Necklace_37" or "Interface\\Icons\\INV_Jewelry_TrinketPVP_01"
-	end
-end
-
-local TrinketUsed = function(guid, time)
-	local message
-	local unit = arenaGUID[guid]
-	if unit and arenaFrame[unit] then
-		CooldownFrame_SetTimer(arenaFrame[unit].Trinket.cooldownFrame, GetTime(), time, 1)
-		if arenaFrame[unit].Trinket.trinketUseAnnounce then
-			message = time == 120 and "Trinket used: " or "WotF used: "
-			SendChatMessage(message..UnitName(unit).." "..UnitClass(unit), "PARTY")
-		end
-	end
-	usedTrinkets[guid] = true
-	if not trinketFrame[guid] then 
-		trinketFrame[guid] = CreateFrame("Frame")
-	end
-	trinketFrame[guid].endTime = GetTime() + time
-	trinketFrame[guid].guid = guid
-	trinketFrame[guid]:SetScript("OnUpdate", TrinketUpdate)
-end
-
-local Update = function(self, event, ...)
-	if event == "COMBAT_LOG_EVENT_UNFILTERED" then
-		local timestamp, eventType, _, sourceGUID, sourceName, sourceFlags, destGUID, destName, destFlags, spellID, spellName = ...
-		if eventType == "SPELL_CAST_SUCCESS" then
-			-- enemy trinket usage
-			if spellID == 59752 or spellID == 42292 then
-				TrinketUsed(sourceGUID, 120)
-			end
-			-- WotF
-			if spellID == 7744 then
-				TrinketUsed(sourceGUID, 45)
-			end
-		end
-	elseif event == "ARENA_OPPONENT_UPDATE" then
-		local unit, type = ...
-		if type == "seen" then
-			if UnitExists(unit) and UnitIsPlayer(unit) and arenaFrame[unit] then
-				arenaGUID[UnitGUID(unit)] = unit
-				arenaFrame[unit].Trinket.Icon:SetTexture(GetTrinketIcon(unit))
-			end
-		end
-	elseif event == "PLAYER_ENTERING_WORLD" then
-		for k, v in pairs(trinketFrame) do
-			v:SetScript("OnUpdate", nil)
-		end
-		for k, v in pairs(arenaFrame) do
-			CooldownFrame_SetTimer(v.Trinket.cooldownFrame, 1, 1, 1)
-		end
-		arenaGUID  = {}
-		usedTrinkets = {}
-		trinketFrame = {}
-	end
-end
-
-local frame = CreateFrame("Frame")
-frame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
-frame:RegisterEvent("ARENA_OPPONENT_UPDATE")
-frame:RegisterEvent("PLAYER_ENTERING_WORLD")
-frame:SetScript("OnEvent", Update)
-
-oUF.Tags['[trinket]'] = function(unit)
-	if usedTrinkets[UnitGUID(unit)] or not UnitIsPlayer(unit) then return end
-	return string.format("|T%s:20:20:0:0|t", GetTrinketIcon(unit))
-end
-
-local Enable = function(self)
-	if self.Trinket then
-		self.Trinket.cooldownFrame = CreateFrame("Cooldown", nil, self.Trinket)
-		self.Trinket.cooldownFrame:SetAllPoints(self.Trinket)
-		self.Trinket.Icon = self.Trinket:CreateTexture(nil, "BORDER")
-		self.Trinket.Icon:SetAllPoints(self.Trinket)
-		self.Trinket.Icon:SetTexCoord(0.07, 0.93, 0.07, 0.93)
-		arenaFrame[self.unit] = self
-	end
-end
- 
-local Disable = function(self)
-	if self.Trinket then
-		arenaFrame[self.unit] = nil
-	end
-end
- 
-oUF:AddElement('Trinket', function() return end, Enable, Disable)
+local _, ns = ...
+local oUF = ns.oUF
+assert(oUF, 'oUF not loaded')
+
+local arenaFrame = {}
+local arenaGUID  = {}
+local usedTrinkets = {}
+local trinketFrame = {}
+ 
+local TrinketUpdate = function(self, elapsed)
+	if self.endTime < GetTime() then
+		usedTrinkets[self.guid] = false
+		local unit = arenaGUID[self.guid]
+		if unit and arenaFrame[unit] then
+			if arenaFrame[unit].Trinket.trinketUpAnnounce then
+				SendChatMessage("Trinket ready: "..UnitName(unit).." "..UnitClass(unit), "PARTY")
+			end
+		end
+		self:SetScript("OnUpdate", nil)
+	end
+end
+
+local GetTrinketIcon = function(unit)
+	if UnitFactionGroup(unit) == "Horde" then
+		return UnitLevel(unit) == 80 and "Interface\\Icons\\INV_Jewelry_Necklace_38" or "Interface\\Icons\\INV_Jewelry_TrinketPVP_02"
+	else
+		return UnitLevel(unit) == 80 and "Interface\\Icons\\INV_Jewelry_Necklace_37" or "Interface\\Icons\\INV_Jewelry_TrinketPVP_01"
+	end
+end
+
+local TrinketUsed = function(guid, time)
+	local message
+	local unit = arenaGUID[guid]
+	if unit and arenaFrame[unit] then
+		CooldownFrame_SetTimer(arenaFrame[unit].Trinket.cooldownFrame, GetTime(), time, 1)
+		if arenaFrame[unit].Trinket.trinketUseAnnounce then
+			message = time == 120 and "Trinket used: " or "WotF used: "
+			SendChatMessage(message..UnitName(unit).." "..UnitClass(unit), "PARTY")
+		end
+	end
+	usedTrinkets[guid] = true
+	if not trinketFrame[guid] then 
+		trinketFrame[guid] = CreateFrame("Frame")
+	end
+	trinketFrame[guid].endTime = GetTime() + time
+	trinketFrame[guid].guid = guid
+	trinketFrame[guid]:SetScript("OnUpdate", TrinketUpdate)
+end
+
+local Update = function(self, event, ...)
+	if event == "COMBAT_LOG_EVENT_UNFILTERED" then
+		local timestamp, eventType, _, sourceGUID, sourceName, sourceFlags, destGUID, destName, destFlags, spellID, spellName = ...
+		if eventType == "SPELL_CAST_SUCCESS" then
+			-- enemy trinket usage
+			if spellID == 59752 or spellID == 42292 then
+				TrinketUsed(sourceGUID, 120)
+			end
+			-- WotF
+			if spellID == 7744 then
+				TrinketUsed(sourceGUID, 45)
+			end
+		end
+	elseif event == "ARENA_OPPONENT_UPDATE" then
+		local unit, type = ...
+		if type == "seen" then
+			if UnitExists(unit) and UnitIsPlayer(unit) and arenaFrame[unit] then
+				arenaGUID[UnitGUID(unit)] = unit
+				arenaFrame[unit].Trinket.Icon:SetTexture(GetTrinketIcon(unit))
+			end
+		end
+	elseif event == "PLAYER_ENTERING_WORLD" then
+		for k, v in pairs(trinketFrame) do
+			v:SetScript("OnUpdate", nil)
+		end
+		for k, v in pairs(arenaFrame) do
+			CooldownFrame_SetTimer(v.Trinket.cooldownFrame, 1, 1, 1)
+		end
+		arenaGUID  = {}
+		usedTrinkets = {}
+		trinketFrame = {}
+	end
+end
+
+local frame = CreateFrame("Frame")
+frame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
+frame:RegisterEvent("ARENA_OPPONENT_UPDATE")
+frame:RegisterEvent("PLAYER_ENTERING_WORLD")
+frame:SetScript("OnEvent", Update)
+
+oUF.Tags['[trinket]'] = function(unit)
+	if usedTrinkets[UnitGUID(unit)] or not UnitIsPlayer(unit) then return end
+	return string.format("|T%s:20:20:0:0|t", GetTrinketIcon(unit))
+end
+
+local Enable = function(self)
+	if self.Trinket then
+		self.Trinket.cooldownFrame = CreateFrame("Cooldown", nil, self.Trinket)
+		self.Trinket.cooldownFrame:SetAllPoints(self.Trinket)
+		self.Trinket.Icon = self.Trinket:CreateTexture(nil, "BORDER")
+		self.Trinket.Icon:SetAllPoints(self.Trinket)
+		self.Trinket.Icon:SetTexCoord(0.07, 0.93, 0.07, 0.93)
+		arenaFrame[self.unit] = self
+	end
+end
+ 
+local Disable = function(self)
+	if self.Trinket then
+		arenaFrame[self.unit] = nil
+	end
+end
+ 
+oUF:AddElement('Trinket', function() return end, Enable, Disable)