Stupid Cleanup

diff --git a/ElvUI_SLE/core/elvprot.lua b/ElvUI_SLE/core/elvprot.lua
index 2c42918..5f439fe 100644
--- a/ElvUI_SLE/core/elvprot.lua
+++ b/ElvUI_SLE/core/elvprot.lua
@@ -56,6 +56,4 @@ function E:BeginFoolsDayEvent()
 	tinsert(self.massiveShakeObjects, ActionBG)
 	tinsert(self.massiveShakeObjects, RaidUtility_ShowButton)
 	tinsert(self.massiveShakeObjects, RaidUtilityPanel)
-end
-
-
+end
\ No newline at end of file
diff --git a/ElvUI_SLE/core/modules.lua b/ElvUI_SLE/core/modules.lua
index 87c20f5..cbbded5 100644
--- a/ElvUI_SLE/core/modules.lua
+++ b/ElvUI_SLE/core/modules.lua
@@ -38,5 +38,4 @@ local function Register()
 	end
 end

-Register()
-
+Register()
\ No newline at end of file
diff --git a/ElvUI_SLE/media/sharedmedia.lua b/ElvUI_SLE/media/sharedmedia.lua
index 58a766a..d845923 100644
--- a/ElvUI_SLE/media/sharedmedia.lua
+++ b/ElvUI_SLE/media/sharedmedia.lua
@@ -17,4 +17,4 @@ LSM:Register("font", "Trafaret", [[Interface\AddOns\ElvUI_SLE\media\fonts\Trafar
 LSM:Register("font", "Intro Black", [[Interface\AddOns\ElvUI_SLE\media\fonts\Intro_Black.ttf]], LSM.LOCALE_BIT_ruRU + LSM.LOCALE_BIT_western)
 LSM:Register("font", "Univers", [[Interface\AddOns\ElvUI_SLE\media\fonts\Univers.ttf]], LSM.LOCALE_BIT_ruRU + LSM.LOCALE_BIT_western)
 LSM:Register("font", "Rubino", [[Interface\AddOns\ElvUI_SLE\media\fonts\Rubino_Plain.ttf]], LSM.LOCALE_BIT_ruRU + LSM.LOCALE_BIT_western)
-LSM:Register("sound", "It's The Gri...", [[Interface\AddOns\ElvUI_SLE\media\sounds\TheGrCorpus.ogg]])
+LSM:Register("sound", "It's The Gri...", [[Interface\AddOns\ElvUI_SLE\media\sounds\TheGrCorpus.ogg]])
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/chat.lua b/ElvUI_SLE/modules/chat.lua
index 1114c46..dfcfe34 100644
--- a/ElvUI_SLE/modules/chat.lua
+++ b/ElvUI_SLE/modules/chat.lua
@@ -1141,5 +1141,4 @@ function LO:CreateChatPanels()
 	--Right Chat Tab
 	RightChatTab:Point('TOPRIGHT', RightChatPanel, 'TOPRIGHT', -2, -2)
 	RightChatTab:Point('BOTTOMLEFT', RightChatPanel, 'TOPLEFT', 2, -PANEL_HEIGHT)
-end
-
+end
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/dashboard/datapanels/bags.lua b/ElvUI_SLE/modules/dashboard/datapanels/bags.lua
index 9bb03ac..cc09486 100644
--- a/ElvUI_SLE/modules/dashboard/datapanels/bags.lua
+++ b/ElvUI_SLE/modules/dashboard/datapanels/bags.lua
@@ -21,4 +21,4 @@ board[2].Status:SetScript("OnUpdate", function(self)
 	end
 end)

-board[2].Status:RegisterEvent("BAG_UPDATE")
+board[2].Status:RegisterEvent("BAG_UPDATE")
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/dashboard/datapanels/fps.lua b/ElvUI_SLE/modules/dashboard/datapanels/fps.lua
index 447f690..9d1db9f 100644
--- a/ElvUI_SLE/modules/dashboard/datapanels/fps.lua
+++ b/ElvUI_SLE/modules/dashboard/datapanels/fps.lua
@@ -19,4 +19,4 @@ board[3].Status:SetScript("OnUpdate", function( self, elapsed)
 		end
 		LastUpdate = 1
 	end
-end)
+end)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/dashboard/datapanels/ms.lua b/ElvUI_SLE/modules/dashboard/datapanels/ms.lua
index 2d8b32a..3bece2f 100644
--- a/ElvUI_SLE/modules/dashboard/datapanels/ms.lua
+++ b/ElvUI_SLE/modules/dashboard/datapanels/ms.lua
@@ -20,4 +20,4 @@ board[4].Status:SetScript("OnUpdate", function(self, elapsed)
 		end
 		LastUpdate = 1
 	end
-end)
+end)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/raidutility.lua b/ElvUI_SLE/modules/raidutility.lua
index 8546a1a..4502a51 100644
--- a/ElvUI_SLE/modules/raidutility.lua
+++ b/ElvUI_SLE/modules/raidutility.lua
@@ -35,4 +35,4 @@ function M:Initialize()
 	end
 end

-RaidUtility_ShowButton:RegisterForDrag("") --Unregister any buttons for dragging.
+RaidUtility_ShowButton:RegisterForDrag("") --Unregister any buttons for dragging.
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/sledatatexts/agility.lua b/ElvUI_SLE/modules/sledatatexts/agility.lua
index 96d73db..95c12a2 100644
--- a/ElvUI_SLE/modules/sledatatexts/agility.lua
+++ b/ElvUI_SLE/modules/sledatatexts/agility.lua
@@ -18,4 +18,4 @@ local function ValueColorUpdate(hex, r, g, b)
 end
 E['valueColorUpdateFuncs'][ValueColorUpdate] = true

-DT:RegisterDatatext('Agility', { "UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
+DT:RegisterDatatext('Agility', { "UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/sledatatexts/energyregen.lua b/ElvUI_SLE/modules/sledatatexts/energyregen.lua
index 5e56dd9..65d0ca9 100644
--- a/ElvUI_SLE/modules/sledatatexts/energyregen.lua
+++ b/ElvUI_SLE/modules/sledatatexts/energyregen.lua
@@ -18,4 +18,4 @@ local function ValueColorUpdate(hex, r, g, b)
 end
 E['valueColorUpdateFuncs'][ValueColorUpdate] = true

-DT:RegisterDatatext('Energy Regen', { "UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
+DT:RegisterDatatext('Energy Regen', { "UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/sledatatexts/intellect.lua b/ElvUI_SLE/modules/sledatatexts/intellect.lua
index 8665bfb..32a26ce 100644
--- a/ElvUI_SLE/modules/sledatatexts/intellect.lua
+++ b/ElvUI_SLE/modules/sledatatexts/intellect.lua
@@ -18,4 +18,4 @@ local function ValueColorUpdate(hex, r, g, b)
 end
 E['valueColorUpdateFuncs'][ValueColorUpdate] = true

-DT:RegisterDatatext('Intellect', { "UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
+DT:RegisterDatatext('Intellect', { "UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/sledatatexts/itemlevel.lua b/ElvUI_SLE/modules/sledatatexts/itemlevel.lua
index 3d74ff6..7fb704a 100644
--- a/ElvUI_SLE/modules/sledatatexts/itemlevel.lua
+++ b/ElvUI_SLE/modules/sledatatexts/itemlevel.lua
@@ -260,4 +260,4 @@ local function ValueColorUpdate(hex, r, g, b)
 end
 E["valueColorUpdateFuncs"][ValueColorUpdate] = true

-DT:RegisterDatatext("S&L Item Level", {"PLAYER_ENTERING_WORLD", "PLAYER_EQUIPMENT_CHANGED", "UNIT_INVENTORY_CHANGED"}, OnEvent, nil, nil, OnEnter)
+DT:RegisterDatatext("S&L Item Level", {"PLAYER_ENTERING_WORLD", "PLAYER_EQUIPMENT_CHANGED", "UNIT_INVENTORY_CHANGED"}, OnEvent, nil, nil, OnEnter)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/sledatatexts/lfr.lua b/ElvUI_SLE/modules/sledatatexts/lfr.lua
index 1d8e820..bfd9729 100644
--- a/ElvUI_SLE/modules/sledatatexts/lfr.lua
+++ b/ElvUI_SLE/modules/sledatatexts/lfr.lua
@@ -404,4 +404,4 @@ function DT:LFRShow()
 	if not E.db.sle.lfrshow.ds and not E.db.sle.lfrshow.mv and not E.db.sle.lfrshow.hof and not E.db.sle.lfrshow.toes and not E.db.sle.lfrshow.tot and not E.db.sle.lfrshow.soo and not E.db.sle.lfrshow.soof then
 		DT.tooltip:AddLine(" "..L["You didn't select any instance to track."])
 	end
-end
+end
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/sledatatexts/mail.lua b/ElvUI_SLE/modules/sledatatexts/mail.lua
index 979a864..54562b2 100644
--- a/ElvUI_SLE/modules/sledatatexts/mail.lua
+++ b/ElvUI_SLE/modules/sledatatexts/mail.lua
@@ -82,5 +82,4 @@ local function OnEnter(self)
 	DT.tooltip:Show()
 end

-DT:RegisterDatatext('S&L Mail', {'PLAYER_ENTERING_WORLD', 'MAIL_INBOX_UPDATE', 'UPDATE_PENDING_MAIL', 'MAIL_CLOSED', 'PLAYER_LOGIN','MAIL_SHOW'}, OnEvent, nil, nil, OnEnter)
-
+DT:RegisterDatatext('S&L Mail', {'PLAYER_ENTERING_WORLD', 'MAIL_INBOX_UPDATE', 'UPDATE_PENDING_MAIL', 'MAIL_CLOSED', 'PLAYER_LOGIN','MAIL_SHOW'}, OnEvent, nil, nil, OnEnter)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/sledatatexts/range.lua b/ElvUI_SLE/modules/sledatatexts/range.lua
index d86d97b..bae1d5b 100644
--- a/ElvUI_SLE/modules/sledatatexts/range.lua
+++ b/ElvUI_SLE/modules/sledatatexts/range.lua
@@ -50,4 +50,4 @@ local function ValueColorUpdate(hex, r, g, b)
 end
 E.valueColorUpdateFuncs[ValueColorUpdate] = true

-DT:RegisterDatatext('S&L Target Range', {"PLAYER_TARGET_CHANGED"}, OnEvent, OnUpdate)
+DT:RegisterDatatext('S&L Target Range', {"PLAYER_TARGET_CHANGED"}, OnEvent, OnUpdate)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/sledatatexts/regen.lua b/ElvUI_SLE/modules/sledatatexts/regen.lua
index 628a929..3ce2bd1 100644
--- a/ElvUI_SLE/modules/sledatatexts/regen.lua
+++ b/ElvUI_SLE/modules/sledatatexts/regen.lua
@@ -25,4 +25,4 @@ local function ValueColorUpdate(hex, r, g, b)
 end
 E['valueColorUpdateFuncs'][ValueColorUpdate] = true

-DT:RegisterDatatext('MP5', {"UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
+DT:RegisterDatatext('MP5', {"UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/sledatatexts/spirit.lua b/ElvUI_SLE/modules/sledatatexts/spirit.lua
index 08f8a97..3a4eaf8 100644
--- a/ElvUI_SLE/modules/sledatatexts/spirit.lua
+++ b/ElvUI_SLE/modules/sledatatexts/spirit.lua
@@ -18,4 +18,4 @@ local function ValueColorUpdate(hex, r, g, b)
 end
 E['valueColorUpdateFuncs'][ValueColorUpdate] = true

-DT:RegisterDatatext('Spirit', { "UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
+DT:RegisterDatatext('Spirit', { "UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/sledatatexts/stamina.lua b/ElvUI_SLE/modules/sledatatexts/stamina.lua
index 724c03d..c295cc0 100644
--- a/ElvUI_SLE/modules/sledatatexts/stamina.lua
+++ b/ElvUI_SLE/modules/sledatatexts/stamina.lua
@@ -18,4 +18,4 @@ local function ValueColorUpdate(hex, r, g, b)
 end
 E['valueColorUpdateFuncs'][ValueColorUpdate] = true

-DT:RegisterDatatext('Stamina', { "UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
+DT:RegisterDatatext('Stamina', { "UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/sledatatexts/strength.lua b/ElvUI_SLE/modules/sledatatexts/strength.lua
index 31042a2..d05c3e8 100644
--- a/ElvUI_SLE/modules/sledatatexts/strength.lua
+++ b/ElvUI_SLE/modules/sledatatexts/strength.lua
@@ -18,4 +18,4 @@ local function ValueColorUpdate(hex, r, g, b)
 end
 E['valueColorUpdateFuncs'][ValueColorUpdate] = true

-DT:RegisterDatatext('Strength', { "UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
+DT:RegisterDatatext('Strength', { "UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/sledatatexts/version.lua b/ElvUI_SLE/modules/sledatatexts/version.lua
index 77add52..3c50a78 100644
--- a/ElvUI_SLE/modules/sledatatexts/version.lua
+++ b/ElvUI_SLE/modules/sledatatexts/version.lua
@@ -42,5 +42,4 @@ local function ValueColorUpdate(hex, r, g, b)
 end
 E['valueColorUpdateFuncs'][ValueColorUpdate] = true

-DT:RegisterDatatext("Version", {'PLAYER_ENTERING_WORLD'}, OnEvent, Update, Click, OnEnter)
-
+DT:RegisterDatatext("Version", {'PLAYER_ENTERING_WORLD'}, OnEvent, Update, Click, OnEnter)
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/unitframes.lua b/ElvUI_SLE/modules/unitframes.lua
index 7e63e91..ce77107 100644
--- a/ElvUI_SLE/modules/unitframes.lua
+++ b/ElvUI_SLE/modules/unitframes.lua
@@ -278,5 +278,4 @@ if E.myclass == "WARLOCK" then

 	ShardBar.powtext = dfbar:CreateFontString(nil, 'OVERLAY')
 	ShardBar.powtext:SetFont("Fonts\\FRIZQT__.TTF", 10, "OUTLINE")
-end
-
+end
\ No newline at end of file
diff --git a/ElvUI_SLE/options/autorelease_c.lua b/ElvUI_SLE/options/autorelease_c.lua
index e76085f..d6c8692 100644
--- a/ElvUI_SLE/options/autorelease_c.lua
+++ b/ElvUI_SLE/options/autorelease_c.lua
@@ -1,30 +1,30 @@
 local E, L, V, P, G, _ = unpack(ElvUI);
-local function configTable()

-E.Options.args.sle.args.options.args.general.args.pvpautorelease = {
-	type = "group",
-    name = L["PvP Auto Release"],
-    order = 5,
-	args = {
-		header = {
-			order = 1,
-			type = "header",
-			name = L["PvP Auto Release"],
-		},
-		intro = {
-			order = 2,
-			type = "description",
-			name = L["Automatically release body when killed inside a battleground."],
-		},
-		enable = {
-			order = 3,
-			type = "toggle",
-			name = L["Enable"],
-			get = function(info) return E.db.sle.pvpautorelease end,
-			set = function(info, value) E.db.sle.pvpautorelease = value; end
+local function configTable()
+	E.Options.args.sle.args.options.args.general.args.pvpautorelease = {
+		type = "group",
+	    name = L["PvP Auto Release"],
+	    order = 5,
+		args = {
+			header = {
+				order = 1,
+				type = "header",
+				name = L["PvP Auto Release"],
+			},
+			intro = {
+				order = 2,
+				type = "description",
+				name = L["Automatically release body when killed inside a battleground."],
+			},
+			enable = {
+				order = 3,
+				type = "toggle",
+				name = L["Enable"],
+				get = function(info) return E.db.sle.pvpautorelease end,
+				set = function(info, value) E.db.sle.pvpautorelease = value; end
+			},
 		},
-	},
-}
+	}
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/backgrounds_c.lua b/ElvUI_SLE/options/backgrounds_c.lua
index cdde539..0c861db 100644
--- a/ElvUI_SLE/options/backgrounds_c.lua
+++ b/ElvUI_SLE/options/backgrounds_c.lua
@@ -1,160 +1,161 @@
 local E, L, V, P, G, _ = unpack(ElvUI);
 local BG = E:GetModule('SLE_BackGrounds')
-local function configTable()
-local drop = {
-	--Group name = {short name, order}
-	["Bottom BG"] = {"bottom", 1},
-	["Left BG"] = {"left", 2},
-	["Right BG"] = {"right", 3},
-	["Actionbar BG"] = {"action", 4},
-}

---Options for additional background frames. Main group
-E.Options.args.sle.args.datatext.args.backgrounds = {
-	type = "group",
-	name = L["Backgrounds"],
-	order = 3,
-	args = {
-		header = {
-			order = 1,
-			type = "header",
-			name = L["Additional Background Panels"],
-		},
-		intro = {
-			order = 2,
-			type = "description",
-			name = L["BG_DESC"]
-		},
-		enabled = {
-			order = 3,
-			type = "toggle",
-			name = L["Enable"],
-			desc = L["Show/Hide this frame."],
-			get = function(info) return E.private.sle.backgrounds end,
-			set = function(info, value) E.private.sle.backgrounds = value; E:StaticPopup_Show("PRIVATE_RL") end
-		},
-		Reset = {
-			order = 4,
-			type = 'execute',
-			name = L['Restore Defaults'],
-			desc = L["Reset these options to defaults"],
-			disabled = function() return not E.private.sle.backgrounds end,
-			func = function() E:GetModule('SLE'):Reset(nil, nil, nil, true) end,
-		},
-		spacerreset = {
-			order = 5,
-			type = 'description',
-			name = "",
-		},
-		bottom_enabled = {
-			order = 6,
-			type = "toggle",
-			name = L["Bottom BG"],
-			desc = L["Show/Hide this frame."],
-			disabled = function() return not E.private.sle.backgrounds end,
-			get = function(info) return E.db.sle.backgrounds.bottom.enabled end,
-			set = function(info, value) E.db.sle.backgrounds.bottom.enabled = value; BG:FramesVisibility() end
-		},
-		left_enabled = {
-			order = 7,
-			type = "toggle",
-			name = L["Left BG"],
-			desc = L["Show/Hide this frame."],
-			disabled = function() return not E.private.sle.backgrounds end,
-			get = function(info) return E.db.sle.backgrounds.left.enabled end,
-			set = function(info, value) E.db.sle.backgrounds.left.enabled = value; BG:FramesVisibility() end
-		},
-		spacer = {
-			order = 8,
-			type = "description",
-			name = "",
-		},
-		right_enabled = {
-			order = 9,
-			type = "toggle",
-			name = L["Right BG"],
-			desc = L["Show/Hide this frame."],
-			disabled = function() return not E.private.sle.backgrounds end,
-			get = function(info) return E.db.sle.backgrounds.right.enabled end,
-			set = function(info, value) E.db.sle.backgrounds.right.enabled = value; BG:FramesVisibility() end
-		},
-		action_enabled = {
-			order = 10,
-			type = "toggle",
-			name = L["Actionbar BG"],
-			desc = L["Show/Hide this frame."],
-			disabled = function() return not E.private.sle.backgrounds end,
-			get = function(info) return E.db.sle.backgrounds.action.enabled end,
-			set = function(info, value) E.db.sle.backgrounds.action.enabled = value; BG:FramesVisibility() end
-		},
+local function configTable()
+	local drop = {
+		--Group name = {short name, order}
+		["Bottom BG"] = {"bottom", 1},
+		["Left BG"] = {"left", 2},
+		["Right BG"] = {"right", 3},
+		["Actionbar BG"] = {"action", 4},
 	}
-}

---Subgroups
-for k,v in pairs(drop) do
-	E.Options.args.sle.args.datatext.args.backgrounds.args[v[1]] = {
+	--Options for additional background frames. Main group
+	E.Options.args.sle.args.datatext.args.backgrounds = {
 		type = "group",
-		name = L[k],
-		order = v[2],
-		get = function(info) return E.db.sle.backgrounds[v[1]][ info[#info] ] end,
-		disabled = function() return not E.db.sle.backgrounds[v[1]].enabled or not E.private.sle.backgrounds end,
+		name = L["Backgrounds"],
+		order = 3,
 		args = {
-			width = { --setting width (obviously)
+			header = {
 				order = 1,
-				type = "range",
-				name = L['Width'],
-				desc = L["Sets width of the frame"],
-				min = 50, max = E.screenwidth, step = 1,
-				set = function(info, value) E.db.sle.backgrounds[v[1]].width = value; BG:FramesSize() end,
+				type = "header",
+				name = L["Additional Background Panels"],
 			},
-			height = {
+			intro = {
 				order = 2,
-				type = "range",
-				name = L['Height'],
-				desc = L["Sets height of the frame"],
-				min = 30, max = E.screenheight/2, step = 1,
-				set = function(info, value) E.db.sle.backgrounds[v[1]].height = value; BG:FramesSize() end,
+				type = "description",
+				name = L["BG_DESC"]
 			},
-			spacer = { --Empty slot for making sliders move to next line
+			enabled = {
 				order = 3,
-				type = "description",
+				type = "toggle",
+				name = L["Enable"],
+				desc = L["Show/Hide this frame."],
+				get = function(info) return E.private.sle.backgrounds end,
+				set = function(info, value) E.private.sle.backgrounds = value; E:StaticPopup_Show("PRIVATE_RL") end
+			},
+			Reset = {
+				order = 4,
+				type = 'execute',
+				name = L['Restore Defaults'],
+				desc = L["Reset these options to defaults"],
+				disabled = function() return not E.private.sle.backgrounds end,
+				func = function() E:GetModule('SLE'):Reset(nil, nil, nil, true) end,
+			},
+			spacerreset = {
+				order = 5,
+				type = 'description',
 				name = "",
 			},
-			--Setting custom texture for those who like it
-			texture = {
+			bottom_enabled = {
 				order = 6,
-				type = 'input',
-				width = 'full',
-				name = L["Texture"],
-				desc = L["Set the texture to use in this frame.  Requirements are the same as the chat textures."],
-				set = function(info, value)
-					E.db.sle.backgrounds[v[1]].texture = value
-					E:UpdateMedia()
-					BG:UpdateTex()
-				end,
+				type = "toggle",
+				name = L["Bottom BG"],
+				desc = L["Show/Hide this frame."],
+				disabled = function() return not E.private.sle.backgrounds end,
+				get = function(info) return E.db.sle.backgrounds.bottom.enabled end,
+				set = function(info, value) E.db.sle.backgrounds.bottom.enabled = value; BG:FramesVisibility() end
 			},
-			template = {
+			left_enabled = {
 				order = 7,
-				type = "select",
-				name = L["Backdrop Template"],
-				desc = L["Change the template used for this backdrop."],
-				get = function(info) return E.db.sle.backgrounds[v[1]].template end,
-				set = function(info, value) E.db.sle.backgrounds[v[1]].template = value; BG:UpdateFrames() end,
-				values = {
-					['Default'] = L["Default"],
-					['Transparent'] = L["Transparent"],
-				},
+				type = "toggle",
+				name = L["Left BG"],
+				desc = L["Show/Hide this frame."],
+				disabled = function() return not E.private.sle.backgrounds end,
+				get = function(info) return E.db.sle.backgrounds.left.enabled end,
+				set = function(info, value) E.db.sle.backgrounds.left.enabled = value; BG:FramesVisibility() end
 			},
-			pethide = {
+			spacer = {
 				order = 8,
+				type = "description",
+				name = "",
+			},
+			right_enabled = {
+				order = 9,
+				type = "toggle",
+				name = L["Right BG"],
+				desc = L["Show/Hide this frame."],
+				disabled = function() return not E.private.sle.backgrounds end,
+				get = function(info) return E.db.sle.backgrounds.right.enabled end,
+				set = function(info, value) E.db.sle.backgrounds.right.enabled = value; BG:FramesVisibility() end
+			},
+			action_enabled = {
+				order = 10,
 				type = "toggle",
-				name = L["Hide in Pet Batlle"],
-				desc = L["Show/Hide this frame during Pet Battles."],
-				set = function(info, value) E.db.sle.backgrounds[v[1]].pethide = value; BG:RegisterHide() end
+				name = L["Actionbar BG"],
+				desc = L["Show/Hide this frame."],
+				disabled = function() return not E.private.sle.backgrounds end,
+				get = function(info) return E.db.sle.backgrounds.action.enabled end,
+				set = function(info, value) E.db.sle.backgrounds.action.enabled = value; BG:FramesVisibility() end
 			},
-		},
+		}
 	}
-end
+
+	--Subgroups
+	for k,v in pairs(drop) do
+		E.Options.args.sle.args.datatext.args.backgrounds.args[v[1]] = {
+			type = "group",
+			name = L[k],
+			order = v[2],
+			get = function(info) return E.db.sle.backgrounds[v[1]][ info[#info] ] end,
+			disabled = function() return not E.db.sle.backgrounds[v[1]].enabled or not E.private.sle.backgrounds end,
+			args = {
+				width = { --setting width (obviously)
+					order = 1,
+					type = "range",
+					name = L['Width'],
+					desc = L["Sets width of the frame"],
+					min = 50, max = E.screenwidth, step = 1,
+					set = function(info, value) E.db.sle.backgrounds[v[1]].width = value; BG:FramesSize() end,
+				},
+				height = {
+					order = 2,
+					type = "range",
+					name = L['Height'],
+					desc = L["Sets height of the frame"],
+					min = 30, max = E.screenheight/2, step = 1,
+					set = function(info, value) E.db.sle.backgrounds[v[1]].height = value; BG:FramesSize() end,
+				},
+				spacer = { --Empty slot for making sliders move to next line
+					order = 3,
+					type = "description",
+					name = "",
+				},
+				--Setting custom texture for those who like it
+				texture = {
+					order = 6,
+					type = 'input',
+					width = 'full',
+					name = L["Texture"],
+					desc = L["Set the texture to use in this frame.  Requirements are the same as the chat textures."],
+					set = function(info, value)
+						E.db.sle.backgrounds[v[1]].texture = value
+						E:UpdateMedia()
+						BG:UpdateTex()
+					end,
+				},
+				template = {
+					order = 7,
+					type = "select",
+					name = L["Backdrop Template"],
+					desc = L["Change the template used for this backdrop."],
+					get = function(info) return E.db.sle.backgrounds[v[1]].template end,
+					set = function(info, value) E.db.sle.backgrounds[v[1]].template = value; BG:UpdateFrames() end,
+					values = {
+						['Default'] = L["Default"],
+						['Transparent'] = L["Transparent"],
+					},
+				},
+				pethide = {
+					order = 8,
+					type = "toggle",
+					name = L["Hide in Pet Batlle"],
+					desc = L["Show/Hide this frame during Pet Battles."],
+					set = function(info, value) E.db.sle.backgrounds[v[1]].pethide = value; BG:RegisterHide() end
+				},
+			},
+		}
+	end
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/chat_c.lua b/ElvUI_SLE/options/chat_c.lua
index c2eaee6..1760aa7 100644
--- a/ElvUI_SLE/options/chat_c.lua
+++ b/ElvUI_SLE/options/chat_c.lua
@@ -1,53 +1,53 @@
 local E, L, V, P, G, _ = unpack(ElvUI);
 local CH = E:GetModule('Chat')
-local function configTable()

-E.Options.args.sle.args.options.args.general.args.chat = {
-	order = 7,
-	type = "group",
-	name = L["Chat"],
-	args = {
-		header = {
-			order = 1,
-			type = "header",
-			name = L["Chat"],
-		},
-		editboxhistory = {
-			order = 2,
-			type = "range",
-			name = L["Chat Editbox History"],
-			desc = L["Amount of messages to save. Set to 0 to disable."],
-			min = 0, max = 20, step = 1,
-			get = function(info) return E.db.chat.editboxhistory end,
-			set = function(info, value)	E.db.chat.editboxhistory = value; end,
-		},
-		guildmaster = {
-			order = 3,
-			type = "toggle",
-			name = "Guild Master Icon",
-			desc = [[Show an icon near your Guild Master's messages in chat.
-Will not affect messages in chat history and possibly some messages right after your loading screen disappears on login.]],
-			get = function(info) return E.private.sle.guildmaster end,
-			set = function(info, value)	E.private.sle.guildmaster = value; CH:GMIconUpdate() end,
-		},
-		historyreset = {
-			order = 4,
-			type = 'execute',
-			name = "Reset Chat History",
-			desc = "Will delete all messages from chat history added prior clicking the button.",
-			disabled = function() return not E.db.chat.chatHistory end,
-			func = function() E:StaticPopup_Show("SLE_CHAT_HISTORY") end,
-		},
-		editreset = {
-			order = 5,
-			type = 'execute',
-			name = "Reset Editbox History",
-			desc = "Will delete all messages from editbox history. Will immidiatly reload your UI.",
-			disabled = function() return not E.db.chat.chatHistory end,
-			func = function() E:StaticPopup_Show("SLE_EDIT_HISTORY") end,
+local function configTable()
+	E.Options.args.sle.args.options.args.general.args.chat = {
+		order = 7,
+		type = "group",
+		name = L["Chat"],
+		args = {
+			header = {
+				order = 1,
+				type = "header",
+				name = L["Chat"],
+			},
+			editboxhistory = {
+				order = 2,
+				type = "range",
+				name = L["Chat Editbox History"],
+				desc = L["Amount of messages to save. Set to 0 to disable."],
+				min = 0, max = 20, step = 1,
+				get = function(info) return E.db.chat.editboxhistory end,
+				set = function(info, value)	E.db.chat.editboxhistory = value; end,
+			},
+			guildmaster = {
+				order = 3,
+				type = "toggle",
+				name = "Guild Master Icon",
+				desc = [[Show an icon near your Guild Master's messages in chat.
+	Will not affect messages in chat history and possibly some messages right after your loading screen disappears on login.]],
+				get = function(info) return E.private.sle.guildmaster end,
+				set = function(info, value)	E.private.sle.guildmaster = value; CH:GMIconUpdate() end,
+			},
+			historyreset = {
+				order = 4,
+				type = 'execute',
+				name = "Reset Chat History",
+				desc = "Will delete all messages from chat history added prior clicking the button.",
+				disabled = function() return not E.db.chat.chatHistory end,
+				func = function() E:StaticPopup_Show("SLE_CHAT_HISTORY") end,
+			},
+			editreset = {
+				order = 5,
+				type = 'execute',
+				name = "Reset Editbox History",
+				desc = "Will delete all messages from editbox history. Will immidiatly reload your UI.",
+				disabled = function() return not E.db.chat.chatHistory end,
+				func = function() E:StaticPopup_Show("SLE_EDIT_HISTORY") end,
+			},
 		},
-	},
-}
+	}
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/core_c.lua b/ElvUI_SLE/options/core_c.lua
index a1d85e3..bc52993 100644
--- a/ElvUI_SLE/options/core_c.lua
+++ b/ElvUI_SLE/options/core_c.lua
@@ -3,185 +3,184 @@ local SLE = E:GetModule('SLE')
 local LT = E:GetModule('SLE_Loot')

 local function configTable()
-
-E.Options.args.ElvUI_Header = {
-		order = 1,
-		type = "header",
-		name = "ElvUI"..format(": |cff99ff33%s|r",E.version).."  "..L["Shadow & Light"]..format(": |cff99ff33%s|r",SLE.version),
-		width = "full",
-}
-
-local size = E.db.general.fontSize
-
---Main options group
-E.Options.args.sle = {
-	type = "group",
-	name = L["Shadow & Light"],
-	desc = [[The |cff1784d1ElvUI|r modification by
-Darth Predator and Repooc.]],
-	order = 50,
-	args = {
-		header = {
+	E.Options.args.ElvUI_Header = {
 			order = 1,
 			type = "header",
-			name = L["Shadow & Light"]..format(": |cff99ff33%s|r", SLE.version),
-		},
-		logo = {
-			type = 'description',
-			name = '',
-			order = 2,
-			image = function() return 'Interface\\AddOns\\ElvUI_SLE\\media\\textures\\SLE_Title', 650, 410 end,
-		},
-		info = {
-			order = 3,
-			type = "description",
-			name = L["SLE_DESC"],
-		},
-		Install = {
-			order = 4,
-			type = 'execute',
-			name = L['Install'],
-			desc = L['Run the installation process.'],
-			func = function() SLE:Install(); E:ToggleConfig() end,
-		},
-		options = {
-			order = 1,
-			type = "group",
-			childGroups = 'tab',
-			name = SETTINGS,
-			args = {
-				intro = {
-					order = 1,
-					type = "description",
-					name = L["Below you can see option groups presented by |cff1784d1Shadow & Light|r."],
-				},
-				general = {
-					order = 2,
-					type = "group",
-					name = L["General"],
-					args = {
-						intro = {
-							order = 1,
-							type = "description",
-							name = L["General options of |cff1784d1Shadow & Light|r."],
-						},
-						Reset = {
-							order = 2,
-							type = 'execute',
-							name = L["Reset All"],
-							desc = L["Reset all Shadow & Light options and movers to their defaults"],
-							func = function() SLE:Reset(true) end,
-						},
-						space1 = {
-							order = 3,
-							type = 'description',
-							name = "",
-						},
-						space2 = {
-							order = 4,
-							type = 'description',
-							name = "",
-						},
-						lootwindow = {
-							order = 6,
-							type = "group",
-							name = L["Loot History"],
-							args = {
-								header = {
-									order = 1,
-									type = "header",
-									name = L["Loot History"],
-								},
-								info = {
-									order = 2,
-									type = "description",
-									name = L["Options to tweak Loot History window behaviour."],
-								},
-								window = {
-									order = 3,
-									type = "toggle",
-									name = L["Auto hide"],
-									desc = L["Automaticaly hide Blizzard loot histroy frame when leaving the instance."],
-									get = function(info) return E.db.sle.lootwin end,
-									set = function(info, value) E.db.sle.lootwin = value; LT:LootShow() end
-								},
-								alpha = {
-									order = 4,
-									type = "range",
-									name = L['Alpha'],
-									desc = L["Sets alpha of loot histroy frame."],
-									min = 0.2, max = 1, step = 0.1,
-									get = function(info) return E.db.sle.lootalpha end,
-									set = function(info, value) E.db.sle.lootalpha = value; LT:LootShow() end,
+			name = "ElvUI"..format(": |cff99ff33%s|r",E.version).."  "..L["Shadow & Light"]..format(": |cff99ff33%s|r",SLE.version),
+			width = "full",
+	}
+
+	local size = E.db.general.fontSize
+
+	--Main options group
+	E.Options.args.sle = {
+		type = "group",
+		name = L["Shadow & Light"],
+		desc = [[The |cff1784d1ElvUI|r modification by
+	Darth Predator and Repooc.]],
+		order = 50,
+		args = {
+			header = {
+				order = 1,
+				type = "header",
+				name = L["Shadow & Light"]..format(": |cff99ff33%s|r", SLE.version),
+			},
+			logo = {
+				type = 'description',
+				name = '',
+				order = 2,
+				image = function() return 'Interface\\AddOns\\ElvUI_SLE\\media\\textures\\SLE_Title', 650, 410 end,
+			},
+			info = {
+				order = 3,
+				type = "description",
+				name = L["SLE_DESC"],
+			},
+			Install = {
+				order = 4,
+				type = 'execute',
+				name = L['Install'],
+				desc = L['Run the installation process.'],
+				func = function() SLE:Install(); E:ToggleConfig() end,
+			},
+			options = {
+				order = 1,
+				type = "group",
+				childGroups = 'tab',
+				name = SETTINGS,
+				args = {
+					intro = {
+						order = 1,
+						type = "description",
+						name = L["Below you can see option groups presented by |cff1784d1Shadow & Light|r."],
+					},
+					general = {
+						order = 2,
+						type = "group",
+						name = L["General"],
+						args = {
+							intro = {
+								order = 1,
+								type = "description",
+								name = L["General options of |cff1784d1Shadow & Light|r."],
+							},
+							Reset = {
+								order = 2,
+								type = 'execute',
+								name = L["Reset All"],
+								desc = L["Reset all Shadow & Light options and movers to their defaults"],
+								func = function() SLE:Reset(true) end,
+							},
+							space1 = {
+								order = 3,
+								type = 'description',
+								name = "",
+							},
+							space2 = {
+								order = 4,
+								type = 'description',
+								name = "",
+							},
+							lootwindow = {
+								order = 6,
+								type = "group",
+								name = L["Loot History"],
+								args = {
+									header = {
+										order = 1,
+										type = "header",
+										name = L["Loot History"],
+									},
+									info = {
+										order = 2,
+										type = "description",
+										name = L["Options to tweak Loot History window behaviour."],
+									},
+									window = {
+										order = 3,
+										type = "toggle",
+										name = L["Auto hide"],
+										desc = L["Automaticaly hide Blizzard loot histroy frame when leaving the instance."],
+										get = function(info) return E.db.sle.lootwin end,
+										set = function(info, value) E.db.sle.lootwin = value; LT:LootShow() end
+									},
+									alpha = {
+										order = 4,
+										type = "range",
+										name = L['Alpha'],
+										desc = L["Sets alpha of loot histroy frame."],
+										min = 0.2, max = 1, step = 0.1,
+										get = function(info) return E.db.sle.lootalpha end,
+										set = function(info, value) E.db.sle.lootalpha = value; LT:LootShow() end,
+									},
 								},
 							},
 						},
 					},
 				},
 			},
-		},
-		links = {
-			type = 'group',
-			name = 'About/Help',
-			order = -2,
-			args = {
-				desc = {
-					order = 1,
-					type = 'description',
-					fontSize = 'medium',
-					name = 'Da LinkZ!!!!',
-				},
-				tukuilink = {
-					type = 'input',
-					width = 'full',
-					name = 'On TukUI.org',
-					get = function(info) return 'http://www.tukui.org/addons/index.php?act=view&id=42' end,
-					order = 2,
-				},
-				wowilink = {
-					type = 'input',
-					width = 'full',
-					name = 'On WoWI',
-					get = function(info) return 'http://www.wowinterface.com/downloads/info20927-ElvUIShadowLight.html' end,
-					order = 3,
-				},
-				curselink= {
-					type = 'input',
-					width = 'full',
-					name = 'On Curse',
-					get = function(info) return 'http://www.curse.com/addons/wow/shadow-and-light-edit' end,
-					order = 4,
-				},
-				gitlablink = {
-					type = 'input',
-					width = 'full',
-					name = 'GitLab Link / Report Errors',
-					get = function(info) return 'http://git.tukui.org/repooc/elvui-shadowandlight' end,
-					order = 5,
+			links = {
+				type = 'group',
+				name = 'About/Help',
+				order = -2,
+				args = {
+					desc = {
+						order = 1,
+						type = 'description',
+						fontSize = 'medium',
+						name = 'Da LinkZ!!!!',
+					},
+					tukuilink = {
+						type = 'input',
+						width = 'full',
+						name = 'On TukUI.org',
+						get = function(info) return 'http://www.tukui.org/addons/index.php?act=view&id=42' end,
+						order = 2,
+					},
+					wowilink = {
+						type = 'input',
+						width = 'full',
+						name = 'On WoWI',
+						get = function(info) return 'http://www.wowinterface.com/downloads/info20927-ElvUIShadowLight.html' end,
+						order = 3,
+					},
+					curselink= {
+						type = 'input',
+						width = 'full',
+						name = 'On Curse',
+						get = function(info) return 'http://www.curse.com/addons/wow/shadow-and-light-edit' end,
+						order = 4,
+					},
+					gitlablink = {
+						type = 'input',
+						width = 'full',
+						name = 'GitLab Link / Report Errors',
+						get = function(info) return 'http://git.tukui.org/repooc/elvui-shadowandlight' end,
+						order = 5,
+					},
 				},
 			},
 		},
-	},
-}
+	}

---Credits
-E.Options.args.sle.args.credits = {
-	order = 400,
-	type = 'group',
-	name = L["Credits"],
-	args = {
-		creditheader = {
-			order = 1,
-			type = "header",
-			name = L["Credits"],
-		},
-		credits = {
-			order = 2,
-			type = "description",
-			name = L["ELVUI_SLE_CREDITS"]..'\n\n\n'..L["Submodules and Coding:"]..'\n\n'..L["ELVUI_SLE_CODERS"]..'\n\n\n'..L["Other Support:"]..'\n\n'..L["ELVUI_SLE_MISC"],
+	--Credits
+	E.Options.args.sle.args.credits = {
+		order = 400,
+		type = 'group',
+		name = L["Credits"],
+		args = {
+			creditheader = {
+				order = 1,
+				type = "header",
+				name = L["Credits"],
+			},
+			credits = {
+				order = 2,
+				type = "description",
+				name = L["ELVUI_SLE_CREDITS"]..'\n\n\n'..L["Submodules and Coding:"]..'\n\n'..L["ELVUI_SLE_CODERS"]..'\n\n\n'..L["Other Support:"]..'\n\n'..L["ELVUI_SLE_MISC"],
+			},
 		},
-	},
-}
+	}
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/datatexts_c.lua b/ElvUI_SLE/options/datatexts_c.lua
index 261e977..574d36e 100644
--- a/ElvUI_SLE/options/datatexts_c.lua
+++ b/ElvUI_SLE/options/datatexts_c.lua
@@ -1,503 +1,503 @@
 local E, L, V, P, G, _ = unpack(ElvUI);
 local DTP = E:GetModule('SLE_DTPanels')
 local DT = E:GetModule('DataTexts')
-
 local datatexts = {}
+
 local function configTable()
-local drop = {
-	--Group name = {short name, order, slot}
-	["DP_1"] = {"dp1", 1, 3},
-	["DP_2"] = {"dp2", 2, 3},
-	["DP_3"] = {"dp3", 3, 3},
-	["DP_4"] = {"dp4", 4, 3},
-	["DP_5"] = {"dp5", 5, 3},
-	["DP_6"] = {"dp6", 6, 3},
-	["Top_Center"] = {"top", 7, 1},
-	["Bottom_Panel"] = {"bottom", 8, 1},
-}
-local chatT = {
-	--Group name = {short name, order, elv's varible, chat panel(used to call functions)}
-	["Left Chat"] = {"chatleft", 9, "leftChatPanel", "LeftChat"},
-	["Right Chat"] = {"chatright", 10, "rightChatPanel", "RightChat"},
-}
+	local drop = {
+		--Group name = {short name, order, slot}
+		["DP_1"] = {"dp1", 1, 3},
+		["DP_2"] = {"dp2", 2, 3},
+		["DP_3"] = {"dp3", 3, 3},
+		["DP_4"] = {"dp4", 4, 3},
+		["DP_5"] = {"dp5", 5, 3},
+		["DP_6"] = {"dp6", 6, 3},
+		["Top_Center"] = {"top", 7, 1},
+		["Bottom_Panel"] = {"bottom", 8, 1},
+	}
+	local chatT = {
+		--Group name = {short name, order, elv's varible, chat panel(used to call functions)}
+		["Left Chat"] = {"chatleft", 9, "leftChatPanel", "LeftChat"},
+		["Right Chat"] = {"chatright", 10, "rightChatPanel", "RightChat"},
+	}

---Datatext panels
-E.Options.args.sle.args.datatext = {
-	type = "group",
-	name = L["Panels & Dashboard"],
-	order = 10,
-	childGroups = "tab",
-	args = {
-		panels = {
-			type = "group",
-			name = L["Panels & Dashboard"],
-			order = 1,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Additional Datatext Panels"],
-				},
-				intro = {
-					order = 2,
-					type = "description",
-					name = L["DP_DESC"]
-				},
-				Reset = {
-					order = 3,
-					type = 'execute',
-					name = L['Restore Defaults'],
-					desc = L["Reset these options to defaults"],
-					func = function() E:GetModule('SLE'):Reset(nil, nil, true) end,
-				},
-				spacer = {
-					order = 4,
-					type = 'description',
-					name = "",
-				},
-				dashboard = {
-					order = 5,
-					type = "toggle",
-					name = L["Dashboard"],
-					desc = L["Show/Hide dashboard."],
-					get = function(info) return E.db.sle.datatext.dashboard.enable end,
-					set = function(info, value) E.db.sle.datatext.dashboard.enable = value; DTP:DashboardShow() end
-				},
-				width = {
-					order = 6,
-					type = "range",
-					name = L["Dashboard Panels Width"],
-					desc = L["Sets size of dashboard panels."],
-					disabled = function() return not E.db.sle.datatext.dashboard.enable end,
-					min = 75, max = 200, step = 1,
-					get = function(info) return E.db.sle.datatext.dashboard.width end,
-					set = function(info, value) E.db.sle.datatext.dashboard.width = value; DTP:DashWidth() end,
-				},
-				chathandle = {
-					order = 7,
-					type = "toggle",
-					name = "Chat handle",
-					desc = L["Show/Hide dashboard."],
-					get = function(info) return E.db.sle.datatext.chathandle end,
-					set = function(info, value) E.db.sle.datatext.chathandle = value; E:GetModule('Layout'):ToggleChatPanels() end
+	--Datatext panels
+	E.Options.args.sle.args.datatext = {
+		type = "group",
+		name = L["Panels & Dashboard"],
+		order = 10,
+		childGroups = "tab",
+		args = {
+			panels = {
+				type = "group",
+				name = L["Panels & Dashboard"],
+				order = 1,
+				args = {
+					header = {
+						order = 1,
+						type = "header",
+						name = L["Additional Datatext Panels"],
+					},
+					intro = {
+						order = 2,
+						type = "description",
+						name = L["DP_DESC"]
+					},
+					Reset = {
+						order = 3,
+						type = 'execute',
+						name = L['Restore Defaults'],
+						desc = L["Reset these options to defaults"],
+						func = function() E:GetModule('SLE'):Reset(nil, nil, true) end,
+					},
+					spacer = {
+						order = 4,
+						type = 'description',
+						name = "",
+					},
+					dashboard = {
+						order = 5,
+						type = "toggle",
+						name = L["Dashboard"],
+						desc = L["Show/Hide dashboard."],
+						get = function(info) return E.db.sle.datatext.dashboard.enable end,
+						set = function(info, value) E.db.sle.datatext.dashboard.enable = value; DTP:DashboardShow() end
+					},
+					width = {
+						order = 6,
+						type = "range",
+						name = L["Dashboard Panels Width"],
+						desc = L["Sets size of dashboard panels."],
+						disabled = function() return not E.db.sle.datatext.dashboard.enable end,
+						min = 75, max = 200, step = 1,
+						get = function(info) return E.db.sle.datatext.dashboard.width end,
+						set = function(info, value) E.db.sle.datatext.dashboard.width = value; DTP:DashWidth() end,
+					},
+					chathandle = {
+						order = 7,
+						type = "toggle",
+						name = "Chat handle",
+						desc = L["Show/Hide dashboard."],
+						get = function(info) return E.db.sle.datatext.chathandle end,
+						set = function(info, value) E.db.sle.datatext.chathandle = value; E:GetModule('Layout'):ToggleChatPanels() end
+					},
 				},
 			},
 		},
-	},
-}
+	}

-for k,v in pairs(drop) do
-E.Options.args.sle.args.datatext.args.panels.args[v[1]] = {
-	order = v[2],
-	type = "group",
-	name = L[k],
-	get = function(info) return E.db.sle.datatext[v[1]][ info[#info] ] end,
-	args = {
-		enabled = {
-			order = 1,
-			type = "toggle",
-			name = L["Enable"],
-			desc = L["Show/Hide this panel."],
-			set = function(info, value) E.db.sle.datatext[v[1]].enabled = value; DTP:ExtraDataBarSetup() end
-		},
-		width = {
-			order = 2,
-			type = "range",
-			name = L['Width'],
-			desc = L["Sets size of this panel"],
-			disabled = function() return not E.db.sle.datatext[v[1]].enabled end,
-			min = 100 * v[3], max = E.screenwidth/2, step = 1,
-			set = function(info, value) E.db.sle.datatext[v[1]].width = value; DTP:Update() end,
-		},
-		hide = {
-			order = 3,
-			type = "toggle",
-			name = L['Hide panel background'],
-			desc = L["Don't show this panel, only datatexts assinged to it"],
-			disabled = function() return not E.db.sle.datatext[v[1]].enabled end,
-			get = function(info) return E.private.sle.datatext[v[1].."hide"] end,
-			set = function(info, value) E.private.sle.datatext[v[1].."hide"] = value; E:StaticPopup_Show("PRIVATE_RL") end,
-		},
-		transparent = {
-			order = 4,
-			name = L['Panel Transparency'],
-			type = 'toggle',
-			disabled = function() return not E.db.sle.datatext[v[1]].enabled or E.private.sle.datatext[v[1].."hide"] end,
-			set = function(info, value) E.db.sle.datatext[v[1]].transparent = value; DTP:ExtraDataBarSetup() end,
-		},
-		pethide = {
-			order = 5,
-			name = L['Hide in Pet Battle'],
-			type = 'toggle',
-			desc = L['Show/Hide this frame during Pet Battles.'],
-			set = function(info, value) E.db.sle.datatext[v[1]].pethide = value; DTP:RegisterHide() end,
+	for k,v in pairs(drop) do
+	E.Options.args.sle.args.datatext.args.panels.args[v[1]] = {
+		order = v[2],
+		type = "group",
+		name = L[k],
+		get = function(info) return E.db.sle.datatext[v[1]][ info[#info] ] end,
+		args = {
+			enabled = {
+				order = 1,
+				type = "toggle",
+				name = L["Enable"],
+				desc = L["Show/Hide this panel."],
+				set = function(info, value) E.db.sle.datatext[v[1]].enabled = value; DTP:ExtraDataBarSetup() end
+			},
+			width = {
+				order = 2,
+				type = "range",
+				name = L['Width'],
+				desc = L["Sets size of this panel"],
+				disabled = function() return not E.db.sle.datatext[v[1]].enabled end,
+				min = 100 * v[3], max = E.screenwidth/2, step = 1,
+				set = function(info, value) E.db.sle.datatext[v[1]].width = value; DTP:Update() end,
+			},
+			hide = {
+				order = 3,
+				type = "toggle",
+				name = L['Hide panel background'],
+				desc = L["Don't show this panel, only datatexts assinged to it"],
+				disabled = function() return not E.db.sle.datatext[v[1]].enabled end,
+				get = function(info) return E.private.sle.datatext[v[1].."hide"] end,
+				set = function(info, value) E.private.sle.datatext[v[1].."hide"] = value; E:StaticPopup_Show("PRIVATE_RL") end,
+			},
+			transparent = {
+				order = 4,
+				name = L['Panel Transparency'],
+				type = 'toggle',
+				disabled = function() return not E.db.sle.datatext[v[1]].enabled or E.private.sle.datatext[v[1].."hide"] end,
+				set = function(info, value) E.db.sle.datatext[v[1]].transparent = value; DTP:ExtraDataBarSetup() end,
+			},
+			pethide = {
+				order = 5,
+				name = L['Hide in Pet Battle'],
+				type = 'toggle',
+				desc = L['Show/Hide this frame during Pet Battles.'],
+				set = function(info, value) E.db.sle.datatext[v[1]].pethide = value; DTP:RegisterHide() end,
+			},
 		},
-	},
-}
-end
+	}
+	end

-for k,v in pairs(chatT) do
-E.Options.args.sle.args.datatext.args.panels.args[v[1]] = {
-	order = v[2],
-	type = "group",
-	name = L[k],
-	args = {
-		enabled = {
-			order = 1,
-			type = "toggle",
-			name = L["Enable"],
-			desc = L["Show/Hide this panel."],
-			get = function(info) return E.db.datatexts[v[3]] end,
-			set = function(info, value)
-				E.db.datatexts[v[3]] = value;
-				if E.db[v[4].."PanelFaded"] then
-					E.db[v[4].."PanelFaded"] = true;
-					Hide[v[4]]()
+	for k,v in pairs(chatT) do
+	E.Options.args.sle.args.datatext.args.panels.args[v[1]] = {
+		order = v[2],
+		type = "group",
+		name = L[k],
+		args = {
+			enabled = {
+				order = 1,
+				type = "toggle",
+				name = L["Enable"],
+				desc = L["Show/Hide this panel."],
+				get = function(info) return E.db.datatexts[v[3]] end,
+				set = function(info, value)
+					E.db.datatexts[v[3]] = value;
+					if E.db[v[4].."PanelFaded"] then
+						E.db[v[4].."PanelFaded"] = true;
+						Hide[v[4]]()
+					end
+					E:GetModule('Chat'):UpdateAnchors()
+					E:GetModule('Layout'):ToggleChatPanels()
+					E:GetModule('Bags'):PositionBagFrames()
 				end
-				E:GetModule('Chat'):UpdateAnchors()
-				E:GetModule('Layout'):ToggleChatPanels()
-				E:GetModule('Bags'):PositionBagFrames()
-			end
-		},
-		width = {
-			order = 2,
-			type = "range",
-			name = L['Width'],
-			desc = L["Sets size of this panel"],
-			disabled = function() return not E.db.datatexts[v[3]] end,
-			min = 150, max = E.screenwidth/2, step = 1,
-			get = function(info) return E.db.sle.datatext[v[1]].width end,
-			set = function(info, value) E.db.sle.datatext[v[1]].width = value; DTP:ChatResize() end,
+			},
+			width = {
+				order = 2,
+				type = "range",
+				name = L['Width'],
+				desc = L["Sets size of this panel"],
+				disabled = function() return not E.db.datatexts[v[3]] end,
+				min = 150, max = E.screenwidth/2, step = 1,
+				get = function(info) return E.db.sle.datatext[v[1]].width end,
+				set = function(info, value) E.db.sle.datatext[v[1]].width = value; DTP:ChatResize() end,
+			},
 		},
-	},
-
-}
-end
+
+	}
+	end

-E.Options.args.sle.args.datatext.args.sldatatext = {
-	type = "group",
-	name = L["S&L Datatexts"],
-	order = 2,
-	args = {
-		header = {
-			order = 1,
-			type = "header",
-			name = L["Datatext Options"],
-		},
-		intro = {
-			order = 2,
-			type = "description",
-			name = L["Some datatexts that Shadow & Light are supplied with, has settings that can be modified to alter the displayed information. Please use the dropdown box to select which datatext you would like to configure."]
-		},
-		spacer = {
-			order = 3,
-			type = 'description',
-			name = "",
-		},
-		timedt = {
-			type = "group",
-			name = RAID_FINDER,
-			order = 1,
-			args = {
-				lfrshow = {
-					order = 1,
-					type = "toggle",
-					name = L["LFR Lockout"],
-					desc = L["Show/Hide LFR lockout info in time datatext's tooltip."],
-					get = function(info) return E.db.sle.lfrshow.enabled end,
-					set = function(info, value) E.db.sle.lfrshow.enabled = value; end
-				},
-				instances = {
-					order = 2,
-					type = "group",
-					name = L["Loot History"],
-					guiInline = true,
-					get = function(info) return E.db.sle.lfrshow[ info[#info] ] end,
-					set = function(info, value) E.db.sle.lfrshow[ info[#info] ] = value; end,
-					args = {
-						ds = {
-							order = 1,
-							type = "toggle",
-							name = GetMapNameByID(824),
-						},
-						mv = {
-							order = 2,
-							type = "toggle",
-							name = GetMapNameByID(896),
-						},
-						hof = {
-							order = 3,
-							type = "toggle",
-							name = GetMapNameByID(897),
-						},
-						toes = {
-							order = 4,
-							type = "toggle",
-							name = GetMapNameByID(886),
-						},
-						tot = {
-							order = 5,
-							type = "toggle",
-							name = GetMapNameByID(930),
-						},
-						soo = {
-							order = 6,
-							type = "toggle",
-							name = GetMapNameByID(953),
-						},
-						soof = {
-							order = 7,
-							type = "toggle",
-							name = FLEX_RAID.." "..GetMapNameByID(953),
+	E.Options.args.sle.args.datatext.args.sldatatext = {
+		type = "group",
+		name = L["S&L Datatexts"],
+		order = 2,
+		args = {
+			header = {
+				order = 1,
+				type = "header",
+				name = L["Datatext Options"],
+			},
+			intro = {
+				order = 2,
+				type = "description",
+				name = L["Some datatexts that Shadow & Light are supplied with, has settings that can be modified to alter the displayed information. Please use the dropdown box to select which datatext you would like to configure."]
+			},
+			spacer = {
+				order = 3,
+				type = 'description',
+				name = "",
+			},
+			timedt = {
+				type = "group",
+				name = RAID_FINDER,
+				order = 1,
+				args = {
+					lfrshow = {
+						order = 1,
+						type = "toggle",
+						name = L["LFR Lockout"],
+						desc = L["Show/Hide LFR lockout info in time datatext's tooltip."],
+						get = function(info) return E.db.sle.lfrshow.enabled end,
+						set = function(info, value) E.db.sle.lfrshow.enabled = value; end
+					},
+					instances = {
+						order = 2,
+						type = "group",
+						name = L["Loot History"],
+						guiInline = true,
+						get = function(info) return E.db.sle.lfrshow[ info[#info] ] end,
+						set = function(info, value) E.db.sle.lfrshow[ info[#info] ] = value; end,
+						args = {
+							ds = {
+								order = 1,
+								type = "toggle",
+								name = GetMapNameByID(824),
+							},
+							mv = {
+								order = 2,
+								type = "toggle",
+								name = GetMapNameByID(896),
+							},
+							hof = {
+								order = 3,
+								type = "toggle",
+								name = GetMapNameByID(897),
+							},
+							toes = {
+								order = 4,
+								type = "toggle",
+								name = GetMapNameByID(886),
+							},
+							tot = {
+								order = 5,
+								type = "toggle",
+								name = GetMapNameByID(930),
+							},
+							soo = {
+								order = 6,
+								type = "toggle",
+								name = GetMapNameByID(953),
+							},
+							soof = {
+								order = 7,
+								type = "toggle",
+								name = FLEX_RAID.." "..GetMapNameByID(953),
+							},
 						},
 					},
-				},
-				hubs = {
-					order = 3,
-					type = "group",
-					name = L["World Loot"],
-					guiInline = true,
-					get = function(info) return E.db.sle.lfrshow[ info[#info] ] end,
-					set = function(info, value) E.db.sle.lfrshow[ info[#info] ] = value; end,
-					args = {
-						leishen = {
-							order = 1,
-							type = "toggle",
-							name = GetMapNameByID(928),
-							desc = L["Show/Hide the status of Key to the Palace of Lei Shen and Trove of the Thunder King."],
+					hubs = {
+						order = 3,
+						type = "group",
+						name = L["World Loot"],
+						guiInline = true,
+						get = function(info) return E.db.sle.lfrshow[ info[#info] ] end,
+						set = function(info, value) E.db.sle.lfrshow[ info[#info] ] = value; end,
+						args = {
+							leishen = {
+								order = 1,
+								type = "toggle",
+								name = GetMapNameByID(928),
+								desc = L["Show/Hide the status of Key to the Palace of Lei Shen and Trove of the Thunder King."],
+							},
 						},
 					},
 				},
 			},
-		},
-		slcurrency = {
-			type = "group",
-			name = "S&L Currency",
-			order = 2,
-			args = {
-				header = {
-					order = 1,
-					type = "description",
-					name = L['ElvUI Improved Currency Options'],
-				},
-				arch = {
-					order = 2,
-					type = "toggle",
-					name = L['Show Archaeology Fragments'],
-					get = function(info) return E.private['ElvUI_Currency']['Archaeology'] end,
-					set = function(info, value) E.private['ElvUI_Currency']['Archaeology'] = value; end,
-				},
-				jewel = {
-					order = 3,
-					type = "toggle",
-					name = L['Show Jewelcrafting Tokens'],
-					get = function(info) return E.private['ElvUI_Currency']['Jewelcrafting'] end,
-					set = function(info, value) E.private['ElvUI_Currency']['Jewelcrafting'] = value; end,
-				},
-				pvp = {
-					order = 4,
-					type = "toggle",
-					name = L['Show Player vs Player Currency'],
-					get = function(info) return E.private['ElvUI_Currency']['PvP'] end,
-					set = function(info, value) E.private['ElvUI_Currency']['PvP'] = value; end,
-				},
-				dungeon = {
-					order = 5,
-					type = "toggle",
-					name = L['Show Dungeon and Raid Currency'],
-					get = function(info) return E.private['ElvUI_Currency']['Raid'] end,
-					set = function(info, value) E.private['ElvUI_Currency']['Raid'] = value; end,
-				},
-				cook = {
-					order = 6,
-					type = "toggle",
-					name = L['Show Cooking Awards'],
-					get = function(info) return E.private['ElvUI_Currency']['Cooking'] end,
-					set = function(info, value) E.private['ElvUI_Currency']['Cooking'] = value; end,
-				},
-				misc = {
-					order = 7,
-					type = "toggle",
-					name = L['Show Miscellaneous Currency'],
-					get = function(info) return E.private['ElvUI_Currency']['Miscellaneous'] end,
-					set = function(info, value) E.private['ElvUI_Currency']['Miscellaneous'] = value; end,
-				},
-				zero = {
-					order = 8,
-					type = "toggle",
-					name = L['Show Zero Currency'],
-					get = function(info) return E.private['ElvUI_Currency']['Zero'] end,
-					set = function(info, value) E.private['ElvUI_Currency']['Zero'] = value; end,
-				},
-				icons = {
-					order = 9,
-					type = "toggle",
-					name = L['Show Icons'],
-					get = function(info) return E.private['ElvUI_Currency']['Icons'] end,
-					set = function(info, value) E.private['ElvUI_Currency']['Icons'] = value; end,
-				},
-				faction = {
-					order = 10,
-					type = "toggle",
-					name = L['Show Faction Totals'],
-					get = function(info) return E.private['ElvUI_Currency']['Faction'] end,
-					set = function(info, value) E.private['ElvUI_Currency']['Faction'] = value; end,
-				},
-				unused = {
-					order = 11,
-					type = "toggle",
-					name = L['Show Unsed Currency'],
-					get = function(info) return E.private['ElvUI_Currency']['Unused'] end,
-					set = function(info, value) E.private['ElvUI_Currency']['Unused'] = value; end,
+			slcurrency = {
+				type = "group",
+				name = "S&L Currency",
+				order = 2,
+				args = {
+					header = {
+						order = 1,
+						type = "description",
+						name = L['ElvUI Improved Currency Options'],
+					},
+					arch = {
+						order = 2,
+						type = "toggle",
+						name = L['Show Archaeology Fragments'],
+						get = function(info) return E.private['ElvUI_Currency']['Archaeology'] end,
+						set = function(info, value) E.private['ElvUI_Currency']['Archaeology'] = value; end,
+					},
+					jewel = {
+						order = 3,
+						type = "toggle",
+						name = L['Show Jewelcrafting Tokens'],
+						get = function(info) return E.private['ElvUI_Currency']['Jewelcrafting'] end,
+						set = function(info, value) E.private['ElvUI_Currency']['Jewelcrafting'] = value; end,
+					},
+					pvp = {
+						order = 4,
+						type = "toggle",
+						name = L['Show Player vs Player Currency'],
+						get = function(info) return E.private['ElvUI_Currency']['PvP'] end,
+						set = function(info, value) E.private['ElvUI_Currency']['PvP'] = value; end,
+					},
+					dungeon = {
+						order = 5,
+						type = "toggle",
+						name = L['Show Dungeon and Raid Currency'],
+						get = function(info) return E.private['ElvUI_Currency']['Raid'] end,
+						set = function(info, value) E.private['ElvUI_Currency']['Raid'] = value; end,
+					},
+					cook = {
+						order = 6,
+						type = "toggle",
+						name = L['Show Cooking Awards'],
+						get = function(info) return E.private['ElvUI_Currency']['Cooking'] end,
+						set = function(info, value) E.private['ElvUI_Currency']['Cooking'] = value; end,
+					},
+					misc = {
+						order = 7,
+						type = "toggle",
+						name = L['Show Miscellaneous Currency'],
+						get = function(info) return E.private['ElvUI_Currency']['Miscellaneous'] end,
+						set = function(info, value) E.private['ElvUI_Currency']['Miscellaneous'] = value; end,
+					},
+					zero = {
+						order = 8,
+						type = "toggle",
+						name = L['Show Zero Currency'],
+						get = function(info) return E.private['ElvUI_Currency']['Zero'] end,
+						set = function(info, value) E.private['ElvUI_Currency']['Zero'] = value; end,
+					},
+					icons = {
+						order = 9,
+						type = "toggle",
+						name = L['Show Icons'],
+						get = function(info) return E.private['ElvUI_Currency']['Icons'] end,
+						set = function(info, value) E.private['ElvUI_Currency']['Icons'] = value; end,
+					},
+					faction = {
+						order = 10,
+						type = "toggle",
+						name = L['Show Faction Totals'],
+						get = function(info) return E.private['ElvUI_Currency']['Faction'] end,
+						set = function(info, value) E.private['ElvUI_Currency']['Faction'] = value; end,
+					},
+					unused = {
+						order = 11,
+						type = "toggle",
+						name = L['Show Unsed Currency'],
+						get = function(info) return E.private['ElvUI_Currency']['Unused'] end,
+						set = function(info, value) E.private['ElvUI_Currency']['Unused'] = value; end,
+					},
 				},
 			},
-		},
-		slfriends = {
-			type = "group",
-			name = L["S&L Friends"],
-			order = 3,
-			args = {
-				header = {
-					order = 1,
-					type = "description",
-					name = L["These options are for modifing the Shadow & Light Friends datatext."],
-				},
-				combat = {
-					order = 2,
-					type = "toggle",
-					name = L["Hide In Combat"],
-					desc = L["Will not show the tooltip while in combat."],
-					get = function(info) return E.db.sle.dt.friends.combat end,
-					set = function(info, value) E.db.sle.dt.friends.combat = value; end,
-				},
-				hidetotals = {
-					order = 3,
-					type = "toggle",
-					name = L["Show Totals"],
-					desc = L["Show total friends in the datatext."],
-					get = function(info) return E.db.sle.dt.friends.totals end,
-					set = function(info, value) E.db.sle.dt.friends.totals = value; DT:update_Friends() end,
-				},
-				hidehintline = {
-					order = 4,
-					type = "toggle",
-					name = L["Hide Hints"],
-					desc = L["Hide the hints in the tooltip."],
-					get = function(info) return E.db.sle.dt.friends.hide_hintline end,
-					set = function(info, value) E.db.sle.dt.friends.hide_hintline = value; end,
-				},
-				bnbroadcast = {
-					order = 5,
-					type = "toggle",
-					name = L["Expand RealID"],
-					desc = L["Display realid with two lines to view broadcasts."],
-					get = function(info) return E.db.sle.dt.friends.expandBNBroadcast end,
-					set = function(info, value) E.db.sle.dt.friends.expandBNBroadcast = value; end,
-				},
-				spacer = {
-					order = 6,
-					type = 'description',
-					name = "",
-				},
-				tooltipautohide = {
-					order = 7,
-					type = "range",
-					name = L["Autohide Delay:"],
-					desc = L["Adjust the tooltip autohide delay when mouse is no longer hovering of the datatext."],
-					min = 0.1, max = 1, step = 0.1,
-					get = function(info) return E.db.sle.dt.friends.tooltipAutohide end,
-					set = function(info, value) E.db.sle.dt.friends.tooltipAutohide = value; end,
+			slfriends = {
+				type = "group",
+				name = L["S&L Friends"],
+				order = 3,
+				args = {
+					header = {
+						order = 1,
+						type = "description",
+						name = L["These options are for modifing the Shadow & Light Friends datatext."],
+					},
+					combat = {
+						order = 2,
+						type = "toggle",
+						name = L["Hide In Combat"],
+						desc = L["Will not show the tooltip while in combat."],
+						get = function(info) return E.db.sle.dt.friends.combat end,
+						set = function(info, value) E.db.sle.dt.friends.combat = value; end,
+					},
+					hidetotals = {
+						order = 3,
+						type = "toggle",
+						name = L["Show Totals"],
+						desc = L["Show total friends in the datatext."],
+						get = function(info) return E.db.sle.dt.friends.totals end,
+						set = function(info, value) E.db.sle.dt.friends.totals = value; DT:update_Friends() end,
+					},
+					hidehintline = {
+						order = 4,
+						type = "toggle",
+						name = L["Hide Hints"],
+						desc = L["Hide the hints in the tooltip."],
+						get = function(info) return E.db.sle.dt.friends.hide_hintline end,
+						set = function(info, value) E.db.sle.dt.friends.hide_hintline = value; end,
+					},
+					bnbroadcast = {
+						order = 5,
+						type = "toggle",
+						name = L["Expand RealID"],
+						desc = L["Display realid with two lines to view broadcasts."],
+						get = function(info) return E.db.sle.dt.friends.expandBNBroadcast end,
+						set = function(info, value) E.db.sle.dt.friends.expandBNBroadcast = value; end,
+					},
+					spacer = {
+						order = 6,
+						type = 'description',
+						name = "",
+					},
+					tooltipautohide = {
+						order = 7,
+						type = "range",
+						name = L["Autohide Delay:"],
+						desc = L["Adjust the tooltip autohide delay when mouse is no longer hovering of the datatext."],
+						min = 0.1, max = 1, step = 0.1,
+						get = function(info) return E.db.sle.dt.friends.tooltipAutohide end,
+						set = function(info, value) E.db.sle.dt.friends.tooltipAutohide = value; end,
+					},
 				},
 			},
-		},
-		slguild = {
-			type = "group",
-			name = L["S&L Guild"],
-			order = 4,
-			args = {
-				header = {
-					order = 1,
-					type = "description",
-					name = L["These options are for modifing the Shadow & Light Guild datatext."],
-				},
-				combat = {
-					order = 2,
-					type = "toggle",
-					name = L["Hide In Combat"],
-					desc = L["Will not show the tooltip while in combat."],
-					get = function(info) return E.db.sle.dt.guild.combat end,
-					set = function(info, value) E.db.sle.dt.guild.combat = value; end,
-				},
-				hidetotals = {
-					order = 3,
-					type = "toggle",
-					name = L["Show Totals"],
-					desc = L["Show total guild members in the datatext."],
-					get = function(info) return E.db.sle.dt.guild.totals end,
-					set = function(info, value) E.db.sle.dt.guild.totals = value; DT:update_Guild() end,
-				},
-				hidehintline = {
-					order = 4,
-					type = "toggle",
-					name = L["Hide Hints"],
-					desc = L["Display the hints in the tooltip."],
-					get = function(info) return E.db.sle.dt.guild.hide_hintline end,
-					set = function(info, value) E.db.sle.dt.guild.hide_hintline = value; end,
-				},
-				hidemotd = {
-					order = 5,
-					type = "toggle",
-					name = L["Hide MOTD"],
-					desc = L["Hide the guild's Message of the Day in the tooltip."],
-					get = function(info) return E.db.sle.dt.guild.hide_gmotd end,
-					set = function(info, value) E.db.sle.dt.guild.hide_gmotd = value; end,
-				},
-				hideguildname = {
-					order = 6,
-					type = "toggle",
-					name = L["Hide Guild Name"],
-					desc = L["Hide the guild's name in the tooltip."],
-					get = function(info) return E.db.sle.dt.guild.hide_guildname end,
-					set = function(info, value) E.db.sle.dt.guild.hide_guildname = value; end,
-				},
-				spacer = {
-					order = 7,
-					type = 'description',
-					name = "",
-				},
-				tooltipautohide = {
-					order = 8,
-					type = "range",
-					name = L["Autohide Delay:"],
-					desc = L["Adjust the tooltip autohide delay when mouse is no longer hovering of the datatext."],
-					min = 0.1, max = 1, step = 0.1,
-					get = function(info) return E.db.sle.dt.guild.tooltipAutohide end,
-					set = function(info, value) E.db.sle.dt.guild.tooltipAutohide = value; end,
+			slguild = {
+				type = "group",
+				name = L["S&L Guild"],
+				order = 4,
+				args = {
+					header = {
+						order = 1,
+						type = "description",
+						name = L["These options are for modifing the Shadow & Light Guild datatext."],
+					},
+					combat = {
+						order = 2,
+						type = "toggle",
+						name = L["Hide In Combat"],
+						desc = L["Will not show the tooltip while in combat."],
+						get = function(info) return E.db.sle.dt.guild.combat end,
+						set = function(info, value) E.db.sle.dt.guild.combat = value; end,
+					},
+					hidetotals = {
+						order = 3,
+						type = "toggle",
+						name = L["Show Totals"],
+						desc = L["Show total guild members in the datatext."],
+						get = function(info) return E.db.sle.dt.guild.totals end,
+						set = function(info, value) E.db.sle.dt.guild.totals = value; DT:update_Guild() end,
+					},
+					hidehintline = {
+						order = 4,
+						type = "toggle",
+						name = L["Hide Hints"],
+						desc = L["Display the hints in the tooltip."],
+						get = function(info) return E.db.sle.dt.guild.hide_hintline end,
+						set = function(info, value) E.db.sle.dt.guild.hide_hintline = value; end,
+					},
+					hidemotd = {
+						order = 5,
+						type = "toggle",
+						name = L["Hide MOTD"],
+						desc = L["Hide the guild's Message of the Day in the tooltip."],
+						get = function(info) return E.db.sle.dt.guild.hide_gmotd end,
+						set = function(info, value) E.db.sle.dt.guild.hide_gmotd = value; end,
+					},
+					hideguildname = {
+						order = 6,
+						type = "toggle",
+						name = L["Hide Guild Name"],
+						desc = L["Hide the guild's name in the tooltip."],
+						get = function(info) return E.db.sle.dt.guild.hide_guildname end,
+						set = function(info, value) E.db.sle.dt.guild.hide_guildname = value; end,
+					},
+					spacer = {
+						order = 7,
+						type = 'description',
+						name = "",
+					},
+					tooltipautohide = {
+						order = 8,
+						type = "range",
+						name = L["Autohide Delay:"],
+						desc = L["Adjust the tooltip autohide delay when mouse is no longer hovering of the datatext."],
+						min = 0.1, max = 1, step = 0.1,
+						get = function(info) return E.db.sle.dt.guild.tooltipAutohide end,
+						set = function(info, value) E.db.sle.dt.guild.tooltipAutohide = value; end,
+					},
 				},
 			},
-		},
-		slmail = {
-			type = "group",
-			name = L["S&L Mail"],
-			order = 5,
-			args = {
-				header = {
-					order = 1,
-					type = "description",
-					name = L["These options are for modifing the Shadow & Light Mail datatext."],
+			slmail = {
+				type = "group",
+				name = L["S&L Mail"],
+				order = 5,
+				args = {
+					header = {
+						order = 1,
+						type = "description",
+						name = L["These options are for modifing the Shadow & Light Mail datatext."],
+					},
+					icon = {
+						order = 2,
+						type = "toggle",
+						name = L["Minimap icon"],
+						desc = L["If enabled will show new mail icon on minimap."],
+						get = function(info) return E.db.sle.dt.mail.icon end,
+						set = function(info, value) E.db.sle.dt.mail.icon = value; DT:SLEmailUp() end,
+					}
 				},
-				icon = {
-					order = 2,
-					type = "toggle",
-					name = L["Minimap icon"],
-					desc = L["If enabled will show new mail icon on minimap."],
-					get = function(info) return E.db.sle.dt.mail.icon end,
-					set = function(info, value) E.db.sle.dt.mail.icon = value; DT:SLEmailUp() end,
-				}
 			},
 		},
-	},
-}
+	}
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/dev_c.lua b/ElvUI_SLE/options/dev_c.lua
index 8c90cf4..5ba92b2 100644
--- a/ElvUI_SLE/options/dev_c.lua
+++ b/ElvUI_SLE/options/dev_c.lua
@@ -339,6 +339,7 @@ if SLE:Auth() then
 				},
 			},
 		}
+
 		for i = 1, 40 do
 			E.Options.args.sle.args.developer.args.userList.args.userList.args[tostring(i)] = {
 				type = 'description',
@@ -371,5 +372,6 @@ if SLE:Auth() then
 			}
 		end
 	end
+
 	table.insert(E.SLEConfigs, configTable)
 end
\ No newline at end of file
diff --git a/ElvUI_SLE/options/equipmanager_c.lua b/ElvUI_SLE/options/equipmanager_c.lua
index 8bc7f32..454d17f 100644
--- a/ElvUI_SLE/options/equipmanager_c.lua
+++ b/ElvUI_SLE/options/equipmanager_c.lua
@@ -17,114 +17,113 @@ local function FillTable()
 end

 local function configTable()
-
-E.Options.args.sle.args.options.args.equipmanager = {
-	type = 'group',
-	order = 7,
-	name = L['Equipment Manager'],
-	args = {
-		header = {
-			order = 1,
-			type = "header",
-			name = L["Equipment Manager"],
-		},
-		intro = {
-			order = 2,
-			type = 'description',
-			name = L["EM_DESC"],
-		},
-		enable = {
-			type = "toggle",
-			order = 3,
-			name = L['Enable'],
-			get = function(info) return E.private.sle.equip.enable end,
-			set = function(info, value) E.private.sle.equip.enable = value; E:StaticPopup_Show("PRIVATE_RL") end
-		},
-		spam = {
-			type = "toggle",
-			order = 4,
-			name = L['Spam Throttling'],
-			desc = L["Removes the spam from chat stating what talents were learned or unlearned during spec change."],
-			get = function(info) return E.private.sle.equip.spam end,
-			set = function(info, value) E.private.sle.equip.spam = value; EM:SpamThrottle() end
-		},
-		setoverlay = {
-			type = "toggle",
-			order = 5,
-			name = L['Equipment Set Overlay'],
-			desc = L['Show the associated equipment sets for the items in your bags (or bank).'],
-			get = function(info) return E.private.sle.equip.setoverlay end,
-			set = function(info, value) E.private.sle.equip.setoverlay = value; BI:ToggleSettings(); end,
-		},
-		equipsets = {
-			type = "group",
-			name = PAPERDOLL_EQUIPMENTMANAGER,
-			order = 6,
-			disabled = function() return not E.private.sle.equip.enable end,
-			guiInline = true,
-			args = {
-				intro = {
-					order = 1,
-					type = 'description',
-					name = L["Here you can choose what equipment sets to use in different situations."],
-				},
-				primary = {
-					order = 2,
-					type = "select",
-					name = SPECIALIZATION_PRIMARY,
-					desc = L["Equip this set when switching to primary talents."],
-					get = function(info) return E.private.sle.equip.primary end,
-					set = function(info, value) E.private.sle.equip.primary = value; end,
-					values = function()
-						FillTable()
-						return sets
-					end,
-				},
-				secondary = {
-					order = 3,
-					type = "select",
-					name = SPECIALIZATION_SECONDARY,
-					desc = L["Equip this set when switching to secondary talents."],
-					get = function(info) return E.private.sle.equip.secondary end,
-					set = function(info, value) E.private.sle.equip.secondary = value end,
-					values = function()
-						FillTable()
-						return sets
-					end,
-				},
-				spacer = {
-					type = "description",
-					order = 4,
-					name = "",
-				},
-				instance = {
-					order = 5,
-					type = "select",
-					name = DUNGEONS,
-					desc = L["Equip this set after entering dungeons or raids."],
-					get = function(info) return E.private.sle.equip.instance end,
-					set = function(info, value) E.private.sle.equip.instance = value end,
-					values = function()
-						FillTable()
-						return sets
-					end,
-				},
-				pvp = {
-					order = 6,
-					type = "select",
-					name = PVP,
-					desc = L["Equip this set after entering battlegrounds or arens."],
-					get = function(info) return E.private.sle.equip.pvp end,
-					set = function(info, value) E.private.sle.equip.pvp = value end,
-					values = function()
-						FillTable()
-						return sets
-					end,
+	E.Options.args.sle.args.options.args.equipmanager = {
+		type = 'group',
+		order = 7,
+		name = L['Equipment Manager'],
+		args = {
+			header = {
+				order = 1,
+				type = "header",
+				name = L["Equipment Manager"],
+			},
+			intro = {
+				order = 2,
+				type = 'description',
+				name = L["EM_DESC"],
+			},
+			enable = {
+				type = "toggle",
+				order = 3,
+				name = L['Enable'],
+				get = function(info) return E.private.sle.equip.enable end,
+				set = function(info, value) E.private.sle.equip.enable = value; E:StaticPopup_Show("PRIVATE_RL") end
+			},
+			spam = {
+				type = "toggle",
+				order = 4,
+				name = L['Spam Throttling'],
+				desc = L["Removes the spam from chat stating what talents were learned or unlearned during spec change."],
+				get = function(info) return E.private.sle.equip.spam end,
+				set = function(info, value) E.private.sle.equip.spam = value; EM:SpamThrottle() end
+			},
+			setoverlay = {
+				type = "toggle",
+				order = 5,
+				name = L['Equipment Set Overlay'],
+				desc = L['Show the associated equipment sets for the items in your bags (or bank).'],
+				get = function(info) return E.private.sle.equip.setoverlay end,
+				set = function(info, value) E.private.sle.equip.setoverlay = value; BI:ToggleSettings(); end,
+			},
+			equipsets = {
+				type = "group",
+				name = PAPERDOLL_EQUIPMENTMANAGER,
+				order = 6,
+				disabled = function() return not E.private.sle.equip.enable end,
+				guiInline = true,
+				args = {
+					intro = {
+						order = 1,
+						type = 'description',
+						name = L["Here you can choose what equipment sets to use in different situations."],
+					},
+					primary = {
+						order = 2,
+						type = "select",
+						name = SPECIALIZATION_PRIMARY,
+						desc = L["Equip this set when switching to primary talents."],
+						get = function(info) return E.private.sle.equip.primary end,
+						set = function(info, value) E.private.sle.equip.primary = value; end,
+						values = function()
+							FillTable()
+							return sets
+						end,
+					},
+					secondary = {
+						order = 3,
+						type = "select",
+						name = SPECIALIZATION_SECONDARY,
+						desc = L["Equip this set when switching to secondary talents."],
+						get = function(info) return E.private.sle.equip.secondary end,
+						set = function(info, value) E.private.sle.equip.secondary = value end,
+						values = function()
+							FillTable()
+							return sets
+						end,
+					},
+					spacer = {
+						type = "description",
+						order = 4,
+						name = "",
+					},
+					instance = {
+						order = 5,
+						type = "select",
+						name = DUNGEONS,
+						desc = L["Equip this set after entering dungeons or raids."],
+						get = function(info) return E.private.sle.equip.instance end,
+						set = function(info, value) E.private.sle.equip.instance = value end,
+						values = function()
+							FillTable()
+							return sets
+						end,
+					},
+					pvp = {
+						order = 6,
+						type = "select",
+						name = PVP,
+						desc = L["Equip this set after entering battlegrounds or arens."],
+						get = function(info) return E.private.sle.equip.pvp end,
+						set = function(info, value) E.private.sle.equip.pvp = value end,
+						values = function()
+							FillTable()
+							return sets
+						end,
+					},
 				},
 			},
 		},
-	},
-}
+	}
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/exprepbar_c.lua b/ElvUI_SLE/options/exprepbar_c.lua
index 747886e..7afdbcf 100644
--- a/ElvUI_SLE/options/exprepbar_c.lua
+++ b/ElvUI_SLE/options/exprepbar_c.lua
@@ -1,44 +1,44 @@
 local E, L, V, P, G, _ = unpack(ElvUI);
 local M = E:GetModule('Misc')
-local function configTable()

---Options for Exp/Rep text
-E.Options.args.sle.args.options.args.general.args.exprep = {
-	type = "group",
-    name = L["Xp-Rep Text"],
-    order = 6,
-   	args = {
-		header = {
-			order = 1,
-			type = "header",
-			name = L["Xp-Rep Text"],
-		},
-		explong = {
-			order = 2,
-			type = "toggle",
-			name = L["Full value on Exp Bar"],
-			desc = L["Changes the way text is shown on exp bar."],
-			get = function(info) return E.db.sle.exprep.explong end,
-			set = function(info, value) E.db.sle.exprep.explong = value; M:UpdateExperience() end
-		},
-		replong = {
-			order = 3,
-			type = "toggle",
-			name = L["Full value on Rep Bar"],
-			desc = L["Changes the way text is shown on rep bar."],
-			get = function(info) return E.db.sle.exprep.replong end,
-			set = function(info, value) E.db.sle.exprep.replong = value; M:UpdateReputation() end
-		},
-		autotrackrep = {
-			order = 4,
-			type = "toggle",
-			name = L["Auto Track Reputation"],
-			desc = L["Automatically sets reputation tracking to the most recent reputation change."],
-			get = function(info) return E.private.sle.exprep.autotrack end,
-			set = function(info, value) E.private.sle.exprep.autotrack = value; end
+local function configTable()
+	--Options for Exp/Rep text
+	E.Options.args.sle.args.options.args.general.args.exprep = {
+		type = "group",
+	    name = L["Xp-Rep Text"],
+	    order = 6,
+	   	args = {
+			header = {
+				order = 1,
+				type = "header",
+				name = L["Xp-Rep Text"],
+			},
+			explong = {
+				order = 2,
+				type = "toggle",
+				name = L["Full value on Exp Bar"],
+				desc = L["Changes the way text is shown on exp bar."],
+				get = function(info) return E.db.sle.exprep.explong end,
+				set = function(info, value) E.db.sle.exprep.explong = value; M:UpdateExperience() end
+			},
+			replong = {
+				order = 3,
+				type = "toggle",
+				name = L["Full value on Rep Bar"],
+				desc = L["Changes the way text is shown on rep bar."],
+				get = function(info) return E.db.sle.exprep.replong end,
+				set = function(info, value) E.db.sle.exprep.replong = value; M:UpdateReputation() end
+			},
+			autotrackrep = {
+				order = 4,
+				type = "toggle",
+				name = L["Auto Track Reputation"],
+				desc = L["Automatically sets reputation tracking to the most recent reputation change."],
+				get = function(info) return E.private.sle.exprep.autotrack end,
+				set = function(info, value) E.private.sle.exprep.autotrack = value; end
+			},
 		},
-	},
-}
+	}
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/farm_c.lua b/ElvUI_SLE/options/farm_c.lua
index 49fc769..7789927 100644
--- a/ElvUI_SLE/options/farm_c.lua
+++ b/ElvUI_SLE/options/farm_c.lua
@@ -1,97 +1,97 @@
 local E, L, V, P, G, _ = unpack(ElvUI);
 local F = E:GetModule('SLE_Farm')
-local function configTable()

-E.Options.args.sle.args.options.args.farm = {
-	type = 'group',
-	order = 8,
-	name = L['Farm'],
-	args = {
-		header = {
-			order = 1,
-			type = "header",
-			name = L["Farm Options"],
-		},
-		intro = {
-			order = 2,
-			type = 'description',
-			name = L["FARM_DESC"],
-		},
-		enable = {
-			type = "toggle",
-			order = 3,
-			name = L['Enable'],
-			get = function(info) return E.private.sle.farm.enable end,
-			set = function(info, value) E.private.sle.farm.enable = value; E:StaticPopup_Show("PRIVATE_RL") end
-		},
-		active = {
-			order = 4,
-			type = 'toggle',
-			name = L['Only active buttons'],
-			desc = L['Only show the buttons for the seeds, portals, tools you have in your bags.'],
-			disabled = function() return not E.private.sle.farm.enable end,
-			get = function(info) return E.db.sle.farm.active end,
-			set = function(info, value) E.db.sle.farm.active = value; if SeedAnchor then F:UpdateLayout() end end,
-		},
-		size = {
-			order = 5,
-			type = "range",
-			name = L["Button Size"],
-			disabled = function() return not E.private.sle.farm.enable end,
-			min = 15, max = 60, step = 1,
-			get = function(info) return E.db.sle.farm.size end,
-			set = function(info, value) E.db.sle.farm.size = value; F:UpdateLayout() end,
-		},
-		seedbar = {
-			type = "group",
-			order = 6,
-			name = L["Seed Bars"],
-			disabled = function() return not E.private.sle.farm.enable end,
-			guiInline = true,
-			args = {
-				autotarget = {
-					type = "toggle",
-					order = 1,
-					name = L["Auto Planting"],
-					desc = L["Automatically plant seeds to the nearest tilled soil if one is not already selected."],
-					get = function(info) return E.db.sle.farm.autotarget end,
-					set = function(info, value) E.db.sle.farm.autotarget = value; end
-				},
-				trash = {
-					type = "toggle",
-					order = 2,
-					name = L["Drop Seeds"],
-					desc = L["Allow seeds to be destroyed from seed bars."],
-					get = function(info) return E.private.sle.farm.seedtrash end,
-					set = function(info, value) E.private.sle.farm.seedtrash = value; E:StaticPopup_Show("PRIVATE_RL") end
-				},
-				quest = {
-					type = "toggle",
-					order = 3,
-					name = L["Quest Glow"],
-					desc = L["Show glowing border on seeds needed for any quest in your log."],
-					get = function(info) return E.db.sle.farm.quest end,
-					set = function(info, value) E.db.sle.farm.quest = value; if SeedAnchor then F:UpdateLayout() end end
-				},
-				growth = {
-					order = 8,
-					type = "select",
-					name = L["Dock Buttons To"],
-					desc = L["Change the position from where seed bars will grow."],
-					disabled = function() return not E.private.sle.farm end,
-					get = function(info) return E.db.sle.farm.seedor end,
-					set = function(info, value) E.db.sle.farm.seedor = value; if SeedAnchor then F:UpdateLayout() end end,
-					values = {
-						['RIGHT'] = L["Right"],
-						['LEFT'] = L["Left"],
-						['BOTTOM'] = L["Bottom"],
-						['TOP'] = L["Top"],
+local function configTable()
+	E.Options.args.sle.args.options.args.farm = {
+		type = 'group',
+		order = 8,
+		name = L['Farm'],
+		args = {
+			header = {
+				order = 1,
+				type = "header",
+				name = L["Farm Options"],
+			},
+			intro = {
+				order = 2,
+				type = 'description',
+				name = L["FARM_DESC"],
+			},
+			enable = {
+				type = "toggle",
+				order = 3,
+				name = L['Enable'],
+				get = function(info) return E.private.sle.farm.enable end,
+				set = function(info, value) E.private.sle.farm.enable = value; E:StaticPopup_Show("PRIVATE_RL") end
+			},
+			active = {
+				order = 4,
+				type = 'toggle',
+				name = L['Only active buttons'],
+				desc = L['Only show the buttons for the seeds, portals, tools you have in your bags.'],
+				disabled = function() return not E.private.sle.farm.enable end,
+				get = function(info) return E.db.sle.farm.active end,
+				set = function(info, value) E.db.sle.farm.active = value; if SeedAnchor then F:UpdateLayout() end end,
+			},
+			size = {
+				order = 5,
+				type = "range",
+				name = L["Button Size"],
+				disabled = function() return not E.private.sle.farm.enable end,
+				min = 15, max = 60, step = 1,
+				get = function(info) return E.db.sle.farm.size end,
+				set = function(info, value) E.db.sle.farm.size = value; F:UpdateLayout() end,
+			},
+			seedbar = {
+				type = "group",
+				order = 6,
+				name = L["Seed Bars"],
+				disabled = function() return not E.private.sle.farm.enable end,
+				guiInline = true,
+				args = {
+					autotarget = {
+						type = "toggle",
+						order = 1,
+						name = L["Auto Planting"],
+						desc = L["Automatically plant seeds to the nearest tilled soil if one is not already selected."],
+						get = function(info) return E.db.sle.farm.autotarget end,
+						set = function(info, value) E.db.sle.farm.autotarget = value; end
+					},
+					trash = {
+						type = "toggle",
+						order = 2,
+						name = L["Drop Seeds"],
+						desc = L["Allow seeds to be destroyed from seed bars."],
+						get = function(info) return E.private.sle.farm.seedtrash end,
+						set = function(info, value) E.private.sle.farm.seedtrash = value; E:StaticPopup_Show("PRIVATE_RL") end
+					},
+					quest = {
+						type = "toggle",
+						order = 3,
+						name = L["Quest Glow"],
+						desc = L["Show glowing border on seeds needed for any quest in your log."],
+						get = function(info) return E.db.sle.farm.quest end,
+						set = function(info, value) E.db.sle.farm.quest = value; if SeedAnchor then F:UpdateLayout() end end
+					},
+					growth = {
+						order = 8,
+						type = "select",
+						name = L["Dock Buttons To"],
+						desc = L["Change the position from where seed bars will grow."],
+						disabled = function() return not E.private.sle.farm end,
+						get = function(info) return E.db.sle.farm.seedor end,
+						set = function(info, value) E.db.sle.farm.seedor = value; if SeedAnchor then F:UpdateLayout() end end,
+						values = {
+							['RIGHT'] = L["Right"],
+							['LEFT'] = L["Left"],
+							['BOTTOM'] = L["Bottom"],
+							['TOP'] = L["Top"],
+						},
 					},
 				},
 			},
 		},
-	},
-}
+	}
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/help_c.lua b/ElvUI_SLE/options/help_c.lua
index 0dfbf05..2d5c323 100644
--- a/ElvUI_SLE/options/help_c.lua
+++ b/ElvUI_SLE/options/help_c.lua
@@ -1,50 +1,49 @@
 local E, L, V, P, G =  unpack(ElvUI);
 local SLE = E:GetModule('SLE')
-local function configTable()

---Main options group
-E.Options.args.sle.args.links = {
-	type = 'group',
-	name = 'About/Help',
-	order = -2,
-	args = {
-		desc = {
-			order = 1,
-			type = 'description',
-			fontSize = 'medium',
-			name = 'Da LinkZ!!!!',
-		},
-		tukuilink = {
-			type = 'input',
-			width = 'full',
-			name = 'On TukUI.org',
-			get = function(info) return 'http://www.tukui.org/addons/index.php?act=view&id=42' end,
-			order = 2,
-		},
-		wowilink = {
-			type = 'input',
-			width = 'full',
-			name = 'On WoWI',
-			get = function(info) return 'http://www.wowinterface.com/downloads/info20927-ElvUIShadowLight.html' end,
-			order = 3,
-		},
-		curselink= {
-			type = 'input',
-			width = 'full',
-			name = 'On Curse',
-			get = function(info) return 'http://www.curse.com/addons/wow/shadow-and-light-edit' end,
-			order = 4,
-		},
-		gitlablink = {
-			type = 'input',
-			width = 'full',
-			name = 'GitLab Link / Report Errors',
-			get = function(info) return 'http://git.tukui.org/repooc/elvui-shadowandlight' end,
-			order = 5,
+local function configTable()
+	--Main options group
+	E.Options.args.sle.args.links = {
+		type = 'group',
+		name = 'About/Help',
+		order = -2,
+		args = {
+			desc = {
+				order = 1,
+				type = 'description',
+				fontSize = 'medium',
+				name = 'Da LinkZ!!!!',
+			},
+			tukuilink = {
+				type = 'input',
+				width = 'full',
+				name = 'On TukUI.org',
+				get = function(info) return 'http://www.tukui.org/addons/index.php?act=view&id=42' end,
+				order = 2,
+			},
+			wowilink = {
+				type = 'input',
+				width = 'full',
+				name = 'On WoWI',
+				get = function(info) return 'http://www.wowinterface.com/downloads/info20927-ElvUIShadowLight.html' end,
+				order = 3,
+			},
+			curselink= {
+				type = 'input',
+				width = 'full',
+				name = 'On Curse',
+				get = function(info) return 'http://www.curse.com/addons/wow/shadow-and-light-edit' end,
+				order = 4,
+			},
+			gitlablink = {
+				type = 'input',
+				width = 'full',
+				name = 'GitLab Link / Report Errors',
+				get = function(info) return 'http://git.tukui.org/repooc/elvui-shadowandlight' end,
+				order = 5,
+			},
 		},
-	},
-}
-
+	}
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/loot_c.lua b/ElvUI_SLE/options/loot_c.lua
index 104fc5a..ed984bd 100644
--- a/ElvUI_SLE/options/loot_c.lua
+++ b/ElvUI_SLE/options/loot_c.lua
@@ -1,72 +1,72 @@
 local E, L, V, P, G, _ = unpack(ElvUI);
-local function configTable()

-E.Options.args.sle.args.options.args.loot = {
-	order = 9,
-	type = "group",
-	name = L['Loot Announcer'],
-	args = {
-		marksheader = {
-			order = 1,
-			type = "header",
-			name = L['Loot Announcer'],
-		},
-		info = {
-			order = 2,
-			type = "description",
-			name = L["LOOT_DESC"],
-		},
-		enabled = {
-			order = 3,
-			type = "toggle",
-			name = L["Enable"],
-			get = function(info) return E.private.sle.loot.enable end,
-			set = function(info, value) E.private.sle.loot.enable = value; E:StaticPopup_Show("PRIVATE_RL") end
-		},
-		auto = {
-			order = 4,
-			type = "toggle",
-			name = L["Auto Announce"],
-			desc = L["Automatically announce when loot window opens (Master Looter Only)."],
-			disabled = function() return not E.private.sle.loot.enable end,
-			get = function(info) return E.db.sle.loot.auto end,
-			set = function(info, value) E.db.sle.loot.auto = value; end
-		},
-		spacer = {
-			order = 5,
-			type = "description",
-			name = "",
-		},
-		quality = {
-			order = 6,
-			type = "select",
-			name = L["Loot Quality"],
-			desc = L["Set the minimum quality of an item to announce."],
-			disabled = function() return not E.private.sle.loot.enable end,
-			get = function(info) return E.db.sle.loot.quality end,
-			set = function(info, value) E.db.sle.loot.quality = value;  end,
-			values = {
-				['EPIC'] = "|cffA335EE"..ITEM_QUALITY4_DESC.."|r",
-				['RARE'] = "|cff0070DD"..ITEM_QUALITY3_DESC.."|r",
-				['UNCOMMON'] = "|cff1EFF00"..ITEM_QUALITY2_DESC.."|r",
+local function configTable()
+	E.Options.args.sle.args.options.args.loot = {
+		order = 9,
+		type = "group",
+		name = L['Loot Announcer'],
+		args = {
+			marksheader = {
+				order = 1,
+				type = "header",
+				name = L['Loot Announcer'],
 			},
-		},
-		chat = {
-			order = 7,
-			type = "select",
-			name = L["Chat"],
-			desc = L["Announce loot to the selected channel."],
-			disabled = function() return not E.private.sle.loot.enable end,
-			get = function(info) return E.db.sle.loot.chat end,
-			set = function(info, value) E.db.sle.loot.chat = value;  end,
-			values = {
-				['RAID'] = "|cffFF7F00"..RAID.."|r",
-				['PARTY'] = "|cffAAAAFF"..PARTY.."|r",
-				['SAY'] = "|cffFFFFFF"..SAY.."|r",
+			info = {
+				order = 2,
+				type = "description",
+				name = L["LOOT_DESC"],
+			},
+			enabled = {
+				order = 3,
+				type = "toggle",
+				name = L["Enable"],
+				get = function(info) return E.private.sle.loot.enable end,
+				set = function(info, value) E.private.sle.loot.enable = value; E:StaticPopup_Show("PRIVATE_RL") end
+			},
+			auto = {
+				order = 4,
+				type = "toggle",
+				name = L["Auto Announce"],
+				desc = L["Automatically announce when loot window opens (Master Looter Only)."],
+				disabled = function() return not E.private.sle.loot.enable end,
+				get = function(info) return E.db.sle.loot.auto end,
+				set = function(info, value) E.db.sle.loot.auto = value; end
+			},
+			spacer = {
+				order = 5,
+				type = "description",
+				name = "",
+			},
+			quality = {
+				order = 6,
+				type = "select",
+				name = L["Loot Quality"],
+				desc = L["Set the minimum quality of an item to announce."],
+				disabled = function() return not E.private.sle.loot.enable end,
+				get = function(info) return E.db.sle.loot.quality end,
+				set = function(info, value) E.db.sle.loot.quality = value;  end,
+				values = {
+					['EPIC'] = "|cffA335EE"..ITEM_QUALITY4_DESC.."|r",
+					['RARE'] = "|cff0070DD"..ITEM_QUALITY3_DESC.."|r",
+					['UNCOMMON'] = "|cff1EFF00"..ITEM_QUALITY2_DESC.."|r",
+				},
+			},
+			chat = {
+				order = 7,
+				type = "select",
+				name = L["Chat"],
+				desc = L["Announce loot to the selected channel."],
+				disabled = function() return not E.private.sle.loot.enable end,
+				get = function(info) return E.db.sle.loot.chat end,
+				set = function(info, value) E.db.sle.loot.chat = value;  end,
+				values = {
+					['RAID'] = "|cffFF7F00"..RAID.."|r",
+					['PARTY'] = "|cffAAAAFF"..PARTY.."|r",
+					['SAY'] = "|cffFFFFFF"..SAY.."|r",
+				},
 			},
 		},
-	},
-}
+	}
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/marks_c.lua b/ElvUI_SLE/options/marks_c.lua
index 9c320fc..4ae10bd 100644
--- a/ElvUI_SLE/options/marks_c.lua
+++ b/ElvUI_SLE/options/marks_c.lua
@@ -1,187 +1,187 @@
 local E, L, V, P, G, _ = unpack(ElvUI);
 local RM = E:GetModule('SLE_RaidMarks')
 local RF = E:GetModule('SLE_RaidFlares')
-local function configTable()

-E.Options.args.sle.args.options.args.marks = {
-	order = 4,
-	type = "group",
-	name = L["Raid Marks"],
-	args = {
-		intro = {
-			order = 1,
-			type = 'description',
-			name = L['Options for panels providing fast access to raid markers and flares.'],
-		},
-		marks = {
-			order = 2,
-			type = "group",
-			name = L["Raid Marks"],
-			set = function(info, value) E.db.sle.marks[ info[#info] ]  = value; RM:Update() end,
-			args = {
-				marksheader = {
-					order = 1,
-					type = "header",
-					name = L["Raid Marks"],
-				},
-				enabled = {
-					order = 2,
-					type = "toggle",
-					name = L["Enable"],
-					desc = L["Show/Hide raid marks."],
-					get = function(info) return E.private.sle.marks.marks end,
-					set = function(info, value) E.private.sle.marks.marks = value; E:StaticPopup_Show("PRIVATE_RL") end
-				},
-				backdrop = {
-					order = 3,
-					type = "toggle",
-					name = L["Backdrop"],
-					disabled = function() return not E.private.sle.marks.marks end,
-					get = function(info) return E.db.sle.marks.backdrop end,
-				},
-				Reset = {
-					order = 4,
-					type = 'execute',
-					name = L['Restore Defaults'],
-					desc = L["Reset these options to defaults"],
-					disabled = function() return not E.private.sle.marks.marks end,
-					func = function() E:GetModule('SLE'):Reset(nil, nil, nil, nil, true) end,
-				},
-				spacer = {
-					order = 5,
-					type = 'description',
-					name = "",
-				},
-				showinside = {
-					order = 6,
-					type = "toggle",
-					name = L["Show only in instances"],
-					desc = L["Selecting this option will have the Raid Markers appear only while in a raid or dungeon."],
-					disabled = function() return not E.private.sle.marks.marks end,
-					get = function(info) return E.db.sle.marks.showinside end,
-				},
-				target = {
-					order = 7,
-					type = "toggle",
-					name = L["Target Exists"],
-					desc = L["Selecting this option will have the Raid Markers appear only when you have a target."],
-					disabled = function() return not E.private.sle.marks.marks end,
-					get = function(info) return E.db.sle.marks.target end,
-				},
-				mouseover = {
-					order = 7,
-					type = "toggle",
-					name = L["Mouseover"],
-					desc = L["Show on mouse over."],
-					disabled = function() return not E.private.sle.marks.marks end,
-					get = function(info) return E.db.sle.marks.mouseover end,
-				},
-				size = {
-					order = 9,
-					type = "range",
-					name = L['Size'],
-					desc = L["Sets size of buttons"],
-					disabled = function() return not E.private.sle.marks.marks end,
-					min = 15, max = 30, step = 1,
-					get = function(info) return E.db.sle.marks.size end,
-				},
-				growth = {
-					order = 10,
-					type = "select",
-					name = L["Direction"],
-					desc = L["Change the direction of buttons growth from the skull marker"],
-					disabled = function() return not E.private.sle.marks.marks end,
-					get = function(info) return E.db.sle.marks.growth end,
-					values = {
-						['RIGHT'] = L["Right"],
-						['LEFT'] = L["Left"],
-						['UP'] = L["Up"],
-						['DOWN'] = L["Down"],
+local function configTable()
+	E.Options.args.sle.args.options.args.marks = {
+		order = 4,
+		type = "group",
+		name = L["Raid Marks"],
+		args = {
+			intro = {
+				order = 1,
+				type = 'description',
+				name = L['Options for panels providing fast access to raid markers and flares.'],
+			},
+			marks = {
+				order = 2,
+				type = "group",
+				name = L["Raid Marks"],
+				set = function(info, value) E.db.sle.marks[ info[#info] ]  = value; RM:Update() end,
+				args = {
+					marksheader = {
+						order = 1,
+						type = "header",
+						name = L["Raid Marks"],
+					},
+					enabled = {
+						order = 2,
+						type = "toggle",
+						name = L["Enable"],
+						desc = L["Show/Hide raid marks."],
+						get = function(info) return E.private.sle.marks.marks end,
+						set = function(info, value) E.private.sle.marks.marks = value; E:StaticPopup_Show("PRIVATE_RL") end
+					},
+					backdrop = {
+						order = 3,
+						type = "toggle",
+						name = L["Backdrop"],
+						disabled = function() return not E.private.sle.marks.marks end,
+						get = function(info) return E.db.sle.marks.backdrop end,
+					},
+					Reset = {
+						order = 4,
+						type = 'execute',
+						name = L['Restore Defaults'],
+						desc = L["Reset these options to defaults"],
+						disabled = function() return not E.private.sle.marks.marks end,
+						func = function() E:GetModule('SLE'):Reset(nil, nil, nil, nil, true) end,
+					},
+					spacer = {
+						order = 5,
+						type = 'description',
+						name = "",
+					},
+					showinside = {
+						order = 6,
+						type = "toggle",
+						name = L["Show only in instances"],
+						desc = L["Selecting this option will have the Raid Markers appear only while in a raid or dungeon."],
+						disabled = function() return not E.private.sle.marks.marks end,
+						get = function(info) return E.db.sle.marks.showinside end,
+					},
+					target = {
+						order = 7,
+						type = "toggle",
+						name = L["Target Exists"],
+						desc = L["Selecting this option will have the Raid Markers appear only when you have a target."],
+						disabled = function() return not E.private.sle.marks.marks end,
+						get = function(info) return E.db.sle.marks.target end,
+					},
+					mouseover = {
+						order = 7,
+						type = "toggle",
+						name = L["Mouseover"],
+						desc = L["Show on mouse over."],
+						disabled = function() return not E.private.sle.marks.marks end,
+						get = function(info) return E.db.sle.marks.mouseover end,
+					},
+					size = {
+						order = 9,
+						type = "range",
+						name = L['Size'],
+						desc = L["Sets size of buttons"],
+						disabled = function() return not E.private.sle.marks.marks end,
+						min = 15, max = 30, step = 1,
+						get = function(info) return E.db.sle.marks.size end,
+					},
+					growth = {
+						order = 10,
+						type = "select",
+						name = L["Direction"],
+						desc = L["Change the direction of buttons growth from the skull marker"],
+						disabled = function() return not E.private.sle.marks.marks end,
+						get = function(info) return E.db.sle.marks.growth end,
+						values = {
+							['RIGHT'] = L["Right"],
+							['LEFT'] = L["Left"],
+							['UP'] = L["Up"],
+							['DOWN'] = L["Down"],
+						},
 					},
 				},
 			},
-		},
-		flares = {
-			order = 3,
-			type = "group",
-			name = L["Raid Flares"],
-			set = function(info, value) E.db.sle.flares[ info[#info] ]  = value; RF:Update() end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Raid Flares"],
-				},
-				enabled = {
-					order = 2,
-					type = "toggle",
-					name = L["Enable"],
-					desc = L["Show/Hide Raid Flares."],
-					get = function(info) return E.private.sle.marks.flares end,
-					set = function(info, value) E.private.sle.marks.flares = value; E:StaticPopup_Show("PRIVATE_RL") end
-				},
-				backdrop = {
-					order = 3,
-					type = "toggle",
-					name = L["Backdrop"],
-					disabled = function() return not E.private.sle.marks.flares end,
-					get = function(info) return E.db.sle.flares.backdrop end,
-				},
-				spacer = {
-					order = 5,
-					type = 'description',
-					name = "",
-				},
-				showinside = {
-					order = 6,
-					type = "toggle",
-					name = L["Show only in instances"],
-					desc = L["Selecting this option will have the Raid Flares appear only while in a raid or dungeon."],
-					disabled = function() return not E.private.sle.marks.flares end,
-					get = function(info) return E.db.sle.flares.showinside end,
-				},
-				mouseover = {
-					order = 7,
-					type = "toggle",
-					name = L["Mouseover"],
-					desc = L["Show on mouse over."],
-					disabled = function() return not E.private.sle.marks.flares end,
-					get = function(info) return E.db.sle.flares.mouseover end,
-				},
-				tooltips = {
-					order = 8,
-					type = "toggle",
-					name = L["Show Tooltip"],
-					disabled = function() return not E.private.sle.marks.flares end,
-					get = function(info) return E.db.sle.flares.tooltips end,
-				},
-				size = {
-					order = 9,
-					type = "range",
-					name = L['Size'],
-					desc = L["Sets size of buttons"],
-					disabled = function() return not E.private.sle.marks.flares end,
-					min = 15, max = 30, step = 1,
-					get = function(info) return E.db.sle.flares.size end,
-				},
-				growth = {
-					order = 9,
-					type = "select",
-					name = L["Direction"],
-					desc = L["Change the direction of buttons growth from the square marker"],
-					disabled = function() return not E.private.sle.marks.flares end,
-					get = function(info) return E.db.sle.flares.growth end,
-					values = {
-						['RIGHT'] = L["Right"],
-						['LEFT'] = L["Left"],
-						['UP'] = L["Up"],
-						['DOWN'] = L["Down"],
+			flares = {
+				order = 3,
+				type = "group",
+				name = L["Raid Flares"],
+				set = function(info, value) E.db.sle.flares[ info[#info] ]  = value; RF:Update() end,
+				args = {
+					header = {
+						order = 1,
+						type = "header",
+						name = L["Raid Flares"],
+					},
+					enabled = {
+						order = 2,
+						type = "toggle",
+						name = L["Enable"],
+						desc = L["Show/Hide Raid Flares."],
+						get = function(info) return E.private.sle.marks.flares end,
+						set = function(info, value) E.private.sle.marks.flares = value; E:StaticPopup_Show("PRIVATE_RL") end
+					},
+					backdrop = {
+						order = 3,
+						type = "toggle",
+						name = L["Backdrop"],
+						disabled = function() return not E.private.sle.marks.flares end,
+						get = function(info) return E.db.sle.flares.backdrop end,
+					},
+					spacer = {
+						order = 5,
+						type = 'description',
+						name = "",
+					},
+					showinside = {
+						order = 6,
+						type = "toggle",
+						name = L["Show only in instances"],
+						desc = L["Selecting this option will have the Raid Flares appear only while in a raid or dungeon."],
+						disabled = function() return not E.private.sle.marks.flares end,
+						get = function(info) return E.db.sle.flares.showinside end,
+					},
+					mouseover = {
+						order = 7,
+						type = "toggle",
+						name = L["Mouseover"],
+						desc = L["Show on mouse over."],
+						disabled = function() return not E.private.sle.marks.flares end,
+						get = function(info) return E.db.sle.flares.mouseover end,
+					},
+					tooltips = {
+						order = 8,
+						type = "toggle",
+						name = L["Show Tooltip"],
+						disabled = function() return not E.private.sle.marks.flares end,
+						get = function(info) return E.db.sle.flares.tooltips end,
+					},
+					size = {
+						order = 9,
+						type = "range",
+						name = L['Size'],
+						desc = L["Sets size of buttons"],
+						disabled = function() return not E.private.sle.marks.flares end,
+						min = 15, max = 30, step = 1,
+						get = function(info) return E.db.sle.flares.size end,
+					},
+					growth = {
+						order = 9,
+						type = "select",
+						name = L["Direction"],
+						desc = L["Change the direction of buttons growth from the square marker"],
+						disabled = function() return not E.private.sle.marks.flares end,
+						get = function(info) return E.db.sle.flares.growth end,
+						values = {
+							['RIGHT'] = L["Right"],
+							['LEFT'] = L["Left"],
+							['UP'] = L["Up"],
+							['DOWN'] = L["Down"],
+						},
 					},
 				},
 			},
 		},
-	},
-}
+	}
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/media_c.lua b/ElvUI_SLE/options/media_c.lua
index 7627c88..f6e6677 100644
--- a/ElvUI_SLE/options/media_c.lua
+++ b/ElvUI_SLE/options/media_c.lua
@@ -1,196 +1,195 @@
 local E, L, V, P, G, _ = unpack(ElvUI);
-local function configTable()

-E.Options.args.sle.args.media = {
-	type = "group",
-    name = L["Media"],
-    order = 3,
-	args = {
-		header = {
-			order = 1,
-			type = "header",
-			name = L["Media"],
-		},
-		intro = {
-			order = 2,
-			type = "description",
-			name = "Imma text!",
-		},
-		fonts = {
-			type = "group",
-			name = L["Fonts"],
-			order = 3,
-			guiInline = true,
-			args = {
-				intro = {
-					order = 1,
-					type = "description",
-					name = "Enables replacement of some fonts. Please note that these options will take effect only after reload of your UI.",
-				},
-				enable = {
-					order = 2,
-					type = "toggle",
-					name = L["Enable"],
-					get = function(info) return E.global.sle.fonts.enable end,
-					set = function(info, value) E.global.sle.fonts.enable = value; E:StaticPopup_Show("GLOBAL_RL") end
-				},
-				zone = {
-					type = "group",
-					name = "Zone Text",
-					order = 3,
-					guiInline = true,
-					disabled = function() return not E.global.sle.fonts.enable end,
-					args = {
-						font = {
-							type = "select", dialogControl = 'LSM30_Font',
-							order = 1,
-							name = L["Default Font"],
-							values = AceGUIWidgetLSMlists.font,
-							get = function(info) return E.global.sle.fonts.zone.font end,
-							set = function(info, value) E.global.sle.fonts.zone.font = value; E:StaticPopup_Show("GLOBAL_RL") end,
-						},
-						size = {
-							order = 2,
-							name = L["Font Size"],
-							type = "range",
-							min = 6, max = 48, step = 1,
-							get = function(info) return E.global.sle.fonts.zone.size end,
-							set = function(info, value) E.global.sle.fonts.zone.size = value; E:StaticPopup_Show("GLOBAL_RL") end,
-						},
-						outline = {
-							order = 3,
-							name = L["Font Outline"],
-							desc = L["Set the font outline."],
-							type = "select",
-							get = function(info) return E.global.sle.fonts.zone.outline end,
-							set = function(info, value) E.global.sle.fonts.zone.outline = value; E:StaticPopup_Show("GLOBAL_RL") end,
-							values = {
-								['NONE'] = L['None'],
-								['OUTLINE'] = 'OUTLINE',
-
-								['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE',
-								['THICKOUTLINE'] = 'THICKOUTLINE',
+local function configTable()
+	E.Options.args.sle.args.media = {
+		type = "group",
+	    name = L["Media"],
+	    order = 3,
+		args = {
+			header = {
+				order = 1,
+				type = "header",
+				name = L["Media"],
+			},
+			intro = {
+				order = 2,
+				type = "description",
+				name = "Imma text!",
+			},
+			fonts = {
+				type = "group",
+				name = L["Fonts"],
+				order = 3,
+				guiInline = true,
+				args = {
+					intro = {
+						order = 1,
+						type = "description",
+						name = "Enables replacement of some fonts. Please note that these options will take effect only after reload of your UI.",
+					},
+					enable = {
+						order = 2,
+						type = "toggle",
+						name = L["Enable"],
+						get = function(info) return E.global.sle.fonts.enable end,
+						set = function(info, value) E.global.sle.fonts.enable = value; E:StaticPopup_Show("GLOBAL_RL") end
+					},
+					zone = {
+						type = "group",
+						name = "Zone Text",
+						order = 3,
+						guiInline = true,
+						disabled = function() return not E.global.sle.fonts.enable end,
+						args = {
+							font = {
+								type = "select", dialogControl = 'LSM30_Font',
+								order = 1,
+								name = L["Default Font"],
+								values = AceGUIWidgetLSMlists.font,
+								get = function(info) return E.global.sle.fonts.zone.font end,
+								set = function(info, value) E.global.sle.fonts.zone.font = value; E:StaticPopup_Show("GLOBAL_RL") end,
+							},
+							size = {
+								order = 2,
+								name = L["Font Size"],
+								type = "range",
+								min = 6, max = 48, step = 1,
+								get = function(info) return E.global.sle.fonts.zone.size end,
+								set = function(info, value) E.global.sle.fonts.zone.size = value; E:StaticPopup_Show("GLOBAL_RL") end,
+							},
+							outline = {
+								order = 3,
+								name = L["Font Outline"],
+								desc = L["Set the font outline."],
+								type = "select",
+								get = function(info) return E.global.sle.fonts.zone.outline end,
+								set = function(info, value) E.global.sle.fonts.zone.outline = value; E:StaticPopup_Show("GLOBAL_RL") end,
+								values = {
+									['NONE'] = L['None'],
+									['OUTLINE'] = 'OUTLINE',
+
+									['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE',
+									['THICKOUTLINE'] = 'THICKOUTLINE',
+								},
+							},
+							width = {
+								order = 4,
+								name = L["Width"],
+								type = "range",
+								min = 512, max = E.screenwidth, step = 1,
+								get = function(info) return E.global.sle.fonts.zone.width end,
+								set = function(info, value) E.global.sle.fonts.zone.width = value; E:StaticPopup_Show("GLOBAL_RL") end,
 							},
-						},
-						width = {
-							order = 4,
-							name = L["Width"],
-							type = "range",
-							min = 512, max = E.screenwidth, step = 1,
-							get = function(info) return E.global.sle.fonts.zone.width end,
-							set = function(info, value) E.global.sle.fonts.zone.width = value; E:StaticPopup_Show("GLOBAL_RL") end,
 						},
 					},
-				},
-				subzone = {
-					type = "group",
-					name = "Subzone Text",
-					order = 4,
-					guiInline = true,
-					disabled = function() return not E.global.sle.fonts.enable end,
-					args = {
-						font = {
-							type = "select", dialogControl = 'LSM30_Font',
-							order = 1,
-							name = L["Default Font"],
-							values = AceGUIWidgetLSMlists.font,
-							get = function(info) return E.global.sle.fonts.subzone.font end,
-							set = function(info, value) E.global.sle.fonts.subzone.font = value; E:StaticPopup_Show("GLOBAL_RL") end,
-						},
-						size = {
-							order = 2,
-							name = L["Font Size"],
-							type = "range",
-							min = 6, max = 48, step = 1,
-							get = function(info) return E.global.sle.fonts.subzone.size end,
-							set = function(info, value) E.global.sle.fonts.subzone.size = value; E:StaticPopup_Show("GLOBAL_RL") end,
-						},
-						outline = {
-							order = 3,
-							name = L["Font Outline"],
-							desc = L["Set the font outline."],
-							type = "select",
-							get = function(info) return E.global.sle.fonts.subzone.outline end,
-							set = function(info, value) E.global.sle.fonts.subzone.outline = value; E:StaticPopup_Show("GLOBAL_RL") end,
-							values = {
-								['NONE'] = L['None'],
-								['OUTLINE'] = 'OUTLINE',
-
-								['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE',
-								['THICKOUTLINE'] = 'THICKOUTLINE',
+					subzone = {
+						type = "group",
+						name = "Subzone Text",
+						order = 4,
+						guiInline = true,
+						disabled = function() return not E.global.sle.fonts.enable end,
+						args = {
+							font = {
+								type = "select", dialogControl = 'LSM30_Font',
+								order = 1,
+								name = L["Default Font"],
+								values = AceGUIWidgetLSMlists.font,
+								get = function(info) return E.global.sle.fonts.subzone.font end,
+								set = function(info, value) E.global.sle.fonts.subzone.font = value; E:StaticPopup_Show("GLOBAL_RL") end,
+							},
+							size = {
+								order = 2,
+								name = L["Font Size"],
+								type = "range",
+								min = 6, max = 48, step = 1,
+								get = function(info) return E.global.sle.fonts.subzone.size end,
+								set = function(info, value) E.global.sle.fonts.subzone.size = value; E:StaticPopup_Show("GLOBAL_RL") end,
+							},
+							outline = {
+								order = 3,
+								name = L["Font Outline"],
+								desc = L["Set the font outline."],
+								type = "select",
+								get = function(info) return E.global.sle.fonts.subzone.outline end,
+								set = function(info, value) E.global.sle.fonts.subzone.outline = value; E:StaticPopup_Show("GLOBAL_RL") end,
+								values = {
+									['NONE'] = L['None'],
+									['OUTLINE'] = 'OUTLINE',
+
+									['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE',
+									['THICKOUTLINE'] = 'THICKOUTLINE',
+								},
+							},
+							offset = {
+								order = 4,
+								name = L["Offset"],
+								type = "range",
+								min = 0, max = 30, step = 1,
+								get = function(info) return E.global.sle.fonts.subzone.offset end,
+								set = function(info, value) E.global.sle.fonts.subzone.offset = value; E:StaticPopup_Show("GLOBAL_RL") end,
+							},
+							width = {
+								order = 5,
+								name = L["Width"],
+								type = "range",
+								min = 512, max = E.screenwidth, step = 1,
+								get = function(info) return E.global.sle.fonts.subzone.width end,
+								set = function(info, value) E.global.sle.fonts.subzone.width = value; E:StaticPopup_Show("GLOBAL_RL") end,
 							},
-						},
-						offset = {
-							order = 4,
-							name = L["Offset"],
-							type = "range",
-							min = 0, max = 30, step = 1,
-							get = function(info) return E.global.sle.fonts.subzone.offset end,
-							set = function(info, value) E.global.sle.fonts.subzone.offset = value; E:StaticPopup_Show("GLOBAL_RL") end,
-						},
-						width = {
-							order = 5,
-							name = L["Width"],
-							type = "range",
-							min = 512, max = E.screenwidth, step = 1,
-							get = function(info) return E.global.sle.fonts.subzone.width end,
-							set = function(info, value) E.global.sle.fonts.subzone.width = value; E:StaticPopup_Show("GLOBAL_RL") end,
 						},
 					},
-				},
-				pvpstatus = {
-					type = "group",
-					name = "PvP Status Text",
-					order = 5,
-					guiInline = true,
-					disabled = function() return not E.global.sle.fonts.enable end,
-					args = {
-						font = {
-							type = "select", dialogControl = 'LSM30_Font',
-							order = 1,
-							name = L["Default Font"],
-							values = AceGUIWidgetLSMlists.font,
-							get = function(info) return E.global.sle.fonts.pvp.font end,
-							set = function(info, value) E.global.sle.fonts.pvp.font = value; E:StaticPopup_Show("GLOBAL_RL") end,
-						},
-						size = {
-							order = 2,
-							name = L["Font Size"],
-							type = "range",
-							min = 6, max = 48, step = 1,
-							get = function(info) return E.global.sle.fonts.pvp.size end,
-							set = function(info, value) E.global.sle.fonts.pvp.size = value; E:StaticPopup_Show("GLOBAL_RL") end,
-						},
-						outline = {
-							order = 3,
-							name = L["Font Outline"],
-							desc = L["Set the font outline."],
-							type = "select",
-							get = function(info) return E.global.sle.fonts.pvp.outline end,
-							set = function(info, value) E.global.sle.fonts.pvp.outline = value; E:StaticPopup_Show("GLOBAL_RL") end,
-							values = {
-								['NONE'] = L['None'],
-								['OUTLINE'] = 'OUTLINE',
-
-								['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE',
-								['THICKOUTLINE'] = 'THICKOUTLINE',
+					pvpstatus = {
+						type = "group",
+						name = "PvP Status Text",
+						order = 5,
+						guiInline = true,
+						disabled = function() return not E.global.sle.fonts.enable end,
+						args = {
+							font = {
+								type = "select", dialogControl = 'LSM30_Font',
+								order = 1,
+								name = L["Default Font"],
+								values = AceGUIWidgetLSMlists.font,
+								get = function(info) return E.global.sle.fonts.pvp.font end,
+								set = function(info, value) E.global.sle.fonts.pvp.font = value; E:StaticPopup_Show("GLOBAL_RL") end,
+							},
+							size = {
+								order = 2,
+								name = L["Font Size"],
+								type = "range",
+								min = 6, max = 48, step = 1,
+								get = function(info) return E.global.sle.fonts.pvp.size end,
+								set = function(info, value) E.global.sle.fonts.pvp.size = value; E:StaticPopup_Show("GLOBAL_RL") end,
+							},
+							outline = {
+								order = 3,
+								name = L["Font Outline"],
+								desc = L["Set the font outline."],
+								type = "select",
+								get = function(info) return E.global.sle.fonts.pvp.outline end,
+								set = function(info, value) E.global.sle.fonts.pvp.outline = value; E:StaticPopup_Show("GLOBAL_RL") end,
+								values = {
+									['NONE'] = L['None'],
+									['OUTLINE'] = 'OUTLINE',
+
+									['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE',
+									['THICKOUTLINE'] = 'THICKOUTLINE',
+								},
+							},
+							width = {
+								order = 4,
+								name = L["Width"],
+								type = "range",
+								min = 512, max = E.screenwidth, step = 1,
+								get = function(info) return E.global.sle.fonts.pvp.width end,
+								set = function(info, value) E.global.sle.fonts.pvp.width = value; E:StaticPopup_Show("GLOBAL_RL") end,
 							},
-						},
-						width = {
-							order = 4,
-							name = L["Width"],
-							type = "range",
-							min = 512, max = E.screenwidth, step = 1,
-							get = function(info) return E.global.sle.fonts.pvp.width end,
-							set = function(info, value) E.global.sle.fonts.pvp.width = value; E:StaticPopup_Show("GLOBAL_RL") end,
 						},
 					},
 				},
 			},
 		},
-	},
-}
-
+	}
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/uibuttons_c.lua b/ElvUI_SLE/options/uibuttons_c.lua
index 5234978..57cea0a 100644
--- a/ElvUI_SLE/options/uibuttons_c.lua
+++ b/ElvUI_SLE/options/uibuttons_c.lua
@@ -1,84 +1,84 @@
 local E, L, V, P, G, _ = unpack(ElvUI);
 local UB = E:GetModule('SLE_UIButtons')
-local function configTable()

-E.Options.args.sle.args.options.args.general.args.uibuttons = {
-	type = "group",
-	name = L["UI Buttons"],
-	order = 99,
-	args = {
-		header = {
-			order = 1,
-			type = "header",
-			name = L["UI Buttons"],
-		},
-		intro = {
-			order = 2,
-			type = "description",
-			name = L["Additional menu with useful buttons"],
-		},
-		enabled = {
-			order = 3,
-			type = "toggle",
-			name = L["Enable"],
-			desc = L["Show/Hide UI buttons."],
-			get = function(info) return E.db.sle.uibuttons.enable end,
-			set = function(info, value) E.db.sle.uibuttons.enable = value; UB:Start() end
-		},
-		space1 = {
-			order = 4,
-			type = 'description',
-			name = "",
-		},
-		space2 = {
-			order = 5,
-			type = 'description',
-			name = "",
-		},
-		size = {
-			order = 6,
-			type = "range",
-			name = L['Size'],
-			desc = L["Sets size of buttons"],
-			min = 12, max = 25, step = 1,
-			disabled = function() return not E.db.sle.uibuttons.enable end,
-			get = function(info) return E.db.sle.uibuttons.size end,
-			set = function(info, value) E.db.sle.uibuttons.size = value; UB:UpdateAll() end,
-		},
-		spacing = {
-			order = 7,
-			type = "range",
-			name = L['Button Spacing'],
-			desc = L['The spacing between buttons.'],
-			min = 1, max = 10, step = 1,
-			disabled = function() return not E.db.sle.uibuttons.enable end,
-			get = function(info) return E.db.sle.uibuttons.spacing end,
-			set = function(info, value) E.db.sle.uibuttons.spacing = value; UB:UpdateAll() end,
-		},
-		mouse = {
-			order = 8,
-			type = "toggle",
-			name = L["Mouse over"],
-			desc = L["Show on mouse over."],
-			disabled = function() return not E.db.sle.uibuttons.enable end,
-			get = function(info) return E.db.sle.uibuttons.mouse end,
-			set = function(info, value) E.db.sle.uibuttons.mouse = value; end
-		},
-		position = {
-			order = 10,
-			name = L["Buttons position"],
-			desc = L["Layout for UI buttons."],
-			type = "select",
-			values = {
-				["uib_hor"] = L['Horizontal'],
-				["uib_vert"] = L['Vertical'],
+local function configTable()
+	E.Options.args.sle.args.options.args.general.args.uibuttons = {
+		type = "group",
+		name = L["UI Buttons"],
+		order = 99,
+		args = {
+			header = {
+				order = 1,
+				type = "header",
+				name = L["UI Buttons"],
+			},
+			intro = {
+				order = 2,
+				type = "description",
+				name = L["Additional menu with useful buttons"],
+			},
+			enabled = {
+				order = 3,
+				type = "toggle",
+				name = L["Enable"],
+				desc = L["Show/Hide UI buttons."],
+				get = function(info) return E.db.sle.uibuttons.enable end,
+				set = function(info, value) E.db.sle.uibuttons.enable = value; UB:Start() end
+			},
+			space1 = {
+				order = 4,
+				type = 'description',
+				name = "",
+			},
+			space2 = {
+				order = 5,
+				type = 'description',
+				name = "",
+			},
+			size = {
+				order = 6,
+				type = "range",
+				name = L['Size'],
+				desc = L["Sets size of buttons"],
+				min = 12, max = 25, step = 1,
+				disabled = function() return not E.db.sle.uibuttons.enable end,
+				get = function(info) return E.db.sle.uibuttons.size end,
+				set = function(info, value) E.db.sle.uibuttons.size = value; UB:UpdateAll() end,
+			},
+			spacing = {
+				order = 7,
+				type = "range",
+				name = L['Button Spacing'],
+				desc = L['The spacing between buttons.'],
+				min = 1, max = 10, step = 1,
+				disabled = function() return not E.db.sle.uibuttons.enable end,
+				get = function(info) return E.db.sle.uibuttons.spacing end,
+				set = function(info, value) E.db.sle.uibuttons.spacing = value; UB:UpdateAll() end,
+			},
+			mouse = {
+				order = 8,
+				type = "toggle",
+				name = L["Mouse over"],
+				desc = L["Show on mouse over."],
+				disabled = function() return not E.db.sle.uibuttons.enable end,
+				get = function(info) return E.db.sle.uibuttons.mouse end,
+				set = function(info, value) E.db.sle.uibuttons.mouse = value; end
+			},
+			position = {
+				order = 10,
+				name = L["Buttons position"],
+				desc = L["Layout for UI buttons."],
+				type = "select",
+				values = {
+					["uib_hor"] = L['Horizontal'],
+					["uib_vert"] = L['Vertical'],
+				},
+				disabled = function() return not E.db.sle.uibuttons.enable end,
+				get = function(info) return E.db.sle.uibuttons.position end,
+				set = function(info, value) E.db.sle.uibuttons.position = value; UB:UpdateAll() end,
 			},
-			disabled = function() return not E.db.sle.uibuttons.enable end,
-			get = function(info) return E.db.sle.uibuttons.position end,
-			set = function(info, value) E.db.sle.uibuttons.position = value; UB:UpdateAll() end,
 		},
-	},
-}
+	}
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file
diff --git a/ElvUI_SLE/options/unitframes_c.lua b/ElvUI_SLE/options/unitframes_c.lua
index daa0da5..cfebaf4 100644
--- a/ElvUI_SLE/options/unitframes_c.lua
+++ b/ElvUI_SLE/options/unitframes_c.lua
@@ -1,82 +1,81 @@
 local E, L, V, P, G, _ = unpack(ElvUI);
 local UF = E:GetModule('UnitFrames')
 local CAN_HAVE_CLASSBAR = (E.myclass == "PALADIN" or E.myclass == "DRUID" or E.myclass == "DEATHKNIGHT" or E.myclass == "WARLOCK" or E.myclass == "PRIEST" or E.myclass == "MONK" or E.myclass == 'MAGE')
-local function configTable()

-local positionValues = {
-	TOPLEFT = 'TOPLEFT',
-	LEFT = 'LEFT',
-	BOTTOMLEFT = 'BOTTOMLEFT',
-	RIGHT = 'RIGHT',
-	TOPRIGHT = 'TOPRIGHT',
-	BOTTOMRIGHT = 'BOTTOMRIGHT',
-	CENTER = 'CENTER',
-	TOP = 'TOP',
-	BOTTOM = 'BOTTOM',
-	NONE = L['Hide']
-};
+local function configTable()
+	local positionValues = {
+		TOPLEFT = 'TOPLEFT',
+		LEFT = 'LEFT',
+		BOTTOMLEFT = 'BOTTOMLEFT',
+		RIGHT = 'RIGHT',
+		TOPRIGHT = 'TOPRIGHT',
+		BOTTOMRIGHT = 'BOTTOMRIGHT',
+		CENTER = 'CENTER',
+		TOP = 'TOP',
+		BOTTOM = 'BOTTOM',
+		NONE = L['Hide']
+	};

-E.Options.args.sle.args.options.args.general.args.unitframes = {
-	type = "group",
-	name = L["UnitFrames"],
-	order = 100,
-	args = {
-		header = {
-			order = 1,
-			type = "header",
-			name = L["Additional unit frames options"],
-		},
-		info = {
-			order = 2,
-			type = "description",
-			name = L["Options for customizing unit frames. Please don't change these setting when ElvUI's testing frames for bosses and arena teams are shown. That will make them invisible until retoggling."],
-		},
-		Reset = {
-			order = 3,
-			type = 'execute',
-			name = L['Restore Defaults'],
-			desc = L["Reset these options to defaults"],
-			func = function() E:GetModule('SLE'):Reset(nil, true) end,
+	E.Options.args.sle.args.options.args.general.args.unitframes = {
+		type = "group",
+		name = L["UnitFrames"],
+		order = 100,
+		args = {
+			header = {
+				order = 1,
+				type = "header",
+				name = L["Additional unit frames options"],
+			},
+			info = {
+				order = 2,
+				type = "description",
+				name = L["Options for customizing unit frames. Please don't change these setting when ElvUI's testing frames for bosses and arena teams are shown. That will make them invisible until retoggling."],
+			},
+			Reset = {
+				order = 3,
+				type = 'execute',
+				name = L['Restore Defaults'],
+				desc = L["Reset these options to defaults"],
+				func = function() E:GetModule('SLE'):Reset(nil, true) end,
+			},
+			indicators = {
+				order = 5,
+				type = "group",
+				name = L["Player Frame Indicators"],
+				guiInline = true,
+				args = {
+					combaticopos = {
+						order = 6,
+						type = "select",
+						name = L["Combat Position"],
+						desc = L["Set the point to show combat icon"],
+						get = function(info) return E.db.sle.combatico.pos end,
+						set = function(info, value) E.db.sle.combatico.pos = value; UF:Update_CombatIndicator() end,
+						values = positionValues
+					},
+				},
+			},
 		},
-		indicators = {
-			order = 5,
-			type = "group",
-			name = L["Player Frame Indicators"],
+	}
+
+	if E.myclass == "DRUID" or E.myclass == "WARLOCK" then
+		E.Options.args.sle.args.options.args.general.args.unitframes.args.druid = {
+			order = 7,
+			type = 'group',
+			name = L["Classbar Energy"],
 			guiInline = true,
 			args = {
-				combaticopos = {
-					order = 6,
-					type = "select",
-					name = L["Combat Position"],
-					desc = L["Set the point to show combat icon"],
-					get = function(info) return E.db.sle.combatico.pos end,
-					set = function(info, value) E.db.sle.combatico.pos = value; UF:Update_CombatIndicator() end,
-					values = positionValues
+				powtext = {
+					order = 1,
+					type = "toggle",
+					name = L["Enable"],
+					desc = L["Show/hide the text with exact number of energy (Solar/Lunar or Demonic Fury) on your Classbar."],
+					get = function(info) return E.db.sle.powtext end,
+					set = function(info, value) E.db.sle.powtext = value; UF:ClassbarTextSLE() end,
 				},
 			},
-		},
-	},
-}
-
-if E.myclass == "DRUID" or E.myclass == "WARLOCK" then
-E.Options.args.sle.args.options.args.general.args.unitframes.args.druid = {
-	order = 7,
-	type = 'group',
-	name = L["Classbar Energy"],
-	guiInline = true,
-	args = {
-		powtext = {
-			order = 1,
-			type = "toggle",
-			name = L["Enable"],
-			desc = L["Show/hide the text with exact number of energy (Solar/Lunar or Demonic Fury) on your Classbar."],
-			get = function(info) return E.db.sle.powtext end,
-			set = function(info, value) E.db.sle.powtext = value; UF:ClassbarTextSLE() end,
-		},
-	},
-}
-end
-
+		}
+	end
 end

 table.insert(E.SLEConfigs, configTable)
\ No newline at end of file