diff --git a/api/config.lua b/api/config.lua
index 2e57a607..ee2a8a9c 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -45,8 +45,6 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("appearance", "border",      "default",          "3")
   pfUI:UpdateConfig("appearance", "border",      "actionbars",       "-1")
   pfUI:UpdateConfig("appearance", "border",      "unitframes",       "-1")
-  pfUI:UpdateConfig("appearance", "border",      "groupframes",      "-1")
-  pfUI:UpdateConfig("appearance", "border",      "raidframes",       "-1")
   pfUI:UpdateConfig("appearance", "border",      "panels",           "-1")
   pfUI:UpdateConfig("appearance", "border",      "chat",             "-1")
   pfUI:UpdateConfig("appearance", "border",      "bags",             "-1")
diff --git a/api/unitframes.lua b/api/unitframes.lua
index da2da9e4..f4d50696 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -545,8 +545,8 @@ function pfUI.uf:RefreshUnit(unit, component)
   end
 
   local default_border = pfUI_config.appearance.border.default
-  if pfUI_config.appearance.border.groupframes ~= "-1" then
-    default_border = pfUI_config.appearance.border.groupframes
+  if pfUI_config.appearance.border.unitframes ~= "-1" then
+    default_border = pfUI_config.appearance.border.unitframes
   end
 
   local C = pfUI_config
@@ -914,8 +914,8 @@ end
 function pfUI.uf.UpdateFrameSize(self)
   local unit = self.label .. self.id
   local default_border = pfUI_config.appearance.border.default
-  if pfUI_config.appearance.border.groupframes ~= "-1" then
-    default_border = pfUI_config.appearance.border.groupframes
+  if pfUI_config.appearance.border.unitframes ~= "-1" then
+    default_border = pfUI_config.appearance.border.unitframes
   end
 
   local spacing = self.config.pspace
diff --git a/modules/group.lua b/modules/group.lua
index e92147b1..5622eef7 100644
--- a/modules/group.lua
+++ b/modules/group.lua
@@ -3,8 +3,8 @@ pfUI:RegisterModule("group", function ()
   if C.unitframes.disable == "1" then return end
 
   local default_border = C.appearance.border.default
-  if C.appearance.border.groupframes ~= "-1" then
-    default_border = C.appearance.border.groupframes
+  if C.appearance.border.unitframes ~= "-1" then
+    default_border = C.appearance.border.unitframes
   end
 
   local spacing = C.unitframes.group.pspace
diff --git a/modules/gui.lua b/modules/gui.lua
index caabc341..3031ccd0 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -850,8 +850,6 @@ pfUI:RegisterModule("gui", function ()
   pfUI.gui:CreateConfig(pfUI.gui.appearance, "Global Border Size", C.appearance.border, "default")
   pfUI.gui:CreateConfig(pfUI.gui.appearance, "Action Bar Border Size", C.appearance.border, "actionbars")
   pfUI.gui:CreateConfig(pfUI.gui.appearance, "Unit Frame Border Size", C.appearance.border, "unitframes")
-  pfUI.gui:CreateConfig(pfUI.gui.appearance, "Group Frame Border Size", C.appearance.border, "groupframes")
-  pfUI.gui:CreateConfig(pfUI.gui.appearance, "Raid Frame Border Size", C.appearance.border, "raidframes")
   pfUI.gui:CreateConfig(pfUI.gui.appearance, "Panel Border Size", C.appearance.border, "panels")
   pfUI.gui:CreateConfig(pfUI.gui.appearance, "Chat Border Size", C.appearance.border, "chat")
   pfUI.gui:CreateConfig(pfUI.gui.appearance, "Bags Border Size", C.appearance.border, "bags")
diff --git a/modules/raid.lua b/modules/raid.lua
index 2219748f..2daa01bd 100644
--- a/modules/raid.lua
+++ b/modules/raid.lua
@@ -3,8 +3,8 @@ pfUI:RegisterModule("raid", function ()
   if C.unitframes.disable == "1" then return end
 
   local default_border = C.appearance.border.default
-  if C.appearance.border.raidframes ~= "-1" then
-    default_border = C.appearance.border.raidframes
+  if C.appearance.border.unitframes ~= "-1" then
+    default_border = C.appearance.border.unitframes
   end
 
   pfUI.uf.raid = CreateFrame("Button","pfRaid",UIParent)