From 0d7c70b35a421de45336fd08823795cebba0af8a Mon Sep 17 00:00:00 2001
From: Bunny67 <zolov67@yandex.ru>
Date: Sun, 9 Oct 2016 12:06:37 +0300
Subject: [PATCH] init

---
 .../actionbars/ClickThroughActionBars.lua     | 108 ++++++
 .../Categories/actionbars/PushedColor.lua     |  61 +++
 .../Categories/actionbars/load_tweaks.xml     |   4 +
 .../Categories/bags/BagButtons.lua            | 357 ++++++++++++++++++
 .../Categories/bags/load_tweaks.xml           |   3 +
 .../Categories/chat/MaxLines.lua              |  46 +++
 .../Categories/chat/load_tweaks.xml           |   3 +
 .../Categories/datatexts/BagsTextFormat.lua   |  90 +++++
 .../Categories/datatexts/load_tweaks.xml      |   3 +
 .../Categories/load_categories.xml            |   9 +
 .../Categories/minimap/MinimapSizeLimits.lua  |   9 +
 .../Categories/minimap/load_tweaks.xml        |   3 +
 .../Categories/misc/NoBorders.lua             |  81 ++++
 .../Categories/misc/RaidControl.lua           |  61 +++
 .../Categories/misc/load_tweaks.xml           |   4 +
 .../Categories/unitframes/AuraIconSpacing.lua | 178 +++++++++
 .../Categories/unitframes/AuraIconText.lua    | 301 +++++++++++++++
 .../unitframes/CastbarCustomBackdrop.lua      | 126 +++++++
 .../Categories/unitframes/CastbarText.lua     | 322 ++++++++++++++++
 .../Categories/unitframes/PowerBarTexture.lua |  79 ++++
 .../unitframes/UnitframeSpacingLimits.lua     |  14 +
 .../Categories/unitframes/load_tweaks.xml     |   8 +
 ElvUI_CustomTweaks/ElvUI_CustomTweaks.toc     |  12 +
 ElvUI_CustomTweaks/LICENSE.txt                |  19 +
 ElvUI_CustomTweaks/core.lua                   | 251 ++++++++++++
 ElvUI_CustomTweaks/locales.lua                | 167 ++++++++
 26 files changed, 2319 insertions(+)
 create mode 100644 ElvUI_CustomTweaks/Categories/actionbars/ClickThroughActionBars.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/actionbars/PushedColor.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/actionbars/load_tweaks.xml
 create mode 100644 ElvUI_CustomTweaks/Categories/bags/BagButtons.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/bags/load_tweaks.xml
 create mode 100644 ElvUI_CustomTweaks/Categories/chat/MaxLines.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/chat/load_tweaks.xml
 create mode 100644 ElvUI_CustomTweaks/Categories/datatexts/BagsTextFormat.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/datatexts/load_tweaks.xml
 create mode 100644 ElvUI_CustomTweaks/Categories/load_categories.xml
 create mode 100644 ElvUI_CustomTweaks/Categories/minimap/MinimapSizeLimits.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/minimap/load_tweaks.xml
 create mode 100644 ElvUI_CustomTweaks/Categories/misc/NoBorders.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/misc/RaidControl.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/misc/load_tweaks.xml
 create mode 100644 ElvUI_CustomTweaks/Categories/unitframes/AuraIconSpacing.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/unitframes/AuraIconText.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/unitframes/CastbarCustomBackdrop.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/unitframes/CastbarText.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/unitframes/PowerBarTexture.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/unitframes/UnitframeSpacingLimits.lua
 create mode 100644 ElvUI_CustomTweaks/Categories/unitframes/load_tweaks.xml
 create mode 100644 ElvUI_CustomTweaks/ElvUI_CustomTweaks.toc
 create mode 100644 ElvUI_CustomTweaks/LICENSE.txt
 create mode 100644 ElvUI_CustomTweaks/core.lua
 create mode 100644 ElvUI_CustomTweaks/locales.lua

