From 6284be96ce11d8aeaba1fd4a2d90a03033fe5607 Mon Sep 17 00:00:00 2001
From: Nuno Freire <greven.pt@gmail.com>
Date: Sat, 17 Oct 2020 15:28:57 +0100
Subject: [PATCH] Refactoring, fixes and addional features for 9.01

---
 config/_config.xml      |   3 +-
 config/config.lua       | 366 +++-------------------------------------
 config/defaults.lua     | 347 +++++++++++++++++++++++++++++++++++++
 core/core.lua           |   4 +-
 elements/nameplates.lua |   6 +-
 tasks.todo              |   4 +
 units/arena.lua         |   4 +-
 units/boss.lua          |   4 +-
 units/focus.lua         |   4 +-
 units/party.lua         |   6 +-
 units/pet.lua           |   4 +-
 units/player.lua        |  54 ++++--
 units/target.lua        |   6 +-
 units/targettarget.lua  |   4 +-
 14 files changed, 440 insertions(+), 376 deletions(-)
 create mode 100644 config/defaults.lua

diff --git a/config/_config.xml b/config/_config.xml
index 5930561..6c2740b 100644
--- a/config/_config.xml
+++ b/config/_config.xml
@@ -1,6 +1,7 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/">
 	<Script file='colors.lua' />
+	<Script file='defaults.lua' />
 	<Script file='config.lua' />
 	<Script file='filters.lua' />
-		<Script file='debuffs.lua' />
+	<Script file='debuffs.lua' />
 </Ui>
diff --git a/config/config.lua b/config/config.lua
index 292ac2a..3d1be16 100644
--- a/config/config.lua
+++ b/config/config.lua
@@ -1,346 +1,34 @@
 local _, ns = ...
 
-local cfg, oUF = {}, ns.oUF
-ns.cfg = cfg
+local cfg, oUF = ns.cfg, ns.oUF
 
 -- ------------------------------------------------------------------------
--- > CONFIGURATION
+-- > Your configuration here (will override the defaults.lua settings)
 -- ------------------------------------------------------------------------
 
--- Healing specs
-cfg.healingSpecs = {
-  "Restoration",
-  "Mistweaver",
-  "Holy",
-  "Discipline"
-}
+-- Important: Override each property individually or copy all the defaults
+
+-- Examples
+-- cfg.fontsize = 14 -- The Global Font Size
+-- cfg.scale = 1.25 -- The elements Scale
+
+-- Compact UI
+-- cfg.frames.main.margin = 10
+-- cfg.units.player.pos = {a1 = "LEFT", a2 = "CENTER", af = "UIParent", x = -213, y = -320}
+-- cfg.units.player.castbar.width = 418
+-- cfg.units.player.castbar.pos = {
+--   a1 = "TOPLEFT",
+--   a2 = "BOTTOMLEFT",
+--   af = "oUF_LumenPlayer",
+--   x = cfg.frames.main.height + 2,
+--   y = -101
+-- }
+-- cfg.units.target.pos = {
+--   a1 = "BOTTOMLEFT",
+--   a2 = "BOTTOMRIGHT",
+--   af = "oUF_LumenPlayer",
+--   x = cfg.frames.main.margin,
+--   y = 0
+-- }
 
