diff --git a/res/attract.conf b/res/attract.conf
index b50c24596..602bb92a8 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
#

LADY.TUT=3
STARGATE=3
#SPIDER.RAID=3
FLIP.OUT=3
#STELLAR.7=3
#TRACK.AND.FIELD=3
AGENT.USA=3
GUMBALL=3
TUBEWAY=3
CIDER.SPIDER=3
CONAN=3
MR.COOL=3
CHOPLIFTER=3
HARD.HAT.MACK=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
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
#

NIBBLER=3
LADY.TUT=3
STARGATE=3
#SPIDER.RAID=3
FLIP.OUT=3
#STELLAR.7=3
#TRACK.AND.FIELD=3
AGENT.USA=3
GUMBALL=3
TUBEWAY=3
CIDER.SPIDER=3
CONAN=3
MR.COOL=3
CHOPLIFTER=3
HARD.HAT.MACK=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
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/NIBBLER b/res/demo/NIBBLER
new file mode 100755
index 000000000..dcf8c7b93
Binary files /dev/null and b/res/demo/NIBBLER differ
diff --git a/res/demo/_FileInformation.txt b/res/demo/_FileInformation.txt
index 2881fb1bd..c461096f8 100644
--- a/res/demo/_FileInformation.txt
+++ b/res/demo/_FileInformation.txt
@@ -58,6 +58,7 @@ 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)
+NIBBLER=Type(06),AuxType(0900),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/nibbler.txt b/res/notes/nibbler.txt
new file mode 100644
index 000000000..a19dbaf57
--- /dev/null
+++ b/res/notes/nibbler.txt
@@ -0,0 +1,6 @@
+$1984: 03686860 -> 0A4C0001 to exit on keypress and disable button detection on title screen (context is AD00C01003686860AD61C01002686860)
+$0914: 00 -> FF to disable sound (context is A900853020AB16)
+$165C: AD61C0 -> A901EA to disable button detection (context is AD61C01007A90085FA)
+$166D: 297FC9 -> 4C0001 to exit on keypress during demo (context is AD00C01015297FC931F019)
+$0981: 297FC9 -> 4C0001 to exit on keypress during demo (context is AD00C0102B297FC953D009)
+$11BC: 4C3409 -> 4C0001 to exit at end of demo cycle (context is A9FF85E92029174C3B094C3409)