diff --git a/objects/AllPlayerCards.15bb07/BiancaDieKatz.897a94.gmnotes b/objects/AllPlayerCards.15bb07/BiancaDieKatz.897a94.gmnotes
index a3f20337..31e27be2 100644
--- a/objects/AllPlayerCards.15bb07/BiancaDieKatz.897a94.gmnotes
+++ b/objects/AllPlayerCards.15bb07/BiancaDieKatz.897a94.gmnotes
@@ -6,6 +6,7 @@
   "cost": 2,
   "level": 0,
   "traits": "Ally. Criminal. Socialite.",
+  "agilityIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -13,7 +14,6 @@
       "id": "10063"
     }
   ],
-  "agilityIcons": 1,
   "uses": [
     {
       "count": 10,
diff --git a/objects/AllPlayerCards.15bb07/BrokenDiadem5.b6d35d.gmnotes b/objects/AllPlayerCards.15bb07/BrokenDiadem5.b6d35d.gmnotes
index 46b30afc..1b23b4ae 100644
--- a/objects/AllPlayerCards.15bb07/BrokenDiadem5.b6d35d.gmnotes
+++ b/objects/AllPlayerCards.15bb07/BrokenDiadem5.b6d35d.gmnotes
@@ -5,6 +5,7 @@
   "cost": 1,
   "level": 5,
   "traits": "Item. Charm. Mask.",
+  "wildIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -12,7 +13,6 @@
       "id": "10134"
     }
   ],
-  "wildIcons": 1,
   "uses": [
     {
       "count": 0,
diff --git a/objects/AllPlayerCards.15bb07/CrystallizerofDreams.6692de.gmnotes b/objects/AllPlayerCards.15bb07/CrystallizerofDreams.6692de.gmnotes
index bd1747fd..8748c3c8 100644
--- a/objects/AllPlayerCards.15bb07/CrystallizerofDreams.6692de.gmnotes
+++ b/objects/AllPlayerCards.15bb07/CrystallizerofDreams.6692de.gmnotes
@@ -6,6 +6,7 @@
   "cost": 1,
   "level": 0,
   "traits": "Item. Relic.",
+  "willpowerIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -13,6 +14,5 @@
       "id": "06025"
     }
   ],
-  "willpowerIcons": 1,
   "cycle": "The Dream-Eaters"
 }
diff --git a/objects/AllPlayerCards.15bb07/DreamDiary.b81dcf.gmnotes b/objects/AllPlayerCards.15bb07/DreamDiary.b81dcf.gmnotes
index 34fca57a..d01f3796 100644
--- a/objects/AllPlayerCards.15bb07/DreamDiary.b81dcf.gmnotes
+++ b/objects/AllPlayerCards.15bb07/DreamDiary.b81dcf.gmnotes
@@ -6,6 +6,7 @@
   "cost": 2,
   "level": 0,
   "traits": "Item. Tome. Charm.",
+  "willpowerIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -13,6 +14,5 @@
       "id": "06113"
     }
   ],
-  "willpowerIcons": 1,
   "cycle": "The Dream-Eaters"
 }
diff --git a/objects/AllPlayerCards.15bb07/DreamDiary3.5f9a10.gmnotes b/objects/AllPlayerCards.15bb07/DreamDiary3.5f9a10.gmnotes
index 4a0e1b16..2aa57ac4 100644
--- a/objects/AllPlayerCards.15bb07/DreamDiary3.5f9a10.gmnotes
+++ b/objects/AllPlayerCards.15bb07/DreamDiary3.5f9a10.gmnotes
@@ -6,6 +6,8 @@
   "cost": 2,
   "level": 3,
   "traits": "Item. Tome. Charm.",
+  "willpowerIcons": 1,
+  "agilityIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -13,7 +15,5 @@
       "id": "06113"
     }
   ],
-  "willpowerIcons": 1,
-  "agilityIcons": 1,
   "cycle": "The Dream-Eaters"
 }
diff --git a/objects/AllPlayerCards.15bb07/DreamDiary3.e5f9cb.gmnotes b/objects/AllPlayerCards.15bb07/DreamDiary3.e5f9cb.gmnotes
index fb970d0c..4c29ff3e 100644
--- a/objects/AllPlayerCards.15bb07/DreamDiary3.e5f9cb.gmnotes
+++ b/objects/AllPlayerCards.15bb07/DreamDiary3.e5f9cb.gmnotes
@@ -6,6 +6,8 @@
   "cost": 2,
   "level": 3,
   "traits": "Item. Tome. Charm.",
+  "willpowerIcons": 1,
+  "combatIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -13,7 +15,5 @@
       "id": "06113"
     }
   ],
