diff --git a/IceHUD.lua b/IceHUD.lua
index a887fa3..ada6289 100644
--- a/IceHUD.lua
+++ b/IceHUD.lua
@@ -777,6 +777,19 @@ function IceHUD:GetDebuffCount(unit, ability, onlyMine, matchByName)
 end
 
 function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
+	if unit == "main hand weapon" or unit == "off hand weapon" then
+		local hasMainHandEnchant, mainHandExpiration, mainHandCharges, hasOffHandEnchant, offHandExpiration, offHandCharges
+			= GetWeaponEnchantInfo()
+
+		if unit == "main hand weapon" and hasMainHandEnchant then
+			return mainHandCharges
+		elseif unit == "off hand weapon" and hasOffHandEnchant then
+			return offHandCharges
+		end
+
+		return 0
+	end
+
 	for i = 1, 40 do
 		local name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
 
diff --git a/modules/CustomCount.lua b/modules/CustomCount.lua
index 3f54f43..f6ad81c 100644
--- a/modules/CustomCount.lua
+++ b/modules/CustomCount.lua
@@ -5,7 +5,7 @@ local waterfall = AceLibrary("Waterfall-1.0")
 
 IceCustomCount.prototype.countSize = 20
 
-local validUnits = {"player", "target", "focus", "pet", "vehicle", "targettarget"}
+local validUnits = {"player", "target", "focus", "pet", "vehicle", "targettarget", "main hand weapon", "off hand weapon"}
 local buffOrDebuff = {"buff", "debuff"}
 
 -- Constructor --
@@ -67,6 +67,7 @@ function IceCustomCount.prototype:GetOptions()
 			self.moduleSettings.auraTarget = v
 			self.unit = v
 			self:Redraw()
+			AceLibrary("Waterfall-1.0"):Refresh("IceHUD")
 		end,
 		disabled = function()
 			return not self.moduleSettings.enabled
@@ -87,7 +88,7 @@ function IceCustomCount.prototype:GetOptions()
 			self:Redraw()
 		end,
 		disabled = function()
-			return not self.moduleSettings.enabled
+			return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
 		end,
 		order = 20.5,
 	}
@@ -104,7 +105,7 @@ function IceCustomCount.prototype:GetOptions()
 			self:Redraw()
 		end,
 		disabled = function()
-			return not self.moduleSettings.enabled
+			return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
 		end,
 		order = 20.6,
 	}
@@ -121,7 +122,7 @@ function IceCustomCount.prototype:GetOptions()
 			self:Redraw()
 		end,
 		disabled = function()
-			return not self.moduleSettings.enabled
+			return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
 		end,
 		order = 20.7,
 	}
@@ -524,7 +525,7 @@ end
 
 
 function IceCustomCount.prototype:UpdateCustomCount(unit)
-	if unit and unit ~= self.unit then
+	if unit and unit ~= self.unit and self.unit ~= "main hand weapon" and self.unit ~= "off hand weapon" then
 		return
 	end