--- -----------------------------------
--- > COLORS
--- -----------------------------------
-
-cfg.colors = {
-  backdrop = {r = 0, g = 0, b = 0, a = 1}, -- Backdrop Color (Some frames might not be affected)
-  health = {0.3, 0.3, 0.3, 1}, -- Fallback color
-  inverted = {0.1, 0.1, 0.1, 1} -- Inverted Color
-}
-
--- -----------------------------------
--- > GENERAL
--- -----------------------------------
-
-cfg.fontsize = 14 -- The Global Font Size
-cfg.scale = 1 -- The elements Scale
-
--- -----------------------------------
--- > FRAMES
--- -----------------------------------
-
-cfg.frames = {
-  main = {
-    width = 208, -- Width of the Player and Target Frames
-    height = 26, -- Height of the Player and Target Frames
-    health = {
-      margin = 2 -- Spacing between HP and Power Bars
-    },
-    power = {
-      height = 1, -- Height of the Power Bar
-      text = {
-        hideMax = true
-      }
-    }
-  },
-  secondary = {
-    width = 98, -- Width of the ToT, Focus, Pet...
-    height = 20, -- Height of the ToT, Focus, Pet...
-    margin = 10, -- Margin to other frames
-    health = {
-      margin = 2 -- Spacing between HP and Power Bars
-    },
-    power = {
-      height = 1 -- Height of the Power Bar
-    }
-  },
-  shadow = {
-    show = true, -- Use frame drop shadows
-    opacity = 0.7
-  },
-  range = {
-    insideAlpha = 1,
-    outsideAlpha = 0.25
-  }
-}
-
--- -----------------------------------
--- > UNITS
--- -----------------------------------
-
-cfg.units = {
-  player = {
-    show = true,
-    width = cfg.frames.main.width,
-    height = cfg.frames.main.height,
-    pos = {a1 = "LEFT", a2 = "CENTER", af = "UIParent", x = -213, y = -310},
-    health = {
-      classColored = true,
-      gradientColored = true,
-      classColoredText = false,
-      reactionColored = false,
-      smooth = true
-    },
-    power = {
-      height = cfg.frames.main.power.height,
-      classColored = false,
-      frequentUpdates = true,
-      smooth = true
-    },
-    -- visibility = "[combat][mod][@target,exists][vehicleui][group] show; hide",
-    name = {
-      show = true
-    },
-    altpower = {
-      height = 2
-    },
-    castbar = {
-      enable = true,
-      pos = {a1 = "TOPLEFT", a2 = "BOTTOMLEFT", af = "oUF_LumenPlayer", x = cfg.frames.main.height, y = -102},
-      color = {5 / 255, 107 / 255, 246 / 255},
-      width = cfg.frames.main.width * 2 + 2,
-      height = 25,
-      latency = {
-        show = true,
-        color = {1, 0, 0, 0.4}
-      }
-    },
-    auras = {
-      debuffs = {
-        show = true
-      },
-      barTimers = {
-        show = true
-      }
-    },
-    fader = {
-      enable = false,
-      alpha = 0.3
-    }
-  },
-  target = {
-    show = true,
-    width = cfg.frames.main.width,
-    height = cfg.frames.main.height,
-    pos = {a1 = "BOTTOMLEFT", a2 = "BOTTOMRIGHT", af = "oUF_LumenPlayer", x = cfg.frames.secondary.margin, y = 0},
-    health = {
-      classColored = true,
-      gradientColored = false,
-      classColoredText = false,
-      reactionColored = true,
-      smooth = true
-    },
-    power = {
-      height = cfg.frames.main.power.height,
-      classColored = false,
-      frequentUpdates = true,
-      smooth = true
-    },
-    name = {
-      show = true
-    },
-    castbar = {
-      enable = true,
-      color = {235 / 255, 25 / 255, 25 / 255},
-      width = cfg.frames.main.width * 1.75,
-      height = cfg.frames.main.height + 4
-    },
-    auras = {
-      buffs = {
-        show = true
-      },
-      barTimers = {
-        show = true
-      }
-    }
-  },
-  targettarget = {
-    show = true,
-    width = cfg.frames.secondary.width,
-    height = cfg.frames.secondary.height,
-    pos = {a1 = "BOTTOMRIGHT", a2 = "TOPRIGHT", af = "oUF_LumenTarget", x = 0, y = cfg.frames.secondary.margin},
-    health = {
-      classColored = true,
-      gradientColored = false,
-      classColoredText = false,
-      reactionColored = true,
-      smooth = true
-    },
-    power = {
-      height = cfg.frames.secondary.power.height,
-      classColored = false,
-      frequentUpdates = false,
-      smooth = true
-    }
-  },
-  focus = {
-    show = true,
-    width = cfg.frames.secondary.width,
-    height = cfg.frames.secondary.height,
-    pos = {a1 = "BOTTOMRIGHT", a2 = "TOPRIGHT", af = "oUF_LumenPlayer", x = 0, y = cfg.frames.secondary.margin},
-    health = {
-      classColored = true,
-      gradientColored = false,
-      classColoredText = false,
-      reactionColored = true,
-      smooth = true
-    },
-    power = {
-      height = cfg.frames.secondary.power.height,
-      classColored = false,
-      frequentUpdates = false,
-      smooth = true
-    },
-    castbar = {
-      enable = true,
-      color = {123 / 255, 66 / 255, 200 / 255},
-      width = 282,
-      height = cfg.frames.main.height
-    }
-  },
-  pet = {
-    show = true,
-    width = cfg.frames.secondary.width,
-    height = cfg.frames.secondary.height,
-    pos = {a1 = "BOTTOMLEFT", a2 = "TOPLEFT", af = "oUF_LumenPlayer", x = 0, y = cfg.frames.secondary.margin},
-    health = {
-      classColored = false,
-      gradientColored = true,
-      classColoredText = false,
-      reactionColored = false,
-      smooth = true
-    },
-    power = {
-      height = cfg.frames.secondary.power.height,
-      classColored = false,
-      frequentUpdates = false,
-      smooth = true
-    },
-    buffs = {
-      filter = true
-    }
-  },
-  boss = {
-    show = true,
-    width = 200,
-    height = 28,
-    pos = {a1 = "RIGHT", a2 = "CENTER", af = "UIParent", x = 700, y = 200},
-    health = {
-      gradientColored = false,
-      reactionColored = true,
-      smooth = true
-    },
-    power = {
-      height = cfg.frames.secondary.power.height,
-      classColored = false,
-      frequentUpdates = false,
-      smooth = true,
-      text = {
-        show = false
-      }
-    },
-    castbar = {
-      enable = true,
-      color = {5 / 255, 107 / 255, 246 / 255},
-      width = 282,
-      height = cfg.frames.main.height
-    }
-  },
-  arena = {
-    show = true,
-    width = 250,
-    height = 32,
-    pos = {a1 = "RIGHT", a2 = "CENTER", af = "UIParent", x = 700, y = 200},
-    health = {
-      classColored = true,
-      gradientColored = false,
-      classColoredText = false,
-      reactionColored = true,
-      smooth = true
-    },
-    power = {
-      height = cfg.frames.secondary.power.height,
-      classColored = false,
-      frequentUpdates = false,
-      smooth = true
-    }
-  },
-  party = {
-    show = true,
-    width = 164,
-    height = 40,
-    pos = {a1 = "CENTER", a2 = "CENTER", af = "UIParent", x = -550, y = -102},
-    health = {
-      classColored = true,
-      gradientColored = false,
-      reactionColored = false,
-      invertedColors = true,
-      classColoredText = false,
-      smooth = true
-    },
-    power = {
-      height = 1.5,
-      classColored = true,
-      frequentUpdates = false,
-      smooth = true
-    },
-    showPortraits = true,
-    forceRole = true
-  },
-  raid = {
-    show = true
-  },
-  nameplate = {
-    show = true,
-    width = 120,
-    height = 8,
-    pos = {a1 = "CENTER", a2 = "CENTER", af = "UIParent", x = 0, y = 0},
-    classpower = true,
-    debuffs = true,
-    castbar = {
-      enable = true,
-      color = {5 / 255, 107 / 255, 246 / 255},
-      height = 2
-    },
-    selectedColor = {255 / 255, 25 / 255, 25 / 255, 0.8},
-    glowColor = {50 / 255, 240 / 255, 210 / 255, 0.7},
-    showTargetArrow = false,
-    showGlow = false,
-    showHighlight = false
-  }
-}
-
-cfg.elements = {
-  castbar = {
-    backdrop = {
-      color = {r = 0, g = 0, b = 0, a = 0.85}
-    },
-    timeToHold = 2
-  },
-  experiencebar = {
-    show = true,
-    height = 3,
-    width = Minimap:GetWidth() + 4,
-    pos = {a1 = "TOPLEFT", a2 = "BOTTOMLEFT", af = "Minimap", x = -2, y = -12}
-  },
-  artifactpowerbar = {
-    show = true,
-    height = 3,
-    width = Minimap:GetWidth() + 4,
-    pos = {a1 = "TOPLEFT", a2 = "BOTTOMLEFT", af = "Minimap", x = -2, y = -24}
-  },
-  altpowerbar = {
-    show = true
-  },
-  mirrorTimers = {
-    width = 220,
-    height = cfg.frames.main.height + 2
-  }
-}
+-- ------------------------------------------------------------------------
diff --git a/config/defaults.lua b/config/defaults.lua
new file mode 100644
index 0000000..eebeaee
--- /dev/null
+++ b/config/defaults.lua
@@ -0,0 +1,347 @@
+local _, ns = ...
+
+local cfg, oUF = {}, ns.oUF
+ns.cfg = cfg
+
+-- ------------------------------------------------------------------------
+-- > CONFIGURATION
+-- ------------------------------------------------------------------------
+
+-- Healing specs
+cfg.healingSpecs = {
+  "Restoration",
+  "Mistweaver",
+  "Holy",
+  "Discipline"
+}
+
+-- -----------------------------------
+-- > COLORS
+-- -----------------------------------
+
+cfg.colors = {
+  backdrop = {r = 0, g = 0, b = 0, a = 1}, -- Backdrop Color (Some frames might not be affected)
+  health = {0.3, 0.3, 0.3, 1}, -- Fallback color
+  inverted = {0.1, 0.1, 0.1, 1} -- Inverted Color
+}
+
+-- -----------------------------------
+-- > GENERAL
+-- -----------------------------------
+
+cfg.fontsize = 14 -- The Global Font Size
+cfg.scale = 1 -- The elements Scale
+
+-- -----------------------------------
+-- > FRAMES
+-- -----------------------------------
+
+cfg.frames = {
+  main = {
+    width = 208, -- Width of the Player and Target Frames
+    height = 26, -- Height of the Player and Target Frames
+    margin = 226, -- Margin between Player and Target Frames
+    health = {
+      margin = 2 -- Spacing between HP and Power Bars
+    },
+    power = {
+      height = 1.5, -- Height of the Power Bar
+      text = {
+        hideMax = true
+      }
+    }
+  },
+  secondary = {
+    width = 98, -- Width of the ToT, Focus, Pet...
+    height = 20, -- Height of the ToT, Focus, Pet...
+    margin = 10, -- Margin to other frames
+    health = {
+      margin = 2 -- Spacing between HP and Power Bars
+    },
+    power = {
+      height = 1.5 -- Height of the Power Bar
+    }
+  },
+  shadow = {
+    show = true, -- Use frame drop shadows
+    opacity = 0.7
+  },
+  range = {
+    insideAlpha = 1,
+    outsideAlpha = 0.25
+  }
+}
+
+-- -----------------------------------
+-- > UNITS
+-- -----------------------------------
+
+cfg.units = {
+  player = {
+    show = true,
+    width = cfg.frames.main.width,
+    height = cfg.frames.main.height,
+    pos = {a1 = "LEFT", a2 = "CENTER", af = "UIParent", x = -322, y = -362},
+    health = {
+      classColored = true,
+      gradientColored = true,
+      classColoredText = false,
+      reactionColored = false,
+      smooth = true
+    },
+    power = {
+      height = cfg.frames.main.power.height,
+      classColored = false,
+      frequentUpdates = true,
+      smooth = true
+    },
+    -- visibility = "[combat][mod][@target,exists][vehicleui][group] show; hide",
+    name = {
+      show = true
+    },
+    altpower = {
+      height = 2
+    },
+    castbar = {
+      enable = true,
+      pos = {a1 = "TOPLEFT", a2 = "BOTTOMLEFT", af = "oUF_LumenPlayer", x = cfg.frames.main.height + 2, y = -96},
+      color = {5 / 255, 107 / 255, 246 / 255},
+      width = cfg.frames.main.width * 2 + cfg.frames.main.margin - cfg.frames.main.height / 2 + 6,
+      height = cfg.frames.main.height,
+      latency = {
+        show = true,
+        color = {1, 0, 0, 0.4}
+      }
+    },
+    auras = {
+      debuffs = {
+        show = true
+      },
+      barTimers = {
+        show = true
+      }
+    },
+    fader = {
+      enable = false,
+      alpha = 0.3
+    }
+  },
+  target = {
+    show = true,
+    width = cfg.frames.main.width,
+    height = cfg.frames.main.height,
+    pos = {a1 = "BOTTOMLEFT", a2 = "BOTTOMRIGHT", af = "oUF_LumenPlayer", x = cfg.frames.main.margin, y = 0},
+    health = {
+      classColored = true,
+      gradientColored = false,
+      classColoredText = false,
+      reactionColored = true,
+      smooth = true
+    },
+    power = {
+      height = cfg.frames.main.power.height,
+      classColored = false,
+      frequentUpdates = true,
+      smooth = true
+    },
+    name = {
+      show = true
+    },
+    castbar = {
+      enable = true,
+      color = {235 / 255, 25 / 255, 25 / 255},
+      width = cfg.frames.main.width * 1.75,
+      height = cfg.frames.main.height
+    },
+    auras = {
+      buffs = {
+        show = true
+      },
+      barTimers = {
+        show = true
+      }
+    }
+  },
+  targettarget = {
+    show = true,
+    width = cfg.frames.secondary.width,
+    height = cfg.frames.secondary.height,
+    pos = {a1 = "BOTTOMRIGHT", a2 = "TOPRIGHT", af = "oUF_LumenTarget", x = 0, y = cfg.frames.secondary.margin},
+    health = {
+      classColored = true,
+      gradientColored = false,
+      classColoredText = false,
+      reactionColored = true,
+      smooth = true
+    },
+    power = {
+      height = cfg.frames.secondary.power.height,
+      classColored = false,
+      frequentUpdates = false,
+      smooth = true
+    }
+  },
+  focus = {
+    show = true,
+    width = cfg.frames.secondary.width,
+    height = cfg.frames.secondary.height,
+    pos = {a1 = "BOTTOMRIGHT", a2 = "TOPRIGHT", af = "oUF_LumenPlayer", x = 0, y = cfg.frames.secondary.margin},
+    health = {
+      classColored = true,
+      gradientColored = false,
+      classColoredText = false,
+      reactionColored = true,
+      smooth = true
+    },
+    power = {
+      height = cfg.frames.secondary.power.height,
+      classColored = false,
+      frequentUpdates = false,
+      smooth = true
+    },
+    castbar = {
+      enable = true,
+      color = {123 / 255, 66 / 255, 200 / 255},
+      width = 282,
+      height = cfg.frames.main.height
+    }
+  },
+  pet = {
+    show = true,
+    width = cfg.frames.secondary.width,
+    height = cfg.frames.secondary.height,
+    pos = {a1 = "BOTTOMLEFT", a2 = "TOPLEFT", af = "oUF_LumenPlayer", x = 0, y = cfg.frames.secondary.margin},
+    health = {
+      classColored = false,
+      gradientColored = true,
+      classColoredText = false,
+      reactionColored = false,
+      smooth = true
+    },
+    power = {
+      height = cfg.frames.secondary.power.height,
+      classColored = false,
+      frequentUpdates = false,
+      smooth = true
+    },
+    buffs = {
+      filter = true
+    }
+  },
+  boss = {
+    show = true,
+    width = 200,
+    height = 28,
+    pos = {a1 = "RIGHT", a2 = "CENTER", af = "UIParent", x = 700, y = 200},
+    health = {
+      gradientColored = false,
+      reactionColored = true,
+      smooth = true
+    },
+    power = {
+      height = cfg.frames.secondary.power.height,
+      classColored = false,
+      frequentUpdates = false,
+      smooth = true,
+      text = {
+        show = false
+      }
+    },
+    castbar = {
+      enable = true,
+      color = {5 / 255, 107 / 255, 246 / 255},
+      width = 282,
+      height = cfg.frames.main.height
+    }
+  },
+  arena = {
+    show = true,
+    width = 250,
+    height = 32,
+    pos = {a1 = "RIGHT", a2 = "CENTER", af = "UIParent", x = 700, y = 200},
+    health = {
+      classColored = true,
+      gradientColored = false,
+      classColoredText = false,
+      reactionColored = true,
+      smooth = true
+    },
+    power = {
+      height = cfg.frames.secondary.power.height,
+      classColored = false,
+      frequentUpdates = false,
+      smooth = true
+    }
+  },
+  party = {
+    show = true,
+    width = 164,
+    height = 40,
+    pos = {a1 = "CENTER", a2 = "CENTER", af = "UIParent", x = -550, y = -102},
+    health = {
+      classColored = true,
+      gradientColored = false,
+      reactionColored = false,
+      invertedColors = true,
+      classColoredText = false,
+      smooth = true
+    },
+    power = {
+      height = 1.5,
+      classColored = true,
+      frequentUpdates = false,
+      smooth = true
+    },
+    showPortraits = true,
+    forceRole = true
+  },
+  raid = {
+    show = true
+  },
+  nameplate = {
+    show = true,
+    width = 120,
+    height = 8,
+    pos = {a1 = "CENTER", a2 = "CENTER", af = "UIParent", x = 0, y = 0},
+    classpower = true,
+    debuffs = true,
+    castbar = {
+      enable = true,
+      color = {5 / 255, 107 / 255, 246 / 255},
+      height = 2
+    },
+    selectedColor = {255 / 255, 25 / 255, 25 / 255, 0.8},
+    glowColor = {50 / 255, 240 / 255, 210 / 255, 0.7},
+    showTargetArrow = false,
+    showGlow = false,
+    showHighlight = false
+  }
+}
+
+cfg.elements = {
+  castbar = {
+    backdrop = {
+      color = {r = 0, g = 0, b = 0, a = 0.85}
+    },
+    timeToHold = 2
+  },
+  experiencebar = {
+    show = true,
+    height = 3,
+    width = Minimap:GetWidth() + 4,
+    pos = {a1 = "TOPLEFT", a2 = "BOTTOMLEFT", af = "Minimap", x = -2, y = -12}
+  },
+  artifactpowerbar = {
+    show = true,
+    height = 3,
+    width = Minimap:GetWidth() + 4,
+    pos = {a1 = "TOPLEFT", a2 = "BOTTOMLEFT", af = "Minimap", x = -2, y = -24}
+  },
+  altpowerbar = {
+    show = true
+  },
+  mirrorTimers = {
+    width = 220,
+    height = cfg.frames.main.height + 2
+  }
+}
diff --git a/core/core.lua b/core/core.lua
index dd0d66c..8921772 100644
--- a/core/core.lua
+++ b/core/core.lua
@@ -158,7 +158,7 @@ function core:createHPPercentString(self, font, size, outline, x, y, point, laye
   self.Health.percent:SetJustifyH("RIGHT")
   self.Health.percent:SetTextColor(0.5, 0.5, 0.5, 0.5)
   self.Health.percent:SetShadowColor(0, 0, 0, 0)
-  self:Tag(self.Health.percent, "[lumen:hpperc]")
+  self:Tag(self.Health.percent, "[lum:hpperc]")
 end
 
 -- Generates the Power Percent String
@@ -166,7 +166,7 @@ function core:createPowerString(self, font, size, outline, x, y, point)
   self.Power.value = core:createFontstring(self.Power, font, size, outline)
   self.Power.value:SetPoint(point, self.Power, x, y)
   self.Power.value:SetJustifyH(point)
-  self:Tag(self.Power.value, "[lumen:powervalue]")
+  self:Tag(self.Power.value, "[lum:powervalue]")
 end
 
 -- Create Border
diff --git a/elements/nameplates.lua b/elements/nameplates.lua
index 69d1f33..a8fce42 100644
--- a/elements/nameplates.lua
+++ b/elements/nameplates.lua
@@ -253,7 +253,7 @@ local createStyle = function(self, unit)
 
   -- Name strings
   core:createNameString(self, font, cfg.fontsize - 5, "THINOUTLINE", 0, 6, "CENTER", self.cfg.width - 4)
-  self:Tag(self.Name, "[lumen:levelplus] [lumen:name]")
+  self:Tag(self.Name, "[lum:levelplus] [lum:name]")
 
   -- Health Percentage
   health.percent = core:createFontstring(self.Health, font, cfg.fontsize - 3, "THINOUTLINE", "BACKGROUND")
@@ -261,7 +261,7 @@ local createStyle = function(self, unit)
   health.percent:SetJustifyH("LEFT")
   health.percent:SetWidth(self.cfg.width)
   health.percent:SetTextColor(0.8, 0.8, 0.8, 1)
-  self:Tag(health.percent, "[lumen:hpperc]")
+  self:Tag(health.percent, "[lum:hpperc]")
 
   -- Class Power (Combo Points, Insanity, etc...)
   if cfg.units.nameplate.classpower then
@@ -269,7 +269,7 @@ local createStyle = function(self, unit)
     classPower:SetPoint("RIGHT", self.Health, "LEFT", -4, 0)
     classPower:SetJustifyH("RIGHT")
     classPower:SetWidth(self.cfg.width)
-    self:Tag(classPower, "[lumen:classpower]", "player")
+    self:Tag(classPower, "[lum:classpower]", "player")
     classPower:Hide()
     self.classPower = classPower
   end
diff --git a/tasks.todo b/tasks.todo
index d1d1616..d801b4f 100644
--- a/tasks.todo
+++ b/tasks.todo
@@ -1,3 +1,5 @@
+general:
+  ☐ Add scale back to frames (player, party, target, etc)
 party:
   ☐ Finish the party frames
     ☐ Add debuffs
@@ -8,3 +10,5 @@ raid:
   ☐ Create the raid frames?
   ☐ Add corner indicators (example healers: DoTs, etc, debuffs, etc, make it configurable)
   ☐ Add PhaseIndicator
+personal resource display:
+  ☐ skin the element
diff --git a/units/arena.lua b/units/arena.lua
index a8ad484..d00b9c9 100644
--- a/units/arena.lua
+++ b/units/arena.lua
@@ -39,9 +39,9 @@ local createStyle = function(self)
 
   -- Texts
   core:createNameString(self, font, cfg.fontsize + 2, "THINOUTLINE", 4, 0, "LEFT", self.cfg.width - 75)
-  self:Tag(self.Name, "[lumen:level]  [lumen:name]")
+  self:Tag(self.Name, "[lum:level]  [lum:name]")
   core:createHPString(self, font, cfg.fontsize, "THINOUTLINE", -4, 0, "RIGHT")
-  self:Tag(self.Health.value, "[lumen:hpvalue]")
+  self:Tag(self.Health.value, "[lum:hpvalue]")
   core:createHPPercentString(self, font, cfg.fontsize, nil, -32, 0, "LEFT", "BACKGROUND")
   core:createPowerString(self, font, cfg.fontsize - 4, "THINOUTLINE", 0, 0, "CENTER")
 
diff --git a/units/boss.lua b/units/boss.lua
index b728518..2510845 100644
--- a/units/boss.lua
+++ b/units/boss.lua
@@ -51,9 +51,9 @@ local createStyle = function(self)
 
   -- Texts
   core:createNameString(self, font, cfg.fontsize + 2, "THINOUTLINE", 4, 0, "LEFT", self.cfg.width - 75)
-  self:Tag(self.Name, "[lumen:level]  [lumen:name]")
+  self:Tag(self.Name, "[lum:level]  [lum:name]")
   core:createHPString(self, font, cfg.fontsize, "THINOUTLINE", -4, 0, "RIGHT")
-  self:Tag(self.Health.value, "[lumen:hpvalue]")
+  self:Tag(self.Health.value, "[lum:hpvalue]")
   core:createHPPercentString(self, font, cfg.fontsize, nil, -32, 0, "LEFT", "BACKGROUND")
   if self.cfg.power.text.show then
     core:createPowerString(self, font, cfg.fontsize - 4, "THINOUTLINE", 0, 0, "CENTER")
diff --git a/units/focus.lua b/units/focus.lua
index cdbd699..6969421 100644
--- a/units/focus.lua
+++ b/units/focus.lua
@@ -37,9 +37,9 @@ local createStyle = function(self)
 
   -- Texts
   core:createNameString(self, font, cfg.fontsize, "THINOUTLINE", 2, 0, "LEFT", self.cfg.width - 4)
-  self:Tag(self.Name, "[lumen:name]")
+  self:Tag(self.Name, "[lum:name]")
   -- core:createHPString(self, font, cfg.fontsize - 4, "THINOUTLINE", -4, 0, "RIGHT")
-  -- self:Tag(self.Health.value, '[lumen:hpperc]')
+  -- self:Tag(self.Health.value, '[lum:hpperc]')
 
   -- Health & Power Updates
   self.Health.PostUpdate = PostUpdateHealth
diff --git a/units/party.lua b/units/party.lua
index b4bdab3..438cf39 100644
--- a/units/party.lua
+++ b/units/party.lua
@@ -130,15 +130,15 @@ local createStyle = function(self)
 
   core:createPartyNameString(self, font, cfg.fontsize)
   if self.cfg.health.classColoredText then
-    self:Tag(self.Name, "[lumen:playerstatus] [lumen:leader] [raidcolor][lumen:name]")
+    self:Tag(self.Name, "[lum:playerstatus] [lum:leader] [raidcolor][lum:name]")
   else
-    self:Tag(self.Name, "[lumen:playerstatus] [lumen:leader] [lumen:name]")
+    self:Tag(self.Name, "[lum:playerstatus] [lum:leader] [lum:name]")
   end
 
   self.classText = core:createFontstring(self.Health, font, cfg.fontsize, "THINOUTLINE")
   self.classText:SetPoint("BOTTOMRIGHT", self, "BOTTOMRIGHT", -4, 5)
   self.classText:SetJustifyH("RIGHT")
-  self:Tag(self.classText, "[lumen:level] [raidcolor][class]")
+  self:Tag(self.classText, "[lum:level] [raidcolor][class]")
 
   -- Portrait
   if self.cfg.showPortraits then
diff --git a/units/pet.lua b/units/pet.lua
index 72b13aa..99d3167 100644
--- a/units/pet.lua
+++ b/units/pet.lua
@@ -63,9 +63,9 @@ local createStyle = function(self)
 
   -- Texts
   core:createNameString(self, font, cfg.fontsize, "THINOUTLINE", 2, 0, "LEFT", self.cfg.width - 8)
-  self:Tag(self.Name, "[lumen:name]")
+  self:Tag(self.Name, "[lum:name]")
   -- core:createHPString(self, font, cfg.fontsize - 4, "THINOUTLINE", -4, 0, "RIGHT")
-  -- self:Tag(self.Health.value, '[lumen:hpperc]')
+  -- self:Tag(self.Health.value, '[lum:hpperc]')
 
   -- Health & Power Updates
   self.Health.PostUpdate = PostUpdateHealth
diff --git a/units/player.lua b/units/player.lua
index 88f3f48..23b8970 100644
--- a/units/player.lua
+++ b/units/player.lua
@@ -98,7 +98,7 @@ local function CreateClassPower(self)
 
   for index = 1, 10 do
     local Bar = CreateFrame("StatusBar", "oUF_LumenClassPower", self, "BackdropTemplate")
-    Bar:SetHeight(1.5)
+    Bar:SetHeight(2)
     Bar:SetStatusBarTexture(m.textures.status_texture)
     core:setBackdrop(Bar, 2, 2, 2, 2)
 
@@ -124,7 +124,7 @@ local function CreateClassPower(self)
 end
 
 -- Death Knight Runebar
-local CreateRuneBar = function(self)
+local function CreateRuneBar(self)
   local Runes = {}
   Runes.sortOrder = "asc"
   Runes.colorSpec = true -- color runes by spec
@@ -134,7 +134,7 @@ local CreateRuneBar = function(self)
     local numRunes, maxWidth, gap = 6, cfg.frames.main.width, 6
     local width = ((maxWidth / numRunes) - (((numRunes - 1) * gap) / numRunes))
 
-    Rune:SetSize(width, 1.5)
+    Rune:SetSize(width, 2)
     Rune:SetStatusBarTexture(m.textures.status_texture)
     core:setBackdrop(Rune, 2, 2, 2, 2) -- Backdrop
 
@@ -157,7 +157,7 @@ local CreateRuneBar = function(self)
 end
 
 -- AdditionalPower post update callback
-local onAdditionalPowerPostUpdate = function(self, cur, max)
+local function onAdditionalPowerPostUpdate(self, cur, max)
   local powertype = UnitPowerType("player")
 
   if powertype == 0 then
@@ -173,7 +173,7 @@ local onAdditionalPowerPostUpdate = function(self, cur, max)
 end
 
 -- Create additional power (power bar for specs like Feral Druid or Enhancement Shaman)
-local CreateAdditionalPower = function(self)
+local function CreateAdditionalPower(self)
   local height = -18
   local r, g, b = unpack(oUF.colors.power[ADDITIONAL_POWER_BAR_NAME])
 
@@ -195,7 +195,7 @@ local CreateAdditionalPower = function(self)
   local PowerValue = core:createFontstring(AdditionalPower, font, cfg.fontsize - 4, "THINOUTLINE")
   PowerValue:SetPoint("RIGHT", AdditionalPower, -8, 0)
   PowerValue:SetJustifyH("RIGHT")
-  self:Tag(PowerValue, "[lumen:altpower]")
+  self:Tag(PowerValue, "[lum:altpower]")
 
   -- Backdrop
   core:setBackdrop(AdditionalPower, 1, 1, 1, 1)
@@ -332,7 +332,7 @@ local function AlternativePowerOnLeave(self)
 end
 
 -- AltPower (quest or boss special power)
-local CreateAlternativePower = function(self)
+local function CreateAlternativePower(self)
   local AlternativePower = CreateFrame("StatusBar", nil, self)
   AlternativePower:SetStatusBarTexture(m.textures.status_texture)
   core:setBackdrop(AlternativePower, 2, 2, 2, 2)
@@ -357,6 +357,32 @@ local CreateAlternativePower = function(self)
   self.AlternativePower = AlternativePower
 end
 
+local function CreatePowerPrediction(self)
+  local mainBar = CreateFrame("StatusBar", nil, self.Power)
+  mainBar:SetStatusBarTexture(m.textures.status_texture)
+  mainBar:SetStatusBarColor(1, 1, 1, 0.5)
+  mainBar:SetReverseFill(true)
+  mainBar:SetPoint("TOP")
+  mainBar:SetPoint("BOTTOM")
+  mainBar:SetPoint("RIGHT", self.Power:GetStatusBarTexture(), "RIGHT")
+  mainBar:SetWidth(self.cfg.width)
+
+  local altBar = CreateFrame("StatusBar", nil, self.AdditionalPower)
+  altBar:SetStatusBarTexture(m.textures.status_texture)
+  altBar:SetStatusBarColor(1, 1, 1, 0.5)
+  altBar:SetReverseFill(true)
+  altBar:SetPoint("TOP")
+  altBar:SetPoint("BOTTOM")
+  altBar:SetPoint("RIGHT", self.AdditionalPower:GetStatusBarTexture(), "RIGHT")
+  altBar:SetWidth(self.cfg.width)
+
+  -- Register with oUF
+  self.PowerPrediction = {
+    mainBar = mainBar,
+    altBar = altBar
+  }
+end
+
 local PostCreateIcon = function(Auras, button)
   local count = button.count
   count:ClearAllPoints()
@@ -469,10 +495,10 @@ local createStyle = function(self)
   -- Text strings
   if self.cfg.name.show then
     core:createNameString(self, font, cfg.fontsize + 2, "THINOUTLINE", 4, 0, "LEFT", self.cfg.width - 56)
-    self:Tag(self.Name, "[lumen:level]  [lumen:name]")
+    self:Tag(self.Name, "[lum:level]  [lum:name]")
   end
   core:createHPString(self, font, cfg.fontsize, "THINOUTLINE", -4, 0, "RIGHT")
-  self:Tag(self.Health.value, "[lumen:hpvalue]")
+  self:Tag(self.Health.value, "[lum:hpvalue]")
   core:createHPPercentString(self, font, cfg.fontsize, nil, -32, 0, "LEFT", "BACKGROUND")
   core:createPowerString(self, font, cfg.fontsize - 4, "THINOUTLINE", 0, 0, "CENTER")
 
@@ -520,12 +546,10 @@ local createStyle = function(self)
   end
 
   -- Alternate Power Bar (Mana Bar)
-  if
-    core.playerClass == "DRUID" or core.playerClass == "PRIEST" or core.playerClass == "MONK" or
-      core.playerClass == "SHAMAN"
-   then
-    CreateAdditionalPower(self)
-  end
+  CreateAdditionalPower(self)
+
+  -- Power Prediction
+  CreatePowerPrediction(self)
 
   -- AltPower (quest or boss special power)
   if cfg.elements.altpowerbar.show then
diff --git a/units/target.lua b/units/target.lua
index 20a8aad..06541eb 100644
--- a/units/target.lua
+++ b/units/target.lua
@@ -93,18 +93,18 @@ local createStyle = function(self)
   -- Texts
   if self.cfg.name.show then
     core:createNameString(self, font, cfg.fontsize + 2, "THINOUTLINE", 4, 0, "LEFT", self.cfg.width - 56)
-    self:Tag(self.Name, "[lumen:level]  [lumen:name]")
+    self:Tag(self.Name, "[lum:level]  [lum:name]")
   end
 
   core:createHPString(self, font, cfg.fontsize, "THINOUTLINE", -4, 0, "RIGHT")
-  self:Tag(self.Health.value, "[lumen:hpvalue]")
+  self:Tag(self.Health.value, "[lum:hpvalue]")
   core:createHPPercentString(self, font, cfg.fontsize, nil, -32, 0, "LEFT", "BACKGROUND")
   core:createPowerString(self, font, cfg.fontsize - 4, "THINOUTLINE", 0, 0, "CENTER")
 
   local clf = core:createFontstring(self, font, cfg.fontsize - 1, "THINOUTLINE") -- Classification
   clf:SetPoint("LEFT", self, "TOPLEFT", 0, 12)
   clf:SetTextColor(1, 1, 1, 1)
-  self:Tag(clf, "[lumen:classification]")
+  self:Tag(clf, "[lum:classification]")
 
   -- Health & Power Updates
   self.Health.PostUpdate = PostUpdateHealth
diff --git a/units/targettarget.lua b/units/targettarget.lua
index 0136836..3fd8501 100644
--- a/units/targettarget.lua
+++ b/units/targettarget.lua
@@ -37,9 +37,9 @@ local createStyle = function(self)
 
   -- Texts
   core:createNameString(self, font, cfg.fontsize, "THINOUTLINE", 2, 0, "LEFT", self.cfg.width - 4)
-  self:Tag(self.Name, "[lumen:name]")
+  self:Tag(self.Name, "[lum:name]")
   -- core:createHPString(self, font, cfg.fontsize - 4, "THINOUTLINE", -4, 0, "RIGHT")
-  -- self:Tag(self.Health.value, '[lumen:hpperc]')
+  -- self:Tag(self.Health.value, '[lum:hpperc]')
 
   -- Health & Power Updates
   self.Health.PostUpdate = PostUpdateHealth