-  "willpowerIcons": 1,
-  "combatIcons": 1,
   "cycle": "The Dream-Eaters"
 }
diff --git a/objects/AllPlayerCards.15bb07/DreamDiary3.ea40f6.gmnotes b/objects/AllPlayerCards.15bb07/DreamDiary3.ea40f6.gmnotes
index ca601cb3..b0e308a0 100644
--- a/objects/AllPlayerCards.15bb07/DreamDiary3.ea40f6.gmnotes
+++ b/objects/AllPlayerCards.15bb07/DreamDiary3.ea40f6.gmnotes
@@ -6,6 +6,8 @@
   "cost": 2,
   "level": 3,
   "traits": "Item. Tome. Charm.",
+  "willpowerIcons": 1,
+  "intellectIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -13,7 +15,5 @@
       "id": "06113"
     }
   ],
-  "willpowerIcons": 1,
-  "intellectIcons": 1,
   "cycle": "The Dream-Eaters"
 }
diff --git a/objects/AllPlayerCards.15bb07/EmptyVessel4.c0d236.gmnotes b/objects/AllPlayerCards.15bb07/EmptyVessel4.c0d236.gmnotes
index ff308a4a..8db7ead4 100644
--- a/objects/AllPlayerCards.15bb07/EmptyVessel4.c0d236.gmnotes
+++ b/objects/AllPlayerCards.15bb07/EmptyVessel4.c0d236.gmnotes
@@ -6,6 +6,8 @@
   "cost": 1,
   "level": 4,
   "traits": "Item. Relic. Blessed.",
+  "willpowerIcons": 1,
+  "wildIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -13,8 +15,6 @@
       "id": "06277"
     }
   ],
-  "willpowerIcons": 1,
-  "wildIcons": 1,
   "uses": [
     {
       "count": 0,
diff --git a/objects/AllPlayerCards.15bb07/EyesofValusia4.e7bfbe.gmnotes b/objects/AllPlayerCards.15bb07/EyesofValusia4.e7bfbe.gmnotes
index 61218b56..ba576c47 100644
--- a/objects/AllPlayerCards.15bb07/EyesofValusia4.e7bfbe.gmnotes
+++ b/objects/AllPlayerCards.15bb07/EyesofValusia4.e7bfbe.gmnotes
@@ -6,6 +6,8 @@
   "cost": 3,
   "level": 4,
   "traits": "Item. Relic. Spell.",
+  "willpowerIcons": 1,
+  "combatIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -13,8 +15,6 @@
       "id": "10036"
     }
   ],
-  "willpowerIcons": 1,
-  "combatIcons": 1,
   "uses": [
     {
       "type": "Charge",
diff --git a/objects/AllPlayerCards.15bb07/HallowedMirror.312d38.gmnotes b/objects/AllPlayerCards.15bb07/HallowedMirror.312d38.gmnotes
index 8d61f5b7..5c7b651a 100644
--- a/objects/AllPlayerCards.15bb07/HallowedMirror.312d38.gmnotes
+++ b/objects/AllPlayerCards.15bb07/HallowedMirror.312d38.gmnotes
@@ -6,6 +6,7 @@
   "cost": 2,
   "level": 0,
   "traits": "Item. Relic. Occult. Blessed.",
+  "willpowerIcons": 1,
   "bonded": [
     {
       "count": 3,
@@ -13,6 +14,5 @@
       "id": "05314"
     }
   ],
-  "willpowerIcons": 1,
   "cycle": "The Circle Undone"
 }
diff --git a/objects/AllPlayerCards.15bb07/HallowedMirror3.78858f.gmnotes b/objects/AllPlayerCards.15bb07/HallowedMirror3.78858f.gmnotes
index 3f67a1c5..db54e5dc 100644
--- a/objects/AllPlayerCards.15bb07/HallowedMirror3.78858f.gmnotes
+++ b/objects/AllPlayerCards.15bb07/HallowedMirror3.78858f.gmnotes
@@ -6,6 +6,7 @@
   "cost": 2,
   "level": 3,
   "traits": "Item. Relic. Occult. Blessed.",
+  "willpowerIcons": 2,
   "bonded": [
     {
       "count": 3,
@@ -13,6 +14,5 @@
       "id": "05314"
     }
   ],
-  "willpowerIcons": 2,
   "cycle": "Return to the Circle Undone"
 }
