diff --git a/CHANGELOG.md b/CHANGELOG.md
index e714523..371aa6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release Notes
 
 ### Version 2.15.3
-- add Huntsman/Damsel, Noble, Al-Hadikhia, Golem, Fearmonger, Puzzlemaster, Alchemist, Engineer to list of available characters
+- add Huntsman/Damsel, Noble, Al-Hadikhia, Golem, Fearmonger, Puzzlemaster, Alchemist, Engineer, Riot to list of available characters
 
 ### Version 2.15.2
 - added mobile web application support
diff --git a/src/assets/icons/riot.png b/src/assets/icons/riot.png
new file mode 100644
index 0000000..7cdf3db
Binary files /dev/null and b/src/assets/icons/riot.png differ
diff --git a/src/hatred.json b/src/hatred.json
index 632362e..7656a3f 100644
--- a/src/hatred.json
+++ b/src/hatred.json
@@ -17,15 +17,6 @@
       }
     ]
   },
-  {
-    "id": "Mutant",
-    "hatred": [
-      {
-        "id": "Undertaker",
-        "reason": "If the Mutant causes a second execution, the Undertaker learns either one or both executed characters (Storyteller's choice)."
-      }
-    ]
-  },
   {
     "id": "Lunatic",
     "hatred": [
@@ -58,10 +49,6 @@
       {
         "id": "Goblin",
         "reason": "The Cerenovus may choose to make a player mad that they are the Goblin."
-      },
-      {
-        "id": "Undertaker",
-        "reason": "If the Cerenovus causes a second execution, the Undertaker learns either one or both executed characters (Storyteller's choice)."
       }
     ]
   },
@@ -237,12 +224,129 @@
         "id": "Balloonist",
         "reason": "If the Marionette thinks that they are the Balloonist, +1 Outsider was added."
       },
+      {
+        "id": "Damsel",
+        "reason": "The Marionette does not learn that a Damsel is in play."
+      },
       {
         "id": "Huntsman",
         "reason": "If the Marionette thinks that they are the Huntsman, the Damsel was added."
       }
     ]
   },
+  {
+    "id": "Riot",
+    "jinx": [
+      {
+        "id": "Engineer",
+        "reason": "Riot and the Engineer can not both be in play at the start of the game. \nIf the Engineer creates Riot, the evil players become Riot."
+      },
+      {
+        "id": "Golem",
+        "reason": "If The Golem nominates Riot, the Riot player does not die."
+      },
+      {
+        "id": "Snitch",
+        "reason": "If the Snitch is in play, each Riot player gets an extra 3 bluffs."
+      },
+      {
+        "id": "Saint",
+        "reason": "If a good player nominates and kills the Saint, the Saint's team loses."
+      },
+      {
+        "id": "Butler",
+        "reason": "The Butler can not nominate their master."
+      },
+      {
+        "id": "Pit-Hag",
+        "reason": "If the Pit-Hag creates Riot, all evil players become Riot. \nIf the Pit-Hag creates Riot after day 3, the game continues for one more day."
+      },
+      {
+        "id": "Mayor",
+        "reason": "If the 3rd day begins with just three players alive, the players may choose (as a group) not to nominate at all. If so (and a Mayor is alive) then the Mayor's team wins."
+      },
+      {
+        "id": "Monk",
+        "reason": "If a Riot player nominates and kills the Monk-protected-player, the Monk-protected-player does not die."
+      },
+      {
+        "id": "Farmer",
+        "reason": "If a Riot player nominates and kills a Farmer, the Farmer uses their ability tonight."
+      },
+      {
+        "id": "Innkeeper",
+        "reason": "If a Riot player nominates an Innkeeper-protected-player, the Innkeeper-protected-player does not die."
+      },
+      {
+        "id": "Sage",
+        "reason": "If a Riot player nominates and kills a Sage, the Sage uses their ability tonight."
+      },
+      {
+        "id": "Ravenkeeper",
+        "reason": "If a Riot player nominates and kills the Ravenkeeper, the Ravenkeeper uses their ability tonight."
+      },
+      {
+        "id": "Soldier",
+        "reason": "If a Riot player nominates the Soldier, the Soldier does not die."
+      },
+      {
+        "id": "Grandmother",
+        "reason": "If a Riot player nominates and kills the Grandchild, the Grandmother dies too."
+      },
+      {
+        "id": "King",
+        "reason": "If a Riot player nominates and kills the King and the Choirboy is alive, the Choirboy uses their ability tonight."
+      },
+      {
+        "id": "Exorcist",
+        "reason": "Only 1 jinxed character can be in play."
+      },
+      {
+        "id": "Minstrel",
+        "reason": "Only 1 jinxed character can be in play."
+      },
+      {
+        "id": "Flowergirl",
+        "reason": "Only 1 jinxed character can be in play."
+      },
+      {
+        "id": "Undertaker",
+        "reason": "Players that die by nomination register as being executed to the Undertaker."
+      },
+      {
+        "id": "Cannibal",
+        "reason": "Players that die by nomination register as being executed to the Cannibal."
+      },
+      {
+        "id": "Pacifist",
+        "reason": "Players that die by nomination register as being executed to the Pacifist."
+      },
+      {
+        "id": "Devil's Advocate",
+        "reason": "Players that die by nomination register as being executed to the Devil's Advocate."
+      },
+      {
+        "id": "Investigator",
+        "reason": "Riot registers as a Minion to the Investigator."
+      },
+      {
+        "id": "Clockmaker",
+        "reason": "Riot registers as a Minion to the Clockmaker."
+      },
+      {
+        "id": "Town Crier",
+        "reason": "Riot registers as a Minion to the Town Crier."
+      },
+      {
+        "id": "Damsel",
+        "reason": "Riot registers as a Minion to the Damsel."
+      },
+      {
+        "id": "Preacher",
+        "reason": "Riot registers as a Minion to the Preacher."
+      }
+    ]
+  },
   {
     "id": "Lleech",
     "hatred": [
diff --git a/src/roles.json b/src/roles.json
index 82f3612..e4009eb 100644
--- a/src/roles.json
+++ b/src/roles.json
@@ -1674,6 +1674,19 @@
     "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."
   },
+  {
+    "id": "riot",
+    "name": "Riot",
+    "edition": "",
+    "team": "demon",
+    "firstNight": 0,
+    "firstNightReminder": "",
+    "otherNight": 0,
+    "otherNightReminder": "",
+    "reminders": [],
+    "setup": true,
+    "ability": "Nominees die, but may nominate again immediately (on day 3, they must). After day 3, evil wins. [All Minions are Riot]"
+  },
   {
     "id": "gangster",
     "name": "Gangster",