diff --git a/extension.xml b/extension.xml
index d3cade2..3b1cdaa 100644
--- a/extension.xml
+++ b/extension.xml
@@ -3,16 +3,16 @@
 <root version="3.0">
   <properties>
     <name>CT Scroll 5e Extension</name>
-    <version>0.4.1</version>
+    <version>0.4.1-rc1</version>
     <author>fxg42</author>
     <description>Increment and decrement NPC combat tracker entry attack bonuses and damage die with the scroll wheel.</description>
     <loadorder>100</loadorder>
   </properties>
 
-  <announcement text="CT Scroll v0.4.1" font="emotefont" icon="raven"/>
+  <announcement text="CT Scroll v0.4.1-rc1" font="emotefont" icon="raven"/>
 
   <base>
-    <icon name="raven" file="raven-circ-30x30.png"/>
+    <icon name="raven" file="raven-circ-30x30.webp"/>
     <includefile source="ct/ct_host.xml" />
     <script name="CombatManager__proxy" file="scripts/manager_combat2.lua" />
   </base>
diff --git a/raven-circ-30x30.png b/raven-circ-30x30.png
deleted file mode 100644
index a0e1f4e..0000000
Binary files a/raven-circ-30x30.png and /dev/null differ
diff --git a/raven-circ-30x30.webp b/raven-circ-30x30.webp
new file mode 100644
index 0000000..664b92a
Binary files /dev/null and b/raven-circ-30x30.webp differ
diff --git a/scripts/manager_combat2.lua b/scripts/manager_combat2.lua
index bc18e93..9d394b3 100644
--- a/scripts/manager_combat2.lua
+++ b/scripts/manager_combat2.lua
@@ -1,17 +1,27 @@
+--
+-- Different way to call custom functions when adding entry to CT in 5E ruleset
+--
+
+local fonRecordTypeEvent;
 function onInit()
-  CombatRecordManager.setRecordTypePostAddCallback("npc", proxy(CombatManager2.onNPCPostAdd, upcastCantrips));
+  if Session.IsHost then
+    fonRecordTypeEvent = CombatRecordManager.onRecordTypeEvent;
+    CombatRecordManager.onRecordTypeEvent = onRecordTypeEventNS;
+  end
+end
+function onClose()
+  if Session.IsHost then
+    CombatRecordManager.onRecordTypeEvent = fonRecordTypeEvent;
+  end
 end
 
 --
 -- Intercepts calls to subject function and executes an advice after the call.
 --
 
-function proxy(subjectFn, afterAdvice)
-  return function(...)
-    local returnValue = subjectFn(...);
-    afterAdvice(...);
-    return returnValue;
-  end
+function onRecordTypeEventNS(sRecordType, tCustom)
+  fonRecordTypeEvent(sRecordType, tCustom);
+  upcastCantrips(tCustom);
 end
 
 --
@@ -23,7 +33,7 @@ function upcastCantrips(tCustom)
   local nodeEntry = tCustom.nodeCT;
   local notches = getNbNotches(getSpellcasterLevel(nodeEntry));
   if notches < 1 then return end
-  
+
   forEachCantrip(nodeEntry, function(attackLine, setValue)
     if attackLine:find("DMG:") or attackLine:find("HEAL:") then
       setValue(updateNbDice(notches, attackLine));
@@ -74,7 +84,8 @@ function forEachCantrip(nodeEntry, f)
   for _, spellTrait in pairs({"spells", "innatespells"}) do
     for _, nodePower in pairs(DB.getChildren(nodeEntry, spellTrait)) do
       local attackLine = DB.getValue(nodePower, "value", "");
-      if attackLine:find("cantrip") then
+	  local attackLineLower = string.lower(attackLine);
+      if attackLineLower:find("cantrip") then
         local setValue = function(...) DB.setValue(nodePower, "value", "string", ...) end
         f(attackLine, setValue);
       end