diff --git a/ElvUI_CustomTweaks/Categories/actionbars/ClickThroughActionBars.lua b/ElvUI_CustomTweaks/Categories/actionbars/ClickThroughActionBars.lua
new file mode 100644
index 0000000..071ff27
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/actionbars/ClickThroughActionBars.lua
@@ -0,0 +1,108 @@
+local E, L, V, P, G = unpack(ElvUI)
+local AB = E:GetModule("ActionBars")
+local CT = E:GetModule("CustomTweaks")
+local isEnabled = E.private["actionbar"].enable and E.private["CustomTweaks"] and E.private["CustomTweaks"]["ClickThroughActionBars"] and true or false
+
+--Cache global variables
+local _G = _G
+local NUM_ACTIONBAR_BUTTONS = NUM_ACTIONBAR_BUTTONS
+local NUM_PET_ACTION_SLOTS = NUM_PET_ACTION_SLOTS
+local NUM_SHAPESHIFT_SLOTS = NUM_SHAPESHIFT_SLOTS
+
+---
+-- GLOBALS: IsAddOnLoaded, ElvUI_StanceBar, ElvUI_BarPet
+---
+
+P["CustomTweaks"]["ClickThroughActionBars"] = {
+	["bar1"] = false,
+	["bar2"] = false,
+	["bar3"] = false,
+	["bar4"] = false,
+	["bar5"] = false,
+	["bar6"] = false,
+	["bar7"] = false,
+	["bar8"] = false,
+	["bar9"] = false,
+	["bar10"] = false,
+	["barPet"] = false,
+	["stanceBar"] = false,
+}
+
+local function ConfigTable()
+	E.Options.args.CustomTweaks.args.Actionbar.args.options.args.ClickThroughActionBars = {
+		type = "group",
+		name = "ClickThroughActionBars",
+		args = {
+			barPet = {
+				order = 11,
+				type = "toggle",
+				name = L["Pet Bar"],
+				disabled = function() return not isEnabled end,
+				get = function(info) return E.db.CustomTweaks["ClickThroughActionBars"]["barPet"] end,
+				set = function(info, value) E.db.CustomTweaks["ClickThroughActionBars"]["barPet"] = value; AB:PositionAndSizeBarPet() end,
+			},
+			stanceBar = {
+				order = 12,
+				type = "toggle",
+				name = L["Stance Bar"],
+				disabled = function() return not isEnabled end,
+				get = function(info) return E.db.CustomTweaks["ClickThroughActionBars"]["stanceBar"] end,
+				set = function(info, value) E.db.CustomTweaks["ClickThroughActionBars"]["stanceBar"] = value; AB:PositionAndSizeBarShapeShift() end,
+			},
+		},
+	}
+
+	local numBars = 6
+	if IsAddOnLoaded("ElvUI_ExtraActionBars") then
+		numBars = 10
+	end
+
+	for i = 1, numBars do
+		E.Options.args.CustomTweaks.args.Actionbar.args.options.args.ClickThroughActionBars.args["bar"..i] = {
+			order = i,
+			type = "toggle",
+			name = L["Bar "]..i,
+			disabled = function() return not isEnabled end,
+			get = function(info) return E.db.CustomTweaks["ClickThroughActionBars"]["bar"..i] end,
+			set = function(info, value) E.db.CustomTweaks["ClickThroughActionBars"]["bar"..i] = value; AB:PositionAndSizeBar("bar"..i) end,
+		}
+	end
+end
+CT.Configs["ClickThroughActionBars"] = ConfigTable
+if not isEnabled then return; end
+
+local function PositionAndSizeBar(self, barName)
+	local clickThrough = E.db.CustomTweaks.ClickThroughActionBars[barName]
+	local bar = AB["handledBars"][barName]
+	local button
+
+	bar:EnableMouse(not clickThrough)
+	for i=1, NUM_ACTIONBAR_BUTTONS do
+		button = bar.buttons[i];
+		button:EnableMouse(not clickThrough)
+	end
+end
+
+local function PositionAndSizeBarShapeShift(self)
+	ElvUI_StanceBar:EnableMouse(not E.db.CustomTweaks.ClickThroughActionBars.stanceBar)
+	
+	local button
+	for i=1, NUM_SHAPESHIFT_SLOTS do
+		button = _G["ElvUI_StanceBarButton"..i];
+		button:EnableMouse(not E.db.CustomTweaks.ClickThroughActionBars.stanceBar)
+	end
+end
+
+local function PositionAndSizeBarPet(self)
+	ElvUI_BarPet:EnableMouse(not E.db.CustomTweaks.ClickThroughActionBars.barPet)
+	
+	local button
+	for i=1, NUM_PET_ACTION_SLOTS do
+		button = _G["PetActionButton"..i];
+		button:EnableMouse(not E.db.CustomTweaks.ClickThroughActionBars.barPet)
+	end
+end
+
+hooksecurefunc(AB, "PositionAndSizeBar", PositionAndSizeBar)
+hooksecurefunc(AB, "PositionAndSizeBarShapeShift", PositionAndSizeBarShapeShift)
+hooksecurefunc(AB, "PositionAndSizeBarPet", PositionAndSizeBarPet)
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/actionbars/PushedColor.lua b/ElvUI_CustomTweaks/Categories/actionbars/PushedColor.lua
new file mode 100644
index 0000000..781cafe
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/actionbars/PushedColor.lua
@@ -0,0 +1,61 @@
+local E, L, V, P, G = unpack(ElvUI)
+local AB = E:GetModule("ActionBars")
+local CT = E:GetModule("CustomTweaks")
+local isEnabled = E.private["actionbar"].enable and E.private["CustomTweaks"] and E.private["CustomTweaks"]["PushedColor"] and true or false
+
+--Cache global variables
+local pairs = pairs
+
+P["CustomTweaks"]["PushedColor"] = {
+	["Color"] = {r = 1, g = 0, b = 0, a = 0.3},
+}
+
+local function UpdateBars()
+	for barName in pairs(AB["handledBars"]) do
+		AB:PositionAndSizeBar(barName)
+	end
+	AB:PositionAndSizeBarPet()
+	AB:PositionAndSizeBarShapeShift()
+end
+
+local function ConfigTable()
+	E.Options.args.CustomTweaks.args.Actionbar.args.options.args.PushedColor = {
+		type = "group",
+		name = "PushedColor",
+		args = {
+			color = {
+				order = 1,
+				type = "color",
+				name = L["Color"],
+				disabled = function() return not isEnabled end,
+				hasAlpha = true,
+				get = function(info)
+					local t = E.db.CustomTweaks.PushedColor.Color
+					local d = P.CustomTweaks.PushedColor.Color
+					return t.r, t.g, t.b, t.a, d.r, d.g, d.b, d.a
+				end,
+				set = function(info, r, g, b, a)
+					E.db.CustomTweaks.PushedColor.Color = {}
+					local t = E.db.CustomTweaks.PushedColor.Color
+					t.r, t.g, t.b, t.a = r, g, b, a
+					UpdateBars()
+				end,
+			},
+		},
+	}
+end
+CT.Configs["PushedColor"] = ConfigTable
+if not isEnabled then return; end
+
+local function StyleButton(self, button, noBackdrop, adjustChecked)
+	if button.SetPushedTexture then
+		local c = E.db.CustomTweaks.PushedColor.Color
+		local r, g, b, a = c.r, c.g, c.b, c.a
+		local pushedmod = button:CreateTexture("frame", nil, self)
+		pushedmod:SetTexture(r, g, b, a)
+		pushedmod:SetInside()
+		button.pushedmod = pushedmod
+		button:SetPushedTexture(pushedmod)
+	end
+end
+hooksecurefunc(AB, "StyleButton", StyleButton)
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/actionbars/load_tweaks.xml b/ElvUI_CustomTweaks/Categories/actionbars/load_tweaks.xml
new file mode 100644
index 0000000..25f50a3
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/actionbars/load_tweaks.xml
@@ -0,0 +1,4 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file='ClickThroughActionBars.lua'/>
+	<Script file='PushedColor.lua'/>
+</Ui>
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/bags/BagButtons.lua b/ElvUI_CustomTweaks/Categories/bags/BagButtons.lua
new file mode 100644
index 0000000..38b267d
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/bags/BagButtons.lua
@@ -0,0 +1,357 @@
+local E, L, V, P, G = unpack(ElvUI)
+local B = E:GetModule("Bags")
+local CT = E:GetModule("CustomTweaks")
+local isEnabled = E.private["bags"].enable and E.private["CustomTweaks"] and E.private["CustomTweaks"]["BagButtons"] and true or false
+
+--Cache global variables
+local _G = _G
+local unpack = unpack
+local CreateFrame = CreateFrame
+local SortReagentBankBags = SortReagentBankBags
+local GetNumBankSlots = GetNumBankSlots
+local ToggleFrame = ToggleFrame
+local PlaySound = PlaySound
+local IsShiftKeyDown = IsShiftKeyDown
+local DepositReagentBank = DepositReagentBank
+
+---
+-- GLOBALS: BagItemAutoSortButton, BankFrame
+---
+
+P["CustomTweaks"]["BagButtons"] = {
+	["stackButton"] = false,
+	["style"] = "ICON",
+	["buttonColor"] = {r = 0.3, g = 0.3, b = 0.3}
+}
+
+local function ConfigTable()
+	E.Options.args.CustomTweaks.args.Bags.args.options.args.BagButtons = {
+		type = "group",
+		name = "BagButtons",
+		get = function(info) return E.db.CustomTweaks["BagButtons"][info[#info]] end,
+		set = function(info, value) E.db.CustomTweaks["BagButtons"][info[#info]] = value; CT:SetBagButtonStylePosition(); CT:SetBagButtonStylePosition(true); end,
+		args = {
+			stackButton = {
+				order = 1,
+				type = "toggle",
+				name = L["Add 'Stack' Button"],
+				disabled = function() return not isEnabled end,
+			},
+			style = {
+				order = 2,
+				type = "select",
+				name = L["Button Style"],
+				disabled = function() return not isEnabled end,
+				values = {
+					["ICON"] = L["Icons"],
+					["TEXTURE"] = L["Textures"],
+				},
+			},
+			buttonColor = {
+				order = 3,
+				type = "color",
+				name = L["Button Color"],
+				disabled = function() return not isEnabled or E.db.CustomTweaks.BagButtons.style == "ICON" end,
+				hasAlpha = false,
+				get = function(info)
+					local t = E.db.CustomTweaks.BagButtons[info[#info]]
+					local d = P.CustomTweaks.BagButtons[info[#info]]
+					return t.r, t.g, t.b, t.a, d.r, d.g, d.b
+				end,
+				set = function(info, r, g, b)
+					E.db.CustomTweaks.BagButtons[info[#info]] = {}
+					local t = E.db.CustomTweaks.BagButtons[info[#info]]
+					t.r, t.g, t.b = r, g, b
+					CT:SetButtonColors()
+					CT:SetButtonColors(true)
+				end,
+			},
+		},
+	}
+end
+CT.Configs["BagButtons"] = ConfigTable
+if not isEnabled then return; end
+
+local function CreateContainerButtons(self, name, isBank)
+	local f = _G[name]
+	local buttonColor = E:GetColorTable(E.db.CustomTweaks.BagButtons.buttonColor)
+
+	if (isBank) then
+		--Sort/Clean Up Button
+		f.sortButtonOld = CreateFrame("Button", name..'SortButtonOld', f);
+		f.sortButtonOld:Point('TOP', f, 'TOP', 29, -4)
+		f.sortButtonOld:Size(55, 10)
+		f.sortButtonOld:SetTemplate('Default', true)
+		f.sortButtonOld:SetBackdropColor(unpack(buttonColor))
+		f.sortButtonOld:SetScript("OnEnter", B.Tooltip_Show)
+		f.sortButtonOld:SetScript('OnClick', function()
+			if f.holderFrame:IsShown() then
+				B:CommandDecorator(B.SortBags, 'bank')();
+			else
+				SortReagentBankBags()
+			end
+		end)
+
+		--Purchase Bags Button
+		f.purchaseBagButtonOld = CreateFrame('Button', name..'PurchaseButtonOld', f.holderFrame)
+		f.purchaseBagButtonOld:Point('RIGHT', f.sortButtonOld, 'LEFT', -3, 0)
+		f.purchaseBagButtonOld:Size(55, 10)
+		f.purchaseBagButtonOld:SetTemplate('Default', true)
+		f.purchaseBagButtonOld:SetBackdropColor(unpack(buttonColor))
+		f.purchaseBagButtonOld.ttText = L['Purchase Bags']
+		f.purchaseBagButtonOld:SetScript("OnEnter", B.Tooltip_Show)
+		f.purchaseBagButtonOld:SetScript("OnLeave", B.Tooltip_Hide)
+		f.purchaseBagButtonOld:SetScript("OnClick", function()
+			local _, full = GetNumBankSlots()
+			if not full then
+				E:StaticPopup_Show("BUY_BANK_SLOT")
+			else
+				E:StaticPopup_Show("CANNOT_BUY_BANK_SLOT")
+			end
+		end)
+
+		--Toggle Bags Button
+		f.bagsButtonOld = CreateFrame("Button", name..'BagsButtonOld', f.holderFrame);
+		f.bagsButtonOld:Point('RIGHT', f.purchaseBagButtonOld, 'LEFT', -3, 0)
+		f.bagsButtonOld:Size(55, 10)
+		f.bagsButtonOld:SetTemplate('Default', true)
+		f.bagsButtonOld:SetBackdropColor(unpack(buttonColor))
+		f.bagsButtonOld.ttText = L['Toggle Bags'];
+		f.bagsButtonOld:SetScript("OnEnter", B.Tooltip_Show)
+		f.bagsButtonOld:SetScript("OnLeave", B.Tooltip_Hide)
+		f.bagsButtonOld:SetScript('OnClick', function()
+		local numSlots, full = GetNumBankSlots()
+			if numSlots >= 1 then
+				ToggleFrame(f.ContainerHolder)
+			else
+				E:StaticPopup_Show("NO_BANK_BAGS")
+			end
+		end)
+
+		--Stack/Transfer Button Icon
+		f.stackButton = CreateFrame("Button", name..'StackButton', f.holderFrame);
+		f.stackButton:SetSize(16 + E.Border, 16 + E.Border)
+		f.stackButton:SetTemplate()
+		f.stackButton:SetPoint("RIGHT", f.bagText, "LEFT", -5, E.Border * 2)
+		f.stackButton:SetNormalTexture("Interface\\ICONS\\INV_Pet_RatCage")
+		f.stackButton:GetNormalTexture():SetTexCoord(unpack(E.TexCoords))
+		f.stackButton:GetNormalTexture():SetInside()
+		f.stackButton:SetPushedTexture("Interface\\ICONS\\INV_Pet_RatCage")
+		f.stackButton:GetPushedTexture():SetTexCoord(unpack(E.TexCoords))
+		f.stackButton:GetPushedTexture():SetInside()
+		f.stackButton:StyleButton(nil, true)
+		f.stackButton.ttText = L['Stack Items In Bank']
+		f.stackButton.ttText2 = L['Hold Shift:']
+		f.stackButton.ttText2desc = L['Stack Items To Bags']
+		f.stackButton:SetScript("OnEnter", self.Tooltip_Show)
+		f.stackButton:SetScript("OnLeave", self.Tooltip_Hide)
+		f.stackButton:SetScript('OnClick', function()
+			if IsShiftKeyDown() then
+				B:CommandDecorator(B.Stack, 'bank bags')();
+			else
+				B:CommandDecorator(B.Compress, 'bank')();
+			end
+		end)
+
+		--Stack/Transfer Button
+		f.stackButtonOld = CreateFrame('Button', name..'StackButtonOld', f.holderFrame)
+		f.stackButtonOld:Point('LEFT', f.sortButtonOld, 'RIGHT', 3, 0)
+		f.stackButtonOld:Size(55, 10)
+		f.stackButtonOld:SetTemplate('Default', true)
+		f.stackButtonOld:SetBackdropColor(unpack(buttonColor))
+		f.stackButtonOld.ttText = L['Stack Items In Bank']
+		f.stackButtonOld.ttText2 = L['Hold Shift:']
+		f.stackButtonOld.ttText2desc = L['Stack Items To Bags']
+		f.stackButtonOld:SetScript("OnEnter", B.Tooltip_Show)
+		f.stackButtonOld:SetScript("OnLeave", B.Tooltip_Hide)
+		f.stackButtonOld:SetScript('OnClick', function()
+			if IsShiftKeyDown() then
+				B:CommandDecorator(B.Stack, 'bank bags')();
+			else
+				B:CommandDecorator(B.Compress, 'bank')();
+			end
+		end)
+	else
+		--Vendor Button
+		f.vendorGraysButtonOld = CreateFrame('Button', nil, f)
+		f.vendorGraysButtonOld:Point('TOP', f, 'TOP', 0, -4)
+		f.vendorGraysButtonOld:Size(55, 10)
+		f.vendorGraysButtonOld:SetTemplate('Default', true)
+		f.vendorGraysButtonOld:SetBackdropColor(unpack(buttonColor))
+		f.vendorGraysButtonOld.ttText = L['Vendor Grays']
+		f.vendorGraysButtonOld:SetScript("OnEnter", B.Tooltip_Show)
+		f.vendorGraysButtonOld:SetScript("OnLeave", B.Tooltip_Hide)
+		f.vendorGraysButtonOld:SetScript('OnClick', function() B:VendorGrayCheck(); end)
+
+		--Sort Button
+		f.sortButtonOld = CreateFrame('Button', nil, f)
+		f.sortButtonOld:Point('LEFT', f.vendorGraysButtonOld, 'RIGHT', 3, 0)
+		f.sortButtonOld:Size(55, 10)
+		f.sortButtonOld:SetTemplate('Default', true)
+		f.sortButtonOld:SetBackdropColor(unpack(buttonColor))
+		f.sortButtonOld:SetScript("OnEnter", B.Tooltip_Show)
+		f.sortButtonOld:SetScript('OnClick', function() B:CommandDecorator(B.SortBags, 'bags')(); end)
+
+		--Stack/Transfer Button Icon
+		f.stackButton = CreateFrame("Button", name..'StackButton', f.holderFrame);
+		f.stackButton:SetSize(16 + E.Border, 16 + E.Border)
+		f.stackButton:SetTemplate()
+		f.stackButton:SetPoint("RIGHT", f.goldText, "LEFT", -5, E.Border * 2)
+		f.stackButton:SetNormalTexture("Interface\\ICONS\\INV_Pet_RatCage")
+		f.stackButton:GetNormalTexture():SetTexCoord(unpack(E.TexCoords))
+		f.stackButton:GetNormalTexture():SetInside()
+		f.stackButton:SetPushedTexture("Interface\\ICONS\\INV_Pet_RatCage")
+		f.stackButton:GetPushedTexture():SetTexCoord(unpack(E.TexCoords))
+		f.stackButton:GetPushedTexture():SetInside()
+		f.stackButton:StyleButton(nil, true)
+		f.stackButton.ttText = L['Stack Items In Bags']
+		f.stackButton.ttText2 = L['Hold Shift:']
+		f.stackButton.ttText2desc = L['Stack Items To Bank']
+		f.stackButton:SetScript("OnEnter", self.Tooltip_Show)
+		f.stackButton:SetScript("OnLeave", self.Tooltip_Hide)
+		f.stackButton:SetScript('OnClick', function()
+			if IsShiftKeyDown() then
+				B:CommandDecorator(B.Stack, 'bags bank')();
+			else
+				B:CommandDecorator(B.Compress, 'bags')();
+			end
+		end)
+
+		--Stack/Transfer Button
+		f.stackButtonOld = CreateFrame('Button', nil, f)
+		f.stackButtonOld:Point('LEFT', f.sortButtonOld, 'RIGHT', 3, 0)
+		f.stackButtonOld:Size(55, 10)
+		f.stackButtonOld:SetTemplate('Default', true)
+		f.stackButtonOld:SetBackdropColor(unpack(buttonColor))
+		f.stackButtonOld.ttText = L['Stack Items In Bags']
+		f.stackButtonOld.ttText2 = L['Hold Shift:']
+		f.stackButtonOld.ttText2desc = L['Stack Items To Bank']
+		f.stackButtonOld:SetScript("OnEnter", B.Tooltip_Show)
+		f.stackButtonOld:SetScript("OnLeave", B.Tooltip_Hide)
+		f.stackButtonOld:SetScript('OnClick', function()
+			if IsShiftKeyDown() then
+				B:CommandDecorator(B.Stack, 'bags bank')();
+			else
+				B:CommandDecorator(B.Compress, 'bags')();
+			end
+		end)
+
+		--Bags Button
+		f.bagsButtonOld = CreateFrame('Button', nil, f)
+		f.bagsButtonOld:Point('RIGHT', f.vendorGraysButtonOld, 'LEFT', -3, 0)
+		f.bagsButtonOld:Size(55, 10)
+		f.bagsButtonOld:SetTemplate('Default', true)
+		f.bagsButtonOld:SetBackdropColor(unpack(buttonColor))
+		f.bagsButtonOld.ttText = L['Toggle Bags']
+		f.bagsButtonOld:SetScript("OnEnter", B.Tooltip_Show)
+		f.bagsButtonOld:SetScript("OnLeave", B.Tooltip_Hide)
+		f.bagsButtonOld:SetScript('OnClick', function() ToggleFrame(f.ContainerHolder) end)
+	end
+
+	CT:SetBagButtonStylePosition(isBank)
+	CT:SetButtonColors(isBank)
+end
+hooksecurefunc(B, "ContructContainerFrame", CreateContainerButtons)
+
+function CT:SetBagButtonStylePosition(isBank)
+	local f
+	if isBank then
+		f = _G["ElvUI_BankContainerFrame"]
+	else
+		f = _G["ElvUI_ContainerFrame"]
+	end
+	if not f then return; end
+
+	if E.db.CustomTweaks.BagButtons.stackButton and E.db.CustomTweaks.BagButtons.style == "ICON" then
+		f.stackButton:Show()
+		f.stackButtonOld:Hide()
+	elseif E.db.CustomTweaks.BagButtons.stackButton then
+		f.stackButton:Hide()
+		f.stackButtonOld:Show()
+	else
+		f.stackButton:Hide()
+		f.stackButtonOld:Hide()
+	end
+
+	if E.db.CustomTweaks.BagButtons.style == "ICON" then
+		f.sortButton:Show()
+		f.bagsButton:Show()
+		f.sortButtonOld:Hide()
+		f.bagsButtonOld:Hide()
+	else
+		f.sortButton:Hide()
+		f.bagsButton:Hide()
+		f.sortButtonOld:Show()
+		f.bagsButtonOld:Show()
+	end
+
+	if (isBank) then
+		if E.db.CustomTweaks.BagButtons.style == "ICON" then
+			f.purchaseBagButton:Show()
+			f.purchaseBagButtonOld:Hide()
+			f.editBox:Point('RIGHT', f.purchaseBagButton, 'LEFT', -5, 0);
+		else
+			f.purchaseBagButton:Hide()
+			f.purchaseBagButtonOld:Show()
+			if E.db.CustomTweaks.BagButtons.stackButton then
+				f.sortButtonOld:Point('TOP', f, 'TOP', 0, -4)
+			else
+				if f.holderFrame:IsShown() then
+					f.sortButtonOld:Point('TOP', f, 'TOP', 29, -4)
+				end
+			end
+			f.editBox:Point('RIGHT', f.bagText, 'LEFT', -5, 0);
+		end
+	else
+		if E.db.CustomTweaks.BagButtons.style == "ICON" then
+			f.vendorGraysButton:Show()
+			f.vendorGraysButtonOld:Hide()
+			if E.db.CustomTweaks.BagButtons.stackButton then
+				f.sortButton:Point('RIGHT', f.stackButton, 'LEFT', -5, 0)
+			else
+				f.sortButton:Point("RIGHT", f.goldText, "LEFT", -5, E.Border * 2)
+			end
+			f.editBox:Point('RIGHT', f.vendorGraysButton, 'LEFT', -5, 0);
+		else
+			f.vendorGraysButton:Hide()
+			f.vendorGraysButtonOld:Show()
+			if E.db.CustomTweaks.BagButtons.stackButton then
+				f.vendorGraysButtonOld:Point('TOP', f, 'TOP', -29, -4)
+			else
+				f.vendorGraysButtonOld:Point('TOP', f, 'TOP', 0, -4)
+			end
+			f.editBox:Point('RIGHT', f.goldText, 'LEFT', -5, 0);
+		end
+	end
+end
+
+function CT:SetButtonColors(isBank)
+	local buttonColor = E:GetColorTable(E.db.CustomTweaks.BagButtons.buttonColor)
+	local f
+	if isBank then
+		f = _G["ElvUI_BankContainerFrame"]
+	else
+		f = _G["ElvUI_ContainerFrame"]
+	end
+	if not f then return; end
+
+	f.sortButtonOld.SetBackdropColor = nil
+	f.stackButtonOld.SetBackdropColor = nil
+	f.bagsButtonOld.SetBackdropColor = nil
+	f.sortButtonOld:SetBackdropColor(unpack(buttonColor))
+	f.stackButtonOld:SetBackdropColor(unpack(buttonColor))
+	f.bagsButtonOld:SetBackdropColor(unpack(buttonColor))
+	f.sortButtonOld.SetBackdropColor = E.noop
+	f.stackButtonOld.SetBackdropColor = E.noop
+	f.bagsButtonOld.SetBackdropColor = E.noop
+	
+	if isBank then
+		f.purchaseBagButtonOld.SetBackdropColor = nil
+		f.purchaseBagButtonOld:SetBackdropColor(unpack(buttonColor))
+		f.purchaseBagButtonOld.SetBackdropColor = E.noop
+	else
+		f.vendorGraysButtonOld.SetBackdropColor = nil
+		f.vendorGraysButtonOld:SetBackdropColor(unpack(buttonColor))
+		f.vendorGraysButtonOld.SetBackdropColor = E.noop
+	end
+end
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/bags/load_tweaks.xml b/ElvUI_CustomTweaks/Categories/bags/load_tweaks.xml
new file mode 100644
index 0000000..e30a6df
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/bags/load_tweaks.xml
@@ -0,0 +1,3 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file='BagButtons.lua'/>
+</Ui>
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/chat/MaxLines.lua b/ElvUI_CustomTweaks/Categories/chat/MaxLines.lua
new file mode 100644
index 0000000..ad279b6
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/chat/MaxLines.lua
@@ -0,0 +1,46 @@
+local E, L, V, P, G = unpack(ElvUI)
+local CH = E:GetModule("Chat")
+local CT = E:GetModule("CustomTweaks")
+local isEnabled = E.private["chat"].enable and E.private["CustomTweaks"] and E.private["CustomTweaks"]["ChatMaxLines"] and true or false
+
+--Cache global variables
+local _G = _G
+local pairs = pairs
+
+---
+-- GLOBALS: CHAT_FRAMES
+---
+
+P["CustomTweaks"]["ChatMaxLines"] = {
+	["MaxLines"] = 128,
+}
+
+local UpdateMaxLines
+local function ConfigTable()
+	E.Options.args.CustomTweaks.args.Chat.args.options.args.ChatMaxLines = {
+		type = "group",
+		name = "ChatMaxLines",
+		get = function(info) return E.db.CustomTweaks.ChatMaxLines[info[#info]] end,
+		set = function(info, value) E.db.CustomTweaks.ChatMaxLines[info[#info]] = value; UpdateMaxLines() end,
+		args = {
+			MaxLines = {
+				order = 1,
+				type = "range",
+				name = L["Max Lines"],
+				desc = L["The max amount of messages kept in chat before they get replaced by new messages. Changing this setting will clear the chat in all windows."],
+				disabled = function() return not isEnabled end,
+				min = 1, max = 5000, step = 1,
+			},
+		},
+	}
+end
+CT.Configs["ChatMaxLines"] = ConfigTable
+if not isEnabled then return; end
+
+function UpdateMaxLines()
+	for _, frameName in pairs(CHAT_FRAMES) do
+		local frame = _G[frameName]
+		frame:SetMaxLines(E.db.CustomTweaks.ChatMaxLines.MaxLines)
+	end
+end
+hooksecurefunc(CH, "Initialize", UpdateMaxLines)
diff --git a/ElvUI_CustomTweaks/Categories/chat/load_tweaks.xml b/ElvUI_CustomTweaks/Categories/chat/load_tweaks.xml
new file mode 100644
index 0000000..af87fa2
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/chat/load_tweaks.xml
@@ -0,0 +1,3 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file='MaxLines.lua'/>
+</Ui>
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/datatexts/BagsTextFormat.lua b/ElvUI_CustomTweaks/Categories/datatexts/BagsTextFormat.lua
new file mode 100644
index 0000000..8f01934
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/datatexts/BagsTextFormat.lua
@@ -0,0 +1,90 @@
+local E, L, V, P, G = unpack(ElvUI)
+local DT = E:GetModule("DataTexts")
+local CT = E:GetModule("CustomTweaks")
+local isEnabled = E.private["CustomTweaks"] and E.private["CustomTweaks"]["BagsTextFormat"] and true or false
+
+--Cache global variables
+local unpack = unpack
+local join = string.join
+local GetContainerNumFreeSlots = GetContainerNumFreeSlots
+local GetContainerNumSlots = GetContainerNumSlots
+local NUM_BAG_SLOTS = NUM_BAG_SLOTS
+
+local displayString = ""
+local lastPanel
+
+P["CustomTweaks"]["BagsTextFormat"] = {
+	["textFormat"] = "USED_TOTAL",
+}
+
+local function ConfigTable()
+	E.Options.args.CustomTweaks.args.Datatexts.args.options.args.BagsTextFormat = {
+		type = "group",
+		name = "BagsTextFormat",
+		get = function(info) return E.db.CustomTweaks.BagsTextFormat[info[#info]] end,
+		set = function(info, value) E.db.CustomTweaks.BagsTextFormat[info[#info]] = value; CT:UpdateDatatext() end,
+		args = {
+			textFormat = {
+				order = 1,
+				type = "select",
+				name = L["Bags Text Format"],
+				disabled = function() return not isEnabled end,
+				values = {
+					["FREE"] = L["Only Free Slots"],
+					["USED"] = L["Only Used Slots"],
+					["FREE_TOTAL"] = L["Free/Total"],
+					["USED_TOTAL"] = L["Used/Total"],
+				},
+			},
+		},
+	}
+end
+CT.Configs["BagsTextFormat"] = ConfigTable
+if not isEnabled then return; end
+
+local function OnEvent(self, event, ...)
+	lastPanel = self
+	local free, total,used = 0, 0, 0
+	for i = 0, NUM_BAG_SLOTS do
+		free, total = free + GetContainerNumFreeSlots(i), total + GetContainerNumSlots(i)
+	end
+	used = total - free
+	local textFormat = E.db.CustomTweaks.BagsTextFormat.textFormat
+	if textFormat == "FREE" then
+		self.text:SetFormattedText(displayString, L["Bags"]..": ", free)
+	elseif textFormat == "USED" then
+		self.text:SetFormattedText(displayString, L["Bags"]..": ", used)
+	elseif textFormat == "FREE_TOTAL" then
+		self.text:SetFormattedText(displayString, L["Bags"]..": ", free, total)
+	else
+		self.text:SetFormattedText(displayString, L["Bags"]..": ", used, total)
+	end
+end
+
+local function ValueColorUpdate(hex, r, g, b)
+	local textFormat = E.db.CustomTweaks.BagsTextFormat.textFormat
+	if(not textFormat) then return; end
+
+	if textFormat == "FREE" or textFormat == "USED" then
+		displayString = join("", "%s", hex, "%d|r")
+	else
+		displayString = join("", "%s", hex, "%d/%d|r")
+	end
+
+	if lastPanel ~= nil then
+		OnEvent(lastPanel)
+	end
+end
+E["valueColorUpdateFuncs"][ValueColorUpdate] = true
+
+function CT:UpdateDatatext()
+	ValueColorUpdate(E["media"].hexvaluecolor, unpack(E["media"].rgbvaluecolor))
+	if DT.RegisteredDataTexts and DT.RegisteredDataTexts["Bags"] and DT.RegisteredDataTexts["Bags"].eventFunc then
+		DT.RegisteredDataTexts["Bags"].eventFunc = OnEvent
+	end
+	DT:LoadDataTexts()
+end
+
+local f = CreateFrame("Frame")
+f:RegisterEvent("PLAYER_ENTERING_WORLD")
+f:SetScript("OnEvent", CT.UpdateDatatext)
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/datatexts/load_tweaks.xml b/ElvUI_CustomTweaks/Categories/datatexts/load_tweaks.xml
new file mode 100644
index 0000000..181ea29
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/datatexts/load_tweaks.xml
@@ -0,0 +1,3 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file='BagsTextFormat.lua'/>
+</Ui>
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/load_categories.xml b/ElvUI_CustomTweaks/Categories/load_categories.xml
new file mode 100644
index 0000000..a7b4820
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/load_categories.xml
@@ -0,0 +1,9 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Include file="actionbars\load_tweaks.xml"/>
+	<Include file="bags\load_tweaks.xml"/>
+	<Include file="chat\load_tweaks.xml"/>
+	<Include file="datatexts\load_tweaks.xml"/>
+	<Include file="minimap\load_tweaks.xml"/>
+	<Include file="misc\load_tweaks.xml"/>
+	<Include file="unitframes\load_tweaks.xml"/>
+</Ui>
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/minimap/MinimapSizeLimits.lua b/ElvUI_CustomTweaks/Categories/minimap/MinimapSizeLimits.lua
new file mode 100644
index 0000000..18f99e3
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/minimap/MinimapSizeLimits.lua
@@ -0,0 +1,9 @@
+local E, L, V, P, G = unpack(ElvUI)
+if not E.private["general"]["minimap"].enable or not E.private["CustomTweaks"] or not E.private["CustomTweaks"]["MinimapSizeLimits"] then return end;
+
+local CT = E:GetModule("CustomTweaks")
+
+local function ConfigTable()
+	E.Options.args.maps.args.minimap.args.size.min = 40
+end
+CT.Configs["MinimapSizeLimits"] = ConfigTable
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/minimap/load_tweaks.xml b/ElvUI_CustomTweaks/Categories/minimap/load_tweaks.xml
new file mode 100644
index 0000000..495f010
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/minimap/load_tweaks.xml
@@ -0,0 +1,3 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file='MinimapSizeLimits.lua'/>
+</Ui>
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/misc/NoBorders.lua b/ElvUI_CustomTweaks/Categories/misc/NoBorders.lua
new file mode 100644
index 0000000..a1686e8
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/misc/NoBorders.lua
@@ -0,0 +1,81 @@
+local E, L, V, P, G = unpack(ElvUI)
+local CT = E:GetModule("CustomTweaks")
+if not E.private["CustomTweaks"] or not E.private["CustomTweaks"]["NoBorders"] then return end;
+
+--Cache global variables
+local unpack, getmetatable = unpack, getmetatable
+local hooksecurefunc = hooksecurefunc
+local RAID_CLASS_COLORS = RAID_CLASS_COLORS
+
+--Code taken from ElvUI
+local backdropr, backdropg, backdropb, backdropa, borderr, borderg, borderb = 0, 0, 0, 1, 0, 0, 0
+local function GetTemplate(t)
+	backdropa = 1
+	if t == "ClassColor" then
+		borderr, borderg, borderb = RAID_CLASS_COLORS[E.myclass].r, RAID_CLASS_COLORS[E.myclass].g, RAID_CLASS_COLORS[E.myclass].b
+		if t ~= "Transparent" then
+			backdropr, backdropg, backdropb = unpack(E["media"].backdropcolor)
+		else
+			backdropr, backdropg, backdropb, backdropa = unpack(E["media"].backdropfadecolor)
+		end
+	elseif t == "Transparent" then
+		borderr, borderg, borderb = unpack(E["media"].bordercolor)
+		backdropr, backdropg, backdropb, backdropa = unpack(E["media"].backdropfadecolor)
+	else
+		borderr, borderg, borderb = unpack(E["media"].bordercolor)
+		backdropr, backdropg, backdropb = unpack(E["media"].backdropcolor)
+	end
+end
+
+--Code taken from ElvUI and modified to remove borders
+local function SetTemplate(f, t, glossTex, ignoreUpdates)
+	GetTemplate(t)
+
+	local bgFile = E.media.blankTex;
+	if(glossTex) then
+		bgFile = E.media.glossTex;
+	end
+
+	f:SetBackdrop({
+	  bgFile = bgFile,
+	  edgeFile = nil,
+	  tile = false, tileSize = 0, edgeSize = 0,
+	  insets = { left = 0, right = 0, top = 0, bottom = 0}
+	})
+
+	if t == 'Transparent' then
+		f:SetBackdropColor(backdropr, backdropg, backdropb, backdropa)
+		if not E.private.general.pixelPerfect then
+			f.iborder:SetBackdropBorderColor(0, 0, 0, 0)
+			f.oborder:SetBackdropBorderColor(0, 0, 0, 0)
+		end
+	end
+
+	f:SetBackdropColor(backdropr, backdropg, backdropb, backdropa)
+	f:SetBackdropBorderColor(0, 0, 0, 0)
+end
+
+--Code taken from ElvUI
+local function addapi(object)
+	if not object.isCTHooked then
+		local mt = getmetatable(object).__index
+		hooksecurefunc(mt, "SetTemplate", SetTemplate)
+		object.isCTHooked = true
+	end
+end
+
+local handled = {["Frame"] = true}
+local object = CreateFrame("Frame")
+addapi(object)
+addapi(object:CreateTexture())
+addapi(object:CreateFontString())
+
+object = EnumerateFrames()
+while object do
+	if not handled[object:GetObjectType()] then
+		addapi(object)
+		handled[object:GetObjectType()] = true
+	end
+
+	object = EnumerateFrames(object)
+end
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/misc/RaidControl.lua b/ElvUI_CustomTweaks/Categories/misc/RaidControl.lua
new file mode 100644
index 0000000..d761c58
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/misc/RaidControl.lua
@@ -0,0 +1,61 @@
+local E, L, V, P, G = unpack(ElvUI)
+local RU = E:GetModule("RaidUtility")
+local CT = E:GetModule("CustomTweaks")
+local isEnabled = E.private["CustomTweaks"] and E.private["CustomTweaks"]["RaidControl"] and true or false
+
+--Cache global variables
+local InCombatLockdown = InCombatLockdown
+
+---
+-- GLOBALS: RaidUtility_ShowButton, RaidUtility_CloseButton, RaidUtilityPanel
+---
+
+P["CustomTweaks"]["RaidControl"] = {
+	["hide"] = false,
+	["transparent"] = true,
+}
+
+local UpdateRaidControl
+local function ConfigTable()
+	E.Options.args.CustomTweaks.args.Misc.args.options.args.RaidControl = {
+		type = "group",
+		name = "RaidControl",
+		get = function(info) return E.db.CustomTweaks.RaidControl[info[#info]] end,
+		set = function(info, value) E.db.CustomTweaks.RaidControl[info[#info]] = value; UpdateRaidControl() end,
+		args = {
+			hide = {
+				order = 1,
+				type = "toggle",
+				name = L["Hide Raid Control"],
+				disabled = function() return not isEnabled end,
+			},
+			transparent = {
+				order = 2,
+				type = "toggle",
+				name = L["Use Transparent Template"],
+				disabled = function() return not isEnabled end,
+			},
+		},
+	}
+end
+CT.Configs["RaidControl"] = ConfigTable
+if not isEnabled then return; end
+
+function UpdateRaidControl()
+	if InCombatLockdown() then return; end
+
+	if (E.db.CustomTweaks.RaidControl.hide) then
+		RaidUtility_ShowButton:Hide()
+		RaidUtilityPanel:Hide()
+	end
+	if (E.db.CustomTweaks.RaidControl.transparent) then
+		RaidUtility_ShowButton:SetTemplate("Transparent")
+		RaidUtility_CloseButton:SetTemplate("Transparent")
+		RaidUtilityPanel:SetTemplate("Transparent")
+	else
+		RaidUtility_ShowButton:SetTemplate("Default", true)
+		RaidUtility_CloseButton:SetTemplate("Default", true)
+		RaidUtilityPanel:SetTemplate("Default", true)
+	end
+end
+hooksecurefunc(RU, "ToggleRaidUtil", UpdateRaidControl)
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/misc/load_tweaks.xml b/ElvUI_CustomTweaks/Categories/misc/load_tweaks.xml
new file mode 100644
index 0000000..3417b72
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/misc/load_tweaks.xml
@@ -0,0 +1,4 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file='NoBorders.lua'/>
+	<Script file='RaidControl.lua'/>
+</Ui>
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/unitframes/AuraIconSpacing.lua b/ElvUI_CustomTweaks/Categories/unitframes/AuraIconSpacing.lua
new file mode 100644
index 0000000..c18ec97
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/unitframes/AuraIconSpacing.lua
@@ -0,0 +1,178 @@
+local E, L, V, P, G = unpack(ElvUI)
+local UF = E:GetModule("UnitFrames")
+local CT = E:GetModule("CustomTweaks")
+local isEnabled = E.private["unitframe"].enable and E.private["CustomTweaks"] and E.private["CustomTweaks"]["AuraIconSpacing"] and true or false
+
+--Cache global variables
+local _G = _G
+local pairs = pairs
+
+local UpdateAuraSettings
+
+P["CustomTweaks"]["AuraIconSpacing"] = {
+	["spacing"] = 1,
+	["units"] = {
+		["player"] = true,
+		["target"] = true,
+		["targettarget"] = true,
+		["targettargettarget"] = true,
+		["focus"] = true,
+		["focustarget"] = true,
+		["pet"] = true,
+		["pettarget"] = true,
+		["arena"] = true,
+		["boss"] = true,
+		["party"] = true,
+		["raid"] = true,
+		["raid40"] = true,
+		["raidpet"] = true,
+		["tank"] = true,
+		["assist"] = true,
+	},
+}
+
+local function ConfigTable()
+	E.Options.args.CustomTweaks.args.Unitframe.args.options.args.AuraIconSpacing = {
+		type = "group",
+		name = "AuraIconSpacing",
+		args = {
+			spacing = {
+				type = 'range',
+				order = 1,
+				name = L["Aura Spacing"],
+				desc = L["Sets space between individual aura icons."],
+				get = function(info) return E.db.CustomTweaks.AuraIconSpacing.spacing end,
+				set = function(info, value) E.db.CustomTweaks.AuraIconSpacing.spacing = value; UpdateAuraSettings(); end,
+				disabled = function() return not isEnabled end,
+				min = 0, max = 10, step = 1,
+			},
+			units = {
+				type = "multiselect",
+				order = 2,
+				name = L["Set Aura Spacing On Following Units"],
+				get = function(info, key) return E.db.CustomTweaks.AuraIconSpacing.units[key] end,
+				set = function(info, key, value) E.db.CustomTweaks.AuraIconSpacing.units[key] = value; UpdateAuraSettings(); end,
+				disabled = function() return not isEnabled end,
+				values = {
+					['player'] = L["Player"],
+					['target'] = L["Target"],
+					['targettarget'] = L["TargetTarget"],
+					['targettargettarget'] = L["TargetTargetTarget"],
+					['focus'] = L["Focus"],
+					['focustarget'] = L["FocusTarget"],
+					['pet'] = L["Pet"],
+					['pettarget'] = L["PetTarget"],
+					['arena'] = L["Arena"],
+					['boss'] = L["Boss"],
+					['party'] = L["Party"],
+					['raid'] = L["Raid"],
+					['raid40'] = L["Raid40"],
+					['raidpet'] = L["RaidPet"],
+					["tank"] = L["Tank"],
+					["assist"] = L["Assist"],
+				},
+			},
+		},
+	}
+end
+CT.Configs["AuraIconSpacing"] = ConfigTable
+if not isEnabled then return; end
+
+local function OnPostUpdateAura(self, unit, button)
+	local size = button:GetParent().size
+	if size then
+		button:SetSize(size, size) --:Size() uses E:Scale() which causes overlapping borders
+	end
+end
+hooksecurefunc(UF, "PostUpdateAura", OnPostUpdateAura)
+
+--Set spacing between individual aura icons and update PostUpdateIcon
+local function SetAuraSpacingAndUpdate(unitframe, unitName, auraSpacing)
+	if not unitframe.Buffs and not unitframe.Debuffs then return; end
+
+	if unitframe.Buffs then
+		unitframe.Buffs.spacing = auraSpacing
+		--Reset PostUpdateIcon so it includes our hook
+		unitframe.Buffs.PostUpdateIcon = nil
+		unitframe.Buffs.PostUpdateIcon = UF.PostUpdateAura
+		--Update internal aura settings
+		if unitframe.db then
+			UF:Configure_Auras(unitframe, "Buffs")
+		end
+	end
+	if unitframe.Debuffs then
+		unitframe.Debuffs.spacing = auraSpacing
+		unitframe.Debuffs.PostUpdateIcon = nil
+		unitframe.Debuffs.PostUpdateIcon = UF.PostUpdateAura
+		if unitframe.db then
+			UF:Configure_Auras(unitframe, "Debuffs")
+		end
+	end
+
+	--Refresh aura display
+	if unitframe.IsElementEnabled and unitframe:IsElementEnabled("Aura") then
+		unitframe:UpdateElement("Aura")
+	end
+end
+
+function UpdateAuraSettings()
+	local auraSpacing = E.db.CustomTweaks.AuraIconSpacing.spacing or 1
+
+	for unit, unitName in pairs(UF.units) do
+		local spacing = E.db.CustomTweaks.AuraIconSpacing.units[unitName] and auraSpacing or E.spacing
+		local frameNameUnit = E:StringTitle(unitName)
+		frameNameUnit = frameNameUnit:gsub("t(arget)", "T%1")
+		
+		local unitframe = _G["ElvUF_"..frameNameUnit]
+		if unitframe then
+			SetAuraSpacingAndUpdate(unitframe, unitName, spacing)
+		end
+	end
+
+	for unit, unitgroup in pairs(UF.groupunits) do
+		local spacing = E.db.CustomTweaks.AuraIconSpacing.units[unitgroup] and auraSpacing or E.spacing
+		local frameNameUnit = E:StringTitle(unit)
+		frameNameUnit = frameNameUnit:gsub("t(arget)", "T%1")
+		
+		local unitframe = _G["ElvUF_"..frameNameUnit]
+		if unitframe then
+			SetAuraSpacingAndUpdate(unitframe, unitgroup, spacing)
+		end
+	end
+	
+	for _, header in pairs(UF.headers) do
+		local name = header.groupName
+		local spacing = E.db.CustomTweaks.AuraIconSpacing.units[name] and auraSpacing or E.spacing
+
+		for i = 1, header:GetNumChildren() do
+			local group = select(i, header:GetChildren())
+			--group is Tank/Assist Frames, but for Party/Raid we need to go deeper
+			SetAuraSpacingAndUpdate(group, name, spacing)
+
+			for j = 1, group:GetNumChildren() do
+				--Party/Raid unitbutton
+				local unitbutton = select(j, group:GetChildren())
+				SetAuraSpacingAndUpdate(unitbutton, name, spacing)
+			end
+		end
+	end
+end
+
+local f = CreateFrame("Frame")
+f:RegisterEvent("PLAYER_ENTERING_WORLD")
+f:SetScript("OnEvent", function(self)
+	self:UnregisterEvent("PLAYER_ENTERING_WORLD")
+	UpdateAuraSettings()
+end)
+
+local function SetAuraWidth(self, frame, auraType)
+	local db = frame.db
+
+	local auras = frame[auraType]
+	auraType = auraType:lower()
+	
+	if db[auraType].sizeOverride and db[auraType].sizeOverride > 0 then
+		auras:SetWidth(db[auraType].perrow * db[auraType].sizeOverride + ((db[auraType].perrow - 1) * auras.spacing))
+	end
+end
+hooksecurefunc(UF, 'Configure_Auras', SetAuraWidth)
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/unitframes/AuraIconText.lua b/ElvUI_CustomTweaks/Categories/unitframes/AuraIconText.lua
new file mode 100644
index 0000000..3c93b5b
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/unitframes/AuraIconText.lua
@@ -0,0 +1,301 @@
+local E, L, V, P, G = unpack(ElvUI)
+local UF = E:GetModule("UnitFrames")
+local CT = E:GetModule("CustomTweaks")
+local isEnabled = E.private["unitframe"].enable and E.private["CustomTweaks"] and E.private["CustomTweaks"]["AuraIconText"] and true or false
+
+--Cache global variables
+local CreateFrame = CreateFrame
+
+P["CustomTweaks"]["AuraIconText"] = {
+	["durationTextPos"] = "TOPLEFT",
+	["durationTextOffsetX"] = 3,
+	["durationTextOffsetY"] = -3,
+	["stackTextPos"] = "BOTTOMRIGHT",
+	["stackTextOffsetX"] = 1,
+	["stackTextOffsetY"] = 2,
+	["hideDurationText"] = false,
+	["hideStackText"] = false,
+	["durationFilterOwner"] = false,
+	["durationThreshold"] = -1,
+	["stackFilterOwner"] = false,
+}
+
+local function ConfigTable()
+	E.Options.args.CustomTweaks.args.Unitframe.args.options.args.AuraIconText = {
+		type = "group",
+		name = "AuraIconText",
+		get = function(info) return E.db.CustomTweaks.AuraIconText[info[#info]] end,
+		set = function(info, value) E.db.CustomTweaks.AuraIconText[info[#info]] = value; E:StaticPopup_Show("CONFIG_RL"); end,
+		args = {
+			dur = {
+				order = 1,
+				type = "group",
+				name = L["Duration Text"],
+				guiInline = true,
+				args = {
+					hideDurationText = {
+						order = 1,
+						type = "toggle",
+						name = L["Hide Text"],
+						set = function(info, value) E.db.CustomTweaks.AuraIconText.hideDurationText = value; end,
+						disabled = function() return not isEnabled end,
+					},
+					durationFilterOwner = {
+						order = 2,
+						type = "toggle",
+						name = L["Hide From Others"],
+						desc = L["Will hide duration text on auras that are not cast by you."],
+						set = function(info, value) E.db.CustomTweaks.AuraIconText.durationFilterOwner = value; end,
+						disabled = function() return (not isEnabled or E.db.CustomTweaks.AuraIconText.hideDurationText) end,
+					},
+					durationThreshold = {
+						order = 3,
+						type = "range",
+						name = L["Threshold"],
+						desc = L["Duration text will be hidden until it reaches this threshold (in seconds). Set to -1 to always show duration text."],
+						set = function(info, value) E.db.CustomTweaks.AuraIconText.durationThreshold = value; end,
+						disabled = function() return (not isEnabled or E.db.CustomTweaks.AuraIconText.hideDurationText) end,
+						min = -1, max = 60, step = 1,
+					},
+					durationTextPos = {
+						order = 4,
+						type = "select",
+						name = L["Position"],
+						desc = L["Position of the duration text on the aura icon."],
+						disabled = function() return not isEnabled end,
+						values = {
+							["BOTTOMLEFT"] = L["Bottom Left"],
+							["BOTTOMRIGHT"] = L["Bottom Right"],
+							["TOPLEFT"] = L["Top Left"],
+							["TOPRIGHT"] = L["Top Right"],
+							["CENTER"] = L["Center"],
+						},
+					},
+					durationTextOffsetX = {
+						order = 5,
+						type = "range",
+						name = L["X-Offset"],
+						desc = L["Horizontal offset of the duration text."],
+						disabled = function() return not isEnabled end,
+						min = -20, max = 20, step = 1,
+					},
+					durationTextOffsetY = {
+						order = 6,
+						type = "range",
+						name = L["Y-Offset"],
+						desc = L["Vertical offset of the duration text."],
+						disabled = function() return not isEnabled end,
+						min = -20, max = 20, step = 1,
+					},
+				},
+			},
+			stack = {
+				order = 2,
+				type = "group",
+				name = L["Stack Text"],
+				guiInline = true,
+				args = {
+					hideStackText = {
+						order = 1,
+						type = "toggle",
+						name = L["Hide Text"],
+						set = function(info, value) E.db.CustomTweaks.AuraIconText.hideStackText = value; end,
+						disabled = function() return not isEnabled end,
+					},
+					stackFilterOwner = {
+						order = 2,
+						type = "toggle",
+						name = L["Hide From Others"],
+						desc = L["Will hide stack text on auras that are not cast by you."],
+						set = function(info, value) E.db.CustomTweaks.AuraIconText.stackFilterOwner = value; end,
+						disabled = function() return (not isEnabled or E.db.CustomTweaks.AuraIconText.hideStackText) end,
+					},
+					stackTextPos = {
+						order = 3,
+						type = "select",
+						name = L["Position"],
+						desc = L["Position of the stack count on the aura icon."],
+						disabled = function() return not isEnabled end,
+						values = {
+							["BOTTOMLEFT"] = L["Bottom Left"],
+							["BOTTOMRIGHT"] = L["Bottom Right"],
+							["TOPLEFT"] = L["Top Left"],
+							["TOPRIGHT"] = L["Top Right"],
+							["CENTER"] = L["Center"],
+						},
+					},
+					spacer = {
+						order = 4,
+						type = "description",
+						name = "",
+					},
+					stackTextOffsetX = {
+						order = 5,
+						type = "range",
+						name = L["X-Offset"],
+						desc = L["Horizontal offset of the stack count."],
+						disabled = function() return not isEnabled end,
+						min = -20, max = 20, step = 1,
+					},
+					stackTextOffsetY = {
+						order = 6,
+						type = "range",
+						name = L["Y-Offset"],
+						desc = L["Vertical offset of the stack count."],
+						disabled = function() return not isEnabled end,
+						min = -20, max = 20, step = 1,
+					},
+				},
+			},
+		},
+	}
+end
+CT.Configs["AuraIconText"] = ConfigTable
+if not isEnabled then return; end
+
+local function UpdateAuraIconSettings(self, auras, noCycle)
+	local frame = auras:GetParent()
+	local type = auras.type
+	if(noCycle) then
+		frame = auras:GetParent():GetParent()
+		type = auras:GetParent().type
+	end
+	if(not frame.db) then return end
+
+	local db = frame.db[type]
+	local index = 1
+	if(db) then
+		local config = E.db.CustomTweaks.AuraIconText
+		if(not noCycle) then
+			while(auras[index]) do
+				local button = auras[index]
+				button.text:Point(config.durationTextPos, config.durationTextOffsetX, config.durationTextOffsetY)
+				button.count:Point(config.stackTextPos, config.stackTextOffsetX, config.stackTextOffsetY)
+
+				if not button.helper then
+					local helper = CreateFrame("Frame", nil, button)
+					button.helper = helper
+					button.helper:SetInside()
+					button.helper:SetFrameStrata(button.cd.GetFrameStrata and button.cd:GetFrameStrata() or "HIGH")
+					button.helper:SetFrameLevel(button.cd.GetFrameLevel and (button.cd:GetFrameLevel() + 2) or 20)
+					button.count:SetParent(button.helper)
+				end
+
+				index = index + 1
+			end
+		else
+			auras.text:Point(config.durationTextPos, config.durationTextOffsetX, config.durationTextOffsetY)
+			auras.count:Point(config.stackTextPos, config.stackTextOffsetX, config.stackTextOffsetY)
+
+			if not auras.helper then
+				local helper = CreateFrame("Frame", nil, auras)
+				auras.helper = helper
+				auras.helper:SetInside()
+				auras.helper:SetFrameStrata(auras.cd.GetFrameStrata and auras.cd:GetFrameStrata() or "HIGH")
+				auras.helper:SetFrameLevel(auras.cd.GetFrameLevel and (auras.cd:GetFrameLevel() + 2) or 20)
+				auras.count:SetParent(auras.helper)
+			end
+		end
+	end
+end
+hooksecurefunc(UF, "UpdateAuraIconSettings", UpdateAuraIconSettings)
+
+local function UpdateAuraTimer(self, elapsed)
+	local hideDurationText = E.db.CustomTweaks.AuraIconText.hideDurationText
+	local hideStackText = E.db.CustomTweaks.AuraIconText.hideStackText
+	local durationThreshold = E.db.CustomTweaks.AuraIconText.durationThreshold
+	local durationFilterOwner = E.db.CustomTweaks.AuraIconText.durationFilterOwner
+	local stackFilterOwner = E.db.CustomTweaks.AuraIconText.stackFilterOwner
+	local showText = true
+	local showCount = true
+
+	if ((durationThreshold > 0) and (self.expiration > durationThreshold)) or (durationFilterOwner and (self.owner ~= "player" and self.owner ~= "vehicle")) or (hideDurationText) then
+		showText = false
+	end
+
+	if (stackFilterOwner and (self.owner ~= "player" and self.owner ~= "vehicle")) or (hideStackText) then
+		showCount = false
+	end
+
+	self.text:SetAlpha(showText and 1 or 0)
+	self.count:SetAlpha(showCount and 1 or 0)
+end
+hooksecurefunc(UF, "UpdateAuraTimer", UpdateAuraTimer)
+
+local function SetOnUpdate(button)
+	if button:GetScript('OnUpdate') and not button.isUpdatedCT then
+		button.nextupdate = -1
+		button:SetScript('OnUpdate', UF.UpdateAuraTimer)
+		button.isUpdatedCT = true
+	end
+end
+
+local function ResetOnUpdate(unitframe)
+	if not unitframe.Buffs and not unitframe.Debuffs then return; end
+	
+	if unitframe.Buffs then
+		for i = 1, #unitframe.Buffs do
+			local button = unitframe.Buffs[i]
+			if(button and button:IsShown()) then
+				SetOnUpdate(button)
+			end
+		end
+	end
+	
+	if unitframe.Debuffs then
+		for i = 1, #unitframe.Debuffs do
+			local button = unitframe.Debuffs[i]
+			if(button and button:IsShown()) then
+				SetOnUpdate(button)
+			end
+		end
+	end
+end
+
+--Existing auras with a duration have their OnUpdate set before "UpdateAuraTimer" is hooked
+--Duration or stack text will not be hidden for those aura buttons
+--Look through all auras on all unitframes and update OnUpdate script if necessary
+local function UpdateExistingAuras()
+	for unit, unitName in pairs(UF.units) do
+		local frameNameUnit = E:StringTitle(unitName)
+		frameNameUnit = frameNameUnit:gsub("t(arget)", "T%1")
+		
+		local unitframe = _G["ElvUF_"..frameNameUnit]
+		if unitframe then
+			ResetOnUpdate(unitframe)
+		end
+	end
+
+	for unit, unitgroup in pairs(UF.groupunits) do
+		local frameNameUnit = E:StringTitle(unit)
+		frameNameUnit = frameNameUnit:gsub("t(arget)", "T%1")
+		
+		local unitframe = _G["ElvUF_"..frameNameUnit]
+		if unitframe then
+			ResetOnUpdate(unitframe)
+		end
+	end
+	
+	for _, header in pairs(UF.headers) do
+		local name = header.groupName
+		local db = UF.db['units'][name]
+		for i = 1, header:GetNumChildren() do
+			local group = select(i, header:GetChildren())
+			--group is Tank/Assist Frames, but for Party/Raid we need to go deeper
+			ResetOnUpdate(group)
+
+			for j = 1, group:GetNumChildren() do
+				--Party/Raid unitbutton
+				local unitbutton = select(j, group:GetChildren())
+				ResetOnUpdate(unitbutton)
+			end
+		end
+	end
+end
+
+local f = CreateFrame("Frame")
+f:RegisterEvent("PLAYER_ENTERING_WORLD")
+f:SetScript("OnEvent", function(self, event)
+	self:UnregisterEvent(event)
+	UpdateExistingAuras()
+end)
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/unitframes/CastbarCustomBackdrop.lua b/ElvUI_CustomTweaks/Categories/unitframes/CastbarCustomBackdrop.lua
new file mode 100644
index 0000000..cf8383a
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/unitframes/CastbarCustomBackdrop.lua
@@ -0,0 +1,126 @@
+local E, L, V, P, G = unpack(ElvUI)
+local CT = E:GetModule("CustomTweaks")
+local isEnabled = E.private["unitframe"].enable and E.private["CustomTweaks"] and E.private["CustomTweaks"]["CastbarCustomBackdrop"]and true or false
+
+--Cache global variables
+local _G = _G
+local pairs = pairs
+local hooksecurefunc = hooksecurefunc
+local MAX_BOSS_FRAMES = MAX_BOSS_FRAMES
+
+P["CustomTweaks"]["CastbarCustomBackdrop"] = {
+	["backdropColor"] = {r = 0.16, g = 0.16, b = 0.16, a = 1},
+}
+
+local units = {"Player", "Target", "Focus", "Pet"}
+
+local function ConfigTable()
+	E.Options.args.CustomTweaks.args.Unitframe.args.options.args.CastbarCustomBackdrop = {
+		type = "group",
+		name = "CastbarCustomBackdrop",
+		get = function(info) return E.db.CustomTweaks.CastbarCustomBackdrop[info[#info]] end,
+		set = function(info, value) E.db.CustomTweaks.CastbarCustomBackdrop[info[#info]] = value; end,
+		args = {
+			backdropColor = {
+				order = 1,
+				type = "color",
+				name = L["Castbar Backdrop Color"],
+				disabled = function() return not isEnabled end,
+				hasAlpha = true,
+				get = function(info)
+					local t = E.db.CustomTweaks.CastbarCustomBackdrop.backdropColor
+					local d = P.CustomTweaks.CastbarCustomBackdrop.backdropColor
+					return t.r, t.g, t.b, t.a, d.r, d.g, d.b, d.a
+				end,
+				set = function(info, r, g, b, a)
+					E.db.CustomTweaks.CastbarCustomBackdrop.backdropColor = {}
+					local t = E.db.CustomTweaks.CastbarCustomBackdrop.backdropColor
+					t.r, t.g, t.b, t.a = r, g, b, a
+				end,
+			},
+		},
+	}
+end
+CT.Configs["CastbarCustomBackdrop"] = ConfigTable
+if not isEnabled then return; end
+
+local function PostCastStart(self, unit, name, castid)
+	local db = self:GetParent().db
+	if not db or not db.castbar then return; end
+
+	local color = E.db.CustomTweaks.CastbarCustomBackdrop.backdropColor
+	local r, g, b, a = color.r, color.g, color.b, color.a
+
+	if self.bg and self.bg:IsShown() then
+	--	self.bg:SetTexture(r, g, b)
+	else
+		if self.backdrop then
+			self.backdrop:SetBackdropColor(r, g, b, a)
+		end
+	end
+end
+
+local function PostChannelStart(self, unit, name, castid)
+	local db = self:GetParent().db
+	if not db or not db.castbar then return; end
+
+	local color = E.db.CustomTweaks.CastbarCustomBackdrop.backdropColor
+	local r, g, b, a = color.r, color.g, color.b, color.a
+
+	if self.bg and self.bg:IsShown() then
+	--	self.bg:SetTexture(r, g, b)
+	else
+		if self.backdrop then
+			self.backdrop:SetBackdropColor(r, g, b, a)
+		end
+	end
+end
+
+local function PostCastInterruptible(self, unit)
+	if unit == "vehicle" or unit == "player" then return end
+	
+	local color = E.db.CustomTweaks.CastbarCustomBackdrop.backdropColor
+	local r, g, b, a = color.r, color.g, color.b, color.a
+	
+	if self.bg and self.bg:IsShown() then
+	--	self.bg:SetTexture(r, g, b)
+	else
+		if self.backdrop then
+			self.backdrop:SetBackdropColor(r, g, b, a)
+		end
+	end
+end
+
+local f = CreateFrame("Frame")
+f:RegisterEvent("PLAYER_ENTERING_WORLD")
+f:SetScript("OnEvent", function(self)
+	self:UnregisterEvent("PLAYER_ENTERING_WORLD")
+
+	for _, unit in pairs(units) do
+		local unitframe = _G["ElvUF_"..unit];
+		local castbar = unitframe and unitframe.Castbar
+		if castbar then
+			hooksecurefunc(castbar, "PostCastStart", PostCastStart)
+			hooksecurefunc(castbar, "PostCastInterruptible", PostCastInterruptible)
+			hooksecurefunc(castbar, "PostChannelStart", PostChannelStart)
+		end
+	end
+
+	for i = 1, 5 do
+		local castbar = _G["ElvUF_Arena"..i].Castbar
+		if castbar then
+			hooksecurefunc(castbar, "PostCastStart", PostCastStart)
+			hooksecurefunc(castbar, "PostCastInterruptible", PostCastInterruptible)
+			hooksecurefunc(castbar, "PostChannelStart", PostChannelStart)
+		end
+	end
+
+	for i = 1, MAX_BOSS_FRAMES do
+		local castbar = _G["ElvUF_Boss"..i].Castbar
+		if castbar then
+			hooksecurefunc(castbar, "PostCastStart", PostCastStart)
+			hooksecurefunc(castbar, "PostCastInterruptible", PostCastInterruptible)
+			hooksecurefunc(castbar, "PostChannelStart", PostChannelStart)
+		end
+	end
+end)
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/unitframes/CastbarText.lua b/ElvUI_CustomTweaks/Categories/unitframes/CastbarText.lua
new file mode 100644
index 0000000..809221c
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/unitframes/CastbarText.lua
@@ -0,0 +1,322 @@
+local E, L, V, P, G = unpack(ElvUI)
+local CT = E:GetModule("CustomTweaks")
+local isEnabled = E.private["unitframe"].enable and E.private["CustomTweaks"] and E.private["CustomTweaks"]["CastbarText"]and true or false
+
+--Cache global variables
+local _G = _G
+local pairs = pairs
+
+P["CustomTweaks"]["CastbarText"] = {
+	["Player"] = {
+		["duration"] = {
+			["point"] = "RIGHT",
+			["xOffset"] = -4,
+			["yOffset"] = 0,
+			["color"] = {r = 0.84, g = 0.75, b = 0.65, a = 1},
+		},
+		["text"] = {
+			["point"] = "LEFT",
+			["xOffset"] = 4,
+			["yOffset"] = 0,
+			["color"] = {r = 0.84, g = 0.75, b = 0.65, a = 1},
+		},
+	},
+	["Pet"] = {
+		["duration"] = {
+			["point"] = "RIGHT",
+			["xOffset"] = -4,
+			["yOffset"] = 0,
+			["color"] = {r = 0.84, g = 0.75, b = 0.65, a = 1},
+		},
+		["text"] = {
+			["point"] = "LEFT",
+			["xOffset"] = 4,
+			["yOffset"] = 0,
+			["color"] = {r = 0.84, g = 0.75, b = 0.65, a = 1},
+		},
+	},
+	["Target"] = {
+		["duration"] = {
+			["point"] = "RIGHT",
+			["xOffset"] = -4,
+			["yOffset"] = 0,
+			["color"] = {r = 0.84, g = 0.75, b = 0.65, a = 1},
+		},
+		["text"] = {
+			["point"] = "LEFT",
+			["xOffset"] = 4,
+			["yOffset"] = 0,
+			["color"] = {r = 0.84, g = 0.75, b = 0.65, a = 1},
+		},
+	},
+	["Focus"] = {
+		["duration"] = {
+			["point"] = "RIGHT",
+			["xOffset"] = -4,
+			["yOffset"] = 0,
+			["color"] = {r = 0.84, g = 0.75, b = 0.65, a = 1},
+		},
+		["text"] = {
+			["point"] = "LEFT",
+			["xOffset"] = 4,
+			["yOffset"] = 0,
+			["color"] = {r = 0.84, g = 0.75, b = 0.65, a = 1},
+		},
+	},
+	["Arena"] = {
+		["duration"] = {
+			["point"] = "RIGHT",
+			["xOffset"] = -4,
+			["yOffset"] = 0,
+			["color"] = {r = 0.84, g = 0.75, b = 0.65, a = 1},
+		},
+		["text"] = {
+			["point"] = "LEFT",
+			["xOffset"] = 4,
+			["yOffset"] = 0,
+			["color"] = {r = 0.84, g = 0.75, b = 0.65, a = 1},
+		},
+	},
+	["Boss"] = {
+		["duration"] = {
+			["point"] = "RIGHT",
+			["xOffset"] = -4,
+			["yOffset"] = 0,
+			["color"] = {r = 0.84, g = 0.75, b = 0.65, a = 1},
+		},
+		["text"] = {
+			["point"] = "LEFT",
+			["xOffset"] = 4,
+			["yOffset"] = 0,
+			["color"] = {r = 0.84, g = 0.75, b = 0.65, a = 1},
+		},
+	},
+}
+
+local units = {"Player", "Pet", "Target", "Focus", "Arena", "Boss"}
+local anchorValues = {
+	["TOP"] = "TOP",
+	["BOTTOM"] = "BOTTOM",
+	["CENTER"] = "CENTER",
+	["LEFT"] = "LEFT",
+	["RIGHT"] = "RIGHT",
+}
+local PositionCastbarText
+local SetCastbarTextColor
+local MAX_BOSS_FRAMES = MAX_BOSS_FRAMES
+
+local function ConfigTable()
+	E.Options.args.CustomTweaks.args.Unitframe.args.options.args.CastbarText = {
+		type = "group",
+		name = "CastbarText",
+		get = function(info) return E.db.CustomTweaks.CastbarText[info[#info]] end,
+		set = function(info, value) E.db.CustomTweaks.CastbarText[info[#info]] = value; end,
+		childGroups = "tab",
+		args = {},
+	}
+	
+	local function CreateOptionsGroup(order, name, unit)
+		local group = {
+			order = order,
+			type = "group",
+			name = name,
+			args = {
+				duration = {
+					order = 1,
+					type = "group",
+					name = L["Duration"],
+					guiInline = true,
+					get = function(info) return E.db.CustomTweaks.CastbarText[unit].duration[info[#info]] end,
+					set = function(info, value) E.db.CustomTweaks.CastbarText[unit].duration[info[#info]] = value; PositionCastbarText(unit) end,
+					disabled = function() return not isEnabled end,
+					args = {
+						color = {
+							order = 1,
+							type = "color",
+							name = L["Color"],
+							hasAlpha = true,
+							get = function(info)
+								local t = E.db.CustomTweaks.CastbarText[unit].duration.color
+								local d = P.CustomTweaks.CastbarText[unit].duration.color
+								return t.r, t.g, t.b, t.a, d.r, d.g, d.b, d.a
+							end,
+							set = function(info, r, g, b, a)
+								E.db.CustomTweaks.CastbarText[unit].duration.color = {}
+								local t = E.db.CustomTweaks.CastbarText[unit].duration.color
+								t.r, t.g, t.b, t.a = r, g, b, a
+								SetCastbarTextColor(unit)
+							end,
+						},
+						point = {
+							order = 2,
+							type = "select",
+							name = L["Anchor Point"],
+							values = anchorValues,
+						},
+						xOffset = {
+							order = 3,
+							type = "range",
+							name = L["X-Offset"],
+							min = -50, max = 50, step = 1,
+						},
+						yOffset = {
+							order = 4,
+							type = "range",
+							name = L["Y-Offset"],
+							min = -50, max = 50, step = 1,
+						},
+					},
+				},
+				text = {
+					order = 2,
+					type = "group",
+					name = L["Text"],
+					guiInline = true,
+					get = function(info) return E.db.CustomTweaks.CastbarText[unit].text[info[#info]] end,
+					set = function(info, value) E.db.CustomTweaks.CastbarText[unit].text[info[#info]] = value; PositionCastbarText(unit) end,
+					disabled = function() return not isEnabled end,
+					args = {
+						color = {
+							order = 1,
+							type = "color",
+							name = L["Color"],
+							hasAlpha = true,
+							get = function(info)
+								local t = E.db.CustomTweaks.CastbarText[unit].text.color
+								local d = P.CustomTweaks.CastbarText[unit].text.color
+								return t.r, t.g, t.b, t.a, d.r, d.g, d.b, d.a
+							end,
+							set = function(info, r, g, b, a)
+								E.db.CustomTweaks.CastbarText[unit].text.color = {}
+								local t = E.db.CustomTweaks.CastbarText[unit].text.color
+								t.r, t.g, t.b, t.a = r, g, b, a
+								SetCastbarTextColor(unit)
+							end,
+						},
+						point = {
+							order = 2,
+							type = "select",
+							name = L["Anchor Point"],
+							values = anchorValues,
+						},
+						xOffset = {
+							order = 3,
+							type = "range",
+							name = L["X-Offset"],
+							min = -50, max = 50, step = 1,
+						},
+						yOffset = {
+							order = 4,
+							type = "range",
+							name = L["Y-Offset"],
+							min = -50, max = 50, step = 1,
+						},
+					},
+				},
+			},
+		}
+
+		return group
+	end
+	
+	local options = E.Options.args.CustomTweaks.args.Unitframe.args.options.args.CastbarText.args
+	options.player = CreateOptionsGroup(1, L["Player"], "Player")
+	options.pet = CreateOptionsGroup(2, L["Pet"], "Pet")
+	options.target = CreateOptionsGroup(3, L["Target"], "Target")
+	options.focus = CreateOptionsGroup(4, L["Focus"], "Focus")
+	options.arena = CreateOptionsGroup(5, L["Arena"], "Arena")
+	options.boss = CreateOptionsGroup(6, L["Boss"], "Boss")
+end
+CT.Configs["CastbarText"] = ConfigTable
+if not isEnabled then return; end
+
+function PositionCastbarText(unit)
+	local pointText = E.db.CustomTweaks.CastbarText[unit].text.point
+	local xOffsetText = E.db.CustomTweaks.CastbarText[unit].text.xOffset
+	local yOffsetText = E.db.CustomTweaks.CastbarText[unit].text.yOffset
+	local pointDuration = E.db.CustomTweaks.CastbarText[unit].duration.point
+	local xOffsetDuration = E.db.CustomTweaks.CastbarText[unit].duration.xOffset
+	local yOffsetDuration =	E.db.CustomTweaks.CastbarText[unit].duration.yOffset
+	
+	if unit == "Arena" then
+		for i = 1, 5 do
+			local unitframe = _G["ElvUF_Arena"..1]
+			local castbar = unitframe and unitframe.Castbar
+			
+			if castbar then
+				castbar.Text:ClearAllPoints()
+				castbar.Text:SetPoint(pointText, castbar, pointText, xOffsetText, yOffsetText)
+				castbar.Time:ClearAllPoints()
+				castbar.Time:SetPoint(pointDuration, castbar, pointDuration, xOffsetDuration, yOffsetDuration)
+			end
+		end
+	elseif unit == "Boss" then
+		for i = 1, MAX_BOSS_FRAMES do
+			local unitframe = _G["ElvUF_Boss"..1]
+			local castbar = unitframe and unitframe.Castbar
+			
+			if castbar then
+				castbar.Text:ClearAllPoints()
+				castbar.Text:SetPoint(pointText, castbar, pointText, xOffsetText, yOffsetText)
+				castbar.Time:ClearAllPoints()
+				castbar.Time:SetPoint(pointDuration, castbar, pointDuration, xOffsetDuration, yOffsetDuration)
+			end
+		end
+	else
+		local unitframe = _G["ElvUF_"..unit]
+		local castbar = unitframe and unitframe.Castbar
+		
+		if castbar then
+			castbar.Text:ClearAllPoints()
+			castbar.Text:SetPoint(pointText, castbar, pointText, xOffsetText, yOffsetText)
+			castbar.Time:ClearAllPoints()
+			castbar.Time:SetPoint(pointDuration, castbar, pointDuration, xOffsetDuration, yOffsetDuration)
+		end
+	end
+end
+
+function SetCastbarTextColor(unit)
+	local durationColor = E.db.CustomTweaks.CastbarText[unit].duration.color
+	local textColor = E.db.CustomTweaks.CastbarText[unit].text.color
+	
+	if unit == "Arena" then
+		for i = 1, 5 do
+			local unitframe = _G["ElvUF_Arena"..i]
+			local castbar = unitframe and unitframe.Castbar
+			
+			if castbar then
+				castbar.Text:SetTextColor(textColor.r, textColor.g, textColor.b, textColor.a)
+				castbar.Time:SetTextColor(durationColor.r, durationColor.g, durationColor.b, durationColor.a)
+			end
+		end
+	elseif unit == "Boss" then
+		for i = 1, MAX_BOSS_FRAMES do
+			local unitframe = _G["ElvUF_Boss"..i]
+			local castbar = unitframe and unitframe.Castbar
+			
+			if castbar then
+				castbar.Text:SetTextColor(textColor.r, textColor.g, textColor.b, textColor.a)
+				castbar.Time:SetTextColor(durationColor.r, durationColor.g, durationColor.b, durationColor.a)
+			end
+		end
+	else
+		local unitframe = _G["ElvUF_"..unit]
+		local castbar = unitframe and unitframe.Castbar
+
+		if castbar then
+			castbar.Text:SetTextColor(textColor.r, textColor.g, textColor.b, textColor.a)
+			castbar.Time:SetTextColor(durationColor.r, durationColor.g, durationColor.b, durationColor.a)
+		end
+	end
+end
+
+local f = CreateFrame("Frame")
+f:RegisterEvent("PLAYER_ENTERING_WORLD")
+f:SetScript("OnEvent", function(self)
+	self:UnregisterEvent("PLAYER_ENTERING_WORLD")
+
+	for _, unit in pairs(units) do
+		PositionCastbarText(unit)
+		SetCastbarTextColor(unit)
+	end
+end)
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/unitframes/PowerBarTexture.lua b/ElvUI_CustomTweaks/Categories/unitframes/PowerBarTexture.lua
new file mode 100644
index 0000000..a8920ac
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/unitframes/PowerBarTexture.lua
@@ -0,0 +1,79 @@
+local E, L, V, P, G = unpack(ElvUI)
+local LSM = LibStub("LibSharedMedia-3.0");
+local UF = E:GetModule("UnitFrames")
+local CT = E:GetModule("CustomTweaks")
+local isEnabled = E.private["unitframe"].enable and E.private["CustomTweaks"] and E.private["CustomTweaks"]["PowerBarTexture"] and true or false
+
+--Cache global variables
+local _G = _G
+local pairs = pairs
+local twipe = table.wipe
+
+---
+-- GLOBALS: AceGUIWidgetLSMlists
+---
+
+P["CustomTweaks"]["PowerBarTexture"] = {
+	["powerstatusbar"] = "ElvUI Norm",
+}
+
+local UpdateStatusBars
+local BuildTable
+local powerbars = {}
+
+local function ConfigTable()
+	E.Options.args.CustomTweaks.args.Unitframe.args.options.args.PowerBarTexture = {
+		type = "group",
+		name = "PowerBarTexture",
+		get = function(info) return E.db.CustomTweaks.PowerBarTexture[info[#info]] end,
+		set = function(info, value) E.db.CustomTweaks.PowerBarTexture[info[#info]] = value; BuildTable(); UpdateStatusBars() end,
+		args = {
+			powerstatusbar = {
+				order = 1,
+				type = "select", dialogControl = "LSM30_Statusbar",
+				name = L["PowerBar Texture"],
+				disabled = function() return not isEnabled end,
+				values = AceGUIWidgetLSMlists.statusbar,
+			},
+		},
+	}
+end
+CT.Configs["PowerBarTexture"] = ConfigTable
+if not isEnabled then return; end
+
+function BuildTable()
+	twipe(powerbars)
+
+	for _, unitName in pairs(UF.units) do
+		local frameNameUnit = E:StringTitle(unitName)
+		frameNameUnit = frameNameUnit:gsub("t(arget)", "T%1")
+		
+		local unitframe = _G["ElvUF_"..frameNameUnit]
+		if unitframe and unitframe.Power then powerbars[unitframe.Power] = true end
+	end
+	
+	for unit, unitgroup in pairs(UF.groupunits) do
+		local frameNameUnit = E:StringTitle(unit)
+		frameNameUnit = frameNameUnit:gsub("t(arget)", "T%1")
+		
+		local unitframe = _G["ElvUF_"..frameNameUnit]
+		if unitframe and unitframe.Power then powerbars[unitframe.Power] = true end
+	end
+end
+BuildTable()
+
+function UpdateStatusBars()
+	local statusBarTexture = LSM:Fetch("statusbar", E.db.CustomTweaks.PowerBarTexture.powerstatusbar)
+	for powerbar in pairs(powerbars) do
+		if powerbar and powerbar:GetObjectType() == "StatusBar" and not powerbar.isTransparent then
+			powerbar:SetStatusBarTexture(statusBarTexture)
+		elseif powerbar and powerbar:GetObjectType() == "Texture" then
+			powerbar:SetStatusBarTexture(statusBarTexture)
+		end
+	end
+end
+hooksecurefunc(UF, "Update_StatusBars", UpdateStatusBars)
+hooksecurefunc(UF, "CreateAndUpdateUF", UpdateStatusBars)
+hooksecurefunc(UF, "CreateAndUpdateUFGroup", UpdateStatusBars)
+hooksecurefunc(UF, "CreateAndUpdateHeaderGroup", UpdateStatusBars)
+hooksecurefunc(UF, "ForceShow", UpdateStatusBars)
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/unitframes/UnitframeSpacingLimits.lua b/ElvUI_CustomTweaks/Categories/unitframes/UnitframeSpacingLimits.lua
new file mode 100644
index 0000000..873a26e
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/unitframes/UnitframeSpacingLimits.lua
@@ -0,0 +1,14 @@
+local E, L, V, P, G = unpack(ElvUI)
+if not E.private["unitframe"].enable or not E.private["CustomTweaks"] or not E.private["CustomTweaks"]["UnitFrameSpacingLimits"] then return end;
+
+local CT = E:GetModule("CustomTweaks")
+
+local function ConfigTable()
+	E.Options.args.unitframe.args.party.args.general.args.positionsGroup.args.verticalSpacing.max = 200
+	E.Options.args.unitframe.args.party.args.general.args.positionsGroup.args.horizontalSpacing.max = 200
+	E.Options.args.unitframe.args.raid.args.general.args.positionsGroup.args.verticalSpacing.max = 200
+	E.Options.args.unitframe.args.raid.args.general.args.positionsGroup.args.horizontalSpacing.max = 200
+	E.Options.args.unitframe.args.raid40.args.general.args.positionsGroup.args.verticalSpacing.max = 200
+	E.Options.args.unitframe.args.raid40.args.general.args.positionsGroup.args.horizontalSpacing.max = 200
+end
+CT.Configs["UnitFrameSpacingLimits"] = ConfigTable
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/Categories/unitframes/load_tweaks.xml b/ElvUI_CustomTweaks/Categories/unitframes/load_tweaks.xml
new file mode 100644
index 0000000..cbdc02d
--- /dev/null
+++ b/ElvUI_CustomTweaks/Categories/unitframes/load_tweaks.xml
@@ -0,0 +1,8 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file='AuraIconSpacing.lua'/>
+	<Script file='AuraIconText.lua'/>
+	<Script file='CastbarCustomBackdrop.lua'/>
+	<Script file='CastbarText.lua'/>
+	<Script file='PowerBarTexture.lua'/>
+	<Script file='UnitframeSpacingLimits.lua'/>
+</Ui>
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/ElvUI_CustomTweaks.toc b/ElvUI_CustomTweaks/ElvUI_CustomTweaks.toc
new file mode 100644
index 0000000..973f315
--- /dev/null
+++ b/ElvUI_CustomTweaks/ElvUI_CustomTweaks.toc
@@ -0,0 +1,12 @@
+## Interface: 70000
+## Author: Blazeflack
+## Credit: Azilroka, Benik
+## Version: 1.30
+## Title: |cffA11313E|r|cffC4C4C4lvUI|r |cffA11313C|r|cffC4C4C4ustom|r |cffA11313T|r|cffC4C4C4weaks|r
+## Notes: A collection of various tweaks to ElvUI, requested by the users.
+## RequiredDeps: ElvUI
+## DefaultState: enabled
+
+locales.lua
+core.lua
+categories\load_categories.xml
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/LICENSE.txt b/ElvUI_CustomTweaks/LICENSE.txt
new file mode 100644
index 0000000..49c38c8
--- /dev/null
+++ b/ElvUI_CustomTweaks/LICENSE.txt
@@ -0,0 +1,19 @@
+ElvUI_CustomTweaks License
+	Copyright ©2014-2015
+
+	The contents of this addon, excluding third-party resources, are
+	copyrighted to their authors with all rights reserved.
+
+	The author of this addon hereby grants you the following rights:
+
+	1. 	You may make modifications to this addon for private use only, you 
+		must have the authors express written consent to publicize any portion 
+		of this addon.
+	
+	2. 	Do not modify the name of this addon, including the addon folders.
+	
+	3. 	This copyright notice shall be included in all copies or substantial 
+		portions of the Software.
+
+	All rights not explicitly addressed in this license are reserved by
+	the copyright holders.
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/core.lua b/ElvUI_CustomTweaks/core.lua
new file mode 100644
index 0000000..fba8961
--- /dev/null
+++ b/ElvUI_CustomTweaks/core.lua
@@ -0,0 +1,251 @@
+local E, L, V, P, G = unpack(ElvUI);
+local CT = E:NewModule("CustomTweaks", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0");
+local EP = LibStub("LibElvUIPlugin-1.0")
+local addon, ns = ...
+
+--Cache global variables
+local pairs, ipairs = pairs, ipairs
+local tinsert, tsort = table.insert, table.sort
+local format = string.format
+
+CT.Version = GetAddOnMetadata(addon, "Version")
+CT.Title = "|cff4beb2cCustomTweaks|r"
+CT.Configs = {}
+
+P["CustomTweaks"] = {}
+V["CustomTweaks"] = {}
+
+local Tweaks = {
+	["Actionbar"] = {
+		{"PushedColor", L["Allows you to choose the color of the actionbar button when it is pushed down."]}, 
+		{"ClickThroughActionBars", L["Allows you to make actionbars clickthrough."]},
+	},
+	["Bags"] = {
+		{"BagButtons", L["Allows you to change bag buttons to use the classic texture style and allows you to add a 'Stack' button."]},
+	},
+	["Chat"] = {
+		{"ChatMaxLines", L["Increases the amount of messages saved in a chat window, before they get replaced by new messages."]},
+	},
+	["Datatexts"] = {
+		{"BagsTextFormat", L["Allows you to choose which text format the Bags datatext uses."]},
+	},
+	["Minimap"] = {
+		{"MinimapSizeLimits", L["Lowers the minimum allowed minimap size."]},
+	},
+	["Misc"] = {
+		{"RaidControl", L["Allows you to change template of the Raid Control button or hide it altogether."]},
+		{"NoBorders", L["Attempts to remove borders on all ElvUI elements. This doesn't work on all statusbars, so some borders will be kept intact."]},
+	},
+	["Unitframe"] = {
+		{"AuraIconSpacing", L["Allows you to set a spacing between individual aura icons for the units you choose."]},
+		{"AuraIconText", L["Allows you to position the unitframe aura duration and stack text or hide it."]},
+		{"CastbarCustomBackdrop", L["Allows you to use a custom castbar backdrop color."]},
+		{"CastbarText", L["Allows you to position and change color and alpha of castbar text."]},
+		{"PowerBarTexture", L["Allows you to use a separate texture for unitframe power bars."]},
+		{"UnitFrameSpacingLimits", L["Increases the maximum allowed vertical and horizontal spacing for party and raid frames."]},
+	},
+}
+
+local Authors = {
+	{"Benik", {
+		"PowerBarTexture",
+	}},
+	{"Blazeflack", {
+		"AuraIconSpacing",
+		"AuraIconText",
+		"BagButtons",
+		"BagsTextFormat",
+		"CastbarCustomBackdrop",
+		"CastbarText",
+		"ChatMaxLines",
+		"ClickThroughActionBars",
+		"MinimapSizeLimits",
+		"NoBorders",
+		"PushedColor",
+		"RaidControl",
+		"UnitFrameSpacingLimits",
+	}},
+}
+
+local linebreak = "\n"
+local function GetTweaksAsString(tweaks)
+	local tweaksString = ""
+	local temp = {}
+
+	for _, tweak in pairs(tweaks) do
+		tinsert(temp, tweak)
+	end
+	tsort(temp)
+	
+	for _, tweak in ipairs(temp) do
+		tweaksString = tweaksString..tweak..linebreak
+	end
+	
+	return tweaksString
+end
+
+--Copied from ElvUI
+local function RGBToHex(r, g, b)
+	r = r <= 1 and r >= 0 and r or 0
+	g = g <= 1 and g >= 0 and g or 0
+	b = b <= 1 and b >= 0 and b or 0
+	return format("%02x%02x%02x", r*255, g*255, b*255)
+end
+
+function CT:ColorStr(str, r, g, b)
+	local hex
+	local coloredString
+	
+	if r and g and b then
+		hex = RGBToHex(r, g, b)
+	else
+		hex = RGBToHex(75/255, 235/255, 44/255)
+	end
+	
+	coloredString = "|cff"..hex..str.."|r"
+	return coloredString
+end
+
+local function buildCategory(category, groupName)
+	E.Options.args.CustomTweaks.args[category] = {
+		order = 100,
+		type = "group",
+		name = groupName,
+		childGroups = "tab",
+		args = {
+			header = {
+				order = 1,
+				type = "header",
+				name = CT:ColorStr(L["Tweaks"]),
+			},
+			description = {
+				order = 2,
+				type = "description",
+				name = format(L["Some tweaks may provide customizable options when enabled. If so then they will appear in the '%s' field below."], L["Options"]),
+			},
+			tweaks = {
+				order = 3,
+				type = "group",
+				name = "",
+				guiInline = true,
+				args = {},
+			},
+			spacer = {
+				order = 4,
+				type = "description",
+				name = "",
+			},
+			options = {
+				order = 5,
+				type = "group",
+				name = CT:ColorStr(L["Options"]),
+				args = {},
+			},
+		},
+	}
+end
+
+function CT:ConfigTable()
+	E.Options.args.CustomTweaks = {
+		order = 100,
+		type = "group",
+		name = CT.Title,
+		args = {
+			header1 = {
+				order = 1,
+				type = "header",
+				name = format(L["%s version %s by Blazeflack of tukui.org"], CT.Title, CT:ColorStr(CT.Version)),
+			},		
+			description1 = {
+				order = 2,
+				type = "description",
+				name = format(L["%s is a collection of various tweaks for ElvUI. New features or changes have been requested by regular users and then fulfilled by members of the Tukui community."], CT.Title),
+			},
+			spacer1 = {
+				order = 3,
+				type = "description",
+				name = "\n",
+			},
+			header2 = {
+				order = 4,
+				type = "header",
+				name = CT:ColorStr(L["Information / Help"]),
+			},
+			description2 = {
+				order = 5,
+				type = "description",
+				name = L["Please use the following links if you need help or wish to know more about this AddOn."],
+			},
+			addonpage = {
+				order = 6,
+				type = "input",
+				width = "full",
+				name = L["AddOn Description / Download"],
+				get = function(info) return "http://www.tukui.org/addons/index.php?act=view&id=254" end,
+				set = function(info) return "http://www.tukui.org/addons/index.php?act=view&id=254" end,
+			},
+			tickets = {
+				order = 7,
+				type = "input",
+				width = "full",
+				name = L["Report Bugs / Request Tweaks"],
+				get = function(info) return "http://git.tukui.org/Blazeflack/elvui-customtweaks/issues" end,
+				set = function(info) return "http://git.tukui.org/Blazeflack/elvui-customtweaks/issues" end,
+			},
+			credit = {
+				order = -1,
+				type = "group",
+				name = L["Credit"],
+				args = {},
+			},
+		},
+	}
+
+	local n = 0
+	for i = 1, #Authors do
+		local author = Authors[i][1]
+		local tweaks = Authors[i][2]
+		n = n + 1
+		E.Options.args.CustomTweaks.args.credit.args[author.."Header"] = {
+			order = n,
+			type = "header",
+			name = CT:ColorStr(author),
+		}
+		n = n + 1
+		E.Options.args.CustomTweaks.args.credit.args[author.."Desc"] = {
+			order = n,
+			type = "description",
+			name = format(L["%s is the author of the following tweaks:"], author).."\n"
+		}
+		n = n + 1
+		E.Options.args.CustomTweaks.args.credit.args[author.."List"] = {
+			order = n,
+			type = "description",
+			name = GetTweaksAsString(tweaks),
+		}
+	end
+
+	for cat, tweaks in pairs(Tweaks) do
+		buildCategory(cat, L[cat.." Tweaks"])
+		for _, tweak in pairs(tweaks) do
+			local tName = tweak[1]
+			local tDesc = tweak[2]
+			E.Options.args.CustomTweaks.args[cat].args.tweaks.args[tName] = {
+				type = "toggle",
+				name = CT:ColorStr(tName),
+				desc = tDesc,
+				descStyle = "inline",
+				get = function(info) return E.private["CustomTweaks"][tName] end,
+				set = function(info, value) E.private["CustomTweaks"][tName] = value; E:StaticPopup_Show("PRIVATE_RL") end,
+			}
+		end
+	end
+	
+	for _, func in pairs(CT.Configs) do func() end
+end
+
+function CT:Initialize()
+	EP:RegisterPlugin(addon, CT.ConfigTable)
+end
+
+E:RegisterModule(CT:GetName())
\ No newline at end of file
diff --git a/ElvUI_CustomTweaks/locales.lua b/ElvUI_CustomTweaks/locales.lua
new file mode 100644
index 0000000..2de18b7
--- /dev/null
+++ b/ElvUI_CustomTweaks/locales.lua
@@ -0,0 +1,167 @@
+-- English localization file for enUS and enGB.
+local AceLocale = LibStub:GetLibrary("AceLocale-3.0");
+local L = AceLocale:NewLocale("ElvUI", "enUS", true);
+if not L then return; end
+
+L["%s is a collection of various tweaks for ElvUI. New features or changes have been requested by regular users and then fulfilled by members of the Tukui community."] = true;
+L["%s is the author of the following tweaks:"] = true;
+L["%s version %s by Blazeflack of tukui.org"] = true;
+L["Actionbar Tweaks"] = true;
+L["Add 'Stack' Button"] = true;
+L["AddOn Description / Download"] = true;
+L["Adds an ElvUI Config button to the Game Menu (ESC)."] = true;
+L["Allows you to change bag buttons to use the classic texture style and allows you to add a 'Stack' button."] = true;
+L["Allows you to change template of the Raid Control button or hide it altogether."] = true;
+L["Allows you to choose the color of the actionbar button when it is pushed down."] = true;
+L["Allows you to choose which text format the Bags datatext uses."] = true;
+L["Allows you to enable and disable Buffs and Debuffs individually, keeping one active while the other is disabled."] = true;
+L["Allows you to make actionbars clickthrough."] = true;
+L["Allows you to position and change color and alpha of castbar text."] = true;
+L["Allows you to position the unitframe aura duration and stack text or hide it."] = true;
+L["Allows you to set a spacing between individual aura icons for the units you choose."] = true;
+L["Allows you to specify a pet to be shown on the ElvUI AFK screen."] = true;
+L["Allows you to use a custom castbar backdrop color."] = true;
+L["Allows you to use a separate texture for unitframe power bars."] = true;
+L["Animation"] = true;
+L["Assist"] = true;
+L["Attempts to remove borders on all ElvUI elements. This doesn't work on all statusbars, so some borders will be kept intact."] = true
+L["Aura Spacing"] = true;
+L["Bags Text Format"] = true;
+L["Bags Tweaks"] = true;
+L["Boss"] = true;
+L["Button Color"] = true;
+L["Button Style"] = true;
+L["Castbar Backdrop Color"] = true;
+L["Chat Tweaks"] = true;
+L["Companion Pet Name"] = true;
+L["Credit"] = true;
+L["Datatexts Tweaks"] = true;
+L["Duration text will be hidden until it reaches this threshold (in seconds). Set to -1 to always show duration text."] = true;
+L["Duration Text"] = true;
+L["Enable Buffs"] = true;
+L["Enable Debuffs"] = true;
+L["Focus"] = true;
+L["FocusTarget"] = true;
+L["Free/Total"] = true;
+L["Hide From Others"] = true;
+L["Hide Raid Control"] = true;
+L["Hide Text On Units"] = true;
+L["Hide Text"] = true;
+L["Hold Shift:"] = true;
+L["Horizontal offset of the duration text."] = true;
+L["Horizontal offset of the stack count."] = true;
+L["Icons"] = true;
+L["Increases the amount of messages saved in a chat window, before they get replaced by new messages."] = true;
+L["Increases the maximum allowed vertical and horizontal spacing for party and raid frames."] = true;
+L["Information / Help"] = true;
+L["Invalid name, check spelling."] = true;
+L["Less than 0 faces the model to the left, more than 0 faces the model to the right"] = true;
+L["Lowers the minimum allowed minimap size."] = true;
+L["Makes the Consolidated Buffs frame movable and provides some configuration options."] = true;
+L["Max Lines"] = true;
+L["Minimap Tweaks"] = true;
+L["Misc Tweaks"] = true;
+L["Model Facing Direction"] = true;
+L["Model Scale"] = true;
+L["NPC animations are not documented anywhere, and as such you will just have to try out various settings until you find the animation you want. Default animation is 0 (idle)"] = true;
+L["Only Free Slots"] = true;
+L["Only Used Slots"] = true;
+L["Options"] = true;
+L["Party"] = true;
+L["Pet"] = true;
+L["PetTarget"] = true;
+L["Player"] = true;
+L["Please use the following links if you need help or wish to know more about this AddOn."] = true;
+L["Position of the duration text on the aura icon."] = true;
+L["Position of the stack count on the aura icon."] = true;
+L["PowerBar Texture"] = true;
+L["Raid"] = true;
+L["Raid40"] = true;
+L["RaidPet"] = true;
+L["Report Bugs / Request Tweaks"] = true;
+L["Set Aura Spacing On Following Units"] = true;
+L["Sets space between individual aura icons."] = true;
+L["Some pets will appear huge. Lower the scale when that happens."] = true;
+L["Some tweaks may provide customizable options when enabled. If so then they will appear in the '%s' field below."] = true;
+L["Stack Items In Bags"] = true;
+L["Stack Items In Bank"] = true;
+L["Stack Items To Bags"] = true;
+L["Stack Items To Bank"] = true;
+L["Stack Text"] = true;
+L["Tank"] = true;
+L["Target"] = true;
+L["TargetTarget"] = true;
+L["TargetTargetTarget"] = true;
+L["The max amount of messages kept in chat before they get replaced by new messages. Changing this setting will clear the chat in all windows."] = true;
+L["Threshold"] = true;
+L["Tweaks"] = true;
+L["Unitframe Tweaks"] = true;
+L["Use Transparent Template"] = true;
+L["Used/Total"] = true;
+L["Vertical offset of the duration text."] = true;
+L["Vertical offset of the stack count."] = true;
+L["Will hide duration text on auras that are not cast by you."] = true;
+L["Will hide stack text on auras that are not cast by you."] = true;
+
+--We don't need the rest if we're on enUS or enGB locale, so stop here.
+if GetLocale() == "enUS" then return end
+
+--German Localizations
+local L = LibStub("AceLocale-3.0"):NewLocale("ElvUI", "deDE")
+if L then
+	--Add translations here
+end
+
+--Spanish (Spain) Localizations
+local L = LibStub("AceLocale-3.0"):NewLocale("ElvUI", "esES")
+if L then
+	--Add translations here
+end
+
+--Spanish (Mexico) Localizations
+local L = LibStub("AceLocale-3.0"):NewLocale("ElvUI", "esMX")
+if L then
+	--Add translations here
+end
+
+--French Localizations
+local L = LibStub("AceLocale-3.0"):NewLocale("ElvUI", "frFR")
+if L then
+	--Add translations here
+end
+
+--Italian Localizations
+local L = LibStub("AceLocale-3.0"):NewLocale("ElvUI", "itIT")
+if L then
+	--Add translations here
+end
+
+--Korean Localizations
+local L = LibStub("AceLocale-3.0"):NewLocale("ElvUI", "koKR")
+if L then
+	--Add translations here
+end
+
+--Portuguese Localizations
+local L = LibStub("AceLocale-3.0"):NewLocale("ElvUI", "ptBR")
+if L then
+	--Add translations here
+end
+
+--Russian Localizations
+local L = LibStub("AceLocale-3.0"):NewLocale("ElvUI", "ruRU")
+if L then
+	--Add translations here
+end
+
+--Chinese (China, simplified) Localizations
+local L = LibStub("AceLocale-3.0"):NewLocale("ElvUI", "zhCN")
+if L then
+	--Add translations here
+end
+
+--Chinese (Taiwan, traditional) Localizations
+local L = LibStub("AceLocale-3.0"):NewLocale("ElvUI", "zhTW")
+if L then
+	--Add translations here
+end
\ No newline at end of file