diff --git a/objects/AllPlayerCards.15bb07/HankSamson.3764cd.gmnotes b/objects/AllPlayerCards.15bb07/HankSamson.3764cd.gmnotes
index 218b796c..92f6acc8 100644
--- a/objects/AllPlayerCards.15bb07/HankSamson.3764cd.gmnotes
+++ b/objects/AllPlayerCards.15bb07/HankSamson.3764cd.gmnotes
@@ -3,6 +3,10 @@
   "type": "Investigator",
   "class": "Survivor",
   "traits": "Assistant. Warden.",
+  "willpowerIcons": 3,
+  "intellectIcons": 1,
+  "combatIcons": 5,
+  "agilityIcons": 3,
   "bonded": [
     {
       "count": 1,
@@ -15,10 +19,6 @@
       "id": "10015-b2"
     }
   ],
-  "willpowerIcons": 3,
-  "intellectIcons": 1,
-  "combatIcons": 5,
-  "agilityIcons": 3,
   "cycle": "The Feast of Hemlock Vale",
   "extraToken": "None",
   "signatures": [
diff --git a/objects/AllPlayerCards.15bb07/MiracleWish5.d78d4a.gmnotes b/objects/AllPlayerCards.15bb07/MiracleWish5.d78d4a.gmnotes
index d3dc1fb8..415996f2 100644
--- a/objects/AllPlayerCards.15bb07/MiracleWish5.d78d4a.gmnotes
+++ b/objects/AllPlayerCards.15bb07/MiracleWish5.d78d4a.gmnotes
@@ -4,6 +4,8 @@
   "class": "Guardian",
   "level": 5,
   "traits": "Favor. Blessed.",
+  "willpowerIcons": 1,
+  "wildIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -11,7 +13,5 @@
       "id": "10039"
     }
   ],
-  "willpowerIcons": 1,
-  "wildIcons": 1,
   "cycle": "The Feast of Hemlock Vale"
 }
diff --git a/objects/AllPlayerCards.15bb07/MissDoyle1.e1aedf.gmnotes b/objects/AllPlayerCards.15bb07/MissDoyle1.e1aedf.gmnotes
index 026d1bd9..77f02603 100644
--- a/objects/AllPlayerCards.15bb07/MissDoyle1.e1aedf.gmnotes
+++ b/objects/AllPlayerCards.15bb07/MissDoyle1.e1aedf.gmnotes
@@ -6,6 +6,7 @@
   "cost": 3,
   "level": 1,
   "traits": "Ally. Creature. Dreamlands.",
+  "wildIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -23,6 +24,5 @@
       "id": "06033"
     }
   ],
-  "wildIcons": 1,
   "cycle": "The Dream-Eaters"
 }
diff --git a/objects/AllPlayerCards.15bb07/NightmareBauble3.d6f6f1.gmnotes b/objects/AllPlayerCards.15bb07/NightmareBauble3.d6f6f1.gmnotes
index b5fea3b2..7239875b 100644
--- a/objects/AllPlayerCards.15bb07/NightmareBauble3.d6f6f1.gmnotes
+++ b/objects/AllPlayerCards.15bb07/NightmareBauble3.d6f6f1.gmnotes
@@ -6,6 +6,8 @@
   "cost": 1,
   "level": 3,
   "traits": "Item. Charm. Cursed.",
+  "willpowerIcons": 1,
+  "wildIcons": 1,
   "bonded": [
     {
       "count": 3,
@@ -13,7 +15,5 @@
       "id": "06331"
     }
   ],
-  "willpowerIcons": 1,
-  "wildIcons": 1,
   "cycle": "The Dream-Eaters"
 }
diff --git a/objects/AllPlayerCards.15bb07/OccultLexicon.5d6728.gmnotes b/objects/AllPlayerCards.15bb07/OccultLexicon.5d6728.gmnotes
index c8b28e1a..7575b1dc 100644
--- a/objects/AllPlayerCards.15bb07/OccultLexicon.5d6728.gmnotes
+++ b/objects/AllPlayerCards.15bb07/OccultLexicon.5d6728.gmnotes
@@ -6,6 +6,7 @@
   "cost": 2,
   "level": 0,
   "traits": "Item. Tome. Occult.",
+  "intellectIcons": 1,
   "bonded": [
     {
       "count": 3,
@@ -13,6 +14,5 @@
       "id": "05317"
     }
   ],
-  "intellectIcons": 1,
   "cycle": "The Circle Undone"
 }
diff --git a/objects/AllPlayerCards.15bb07/OccultLexicon3.71d99c.gmnotes b/objects/AllPlayerCards.15bb07/OccultLexicon3.71d99c.gmnotes
index 658d18db..daff8619 100644
--- a/objects/AllPlayerCards.15bb07/OccultLexicon3.71d99c.gmnotes
+++ b/objects/AllPlayerCards.15bb07/OccultLexicon3.71d99c.gmnotes
@@ -6,6 +6,7 @@
   "cost": 2,
   "level": 3,
   "traits": "Item. Tome. Occult.",
