diff --git a/CHANGELOG.md b/CHANGELOG.md
index c38e6a7..716992a 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, Riot, Psychopath, Atheist to list of available characters
+- add Huntsman/Damsel, Noble, Al-Hadikhia, Golem, Fearmonger, Puzzlemaster, Alchemist, Engineer, Riot, Psychopath, Atheist, Nightwatchman to list of available characters
 
 ### Version 2.15.2
 - added mobile web application support
diff --git a/README.md b/README.md
index d31a7f7..c082213 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ If you want to learn more about how to use the app as a player, [JayBotC](https:
 
 ### Custom Script Support
 
-Any custom script generated by the official [Script Tool](https://bloodontheclocktower.com/script) is supported out of
+Any custom script generated by the official [Script Tool](https://script.bloodontheclocktower.com/) is supported out of
 the box and you only need to upload it to get the selected set of characters into your grimoire. If you want to customize
 your script further, there is an additional `"_meta"` object that you can add to the script like you would add a normal
 character:
diff --git a/src/assets/icons/nightwatchman.png b/src/assets/icons/nightwatchman.png
new file mode 100644
index 0000000..7099d42
Binary files /dev/null and b/src/assets/icons/nightwatchman.png differ
diff --git a/src/roles.json b/src/roles.json
index 3901318..2ebea61 100644
--- a/src/roles.json
+++ b/src/roles.json
@@ -242,9 +242,9 @@
     "name": "Spy",
     "edition": "tb",
     "team": "minion",
-    "firstNight": 47,
+    "firstNight": 48,
     "firstNightReminder": "Show the Grimoire to the Spy for as long as they need.",
-    "otherNight": 67,
+    "otherNight": 68,
     "otherNightReminder": "Show the Grimoire to the Spy for as long as they need.",
     "reminders": [],
     "setup": false,
@@ -385,9 +385,9 @@
     "name": "Chambermaid",
     "edition": "bmr",
     "team": "townsfolk",
-    "firstNight": 49,
+    "firstNight": 50,
     "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": 69,
+    "otherNight": 70,
     "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,
@@ -802,9 +802,9 @@
     "name": "Mathematician",
     "edition": "snv",
     "team": "townsfolk",
-    "firstNight": 50,
+    "firstNight": 51,
     "firstNightReminder": "Show the hand signal for the number (0, 1, 2, etc.) of players whose ability malfunctioned due to other abilities.",
-    "otherNight": 70,
+    "otherNight": 71,
     "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,
@@ -1202,9 +1202,9 @@
     "name": "General",
     "edition": "",
     "team": "townsfolk",
-    "firstNight": 48,
+    "firstNight": 49,
     "firstNightReminder": "Show the General thumbs up for good winning, thumbs down for evil winning or thumb to the side for neither.",
-    "otherNight": 68,
+    "otherNight": 69,
     "otherNightReminder": "Show the General thumbs up for good winning, thumbs down for evil winning or thumb to the side for neither.",
     "reminders": [],
     "setup": false,
@@ -1258,9 +1258,9 @@
     "name": "Cult Leader",
     "edition": "",
     "team": "townsfolk",
-    "firstNight": 46,
+    "firstNight": 47,
     "firstNightReminder": "If the cult leader changed alignment, show them the thumbs up good signal of the thumbs down evil signal accordingly.",
-    "otherNight": 66,
+    "otherNight": 67,
     "otherNightReminder": "If the cult leader changed alignment, show them the thumbs up good signal of the thumbs down evil signal accordingly.",
     "reminders": [],
     "setup": false,
@@ -1292,6 +1292,19 @@
     "setup": false,
     "ability": "You do not know what your ability is. Each day, privately guess what it is: you learn how accurate you are."
   },
+  {
+    "id": "nightwatchman",
+    "name": "Nightwatchman",
+    "edition": "",
+    "team": "townsfolk",
+    "firstNight": 46,
+    "firstNightReminder": "The Nightwatchman may point to a player. Wake that player, show the 'This character selected you' card and the Nightwatchman token, then point to the Nightwatchman player.",
+    "otherNight": 66,
+    "otherNightReminder": "The Nightwatchman may point to a player. Wake that player, show the 'This character selected you' card and the Nightwatchman token, then point to the Nightwatchman player.",
+    "reminders": ["No ability"],
+    "setup": false,
+    "ability": "Once per game, at night, choose a player: they learn who you are."
+  },
   {
     "id": "engineer",
     "name": "Engineer",
@@ -1687,9 +1700,9 @@
     "name": "Leviathan",
     "edition": "",
     "team": "demon",
-    "firstNight": 52,
+    "firstNight": 53,
     "firstNightReminder": "Place the Leviathan 'Day 1' marker. Announce 'The Leviathan is in play; this is Day 1.'",
-    "otherNight": 72,
+    "otherNight": 73,
     "otherNightReminder": "Change the Leviathan Day reminder for the next day.",
     "reminders": ["Day 1",
         "Day 2",