diff --git a/res/ATTRACT.CONF b/res/ATTRACT.CONF
index fc32c50b3..284cd21a3 100644
--- a/res/ATTRACT.CONF
+++ b/res/ATTRACT.CONF
@@ -286,6 +286,7 @@ ACTIONAB4.CONF=2
 LASER.BOUNCE=0
 ACTIONCD5.CONF=2
 NIGHT.STALKER=0
+NIGHTMARE=0
 
 [eof]
 
diff --git a/res/ATTRACT/NIGHTMARE b/res/ATTRACT/NIGHTMARE
index be8afb8cf..7f5254073 100644
--- a/res/ATTRACT/NIGHTMARE
+++ b/res/ATTRACT/NIGHTMARE
@@ -4,5 +4,6 @@
 #
 
 ACTION.HGR/NIGHTMARE=A
+NIGHTMARE=0
 
 [eof]
diff --git a/res/DEMO/NIGHTMARE b/res/DEMO/NIGHTMARE
new file mode 100755
index 000000000..abd719654
Binary files /dev/null and b/res/DEMO/NIGHTMARE differ
diff --git a/res/DEMO/NIGHTMARE.1 b/res/DEMO/NIGHTMARE.1
new file mode 100755
index 000000000..25572b62b
Binary files /dev/null and b/res/DEMO/NIGHTMARE.1 differ
diff --git a/res/DEMO/_FileInformation.txt b/res/DEMO/_FileInformation.txt
index fabbe556f..c8ddadcd8 100644
--- a/res/DEMO/_FileInformation.txt
+++ b/res/DEMO/_FileInformation.txt
@@ -112,6 +112,8 @@ LOST.TOMB=Type(06),AuxType(084D),Access(C3)
 MR.COOL=Type(06),AuxType(3FE7),Access(C3)
 NIGHT.STALKER=Type(06),AuxType(0300),Access(C3)
 NIGHT.STALKER.1=Type(F1),AuxType(0000),Access(C3)
+NIGHTMARE=Type(06),AuxType(0300),Access(C3)
+NIGHTMARE.1=Type(F1),AuxType(0000),Access(C3)
 N.O.R.A.D=Type(06),AuxType(0300),Access(C3)
 NORAD.1=Type(F1),AuxType(0000),Access(C3)
 NIBBLER=Type(06),AuxType(0900),Access(C3)
diff --git a/res/history.md b/res/history.md
index e357f72f6..51776e9e5 100644
--- a/res/history.md
+++ b/res/history.md
@@ -63,6 +63,7 @@
  - Crime Wave
  - Laser Bounce
  - Night Stalker
+ - Nightmare Gallery
  - N.O.R.A.D
  - Phaser Fire
  - Space Quarks
diff --git a/res/notes/demos/nightmare-gallery.txt b/res/notes/demos/nightmare-gallery.txt
new file mode 100644
index 000000000..b04ee1e76
--- /dev/null
+++ b/res/notes/demos/nightmare-gallery.txt
@@ -0,0 +1,9 @@
+$8C24: 8DF28C -> 4C0001 to exit on keypress (context is AD00C010078DF28C8D10C060)
+$8C35: AD097E -> 4C0001 to exit on button press (context is AD62C010F5AD097ED0F0A9A08DF28C60)
+$1669: 4C8E12 -> 4C5003 to jump to custom routine in loader and eventually exit after multiple demo cycles (context is 20039020A41620BA164C8E12)
+
+$034F: 03
+$0350: DEC $034F
+       BEQ +
+       JMP $128E
+     + JMP $0100
diff --git a/src/constants.a b/src/constants.a
index e03321442..4db07ece8 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -6,7 +6,7 @@
 ; YE OLDE GRAND UNIFIED MEMORY MAP
 ;
 ; LC RAM BANK 1
-; D000..E3EF - persistent data structures (gGlobalPrefsStore, gGamesListStore)
+; D000..E418 - persistent data structures (gGlobalPrefsStore, gGamesListStore)
 ; ...unused...
 ; E944..FFF1 - main program code
 ; FFF2..FFF9 - API functions and global constants available for main program