+  "intellectIcons": 2,
   "bonded": [
     {
       "count": 3,
@@ -13,6 +14,5 @@
       "id": "05317"
     }
   ],
-  "intellectIcons": 2,
   "cycle": "Return to the Circle Undone"
 }
diff --git a/objects/AllPlayerCards.15bb07/RavenousMyconid.0aa967.gmnotes b/objects/AllPlayerCards.15bb07/RavenousMyconid.0aa967.gmnotes
index 837f6c1a..f84584e5 100644
--- a/objects/AllPlayerCards.15bb07/RavenousMyconid.0aa967.gmnotes
+++ b/objects/AllPlayerCards.15bb07/RavenousMyconid.0aa967.gmnotes
@@ -5,6 +5,7 @@
   "cost": 2,
   "level": 0,
   "traits": "Creature. Monster. Flora. Science.",
+  "agilityIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -12,7 +13,6 @@
       "id": "10045"
     }
   ],
-  "agilityIcons": 1,
   "uses": [
     {
       "count": 0,
diff --git a/objects/AllPlayerCards.15bb07/RavenousMyconid4.ab2752.gmnotes b/objects/AllPlayerCards.15bb07/RavenousMyconid4.ab2752.gmnotes
index 90abc639..b3c51dc6 100644
--- a/objects/AllPlayerCards.15bb07/RavenousMyconid4.ab2752.gmnotes
+++ b/objects/AllPlayerCards.15bb07/RavenousMyconid4.ab2752.gmnotes
@@ -5,6 +5,7 @@
   "cost": 2,
   "level": 4,
   "traits": "Creature. Science.",
+  "intellectIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -12,7 +13,6 @@
       "id": "10045"
     }
   ],
-  "intellectIcons": 1,
   "uses": [
     {
       "count": 0,
diff --git a/objects/AllPlayerCards.15bb07/RavenousMyconid4.baa926.gmnotes b/objects/AllPlayerCards.15bb07/RavenousMyconid4.baa926.gmnotes
index 6dec9e0b..58b8e87c 100644
--- a/objects/AllPlayerCards.15bb07/RavenousMyconid4.baa926.gmnotes
+++ b/objects/AllPlayerCards.15bb07/RavenousMyconid4.baa926.gmnotes
@@ -5,6 +5,7 @@
   "cost": 2,
   "level": 4,
   "traits": "Flora. Science.",
+  "willpowerIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -12,7 +13,6 @@
       "id": "10045"
     }
   ],
-  "willpowerIcons": 1,
   "uses": [
     {
       "count": 0,
diff --git a/objects/AllPlayerCards.15bb07/RavenousMyconid4.df93ca.gmnotes b/objects/AllPlayerCards.15bb07/RavenousMyconid4.df93ca.gmnotes
index b020ab00..4bb6dded 100644
--- a/objects/AllPlayerCards.15bb07/RavenousMyconid4.df93ca.gmnotes
+++ b/objects/AllPlayerCards.15bb07/RavenousMyconid4.df93ca.gmnotes
@@ -5,6 +5,7 @@
   "cost": 2,
   "level": 4,
   "traits": "Monster. Science.",
+  "combatIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -12,7 +13,6 @@
       "id": "10045"
     }
   ],
-  "combatIcons": 1,
   "uses": [
     {
       "count": 0,
diff --git a/objects/AllPlayerCards.15bb07/RodofCarnamagos.66ec64.gmnotes b/objects/AllPlayerCards.15bb07/RodofCarnamagos.66ec64.gmnotes
index eb0442a9..44d4ff5d 100644
--- a/objects/AllPlayerCards.15bb07/RodofCarnamagos.66ec64.gmnotes
+++ b/objects/AllPlayerCards.15bb07/RodofCarnamagos.66ec64.gmnotes
@@ -6,6 +6,7 @@
   "cost": 2,
   "level": 0,
   "traits": "Item. Relic. Occult. Cursed.",
+  "willpowerIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -33,6 +34,5 @@
       "id": "10090"
     }
   ],
-  "willpowerIcons": 1,
   "cycle": "The Feast of Hemlock Vale"
 }
diff --git a/objects/AllPlayerCards.15bb07/RodofCarnamagos2.d8ef99.gmnotes b/objects/AllPlayerCards.15bb07/RodofCarnamagos2.d8ef99.gmnotes
index 56025aeb..0008e120 100644
--- a/objects/AllPlayerCards.15bb07/RodofCarnamagos2.d8ef99.gmnotes
+++ b/objects/AllPlayerCards.15bb07/RodofCarnamagos2.d8ef99.gmnotes
@@ -6,6 +6,7 @@
   "cost": 2,
   "level": 2,
   "traits": "Item. Relic. Occult. Cursed.",
