diff --git a/api/ui-widgets.lua b/api/ui-widgets.lua
index f3018c89..d138a27b 100644
--- a/api/ui-widgets.lua
+++ b/api/ui-widgets.lua
@@ -676,7 +676,7 @@ function pfUI.api.CreateQuestionDialog(text, yes, no, editbox, onclose)
 
   if not text then text = "Are you sure?" end
 
-  local border = tonumber(pfUI_config.appearance.border.default)
+  local rawborder, border = GetBorderSize()
   local padding = 15
 
   -- frame
diff --git a/api/unitframes.lua b/api/unitframes.lua
index 52cbe2f7..edb6229c 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -242,12 +242,8 @@ function pfUI.uf:UpdateVisibility()
 end
 
 function pfUI.uf:UpdateFrameSize()
-  local default_border = pfUI_config.appearance.border.default
-  if pfUI_config.appearance.border.unitframes ~= "-1" then
-    default_border = pfUI_config.appearance.border.unitframes
-  end
-
-  local spacing = self.config.pspace
+  local rawborder, default_border = GetBorderSize("unitframes")
+  local spacing = self.config.pspace * GetPerfectPixel()
   local width = self.config.width
   local height = self.config.height
   local pheight = self.config.pheight
@@ -271,10 +267,7 @@ end
 function pfUI.uf:UpdateConfig()
   local f = self
   local C = pfUI_config
-  local default_border = C.appearance.border.default
-  if C.appearance.border.unitframes ~= "-1" then
-    default_border = C.appearance.border.unitframes
-  end
+  local rawborder, default_border = GetBorderSize("unitframes")
 
   local relative_point = "BOTTOM"
   if f.config.panchor == "TOPLEFT" then
@@ -321,7 +314,7 @@ function pfUI.uf:UpdateConfig()
   end
 
   f.power:ClearAllPoints()
-  f.power:SetPoint(f.config.panchor, f.hp, relative_point, 0, -2*default_border - f.config.pspace)
+  f.power:SetPoint(f.config.panchor, f.hp, relative_point, 0, -2*default_border - f.config.pspace * GetPerfectPixel())
   f.power:SetWidth((f.config.pwidth ~= "-1" and f.config.pwidth or f.config.width))
   f.power:SetHeight(f.config.pheight)
   if tonumber(f.config.pheight) < 0 then f.power:Hide() end
@@ -1218,10 +1211,7 @@ function pfUI.uf:RefreshUnit(unit, component)
   -- create required fields
   if not unit.cache then unit.cache = {} end
   local unitstr = unit.label..unit.id
-  local default_border = C.appearance.border.default
-  if C.appearance.border.unitframes ~= "-1" then
-    default_border = C.appearance.border.unitframes
-  end
+  local rawborder, default_border = GetBorderSize("unitframes")
 
   -- Buffs
   if unit.buffs and ( component == "all" or component == "aura" ) then
