diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab68428..92c35f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Release Notes
 
+### Version 2.12.0
 - tweak reference sheet to better fit screen in single column layout
+- add warning icon overlay for setup roles on character assignment modal
+- added Heretic and Marionette to list of available characters
+
+---
 
 ### Version 2.11.0
 - new design for character reference sheet
diff --git a/package-lock.json b/package-lock.json
index ac73bc0..f4661ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "townsquare",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "2.11.0",
+      "version": "2.12.0",
       "license": "GPL-3.0",
       "dependencies": {
         "@fortawesome/fontawesome-svg-core": "^1.2.32",
diff --git a/package.json b/package.json
index d4947a9..9e2878c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "townsquare",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "description": "Blood on the Clocktower Town Square",
   "author": "Steffen Baumgart",
   "scripts": {
diff --git a/src/assets/icons/heretic.png b/src/assets/icons/heretic.png
new file mode 100644
index 0000000..382fb34
Binary files /dev/null and b/src/assets/icons/heretic.png differ
diff --git a/src/assets/icons/marionette.png b/src/assets/icons/marionette.png
new file mode 100644
index 0000000..21949f6
Binary files /dev/null and b/src/assets/icons/marionette.png differ
diff --git a/src/components/modals/NightOrderModal.vue b/src/components/modals/NightOrderModal.vue
index 5531756..133856b 100644
--- a/src/components/modals/NightOrderModal.vue
+++ b/src/components/modals/NightOrderModal.vue
@@ -115,7 +115,7 @@ export default {
           {
             id: "evil",
             name: "Minion info",
-            firstNight: 3,
+            firstNight: 4,
             team: "minion",
             players: this.players.filter(p => p.role.team === "minion"),
             firstNightReminder:
@@ -125,7 +125,7 @@ export default {
           {
             id: "evil",
             name: "Demon info & bluffs",
-            firstNight: 6,
+            firstNight: 7,
             team: "demon",
             players: this.players.filter(p => p.role.team === "demon"),
             firstNightReminder:
diff --git a/src/components/modals/ReferenceModal.vue b/src/components/modals/ReferenceModal.vue
index 8720a88..45936ac 100644
--- a/src/components/modals/ReferenceModal.vue
+++ b/src/components/modals/ReferenceModal.vue
@@ -231,11 +231,21 @@ ul {
   }
   ul {
     li {
-      .icon { width: 6vh; }
-      .role { line-height: 100%; }
-      .name { font-size: 100%; }
-      .player { font-size: 100%; }
-      .ability { font-size: 90%; }
+      .icon {
+        width: 6vh;
+      }
+      .role {
+        line-height: 100%;
+      }
+      .name {
+        font-size: 100%;
+      }
+      .player {
+        font-size: 100%;
+      }
+      .ability {
+        font-size: 90%;
+      }
     }
   }
 }
diff --git a/src/components/modals/RolesModal.vue b/src/components/modals/RolesModal.vue
index d056425..27833b0 100644
--- a/src/components/modals/RolesModal.vue
+++ b/src/components/modals/RolesModal.vue
@@ -17,6 +17,7 @@
         @click="role.selected = role.selected ? 0 : 1"
       >
         <Token :role="role" />
+        <font-awesome-icon icon="exclamation-triangle" v-if="role.setup" />
         <div class="buttons" v-if="allowMultiple">
           <font-awesome-icon
             icon="minus-circle"
@@ -177,6 +178,9 @@ ul.tokens {
       .buttons {
         display: flex;
       }
+      .fa-exclamation-triangle {
+        display: block;
+      }
     }
     &.townsfolk {
       box-shadow: 0 0 10px $townsfolk, 0 0 10px #004cff;
@@ -197,6 +201,15 @@ ul.tokens {
       transform: scale(1.2);
       z-index: 10;
     }
+    .fa-exclamation-triangle {
+      position: absolute;
+      color: red;
+      filter: drop-shadow(0 0 3px black) drop-shadow(0 0 3px black);
+      top: 5px;
+      right: -5px;
+      font-size: 150%;
+      display: none;
+    }
     .buttons {
       display: none;
       position: absolute;
diff --git a/src/roles.json b/src/roles.json
index 154cd59..47c26bc 100644
--- a/src/roles.json
+++ b/src/roles.json
@@ -4,7 +4,7 @@
     "name": "Washerwoman",
     "edition": "tb",
     "team": "townsfolk",
-    "firstNight": 23,
+    "firstNight": 25,
     "firstNightReminder": "Show the character token of a Townsfolk in play. Point to two players, one of which is that character.",
     "otherNight": 0,
     "otherNightReminder": "",
@@ -18,7 +18,7 @@
     "name": "Librarian",
     "edition": "tb",
     "team": "townsfolk",
-    "firstNight": 24,
+    "firstNight": 26,
     "firstNightReminder": "Show the character token of an Outsider in play. Point to two players, one of which is that character.",
     "otherNight": 0,
     "otherNightReminder": "",
@@ -32,7 +32,7 @@
     "name": "Investigator",
     "edition": "tb",
     "team": "townsfolk",
-    "firstNight": 25,
+    "firstNight": 27,
     "firstNightReminder": "Show the character token of a Minion in play. Point to two players, one of which is that character.",
     "otherNight": 0,
     "otherNightReminder": "",
@@ -46,7 +46,7 @@
     "name": "Chef",
     "edition": "tb",
     "team": "townsfolk",
-    "firstNight": 26,
+    "firstNight": 28,
     "firstNightReminder": "Show the finger signal (0, 1, 2, \u2026) for the number of pairs of neighbouring evil players.",
     "otherNight": 0,
     "otherNightReminder": "",
@@ -59,9 +59,9 @@
     "name": "Empath",
     "edition": "tb",
     "team": "townsfolk",
-    "firstNight": 27,
+    "firstNight": 29,
     "firstNightReminder": "Show the finger signal (0, 1, 2) for the number of evil alive neighbours of the Empath.",
-    "otherNight": 46,
+    "otherNight": 47,
     "otherNightReminder": "Show the finger signal (0, 1, 2) for the number of evil neighbours.",
     "reminders": [],
     "setup": false,
@@ -72,9 +72,9 @@
     "name": "Fortune Teller",
     "edition": "tb",
     "team": "townsfolk",
-    "firstNight": 28,
+    "firstNight": 30,
     "firstNightReminder": "The Fortune Teller points to two players. Give the head signal (nod yes, shake no) for whether one of those players is the Demon. ",
-    "otherNight": 47,
+    "otherNight": 48,
     "otherNightReminder": "The Fortune Teller points to two players. Show the head signal (nod 'yes', shake 'no') for whether one of those players is the Demon.",
     "reminders": ["Red herring"],
     "setup": false,
@@ -87,7 +87,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 49,
+    "otherNight": 50,
     "otherNightReminder": "If a player was executed today: Show that player\u2019s character token.",
     "reminders": ["Executed"],
     "setup": false,
@@ -100,7 +100,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 11,
+    "otherNight": 12,
     "otherNightReminder": "The previously protected player is no longer protected. The Monk points to a player not themself. Mark that player 'Protected'.",
     "reminders": ["Protected"],
     "setup": false,
@@ -113,7 +113,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 44,
+    "otherNight": 45,
     "otherNightReminder": "If the Ravenkeeper died tonight: The Ravenkeeper points to a player. Show that player\u2019s character token.",
     "reminders": [],
     "setup": false,
@@ -176,9 +176,9 @@
     "name": "Butler",
     "edition": "tb",
     "team": "outsider",
-    "firstNight": 29,
+    "firstNight": 31,
     "firstNightReminder": "The Butler points to a player. Mark that player as 'Master'.",
-    "otherNight": 48,
+    "otherNight": 49,
     "otherNightReminder": "The Butler points to a player. Mark that player as 'Master'.",
     "reminders": ["Master"],
     "setup": false,
@@ -229,9 +229,9 @@
     "name": "Poisoner",
     "edition": "tb",
     "team": "minion",
-    "firstNight": 11,
+    "firstNight": 13,
     "firstNightReminder": "The Poisoner points to a player. That player is poisoned.",
-    "otherNight": 6,
+    "otherNight": 7,
     "otherNightReminder": "The previously poisoned player is no longer poisoned. The Poisoner points to a player. That player is poisoned.",
     "reminders": ["Poisoned"],
     "setup": false,
@@ -242,9 +242,9 @@
     "name": "Spy",
     "edition": "tb",
     "team": "minion",
-    "firstNight": 37,
+    "firstNight": 39,
     "firstNightReminder": "Show the Grimoire to the Spy for as long as they need.",
-    "otherNight": 59,
+    "otherNight": 60,
     "otherNightReminder": "Show the Grimoire to the Spy for as long as they need.",
     "reminders": [],
     "setup": false,
@@ -257,7 +257,7 @@
     "team": "minion",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 17,
+    "otherNight": 18,
     "otherNightReminder": "If the Scarlet Woman became the Demon today: Show the 'You are' card, then the demon token.",
     "reminders": ["Demon"],
     "setup": false,
@@ -283,7 +283,7 @@
     "team": "demon",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 21,
+    "otherNight": 22,
     "otherNightReminder": "The Imp points to a player. That player dies. If the Imp chose themselves: Replace the character of 1 alive minion with a spare Imp token. Show the 'You are' card, then the Imp token.",
     "reminders": ["Dead"],
     "setup": false,
@@ -359,9 +359,9 @@
     "name": "Grandmother",
     "edition": "bmr",
     "team": "townsfolk",
-    "firstNight": 30,
+    "firstNight": 32,
     "firstNightReminder": "Show the marked character token. Point to the marked player.",
-    "otherNight": 42,
+    "otherNight": 43,
     "otherNightReminder": "If the Grandmother\u2019s grandchild was killed by the Demon tonight: The Grandmother dies.",
     "reminders": ["Grandchild"],
     "setup": false,
@@ -372,9 +372,9 @@
     "name": "Sailor",
     "edition": "bmr",
     "team": "townsfolk",
-    "firstNight": 7,
+    "firstNight": 8,
     "firstNightReminder": "The Sailor points to a living player. Either the Sailor, or the chosen player, is drunk.",
-    "otherNight": 3,
+    "otherNight": 4,
     "otherNightReminder": "The previously drunk player is no longer drunk. The Sailor points to a living player. Either the Sailor, or the chosen player, is drunk.",
     "reminders": ["Drunk"],
     "setup": false,
@@ -385,9 +385,9 @@
     "name": "Chambermaid",
     "edition": "bmr",
     "team": "townsfolk",
-    "firstNight": 40,
+    "firstNight": 42,
     "firstNightReminder": "The Chambermaid points to two players. Show the number signal (0, 1, 2, \u2026) for how many of those players wake tonight for their ability.",
-    "otherNight": 62,
+    "otherNight": 63,
     "otherNightReminder": "The Chambermaid points to two players. Show the number signal (0, 1, 2, \u2026) for how many of those players wake tonight for their ability.",
     "reminders": [],
     "setup": false,
@@ -400,7 +400,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 19,
+    "otherNight": 20,
     "otherNightReminder": "The Exorcist points to a player, different from the previous night. If that player is the Demon: Wake the Demon. Show the Exorcist token. Point to the Exorcist. The Demon does not act tonight.",
     "reminders": ["Chosen"],
     "setup": false,
@@ -413,7 +413,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 7,
+    "otherNight": 8,
     "otherNightReminder": "The previously protected and drunk players lose those markers. The Innkeeper points to two players. Those players are protected. One is drunk.",
     "reminders": ["Protected",
         "Drunk"],
@@ -427,7 +427,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 9,
+    "otherNight": 10,
     "otherNightReminder": "The Gambler points to a player, and a character on their sheet. If incorrect, the Gambler dies.",
     "reminders": ["Dead"],
     "setup": false,
@@ -440,7 +440,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 39,
+    "otherNight": 40,
     "otherNightReminder": "If the Gossip\u2019s public statement was true: Choose a player not protected from dying tonight. That player dies.",
     "reminders": ["Dead"],
     "setup": false,
@@ -451,9 +451,9 @@
     "name": "Courtier",
     "edition": "bmr",
     "team": "townsfolk",
-    "firstNight": 13,
+    "firstNight": 15,
     "firstNightReminder": "The Courtier either shows a 'no' head signal, or points to a character on the sheet. If the Courtier used their ability: If that character is in play, that player is drunk.",
-    "otherNight": 8,
+    "otherNight": 9,
     "otherNightReminder": "Reduce the remaining number of days the marked player is poisoned. If the Courtier has not yet used their ability: The Courtier either shows a 'no' head signal, or points to a character on the sheet. If the Courtier used their ability: If that character is in play, that player is drunk.",
     "reminders": ["Drunk 3",
         "Drunk 2",
@@ -469,7 +469,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 38,
+    "otherNight": 39,
     "otherNightReminder": "If the Professor has not used their ability: The Professor either shakes their head no, or points to a player. If that player is a Townsfolk, they are now alive.",
     "reminders": ["Alive",
         "No ability"],
@@ -535,7 +535,7 @@
     "team": "outsider",
     "firstNight": 0,
     "firstNightReminder": "The Tinker might die.",
-    "otherNight": 40,
+    "otherNight": 41,
     "otherNightReminder": "The Tinker might die.",
     "reminders": ["Dead"],
     "setup": false,
@@ -548,7 +548,7 @@
     "team": "outsider",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 41,
+    "otherNight": 42,
     "otherNightReminder": "If the Moonchild used their ability to target a player today: If that player is good, they die.",
     "reminders": ["Dead"],
     "setup": false,
@@ -572,9 +572,9 @@
     "name": "Lunatic",
     "edition": "bmr",
     "team": "outsider",
-    "firstNight": 5,
+    "firstNight": 6,
     "firstNightReminder": "If 7 or more players: Show the Lunatic a number of arbitrary 'Minions', players equal to the number of Minions in play. Show 3 character tokens of arbitrary good characters. If the token received by the Lunatic is a Demon that would wake tonight: Allow the Lunatic to do the Demon actions. Place their 'attack' markers. Wake the Demon. Show the Demon\u2019s real character token. Show them the Lunatic player. If the Lunatic attacked players: Show the real demon each marked player. Remove any Lunatic 'attack' markers.",
-    "otherNight": 18,
+    "otherNight": 19,
     "otherNightReminder": "Allow the Lunatic to do the actions of the Demon. Place their 'attack' markers. If the Lunatic selected players: Wake the Demon. Show the 'attack' marker, then point to each marked player. Remove any Lunatic 'attack' markers.",
     "reminders": ["Attack 1",
         "Attack 2",
@@ -587,9 +587,9 @@
     "name": "Godfather",
     "edition": "bmr",
     "team": "minion",
-    "firstNight": 15,
+    "firstNight": 17,
     "firstNightReminder": "Show each of the Outsider tokens in play.",
-    "otherNight": 33,
+    "otherNight": 34,
     "otherNightReminder": "If an Outsider died today: The Godfather points to a player. That player dies.",
     "reminders": ["Died today",
         "Dead"],
@@ -601,9 +601,9 @@
     "name": "Devil's Advocate",
     "edition": "bmr",
     "team": "minion",
-    "firstNight": 16,
+    "firstNight": 18,
     "firstNightReminder": "The Devil\u2019s Advocate points to a living player. That player survives execution tomorrow.",
-    "otherNight": 12,
+    "otherNight": 13,
     "otherNightReminder": "The Devil\u2019s Advocate points to a living player, different from the previous night. That player survives execution tomorrow.",
     "reminders": ["Survives execution"],
     "setup": false,
@@ -616,7 +616,7 @@
     "team": "minion",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 32,
+    "otherNight": 33,
     "otherNightReminder": "If the Assassin has not yet used their ability: The Assassin either shows the 'no' head signal, or points to a player. That player dies.",
     "reminders": ["Dead",
         "No ability"],
@@ -643,7 +643,7 @@
     "team": "demon",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 22,
+    "otherNight": 23,
     "otherNightReminder": "If no-one died during the day: The Zombuul points to a player. That player dies.",
     "reminders": ["Died today",
         "Dead"],
@@ -655,9 +655,9 @@
     "name": "Pukka",
     "edition": "bmr",
     "team": "demon",
-    "firstNight": 21,
+    "firstNight": 23,
     "firstNightReminder": "The Pukka points to a player. That player is poisoned.",
-    "otherNight": 23,
+    "otherNight": 24,
     "otherNightReminder": "The poisoned player dies. The Pukka points to a player. That player is poisoned.",
     "reminders": ["Poisoned",
         "Dead"],
@@ -671,7 +671,7 @@
     "team": "demon",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 24,
+    "otherNight": 25,
     "otherNightReminder": "One player that the Shabaloth chose the previous night might be resurrected. The Shabaloth points to two players. Those players die.",
     "reminders": ["Dead",
         "Alive"],
@@ -685,7 +685,7 @@
     "team": "demon",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 25,
+    "otherNight": 26,
     "otherNightReminder": "If the Po chose no-one the previous night: The Po points to three players. Otherwise: The Po either shows the 'no' head signal , or points to a player. Chosen players die",
     "reminders": ["Dead",
         "3 attacks"],
@@ -763,7 +763,7 @@
     "name": "Clockmaker",
     "edition": "snv",
     "team": "townsfolk",
-    "firstNight": 31,
+    "firstNight": 33,
     "firstNightReminder": "Show the hand signal for the number (1, 2, 3, etc.) of places from Demon to closest Minion.",
     "otherNight": 0,
     "otherNightReminder": "",
@@ -776,9 +776,9 @@
     "name": "Dreamer",
     "edition": "snv",
     "team": "townsfolk",
-    "firstNight": 32,
+    "firstNight": 34,
     "firstNightReminder": "The Dreamer points to a player. Show 1 good and 1 evil character token; one of these is correct.",
-    "otherNight": 50,
+    "otherNight": 51,
     "otherNightReminder": "The Dreamer points to a player. Show 1 good and 1 evil character token; one of these is correct.",
     "reminders": [],
     "setup": false,
@@ -789,9 +789,9 @@
     "name": "Snake Charmer",
     "edition": "snv",
     "team": "townsfolk",
-    "firstNight": 14,
+    "firstNight": 16,
     "firstNightReminder": "The Snake Charmer points to a player. If that player is the Demon: swap the Demon and Snake Charmer character and alignments. Wake each player to inform them of their new role and alignment. The new Snake Charmer is poisoned.",
-    "otherNight": 10,
+    "otherNight": 11,
     "otherNightReminder": "The Snake Charmer points to a player. If that player is the Demon: swap the Demon and Snake Charmer character and alignments. Wake each player to inform them of their new role and alignment. The new Snake Charmer is poisoned.",
     "reminders": ["Poisoned"],
     "setup": false,
@@ -802,9 +802,9 @@
     "name": "Mathematician",
     "edition": "snv",
     "team": "townsfolk",
-    "firstNight": 39,
+    "firstNight": 41,
     "firstNightReminder": "Show the hand signal for the number (0, 1, 2, etc.) of players whose ability malfunctioned due to other abilities.",
-    "otherNight": 61,
+    "otherNight": 62,
     "otherNightReminder": "Show the hand signal for the number (0, 1, 2, etc.) of players whose ability malfunctioned due to other abilities.",
     "reminders": ["Abnormal"],
     "setup": false,
@@ -817,7 +817,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "Place the 'Demon not voted' marker.",
-    "otherNight": 51,
+    "otherNight": 52,
     "otherNightReminder": "Nod 'yes' or shake head 'no' for whether the Demon voted today. Place the 'Demon not voted' marker (remove 'Demon voted', if any).",
     "reminders": ["Demon voted",
         "Demon not voted"],
@@ -831,7 +831,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "Place the 'Minions not nominated' marker.",
-    "otherNight": 52,
+    "otherNight": 53,
     "otherNightReminder": "Nod 'yes' or shake head 'no' for whether a Minion nominated today. Place the 'Minion not nominated' marker (remove 'Minion nominated', if any).",
     "reminders": ["Minions not nominated",
         "Minion nominated"],
@@ -845,7 +845,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 53,
+    "otherNight": 54,
     "otherNightReminder": "Show the hand signal for the number (0, 1, 2, etc.) of dead evil players.",
     "reminders": [],
     "setup": false,
@@ -869,9 +869,9 @@
     "name": "Seamstress",
     "edition": "snv",
     "team": "townsfolk",
-    "firstNight": 33,
+    "firstNight": 35,
     "firstNightReminder": "The Seamstress either shows a 'no' head signal, or points to two other players. If the Seamstress chose players , nod 'yes' or shake 'no' for whether they are of same alignment.",
-    "otherNight": 54,
+    "otherNight": 55,
     "otherNightReminder": "If the Seamstress has not yet used their ability: the Seamstress either shows a 'no' head signal, or points to two other players. If the Seamstress chose players , nod 'yes' or shake 'no' for whether they are of same alignment.",
     "reminders": ["No ability"],
     "setup": false,
@@ -882,9 +882,9 @@
     "name": "Philosopher",
     "edition": "snv",
     "team": "townsfolk",
-    "firstNight": 1,
+    "firstNight": 2,
     "firstNightReminder": "The Philosopher either shows a 'no' head signal, or points to a good character on their sheet. If they chose a character: Swap the out-of-play character token with the Philosopher token. Or, if the character is in play, place the drunk marker by that player and the Not the Philosopher token by the Philosopher.",
-    "otherNight": 1,
+    "otherNight": 2,
     "otherNightReminder": "If the Philosopher has not used their ability: the Philosopher either shows a 'no' head signal, or points to a good character on their sheet. If they chose a character: Swap the out-of-play character token with the Philosopher token. Or, if the character is in play, place the drunk marker by that player and the Not the Philosopher token by the Philosopher.",
     "reminders": ["Drunk",
         "Is the Philosopher"],
@@ -911,7 +911,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 55,
+    "otherNight": 56,
     "otherNightReminder": "If today was the Juggler\u2019s first day: Show the hand signal for the number (0, 1, 2, etc.) of 'Correct' markers. Remove markers.",
     "reminders": ["Correct"],
     "setup": false,
@@ -924,7 +924,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 37,
+    "otherNight": 38,
     "otherNightReminder": "If the Sage was killed by a Demon: Point to two players, one of which is that Demon.",
     "reminders": [],
     "setup": false,
@@ -950,7 +950,7 @@
     "team": "outsider",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 36,
+    "otherNight": 37,
     "otherNightReminder": "Choose a player that is drunk.",
     "reminders": ["Drunk"],
     "setup": false,
@@ -963,7 +963,7 @@
     "team": "outsider",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 35,
+    "otherNight": 36,
     "otherNightReminder": "If the Barber died today: Wake the Demon. Show the 'This character selected you' card, then Barber token. The Demon either shows a 'no' head signal, or points to 2 players. If they chose players: Swap the character tokens. Wake each player. Show 'You are', then their new character token.",
     "reminders": ["Haircuts tonight"],
     "setup": false,
@@ -987,7 +987,7 @@
     "name": "Evil Twin",
     "edition": "snv",
     "team": "minion",
-    "firstNight": 17,
+    "firstNight": 19,
     "firstNightReminder": "Wake the Evil Twin and their twin. Confirm that they have acknowledged each other. Point to the Evil Twin. Show their Evil Twin token to the twin player. Point to the twin. Show their character token to the Evil Twin player.",
     "otherNight": 0,
     "otherNightReminder": "",
@@ -1000,9 +1000,9 @@
     "name": "Witch",
     "edition": "snv",
     "team": "minion",
-    "firstNight": 18,
+    "firstNight": 20,
     "firstNightReminder": "The Witch points to a player. If that player nominates tomorrow they die immediately.",
-    "otherNight": 13,
+    "otherNight": 14,
     "otherNightReminder": "If there are 4 or more players alive: The Witch points to a player. If that player nominates tomorrow they die immediately.",
     "reminders": ["Cursed"],
     "setup": false,
@@ -1013,9 +1013,9 @@
     "name": "Cerenovus",
     "edition": "snv",
     "team": "minion",
-    "firstNight": 19,
+    "firstNight": 21,
     "firstNightReminder": "The Cerenovus points to a player, then to a character on their sheet. Wake that player. Show the 'This character selected you' card, then the Cerenovus token. Show the selected character token. If the player is not mad about being that character tomorrow, they can be executed.",
-    "otherNight": 14,
+    "otherNight": 15,
     "otherNightReminder": "The Cerenovus points to a player, then to a character on their sheet. Wake that player. Show the 'This character selected you' card, then the Cerenovus token. Show the selected character token. If the player is not mad about being that character tomorrow, they can be executed.",
     "reminders": ["Mad"],
     "setup": false,
@@ -1028,7 +1028,7 @@
     "team": "minion",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 15,
+    "otherNight": 16,
     "otherNightReminder": "The Pit-Hag points to a player and a character on the sheet. If this character is not in play, wake that player and show them the 'You are' card and the relevant character token. If the character is in play, nothing happens.",
     "reminders": [],
     "setup": false,
@@ -1041,7 +1041,7 @@
     "team": "demon",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 26,
+    "otherNight": 27,
     "otherNightReminder": "The Fang Gu points to a player. That player dies. Or, if that player was an Outsider and there are no other Fang Gu in play: The Fang Gu dies instead of the chosen player. The chosen player is now an evil Fang Gu. Wake the new Fang Gu. Show the 'You are' card, then the Fang Gu token. Show the 'You are' card, then the thumb-down 'evil' hand sign.",
     "reminders": ["Dead"],
     "setup": true,
@@ -1054,7 +1054,7 @@
     "team": "demon",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 29,
+    "otherNight": 30,
     "otherNightReminder": "The Vigormortis points to a player. That player dies. If a Minion, they keep their ability and one of their Townsfolk neighbours is poisoned.",
     "reminders": ["Dead",
         "Has ability",
@@ -1069,7 +1069,7 @@
     "team": "demon",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 27,
+    "otherNight": 28,
     "otherNightReminder": "The No Dashii points to a player. That player dies.",
     "reminders": ["Dead",
         "Poisoned"],
@@ -1083,7 +1083,7 @@
     "team": "demon",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 28,
+    "otherNight": 29,
     "otherNightReminder": "The Vortox points to a player. That player dies.",
     "reminders": ["Dead"],
     "setup": false,
@@ -1161,9 +1161,9 @@
     "name": "Bounty Hunter",
     "edition": "",
     "team": "townsfolk",
-    "firstNight": 35,
+    "firstNight": 37,
     "firstNightReminder": "Point to 1 evil player. Wake the townsfolk who is evil and show them the 'You are' card and the thumbs down evil sign.",
-    "otherNight": 57,
+    "otherNight": 58,
     "otherNightReminder": "If the known evil player has died, point to another evil player. ",
     "reminders": ["Known"],
     "setup": true,
@@ -1174,7 +1174,7 @@
     "name": "Pixie",
     "edition": "",
     "team": "townsfolk",
-    "firstNight": 22,
+    "firstNight": 24,
     "firstNightReminder": "Show the Pixie 1 in-play Townsfolk character token.",
     "otherNight": 0,
     "otherNightReminder": "If the Pixie has been mad they were the relevant character and that player has died, treat the Pixie as if they have the relevant character ability.",
@@ -1188,9 +1188,9 @@
     "name": "General",
     "edition": "",
     "team": "townsfolk",
-    "firstNight": 38,
+    "firstNight": 40,
     "firstNightReminder": "Show the General thumbs up for good winning, thumbs down for evil winning or thumb to the side for neither.",
-    "otherNight": 60,
+    "otherNight": 61,
     "otherNightReminder": "Show the General thumbs up for good winning, thumbs down for evil winning or thumb to the side for neither.",
     "reminders": [],
     "setup": false,
@@ -1201,9 +1201,9 @@
     "name": "Preacher",
     "edition": "",
     "team": "townsfolk",
-    "firstNight": 9,
+    "firstNight": 11,
     "firstNightReminder": "The Preacher chooses a player. If a Minion is chosen, wake the Minion and show the 'This character selected you' card and then the Preacher token.",
-    "otherNight": 5,
+    "otherNight": 6,
     "otherNightReminder": "The Preacher chooses a player. If a Minion is chosen, wake the Minion and show the 'This character selected you' card and then the Preacher token.",
     "reminders": ["At a sermon"],
     "setup": false,
@@ -1214,9 +1214,9 @@
     "name": "Balloonist",
     "edition": "",
     "team": "townsfolk",
-    "firstNight": 34,
+    "firstNight": 36,
     "firstNightReminder": "Choose a character type. Point to a player whose character is of that type. Place the Balloonist's Seen reminder next to that character.",
-    "otherNight": 56,
+    "otherNight": 57,
     "otherNightReminder": "Choose a character type that does not yet have a Seen reminder next to a character of that type. Point to a player whose character is of that type, if there are any. Place the Balloonist's Seen reminder next to that character.",
     "reminders": ["Seen Townsfolk",
         "Seen Outsider",
@@ -1231,9 +1231,9 @@
     "name": "Cult Leader",
     "edition": "",
     "team": "townsfolk",
-    "firstNight": 36,
+    "firstNight": 38,
     "firstNightReminder": "If the cult leader changed alignment, show them the thumbs up good signal of the thumbs down evil signal accordingly.",
-    "otherNight": 58,
+    "otherNight": 59,
     "otherNightReminder": "If the cult leader changed alignment, show them the thumbs up good signal of the thumbs down evil signal accordingly.",
     "reminders": [],
     "setup": false,
@@ -1246,7 +1246,7 @@
     "team": "townsfolk",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 20,
+    "otherNight": 21,
     "otherNightReminder": "The Lycanthrope points to a living player: if good, they die and no one else can die tonight.",
     "reminders": ["Dead"],
     "setup": false,
@@ -1257,9 +1257,9 @@
     "name": "Amnesiac",
     "edition": "",
     "team": "townsfolk",
-    "firstNight": 8,
+    "firstNight": 10,
     "firstNightReminder": "Decide the Amnesiac's entire ability. If the Amnesiac's ability causes them to wake tonight: Wake the Amnesiac and run their ability.",
-    "otherNight": 4,
+    "otherNight": 5,
     "otherNightReminder": "If the Amnesiac's ability causes them to wake tonight: Wake the Amnesiac and run their ability.",
     "reminders": ["?"],
     "setup": false,
@@ -1283,9 +1283,9 @@
     "name": "Poppy Grower",
     "edition": "",
     "team": "townsfolk",
-    "firstNight": 2,
+    "firstNight": 3,
     "firstNightReminder": "Do not inform the Demon/Minions who each other are",
-    "otherNight": 2,
+    "otherNight": 3,
     "otherNightReminder": "If the Poppy Grower has died, show the Minions/Demon who each other are.",
     "reminders": ["Evil wakes"],
     "setup": false,
@@ -1310,7 +1310,7 @@
     "name": "Snitch",
     "edition": "",
     "team": "outsider",
-    "firstNight": 4,
+    "firstNight": 5,
     "firstNightReminder": "After Minion info wake each Minion and show them three not-in-play character tokens. These may be the same or different to each other and the ones shown to the Demon.",
     "otherNight": 0,
     "otherNightReminder": "",
@@ -1325,12 +1325,25 @@
     "team": "outsider",
     "firstNight": 0,
     "firstNightReminder": "If a good living neighbour is drunk or poisoned, the Acrobat player dies.",
-    "otherNight": 34,
+    "otherNight": 35,
     "otherNightReminder": "If a good living neighbour is drunk or poisoned, the Acrobat player dies.",
     "reminders": ["Dead"],
     "setup": false,
     "ability": "Each night*, if either good living neighbour is drunk or poisoned, you die."
   },
+  {
+    "id": "heretic",
+    "name": "Heretic",
+    "edition": "",
+    "team": "outsider",
+    "firstNight": 0,
+    "firstNightReminder": "",
+    "otherNight": 0,
+    "otherNightReminder": "",
+    "reminders": [],
+    "setup": false,
+    "ability": "Whoever wins, loses & whoever loses, wins, even if you are dead."
+  },
   {
     "id": "politician",
     "name": "Politician",
@@ -1349,7 +1362,7 @@
     "name": "Widow",
     "edition": "",
     "team": "minion",
-    "firstNight": 12,
+    "firstNight": 14,
     "firstNightReminder": "Show the Grimoire to the Widow for as long as they need. The Widow points to a player. That player is poisoned. Wake a good player. Show the 'These characters are in play' card, then the Widow character token.",
     "otherNight": 0,
     "otherNightReminder": "",
@@ -1376,23 +1389,37 @@
     "name": "Mephit",
     "edition": "",
     "team": "minion",
-    "firstNight": 20,
+    "firstNight": 22,
     "firstNightReminder": "Show the Mephit their secret word.",
-    "otherNight": 16,
+    "otherNight": 17,
     "otherNightReminder": "Wake the 1st good player that said the Mephit's secret word and show them the 'You are' card and the thumbs down evil signal.",
     "reminders": ["Turns evil",
         "No ability"],
     "setup": false,
     "ability": "You start knowing a secret word. The 1st good player to say this word becomes evil that night."
   },
+  {
+    "id": "marionette",
+    "name": "Marionette",
+    "edition": "",
+    "team": "minion",
+    "firstNight": 9,
+    "firstNightReminder": "Select one of the good players next to the Demon and place the Is the Marionette reminder token. Wake the Demon and show them the Marionette.",
+    "otherNight": 0,
+    "otherNightReminder": "",
+    "reminders": [],
+    "remindersGlobal": ["Is the Marionette"],
+    "setup": true,
+    "ability": "You think you are a good character. You are poisoned & the Demon knows who you are. [You neighbour the Demon]"
+  },
   {
     "id": "lilmonsta",
     "name": "Lil Monsta",
     "edition": "",
     "team": "demon",
-    "firstNight": 10,
+    "firstNight": 12,
     "firstNightReminder": "Wake all Minions together, allow them to vote by pointing at who they want to babysit Lil' Monsta.",
-    "otherNight": 31,
+    "otherNight": 32,
     "otherNightReminder": "Wake all Minions together, allow them to vote by pointing at who they want to babysit Lil' Monsta. Choose a player, that player dies.",
     "reminders": [],
     "remindersGlobal": ["Is the Demon",
@@ -1407,7 +1434,7 @@
     "team": "demon",
     "firstNight": 0,
     "firstNightReminder": "",
-    "otherNight": 30,
+    "otherNight": 31,
     "otherNightReminder": "Choose a player, that player dies.",
     "reminders": ["Dead",
         "About to die"],
@@ -1419,7 +1446,7 @@
     "name": "Leviathan",
     "edition": "",
     "team": "demon",
-    "firstNight": 42,
+    "firstNight": 44,
     "firstNightReminder": "Place the Leviathan 'Day 1' marker. Announce 'The Leviathan is in play; this is Day 1.'",
     "otherNight": 0,
     "otherNightReminder": "Place the next Leviathan 'Day n' marker, where 'n' is the next day number. Announce 'The Leviathan is in play; this is Day n.'.",
@@ -1432,4 +1459,5 @@
     "setup": false,
     "ability": "If more than 1 good player is executed, you win. All players know you are in play. After day 5, evil wins."
   }
-]
\ No newline at end of file
+]
+