diff --git a/monsters/Black Pudding.yml b/monsters/Black Pudding.yml
index b3f5630..b52d07f 100644
--- a/monsters/Black Pudding.yml	
+++ b/monsters/Black Pudding.yml	
@@ -2,7 +2,7 @@ monster:
   name: Black Pudding
   type: Huge Ooze
   size: huge
-  hd: 10d10+60
+  hd: 'd[[10d10]]+60'
   initiative: -5
   speed: 20
   ac:
@@ -14,10 +14,10 @@ monster:
   attacks:
     - name: Slam
       bonus: 8
-      damage: 2d6+4+2d6
+      damage: 'd[[2d6]]+4+d[[2d6]]'
   special:
     - Acid
-    - Constrict 2d6+4+2d6
+    - Constrict 'd[[2d6]]+4+d[[2d6]]'
     - Improved Grab
   space: 15
   reach: 10
@@ -39,7 +39,7 @@ monster:
   alignment: Neutral
   cr: 7
   advancement:
-    medium: 1d5+10
-    large: 1d15+15
+    medium: 'd[[1d5]]+10'
+    large: 'd[[1d15]]+15'
 
 #EOF
diff --git a/monsters/Frost Giant Jarl.yml b/monsters/Frost Giant Jarl.yml
index 8335d7e..1463001 100644
--- a/monsters/Frost Giant Jarl.yml	
+++ b/monsters/Frost Giant Jarl.yml	
@@ -3,7 +3,7 @@ monster:
   name: Frost Giant Jarl
   type: Giant
   size: large
-  hd: 14d8+84+8d10+48
+  hd: 'd[[14d8]]+84+d[[8d10]]+48'
   initiative: 5
   speed: 30
   ac:
@@ -13,33 +13,33 @@ monster:
   attacks:
     - name: +2 Frost Greataxe
       bonus: +30
-      damage: 3d6+13+1d6
+      damage: 'd[[3d6]]+13+d[[1d6]]'
       threat: [20]
       multiplier: 3
     - name: +2 Frost Greataxe
       bonus: +35
-      damage: 3d6+13+1d6
+      damage: 'd[[3d6]]+13+d[[1d6]]'
       threat: [20]
       multiplier: 3
     - name: +2 Frost Greataxe
       bonus: +20
-      damage: 3d6+13+1d6
+      damage: 'd[[3d6]]+13+d[[1d6]]'
       threat: [20]
       multiplier: 3
     - name: +2 Frost Greataxe
       bonus: +15
-      damage: 3d6+13+1d6
+      damage: 'd[[3d6]]+13+d[[1d6]]'
       threat: [20]
       multiplier: 3
     - name: Slam
       bonus: +28
-      damage: 1d4+11
+      damage: 'd[[1d4]]+11'
     - name: Slam
       bonus: +28
-      damage: 1d4+11
+      damage: 'd[[1d4]]+11'
     - name: Rock
       bonus: +18
-      damage: 2d6+11
+      damage: 'd[[2d6]]+11'
   special:
     - Aura of Despair
     - Aura of Evil
diff --git a/monsters/Greater Stone Golem.yml b/monsters/Greater Stone Golem.yml
index 6712b07..7b4be43 100644
--- a/monsters/Greater Stone Golem.yml	
+++ b/monsters/Greater Stone Golem.yml	
@@ -1,8 +1,8 @@
 monster:
-  name: Stone Golem
+  name: Greater Stone Golem
   type: construct
   size: huge
-  hd: 42d10+40
+  hd: 'd[[42d10]]+40'
   initiative: -2
   speed: 20
   ac:
@@ -14,10 +14,10 @@ monster:
   attacks:
     - name: Slam
       bonus: +42
-      damage: 4d8+13
+      damage: 'd[[4d8]]+13'
     - name: Slam
       bonus: +42
-      damage: 4d8+13
+      damage: 'd[[4d8]]+13'
   special:
     - Slow
   space: 10
diff --git a/monsters/Huge Earth Elemental.yml b/monsters/Huge Earth Elemental.yml
index 6e7dea0..af35a13 100644
--- a/monsters/Huge Earth Elemental.yml	
+++ b/monsters/Huge Earth Elemental.yml	
@@ -3,7 +3,7 @@ monster:
   name: Huge Air Elemental
   type: Elemental
   size: huge
-  hd: 16d8+80
+  hd: 'd[[16d8]]+80'
   initiative: -1
   speed: 30
   ac:
@@ -15,10 +15,10 @@ monster:
   attacks:
     - name: Slam
       bonus: 19
-      damage: 2d10+9
+      damage: 'd[[2d10]]+9'
     - name: Slam
       bonus: 19
-      damage: 2d10+9
+      damage: 'd[[2d10]]+9'
   special:
     - Earth Mastery
     - Push
@@ -48,6 +48,6 @@ monster:
   alignment: Neutral
   cr: 7
   advancement:
-    huge: 1d4+16
+    huge: 'd[[1d4]]+16'
 
 # EOF
diff --git a/monsters/Stone Golem.yml b/monsters/Stone Golem.yml
index 24c04b8..58b9d87 100644
--- a/monsters/Stone Golem.yml	
+++ b/monsters/Stone Golem.yml	
@@ -2,7 +2,7 @@ monster:
   name: Stone Golem
   type: construct
   size: large
-  hd: 14d10+30
+  hd: 'd[[14d10]]+30'
   initiative: -1
   speed: 20
   ac:
@@ -14,10 +14,10 @@ monster:
   attacks:
     - name: Slam
       bonus: +18
-      damage: 2d10+9
+      damage: 'd[[2d10]]+9'
     - name: Slam
       bonus: +18
-      damage: 2d10+9
+      damage: 'd[[2d10]]+9'
   special:
     - Slow
   space: 10
@@ -43,7 +43,7 @@ monster:
   adjustment: 0
   cr: 11
   advancement:
-    large: 1d7+14
-    huge: 1d21+21
+    large: 'd[[1d7]]+14'
+    huge: 'd[[1d21]]+21'
 
 #EOF
diff --git a/monsters/Worg.yml b/monsters/Worg.yml
index f3510a7..4625184 100644
--- a/monsters/Worg.yml
+++ b/monsters/Worg.yml
@@ -2,7 +2,7 @@ monster:
   name: Worg
   type: Magical Beast
   size: medium
-  hd: 4d10+8
+  hd: 'd[[4d10]]+8'
   initiative: 5
   speed: 50
   ac:
@@ -14,7 +14,7 @@ monster:
   attacks:
     - name: Bite
       bonus: 7
-      damage: 1d6+4
+      damage: 'd[[1d6]]+4'
   special:
     - Trip
   space: 5
@@ -45,7 +45,7 @@ monster:
     goods: 0.5
     items: 0.5
   advancement:
-    medium: 1d2+4
-    large: 1d6+6
+    medium: 'd[[1d2]]+4'
+    large: 'd[[1d6]]+6'
 
 #EOF