diff --git a/Modules/ExtraActionBar.lua b/Modules/ExtraActionBar.lua
index e2498dc..81e6bd0 100644
--- a/Modules/ExtraActionBar.lua
+++ b/Modules/ExtraActionBar.lua
@@ -129,10 +129,7 @@ local function TryHook()
 
 	if container and button then
 		SetupMover(container, button)
-
-		if E.private.CoA.extraActionBar then
-			SkinButton(button)
-		end
+		SkinButton(button)
 	end
 
 	return container ~= nil and button ~= nil
diff --git a/Modules/LayerPicker.lua b/Modules/LayerPicker.lua
index ba94d68..81b4e86 100644
--- a/Modules/LayerPicker.lua
+++ b/Modules/LayerPicker.lua
@@ -78,10 +78,7 @@ local function TryHook()
 	if button then
 		DisableDrag(button)
 		SetupMover(button)
-
-		if E.private.CoA.instance then
-			SkinButton(button)
-		end
+		SkinButton(button)
 	end
 
 	return button ~= nil
diff --git a/core.lua b/core.lua
index 8c30cb4..2c3565c 100644
--- a/core.lua
+++ b/core.lua
@@ -6,10 +6,7 @@ local AddOnName = ...
 local CoA = E:NewModule("CoA", "AceEvent-3.0", "AceTimer-3.0")
 E.CoA = CoA
 
-V.CoA = {
-	extraActionBar = true,
-	instance = true,
-}
+V.CoA = {}
 
 local function getOptions()
 	local options = {
@@ -18,34 +15,17 @@ local function getOptions()
 		childGroups = "tab",
 		name = string.format("|cff1784d1%s|r", "Conquest of Azeroth"),
 		args = {
-			skin = {
+			extraActionButton = {
 				order = 1,
 				type = "group",
-				name = "Skins",
-				get = function(info) return E.private.CoA[info[#info]] end,
-				set = function(info, value)
-					E.private.CoA[info[#info]] = value
-					E:StaticPopup_Show("PRIVATE_RL")
-				end,
-				args = {
-					header = {
-						order = 1,
-						type = "header",
-						name = "Skins",
-					},
-					extraActionBar = {
-						order = 2,
-						type = "toggle",
-						name = "Extra Action Bar",
-						desc = "Skin the ExtraActionBar frame.",
-					},
-					instance = {
-						order = 3,
-						type = "toggle",
-						name = "Instance",
-						desc = "Skin the LayerPickerFrame button.",
-					},
-				},
+				name = "Extra Action Button",
+				args = {},
+			},
+			instanceSwap = {
+				order = 2,
+				type = "group",
+				name = "Instance Swap",
+				args = {},
 			},
 		},
 	}