diff --git a/modules/actionbar.lua b/modules/actionbar.lua
index 8391629b..2da6dba6 100644
--- a/modules/actionbar.lua
+++ b/modules/actionbar.lua
@@ -6,12 +6,8 @@ pfUI:RegisterModule("actionbar", "vanilla:tbc", function ()
   local backdrop_highlight = { edgeFile = pfUI.media["img:glow"], edgeSize = 8 }
   local showgrid = 0
   local showgrid_pet = 0
-
-  local border = tonumber(C.appearance.border.default)
-  if C.appearance.border.actionbars ~= "-1" then
-    border = tonumber(C.appearance.border.actionbars)
-  end
-  local bpad = border > 1 and border - 1 or 1
+  local rawborder, border = GetBorderSize("actionbars")
+  local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
   local eventcache = { } -- contains a list of events that shall be processed later -> [event] = true
   local updatecache = { } -- contains a list of buttons slots that shall be refreshed later -> [slot] = true
diff --git a/modules/addonbuttons.lua b/modules/addonbuttons.lua
index 4ee6bcf5..9bbea9ba 100644
--- a/modules/addonbuttons.lua
+++ b/modules/addonbuttons.lua
@@ -2,10 +2,7 @@ pfUI:RegisterModule("addonbuttons", "vanilla", function ()
   if not pfUI.minimap then return end
   if C.abuttons.enable == "0" then return end
 
-  local default_border = C.appearance.border.default
-  if C.appearance.border.panels ~= "-1" then
-    default_border = C.appearance.border.panels
-  end
+  local rawborder, border = GetBorderSize("panels")
 
   pfUI_cache["abuttons"] = pfUI_cache["abuttons"] or {}
   pfUI_cache["abuttons"]["add"] = pfUI_cache["abuttons"]["add"] or {}
diff --git a/modules/addons.lua b/modules/addons.lua
index fbb009ed..b9feadd7 100644
--- a/modules/addons.lua
+++ b/modules/addons.lua
@@ -1,4 +1,6 @@
 pfUI:RegisterModule("addons", "vanilla:tbc", function ()
+  local rawborder, border = GetBorderSize()
+
   -- add main menu button
   local pfUIAddonButton = CreateFrame("Button", "GameMenuButtonPFUIAddOns", GameMenuFrame, "GameMenuButtonTemplate")
   pfUIAddonButton:SetPoint("TOP", 0, -32)
@@ -47,7 +49,7 @@ pfUI:RegisterModule("addons", "vanilla:tbc", function ()
   pfUI.addons.caption:SetText(T["Addon List"])
 
   pfUI.addons.close = CreateFrame("Button", "pfBagClose", pfUI.addons)
-  pfUI.addons.close:SetPoint("TOPRIGHT", -C.appearance.border.default*2,-C.appearance.border.default*2 )
+  pfUI.addons.close:SetPoint("TOPRIGHT", -border*2,-border*2 )
   CreateBackdrop(pfUI.addons.close)
   pfUI.addons.close:SetHeight(15)
   pfUI.addons.close:SetWidth(15)
diff --git a/modules/autovendor.lua b/modules/autovendor.lua
index 4aabe2d6..325f4a67 100644
--- a/modules/autovendor.lua
+++ b/modules/autovendor.lua
@@ -1,6 +1,6 @@
 pfUI:RegisterModule("autovendor", "vanilla:tbc", function ()
-  local border = tonumber(pfUI_config.appearance.border.default)
-  local bpad = border > 1 and border - 1 or 1
+  local rawborder, border = GetBorderSize()
+  local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
   local scanlist = {}
 
diff --git a/modules/bags.lua b/modules/bags.lua
index dd2c3477..10142892 100644
--- a/modules/bags.lua
+++ b/modules/bags.lua
@@ -1,8 +1,5 @@
 pfUI:RegisterModule("bags", "vanilla:tbc", function ()
-  local default_border = C.appearance.border.default
-  if C.appearance.border.bags ~= "-1" then
-    default_border = C.appearance.border.bags
-  end
+  local rawborder, default_border = GetBorderSize("bags")
 
   local knownInventorySpellTextures = {
     Spell_Holy_RemoveCurse = {frame="disenchant"},
diff --git a/modules/buffwatch.lua b/modules/buffwatch.lua
index 0dab59c7..8d3473e1 100644
--- a/modules/buffwatch.lua
+++ b/modules/buffwatch.lua
@@ -1,5 +1,5 @@
 pfUI:RegisterModule("buffwatch", "vanilla:tbc", function ()
-  local border = C.appearance.border.default
+  local rawborder, border = GetBorderSize("panels")
   local scanner = libtipscan:GetScanner("buffwatch")
 
   local fcache = {}
diff --git a/modules/castbar.lua b/modules/castbar.lua
index ff59e1da..966def1f 100644
--- a/modules/castbar.lua
+++ b/modules/castbar.lua
@@ -1,12 +1,7 @@
 pfUI:RegisterModule("castbar", "vanilla:tbc", function ()
   local font = C.castbar.use_unitfonts == "1" and pfUI.font_unit or pfUI.font_default
   local font_size = C.castbar.use_unitfonts == "1" and C.global.font_unit_size or C.global.font_size
-
-  local default_border = C.appearance.border.default
-  if C.appearance.border.unitframes ~= "-1" then
-    default_border = C.appearance.border.unitframes
-  end
-
+  local rawborder, default_border = GetBorderSize("unitframes")
   local cbtexture = pfUI.media[C.appearance.castbar.texture]
 
   local function CreateCastbar(name, parent, unitstr, unitname)
diff --git a/modules/chat.lua b/modules/chat.lua
index ef2ad6fd..ced499c5 100644
--- a/modules/chat.lua
+++ b/modules/chat.lua
@@ -1,15 +1,10 @@
 pfUI:RegisterModule("chat", "vanilla:tbc", function ()
   local panelfont = C.panel.use_unitfonts == "1" and pfUI.font_unit or pfUI.font_default
   local panelfont_size = C.panel.use_unitfonts == "1" and C.global.font_unit_size or C.global.font_size
-
-  local default_border = C.appearance.border.default
-  if C.appearance.border.chat ~= "-1" then
-    default_border = C.appearance.border.chat
-  end
+  local rawborder, default_border = GetBorderSize("chat")
 
   _G.CHAT_FONT_HEIGHTS = { 8, 10, 12, 14, 16, 18, 20 }
 
-
   -- add dropdown menu button to ignore player
   UnitPopupButtons["IGNORE_PLAYER"] = { text = IGNORE_PLAYER, dist = 0 }
   for index,value in ipairs(UnitPopupMenus["FRIEND"]) do
diff --git a/modules/combopoints.lua b/modules/combopoints.lua
index ac9bd75c..1878ddbf 100644
--- a/modules/combopoints.lua
+++ b/modules/combopoints.lua
@@ -1,4 +1,6 @@
 pfUI:RegisterModule("combopoints", "vanilla:tbc", function ()
+  local rawborder, border = GetBorderSize()
+
   -- Hide Blizzard combo point frame and unregister all events to prevent it from popping up again
   ComboFrame:Hide()
   ComboFrame:UnregisterAllEvents()
@@ -15,9 +17,9 @@ pfUI:RegisterModule("combopoints", "vanilla:tbc", function ()
     pfUI.combopoints[point]:Hide()
 
     if pfUI.uf.target then
-      pfUI.combopoints[point]:SetPoint("TOPLEFT", pfUI.uf.target, "TOPRIGHT", C.appearance.border.default*3, -(point - 1) * (combo_size + C.appearance.border.default*3))
+      pfUI.combopoints[point]:SetPoint("TOPLEFT", pfUI.uf.target, "TOPRIGHT", border*3, -(point - 1) * (combo_size + border*3))
     else
-      pfUI.combopoints[point]:SetPoint("CENTER", UIParent, "CENTER", (point - 3) * (combo_size + C.appearance.border.default*3), 10 )
+      pfUI.combopoints[point]:SetPoint("CENTER", UIParent, "CENTER", (point - 3) * (combo_size + border*3), 10 )
     end
 
     pfUI.combopoints[point].tex = pfUI.combopoints[point]:CreateTexture("OVERLAY")
diff --git a/modules/eqcompare.lua b/modules/eqcompare.lua
index 3d93d988..0aa6a073 100644
--- a/modules/eqcompare.lua
+++ b/modules/eqcompare.lua
@@ -127,7 +127,7 @@ pfUI:RegisterModule("eqcompare", "vanilla", function ()
     pfUI.eqcompare.tooltip = this
 
     if not IsShiftKeyDown() and C.tooltip.compare.showalways ~= "1" then return end
-    local border = tonumber(C.appearance.border.default)
+    local rawborder, border = GetBorderSize()
 
     for i=1,this:NumLines() do
       local tmpText = _G[this:GetName() .. "TextLeft"..i]
diff --git a/modules/group.lua b/modules/group.lua
index 3f26dab1..5aa0aaa2 100644
--- a/modules/group.lua
+++ b/modules/group.lua
@@ -18,10 +18,7 @@ pfUI:RegisterModule("group", "vanilla:tbc", function ()
   function pfUI.uf.group:UpdateConfig()
     local startid = C.unitframes.selfingroup == "1" and 0 or 1
     local spacing = C.unitframes.group.pspace
-    local default_border = C.appearance.border.default
-    if C.appearance.border.unitframes ~= "-1" then
-      default_border = C.appearance.border.unitframes
-    end
+    local rawborder, default_border = GetBorderSize("unitframes")
 
     for i=0, 4 do
       local active = i >= 1 or startid == 0
diff --git a/modules/hoverbind.lua b/modules/hoverbind.lua
index b41a5103..bb1a9729 100644
--- a/modules/hoverbind.lua
+++ b/modules/hoverbind.lua
@@ -1,5 +1,4 @@
 pfUI:RegisterModule("hoverbind", "vanilla", function ()
-  local default_border = C.appearance.border.default
   local keymap = {
     -- buttons to binding association
     ["pfActionBarMainButton"]     = "ACTIONBUTTON",
diff --git a/modules/infight.lua b/modules/infight.lua
index 057cfbfd..87372432 100644
--- a/modules/infight.lua
+++ b/modules/infight.lua
@@ -1,9 +1,4 @@
 pfUI:RegisterModule("infight", "vanilla:tbc", function ()
-  local default_border = C.appearance.border.default
-  if C.appearance.border.unitframes ~= "-1" then
-    default_border = C.appearance.border.unitframes
-  end
-
   -- build the frame
   pfUI.infight = CreateFrame("Frame", "pfUICombat", UIParent)
 
diff --git a/modules/loot.lua b/modules/loot.lua
index 04f0ae10..fc59ce30 100644
--- a/modules/loot.lua
+++ b/modules/loot.lua
@@ -1,4 +1,6 @@
 pfUI:RegisterModule("loot", "vanilla:tbc", function ()
+  local rawborder, border = GetBorderSize()
+
   pfUI.loot = CreateFrame("Frame", "pfLootFrame", UIParent)
   pfUI.loot:Hide()
   pfUI.loot:SetFrameStrata("DIALOG")
@@ -9,10 +11,10 @@ pfUI:RegisterModule("loot", "vanilla:tbc", function ()
   pfUI.loot:RegisterEvent("UPDATE_MASTER_LOOT_LIST")
   pfUI.loot:RegisterEvent("LOOT_BIND_CONFIRM")
 
-  pfUI.loot:SetWidth(160+C.appearance.border.default*2)
+  pfUI.loot:SetWidth(160+border*2)
 
   if C.loot.mousecursor == "0" then
-    pfUI.loot:SetHeight(160+C.appearance.border.default*2)
+    pfUI.loot:SetHeight(160+border*2)
     pfUI.loot:SetPoint("TOP", UIParent, "CENTER", 0, 0)
     UpdateMovable(pfUI.loot)
   end
@@ -499,8 +501,8 @@ pfUI:RegisterModule("loot", "vanilla:tbc", function ()
         CreateBackdropShadow(pfUI.loot)
         pfUI.loot.backdrop:SetBackdropBorderColor(color.r, color.g, color.b, 1)
       end
-      pfUI.loot:SetHeight(math.max((real*22)+4*C.appearance.border.default), 20)
-      pfUI.loot:SetWidth(maxwidth + 22 + 8*C.appearance.border.default )
+      pfUI.loot:SetHeight(math.max((real*22)+4*border), 20)
+      pfUI.loot:SetWidth(maxwidth + 22 + 8*border)
     end
   end
 
@@ -522,10 +524,10 @@ pfUI:RegisterModule("loot", "vanilla:tbc", function ()
   function pfUI.loot:CreateSlot(id)
     local frame = CreateFrame(LOOT_BUTTON_FRAME_TYPE, 'pfLootButton'..id, pfUI.loot)
     frame:RegisterForClicks('LeftButtonUp', 'RightButtonUp')
-    frame:SetPoint("LEFT", C.appearance.border.default*2, 0)
-    frame:SetPoint("RIGHT", -C.appearance.border.default*2, 0)
+    frame:SetPoint("LEFT", border*2, 0)
+    frame:SetPoint("RIGHT", -border*2, 0)
     frame:SetHeight(22)
-    frame:SetPoint("TOP", pfUI.loot, "TOP", 4, (-C.appearance.border.default*2+22)-(id*22))
+    frame:SetPoint("TOP", pfUI.loot, "TOP", 4, (-border*2+22)-(id*22))
 
     frame:SetScript("OnClick", function()
       if ( IsControlKeyDown() ) then
@@ -579,8 +581,8 @@ pfUI:RegisterModule("loot", "vanilla:tbc", function ()
     end
 
     frame.ficon = CreateFrame("Frame", "pfLootButtonIcon", frame)
-    frame.ficon:SetHeight(frame:GetHeight() - 2*C.appearance.border.default)
-    frame.ficon:SetWidth(frame:GetHeight() - 2*C.appearance.border.default)
+    frame.ficon:SetHeight(frame:GetHeight() - 2*border)
+    frame.ficon:SetWidth(frame:GetHeight() - 2*border)
     frame.ficon:ClearAllPoints()
     frame.ficon:SetPoint("RIGHT", frame)
     CreateBackdrop(frame.ficon)
diff --git a/modules/minimap.lua b/modules/minimap.lua
index ce72587e..610cb4cb 100644
--- a/modules/minimap.lua
+++ b/modules/minimap.lua
@@ -1,5 +1,6 @@
 pfUI:RegisterModule("minimap", "vanilla:tbc", function ()
-  local border = tonumber(pfUI_config.appearance.border.default)
+  local rawborder, border = GetBorderSize()
+
   if MiniMapWorldMapButton then MiniMapWorldMapButton:Hide() end
   if MinimapToggleButton then MinimapToggleButton:Hide() end
   MinimapBorderTop:Hide()
diff --git a/modules/nameplates.lua b/modules/nameplates.lua
index 7400c3aa..c5b7be0b 100644
--- a/modules/nameplates.lua
+++ b/modules/nameplates.lua
@@ -4,6 +4,7 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function ()
   local inactive_alpha = tonumber(C.nameplates.notargalpha)
   local glowr, glowg, glowb, glowa = GetStringColor(C.nameplates.glowcolor)
   local hptexture = pfUI.media[C.nameplates.healthtexture]
+  local rawborder, default_border = GetBorderSize()
 
   -- disable original castbars
   pcall(SetCVar, "ShowVKeyCastbar", 0)
@@ -221,7 +222,7 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function ()
     -- combopoints
     if C.nameplates.cpdisplay == "1" then
       local combo_size = 5
-      local offset = 5 + C.nameplates.heightcast + C.nameplates.heighthealth + C.appearance.border.default*2
+      local offset = 5 + C.nameplates.heightcast + C.nameplates.heighthealth + default_border*2
 
       if not this.combopoints then
         this.combopoints = CreateFrame("Frame", nil, this.nameplate)
@@ -234,7 +235,7 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function ()
           end
 
           CreateBackdrop(this.combopoints["combopoint" .. point])
-          this.combopoints["combopoint" .. point]:SetPoint("BOTTOMRIGHT", this.nameplate, "BOTTOMRIGHT", -(point - 1) * (combo_size + C.appearance.border.default*3) - offset, -C.appearance.border.default*3)
+          this.combopoints["combopoint" .. point]:SetPoint("BOTTOMRIGHT", this.nameplate, "BOTTOMRIGHT", -(point - 1) * (combo_size + default_border*3) - offset, -default_border*3)
 
           if point < 3 then
             local tex = this.combopoints["combopoint" .. point]:CreateTexture("OVERLAY")
diff --git a/modules/panel.lua b/modules/panel.lua
index 045023c6..9ec86595 100644
--- a/modules/panel.lua
+++ b/modules/panel.lua
@@ -4,11 +4,7 @@ pfUI:RegisterModule("panel", "vanilla:tbc", function()
 
   local font = C.panel.use_unitfonts == "1" and pfUI.font_unit or pfUI.font_default
   local font_size = C.panel.use_unitfonts == "1" and C.global.font_unit_size or C.global.font_size
-
-  local default_border = C.appearance.border.default
-  if C.appearance.border.panels ~= "-1" then
-    default_border = C.appearance.border.panels
-  end
+  local rawborder, default_border = GetBorderSize("panels")
 
   do -- Widgets
     do -- Clock & Timer
diff --git a/modules/pet.lua b/modules/pet.lua
index c60b0047..223c633c 100644
--- a/modules/pet.lua
+++ b/modules/pet.lua
@@ -1,14 +1,6 @@
 pfUI:RegisterModule("pet", "vanilla:tbc", function ()
   -- do not go further on disabled UFs
   if C.unitframes.disable == "1" then return end
-
-  local default_border = C.appearance.border.default
-  if C.appearance.border.unitframes ~= "-1" then
-    default_border = C.appearance.border.unitframes
-  end
-
-  local spacing = C.unitframes.pet.pspace
-
   pfUI.uf.pet = pfUI.uf:CreateUnitFrame("Pet", nil, C.unitframes.pet)
   pfUI.uf.pet:UpdateFrameSize()
   pfUI.uf.pet:SetPoint("BOTTOM", UIParent , "BOTTOM", 0, 163)
diff --git a/modules/pettarget.lua b/modules/pettarget.lua
index c434f930..017c30c4 100644
--- a/modules/pettarget.lua
+++ b/modules/pettarget.lua
@@ -1,11 +1,7 @@
 pfUI:RegisterModule("pettarget", "vanilla:tbc", function ()
   -- do not go further on disabled UFs
   if C.unitframes.disable == "1" then return end
-
-  local default_border = pfUI_config.appearance.border.default
-  if pfUI_config.appearance.border.unitframes ~= "-1" then
-    default_border = pfUI_config.appearance.border.unitframes
-  end
+  local rawborder, default_border = GetBorderSize("unitframes")
 
   pfUI.uf.pettarget = pfUI.uf:CreateUnitFrame("PetTarget", nil, C.unitframes.ptarget, .2)
   pfUI.uf.pettarget:UpdateFrameSize()
diff --git a/modules/player.lua b/modules/player.lua
index 3343b8fb..eaf42b88 100644
--- a/modules/player.lua
+++ b/modules/player.lua
@@ -2,13 +2,6 @@ pfUI:RegisterModule("player", "vanilla:tbc", function ()
   -- do not go further on disabled UFs
   if C.unitframes.disable == "1" then return end
 
-  local default_border = C.appearance.border.default
-  if C.appearance.border.unitframes ~= "-1" then
-    default_border = C.appearance.border.unitframes
-  end
-
-  local spacing = C.unitframes.player.pspace
-
   PlayerFrame:Hide()
   PlayerFrame:UnregisterAllEvents()
 
diff --git a/modules/raid.lua b/modules/raid.lua
index d234721d..d8492ed8 100644
--- a/modules/raid.lua
+++ b/modules/raid.lua
@@ -2,10 +2,7 @@ pfUI:RegisterModule("raid", "vanilla:tbc", function ()
   -- do not go further on disabled UFs
   if C.unitframes.disable == "1" then return end
 
-  local default_border = C.appearance.border.default
-  if C.appearance.border.unitframes ~= "-1" then
-    default_border = C.appearance.border.unitframes
-  end
+  local rawborder, default_border = GetBorderSize("unitframes")
 
   pfUI.uf.raid = CreateFrame("Button","pfRaid",UIParent)
 
diff --git a/modules/roll.lua b/modules/roll.lua
index 2d5ad2bd..5b6ee8ce 100644
--- a/modules/roll.lua
+++ b/modules/roll.lua
@@ -74,7 +74,7 @@ pfUI:RegisterModule("roll", "vanilla:tbc", function ()
 
   function pfUI.roll:CreateLootRoll(id)
     local size = 24
-    local border = tonumber(C.appearance.border.default)
+    local rawborder, border = GetBorderSize()
     local esize = size - border*2
     local f = CreateFrame("Frame", "pfLootRollFrame" .. id, UIParent)
 
diff --git a/modules/target.lua b/modules/target.lua
index 6ac7494c..9522b8d0 100644
--- a/modules/target.lua
+++ b/modules/target.lua
@@ -2,13 +2,6 @@ pfUI:RegisterModule("target", "vanilla:tbc", function ()
   -- do not go further on disabled UFs
   if C.unitframes.disable == "1" then return end
 
-  local default_border = C.appearance.border.default
-  if C.appearance.border.unitframes ~= "-1" then
-    default_border = C.appearance.border.unitframes
-  end
-
-  local spacing = C.unitframes.target.pspace
-
   -- Hide Blizzard target frame and unregister all events to prevent it from popping up again
   TargetFrame:Hide()
   TargetFrame:UnregisterAllEvents()
diff --git a/modules/thirdparty.lua b/modules/thirdparty.lua
index 48f7d101..a9d4caf9 100644
--- a/modules/thirdparty.lua
+++ b/modules/thirdparty.lua
@@ -49,6 +49,8 @@ pfUI:RegisterModule("thirdparty", "vanilla", function ()
   function pfUI.thirdparty.meters:Resize()
     if pfUI.chat and pfUI.panel then
 
+      local rawborder, default_border = GetBorderSize()
+
       if DPSMate_DPSMate and C.thirdparty.dpsmate.dock == "1" then
         -- DPSMate Single View
         if pfUI.thirdparty.meters.damage and not pfUI.thirdparty.meters.threat then
@@ -114,7 +116,7 @@ pfUI:RegisterModule("thirdparty", "vanilla", function ()
           RefreshKtmWidth()
           KLHTM_Frame:ClearAllPoints()
           KLHTM_Frame:SetPoint("TOPLEFT", pfUI.chat.right, "TOPLEFT", 0, 0)
-          KLHTM_Frame:SetPoint("BOTTOMRIGHT", pfUI.chat.right, "BOTTOM", -C.appearance.border.default, pfUI.panel.right:GetHeight())
+          KLHTM_Frame:SetPoint("BOTTOMRIGHT", pfUI.chat.right, "BOTTOM", -default_border, pfUI.panel.right:GetHeight())
           KLHTM_Frame.backdrop:SetPoint("BOTTOMRIGHT", KLHTM_Frame, "BOTTOMRIGHT", 0, -(KLHTM_Frame:GetBottom() - pfUI.chat.right:GetBottom()))
         end
       end
@@ -915,10 +917,7 @@ pfUI:RegisterModule("thirdparty", "vanilla", function ()
       -- make sure the bag module is enabled
       if not pfUI.bag or not pfUI.bag.right then return end
 
-      local default_border = C.appearance.border.default
-      if C.appearance.border.bags ~= "-1" then
-        default_border = C.appearance.border.bags
-      end
+      local rawborder, default_border = GetBorderSize("bags")
 
       -- draw the button
       if not pfUI.bag.right.sort then
@@ -1024,10 +1023,7 @@ pfUI:RegisterModule("thirdparty", "vanilla", function ()
       -- make sure the bag module is enabled
       if not pfUI.bag or not pfUI.bag.right then return end
 
-      local default_border = C.appearance.border.default
-      if C.appearance.border.bags ~= "-1" then
-        default_border = C.appearance.border.bags
-      end
+      local rawborder, default_border = GetBorderSize("bags")
 
       -- draw the button
       if not pfUI.bag.right.sort then
diff --git a/modules/tooltip.lua b/modules/tooltip.lua
index 0c6dfbb2..47400552 100644
--- a/modules/tooltip.lua
+++ b/modules/tooltip.lua
@@ -1,4 +1,5 @@
 pfUI:RegisterModule("tooltip", "vanilla:tbc", function ()
+  local rawborder, default_border = GetBorderSize()
 
   pfUI.tooltip = CreateFrame('Frame', "pfTooltip", GameTooltip)
   pfUI.tooltip.anchorframe = CreateFrame('Frame', "pfTooltipAnchor", UIParent)
@@ -89,7 +90,7 @@ pfUI:RegisterModule("tooltip", "vanilla:tbc", function ()
         GameTooltip:ClearAllPoints()
         if C.tooltip.position == "bottom" then
           if pfUI.panel then
-            GameTooltip:SetPoint("BOTTOMRIGHT", pfUI.panel.right, "TOPRIGHT", 0, C.appearance.border.default*2)
+            GameTooltip:SetPoint("BOTTOMRIGHT", pfUI.panel.right, "TOPRIGHT", 0, default_border*2)
           else
             GameTooltip:SetPoint("BOTTOMRIGHT", UIParent, "BOTTOMRIGHT", -5, 5)
           end
@@ -109,7 +110,7 @@ pfUI:RegisterModule("tooltip", "vanilla:tbc", function ()
           end
 
           if anchor then
-            GameTooltip:SetPoint("BOTTOMRIGHT", anchor, "TOPRIGHT", 0, C.appearance.border.default*2)
+            GameTooltip:SetPoint("BOTTOMRIGHT", anchor, "TOPRIGHT", 0, default_border*2)
           else
             GameTooltip:SetPoint("BOTTOMRIGHT", UIParent, "BOTTOMRIGHT", -5, 5)
           end
diff --git a/modules/tracking.lua b/modules/tracking.lua
index 3a9b26cb..399a9ad9 100644
--- a/modules/tracking.lua
+++ b/modules/tracking.lua
@@ -10,11 +10,9 @@ pfUI:RegisterModule("tracking", "vanilla", function ()
     return nil
   end
 
-  local config = {
-      border = C.appearance.border.default,
-      size = tonumber(C.appearance.minimap.tracking_size),
-      pulse = C.appearance.minimap.tracking_pulse == "1"
-  }
+  local rawborder, border = GetBorderSize()
+  local size = tonumber(C.appearance.minimap.tracking_size)
+  local pulse = C.appearance.minimap.tracking_pulse == "1"
 
   local knownTrackingSpellTextures = {
     any = {
@@ -50,13 +48,13 @@ pfUI:RegisterModule("tracking", "vanilla", function ()
 
   pfUI.tracking = CreateFrame("Button", "pfUITracking", UIParent)
   pfUI.tracking:SetFrameStrata("LOW")
-  CreateBackdrop(pfUI.tracking, config.border)
+  CreateBackdrop(pfUI.tracking, border)
   CreateBackdropShadow(pfUI.tracking)
 
   pfUI.tracking:SetPoint("TOPLEFT", pfUI.minimap, -10, -10)
   UpdateMovable(pfUI.tracking)
-  pfUI.tracking:SetWidth(config.size)
-  pfUI.tracking:SetHeight(config.size)
+  pfUI.tracking:SetWidth(size)
+  pfUI.tracking:SetHeight(size)
 
   pfUI.tracking.icon = pfUI.tracking:CreateTexture("BACKGROUND")
   pfUI.tracking.icon:SetTexCoord(.08, .92, .08, .92)
@@ -84,7 +82,7 @@ pfUI:RegisterModule("tracking", "vanilla", function ()
     elseif not texture then
       state.texture = nil
 
-      if config.pulse and HasEntries(state.spells) then
+      if pulse and HasEntries(state.spells) then
         this.pulse = true
         this.icon:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark")
         this.icon:SetVertexColor(1,1,1,1)
diff --git a/modules/uf_tukui.lua b/modules/uf_tukui.lua
index ed95c1b1..51ade14b 100644
--- a/modules/uf_tukui.lua
+++ b/modules/uf_tukui.lua
@@ -8,11 +8,7 @@ pfUI:RegisterModule("uf_tukui", "vanilla:tbc", function ()
     hookUpdateConfigPlayer(pfUI.uf.player)
 
     -- load configs
-    local default_border = C.appearance.border.default
-    if C.appearance.border.unitframes ~= "-1" then
-      default_border = C.appearance.border.unitframes
-    end
-
+    local rawborder, default_border = GetBorderSize("unitframes")
     local pspacing = C.unitframes.player.pspace
     local tspacing = C.unitframes.target.pspace
 
@@ -50,11 +46,7 @@ pfUI:RegisterModule("uf_tukui", "vanilla:tbc", function ()
     hookUpdateConfigTarget(pfUI.uf.target)
 
     -- load configs
-    local default_border = C.appearance.border.default
-    if C.appearance.border.unitframes ~= "-1" then
-      default_border = C.appearance.border.unitframes
-    end
-
+    local rawborder, default_border = GetBorderSize("unitframes")
     local pspacing = C.unitframes.player.pspace
     local tspacing = C.unitframes.target.pspace
 
diff --git a/modules/unlock.lua b/modules/unlock.lua
index 9d7777ea..7e3dee42 100644
--- a/modules/unlock.lua
+++ b/modules/unlock.lua
@@ -1,4 +1,6 @@
 pfUI:RegisterModule("unlock", "vanilla:tbc", function ()
+  local rawborder, default_border = GetBorderSize()
+
   -- grouped frames
   local clusters = {
     -- Name            Shift  Ctrl
@@ -225,7 +227,7 @@ pfUI:RegisterModule("unlock", "vanilla:tbc", function ()
     local frame = drag.frame
 
     -- update dock position
-    SetAutoPoint(dock, drag, tonumber(pfUI_config.appearance.border.default)*2+2)
+    SetAutoPoint(dock, drag, default_border*2+2)
 
     -- update dock entries
     dock.title:SetText(drag.label)
diff --git a/modules/xpbar.lua b/modules/xpbar.lua
index 129bdf43..689a62f8 100644
--- a/modules/xpbar.lua
+++ b/modules/xpbar.lua
@@ -1,4 +1,6 @@
 pfUI:RegisterModule("xpbar", "vanilla:tbc", function ()
+  local rawborder, default_border = GetBorderSize()
+
   local xp_timeout = tonumber(C.panel.xp.xp_timeout)
   local xp_width = C.panel.xp.xp_width
   local xp_height = C.panel.xp.xp_height
@@ -29,11 +31,11 @@ pfUI:RegisterModule("xpbar", "vanilla:tbc", function ()
     b:SetFrameStrata("BACKGROUND")
 
     if t == "XP" and pfUI.chat then
-      b:SetPoint("TOPLEFT", pfUI.chat.left, "TOPRIGHT", C.appearance.border.default*2, 0)
-      b:SetPoint("BOTTOMLEFT", pfUI.chat.left, "BOTTOMRIGHT", C.appearance.border.default*2, 0)
+      b:SetPoint("TOPLEFT", pfUI.chat.left, "TOPRIGHT", default_border*2, 0)
+      b:SetPoint("BOTTOMLEFT", pfUI.chat.left, "BOTTOMRIGHT", default_border*2, 0)
     elseif t == "REP" and pfUI.chat then
-      b:SetPoint("TOPRIGHT",pfUI.chat.right,"TOPLEFT", -C.appearance.border.default*2, 0)
-      b:SetPoint("BOTTOMRIGHT",pfUI.chat.right,"BOTTOMLEFT",-C.appearance.border.default*2, 0)
+      b:SetPoint("TOPRIGHT",pfUI.chat.right,"TOPLEFT", -default_border*2, 0)
+      b:SetPoint("BOTTOMRIGHT",pfUI.chat.right,"BOTTOMLEFT",-default_border*2, 0)
     else
       b:SetPoint("TOPRIGHT", UIParent, "TOPRIGHT", 0, 0)
       b:SetPoint("BOTTOMRIGHT", UIParent, "BOTTOMRIGHT", 0, 0)