diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index ac779b14ff..8726079438 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -19762,7 +19762,7 @@
     <option value="ceil(@{level-class1}/2)"></option>
 </datalist>
 <datalist id="psionic-devotion-macro">
-    <option value="{1+@{level-class1}*2,9}kl1 + {@{level-class1}-4,0}kh1"></option>
+    <option value="1 + ({@{level-class1},4}kl1*2) + ({[[{@{level-class1},20}kl1-4]],0}kh1) + ({[[{@{level-class1},21}kl1-20]],0}kh1*2) + ({[[{@{level-class1},23}kl1-21]],0}kh1*3) + ({[[{@{level-class1},26}kl1-23]],0}kh1*4) + ({[[{@{level-class1},29}kl1-26]],0}kh1*5) + ({[[{@{level-class1},30}kl1-29]],0}kh1*10)"></option>
 </datalist>
 <datalist id="psionic-defense-mode-macro">
     <option value="{ceil(@{level-class1}/2),5}kl1"></option>
diff --git a/ADnD_2E_Revised/html/components/datalists.html b/ADnD_2E_Revised/html/components/datalists.html
index 11ca7506ac..81d56e6095 100644
--- a/ADnD_2E_Revised/html/components/datalists.html
+++ b/ADnD_2E_Revised/html/components/datalists.html
@@ -103,7 +103,7 @@
     <option value="ceil(@{level-class1}/2)"></option>
 </datalist>
 <datalist id="psionic-devotion-macro">
-    <option value="{1+@{level-class1}*2,9}kl1 + {@{level-class1}-4,0}kh1"></option>
+    <option value="1 + ({@{level-class1},4}kl1*2) + ({[[{@{level-class1},20}kl1-4]],0}kh1) + ({[[{@{level-class1},21}kl1-20]],0}kh1*2) + ({[[{@{level-class1},23}kl1-21]],0}kh1*3) + ({[[{@{level-class1},26}kl1-23]],0}kh1*4) + ({[[{@{level-class1},29}kl1-26]],0}kh1*5) + ({[[{@{level-class1},30}kl1-29]],0}kh1*10)"></option>
 </datalist>
 <datalist id="psionic-defense-mode-macro">
     <option value="{ceil(@{level-class1}/2),5}kl1"></option>