diff --git a/README.md b/README.md
index 37315145..396ba3bc 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,6 @@ pfUI supports and contains language specific code for the following gameclients.
 ## Other Addons
 * [pfUI-fonts](https://github.com/shagu/pfUI-fonts) Additional fonts for pfUI
 * [DPSMate](https://github.com/Geigerkind/DPSMate) An advanced combat analyzation tool
-* [DebuffTimers](https://github.com/shagu/DebuffTimers) Timer Overlays for enemy debuffs
 * [Clique](https://github.com/shagu/Clique) Simply powerful click-casting interface
 * [SortBags](https://github.com/shirsig/SortBags) Automatically stacks and sorts your items.
 
diff --git a/env/locales_deDE.lua b/env/locales_deDE.lua
index 0077c2d8..d83a4a4f 100644
--- a/env/locales_deDE.lua
+++ b/env/locales_deDE.lua
@@ -122,6 +122,15 @@ pfUI_locale["deDE"]["critters"] = {
   'Irrwisch',
 }
 
+pfUI_locale["deDE"]["dyndebuffs"] = {
+  ["Rupture"] = "Blutung",
+  ["Kidney Shot"] = "Nierenhieb",
+  ["Rend"] = "Verwunden",
+  ["Shadow Word: Pain"] = "Schattenwort: Schmerz",
+  ["Demoralizing Shout"] = "Demoralisierungsruf",
+  ["Frostbolt"] = "Frostblitz",
+}
+
 pfUI_locale["deDE"]["interrupts"] = {
   ["Schildhieb"] = true,
   ["Zuschlagen"] = true,
diff --git a/env/locales_enUS.lua b/env/locales_enUS.lua
index 0bb99c92..6bed5228 100644
--- a/env/locales_enUS.lua
+++ b/env/locales_enUS.lua
@@ -122,6 +122,15 @@ pfUI_locale["enUS"]["critters"] = {
   'Wisp',
 }
 
+pfUI_locale["enUS"]["dyndebuffs"] = {
+  ["Rupture"] = "Rupture",
+  ["Kidney Shot"] = "Kidney Shot",
+  ["Rend"] = "Rend",
+  ["Shadow Word: Pain"] = "Shadow Word: Pain",
+  ["Demoralizing Shout"] = "Demoralizing Shout",
+  ["Frostbolt"] = "Frostbolt",
+}
+
 pfUI_locale["enUS"]["interrupts"] = {
   ["Shield Bash"] = true,
   ["Pummel"] = true,
diff --git a/env/locales_esES.lua b/env/locales_esES.lua
index eee9cbe5..2f04bddd 100644
--- a/env/locales_esES.lua
+++ b/env/locales_esES.lua
@@ -122,6 +122,15 @@ pfUI_locale["esES"]["critters"] = {
   'Fuego fatuo',
 }
 
+pfUI_locale["esES"]["dyndebuffs"] = {
+  ["Rupture"] = "Ruptura",
+  ["Kidney Shot"] = "Golpe en los riñones",
+  ["Rend"] = "Desgarrar",
+  ["Shadow Word: Pain"] = "Palabra de las Sombras: dolor",
+  ["Demoralizing Shout"] = "Grito desmoralizador",
+  ["Frostbolt"] = "Descarga de Escarcha",
+}
+
 pfUI_locale["esES"]["interrupts"] = {
   ["Azote de escudo"] = true,
   ["Zurrar"] = true,
diff --git a/env/locales_frFR.lua b/env/locales_frFR.lua
index 7be23b04..8fc267af 100644
--- a/env/locales_frFR.lua
+++ b/env/locales_frFR.lua
@@ -117,6 +117,15 @@ pfUI_locale["frFR"]["critters"] = {
   'Feu follet',
 }
 
+pfUI_locale["frFR"]["dyndebuffs"] = {
+  ["Rupture"] = "Rupture",
+  ["Kidney Shot"] = "Aiguillon perfide",
+  ["Rend"] = "Pourfendre",
+  ["Shadow Word: Pain"] = "Mot de l'ombre : Douleur",
+  ["Demoralizing Shout"] = "Cri démoralisant",
+  ["Frostbolt"] = "Eclair de givre",
+}
+
 pfUI_locale["frFR"]["interrupts"] = {
   ["Coup de bouclier"] = true,
   ["Volée de coups"] = true,
diff --git a/env/locales_koKR.lua b/env/locales_koKR.lua
index ac7e392f..8d06d59f 100644
--- a/env/locales_koKR.lua
+++ b/env/locales_koKR.lua
@@ -122,6 +122,15 @@ pfUI_locale["koKR"]["critters"] = {
   '위습',
 }
 
+pfUI_locale["koKR"]["dyndebuffs"] = {
+  ["Rupture"] = "파열",
+  ["Kidney Shot"] = "급소 가격",
+  ["Rend"] = "분쇄",
+  ["Shadow Word: Pain"] = "어둠의 권능: 고통",
+  ["Demoralizing Shout"] = "사기의 외침",
+  ["Frostbolt"] = "얼음 화살",
+}
+
 pfUI_locale["koKR"]["interrupts"] = {
   ["방패 가격"] = true,
   ["자루 공격"] = true,
diff --git a/env/locales_ruRU.lua b/env/locales_ruRU.lua
index ded77efd..00487e7a 100644
--- a/env/locales_ruRU.lua
+++ b/env/locales_ruRU.lua
@@ -122,6 +122,15 @@ pfUI_locale["ruRU"]["critters"] = {
   'Огонек',
 }
 
+pfUI_locale["ruRU"]["dyndebuffs"] = {
+  ["Rupture"] = "Рваная рана",
+  ["Kidney Shot"] = "Удар по почкам",
+  ["Rend"] = "Кровопускание",
+  ["Shadow Word: Pain"] = "Слово Тьмы: Боль",
+  ["Demoralizing Shout"] = "Деморализующий крик",
+  ["Frostbolt"] = "Ледяная стрела",
+}
+
 pfUI_locale["ruRU"]["interrupts"] = {
   ["Удар щитом"] = true,
   ["Зуботычина"] = true,
diff --git a/env/locales_zhCN.lua b/env/locales_zhCN.lua
index f0c84303..c47fbfcd 100644
--- a/env/locales_zhCN.lua
+++ b/env/locales_zhCN.lua
@@ -117,6 +117,15 @@ pfUI_locale["zhCN"]["critters"] = {
   '小精灵',
 }
 
+pfUI_locale["zhCN"]["dyndebuffs"] = {
+  ["Rupture"] = "割裂",
+  ["Kidney Shot"] = "肾击",
+  ["Rend"] = "撕裂",
+  ["Shadow Word: Pain"] = "暗言术：痛",
+  ["Demoralizing Shout"] = "挫志怒吼",
+  ["Frostbolt"] = "寒冰箭",
+}
+
 pfUI_locale["zhCN"]["interrupts"] = {
   ["盾击"] = true,
   ["拳击"] = true,
diff --git a/modules/debuffs.lua b/modules/debuffs.lua
index fcc01c4f..226fc72b 100644
--- a/modules/debuffs.lua
+++ b/modules/debuffs.lua
@@ -106,8 +106,29 @@ pfUI:RegisterModule("debuffs", function ()
     if L["debuffs"][effect] and rank then
       local rank = string.gsub(rank, RANK .. " ", "")
       local duration = L["debuffs"][effect][tonumber(rank)] or pfUI.debuffs:GetDuration(effect)
-      -- TODO: add combo point calculation here
-      -- TODO: add talent calculation here
+      if effect == L["dyndebuffs"]["Rupture"] then
+        -- Rupture: +2 sec per combo point
+        duration = duration + GetComboPoints()*2
+      elseif effect == L["dyndebuffs"]["Kidney Shot"] then
+        -- Kidney Shot: +1 sec per combo point
+        duration = duration + GetComboPoints()*1
+      elseif effect == L["dyndebuffs"]["Rend"] then
+        -- Improved Rend: 15%, 25%, 35%
+        local _,_,_,_,count = GetTalentInfo(1,3)
+        if count and count > 0 then duration = duration + ( duration / 100 * (5+count*10)) end
+      elseif effect == L["dyndebuffs"]["Demoralizing Shout"] then
+        -- Booming Voice: 10% per talent
+        local _,_,_,_,count = GetTalentInfo(2,1)
+        if count and count > 0 then duration = duration + ( duration / 100 * (count*10)) end
+      elseif effect == L["dyndebuffs"]["Shadow Word: Pain"] then
+        -- Improved Shadow Word: Pain: +3s per talent
+        local _,_,_,_,count = GetTalentInfo(3,4)
+        if count and count > 0 then duration = duration + count * 3 end
+      elseif effect == L["dyndebuffs"]["Frostbolt"] then
+        -- Permafrost: +1s per talent
+        local _,_,_,_,count = GetTalentInfo(3,7)
+        if count and count > 0 then duration = duration + count end
+      end
       return duration
     elseif L["debuffs"][effect] and L["debuffs"][effect][0] then
       return L["debuffs"][effect][0]
diff --git a/pfUI.toc b/pfUI.toc
index 5267f36d..a1b5e911 100644
--- a/pfUI.toc
+++ b/pfUI.toc
@@ -2,7 +2,7 @@
 ## Title: |cff33ffccpf|cffffffffUI
 ## Author: Shagu
 ## Notes: A complete user interface replacement.
-## Version: 3.7.0
+## Version: 3.8.0
 ## SavedVariables: pfUI_profiles, pfUI_gold
 ## SavedVariablesPerCharacter: pfUI_config, pfUI_init, pfUI_playerDB