diff --git a/res/attract-mode.txt b/res/attract-mode.txt
index 7652cff7b..8a10ffd21 100644
--- a/res/attract-mode.txt
+++ b/res/attract-mode.txt
@@ -33,8 +33,6 @@
 Apple Cider Spider
 Conan
 Gumball
-Karateka
-Serpentine [has graphical artifacts]
 Stellar 7
 Track N Field
 Tubeway ][
@@ -46,19 +44,16 @@ Bouncing Kamungas
 Buzzard Bait
 Canyon Climber
 Ceiling Zero
-Choplifter
 Drelbs
 Firebird
 Flip Out
 Formula 1 Racer
 Galaxian
-Hard Hat Mack
 High Rise
 Lady Tut
 Mr. Cool
 Nibbler
 O'Riley's Mine
-Pac-Man
 Ribbit
 Robotron 2084
 Snake Byte
@@ -67,6 +62,7 @@ Spider Raid
 Starblaster
 Stargate
 Succession
+The Goonies
 Thunder Bombs
 
 # done
@@ -76,23 +72,29 @@ Aquatron
 Bolo
 BurgerTime
 Championship Lode Runner
+Choplifter
 Dino Eggs
 Dung Beetles
 Gamma Goblins
+Hard Hat Mack
 Jungle Hunt
+Karateka
 Lode Runner
 Lost Tomb
+Pac-Man
 Pest Patrol
 Pie-Man
 Pitfall II
 Plasmania
 Pooyan
 Repton
-Sammy Lightfoot [priority]
+Sammy Lightfoot
+Serpentine
 Sneakers
 Spare Change
 Spy Hunter
 Spy's Demise
+Warp Destroyer
 Wavy Navy
 Vindicator
 
diff --git a/res/attract.conf b/res/attract.conf
index 93be19cc6..33a79547e 100644
--- a/res/attract.conf
+++ b/res/attract.conf
@@ -1 +1 @@
-#
# Mega-Attract-Mode configuration file
#
# Mega-Attract-Mode is split into modules. Each module can be a
# short slideshow or a self-running demo (like a game's built-in
# 'attract mode'). Modules are run in the order listed here, one
# after the next, until interrupted by user input. The last-run
# module is tracked in the global prefs file.
#
# Format:
# key=value
#
# |key| must be unique within this file
#
# |value| must be one of
#   1 for HGR slideshow (|key| is a file containing a list of HGR graphics)
#   2 for DHGR slideshow (|key| is a file containing a list of DHGR graphics)
#   3 for self-running demo (|key| is an executable binary file)
#
# Blank lines and lines beginning with '#' are ignored (like this one!)
# A line beginning with '[' terminates the parsing
#

CHOPLIFTER=3
HARD.HAT.MACK=3
#SPIDER.RAID=3
PACMAN=3
SERPENTINE=3
KARATEKA=3
WARP.DESTROYER=3
LOST.TOMB=3
VINDICATOR=3
REPTON=3
SAMMY.LIGHTFOOT=3
DUNG.BEETLES=3
GAMMA.GOBLINS=3
#ALIEN.DOWNPOUR=3
#AGENT.USA=3
PIEMAN=3
ALIEN.AMBUSH=3
ALIEN.RAIN=3
AQUATRON=3
JUNGLE.HUNT=3
POOYAN=3
SHORT.CONF=1
PLASMANIA=3
SPY.HUNTER=3
DINO.EGGS=3
BOLO=3
CHAMP.LODERUN=3
SPYS.DEMISE=3
PEST.PATROL=3
PITFALL.II=3
LODE.RUNNER=3
BURGERTIME=3
SPARE.CHANGE=3
SNEAKERS=3
WAVY.NAVY=3
DHGR.CONF=2
FAVORITES.CONF=1
EFG.CONF=1
ACTIVISION.CONF=1
CD.CONF=1
BRODERBUND.CONF=1
T.CONF=1
ATARI.CONF=1
SIERRA.CONF=1
PQR.CONF=1
DATAMOST.CONF=1
MNO.CONF=1
DATASOFT.CONF=1
S.CONF=1
MICROFUN.CONF=1
AB.CONF=1
PICCADILLY.CONF=1
HIJKL.CONF=1
SIRIUS.CONF=1

[eof]
\ No newline at end of file
+#
# Mega-Attract-Mode configuration file
#
# Mega-Attract-Mode is split into modules. Each module can be a
# short slideshow or a self-running demo (like a game's built-in
# 'attract mode'). Modules are run in the order listed here, one
# after the next, until interrupted by user input. The last-run
# module is tracked in the global prefs file.
#
# Format:
# key=value
#
# |key| must be unique within this file
#
# |value| must be one of
#   1 for HGR slideshow (|key| is a file containing a list of HGR graphics)
#   2 for DHGR slideshow (|key| is a file containing a list of DHGR graphics)
#   3 for self-running demo (|key| is an executable binary file)
#
# Blank lines and lines beginning with '#' are ignored (like this one!)
# A line beginning with '[' terminates the parsing
#

MR.COOL=3
CHOPLIFTER=3
HARD.HAT.MACK=3
#SPIDER.RAID=3
PACMAN=3
SERPENTINE=3
KARATEKA=3
WARP.DESTROYER=3
LOST.TOMB=3
VINDICATOR=3
REPTON=3
SAMMY.LIGHTFOOT=3
DUNG.BEETLES=3
GAMMA.GOBLINS=3
#ALIEN.DOWNPOUR=3
#AGENT.USA=3
PIEMAN=3
ALIEN.AMBUSH=3
ALIEN.RAIN=3
AQUATRON=3
JUNGLE.HUNT=3
POOYAN=3
SHORT.CONF=1
PLASMANIA=3
SPY.HUNTER=3
DINO.EGGS=3
BOLO=3
CHAMP.LODERUN=3
SPYS.DEMISE=3
PEST.PATROL=3
PITFALL.II=3
LODE.RUNNER=3
BURGERTIME=3
SPARE.CHANGE=3
SNEAKERS=3
WAVY.NAVY=3
DHGR.CONF=2
FAVORITES.CONF=1
EFG.CONF=1
ACTIVISION.CONF=1
CD.CONF=1
BRODERBUND.CONF=1
T.CONF=1
ATARI.CONF=1
SIERRA.CONF=1
PQR.CONF=1
DATAMOST.CONF=1
MNO.CONF=1
DATASOFT.CONF=1
S.CONF=1
MICROFUN.CONF=1
AB.CONF=1
PICCADILLY.CONF=1
HIJKL.CONF=1
SIRIUS.CONF=1

[eof]
\ No newline at end of file
diff --git a/res/demo/MR.COOL b/res/demo/MR.COOL
new file mode 100755
index 000000000..855cc21ca
Binary files /dev/null and b/res/demo/MR.COOL differ
diff --git a/res/demo/_FileInformation.txt b/res/demo/_FileInformation.txt
index 92946e23a..94fae27b0 100644
--- a/res/demo/_FileInformation.txt
+++ b/res/demo/_FileInformation.txt
@@ -39,6 +39,7 @@ LODE.RUNNER=Type(06),AuxType(1F00),Access(C3)
 LODE.RUNNER.1=Type(F1),AuxType(0000),Access(C3)
 LODE.RUNNER.M=Type(F1),AuxType(0000),Access(C3)
 LOST.TOMB=Type(06),AuxType(084D),Access(C3)
+MR.COOL=Type(06),AuxType(3FE7),Access(C3)
 PACMAN=Type(06),AuxType(0F18),Access(C3)
 PEST.PATROL=Type(06),AuxType(0800),Access(C3)
 PIEMAN=Type(06),AuxType(0300),Access(C3)
diff --git a/res/notes/mr-cool.txt b/res/notes/mr-cool.txt
new file mode 100644
index 000000000..6d3b3fbab
--- /dev/null
+++ b/res/notes/mr-cool.txt
@@ -0,0 +1,33 @@
+$597F: AE10C0 -> 4C0001 to exit on keypress (context is AE10C0C983)
+$5A05: AD635E -> 4C0001 to exit on button press (context is AD61C010A2AD635E)
+$7F37: 8D9B5E -> 200601 to exit at end of demo cycle (context is A9058D9B5E203E7F60)
+
+$0106:
+STA $5E9B
+LDA $5C04
+CMP #$0C
+BEQ $0100
+RTS
+
+*3FE7L
+
+3FE7-   A0 0A       LDY   #$0A
+3FE9-   B9 F5 3F    LDA   $3FF5,Y
+3FEC-   99 06 01    STA   $0106,Y
+3FEF-   88          DEY
+3FF0-   10 F7       BPL   $3FE9
+3FF2-   4C 00 40    JMP   $4000
+3FF5-   8D 9B 5E    STA   $5E9B
+3FF8-   AD 04 5C    LDA   $5C04
+3FFB-   C9 0C       CMP   #$0C
+3FFD-   F0 F0       BEQ   $3FEF
+3FFF-   60          RTS
+4000-   2C 00 69    BIT   $6900
+4003-   20 00 85    JSR   $8500
+4006-   20 1F 5F    JSR   $5F1F
+4009-   A2 06       LDX   #$06
+400B-   A9 30       LDA   #$30
+400D-   9D 9E 5E    STA   $5E9E,X
+4010-   CA          DEX
+4011-   10 FA       BPL   $400D
+4013-   A2 03       LDX   #$03