diff --git a/README.md b/README.md
index c108328..df1ccbf 100644
--- a/README.md
+++ b/README.md
@@ -1,116 +1,88 @@
-# ShaguTweaks-extras
+# 🧩 ShaguTweaks Extras — ClassicAPI
 
-***UPDATED FOR TWOW 1.18.1 COMPATIBILITY - REVEAL UNEXPLORED FIX*** 
+A complementary fork of **ShaguTweaks-extras** intended to be used with
+[Dusk-92/ShaguTweaks-ClassicAPI](https://github.com/Dusk-92/ShaguTweaks-ClassicAPI).
 
-This addon extends the capabilities of [ShaguTweaks](https://github.com/shagu/ShaguTweaks) by offering optional modules that can be easily toggled on or off. The new features integrate fully with the "Advanced Options" panel, providing a seamless experience.
+The goal is to keep the useful Extras modules while removing functionality that
+is already integrated into the main ShaguTweaks-ClassicAPI fork, hardening
+legacy hooks, and using the shared `ShaguTweaks.API` ClassicAPI bridge where it
+actually improves reliability.
 
-For a detailed view of what's new and improved, check out the feature list below.
+## Requirements
 
+- **ShaguTweaks-ClassicAPI** — required
+- **ClassicAPI** — required indirectly by ShaguTweaks-ClassicAPI
+- **SuperWoW** — optional, as in the main fork
 
-## Installation (Vanilla, 1.12)
+## Installation
 
-> [!IMPORTANT]
->
-> **This addon requires you to have [ShaguTweaks](https://github.com/shagu/ShaguTweaks) installed.**
->
-> Install instructions for ShaguTweaks can be found on the [GitHub Page](https://github.com/shagu/ShaguTweaks).
+1. Install **ShaguTweaks-ClassicAPI** and rename its folder to `ShaguTweaks`.
+2. Download this repository.
+3. Rename this addon folder to **`ShaguTweaks-extras`**.
+4. Copy it to `World of Warcraft\Interface\AddOns\ShaguTweaks-extras`.
+5. Restart the game.
 
-1. Download **[Latest Version](https://github.com/shagu/ShaguTweaks-extras/archive/master.zip)**
-2. Unpack the Zip file
-3. Rename the folder "ShaguTweaks-extras-master" to "ShaguTweaks-extras"
-4. Copy "ShaguTweaks-extras" into Wow-Directory\Interface\AddOns
-5. Restart Wow
+The `ShaguTweaks-extras` folder name is kept for compatibility with bundled
+texture paths and the original addon layout.
 
+## Removed duplicates
 
-## Features
+These modules are intentionally not shipped here because equivalent/improved
+versions already exist in ShaguTweaks-ClassicAPI:
+
+- **Chat History** → integrated into **Chat Tweaks**
+- **Show Energy Ticks** → integrated as **Unit Frame Energy & Mana Tick**
+
+## Included modules
 
 ### Action Bar
-- **Center Vertical Actionbar**  
-  *Center the vertical actionbar on the right side.*
-
-- **Dragonflight Gryphons**  
-  *Replaces actionbar gryphons with the dragonflight version.*
-
-- **Floating Actionbar**  
-  *Removes all background textures and lets the actionbar float.*
-
-- **Reagent Counter**  
-  *Shows a reagent counter on action buttons.*
-
-- **Show Bags**  
-  *Shows bag and keyring buttons when using the reduced actionbar layout. Hold Ctrl+Shift to move the bag bar.*
-
-- **Show Micro Menu**  
-  *Shows micro menu buttons when using the reduced actionbar layout. Hold Ctrl+Shift to move the micro menu.*
-
-<p align="center"><img src="screenshots/actionbar.gif"></p>
+- Center Vertical Actionbar
+- Dragonflight Gryphons
+- Floating Actionbar
+- Reagent Counter
+- Show Bags
+- Show Micro Menu
 
 ### Chat
-- **Chat History**  
-  *Save chat history of all non-combatlog windows and restore it on login.*
-
-- **Chat Timestamps**  
-  *Add timestamps to chat messages.*
-
-- **Center Text Input Box**  
-  *Move the chat input box to the center of the screen.*
-
-- **Enable Text Shadow**  
-  *Enable text shadow in all chat frames.*
-
+- Chat Timestamps
+- Center Text Input Box
+- Enable Text Shadow
 
 ### General
-- **Bag Item Click**  
-  *Send items to trade window or auction house search via right click.*
-
-- **Bag Search Bar**  
-  *Adds a search field to the bag which allows you to search bag, keyring and bank slots.*
-
-- **Show Energy Ticks**  
-  *Show energy and mana ticks on the player unit frame.*
-
-- **Reveal World Map**  
-  *Reveals unexplored world map areas and shows exploration hints.*
-
+- Bag Item Click
+- Bag Search Bar
+- Reveal World Map
 
 ### Macro
-- **Macro Icons**  
-  *Detect showtooltip and spells in macros to use them on action buttons.*
-
-- **Macro Tweaks**  
-  *Add /equip command to macros, remove #showtooltip from chat and hide macro commands from history.*
-
+- Macro Icons
+- Macro Tweaks
 
 ### Raid
-<img src="screenshots/raid.jpg" float="right" align="right" width="33%">
+- Enable Raid Frames
+- Hide Party Frames
+- Show Aggro Indicators
+- Show Combat Feedback
+- Show Dispel Indicators
+- Show Group Headers
+- Show Healing Predictions
+- Use As Party Frames
+- Use Compact Layout
 
-- **Enable Raid Frames**  
-  *Very simple raid frames with only the most basic features.*
+## Compatibility approach
 
-- **Hide Party Frames**  
-  *Disable default party frames while the raidframes are active.*
+ClassicAPI is consumed through the shared `ShaguTweaks.API` capability layer.
+Modules that do not benefit from ClassicAPI are deliberately left on native
+Vanilla UI APIs instead of adding unnecessary abstraction.
 
-- **Show Aggro Indicators**  
-  *Show indicators on raid members that are currently attacked by other units. (This only works if the unit is a target of a raid member)*
+Legacy global replacements are reduced wherever the feature can be implemented
+with the safer ShaguTweaks hook helpers.
 
-- **Show Combat Feedback**  
-  *Show combat feedback numbers on health bars.*
+## Credits
 
-- **Show Dispel Indicators**  
-  *Show indicators for units affected by curse, magic, poison or diseases based on your class.*
+Original addon and modules by **Shagu**.
 
-- **Show Group Headers**  
-  *Display group headers on raid frames*
+Additional maintenance and Turtle WoW 1.18.1 work by **paokkerkir**.
 
-- **Show Healing Predictions**  
-  *Show healing predictions that are received in a healcomm compatible protocol.*
+ClassicAPI fork maintenance and compatibility work by **Dusk-92**.
 
-- **Use As Party Frames**  
-  *Use raid frames to display party members in regular groups*
-
-- **Use Compact Layout**  
-  *Reduces the raid frame size and the displayed elements. As a healer, you should never use this layout.*
-
-
-## Contact & Support
-Due to time constraints, I am currently unable to process feature requests. However, if you encounter any bugs or issues, please don't hesitate to reach out to me through Discord.
+Released under the original MIT license.
diff --git a/ShaguTweaks-extras.toc b/ShaguTweaks-extras.toc
index 227ecf6..e0ecfe3 100644
--- a/ShaguTweaks-extras.toc
+++ b/ShaguTweaks-extras.toc
@@ -1,8 +1,7 @@
 ## Interface: 11200
-## Title: |cffffcc00Shagu|cffffffffTweaks |cffcccccc[Extras]
-## Author: Shagu - modified by paokkerkir
-## Notes: A collection of tweaks and enhancements to the Default UI
-## Notes-ruRU: Коллекция настроек и улучшений для стандартного пользовательского интерфейса.
+## Title: |cffffcc00Shagu|cffffffffTweaks |cffcccccc[Extras ClassicAPI]
+## Author: Shagu - modified by paokkerkir / Dusk-92
+## Notes: Complementary modules for ShaguTweaks-ClassicAPI
 ## Version: GIT
 ## Dependencies: ShaguTweaks
 
@@ -26,14 +25,12 @@ mods\actionbar-df-gryphon.lua
 mods\actionbar-right-center.lua
 mods\actionbar-reagents.lua
 mods\actionbar-float.lua
-mods\unitframe-energytick.lua
 mods\bag-item-click.lua
 mods\bag-search.lua
 mods\worldmap-reveal.lua
 
 # chat
 mods\chat-input-center.lua
-mods\chat-history.lua
 mods\chat-text-shadow.lua
 mods\chat-timestamps.lua
 
diff --git a/main.lua b/main.lua
index 49b73bc..052edc7 100644
--- a/main.lua
+++ b/main.lua
@@ -1 +1 @@
-ShaguTweaks.provider = "|cffFFCC55Extras:|r"
+ShaguTweaks.provider = "|cffFFCC55Extras ClassicAPI:|r"
diff --git a/mods/actionbar-float.lua b/mods/actionbar-float.lua
index 1edcf6b..55e4212 100644
--- a/mods/actionbar-float.lua
+++ b/mods/actionbar-float.lua
@@ -1,5 +1,6 @@
 local _G = ShaguTweaks.GetGlobalEnv()
 local T = ShaguTweaks.T
+local hooksecurefunc = ShaguTweaks.hooksecurefunc
 
 local module = ShaguTweaks:register({
   title = T["Floating Actionbar"],
@@ -52,13 +53,13 @@ module.enable = function(self)
   -- replace experience bar texture
   MainMenuExpBar:SetStatusBarTexture("Interface\\AddOns\\ShaguTweaks-extras\\img\\xpbar")
   local _, _, _, _, _, background = MainMenuExpBar:GetRegions()
-  background:SetTexture("Interface\\AddOns\\ShaguTweaks-extras\\img\\xpbar")
-  background:SetVertexColor(0, 0, 0, .5)
+  if background then
+    background:SetTexture("Interface\\AddOns\\ShaguTweaks-extras\\img\\xpbar")
+    background:SetVertexColor(0, 0, 0, .5)
+  end
 
-  -- update reputation bar position
-  local HookReputationWatchBar_Update = ReputationWatchBar_Update
-  ReputationWatchBar_Update = function(newLevel)
-    HookReputationWatchBar_Update(newLevel)
+  -- keep the custom reputation position without replacing Blizzard's updater
+  local function UpdateReputationPosition()
     if MainMenuExpBar:IsShown() then
       ReputationWatchBar:SetPoint("BOTTOM", MainMenuBar, "TOP", 0, -7)
     else
@@ -66,6 +67,9 @@ module.enable = function(self)
     end
   end
 
+  hooksecurefunc("ReputationWatchBar_Update", UpdateReputationPosition)
+  UpdateReputationPosition()
+
   -- hide max level top frame
   MainMenuBarMaxLevelBar:SetAlpha(0)
 
diff --git a/mods/actionbar-reagents.lua b/mods/actionbar-reagents.lua
index 6fbe102..0a445b7 100644
--- a/mods/actionbar-reagents.lua
+++ b/mods/actionbar-reagents.lua
@@ -26,19 +26,31 @@ module.enable = function(self)
   reagentcounter:RegisterEvent("UPDATE_BONUS_ACTIONBAR")
   reagentcounter:RegisterEvent("BAG_UPDATE")
 
+  -- Hidden frames still receive events, but do not execute OnUpdate.
+  -- Wake for one frame only when work is pending.
+  reagentcounter:Hide()
   reagentcounter:SetScript("OnEvent", function()
-    this.event = true
+    this.pending = true
+    if event ~= "BAG_UPDATE" then
+      this.rescan = true
+    end
+    this:Show()
   end)
 
   reagentcounter:SetScript("OnUpdate", function()
-    if not this.event then return end
-
-    -- update all slots after each event
-    for slot = 1, 120 do
-      reagentcounter.ScanSlot(slot)
+    if not this.pending then
+      this:Hide()
+      return
     end
 
-    -- scan for all reagent item counts
+    -- Tooltip scans are only required when the action layout changed.
+    if this.rescan then
+      for slot = 1, 120 do
+        reagentcounter.ScanSlot(slot)
+      end
+    end
+
+    -- Bag changes only need fresh counts for reagents already discovered.
     for item in pairs(reagent_counts) do
       reagent_counts[item] = GetItemCount(item)
     end
@@ -47,24 +59,27 @@ module.enable = function(self)
     for _, prefix in pairs(bars) do
       for i = 1, NUM_ACTIONBAR_BUTTONS do
         local button = _G[prefix .. "Button" .. i]
-        local text = _G[button:GetName().."Count"]
-        local slot = ActionButton_GetPagedID(button)
+        if button then
+          local text = _G[button:GetName().."Count"]
+          local slot = ActionButton_GetPagedID(button)
 
-        if reagent_slots[slot] then
-          text:SetText(reagent_counts[reagent_slots[slot]])
-        elseif not IsConsumableAction(slot) then
-          text:SetText()
+          if text then
+            if reagent_slots[slot] then
+              text:SetText(reagent_counts[reagent_slots[slot]])
+            elseif not IsConsumableAction(slot) then
+              text:SetText()
+            end
+          end
         end
       end
     end
 
-    -- remove event trigger
-    this.event = nil
+    this.pending = nil
+    this.rescan = nil
+    this:Hide()
   end)
 
   reagentcounter.ScanSlot = function(slot)
-    local texture = GetActionTexture(slot)
-
     -- update buttons that previously had an reagent
     if reagent_slots[slot] and not HasAction(slot) then
       reagent_slots[slot] = nil
diff --git a/mods/bag-item-click.lua b/mods/bag-item-click.lua
index ed3bf90..f637d1d 100644
--- a/mods/bag-item-click.lua
+++ b/mods/bag-item-click.lua
@@ -1,5 +1,7 @@
 local _G = ShaguTweaks.GetGlobalEnv()
 local T = ShaguTweaks.T
+local API = ShaguTweaks.API or {}
+local hooksecurefunc = ShaguTweaks.hooksecurefunc
 
 local module = ShaguTweaks:register({
   title = T["Bag Item Click"],
@@ -23,10 +25,16 @@ module.enable = function(self)
     return AuctionFrame and AuctionFrame:IsShown() and AuctionFrameAuctions and AuctionFrameAuctions:IsShown()
   end
 
-  -- overwrite use/trade logic unless shift is pressed
+  local function ShiftDown()
+    if API.IsShiftKeyDown then return API.IsShiftKeyDown() end
+    return IsShiftKeyDown()
+  end
+
+  -- Interception is intentional here: the feature must be able to suppress the
+  -- default item use while trade/auction actions are active.
   local pfHookUseContainerItem = _G.UseContainerItem
   function _G.UseContainerItem(bag, slot)
-    if IsTrading() and not IsShiftKeyDown() then
+    if IsTrading() and not ShiftDown() then
       -- move item to trade window
       PickupContainerItem(bag, slot)
       local slot = TradeFrame_GetAvailableSlot()
@@ -34,13 +42,13 @@ module.enable = function(self)
       if CursorHasItem() then
         ClearCursor()
       end
-    elseif IsAuctionBrowsing() and not IsShiftKeyDown() then
+    elseif IsAuctionBrowsing() and not ShiftDown() then
       -- search item in auction house
       local link = GetContainerItemLink(bag, slot)
       local name = link and string.sub(link, string.find(link, "%[")+1, string.find(link, "%]")-1) or ""
       BrowseName:SetText(name)
       AuctionFrameBrowse_Search()
-    elseif IsAuctionSelling() and not IsShiftKeyDown() then
+    elseif IsAuctionSelling() and not ShiftDown() then
       -- sell item to auction house
       PickupContainerItem(bag, slot)
       AuctionsItemButton:Click()
@@ -53,21 +61,11 @@ module.enable = function(self)
     end
   end
 
-  -- detect bag button tooltips
-  local showHelperNextTooltip = false
-  local pfHookSetBagItem = GameTooltip.SetBagItem
-  function GameTooltip.SetBagItem(self, container, slot)
-    showHelperNextTooltip = IsTrading() or IsAuctionBrowsing() or IsAuctionSelling()
-    return pfHookSetBagItem(self, container, slot)
-  end
-
-  -- add helper text to tooltips
-  local tooltip = CreateFrame("Frame", "pfItemClickHelpMessage", GameTooltip)
-  tooltip:SetScript("OnShow", function()
-    if showHelperNextTooltip then
-      GameTooltip:AddLine(T["Hold [Shift] to use item."], 0.50, 0.75, 1.00)
-      GameTooltip:Show()
-      showHelperNextTooltip = false
+  -- Append helper text after the native tooltip method instead of replacing it.
+  hooksecurefunc(GameTooltip, "SetBagItem", function(self, container, slot)
+    if IsTrading() or IsAuctionBrowsing() or IsAuctionSelling() then
+      self:AddLine(T["Hold [Shift] to use item."], 0.50, 0.75, 1.00)
+      self:Show()
     end
   end)
 end
diff --git a/mods/bag-search.lua b/mods/bag-search.lua
index 060dd3e..3fd922c 100644
--- a/mods/bag-search.lua
+++ b/mods/bag-search.lua
@@ -1,5 +1,6 @@
 local _G = ShaguTweaks.GetGlobalEnv()
 local T = ShaguTweaks.T
+local API = ShaguTweaks.API or {}
 
 local module = ShaguTweaks:register({
   title = T["Bag Search Bar"],
@@ -50,8 +51,24 @@ module.enable = function(self)
     disable()
   end
 
+  local function GetContainerItemName(bag, slot)
+    if API.GetContainerItemID and API.GetItemNameByID then
+      local itemID = API.GetContainerItemID(bag, slot)
+      local name = itemID and API.GetItemNameByID(itemID)
+      if name then return name end
+    end
+
+    local link = GetContainerItemLink(bag, slot)
+    if not link then return "" end
+
+    local startPos = string.find(link, "%[")
+    local endPos = string.find(link, "%]")
+    if not startPos or not endPos or endPos <= startPos then return "" end
+    return string.sub(link, startPos + 1, endPos - 1)
+  end
+
   local query = function()
-    local text = strlower(search:GetText())
+    local text = strlower(search:GetText() or "")
 
     -- bag search
     for i = 1, 12 do
@@ -62,19 +79,17 @@ module.enable = function(self)
 
         for j = 1, MAX_CONTAINER_ITEMS do
           local button = _G[name.."Item"..j]
-          local texture = _G[button:GetName().."IconTexture"]
-
           if button then
-            local slot = button and button:GetID()
+            local texture = _G[button:GetName().."IconTexture"]
+            local slot = button:GetID()
 
-            local link = GetContainerItemLink(bag, slot)
             button:SetAlpha(.25)
-            texture:SetDesaturated(1)
+            if texture then texture:SetDesaturated(1) end
 
-            local item = link and string.sub(link, string.find(link, "%[")+1, string.find(link, "%]")-1) or ""
+            local item = GetContainerItemName(bag, slot)
             if strfind(strlower(item), text, 1, true) then
               button:SetAlpha(1)
-              texture:SetDesaturated(0)
+              if texture then texture:SetDesaturated(0) end
             end
           end
         end
@@ -87,11 +102,10 @@ module.enable = function(self)
         local button = _G["BankFrameItem"..i]
         local texture = button and _G[button:GetName().."IconTexture"]
         if button and texture then
-          local link = GetContainerItemLink(-1, i)
           button:SetAlpha(.25)
           texture:SetDesaturated(1)
 
-          local item = link and string.sub(link, string.find(link, "%[")+1, string.find(link, "%]")-1) or ""
+          local item = GetContainerItemName(-1, i)
           if strfind(strlower(item), text, 1, true) then
             button:SetAlpha(1)
             texture:SetDesaturated(0)
diff --git a/mods/chat-history.lua b/mods/chat-history.lua
deleted file mode 100644
index b125b07..0000000
--- a/mods/chat-history.lua
+++ /dev/null
@@ -1,81 +0,0 @@
-local _G = ShaguTweaks.GetGlobalEnv()
-local T = ShaguTweaks.T
-local rgbhex = ShaguTweaks.rgbhex
-
-local module = ShaguTweaks:register({
-  title = T["Chat History"],
-  description = T["Save chat history of all non-combatlog windows and restore it on login."],
-  expansions = { ["vanilla"] = true, ["tbc"] = false },
-  category = T["Chat"],
-  maintainer = "@shagu (GitHub)",
-  enabled = true,
-})
-
-module.enable = function(self)
-  local realm = GetRealmName()
-  local player = UnitName("player")
-
-  local history
-  local function SaveChatHistory(id, msg, r, g, b)
-    -- create cache tables if not existing
-    ShaguTweaks_cache = ShaguTweaks_cache or {}
-    ShaguTweaks_cache["chathistory"] = ShaguTweaks_cache["chathistory"] or {}
-    ShaguTweaks_cache["chathistory"][realm] = ShaguTweaks_cache["chathistory"][realm] or {}
-    ShaguTweaks_cache["chathistory"][realm][player] = ShaguTweaks_cache["chathistory"][realm][player] or {}
-    ShaguTweaks_cache["chathistory"][realm][player][id] = ShaguTweaks_cache["chathistory"][realm][player][id] or {}
-
-    if r and g and b then
-      local color = rgbhex(r*.5+.2, g*.5+.2, b*.5+.2)
-      msg = string.gsub(msg, "^", color)
-      msg = string.gsub(msg, "|r", "|r" .. color)
-    end
-
-    history = ShaguTweaks_cache["chathistory"][realm][player][id]
-    table.insert(history, 1, msg)
-    if history[30] then table.remove(history, 30) end
-  end
-
-  local function GetChatHistory(id)
-    -- create cache tables if not existing
-    ShaguTweaks_cache = ShaguTweaks_cache or {}
-    ShaguTweaks_cache["chathistory"] = ShaguTweaks_cache["chathistory"] or {}
-    ShaguTweaks_cache["chathistory"][realm] = ShaguTweaks_cache["chathistory"][realm] or {}
-    ShaguTweaks_cache["chathistory"][realm][player] = ShaguTweaks_cache["chathistory"][realm][player] or {}
-    ShaguTweaks_cache["chathistory"][realm][player][id] = ShaguTweaks_cache["chathistory"][realm][player][id] or {}
-
-    return ShaguTweaks_cache["chathistory"][realm][player][id]
-  end
-
-  local function AddMessage(frame, text, a1, a2, a3, a4, a5)
-    if not text then return end
-
-    -- save chat history
-    SaveChatHistory(frame:GetID(), text, a1, a2, a3)
-    frame:ShaguTweaksChatHistoryAddMessage(text, a1, a2, a3, a4, a5)
-  end
-
-  for i=1,NUM_CHAT_WINDOWS do
-    -- detect combat log message groups
-    local combat = 0
-    for _, msg in pairs(_G["ChatFrame"..i].messageTypeList) do
-      if strfind(msg, "SPELL", 1) or strfind(msg, "COMBAT", 1) then
-        combat = combat + 1
-      end
-    end
-
-    -- apply hooks and restore history on non-combat log frames
-    if combat <= 5 and not _G["ChatFrame"..i].ShaguTweaksChatHistoryAddMessage then
-      -- write history to chat
-      local history = GetChatHistory(i)
-      for j=30,0,-1 do
-        if history[j] then
-          _G["ChatFrame"..i]:AddMessage(history[j], .7,.7,.7)
-        end
-      end
-
-      -- add chat history hooks
-      _G["ChatFrame"..i].ShaguTweaksChatHistoryAddMessage = _G["ChatFrame"..i].AddMessage
-      _G["ChatFrame"..i].AddMessage = AddMessage
-    end
-  end
-end
diff --git a/mods/chat-input-center.lua b/mods/chat-input-center.lua
index 73db489..70028f2 100644
--- a/mods/chat-input-center.lua
+++ b/mods/chat-input-center.lua
@@ -1,6 +1,6 @@
 local _G = ShaguTweaks.GetGlobalEnv()
 local T = ShaguTweaks.T
-local rgbhex = ShaguTweaks.rgbhex
+local hooksecurefunc = ShaguTweaks.hooksecurefunc
 
 local module = ShaguTweaks:register({
   title = T["Center Text Input Box"],
@@ -19,21 +19,18 @@ module.enable = function(self)
   ChatFrameEditBox:ClearAllPoints()
   ChatFrameEditBox:SetWidth(300)
 
-  -- reload custom frame positions after original frame manage runs
-  local hookUIParent_ManageFramePositions = UIParent_ManageFramePositions
-  UIParent_ManageFramePositions = function(a1, a2, a3)
-    -- run original function
-    hookUIParent_ManageFramePositions(a1, a2, a3)
-
-    -- let inputbox dodge certain frames
+  local function UpdateInputPosition()
     local top = 0
-    for id, frame in pairs(dodge_frames) do
-      if frame:IsVisible() and frame:GetTop() then
+    for _, frame in pairs(dodge_frames) do
+      if frame and frame:IsVisible() and frame:GetTop() then
         top = math.max(top, frame:GetTop())
       end
     end
 
-    -- set new position
+    ChatFrameEditBox:ClearAllPoints()
     ChatFrameEditBox:SetPoint("BOTTOM", UIParent, "BOTTOM", 0, top)
   end
+
+  hooksecurefunc("UIParent_ManageFramePositions", UpdateInputPosition)
+  UpdateInputPosition()
 end
diff --git a/mods/chat-timestamps.lua b/mods/chat-timestamps.lua
index cf7774f..1fcf85f 100644
--- a/mods/chat-timestamps.lua
+++ b/mods/chat-timestamps.lua
@@ -30,14 +30,15 @@ module.enable = function(self)
 
     -- add hooks to each frame
     for i=1,NUM_CHAT_WINDOWS do
-      local original = _G["ChatFrame"..i].AddMessage
-      _G["ChatFrame"..i].AddMessage = function(frame, msg, a1, a2, a3, a4, a5)
-        -- ignore empty messages
-        if not msg then return end
+      local frame = _G["ChatFrame"..i]
+      if frame and not frame.ShaguTweaksExtrasTimestampAddMessage then
+        frame.ShaguTweaksExtrasTimestampAddMessage = frame.AddMessage
+        frame.AddMessage = function(self, msg, a1, a2, a3, a4, a5)
+          if not msg then return end
 
-        -- add timestamp to chat
-        msg = color .. left .. date(format) .. right .. "|r " .. msg
-        original(frame, msg, a1, a2, a3, a4, a5)
+          msg = color .. left .. date(format) .. right .. "|r " .. msg
+          self:ShaguTweaksExtrasTimestampAddMessage(msg, a1, a2, a3, a4, a5)
+        end
       end
     end
 end
diff --git a/mods/unitframe-energytick.lua b/mods/unitframe-energytick.lua
deleted file mode 100644
index 4f1ffec..0000000
--- a/mods/unitframe-energytick.lua
+++ /dev/null
@@ -1,78 +0,0 @@
-local T = ShaguTweaks.T
-
-local module = ShaguTweaks:register({
-  title = T["Show Energy Ticks"],
-  description = T["Show energy and mana ticks on the player unit frame."],
-  expansions = { ["vanilla"] = true, ["tbc"] = nil },
-  maintainer = "@shagu (GitHub)",
-  enabled = nil,
-})
-
-module.enable = function(self)
-  local energytick = CreateFrame("Frame", nil, PlayerFrameManaBar)
-  energytick:SetAllPoints(PlayerFrameManaBar)
-  energytick:RegisterEvent("PLAYER_ENTERING_WORLD")
-  energytick:RegisterEvent("UNIT_DISPLAYPOWER")
-  energytick:RegisterEvent("UNIT_ENERGY")
-  energytick:RegisterEvent("UNIT_MANA")
-  energytick:SetScript("OnEvent", function()
-    if UnitPowerType("player") == 0 then
-      this.mode = "MANA"
-      this:Show()
-    elseif UnitPowerType("player") == 3 then
-      this.mode = "ENERGY"
-      this:Show()
-    else
-      this:Hide()
-    end
-
-    if event == "PLAYER_ENTERING_WORLD" then
-      this.lastMana = UnitMana("player")
-    end
-
-    if (event == "UNIT_MANA" or event == "UNIT_ENERGY") and arg1 == "player" then
-      this.currentMana = UnitMana("player")
-      local diff = 0
-      if this.lastMana then
-        diff = this.currentMana - this.lastMana
-      end
-
-      if this.mode == "MANA" and diff < 0 then
-        this.target = 5
-      elseif this.mode == "MANA" and diff > 0 then
-        if this.max ~= 5 and diff > (this.badtick and this.badtick*1.2 or 5) then
-          this.target = 2
-        else
-          this.badtick = diff
-        end
-      elseif this.mode == "ENERGY" and diff > 0 then
-        this.target = 2
-      end
-      this.lastMana = this.currentMana
-    end
-  end)
-
-  energytick:SetScript("OnUpdate", function()
-    if this.target then
-      this.start, this.max = GetTime(), this.target
-      this.target = nil
-    end
-
-    if not this.start then return end
-
-    this.current = GetTime() - this.start
-
-    if this.current > this.max then
-      this.start, this.max, this.current = GetTime(), 2, 0
-    end
-
-    local pos = 120 * (this.current / this.max)
-    this.spark:SetPoint("LEFT", pos - 8.5, 0)
-  end)
-
-  energytick.spark = energytick:CreateTexture(nil, 'OVERLAY')
-  energytick.spark:SetTexture("Interface\\CastingBar\\UI-CastingBar-Spark")
-  energytick.spark:SetHeight(27)
-  energytick.spark:SetWidth(17)
-  energytick.spark:SetBlendMode('ADD')
-end