+  "willpowerIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -33,6 +34,5 @@
       "id": "10090"
     }
   ],
-  "willpowerIcons": 1,
   "cycle": "The Feast of Hemlock Vale"
 }
diff --git a/objects/AllPlayerCards.15bb07/SealoftheElders5.d2b649.gmnotes b/objects/AllPlayerCards.15bb07/SealoftheElders5.d2b649.gmnotes
index e0fd4059..95989749 100644
--- a/objects/AllPlayerCards.15bb07/SealoftheElders5.d2b649.gmnotes
+++ b/objects/AllPlayerCards.15bb07/SealoftheElders5.d2b649.gmnotes
@@ -5,6 +5,8 @@
   "cost": 0,
   "level": 5,
   "traits": "Spell. Pact. Blessed. Cursed.",
+  "willpowerIcons": 1,
+  "combatIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -17,7 +19,5 @@
       "id": "10107"
     }
   ],
-  "willpowerIcons": 1,
-  "combatIcons": 1,
   "cycle": "The Feast of Hemlock Vale"
 }
diff --git a/objects/AllPlayerCards.15bb07/SegmentofOnyx1.ff9f23.gmnotes b/objects/AllPlayerCards.15bb07/SegmentofOnyx1.ff9f23.gmnotes
index 94331a55..43825ba4 100644
--- a/objects/AllPlayerCards.15bb07/SegmentofOnyx1.ff9f23.gmnotes
+++ b/objects/AllPlayerCards.15bb07/SegmentofOnyx1.ff9f23.gmnotes
@@ -5,6 +5,7 @@
   "cost": 1,
   "level": 1,
   "traits": "Item. Relic. Occult.",
+  "wildIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -12,6 +13,5 @@
       "id": "06022"
     }
   ],
-  "wildIcons": 1,
   "cycle": "The Dream-Eaters"
 }
diff --git a/objects/AllPlayerCards.15bb07/Stargazing1.968a26.gmnotes b/objects/AllPlayerCards.15bb07/Stargazing1.968a26.gmnotes
index be65c26a..68886cec 100644
--- a/objects/AllPlayerCards.15bb07/Stargazing1.968a26.gmnotes
+++ b/objects/AllPlayerCards.15bb07/Stargazing1.968a26.gmnotes
@@ -5,6 +5,7 @@
   "cost": 0,
   "level": 1,
   "traits": "Insight. Augury.",
+  "wildIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -12,6 +13,5 @@
       "id": "06028"
     }
   ],
-  "wildIcons": 1,
   "cycle": "The Dream-Eaters"
 }
diff --git a/objects/AllPlayerCards.15bb07/SummonedHound1.ab4fb3.gmnotes b/objects/AllPlayerCards.15bb07/SummonedHound1.ab4fb3.gmnotes
index a854fec2..4bc60a83 100644
--- a/objects/AllPlayerCards.15bb07/SummonedHound1.ab4fb3.gmnotes
+++ b/objects/AllPlayerCards.15bb07/SummonedHound1.ab4fb3.gmnotes
@@ -6,6 +6,8 @@
   "cost": 3,
   "level": 1,
   "traits": "Ally. Summon.",
+  "intellectIcons": 1,
+  "combatIcons": 1,
   "bonded": [
     {
       "count": 1,
@@ -13,7 +15,5 @@
       "id": "06283"
     }
   ],
-  "intellectIcons": 1,
-  "combatIcons": 1,
   "cycle": "The Dream-Eaters"
 }
diff --git a/objects/AllPlayerCards.15bb07/TheHungeringBlade1.2d94ed.gmnotes b/objects/AllPlayerCards.15bb07/TheHungeringBlade1.2d94ed.gmnotes
index df8f9bb7..f1afcfdd 100644
--- a/objects/AllPlayerCards.15bb07/TheHungeringBlade1.2d94ed.gmnotes
+++ b/objects/AllPlayerCards.15bb07/TheHungeringBlade1.2d94ed.gmnotes
@@ -6,6 +6,7 @@
   "cost": 3,
   "level": 1,
   "traits": "Item. Weapon. Melee. Relic. Cursed.",
+  "combatIcons": 1,
   "bonded": [
     {
       "count": 3,
@@ -13,7 +14,6 @@
       "id": "06019"
     }
   ],
-  "combatIcons": 1,
   "uses": [
     {
       "count": 0,