diff --git a/modules/uf_tukui.lua b/modules/uf_tukui.lua
index 5b4d152b..0a0a81ef 100644
--- a/modules/uf_tukui.lua
+++ b/modules/uf_tukui.lua
@@ -2,29 +2,47 @@ pfUI:RegisterModule("uf_tukui", function ()
   -- do not go further on disabled UFs
   if pfUI_config.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 pspacing = pfUI_config.unitframes.player.pspace
+  local tspacing = pfUI_config.unitframes.target.pspace
+
   if pfUI_config.unitframes.layout == "tukui" then
-    pfUI.uf.player.caption = CreateFrame("Frame",nil, pfUI.uf.player)
-pfUI.api:CreateBackdrop(    pfUI.uf.player.caption)
-    pfUI.uf.player.caption:SetHeight(pfUI_config.global.font_size * 2)
-    pfUI.uf.player.caption:SetPoint("TOPRIGHT",pfUI.uf.player,"BOTTOMRIGHT",0,-1)
-    pfUI.uf.player.caption:SetPoint("TOPLEFT",pfUI.uf.player,"BOTTOMLEFT",0,-1)
+    -- Player
+    pfUI.uf.player.caption = CreateFrame("Frame", "pfPlayerCaption", pfUI.uf.player)
+    pfUI.uf.player.caption:SetHeight(pfUI_config.global.font_size + default_border)
+    pfUI.uf.player.caption:SetPoint("TOPRIGHT",pfUI.uf.player,"BOTTOMRIGHT",0, -default_border*2 - pspacing)
+    pfUI.uf.player.caption:SetPoint("TOPLEFT",pfUI.uf.player,"BOTTOMLEFT",0, -default_border*2 - pspacing)
 
     pfUI.uf.player.hpText:SetParent(pfUI.uf.player.caption)
-    pfUI.uf.player.hpText:SetPoint("RIGHT",pfUI.uf.player.caption, "RIGHT", -3, 0)
+    pfUI.uf.player.hpText:SetAllPoints(pfUI.uf.player.caption)
+    pfUI.uf.player.hpText:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE")
+
+    pfUI.castbar.player:SetAllPoints(pfUI.uf.player.caption)
 
     pfUI.uf.player.powerText:SetParent(pfUI.uf.player.caption)
-    pfUI.uf.player.powerText:SetPoint("LEFT",pfUI.uf.player.caption, "LEFT", 5, 0)
+    pfUI.uf.player.powerText:SetAllPoints(pfUI.uf.player.caption)
+    pfUI.uf.player.powerText:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE")
+    pfUI.api:CreateBackdrop(pfUI.uf.player.caption)
 
-    pfUI.uf.target.caption = CreateFrame("Frame",nil, pfUI.uf.target)
-pfUI.api:CreateBackdrop(    pfUI.uf.target.caption)
-    pfUI.uf.target.caption:SetHeight(pfUI_config.global.font_size * 2)
-    pfUI.uf.target.caption:SetPoint("TOPRIGHT",pfUI.uf.target,"BOTTOMRIGHT",0,-1)
-    pfUI.uf.target.caption:SetPoint("TOPLEFT",pfUI.uf.target,"BOTTOMLEFT",0,-1)
+    -- Target
+    pfUI.uf.target.caption = CreateFrame("Frame", "pfTargetCaption", pfUI.uf.target)
+    pfUI.uf.target.caption:SetHeight(pfUI_config.global.font_size + default_border)
+    pfUI.uf.target.caption:SetPoint("TOPRIGHT",pfUI.uf.target,"BOTTOMRIGHT", 0, -default_border*2 - pspacing)
+    pfUI.uf.target.caption:SetPoint("TOPLEFT",pfUI.uf.target,"BOTTOMLEFT", 0, -default_border*2 - pspacing)
 
     pfUI.uf.target.hpText:SetParent(pfUI.uf.target.caption)
-    pfUI.uf.target.hpText:SetPoint("RIGHT",pfUI.uf.target.caption, "RIGHT", -3, 0)
+    pfUI.uf.target.hpText:SetAllPoints(pfUI.uf.target.caption)
+    pfUI.uf.target.hpText:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE")
+
+    pfUI.castbar.target:SetAllPoints(pfUI.uf.target.caption)
 
     pfUI.uf.target.powerText:SetParent(pfUI.uf.target.caption)
-    pfUI.uf.target.powerText:SetPoint("LEFT",pfUI.uf.target.caption, "LEFT", 5, 0)
+    pfUI.uf.target.powerText:SetAllPoints(pfUI.uf.target.caption)
+    pfUI.uf.target.powerText:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE")
+    pfUI.api:CreateBackdrop(pfUI.uf.target.caption)
   end
 end)