diff --git a/Makefile b/Makefile
index 277799cdd..2a15b8991 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,23 @@ dsk: asm
 	bin/buildindexedfile.sh -p "build/ATTRACTDIR" "build/MINIATTRACT.IDX" "build/MINIATTRACT.ALL" "build/ATTRACT" >>build/log
 	bin/buildindexedfile.sh "build/GAMES.SORTED" "build/PRELAUNCH.IDX" "build/PRELAUNCH.ALL" "build/PRELAUNCH.INDEXED" >>build/log
 #
+# precompute indexed files for HGR action screenshots
+#
+	(for f in res/ACTION.HGR/[ABCD]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR0
+	(for f in res/ACTION.HGR/[EFGH]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR1
+	(for f in res/ACTION.HGR/[IJKL]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR2
+	(for f in res/ACTION.HGR/[MNOP]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR3
+	(for f in res/ACTION.HGR/[QRST]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR4
+	(for f in res/ACTION.HGR/[UVWX]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR5
+	(for f in res/ACTION.HGR/[YZ]*;   do echo "$$(basename $$f)"; done) > build/ACTIONHGR6
+	bin/buildindexedfile.sh    "build/ACTIONHGR0" "build/HGR0.IDX" "build/HGR.ALL" "res/ACTION.HGR" >>build/log
+	bin/buildindexedfile.sh -a "build/ACTIONHGR1" "build/HGR1.IDX" "build/HGR.ALL" "res/ACTION.HGR" >>build/log
+	bin/buildindexedfile.sh -a "build/ACTIONHGR2" "build/HGR2.IDX" "build/HGR.ALL" "res/ACTION.HGR" >>build/log
+	bin/buildindexedfile.sh -a "build/ACTIONHGR3" "build/HGR3.IDX" "build/HGR.ALL" "res/ACTION.HGR" >>build/log
+	bin/buildindexedfile.sh -a "build/ACTIONHGR4" "build/HGR4.IDX" "build/HGR.ALL" "res/ACTION.HGR" >>build/log
+	bin/buildindexedfile.sh -a "build/ACTIONHGR5" "build/HGR5.IDX" "build/HGR.ALL" "res/ACTION.HGR" >>build/log
+	bin/buildindexedfile.sh -a "build/ACTIONHGR6" "build/HGR6.IDX" "build/HGR.ALL" "res/ACTION.HGR" >>build/log
+#
 # precompute indexed files for SHR artwork
 #
 	(for f in res/ARTWORK.SHR/*; do \
@@ -81,7 +98,6 @@ dsk: asm
 #
 	bin/buildfileinfo.sh res/TITLE.HGR "06" "4000" >>build/log
 	bin/buildfileinfo.sh res/TITLE.DHGR "06" "4000" >>build/log
-	bin/buildfileinfo.sh res/ACTION.HGR "06" "3FF8" >>build/log
 	bin/buildfileinfo.sh res/ACTION.DHGR "06" "3FF8" >>build/log
 	bin/buildfileinfo.sh res/ACTION.GR "06" "6000" >>build/log
 	bin/buildfileinfo.sh res/ICONS "CA" "0000" >>build/log
@@ -112,6 +128,14 @@ dsk: asm
 		build/PRELAUNCH.ALL \
 		build/ARTWORK.IDX \
 		build/ARTWORK.ALL \
+		build/HGR0.IDX \
+		build/HGR1.IDX \
+		build/HGR2.IDX \
+		build/HGR3.IDX \
+		build/HGR4.IDX \
+		build/HGR5.IDX \
+		build/HGR6.IDX \
+		build/HGR.ALL \
 		res/DECRUNCH \
 		res/JOYSTICK \
 		res/Finder.Data \
@@ -121,7 +145,6 @@ dsk: asm
 	for f in \
 		res/TITLE.HGR \
 		res/TITLE.DHGR \
-		res/ACTION.HGR \
 		res/ACTION.DHGR \
 		res/ACTION.GR \
                 res/DEMO \
diff --git a/bin/generate-mini-attract-mode.sh b/bin/generate-mini-attract-mode.sh
index 38ce1aebf..29b888b90 100755
--- a/bin/generate-mini-attract-mode.sh
+++ b/bin/generate-mini-attract-mode.sh
@@ -28,7 +28,6 @@ cat res/GAMES.CONF |
         cat res/SS/ACTION*.CONF |
             egrep "(^|=)""$game""$" |
             cut -d"=" -f1 |
-            sed -e "s/^/ACTION.HGR\//g" |
             sed -e "s/$/=A/g" |
             sort |
             uniq >> /tmp/g
diff --git a/res/ATTRACT.CONF b/res/ATTRACT.CONF
index fc046e038..e8b3b937f 100644
--- a/res/ATTRACT.CONF
+++ b/res/ATTRACT.CONF
@@ -1,5 +1,3 @@
-NIGHT.STALKER=0
-
 # set 1
 FAVORITES2.CONF=1
 ACTIONHIJ1.CONF=2
@@ -344,7 +342,7 @@ DATAMOST2.CONF=1
 SHR45.CONF=5
 LAZER.SILK=0
 ACTIONCD7.CONF=2
-#NIGHT.STALKER=0
+NIGHT.STALKER=0
 ACTGR1.CONF=6
 OPTIMUM.CONF=1
 SHR24.CONF=5
diff --git a/res/ATTRACT/A.CITY.DIES b/res/ATTRACT/A.CITY.DIES
index 55035136c..41c82f311 100644
--- a/res/ATTRACT/A.CITY.DIES
+++ b/res/ATTRACT/A.CITY.DIES
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/A.CITY.DIES=A
+A.CITY.DIES=A
 
 [eof]
diff --git a/res/ATTRACT/A.E b/res/ATTRACT/A.E
index 4e84f5ba2..78e769b95 100644
--- a/res/ATTRACT/A.E
+++ b/res/ATTRACT/A.E
@@ -4,6 +4,6 @@
 #
 
 A.E=C
-ACTION.HGR/A.E=A
+A.E=A
 
 [eof]
diff --git a/res/ATTRACT/AA b/res/ATTRACT/AA
index 5188a474d..a160ca570 100644
--- a/res/ATTRACT/AA
+++ b/res/ATTRACT/AA
@@ -4,6 +4,6 @@
 #
 
 AA=C
-ACTION.HGR/AA=A
+AA=A
 
 [eof]
diff --git a/res/ATTRACT/AB b/res/ATTRACT/AB
index d7c75da61..2d5cac6a5 100644
--- a/res/ATTRACT/AB
+++ b/res/ATTRACT/AB
@@ -4,6 +4,6 @@
 #
 
 AB=C
-ACTION.HGR/AB=A
+AB=A
 
 [eof]
diff --git a/res/ATTRACT/AC b/res/ATTRACT/AC
index d5844b87f..691d2d03f 100644
--- a/res/ATTRACT/AC
+++ b/res/ATTRACT/AC
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/AC=A
+AC=A
 AC=0
 
 [eof]
diff --git a/res/ATTRACT/AF b/res/ATTRACT/AF
index 540820bfd..286b4b7df 100644
--- a/res/ATTRACT/AF
+++ b/res/ATTRACT/AF
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/AF=A
+AF=A
 
 [eof]
diff --git a/res/ATTRACT/AGENT.U.S.A b/res/ATTRACT/AGENT.U.S.A
index ab51c4092..e44a8c844 100644
--- a/res/ATTRACT/AGENT.U.S.A
+++ b/res/ATTRACT/AGENT.U.S.A
@@ -4,8 +4,8 @@
 #
 
 AGENT.U.S.A=C
-ACTION.HGR/AGENT.U.S.A2=A
-ACTION.HGR/AGENT.U.S.A=A
+AGENT.U.S.A2=A
+AGENT.U.S.A=A
 AGENT.U.S.A=0
 
 [eof]
diff --git a/res/ATTRACT/ALCAZAR b/res/ATTRACT/ALCAZAR
index f1f618d69..f8007881d 100644
--- a/res/ATTRACT/ALCAZAR
+++ b/res/ATTRACT/ALCAZAR
@@ -4,6 +4,6 @@
 #
 
 ALCAZAR=C
-ACTION.HGR/ALCAZAR=A
+ALCAZAR=A
 
 [eof]
diff --git a/res/ATTRACT/ALIEN.AMBUSH b/res/ATTRACT/ALIEN.AMBUSH
index 9164963c7..612224ab4 100644
--- a/res/ATTRACT/ALIEN.AMBUSH
+++ b/res/ATTRACT/ALIEN.AMBUSH
@@ -4,7 +4,7 @@
 #
 
 ALIEN.AMBUSH=C
-ACTION.HGR/ALIEN.AMBUSH=A
+ALIEN.AMBUSH=A
 ALIEN.AMBUSH=0
 
 [eof]
diff --git a/res/ATTRACT/ALIEN.DOWNPOUR b/res/ATTRACT/ALIEN.DOWNPOUR
index 23533d952..89b9e92f2 100644
--- a/res/ATTRACT/ALIEN.DOWNPOUR
+++ b/res/ATTRACT/ALIEN.DOWNPOUR
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/ALIEN.DOWNPOUR=A
+ALIEN.DOWNPOUR=A
 ALIEN.DOWNPOUR=0
 
 [eof]
diff --git a/res/ATTRACT/ALIEN.LANDER b/res/ATTRACT/ALIEN.LANDER
index 3fe566c2e..3c6a53604 100644
--- a/res/ATTRACT/ALIEN.LANDER
+++ b/res/ATTRACT/ALIEN.LANDER
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/ALIEN.LANDER2=A
-ACTION.HGR/ALIEN.LANDER=A
+ALIEN.LANDER2=A
+ALIEN.LANDER=A
 
 [eof]
diff --git a/res/ATTRACT/ALIEN.MUNCHIES b/res/ATTRACT/ALIEN.MUNCHIES
index 87f727f3b..3d340f703 100644
--- a/res/ATTRACT/ALIEN.MUNCHIES
+++ b/res/ATTRACT/ALIEN.MUNCHIES
@@ -4,7 +4,7 @@
 #
 
 ALIEN.MUNCHIES=C
-ACTION.HGR/ALIEN.MUNCHIES=A
+ALIEN.MUNCHIES=A
 ALIEN.MUNCHIES=0
 
 [eof]
diff --git a/res/ATTRACT/ALIEN.TYPHOON b/res/ATTRACT/ALIEN.TYPHOON
index 80bdb84d5..71cb55ed9 100644
--- a/res/ATTRACT/ALIEN.TYPHOON
+++ b/res/ATTRACT/ALIEN.TYPHOON
@@ -4,9 +4,9 @@
 #
 
 ALIEN.TYPHOON=C
-ACTION.HGR/ALIEN.TYPHOON2=A
-ACTION.HGR/ALIEN.TYPHOON3=A
-ACTION.HGR/ALIEN.TYPHOON=A
+ALIEN.TYPHOON2=A
+ALIEN.TYPHOON3=A
+ALIEN.TYPHOON=A
 ALIEN.TYPHOON=0
 
 [eof]
diff --git a/res/ATTRACT/ANKH b/res/ATTRACT/ANKH
index 14205b546..d1491ca5f 100644
--- a/res/ATTRACT/ANKH
+++ b/res/ATTRACT/ANKH
@@ -4,15 +4,15 @@
 #
 
 ANKH=C
-ACTION.HGR/ANKH02=A
-ACTION.HGR/ANKH03=A
-ACTION.HGR/ANKH04=A
-ACTION.HGR/ANKH05=A
-ACTION.HGR/ANKH06=A
-ACTION.HGR/ANKH07=A
-ACTION.HGR/ANKH08=A
-ACTION.HGR/ANKH09=A
-ACTION.HGR/ANKH10=A
-ACTION.HGR/ANKH=A
+ANKH02=A
+ANKH03=A
+ANKH04=A
+ANKH05=A
+ANKH06=A
+ANKH07=A
+ANKH08=A
+ANKH09=A
+ANKH10=A
+ANKH=A
 
 [eof]
diff --git a/res/ATTRACT/APE.ESCAPE b/res/ATTRACT/APE.ESCAPE
index 41290250e..36621ed32 100644
--- a/res/ATTRACT/APE.ESCAPE
+++ b/res/ATTRACT/APE.ESCAPE
@@ -4,6 +4,6 @@
 #
 
 APE.ESCAPE=C
-ACTION.HGR/APE.ESCAPE=A
+APE.ESCAPE=A
 
 [eof]
diff --git a/res/ATTRACT/APPLE.INVADER b/res/ATTRACT/APPLE.INVADER
index 8b2529511..40270038e 100644
--- a/res/ATTRACT/APPLE.INVADER
+++ b/res/ATTRACT/APPLE.INVADER
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/APPLE.INVADER=A
+APPLE.INVADER=A
 
 [eof]
diff --git a/res/ATTRACT/APPLE.PANIC b/res/ATTRACT/APPLE.PANIC
index e3b46aef5..b5aaa528b 100644
--- a/res/ATTRACT/APPLE.PANIC
+++ b/res/ATTRACT/APPLE.PANIC
@@ -4,6 +4,6 @@
 #
 
 APPLE.PANIC=C
-ACTION.HGR/APPLE.PANIC=A
+APPLE.PANIC=A
 
 [eof]
diff --git a/res/ATTRACT/AQUATRON b/res/ATTRACT/AQUATRON
index 8b195e5a0..6b626d696 100644
--- a/res/ATTRACT/AQUATRON
+++ b/res/ATTRACT/AQUATRON
@@ -4,7 +4,7 @@
 #
 
 AQUATRON=C
-ACTION.HGR/AQUATRON=A
+AQUATRON=A
 AQUATRON=0
 
 [eof]
diff --git a/res/ATTRACT/ARCHON b/res/ATTRACT/ARCHON
index 9ec4e38ca..f27053df6 100644
--- a/res/ATTRACT/ARCHON
+++ b/res/ATTRACT/ARCHON
@@ -4,7 +4,7 @@
 #
 
 ARCHON=C
-ACTION.HGR/ARCHON2=A
-ACTION.HGR/ARCHON=A
+ARCHON2=A
+ARCHON=A
 
 [eof]
diff --git a/res/ATTRACT/ARCHON.II b/res/ATTRACT/ARCHON.II
index dad8f0df3..985529eaa 100644
--- a/res/ATTRACT/ARCHON.II
+++ b/res/ATTRACT/ARCHON.II
@@ -4,6 +4,6 @@
 #
 
 ARCHON.II=C
-ACTION.HGR/ARCHON.II=A
+ARCHON.II=A
 
 [eof]
diff --git a/res/ATTRACT/ARCTIC.FOX b/res/ATTRACT/ARCTIC.FOX
index 548f7c21e..788e4b162 100644
--- a/res/ATTRACT/ARCTIC.FOX
+++ b/res/ATTRACT/ARCTIC.FOX
@@ -4,6 +4,6 @@
 #
 
 ARCTIC.FOX=C
-ACTION.HGR/ARCTIC.FOX=A
+ARCTIC.FOX=A
 
 [eof]
diff --git a/res/ATTRACT/ARENA b/res/ATTRACT/ARENA
index 12017c1c2..cdda877a4 100644
--- a/res/ATTRACT/ARENA
+++ b/res/ATTRACT/ARENA
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/ARENA=A
+ARENA=A
 
 [eof]
diff --git a/res/ATTRACT/ARGOS b/res/ATTRACT/ARGOS
index d2453fb7e..e03a0bcd7 100644
--- a/res/ATTRACT/ARGOS
+++ b/res/ATTRACT/ARGOS
@@ -4,6 +4,6 @@
 #
 
 ARGOS=C
-ACTION.HGR/ARGOS=A
+ARGOS=A
 
 [eof]
diff --git a/res/ATTRACT/ARKANOID b/res/ATTRACT/ARKANOID
index 94e7b0bf3..9a138551d 100644
--- a/res/ATTRACT/ARKANOID
+++ b/res/ATTRACT/ARKANOID
@@ -4,6 +4,6 @@
 #
 
 ARKANOID=C
-ACTION.HGR/ARKANOID=A
+ARKANOID=A
 
 [eof]
diff --git a/res/ATTRACT/ARTESIANS b/res/ATTRACT/ARTESIANS
index 8ce9a57a9..405d28a0a 100644
--- a/res/ATTRACT/ARTESIANS
+++ b/res/ATTRACT/ARTESIANS
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/ARTESIANS2=A
-ACTION.HGR/ARTESIANS=A
+ARTESIANS2=A
+ARTESIANS=A
 
 [eof]
diff --git a/res/ATTRACT/AS b/res/ATTRACT/AS
index d2ce1efa8..e8acda832 100644
--- a/res/ATTRACT/AS
+++ b/res/ATTRACT/AS
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/AS=A
+AS=A
 
 [eof]
diff --git a/res/ATTRACT/AXIS.ASSASSIN b/res/ATTRACT/AXIS.ASSASSIN
index a0490d6dd..f9b4f0efd 100644
--- a/res/ATTRACT/AXIS.ASSASSIN
+++ b/res/ATTRACT/AXIS.ASSASSIN
@@ -4,11 +4,11 @@
 #
 
 AXIS.ASSASSIN=C
-ACTION.HGR/AXIS.ASSASSIN2=A
-ACTION.HGR/AXIS.ASSASSIN3=A
-ACTION.HGR/AXIS.ASSASSIN4=A
-ACTION.HGR/AXIS.ASSASSIN5=A
-ACTION.HGR/AXIS.ASSASSIN=A
+AXIS.ASSASSIN2=A
+AXIS.ASSASSIN3=A
+AXIS.ASSASSIN4=A
+AXIS.ASSASSIN5=A
+AXIS.ASSASSIN=A
 AXIS.ASSASSIN=0
 
 [eof]
diff --git a/res/ATTRACT/AZTEC b/res/ATTRACT/AZTEC
index 07f60421f..25d831c98 100644
--- a/res/ATTRACT/AZTEC
+++ b/res/ATTRACT/AZTEC
@@ -4,8 +4,8 @@
 #
 
 AZTEC=C
-ACTION.HGR/AZTEC2=A
-ACTION.HGR/AZTEC3=A
-ACTION.HGR/AZTEC=A
+AZTEC2=A
+AZTEC3=A
+AZTEC=A
 
 [eof]
diff --git a/res/ATTRACT/B1 b/res/ATTRACT/B1
index 4a6c21c80..7c2bdec94 100644
--- a/res/ATTRACT/B1
+++ b/res/ATTRACT/B1
@@ -4,11 +4,11 @@
 #
 
 B1=C
-ACTION.HGR/B11=A
-ACTION.HGR/B12=A
-ACTION.HGR/B13=A
-ACTION.HGR/B14=A
-ACTION.HGR/B15=A
-ACTION.HGR/B16=A
+B11=A
+B12=A
+B13=A
+B14=A
+B15=A
+B16=A
 
 [eof]
diff --git a/res/ATTRACT/B2 b/res/ATTRACT/B2
index bc26a8191..bbcdb6394 100644
--- a/res/ATTRACT/B2
+++ b/res/ATTRACT/B2
@@ -4,9 +4,9 @@
 #
 
 B2=C
-ACTION.HGR/B21=A
-ACTION.HGR/B22=A
-ACTION.HGR/B23=A
-ACTION.HGR/B24=A
+B21=A
+B22=A
+B23=A
+B24=A
 
 [eof]
diff --git a/res/ATTRACT/BALLBLAZER b/res/ATTRACT/BALLBLAZER
index af8ffbb0a..9c5b09e28 100644
--- a/res/ATTRACT/BALLBLAZER
+++ b/res/ATTRACT/BALLBLAZER
@@ -4,6 +4,6 @@
 #
 
 BALLBLAZER=C
-ACTION.HGR/BALLBLAZER=A
+BALLBLAZER=A
 
 [eof]
diff --git a/res/ATTRACT/BANDITS b/res/ATTRACT/BANDITS
index b87021b70..5468b1eff 100644
--- a/res/ATTRACT/BANDITS
+++ b/res/ATTRACT/BANDITS
@@ -4,7 +4,7 @@
 #
 
 BANDITS=C
-ACTION.HGR/BANDITS2=A
-ACTION.HGR/BANDITS=A
+BANDITS2=A
+BANDITS=A
 
 [eof]
diff --git a/res/ATTRACT/BATTLE.CRUISER b/res/ATTRACT/BATTLE.CRUISER
index 66e4ae6bc..25ede01a5 100644
--- a/res/ATTRACT/BATTLE.CRUISER
+++ b/res/ATTRACT/BATTLE.CRUISER
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/BATTLE.CRUISER=A
+BATTLE.CRUISER=A
 
 [eof]
diff --git a/res/ATTRACT/BATTLEZONE b/res/ATTRACT/BATTLEZONE
index bbceea435..135891ff4 100644
--- a/res/ATTRACT/BATTLEZONE
+++ b/res/ATTRACT/BATTLEZONE
@@ -4,7 +4,7 @@
 #
 
 BATTLEZONE=C
-ACTION.HGR/BATTLEZONE=A
+BATTLEZONE=A
 BATTLEZONE=0
 
 [eof]
diff --git a/res/ATTRACT/BB b/res/ATTRACT/BB
index 63e1b9e48..3911472d4 100644
--- a/res/ATTRACT/BB
+++ b/res/ATTRACT/BB
@@ -4,7 +4,7 @@
 #
 
 BB=C
-ACTION.HGR/BB=A
+BB=A
 BB=0
 
 [eof]
diff --git a/res/ATTRACT/BEACH.LANDING b/res/ATTRACT/BEACH.LANDING
index bd201da27..e5c332180 100644
--- a/res/ATTRACT/BEACH.LANDING
+++ b/res/ATTRACT/BEACH.LANDING
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/BEACH.LANDING=A
+BEACH.LANDING=A
 
 [eof]
diff --git a/res/ATTRACT/BEER.RUN b/res/ATTRACT/BEER.RUN
index 8ce9e2ab6..1a8eea63e 100644
--- a/res/ATTRACT/BEER.RUN
+++ b/res/ATTRACT/BEER.RUN
@@ -4,7 +4,7 @@
 #
 
 BEER.RUN=C
-ACTION.HGR/BEER.RUN=A
+BEER.RUN=A
 BEER.RUN=0
 
 [eof]
diff --git a/res/ATTRACT/BELLHOP b/res/ATTRACT/BELLHOP
index 94bd08edd..4dd9d6ffa 100644
--- a/res/ATTRACT/BELLHOP
+++ b/res/ATTRACT/BELLHOP
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/BELLHOP=A
+BELLHOP=A
 BELLHOP=0
 
 [eof]
diff --git a/res/ATTRACT/BERZAP b/res/ATTRACT/BERZAP
index e58f81e90..41acee01f 100644
--- a/res/ATTRACT/BERZAP
+++ b/res/ATTRACT/BERZAP
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/BERZAP=A
+BERZAP=A
 
 [eof]
diff --git a/res/ATTRACT/BEZARE b/res/ATTRACT/BEZARE
index a1a03e9ae..337942aec 100644
--- a/res/ATTRACT/BEZARE
+++ b/res/ATTRACT/BEZARE
@@ -3,8 +3,8 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/BEZARE2=A
-ACTION.HGR/BEZARE3=A
-ACTION.HGR/BEZARE=A
+BEZARE2=A
+BEZARE3=A
+BEZARE=A
 
 [eof]
diff --git a/res/ATTRACT/BK b/res/ATTRACT/BK
index cee901ba7..8d9ed7070 100644
--- a/res/ATTRACT/BK
+++ b/res/ATTRACT/BK
@@ -4,8 +4,8 @@
 #
 
 BK=C
-ACTION.HGR/BK=A
-ACTION.HGR/BOUNCING.KMNGA2=A
+BK=A
+BOUNCING.KMNGA2=A
 BK=0
 
 [eof]
diff --git a/res/ATTRACT/BLACK.MAGIC b/res/ATTRACT/BLACK.MAGIC
index cce7a1197..840041404 100644
--- a/res/ATTRACT/BLACK.MAGIC
+++ b/res/ATTRACT/BLACK.MAGIC
@@ -4,8 +4,8 @@
 #
 
 BLACK.MAGIC=C
-ACTION.HGR/BLACK.MAGIC2=A
-ACTION.HGR/BLACK.MAGIC3=A
-ACTION.HGR/BLACK.MAGIC=A
+BLACK.MAGIC2=A
+BLACK.MAGIC3=A
+BLACK.MAGIC=A
 
 [eof]
diff --git a/res/ATTRACT/BLISTER.BALL b/res/ATTRACT/BLISTER.BALL
index c79997197..837ea1996 100644
--- a/res/ATTRACT/BLISTER.BALL
+++ b/res/ATTRACT/BLISTER.BALL
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/BLISTER.BALL=A
+BLISTER.BALL=A
 
 [eof]
diff --git a/res/ATTRACT/BOA b/res/ATTRACT/BOA
index 0948c7f65..e6e7c9af8 100644
--- a/res/ATTRACT/BOA
+++ b/res/ATTRACT/BOA
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/BOA=A
+BOA=A
 
 [eof]
diff --git a/res/ATTRACT/BOLO b/res/ATTRACT/BOLO
index 218a48096..f85cc223c 100644
--- a/res/ATTRACT/BOLO
+++ b/res/ATTRACT/BOLO
@@ -4,7 +4,7 @@
 #
 
 BOLO=C
-ACTION.HGR/BOLO=A
+BOLO=A
 BOLO=0
 
 [eof]
diff --git a/res/ATTRACT/BORG b/res/ATTRACT/BORG
index 141b0acfd..c79ca5cb2 100644
--- a/res/ATTRACT/BORG
+++ b/res/ATTRACT/BORG
@@ -4,6 +4,6 @@
 #
 
 BORG=C
-ACTION.HGR/BORG=A
+BORG=A
 
 [eof]
diff --git a/res/ATTRACT/BOULDER.DASH b/res/ATTRACT/BOULDER.DASH
index 95879ca7f..90d7ff2c5 100644
--- a/res/ATTRACT/BOULDER.DASH
+++ b/res/ATTRACT/BOULDER.DASH
@@ -4,8 +4,8 @@
 #
 
 BOULDER.DASH=C
-ACTION.HGR/BOULDER.DASH2=A
-ACTION.HGR/BOULDER.DASH3=A
-ACTION.HGR/BOULDER.DASH=A
+BOULDER.DASH2=A
+BOULDER.DASH3=A
+BOULDER.DASH=A
 
 [eof]
diff --git a/res/ATTRACT/BOULDER.DASH.II b/res/ATTRACT/BOULDER.DASH.II
index 66977976f..0fb166dca 100644
--- a/res/ATTRACT/BOULDER.DASH.II
+++ b/res/ATTRACT/BOULDER.DASH.II
@@ -4,6 +4,6 @@
 #
 
 BOULDER.DASH.II=C
-ACTION.HGR/BOULDER.DASH.II=A
+BOULDER.DASH.II=A
 
 [eof]
diff --git a/res/ATTRACT/BQ b/res/ATTRACT/BQ
index 1051e901a..98fff1cb5 100644
--- a/res/ATTRACT/BQ
+++ b/res/ATTRACT/BQ
@@ -4,6 +4,6 @@
 #
 
 BQ=C
-ACTION.HGR/BQ=A
+BQ=A
 
 [eof]
diff --git a/res/ATTRACT/BR b/res/ATTRACT/BR
index edadbfce1..83c9d7e41 100644
--- a/res/ATTRACT/BR
+++ b/res/ATTRACT/BR
@@ -4,8 +4,8 @@
 #
 
 BR=C
-ACTION.HGR/BR2=A
-ACTION.HGR/BR3=A
-ACTION.HGR/BR=A
+BR2=A
+BR3=A
+BR=A
 
 [eof]
diff --git a/res/ATTRACT/BRUCE.LEE b/res/ATTRACT/BRUCE.LEE
index 4200b8988..29394195b 100644
--- a/res/ATTRACT/BRUCE.LEE
+++ b/res/ATTRACT/BRUCE.LEE
@@ -4,16 +4,16 @@
 #
 
 BRUCE.LEE=C
-ACTION.HGR/BRUCE.LEE03=A
-ACTION.HGR/BRUCE.LEE05=A
-ACTION.HGR/BRUCE.LEE07=A
-ACTION.HGR/BRUCE.LEE09=A
-ACTION.HGR/BRUCE.LEE11=A
-ACTION.HGR/BRUCE.LEE12=A
-ACTION.HGR/BRUCE.LEE13=A
-ACTION.HGR/BRUCE.LEE14=A
-ACTION.HGR/BRUCE.LEE18=A
-ACTION.HGR/BRUCE.LEE20=A
-ACTION.HGR/BRUCE.LEE21=A
+BRUCE.LEE03=A
+BRUCE.LEE05=A
+BRUCE.LEE07=A
+BRUCE.LEE09=A
+BRUCE.LEE11=A
+BRUCE.LEE12=A
+BRUCE.LEE13=A
+BRUCE.LEE14=A
+BRUCE.LEE18=A
+BRUCE.LEE20=A
+BRUCE.LEE21=A
 
 [eof]
diff --git a/res/ATTRACT/BT b/res/ATTRACT/BT
index 990466213..3128924e9 100644
--- a/res/ATTRACT/BT
+++ b/res/ATTRACT/BT
@@ -4,6 +4,6 @@
 #
 
 BT=C
-ACTION.HGR/BT=A
+BT=A
 
 [eof]
diff --git a/res/ATTRACT/BU b/res/ATTRACT/BU
index 893dc6b1b..fc51b7a97 100644
--- a/res/ATTRACT/BU
+++ b/res/ATTRACT/BU
@@ -3,15 +3,15 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/BUL1=A
-ACTION.HGR/BUL2=A
-ACTION.HGR/BUL3=A
-ACTION.HGR/BUL4=A
-ACTION.HGR/BUL5=A
-ACTION.HGR/BUL6=A
-ACTION.HGR/BUL7=A
-ACTION.HGR/BUL8=A
-ACTION.HGR/BUL9=A
+BUL1=A
+BUL2=A
+BUL3=A
+BUL4=A
+BUL5=A
+BUL6=A
+BUL7=A
+BUL8=A
+BUL9=A
 BU=0
 
 [eof]
diff --git a/res/ATTRACT/BUBBLE.BOBBLE b/res/ATTRACT/BUBBLE.BOBBLE
index c4e977c9a..eb9961bf5 100644
--- a/res/ATTRACT/BUBBLE.BOBBLE
+++ b/res/ATTRACT/BUBBLE.BOBBLE
@@ -4,6 +4,6 @@
 #
 
 BUBBLE.BOBBLE=C
-ACTION.HGR/BUBBLE.BOBBLE=A
+BUBBLE.BOBBLE=A
 
 [eof]
diff --git a/res/ATTRACT/BUG.ATTACK b/res/ATTRACT/BUG.ATTACK
index 833e76789..6f2c2841d 100644
--- a/res/ATTRACT/BUG.ATTACK
+++ b/res/ATTRACT/BUG.ATTACK
@@ -4,6 +4,6 @@
 #
 
 BUG.ATTACK=C
-ACTION.HGR/BUG.ATTACK=A
+BUG.ATTACK=A
 
 [eof]
diff --git a/res/ATTRACT/BUG.BATTLE b/res/ATTRACT/BUG.BATTLE
index 891089476..3c67a8e34 100644
--- a/res/ATTRACT/BUG.BATTLE
+++ b/res/ATTRACT/BUG.BATTLE
@@ -4,6 +4,6 @@
 #
 
 BUG.BATTLE=C
-ACTION.HGR/BUG.BATTLE=A
+BUG.BATTLE=A
 
 [eof]
diff --git a/res/ATTRACT/BUZZARD.BAIT b/res/ATTRACT/BUZZARD.BAIT
index dbe995b6e..1f6c608b2 100644
--- a/res/ATTRACT/BUZZARD.BAIT
+++ b/res/ATTRACT/BUZZARD.BAIT
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/BUZZARD.BAIT=A
+BUZZARD.BAIT=A
 BUZZARD.BAIT=0
 
 [eof]
diff --git a/res/ATTRACT/BW b/res/ATTRACT/BW
index b1233a52b..2cf524b42 100644
--- a/res/ATTRACT/BW
+++ b/res/ATTRACT/BW
@@ -4,8 +4,8 @@
 #
 
 BW=C
-ACTION.HGR/BW2=A
-ACTION.HGR/BW3=A
-ACTION.HGR/BW=A
+BW2=A
+BW3=A
+BW=A
 
 [eof]
diff --git a/res/ATTRACT/BY b/res/ATTRACT/BY
index 949b6d2d0..f52c55d44 100644
--- a/res/ATTRACT/BY
+++ b/res/ATTRACT/BY
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/BY=A
+BY=A
 
 [eof]
diff --git a/res/ATTRACT/CANYON.CLIMBER b/res/ATTRACT/CANYON.CLIMBER
index f4f1e78ec..16fdc8c1c 100644
--- a/res/ATTRACT/CANYON.CLIMBER
+++ b/res/ATTRACT/CANYON.CLIMBER
@@ -4,6 +4,6 @@
 #
 
 CANYON.CLIMBER=C
-ACTION.HGR/CANYON.CLIMBER=A
+CANYON.CLIMBER=A
 
 [eof]
diff --git a/res/ATTRACT/CAPTAIN.POWER b/res/ATTRACT/CAPTAIN.POWER
index a1324a262..990f7a059 100644
--- a/res/ATTRACT/CAPTAIN.POWER
+++ b/res/ATTRACT/CAPTAIN.POWER
@@ -4,6 +4,6 @@
 #
 
 CAPTAIN.POWER=C
-ACTION.HGR/CAPTAIN.POWER=A
+CAPTAIN.POWER=A
 
 [eof]
diff --git a/res/ATTRACT/CB b/res/ATTRACT/CB
index a61141af1..2c1fde596 100644
--- a/res/ATTRACT/CB
+++ b/res/ATTRACT/CB
@@ -4,7 +4,7 @@
 #
 
 CB=C
-ACTION.HGR/CB=A
+CB=A
 CB=0
 
 [eof]
diff --git a/res/ATTRACT/CC b/res/ATTRACT/CC
index 7f8eb9c3f..329ac0f0f 100644
--- a/res/ATTRACT/CC
+++ b/res/ATTRACT/CC
@@ -4,6 +4,6 @@
 #
 
 CC=C
-ACTION.HGR/CC=A
+CC=A
 
 [eof]
diff --git a/res/ATTRACT/CEILING.ZERO b/res/ATTRACT/CEILING.ZERO
index b7df8b978..6f6780575 100644
--- a/res/ATTRACT/CEILING.ZERO
+++ b/res/ATTRACT/CEILING.ZERO
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/CEILING.ZERO=A
+CEILING.ZERO=A
 CEILING.ZERO=0
 
 [eof]
diff --git a/res/ATTRACT/CENTIPEDE b/res/ATTRACT/CENTIPEDE
index 8010c9641..40b80c35f 100644
--- a/res/ATTRACT/CENTIPEDE
+++ b/res/ATTRACT/CENTIPEDE
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/CENTIPEDE=A
+CENTIPEDE=A
 
 [eof]
diff --git a/res/ATTRACT/CF b/res/ATTRACT/CF
index 208aec622..1cef4eac9 100644
--- a/res/ATTRACT/CF
+++ b/res/ATTRACT/CF
@@ -4,6 +4,6 @@
 #
 
 CF=C
-ACTION.HGR/CF=A
+CF=A
 
 [eof]
diff --git a/res/ATTRACT/CG b/res/ATTRACT/CG
index 4a1362740..7b7002c63 100644
--- a/res/ATTRACT/CG
+++ b/res/ATTRACT/CG
@@ -4,15 +4,15 @@
 #
 
 CG=C
-ACTION.HGR/CAPTN.GOODNIGH1=A
-ACTION.HGR/CAPTN.GOODNIGH2=A
-ACTION.HGR/CAPTN.GOODNIGH3=A
-ACTION.HGR/CAPTN.GOODNIGH4=A
-ACTION.HGR/CAPTN.GOODNIGH5=A
-ACTION.HGR/CAPTN.GOODNIGH6=A
-ACTION.HGR/CAPTN.GOODNIGH7=A
-ACTION.HGR/CAPTN.GOODNIGH8=A
-ACTION.HGR/CAPTN.GOODNIGH9=A
-ACTION.HGR/CG=A
+CAPTN.GOODNIGH1=A
+CAPTN.GOODNIGH2=A
+CAPTN.GOODNIGH3=A
+CAPTN.GOODNIGH4=A
+CAPTN.GOODNIGH5=A
+CAPTN.GOODNIGH6=A
+CAPTN.GOODNIGH7=A
+CAPTN.GOODNIGH8=A
+CAPTN.GOODNIGH9=A
+CG=A
 
 [eof]
diff --git a/res/ATTRACT/CHIVALRY b/res/ATTRACT/CHIVALRY
index a801b3e06..f0131119c 100644
--- a/res/ATTRACT/CHIVALRY
+++ b/res/ATTRACT/CHIVALRY
@@ -4,11 +4,11 @@
 #
 
 CHIVALRY=C
-ACTION.HGR/CHIVALRY2=A
-ACTION.HGR/CHIVALRY3=A
-ACTION.HGR/CHIVALRY4=A
-ACTION.HGR/CHIVALRY5=A
-ACTION.HGR/CHIVALRY6=A
-ACTION.HGR/CHIVALRY=A
+CHIVALRY2=A
+CHIVALRY3=A
+CHIVALRY4=A
+CHIVALRY5=A
+CHIVALRY6=A
+CHIVALRY=A
 
 [eof]
diff --git a/res/ATTRACT/CHOPLIFTER b/res/ATTRACT/CHOPLIFTER
index 4e992d5d8..9c6a21780 100644
--- a/res/ATTRACT/CHOPLIFTER
+++ b/res/ATTRACT/CHOPLIFTER
@@ -4,7 +4,7 @@
 #
 
 CHOPLIFTER=C
-ACTION.HGR/CHOPLIFTER=A
+CHOPLIFTER=A
 CHOPLIFTER=0
 
 [eof]
diff --git a/res/ATTRACT/CL b/res/ATTRACT/CL
index dc6772fbc..88bfc43c7 100644
--- a/res/ATTRACT/CL
+++ b/res/ATTRACT/CL
@@ -4,57 +4,57 @@
 #
 
 CL=C
-ACTION.HGR/CL=A
-ACTION.HGR/CLODE001=A
-ACTION.HGR/CLODE002=A
-ACTION.HGR/CLODE003=A
-ACTION.HGR/CLODE004=A
-ACTION.HGR/CLODE005=A
-ACTION.HGR/CLODE006=A
-ACTION.HGR/CLODE007=A
-ACTION.HGR/CLODE008=A
-ACTION.HGR/CLODE009=A
-ACTION.HGR/CLODE010=A
-ACTION.HGR/CLODE011=A
-ACTION.HGR/CLODE012=A
-ACTION.HGR/CLODE013=A
-ACTION.HGR/CLODE014=A
-ACTION.HGR/CLODE015=A
-ACTION.HGR/CLODE016=A
-ACTION.HGR/CLODE017=A
-ACTION.HGR/CLODE018=A
-ACTION.HGR/CLODE019=A
-ACTION.HGR/CLODE020=A
-ACTION.HGR/CLODE021=A
-ACTION.HGR/CLODE022=A
-ACTION.HGR/CLODE023=A
-ACTION.HGR/CLODE024=A
-ACTION.HGR/CLODE025=A
-ACTION.HGR/CLODE026=A
-ACTION.HGR/CLODE027=A
-ACTION.HGR/CLODE028=A
-ACTION.HGR/CLODE029=A
-ACTION.HGR/CLODE030=A
-ACTION.HGR/CLODE031=A
-ACTION.HGR/CLODE032=A
-ACTION.HGR/CLODE033=A
-ACTION.HGR/CLODE034=A
-ACTION.HGR/CLODE035=A
-ACTION.HGR/CLODE036=A
-ACTION.HGR/CLODE037=A
-ACTION.HGR/CLODE038=A
-ACTION.HGR/CLODE039=A
-ACTION.HGR/CLODE040=A
-ACTION.HGR/CLODE041=A
-ACTION.HGR/CLODE042=A
-ACTION.HGR/CLODE043=A
-ACTION.HGR/CLODE044=A
-ACTION.HGR/CLODE045=A
-ACTION.HGR/CLODE046=A
-ACTION.HGR/CLODE047=A
-ACTION.HGR/CLODE048=A
-ACTION.HGR/CLODE049=A
-ACTION.HGR/CLODE050=A
+CL=A
+CLODE001=A
+CLODE002=A
+CLODE003=A
+CLODE004=A
+CLODE005=A
+CLODE006=A
+CLODE007=A
+CLODE008=A
+CLODE009=A
+CLODE010=A
+CLODE011=A
+CLODE012=A
+CLODE013=A
+CLODE014=A
+CLODE015=A
+CLODE016=A
+CLODE017=A
+CLODE018=A
+CLODE019=A
+CLODE020=A
+CLODE021=A
+CLODE022=A
+CLODE023=A
+CLODE024=A
+CLODE025=A
+CLODE026=A
+CLODE027=A
+CLODE028=A
+CLODE029=A
+CLODE030=A
+CLODE031=A
+CLODE032=A
+CLODE033=A
+CLODE034=A
+CLODE035=A
+CLODE036=A
+CLODE037=A
+CLODE038=A
+CLODE039=A
+CLODE040=A
+CLODE041=A
+CLODE042=A
+CLODE043=A
+CLODE044=A
+CLODE045=A
+CLODE046=A
+CLODE047=A
+CLODE048=A
+CLODE049=A
+CLODE050=A
 CL=0
 
 [eof]
diff --git a/res/ATTRACT/COLUMNS b/res/ATTRACT/COLUMNS
index 431d98d48..78cd700b5 100644
--- a/res/ATTRACT/COLUMNS
+++ b/res/ATTRACT/COLUMNS
@@ -4,7 +4,7 @@
 #
 
 ACTION.DHGR/COLUMNS=B
-ACTION.HGR/COLUMNS2=A
-ACTION.HGR/COLUMNS=A
+COLUMNS2=A
+COLUMNS=A
 
 [eof]
diff --git a/res/ATTRACT/COMMANDO b/res/ATTRACT/COMMANDO
index a76d5d5c2..66b0e5f27 100644
--- a/res/ATTRACT/COMMANDO
+++ b/res/ATTRACT/COMMANDO
@@ -4,6 +4,6 @@
 #
 
 COMMANDO=C
-ACTION.HGR/COMMANDO=A
+COMMANDO=A
 
 [eof]
diff --git a/res/ATTRACT/CONAN b/res/ATTRACT/CONAN
index f2a377cb1..3fbb9f825 100644
--- a/res/ATTRACT/CONAN
+++ b/res/ATTRACT/CONAN
@@ -4,7 +4,7 @@
 #
 
 CONAN=C
-ACTION.HGR/CONAN=A
+CONAN=A
 CONAN=0
 
 [eof]
diff --git a/res/ATTRACT/CONGO b/res/ATTRACT/CONGO
index 54d201c70..3d0f82ed2 100644
--- a/res/ATTRACT/CONGO
+++ b/res/ATTRACT/CONGO
@@ -4,6 +4,6 @@
 #
 
 CONGO=C
-ACTION.HGR/CONGO=A
+CONGO=A
 
 [eof]
diff --git a/res/ATTRACT/CONGO.BONGO b/res/ATTRACT/CONGO.BONGO
index 994b51e11..833a9ab80 100644
--- a/res/ATTRACT/CONGO.BONGO
+++ b/res/ATTRACT/CONGO.BONGO
@@ -4,6 +4,6 @@
 #
 
 CONGO.BONGO=C
-ACTION.HGR/CONGO.BONGO=A
+CONGO.BONGO=A
 
 [eof]
diff --git a/res/ATTRACT/COSMIC.COMBAT b/res/ATTRACT/COSMIC.COMBAT
index d13a0fe14..e71dd50d5 100644
--- a/res/ATTRACT/COSMIC.COMBAT
+++ b/res/ATTRACT/COSMIC.COMBAT
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/COSMIC.COMBAT2=A
-ACTION.HGR/COSMIC.COMBAT=A
+COSMIC.COMBAT2=A
+COSMIC.COMBAT=A
 
 [eof]
diff --git a/res/ATTRACT/COUNTY.FAIR b/res/ATTRACT/COUNTY.FAIR
index e079df486..90a326adf 100644
--- a/res/ATTRACT/COUNTY.FAIR
+++ b/res/ATTRACT/COUNTY.FAIR
@@ -4,6 +4,6 @@
 #
 
 COUNTY.FAIR=C
-ACTION.HGR/COUNTY.FAIR=A
+COUNTY.FAIR=A
 
 [eof]
diff --git a/res/ATTRACT/CQ b/res/ATTRACT/CQ
index 18bf96b70..f92fce365 100644
--- a/res/ATTRACT/CQ
+++ b/res/ATTRACT/CQ
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/CQ2=A
-ACTION.HGR/CQ=A
+CQ2=A
+CQ=A
 
 [eof]
diff --git a/res/ATTRACT/CR b/res/ATTRACT/CR
index 35e5236fb..7c3f2993f 100644
--- a/res/ATTRACT/CR
+++ b/res/ATTRACT/CR
@@ -4,7 +4,7 @@
 #
 
 CR=C
-ACTION.HGR/CR2=A
-ACTION.HGR/CR=A
+CR2=A
+CR=A
 
 [eof]
diff --git a/res/ATTRACT/CRAZY.MAZEY b/res/ATTRACT/CRAZY.MAZEY
index 0557d5653..d9e671135 100644
--- a/res/ATTRACT/CRAZY.MAZEY
+++ b/res/ATTRACT/CRAZY.MAZEY
@@ -4,6 +4,6 @@
 #
 
 CRAZY.MAZEY=C
-ACTION.HGR/CRAZY.MAZEY=A
+CRAZY.MAZEY=A
 
 [eof]
diff --git a/res/ATTRACT/CRIME.WAVE b/res/ATTRACT/CRIME.WAVE
index 24db16bcc..5a304a8b8 100644
--- a/res/ATTRACT/CRIME.WAVE
+++ b/res/ATTRACT/CRIME.WAVE
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/CRIME.WAVE=A
+CRIME.WAVE=A
 CRIME.WAVE=0
 
 [eof]
diff --git a/res/ATTRACT/CRISIS.MOUNTAIN b/res/ATTRACT/CRISIS.MOUNTAIN
index 341b0bec4..b952e5cc0 100644
--- a/res/ATTRACT/CRISIS.MOUNTAIN
+++ b/res/ATTRACT/CRISIS.MOUNTAIN
@@ -4,6 +4,6 @@
 #
 
 CRISIS.MOUNTAIN=C
-ACTION.HGR/CRISIS.MOUNTAIN=A
+CRISIS.MOUNTAIN=A
 
 [eof]
diff --git a/res/ATTRACT/CROSSFIRE b/res/ATTRACT/CROSSFIRE
index 5a940036a..79ecf8463 100644
--- a/res/ATTRACT/CROSSFIRE
+++ b/res/ATTRACT/CROSSFIRE
@@ -4,6 +4,6 @@
 #
 
 CROSSFIRE=C
-ACTION.HGR/CROSSFIRE=A
+CROSSFIRE=A
 
 [eof]
diff --git a/res/ATTRACT/CRYSTAL.CASTLES b/res/ATTRACT/CRYSTAL.CASTLES
index 8944389cb..69b6047a4 100644
--- a/res/ATTRACT/CRYSTAL.CASTLES
+++ b/res/ATTRACT/CRYSTAL.CASTLES
@@ -4,9 +4,9 @@
 #
 
 CRYSTAL.CASTLES=C
-ACTION.HGR/CRYSTAL.CASTLE2=A
-ACTION.HGR/CRYSTAL.CASTLE3=A
-ACTION.HGR/CRYSTAL.CASTLE4=A
-ACTION.HGR/CRYSTAL.CASTLES=A
+CRYSTAL.CASTLE2=A
+CRYSTAL.CASTLE3=A
+CRYSTAL.CASTLE4=A
+CRYSTAL.CASTLES=A
 
 [eof]
diff --git a/res/ATTRACT/CS b/res/ATTRACT/CS
index e48aa51a0..4affd4df2 100644
--- a/res/ATTRACT/CS
+++ b/res/ATTRACT/CS
@@ -3,8 +3,8 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/CS2=A
-ACTION.HGR/CS3=A
-ACTION.HGR/CS=A
+CS2=A
+CS3=A
+CS=A
 
 [eof]
diff --git a/res/ATTRACT/CUBIT b/res/ATTRACT/CUBIT
index 4e3224bdf..06634bbab 100644
--- a/res/ATTRACT/CUBIT
+++ b/res/ATTRACT/CUBIT
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/CUBIT2=A
-ACTION.HGR/CUBIT=A
+CUBIT2=A
+CUBIT=A
 
 [eof]
diff --git a/res/ATTRACT/CV b/res/ATTRACT/CV
index 542bdc051..d226871f8 100644
--- a/res/ATTRACT/CV
+++ b/res/ATTRACT/CV
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/CV2=A
-ACTION.HGR/CV=A
+CV2=A
+CV=A
 
 [eof]
diff --git a/res/ATTRACT/CW b/res/ATTRACT/CW
index bf6ad2a6b..aeadc616f 100644
--- a/res/ATTRACT/CW
+++ b/res/ATTRACT/CW
@@ -4,7 +4,7 @@
 #
 
 CW=C
-ACTION.HGR/CW2=A
-ACTION.HGR/CW=A
+CW2=A
+CW=A
 
 [eof]
diff --git a/res/ATTRACT/CYBER.STRIKE b/res/ATTRACT/CYBER.STRIKE
index e1f26eb1f..be3de1fb1 100644
--- a/res/ATTRACT/CYBER.STRIKE
+++ b/res/ATTRACT/CYBER.STRIKE
@@ -4,6 +4,6 @@
 #
 
 CYBER.STRIKE=C
-ACTION.HGR/CYBER.STRIKE=A
+CYBER.STRIKE=A
 
 [eof]
diff --git a/res/ATTRACT/CYCLOD b/res/ATTRACT/CYCLOD
index 5424edc5b..c6343bfc6 100644
--- a/res/ATTRACT/CYCLOD
+++ b/res/ATTRACT/CYCLOD
@@ -4,7 +4,7 @@
 #
 
 CYCLOD=C
-ACTION.HGR/CYCLOD=A
+CYCLOD=A
 CYCLOD=0
 
 [eof]
diff --git a/res/ATTRACT/DANGEROUS.DAVE b/res/ATTRACT/DANGEROUS.DAVE
index 860eaa411..872ab9959 100644
--- a/res/ATTRACT/DANGEROUS.DAVE
+++ b/res/ATTRACT/DANGEROUS.DAVE
@@ -3,11 +3,11 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/DANGEROUS.DAVE1=A
-ACTION.HGR/DANGEROUS.DAVE2=A
-ACTION.HGR/DANGEROUS.DAVE3=A
-ACTION.HGR/DANGEROUS.DAVE4=A
-ACTION.HGR/DANGEROUS.DAVE5=A
-ACTION.HGR/DANGEROUS.DAVE6=A
+DANGEROUS.DAVE1=A
+DANGEROUS.DAVE2=A
+DANGEROUS.DAVE3=A
+DANGEROUS.DAVE4=A
+DANGEROUS.DAVE5=A
+DANGEROUS.DAVE6=A
 
 [eof]
diff --git a/res/ATTRACT/DEEP.SPACE b/res/ATTRACT/DEEP.SPACE
index 3b1d1f44f..9c781d462 100644
--- a/res/ATTRACT/DEEP.SPACE
+++ b/res/ATTRACT/DEEP.SPACE
@@ -4,8 +4,8 @@
 #
 
 DEEP.SPACE=C
-ACTION.HGR/DEEP.SPACE2=A
-ACTION.HGR/DEEP.SPACE3=A
-ACTION.HGR/DEEP.SPACE=A
+DEEP.SPACE2=A
+DEEP.SPACE3=A
+DEEP.SPACE=A
 
 [eof]
diff --git a/res/ATTRACT/DEFENDER b/res/ATTRACT/DEFENDER
index 4b7ad5443..76ffec1bc 100644
--- a/res/ATTRACT/DEFENDER
+++ b/res/ATTRACT/DEFENDER
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/DEFENDER=A
+DEFENDER=A
 
 [eof]
diff --git a/res/ATTRACT/DIAMOND.MINE b/res/ATTRACT/DIAMOND.MINE
index 107c337ac..030e9d4c9 100644
--- a/res/ATTRACT/DIAMOND.MINE
+++ b/res/ATTRACT/DIAMOND.MINE
@@ -3,8 +3,8 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/DIAMOND.MINE2=A
-ACTION.HGR/DIAMOND.MINE3=A
-ACTION.HGR/DIAMOND.MINE=A
+DIAMOND.MINE2=A
+DIAMOND.MINE3=A
+DIAMOND.MINE=A
 
 [eof]
diff --git a/res/ATTRACT/DIG.DUG b/res/ATTRACT/DIG.DUG
index c1f724af3..58961e216 100644
--- a/res/ATTRACT/DIG.DUG
+++ b/res/ATTRACT/DIG.DUG
@@ -4,18 +4,18 @@
 #
 
 DIG.DUG=C
-ACTION.HGR/DIG.DUG01=A
-ACTION.HGR/DIG.DUG02=A
-ACTION.HGR/DIG.DUG03=A
-ACTION.HGR/DIG.DUG04=A
-ACTION.HGR/DIG.DUG05=A
-ACTION.HGR/DIG.DUG06=A
-ACTION.HGR/DIG.DUG07=A
-ACTION.HGR/DIG.DUG08=A
-ACTION.HGR/DIG.DUG09=A
-ACTION.HGR/DIG.DUG10=A
-ACTION.HGR/DIG.DUG11=A
-ACTION.HGR/DIG.DUG12=A
+DIG.DUG01=A
+DIG.DUG02=A
+DIG.DUG03=A
+DIG.DUG04=A
+DIG.DUG05=A
+DIG.DUG06=A
+DIG.DUG07=A
+DIG.DUG08=A
+DIG.DUG09=A
+DIG.DUG10=A
+DIG.DUG11=A
+DIG.DUG12=A
 DIG.DUG=0
 
 [eof]
diff --git a/res/ATTRACT/DINO.EGGS b/res/ATTRACT/DINO.EGGS
index 8604beccf..b42ef2086 100644
--- a/res/ATTRACT/DINO.EGGS
+++ b/res/ATTRACT/DINO.EGGS
@@ -4,7 +4,7 @@
 #
 
 DINO.EGGS=C
-ACTION.HGR/DINO.EGGS=A
+DINO.EGGS=A
 DINO.EGGS=0
 
 [eof]
diff --git a/res/ATTRACT/DINO.SMURF b/res/ATTRACT/DINO.SMURF
index f71a9dc38..90570d3d5 100644
--- a/res/ATTRACT/DINO.SMURF
+++ b/res/ATTRACT/DINO.SMURF
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/DINO.SMURF=A
+DINO.SMURF=A
 
 [eof]
diff --git a/res/ATTRACT/DIVE.BOMBER b/res/ATTRACT/DIVE.BOMBER
index 77d4d57b6..d39e1dec6 100644
--- a/res/ATTRACT/DIVE.BOMBER
+++ b/res/ATTRACT/DIVE.BOMBER
@@ -4,11 +4,11 @@
 #
 
 DIVE.BOMBER=C
-ACTION.HGR/DIVE.BOMBER2=A
-ACTION.HGR/DIVE.BOMBER3=A
-ACTION.HGR/DIVE.BOMBER4=A
-ACTION.HGR/DIVE.BOMBER5=A
-ACTION.HGR/DIVE.BOMBER6=A
-ACTION.HGR/DIVE.BOMBER=A
+DIVE.BOMBER2=A
+DIVE.BOMBER3=A
+DIVE.BOMBER4=A
+DIVE.BOMBER5=A
+DIVE.BOMBER6=A
+DIVE.BOMBER=A
 
 [eof]
diff --git a/res/ATTRACT/DM b/res/ATTRACT/DM
index ad2161873..8fd5878fe 100644
--- a/res/ATTRACT/DM
+++ b/res/ATTRACT/DM
@@ -4,6 +4,6 @@
 #
 
 DM=C
-ACTION.HGR/DM=A
+DM=A
 
 [eof]
diff --git a/res/ATTRACT/DOGFIGHT.II b/res/ATTRACT/DOGFIGHT.II
index ea98e81b2..65579ff12 100644
--- a/res/ATTRACT/DOGFIGHT.II
+++ b/res/ATTRACT/DOGFIGHT.II
@@ -4,6 +4,6 @@
 #
 
 DOGFIGHT.II=C
-ACTION.HGR/DOGFIGHT.II=A
+DOGFIGHT.II=A
 
 [eof]
diff --git a/res/ATTRACT/DONKEY.KONG b/res/ATTRACT/DONKEY.KONG
index 804a55b22..848097cb6 100644
--- a/res/ATTRACT/DONKEY.KONG
+++ b/res/ATTRACT/DONKEY.KONG
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/DONKEY.KONG2=A
-ACTION.HGR/DONKEY.KONG=A
+DONKEY.KONG2=A
+DONKEY.KONG=A
 
 [eof]
diff --git a/res/ATTRACT/DOUBLE.TROUBLE b/res/ATTRACT/DOUBLE.TROUBLE
index ff8cd6943..fe74ee61e 100644
--- a/res/ATTRACT/DOUBLE.TROUBLE
+++ b/res/ATTRACT/DOUBLE.TROUBLE
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/DOUBLE.TROUBLE=A
+DOUBLE.TROUBLE=A
 
 [eof]
diff --git a/res/ATTRACT/DRELBS b/res/ATTRACT/DRELBS
index c3c86cdd9..b0656082e 100644
--- a/res/ATTRACT/DRELBS
+++ b/res/ATTRACT/DRELBS
@@ -4,6 +4,6 @@
 #
 
 DRELBS=C
-ACTION.HGR/DRELBS=A
+DRELBS=A
 
 [eof]
diff --git a/res/ATTRACT/DROL b/res/ATTRACT/DROL
index 2e22d05fd..8eea2d429 100644
--- a/res/ATTRACT/DROL
+++ b/res/ATTRACT/DROL
@@ -4,8 +4,8 @@
 #
 
 DROL=C
-ACTION.HGR/DROL2=A
-ACTION.HGR/DROL3=A
-ACTION.HGR/DROL=A
+DROL2=A
+DROL3=A
+DROL=A
 
 [eof]
diff --git a/res/ATTRACT/DU b/res/ATTRACT/DU
index 36dccdb53..dfe3d4934 100644
--- a/res/ATTRACT/DU
+++ b/res/ATTRACT/DU
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/DU=A
+DU=A
 
 [eof]
diff --git a/res/ATTRACT/DUNG.BEETLES b/res/ATTRACT/DUNG.BEETLES
index 0ee70d5c1..e7e0775c7 100644
--- a/res/ATTRACT/DUNG.BEETLES
+++ b/res/ATTRACT/DUNG.BEETLES
@@ -4,9 +4,9 @@
 #
 
 DUNG.BEETLES=C
-ACTION.HGR/DUNG.BEETLES2=A
-ACTION.HGR/DUNG.BEETLES3=A
-ACTION.HGR/DUNG.BEETLES=A
+DUNG.BEETLES2=A
+DUNG.BEETLES3=A
+DUNG.BEETLES=A
 DUNG.BEETLES=0
 
 [eof]
diff --git a/res/ATTRACT/EARLY.BIRD b/res/ATTRACT/EARLY.BIRD
index 7a9cf2a17..8f02905bf 100644
--- a/res/ATTRACT/EARLY.BIRD
+++ b/res/ATTRACT/EARLY.BIRD
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/EARLY.BIRD=A
+EARLY.BIRD=A
 
 [eof]
diff --git a/res/ATTRACT/EI b/res/ATTRACT/EI
index ba9edf94f..c5be340c4 100644
--- a/res/ATTRACT/EI
+++ b/res/ATTRACT/EI
@@ -4,6 +4,6 @@
 #
 
 EI=C
-ACTION.HGR/EI=A
+EI=A
 
 [eof]
diff --git a/res/ATTRACT/EPOCH b/res/ATTRACT/EPOCH
index 1b4392b35..b8b0a8e1d 100644
--- a/res/ATTRACT/EPOCH
+++ b/res/ATTRACT/EPOCH
@@ -4,6 +4,6 @@
 #
 
 EPOCH=C
-ACTION.HGR/EPOCH=A
+EPOCH=A
 
 [eof]
diff --git a/res/ATTRACT/EVOLUTION b/res/ATTRACT/EVOLUTION
index 24775a87c..e3d311c04 100644
--- a/res/ATTRACT/EVOLUTION
+++ b/res/ATTRACT/EVOLUTION
@@ -4,6 +4,6 @@
 #
 
 EVOLUTION=C
-ACTION.HGR/EVOLUTION=A
+EVOLUTION=A
 
 [eof]
diff --git a/res/ATTRACT/EXTERMINATOR b/res/ATTRACT/EXTERMINATOR
index 7f704f04a..9296a6229 100644
--- a/res/ATTRACT/EXTERMINATOR
+++ b/res/ATTRACT/EXTERMINATOR
@@ -4,6 +4,6 @@
 #
 
 EXTERMINATOR=C
-ACTION.HGR/EXTERMINATOR=A
+EXTERMINATOR=A
 
 [eof]
diff --git a/res/ATTRACT/FALCONS b/res/ATTRACT/FALCONS
index 0c6ffef65..4cfd609fd 100644
--- a/res/ATTRACT/FALCONS
+++ b/res/ATTRACT/FALCONS
@@ -4,8 +4,8 @@
 #
 
 FALCONS=C
-ACTION.HGR/FALCONS.SCORE=A
-ACTION.HGR/FALCONS=A
+FALCONS.SCORE=A
+FALCONS=A
 FALCONS=0
 
 [eof]
diff --git a/res/ATTRACT/FAT.CITY b/res/ATTRACT/FAT.CITY
index 932bbdb12..5bc500cf6 100644
--- a/res/ATTRACT/FAT.CITY
+++ b/res/ATTRACT/FAT.CITY
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/FAT.CITY=A
+FAT.CITY=A
 
 [eof]
diff --git a/res/ATTRACT/FIREBIRD b/res/ATTRACT/FIREBIRD
index 9cca38f1c..fe3c5c2bf 100644
--- a/res/ATTRACT/FIREBIRD
+++ b/res/ATTRACT/FIREBIRD
@@ -4,8 +4,8 @@
 #
 
 FIREBIRD=C
-ACTION.HGR/FIREBIRD2=A
-ACTION.HGR/FIREBIRD=A
+FIREBIRD2=A
+FIREBIRD=A
 FIREBIRD=0
 
 [eof]
diff --git a/res/ATTRACT/FLIP.OUT b/res/ATTRACT/FLIP.OUT
index 962cb98e5..76d9151a1 100644
--- a/res/ATTRACT/FLIP.OUT
+++ b/res/ATTRACT/FLIP.OUT
@@ -4,7 +4,7 @@
 #
 
 FLIP.OUT=C
-ACTION.HGR/FLIP.OUT=A
+FLIP.OUT=A
 FLIP.OUT=0
 
 [eof]
diff --git a/res/ATTRACT/FLY.WARS b/res/ATTRACT/FLY.WARS
index 820679895..6571373ee 100644
--- a/res/ATTRACT/FLY.WARS
+++ b/res/ATTRACT/FLY.WARS
@@ -4,7 +4,7 @@
 #
 
 FLY.WARS=C
-ACTION.HGR/FLY.WARS2=A
-ACTION.HGR/FLY.WARS=A
+FLY.WARS2=A
+FLY.WARS=A
 
 [eof]
diff --git a/res/ATTRACT/FORCE.7 b/res/ATTRACT/FORCE.7
index 442a0a125..62300dd4f 100644
--- a/res/ATTRACT/FORCE.7
+++ b/res/ATTRACT/FORCE.7
@@ -4,9 +4,9 @@
 #
 
 FORCE.7=C
-ACTION.HGR/FORCE.72=A
-ACTION.HGR/FORCE.73=A
-ACTION.HGR/FORCE.74=A
-ACTION.HGR/FORCE.7=A
+FORCE.72=A
+FORCE.73=A
+FORCE.74=A
+FORCE.7=A
 
 [eof]
diff --git a/res/ATTRACT/FRAZZLE b/res/ATTRACT/FRAZZLE
index d0cafb77e..876538aef 100644
--- a/res/ATTRACT/FRAZZLE
+++ b/res/ATTRACT/FRAZZLE
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/FRAZZLE=A
+FRAZZLE=A
 
 [eof]
diff --git a/res/ATTRACT/FREE.FALL b/res/ATTRACT/FREE.FALL
index feb4be3be..163467b82 100644
--- a/res/ATTRACT/FREE.FALL
+++ b/res/ATTRACT/FREE.FALL
@@ -4,7 +4,7 @@
 #
 
 FREE.FALL=C
-ACTION.HGR/FREE.FALL2=A
-ACTION.HGR/FREE.FALL=A
+FREE.FALL2=A
+FREE.FALL=A
 
 [eof]
diff --git a/res/ATTRACT/FROGGER b/res/ATTRACT/FROGGER
index 6e3c21a81..d54624c7c 100644
--- a/res/ATTRACT/FROGGER
+++ b/res/ATTRACT/FROGGER
@@ -4,7 +4,7 @@
 #
 
 FROGGER=C
-ACTION.HGR/FROGGER2=A
-ACTION.HGR/FROGGER=A
+FROGGER2=A
+FROGGER=A
 
 [eof]
diff --git a/res/ATTRACT/FROGGER.II b/res/ATTRACT/FROGGER.II
index f82c6f935..9924bcdb0 100644
--- a/res/ATTRACT/FROGGER.II
+++ b/res/ATTRACT/FROGGER.II
@@ -4,6 +4,6 @@
 #
 
 FROGGER.II=C
-ACTION.HGR/FROGGER.II=A
+FROGGER.II=A
 
 [eof]
diff --git a/res/ATTRACT/FS2 b/res/ATTRACT/FS2
index 2237c98ba..bd92759ca 100644
--- a/res/ATTRACT/FS2
+++ b/res/ATTRACT/FS2
@@ -4,6 +4,6 @@
 #
 
 FS2=C
-ACTION.HGR/FS2=A
+FS2=A
 
 [eof]
diff --git a/res/ATTRACT/G.I.JOE b/res/ATTRACT/G.I.JOE
index 1c3760086..d662e881b 100644
--- a/res/ATTRACT/G.I.JOE
+++ b/res/ATTRACT/G.I.JOE
@@ -4,8 +4,8 @@
 #
 
 G.I.JOE=C
-ACTION.HGR/G.I.JOE2=A
-ACTION.HGR/G.I.JOE3=A
-ACTION.HGR/G.I.JOE=A
+G.I.JOE2=A
+G.I.JOE3=A
+G.I.JOE=A
 
 [eof]
diff --git a/res/ATTRACT/GALACTIC.ATTACK b/res/ATTRACT/GALACTIC.ATTACK
index 8dc4003fc..c8445a7c9 100644
--- a/res/ATTRACT/GALACTIC.ATTACK
+++ b/res/ATTRACT/GALACTIC.ATTACK
@@ -4,6 +4,6 @@
 #
 
 GALACTIC.ATTACK=C
-ACTION.HGR/GALACTIC.ATTACK=A
+GALACTIC.ATTACK=A
 
 [eof]
diff --git a/res/ATTRACT/GALAXIAN b/res/ATTRACT/GALAXIAN
index 3b987a0c5..75bf188cc 100644
--- a/res/ATTRACT/GALAXIAN
+++ b/res/ATTRACT/GALAXIAN
@@ -4,6 +4,6 @@
 #
 
 GALAXIAN=C
-ACTION.HGR/GALAXIAN=A
+GALAXIAN=A
 
 [eof]
diff --git a/res/ATTRACT/GALAXY.GATES b/res/ATTRACT/GALAXY.GATES
index 07acd0e42..e55272787 100644
--- a/res/ATTRACT/GALAXY.GATES
+++ b/res/ATTRACT/GALAXY.GATES
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/GALAXY.GATES=A
+GALAXY.GATES=A
 
 [eof]
diff --git a/res/ATTRACT/GAMMA.GOBLINS b/res/ATTRACT/GAMMA.GOBLINS
index 3377241f0..95338bb4f 100644
--- a/res/ATTRACT/GAMMA.GOBLINS
+++ b/res/ATTRACT/GAMMA.GOBLINS
@@ -4,11 +4,11 @@
 #
 
 GAMMA.GOBLINS=C
-ACTION.HGR/GAMMA.GOBLINS2=A
-ACTION.HGR/GAMMA.GOBLINS3=A
-ACTION.HGR/GAMMA.GOBLINS4=A
-ACTION.HGR/GAMMA.GOBLINS5=A
-ACTION.HGR/GAMMA.GOBLINS=A
+GAMMA.GOBLINS2=A
+GAMMA.GOBLINS3=A
+GAMMA.GOBLINS4=A
+GAMMA.GOBLINS5=A
+GAMMA.GOBLINS=A
 GAMMA.GOBLINS=0
 
 [eof]
diff --git a/res/ATTRACT/GAUNTLET b/res/ATTRACT/GAUNTLET
index b8950dc94..5591e4cd3 100644
--- a/res/ATTRACT/GAUNTLET
+++ b/res/ATTRACT/GAUNTLET
@@ -4,8 +4,8 @@
 #
 
 GAUNTLET=C
-ACTION.HGR/GAUNTLET2=A
-ACTION.HGR/GAUNTLET3=A
-ACTION.HGR/GAUNTLET=A
+GAUNTLET2=A
+GAUNTLET3=A
+GAUNTLET=A
 
 [eof]
diff --git a/res/ATTRACT/GENESIS b/res/ATTRACT/GENESIS
index 65d0619a1..a6e3be224 100644
--- a/res/ATTRACT/GENESIS
+++ b/res/ATTRACT/GENESIS
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/GENESIS=A
+GENESIS=A
 
 [eof]
diff --git a/res/ATTRACT/GENETIC.DRIFT b/res/ATTRACT/GENETIC.DRIFT
index 7dd17e37e..1efa2eab2 100644
--- a/res/ATTRACT/GENETIC.DRIFT
+++ b/res/ATTRACT/GENETIC.DRIFT
@@ -4,6 +4,6 @@
 #
 
 GENETIC.DRIFT=C
-ACTION.HGR/GENETIC.DRIFT=A
+GENETIC.DRIFT=A
 
 [eof]
diff --git a/res/ATTRACT/GENIUS b/res/ATTRACT/GENIUS
index 1a5af5dd9..6dd47d49b 100644
--- a/res/ATTRACT/GENIUS
+++ b/res/ATTRACT/GENIUS
@@ -3,8 +3,8 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/GENIUS=A
-ACTION.HGR/GENIUSB=A
-ACTION.HGR/GENIUSC=A
+GENIUS=A
+GENIUSB=A
+GENIUSC=A
 
 [eof]
diff --git a/res/ATTRACT/GENIUS.2 b/res/ATTRACT/GENIUS.2
index ccda374da..9e00ae7bc 100644
--- a/res/ATTRACT/GENIUS.2
+++ b/res/ATTRACT/GENIUS.2
@@ -3,8 +3,8 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/GENIUS.2=A
-ACTION.HGR/GENIUS.2B=A
-ACTION.HGR/GENIUS.2C=A
+GENIUS.2=A
+GENIUS.2B=A
+GENIUS.2C=A
 
 [eof]
diff --git a/res/ATTRACT/GENIUS.3 b/res/ATTRACT/GENIUS.3
index f7a1a81c6..f862b5418 100644
--- a/res/ATTRACT/GENIUS.3
+++ b/res/ATTRACT/GENIUS.3
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/GENIUS.3=A
-ACTION.HGR/GENIUS.3B=A
+GENIUS.3=A
+GENIUS.3B=A
 
 [eof]
diff --git a/res/ATTRACT/GHOSTBUSTERS b/res/ATTRACT/GHOSTBUSTERS
index 8412d99db..7ea91f2e7 100644
--- a/res/ATTRACT/GHOSTBUSTERS
+++ b/res/ATTRACT/GHOSTBUSTERS
@@ -4,10 +4,10 @@
 #
 
 GHOSTBUSTERS=C
-ACTION.HGR/GHOSTBUSTERS2=A
-ACTION.HGR/GHOSTBUSTERS3=A
-ACTION.HGR/GHOSTBUSTERS4=A
-ACTION.HGR/GHOSTBUSTERS5=A
-ACTION.HGR/GHOSTBUSTERS=A
+GHOSTBUSTERS2=A
+GHOSTBUSTERS3=A
+GHOSTBUSTERS4=A
+GHOSTBUSTERS5=A
+GHOSTBUSTERS=A
 
 [eof]
diff --git a/res/ATTRACT/GOLD.RUSH b/res/ATTRACT/GOLD.RUSH
index 16f1f7ae9..9d19816de 100644
--- a/res/ATTRACT/GOLD.RUSH
+++ b/res/ATTRACT/GOLD.RUSH
@@ -4,6 +4,6 @@
 #
 
 GOLD.RUSH=C
-ACTION.HGR/GOLD.RUSH=A
+GOLD.RUSH=A
 
 [eof]
diff --git a/res/ATTRACT/GORGON b/res/ATTRACT/GORGON
index 883b98b20..9c41ddd6c 100644
--- a/res/ATTRACT/GORGON
+++ b/res/ATTRACT/GORGON
@@ -4,6 +4,6 @@
 #
 
 GORGON=C
-ACTION.HGR/GORGON=A
+GORGON=A
 
 [eof]
diff --git a/res/ATTRACT/GREMLINS b/res/ATTRACT/GREMLINS
index 9ebc64b02..2dd7ed9b6 100644
--- a/res/ATTRACT/GREMLINS
+++ b/res/ATTRACT/GREMLINS
@@ -4,6 +4,6 @@
 #
 
 GREMLINS=C
-ACTION.HGR/GREMLINS=A
+GREMLINS=A
 
 [eof]
diff --git a/res/ATTRACT/GUARDIAN b/res/ATTRACT/GUARDIAN
index d8ebfeb61..707b71c91 100644
--- a/res/ATTRACT/GUARDIAN
+++ b/res/ATTRACT/GUARDIAN
@@ -4,7 +4,7 @@
 #
 
 GUARDIAN=C
-ACTION.HGR/GUARDIAN2=A
-ACTION.HGR/GUARDIAN=A
+GUARDIAN2=A
+GUARDIAN=A
 
 [eof]
diff --git a/res/ATTRACT/GUMBALL b/res/ATTRACT/GUMBALL
index 437500b1b..f6db6bcf2 100644
--- a/res/ATTRACT/GUMBALL
+++ b/res/ATTRACT/GUMBALL
@@ -4,8 +4,8 @@
 #
 
 GUMBALL=C
-ACTION.HGR/GUMBALL2=A
-ACTION.HGR/GUMBALL=A
+GUMBALL2=A
+GUMBALL=A
 GUMBALL=0
 
 [eof]
diff --git a/res/ATTRACT/H.E.R.O b/res/ATTRACT/H.E.R.O
index 6c535ad73..dd6c88b13 100644
--- a/res/ATTRACT/H.E.R.O
+++ b/res/ATTRACT/H.E.R.O
@@ -4,20 +4,20 @@
 #
 
 H.E.R.O=C
-ACTION.HGR/H.E.R.O02=A
-ACTION.HGR/H.E.R.O03=A
-ACTION.HGR/H.E.R.O04=A
-ACTION.HGR/H.E.R.O05=A
-ACTION.HGR/H.E.R.O06=A
-ACTION.HGR/H.E.R.O07=A
-ACTION.HGR/H.E.R.O08=A
-ACTION.HGR/H.E.R.O09=A
-ACTION.HGR/H.E.R.O10=A
-ACTION.HGR/H.E.R.O11=A
-ACTION.HGR/H.E.R.O12=A
-ACTION.HGR/H.E.R.O13=A
-ACTION.HGR/H.E.R.O14=A
-ACTION.HGR/H.E.R.O15=A
-ACTION.HGR/H.E.R.O=A
+H.E.R.O02=A
+H.E.R.O03=A
+H.E.R.O04=A
+H.E.R.O05=A
+H.E.R.O06=A
+H.E.R.O07=A
+H.E.R.O08=A
+H.E.R.O09=A
+H.E.R.O10=A
+H.E.R.O11=A
+H.E.R.O12=A
+H.E.R.O13=A
+H.E.R.O14=A
+H.E.R.O15=A
+H.E.R.O=A
 
 [eof]
diff --git a/res/ATTRACT/HADRON b/res/ATTRACT/HADRON
index 3e8b465c7..56c6f9334 100644
--- a/res/ATTRACT/HADRON
+++ b/res/ATTRACT/HADRON
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/HADRON=A
+HADRON=A
 
 [eof]
diff --git a/res/ATTRACT/HANDY.DANDY b/res/ATTRACT/HANDY.DANDY
index 0e8c917a7..90da2f78b 100644
--- a/res/ATTRACT/HANDY.DANDY
+++ b/res/ATTRACT/HANDY.DANDY
@@ -4,8 +4,8 @@
 #
 
 HANDY.DANDY=C
-ACTION.HGR/HANDY.DANDY2=A
-ACTION.HGR/HANDY.DANDY3=A
-ACTION.HGR/HANDY.DANDY=A
+HANDY.DANDY2=A
+HANDY.DANDY3=A
+HANDY.DANDY=A
 
 [eof]
diff --git a/res/ATTRACT/HARD.HAT.MACK b/res/ATTRACT/HARD.HAT.MACK
index 37ca38ffc..43debaca2 100644
--- a/res/ATTRACT/HARD.HAT.MACK
+++ b/res/ATTRACT/HARD.HAT.MACK
@@ -4,9 +4,9 @@
 #
 
 HARD.HAT.MACK=C
-ACTION.HGR/HARD.HAT.MACK2=A
-ACTION.HGR/HARD.HAT.MACK3=A
-ACTION.HGR/HARD.HAT.MACK=A
+HARD.HAT.MACK2=A
+HARD.HAT.MACK3=A
+HARD.HAT.MACK=A
 HARD.HAT.MACK=0
 
 [eof]
diff --git a/res/ATTRACT/HEAD.ON b/res/ATTRACT/HEAD.ON
index f406aeaf6..3f3310c8f 100644
--- a/res/ATTRACT/HEAD.ON
+++ b/res/ATTRACT/HEAD.ON
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/HEAD.ON=A
+HEAD.ON=A
 
 [eof]
diff --git a/res/ATTRACT/HIGH.RISE b/res/ATTRACT/HIGH.RISE
index 9fae149d3..b8661850e 100644
--- a/res/ATTRACT/HIGH.RISE
+++ b/res/ATTRACT/HIGH.RISE
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/HIGH.RISE=A
+HIGH.RISE=A
 HIGH.RISE=0
 
 [eof]
diff --git a/res/ATTRACT/HORIZON.V b/res/ATTRACT/HORIZON.V
index dda3c3cee..f5bdd9138 100644
--- a/res/ATTRACT/HORIZON.V
+++ b/res/ATTRACT/HORIZON.V
@@ -4,7 +4,7 @@
 #
 
 HORIZON.V=C
-ACTION.HGR/HORIZON.V2=A
-ACTION.HGR/HORIZON.V=A
+HORIZON.V2=A
+HORIZON.V=A
 
 [eof]
diff --git a/res/ATTRACT/HUNGRYBOY b/res/ATTRACT/HUNGRYBOY
index 0f373f16f..0f511cbb4 100644
--- a/res/ATTRACT/HUNGRYBOY
+++ b/res/ATTRACT/HUNGRYBOY
@@ -4,7 +4,7 @@
 #
 
 HUNGRYBOY=C
-ACTION.HGR/HUNGRYBOY2=A
-ACTION.HGR/HUNGRYBOY=A
+HUNGRYBOY2=A
+HUNGRYBOY=A
 
 [eof]
diff --git a/res/ATTRACT/HYPER.HEAD.ON b/res/ATTRACT/HYPER.HEAD.ON
index 2196e7a11..2ecb4db8b 100644
--- a/res/ATTRACT/HYPER.HEAD.ON
+++ b/res/ATTRACT/HYPER.HEAD.ON
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/HYPER.HEAD.ON2=A
-ACTION.HGR/HYPER.HEAD.ON=A
+HYPER.HEAD.ON2=A
+HYPER.HEAD.ON=A
 
 [eof]
diff --git a/res/ATTRACT/I1 b/res/ATTRACT/I1
index d6122f3de..53a4f0a6a 100644
--- a/res/ATTRACT/I1
+++ b/res/ATTRACT/I1
@@ -4,6 +4,6 @@
 #
 
 I1=C
-ACTION.HGR/I1=A
+I1=A
 
 [eof]
diff --git a/res/ATTRACT/IKARI.WARRIORS b/res/ATTRACT/IKARI.WARRIORS
index d7a77da3d..0760fc997 100644
--- a/res/ATTRACT/IKARI.WARRIORS
+++ b/res/ATTRACT/IKARI.WARRIORS
@@ -4,6 +4,6 @@
 #
 
 IKARI.WARRIORS=C
-ACTION.HGR/IKARI.WARRIORS=A
+IKARI.WARRIORS=A
 
 [eof]
diff --git a/res/ATTRACT/INFILTRATOR b/res/ATTRACT/INFILTRATOR
index ec2d91e77..befdf961a 100644
--- a/res/ATTRACT/INFILTRATOR
+++ b/res/ATTRACT/INFILTRATOR
@@ -4,8 +4,8 @@
 #
 
 INFILTRATOR=C
-ACTION.HGR/INFILTRATOR2=A
-ACTION.HGR/INFILTRATOR3=A
-ACTION.HGR/INFILTRATOR=A
+INFILTRATOR2=A
+INFILTRATOR3=A
+INFILTRATOR=A
 
 [eof]
diff --git a/res/ATTRACT/INFILTRATOR.2 b/res/ATTRACT/INFILTRATOR.2
index 62caa615a..8e7e3e9b1 100644
--- a/res/ATTRACT/INFILTRATOR.2
+++ b/res/ATTRACT/INFILTRATOR.2
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/INFILTRATOR.2=A
-ACTION.HGR/INFILTRATOR.2B=A
+INFILTRATOR.2=A
+INFILTRATOR.2B=A
 
 [eof]
diff --git a/res/ATTRACT/IO b/res/ATTRACT/IO
index eb91eeff6..6ceee5416 100644
--- a/res/ATTRACT/IO
+++ b/res/ATTRACT/IO
@@ -4,6 +4,6 @@
 #
 
 IO=C
-ACTION.HGR/IO=A
+IO=A
 
 [eof]
diff --git a/res/ATTRACT/IP b/res/ATTRACT/IP
index ed0417422..9e675f86a 100644
--- a/res/ATTRACT/IP
+++ b/res/ATTRACT/IP
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/IP2=A
-ACTION.HGR/IP=A
+IP2=A
+IP=A
 
 [eof]
diff --git a/res/ATTRACT/JAWBREAKER b/res/ATTRACT/JAWBREAKER
index 39608707a..d5fd30beb 100644
--- a/res/ATTRACT/JAWBREAKER
+++ b/res/ATTRACT/JAWBREAKER
@@ -4,6 +4,6 @@
 #
 
 JAWBREAKER=C
-ACTION.HGR/JAWBREAKER=A
+JAWBREAKER=A
 
 [eof]
diff --git a/res/ATTRACT/JAWBREAKER.II b/res/ATTRACT/JAWBREAKER.II
index 21235d61c..554dba2f1 100644
--- a/res/ATTRACT/JAWBREAKER.II
+++ b/res/ATTRACT/JAWBREAKER.II
@@ -4,6 +4,6 @@
 #
 
 JAWBREAKER.II=C
-ACTION.HGR/JAWBREAKER.II=A
+JAWBREAKER.II=A
 
 [eof]
diff --git a/res/ATTRACT/JELLYFISH b/res/ATTRACT/JELLYFISH
index 7657880d8..fcc6e08cf 100644
--- a/res/ATTRACT/JELLYFISH
+++ b/res/ATTRACT/JELLYFISH
@@ -4,6 +4,6 @@
 #
 
 JELLYFISH=C
-ACTION.HGR/JELLYFISH=A
+JELLYFISH=A
 
 [eof]
diff --git a/res/ATTRACT/JOUST b/res/ATTRACT/JOUST
index b8a8de169..0ddd95b5b 100644
--- a/res/ATTRACT/JOUST
+++ b/res/ATTRACT/JOUST
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/JOUST2=A
-ACTION.HGR/JOUST=A
+JOUST2=A
+JOUST=A
 
 [eof]
diff --git a/res/ATTRACT/JUGGLER b/res/ATTRACT/JUGGLER
index 30614b6d0..07d2ff041 100644
--- a/res/ATTRACT/JUGGLER
+++ b/res/ATTRACT/JUGGLER
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/JUGGLER2=A
-ACTION.HGR/JUGGLER=A
+JUGGLER2=A
+JUGGLER=A
 
 [eof]
diff --git a/res/ATTRACT/JUMP.JET b/res/ATTRACT/JUMP.JET
index 1fe4cc65b..2080e1aef 100644
--- a/res/ATTRACT/JUMP.JET
+++ b/res/ATTRACT/JUMP.JET
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/JUMP.JET2=A
-ACTION.HGR/JUMP.JET=A
+JUMP.JET2=A
+JUMP.JET=A
 
 [eof]
diff --git a/res/ATTRACT/JUMPMAN b/res/ATTRACT/JUMPMAN
index d9d8450a7..930353609 100644
--- a/res/ATTRACT/JUMPMAN
+++ b/res/ATTRACT/JUMPMAN
@@ -4,6 +4,6 @@
 #
 
 JUMPMAN=C
-ACTION.HGR/JUMPMAN=A
+JUMPMAN=A
 
 [eof]
diff --git a/res/ATTRACT/JUNGLE.HUNT b/res/ATTRACT/JUNGLE.HUNT
index 5ba9508c3..f091102df 100644
--- a/res/ATTRACT/JUNGLE.HUNT
+++ b/res/ATTRACT/JUNGLE.HUNT
@@ -3,8 +3,8 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/JUNGLE.HUNT2=A
-ACTION.HGR/JUNGLE.HUNT=A
+JUNGLE.HUNT2=A
+JUNGLE.HUNT=A
 JUNGLE.HUNT=0
 
 [eof]
diff --git a/res/ATTRACT/KAMIKAZE b/res/ATTRACT/KAMIKAZE
index 645749e46..95ee7302d 100644
--- a/res/ATTRACT/KAMIKAZE
+++ b/res/ATTRACT/KAMIKAZE
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/KAMIKAZE=A
+KAMIKAZE=A
 
 [eof]
diff --git a/res/ATTRACT/KARATEKA b/res/ATTRACT/KARATEKA
index 58e464567..77d1e5c6d 100644
--- a/res/ATTRACT/KARATEKA
+++ b/res/ATTRACT/KARATEKA
@@ -4,7 +4,7 @@
 #
 
 KARATEKA=C
-ACTION.HGR/KARATEKA=A
+KARATEKA=A
 KARATEKA=0
 
 [eof]
diff --git a/res/ATTRACT/KID.NIKI b/res/ATTRACT/KID.NIKI
index 2e30ab419..bf3d4bf79 100644
--- a/res/ATTRACT/KID.NIKI
+++ b/res/ATTRACT/KID.NIKI
@@ -4,20 +4,20 @@
 #
 
 KID.NIKI=C
-ACTION.HGR/KID.NIKI101=A
-ACTION.HGR/KID.NIKI108=A
-ACTION.HGR/KID.NIKI201=A
-ACTION.HGR/KID.NIKI210=A
-ACTION.HGR/KID.NIKI303=A
-ACTION.HGR/KID.NIKI401=A
-ACTION.HGR/KID.NIKI406=A
-ACTION.HGR/KID.NIKI407=A
-ACTION.HGR/KID.NIKI501=A
-ACTION.HGR/KID.NIKI507=A
-ACTION.HGR/KID.NIKI508=A
-ACTION.HGR/KID.NIKI509=A
-ACTION.HGR/KID.NIKI510=A
-ACTION.HGR/KID.NIKI609=A
-ACTION.HGR/KID.NIKI709=A
+KID.NIKI101=A
+KID.NIKI108=A
+KID.NIKI201=A
+KID.NIKI210=A
+KID.NIKI303=A
+KID.NIKI401=A
+KID.NIKI406=A
+KID.NIKI407=A
+KID.NIKI501=A
+KID.NIKI507=A
+KID.NIKI508=A
+KID.NIKI509=A
+KID.NIKI510=A
+KID.NIKI609=A
+KID.NIKI709=A
 
 [eof]
diff --git a/res/ATTRACT/KUNG.FU.MASTER b/res/ATTRACT/KUNG.FU.MASTER
index af3e127a3..46e2a3975 100644
--- a/res/ATTRACT/KUNG.FU.MASTER
+++ b/res/ATTRACT/KUNG.FU.MASTER
@@ -4,6 +4,6 @@
 #
 
 KUNG.FU.MASTER=C
-ACTION.HGR/KUNG.FU.MASTER=A
+KUNG.FU.MASTER=A
 
 [eof]
diff --git a/res/ATTRACT/LABYRINTH b/res/ATTRACT/LABYRINTH
index 659a929d6..6b5a9d3f3 100644
--- a/res/ATTRACT/LABYRINTH
+++ b/res/ATTRACT/LABYRINTH
@@ -4,7 +4,7 @@
 #
 
 LABYRINTH=C
-ACTION.HGR/LABYRINTH=A
+LABYRINTH=A
 LABYRINTH=0
 
 [eof]
diff --git a/res/ATTRACT/LADY.TUT b/res/ATTRACT/LADY.TUT
index 7d9e947c9..aa5653660 100644
--- a/res/ATTRACT/LADY.TUT
+++ b/res/ATTRACT/LADY.TUT
@@ -4,7 +4,7 @@
 #
 
 LADY.TUT=C
-ACTION.HGR/LADY.TUT=A
+LADY.TUT=A
 LADY.TUT=0
 
 [eof]
diff --git a/res/ATTRACT/LANCASTER b/res/ATTRACT/LANCASTER
index d4e57ff86..56b880d81 100644
--- a/res/ATTRACT/LANCASTER
+++ b/res/ATTRACT/LANCASTER
@@ -4,6 +4,6 @@
 #
 
 LANCASTER=C
-ACTION.HGR/LANCASTER=A
+LANCASTER=A
 
 [eof]
diff --git a/res/ATTRACT/LASER.BOUNCE b/res/ATTRACT/LASER.BOUNCE
index af1527de6..994d54906 100644
--- a/res/ATTRACT/LASER.BOUNCE
+++ b/res/ATTRACT/LASER.BOUNCE
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/LASER.BOUNCE=A
+LASER.BOUNCE=A
 LASER.BOUNCE=0
 
 [eof]
diff --git a/res/ATTRACT/LAZER.SILK b/res/ATTRACT/LAZER.SILK
index 268c55342..b1db42277 100644
--- a/res/ATTRACT/LAZER.SILK
+++ b/res/ATTRACT/LAZER.SILK
@@ -4,7 +4,7 @@
 #
 
 LAZER.SILK=C
-ACTION.HGR/LAZER.SILK=A
+LAZER.SILK=A
 LAZER.SILK=0
 
 [eof]
diff --git a/res/ATTRACT/LC b/res/ATTRACT/LC
index e3813a43e..e64162f1a 100644
--- a/res/ATTRACT/LC
+++ b/res/ATTRACT/LC
@@ -4,6 +4,6 @@
 #
 
 LC=C
-ACTION.HGR/LC=A
+LC=A
 
 [eof]
diff --git a/res/ATTRACT/LG b/res/ATTRACT/LG
index 3cce95736..826cb5ab4 100644
--- a/res/ATTRACT/LG
+++ b/res/ATTRACT/LG
@@ -4,6 +4,6 @@
 #
 
 LG=C
-ACTION.HGR/LG=A
+LG=A
 
 [eof]
diff --git a/res/ATTRACT/LODE.RUNNER b/res/ATTRACT/LODE.RUNNER
index d60ef9672..e91079b17 100644
--- a/res/ATTRACT/LODE.RUNNER
+++ b/res/ATTRACT/LODE.RUNNER
@@ -4,17 +4,17 @@
 #
 
 LODE.RUNNER=C
-ACTION.HGR/LODE001=A
-ACTION.HGR/LODE141=A
-ACTION.HGR/LODE142=A
-ACTION.HGR/LODE143=A
-ACTION.HGR/LODE144=A
-ACTION.HGR/LODE145=A
-ACTION.HGR/LODE146=A
-ACTION.HGR/LODE147=A
-ACTION.HGR/LODE148=A
-ACTION.HGR/LODE149=A
-ACTION.HGR/LODE150=A
+LODE001=A
+LODE141=A
+LODE142=A
+LODE143=A
+LODE144=A
+LODE145=A
+LODE146=A
+LODE147=A
+LODE148=A
+LODE149=A
+LODE150=A
 LODE.RUNNER=0
 
 [eof]
diff --git a/res/ATTRACT/LOST.TOMB b/res/ATTRACT/LOST.TOMB
index dedc0b7de..01ef99632 100644
--- a/res/ATTRACT/LOST.TOMB
+++ b/res/ATTRACT/LOST.TOMB
@@ -4,8 +4,8 @@
 #
 
 LOST.TOMB=C
-ACTION.HGR/LOST.TOMB2=A
-ACTION.HGR/LOST.TOMB=A
+LOST.TOMB2=A
+LOST.TOMB=A
 LOST.TOMB=0
 
 [eof]
diff --git a/res/ATTRACT/LP b/res/ATTRACT/LP
index f7053efe3..65cb30358 100644
--- a/res/ATTRACT/LP
+++ b/res/ATTRACT/LP
@@ -4,6 +4,6 @@
 #
 
 LP=C
-ACTION.HGR/LP=A
+LP=A
 
 [eof]
diff --git a/res/ATTRACT/LUNAR.LEEPERS b/res/ATTRACT/LUNAR.LEEPERS
index ac99680f9..c5340f0ec 100644
--- a/res/ATTRACT/LUNAR.LEEPERS
+++ b/res/ATTRACT/LUNAR.LEEPERS
@@ -4,7 +4,7 @@
 #
 
 LUNAR.LEEPERS=C
-ACTION.HGR/LUNAR.LEEPERS2=A
-ACTION.HGR/LUNAR.LEEPERS=A
+LUNAR.LEEPERS2=A
+LUNAR.LEEPERS=A
 
 [eof]
diff --git a/res/ATTRACT/MAD.BOMBER b/res/ATTRACT/MAD.BOMBER
index ec8ca5fab..0e5e85b08 100644
--- a/res/ATTRACT/MAD.BOMBER
+++ b/res/ATTRACT/MAD.BOMBER
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/MAD.BOMBER=A
+MAD.BOMBER=A
 
 [eof]
diff --git a/res/ATTRACT/MAD.RAT b/res/ATTRACT/MAD.RAT
index de9e70386..74dd5fd1c 100644
--- a/res/ATTRACT/MAD.RAT
+++ b/res/ATTRACT/MAD.RAT
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/MAD.RAT=A
+MAD.RAT=A
 
 [eof]
diff --git a/res/ATTRACT/MANIC.MINER b/res/ATTRACT/MANIC.MINER
index 0d1d159e5..7517f00c0 100644
--- a/res/ATTRACT/MANIC.MINER
+++ b/res/ATTRACT/MANIC.MINER
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/MANIC.MINER=A
+MANIC.MINER=A
 
 [eof]
diff --git a/res/ATTRACT/MARAUDER b/res/ATTRACT/MARAUDER
index 06e9462f3..23634542d 100644
--- a/res/ATTRACT/MARAUDER
+++ b/res/ATTRACT/MARAUDER
@@ -4,7 +4,7 @@
 #
 
 MARAUDER=C
-ACTION.HGR/MARAUDER2=A
-ACTION.HGR/MARAUDER=A
+MARAUDER2=A
+MARAUDER=A
 
 [eof]
diff --git a/res/ATTRACT/MARBLE.MADNESS b/res/ATTRACT/MARBLE.MADNESS
index 98bd3f3ec..6c9cb95d4 100644
--- a/res/ATTRACT/MARBLE.MADNESS
+++ b/res/ATTRACT/MARBLE.MADNESS
@@ -4,7 +4,7 @@
 #
 
 MARBLE.MADNESS=C
-ACTION.HGR/MARBLE.MADNESS2=A
-ACTION.HGR/MARBLE.MADNESS=A
+MARBLE.MADNESS2=A
+MARBLE.MADNESS=A
 
 [eof]
diff --git a/res/ATTRACT/MARS.CARS b/res/ATTRACT/MARS.CARS
index 951136667..16e03be0f 100644
--- a/res/ATTRACT/MARS.CARS
+++ b/res/ATTRACT/MARS.CARS
@@ -4,6 +4,6 @@
 #
 
 MARS.CARS=C
-ACTION.HGR/MARS.CARS=A
+MARS.CARS=A
 
 [eof]
diff --git a/res/ATTRACT/MATING.ZONE b/res/ATTRACT/MATING.ZONE
index 5813a97b4..01deec25d 100644
--- a/res/ATTRACT/MATING.ZONE
+++ b/res/ATTRACT/MATING.ZONE
@@ -4,6 +4,6 @@
 #
 
 MATING.ZONE=C
-ACTION.HGR/MATING.ZONE=A
+MATING.ZONE=A
 
 [eof]
diff --git a/res/ATTRACT/MAXWELL.MANOR b/res/ATTRACT/MAXWELL.MANOR
index b65a60068..394f441f2 100644
--- a/res/ATTRACT/MAXWELL.MANOR
+++ b/res/ATTRACT/MAXWELL.MANOR
@@ -4,7 +4,7 @@
 #
 
 MAXWELL.MANOR=C
-ACTION.HGR/MAXWELL.MANOR2=A
-ACTION.HGR/MAXWELL.MANOR=A
+MAXWELL.MANOR2=A
+MAXWELL.MANOR=A
 
 [eof]
diff --git a/res/ATTRACT/MB b/res/ATTRACT/MB
index 4443af65c..5d8fa1902 100644
--- a/res/ATTRACT/MB
+++ b/res/ATTRACT/MB
@@ -4,14 +4,14 @@
 #
 
 MB=C
-ACTION.HGR/MB1=A
-ACTION.HGR/MB2=A
-ACTION.HGR/MB3=A
-ACTION.HGR/MB4=A
-ACTION.HGR/MB5=A
-ACTION.HGR/MB6=A
-ACTION.HGR/MB7=A
-ACTION.HGR/MB8=A
-ACTION.HGR/MB9=A
+MB1=A
+MB2=A
+MB3=A
+MB4=A
+MB5=A
+MB6=A
+MB7=A
+MB8=A
+MB9=A
 
 [eof]
diff --git a/res/ATTRACT/MC b/res/ATTRACT/MC
index ea7b315e2..e7da8c204 100644
--- a/res/ATTRACT/MC
+++ b/res/ATTRACT/MC
@@ -4,7 +4,7 @@
 #
 
 MC=C
-ACTION.HGR/MC=A
+MC=A
 MC=0
 
 [eof]
diff --git a/res/ATTRACT/MD b/res/ATTRACT/MD
index 9e6c74ff1..1ae9a69d3 100644
--- a/res/ATTRACT/MD
+++ b/res/ATTRACT/MD
@@ -3,15 +3,15 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/MD.L01=A
-ACTION.HGR/MD.L02=A
-ACTION.HGR/MD.L03=A
-ACTION.HGR/MD.L04=A
-ACTION.HGR/MD.L05=A
-ACTION.HGR/MD.L06=A
-ACTION.HGR/MD.L07=A
-ACTION.HGR/MD.L08=A
-ACTION.HGR/MD.L09=A
-ACTION.HGR/MD.L10=A
+MD.L01=A
+MD.L02=A
+MD.L03=A
+MD.L04=A
+MD.L05=A
+MD.L06=A
+MD.L07=A
+MD.L08=A
+MD.L09=A
+MD.L10=A
 
 [eof]
diff --git a/res/ATTRACT/MEGABOTS b/res/ATTRACT/MEGABOTS
index 4ed9075e3..4ba67d820 100644
--- a/res/ATTRACT/MEGABOTS
+++ b/res/ATTRACT/MEGABOTS
@@ -4,8 +4,8 @@
 #
 
 MEGABOTS=C
-ACTION.HGR/MEGABOTS2=A
-ACTION.HGR/MEGABOTS3=A
-ACTION.HGR/MEGABOTS=A
+MEGABOTS2=A
+MEGABOTS3=A
+MEGABOTS=A
 
 [eof]
diff --git a/res/ATTRACT/MI b/res/ATTRACT/MI
index b34ad5332..a7126aedf 100644
--- a/res/ATTRACT/MI
+++ b/res/ATTRACT/MI
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/MI=A
+MI=A
 
 [eof]
diff --git a/res/ATTRACT/MICRO.INVADERS b/res/ATTRACT/MICRO.INVADERS
index c2fb719c4..74ffbf93e 100644
--- a/res/ATTRACT/MICRO.INVADERS
+++ b/res/ATTRACT/MICRO.INVADERS
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/MICRO.INVADERS=A
+MICRO.INVADERS=A
 
 [eof]
diff --git a/res/ATTRACT/MICROWAVE b/res/ATTRACT/MICROWAVE
index d452bbdc0..d88a0b5f8 100644
--- a/res/ATTRACT/MICROWAVE
+++ b/res/ATTRACT/MICROWAVE
@@ -4,7 +4,7 @@
 #
 
 MICROWAVE=C
-ACTION.HGR/MICROWAVE2=A
-ACTION.HGR/MICROWAVE=A
+MICROWAVE2=A
+MICROWAVE=A
 
 [eof]
diff --git a/res/ATTRACT/MINER.2049ER b/res/ATTRACT/MINER.2049ER
index 07d9d51af..284e1b2e4 100644
--- a/res/ATTRACT/MINER.2049ER
+++ b/res/ATTRACT/MINER.2049ER
@@ -4,7 +4,7 @@
 #
 
 MINER.2049ER=C
-ACTION.HGR/MINER.2049ER2=A
-ACTION.HGR/MINER.2049ER=A
+MINER.2049ER2=A
+MINER.2049ER=A
 
 [eof]
diff --git a/res/ATTRACT/MINER.II b/res/ATTRACT/MINER.II
index e0b8bae83..3af08521b 100644
--- a/res/ATTRACT/MINER.II
+++ b/res/ATTRACT/MINER.II
@@ -3,15 +3,15 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/MINER.II01=A
-ACTION.HGR/MINER.II02=A
-ACTION.HGR/MINER.II03=A
-ACTION.HGR/MINER.II04=A
-ACTION.HGR/MINER.II05=A
-ACTION.HGR/MINER.II06=A
-ACTION.HGR/MINER.II07=A
-ACTION.HGR/MINER.II08=A
-ACTION.HGR/MINER.II09=A
-ACTION.HGR/MINER.II10=A
+MINER.II01=A
+MINER.II02=A
+MINER.II03=A
+MINER.II04=A
+MINER.II05=A
+MINER.II06=A
+MINER.II07=A
+MINER.II08=A
+MINER.II09=A
+MINER.II10=A
 
 [eof]
diff --git a/res/ATTRACT/MINIT.MAN b/res/ATTRACT/MINIT.MAN
index 720262bc0..0061b69d1 100644
--- a/res/ATTRACT/MINIT.MAN
+++ b/res/ATTRACT/MINIT.MAN
@@ -4,8 +4,8 @@
 #
 
 MINIT.MAN=C
-ACTION.HGR/MINIT.MAN2=A
-ACTION.HGR/MINIT.MAN3=A
-ACTION.HGR/MINIT.MAN=A
+MINIT.MAN2=A
+MINIT.MAN3=A
+MINIT.MAN=A
 
 [eof]
diff --git a/res/ATTRACT/MINOTAUR b/res/ATTRACT/MINOTAUR
index 54c77154e..edadabd1f 100644
--- a/res/ATTRACT/MINOTAUR
+++ b/res/ATTRACT/MINOTAUR
@@ -4,8 +4,8 @@
 #
 
 MINOTAUR=C
-ACTION.HGR/MINOTAUR2=A
-ACTION.HGR/MINOTAUR3=A
-ACTION.HGR/MINOTAUR=A
+MINOTAUR2=A
+MINOTAUR3=A
+MINOTAUR=A
 
 [eof]
diff --git a/res/ATTRACT/MONSTER.MASH b/res/ATTRACT/MONSTER.MASH
index 2f4a105bb..5ecd349d8 100644
--- a/res/ATTRACT/MONSTER.MASH
+++ b/res/ATTRACT/MONSTER.MASH
@@ -4,6 +4,6 @@
 #
 
 MONSTER.MASH=C
-ACTION.HGR/MONSTER.MASH=A
+MONSTER.MASH=A
 
 [eof]
diff --git a/res/ATTRACT/MOON.PATROL b/res/ATTRACT/MOON.PATROL
index eede8efd8..4d225d688 100644
--- a/res/ATTRACT/MOON.PATROL
+++ b/res/ATTRACT/MOON.PATROL
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/MOON.PATROL=A
+MOON.PATROL=A
 MOON.PATROL=0
 
 [eof]
diff --git a/res/ATTRACT/MOUSKATTACK b/res/ATTRACT/MOUSKATTACK
index b3a6ff680..bc484f09e 100644
--- a/res/ATTRACT/MOUSKATTACK
+++ b/res/ATTRACT/MOUSKATTACK
@@ -4,6 +4,6 @@
 #
 
 MOUSKATTACK=C
-ACTION.HGR/MOUSKATTACK=A
+MOUSKATTACK=A
 
 [eof]
diff --git a/res/ATTRACT/MP b/res/ATTRACT/MP
index c48379f37..5618cea03 100644
--- a/res/ATTRACT/MP
+++ b/res/ATTRACT/MP
@@ -4,12 +4,12 @@
 #
 
 MP=C
-ACTION.HGR/MP1=A
-ACTION.HGR/MP2=A
-ACTION.HGR/MP3=A
-ACTION.HGR/MP4=A
-ACTION.HGR/MP5=A
-ACTION.HGR/MP6=A
-ACTION.HGR/MP7=A
+MP1=A
+MP2=A
+MP3=A
+MP4=A
+MP5=A
+MP6=A
+MP7=A
 
 [eof]
diff --git a/res/ATTRACT/MR b/res/ATTRACT/MR
index d44ca89f2..2811917a6 100644
--- a/res/ATTRACT/MR
+++ b/res/ATTRACT/MR
@@ -4,27 +4,27 @@
 #
 
 MR=C
-ACTION.HGR/MR01=A
-ACTION.HGR/MR02=A
-ACTION.HGR/MR03=A
-ACTION.HGR/MR04=A
-ACTION.HGR/MR05=A
-ACTION.HGR/MR06=A
-ACTION.HGR/MR07=A
-ACTION.HGR/MR08=A
-ACTION.HGR/MR09=A
-ACTION.HGR/MR10=A
-ACTION.HGR/MR11=A
-ACTION.HGR/MR12=A
-ACTION.HGR/MR13=A
-ACTION.HGR/MR14=A
-ACTION.HGR/MR15=A
-ACTION.HGR/MR16=A
-ACTION.HGR/MR17=A
-ACTION.HGR/MR18=A
-ACTION.HGR/MR19=A
-ACTION.HGR/MR20=A
-ACTION.HGR/MR21=A
-ACTION.HGR/MR22=A
+MR01=A
+MR02=A
+MR03=A
+MR04=A
+MR05=A
+MR06=A
+MR07=A
+MR08=A
+MR09=A
+MR10=A
+MR11=A
+MR12=A
+MR13=A
+MR14=A
+MR15=A
+MR16=A
+MR17=A
+MR18=A
+MR19=A
+MR20=A
+MR21=A
+MR22=A
 
 [eof]
diff --git a/res/ATTRACT/MS b/res/ATTRACT/MS
index 96bb9d936..61f37d5ba 100644
--- a/res/ATTRACT/MS
+++ b/res/ATTRACT/MS
@@ -4,13 +4,13 @@
 #
 
 MS=C
-ACTION.HGR/MS1=A
-ACTION.HGR/MS2=A
-ACTION.HGR/MS3=A
-ACTION.HGR/MS4=A
-ACTION.HGR/MS5=A
-ACTION.HGR/MS6=A
-ACTION.HGR/MS7=A
-ACTION.HGR/MS8=A
+MS1=A
+MS2=A
+MS3=A
+MS4=A
+MS5=A
+MS6=A
+MS7=A
+MS8=A
 
 [eof]
diff --git a/res/ATTRACT/MT b/res/ATTRACT/MT
index 59eb1a7d1..cb997537e 100644
--- a/res/ATTRACT/MT
+++ b/res/ATTRACT/MT
@@ -4,7 +4,7 @@
 #
 
 MT=C
-ACTION.HGR/MT2=A
-ACTION.HGR/MT=A
+MT2=A
+MT=A
 
 [eof]
diff --git a/res/ATTRACT/MZ b/res/ATTRACT/MZ
index 60278f54b..71dfea211 100644
--- a/res/ATTRACT/MZ
+++ b/res/ATTRACT/MZ
@@ -3,17 +3,17 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/MZ01=A
-ACTION.HGR/MZ02=A
-ACTION.HGR/MZ03=A
-ACTION.HGR/MZ04=A
-ACTION.HGR/MZ05=A
-ACTION.HGR/MZ06=A
-ACTION.HGR/MZ07=A
-ACTION.HGR/MZ08=A
-ACTION.HGR/MZ09=A
-ACTION.HGR/MZ10=A
-ACTION.HGR/MZ11=A
-ACTION.HGR/MZ12=A
+MZ01=A
+MZ02=A
+MZ03=A
+MZ04=A
+MZ05=A
+MZ06=A
+MZ07=A
+MZ08=A
+MZ09=A
+MZ10=A
+MZ11=A
+MZ12=A
 
 [eof]
diff --git a/res/ATTRACT/N.O.R.A.D b/res/ATTRACT/N.O.R.A.D
index 28065dcd9..87e1756bd 100644
--- a/res/ATTRACT/N.O.R.A.D
+++ b/res/ATTRACT/N.O.R.A.D
@@ -4,8 +4,8 @@
 #
 
 N.O.R.A.D=C
-ACTION.HGR/N.O.R.A.D2=A
-ACTION.HGR/N.O.R.A.D=A
+N.O.R.A.D2=A
+N.O.R.A.D=A
 N.O.R.A.D=0
 
 [eof]
diff --git a/res/ATTRACT/NEPTUNE b/res/ATTRACT/NEPTUNE
index 2a3ced0ab..20c197c79 100644
--- a/res/ATTRACT/NEPTUNE
+++ b/res/ATTRACT/NEPTUNE
@@ -4,6 +4,6 @@
 #
 
 NEPTUNE=C
-ACTION.HGR/NEPTUNE=A
+NEPTUNE=A
 
 [eof]
diff --git a/res/ATTRACT/NI b/res/ATTRACT/NI
index e86ab78ce..9c65c3ff0 100644
--- a/res/ATTRACT/NI
+++ b/res/ATTRACT/NI
@@ -4,7 +4,7 @@
 #
 
 NI=C
-ACTION.HGR/NI=A
+NI=A
 NI=0
 
 [eof]
diff --git a/res/ATTRACT/NIBBLER b/res/ATTRACT/NIBBLER
index fa5143fa6..aea30d199 100644
--- a/res/ATTRACT/NIBBLER
+++ b/res/ATTRACT/NIBBLER
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/NIBBLER=A
+NIBBLER=A
 NIBBLER=0
 
 [eof]
diff --git a/res/ATTRACT/NIGHT.STALKER b/res/ATTRACT/NIGHT.STALKER
index 5fb70061a..a460ab353 100644
--- a/res/ATTRACT/NIGHT.STALKER
+++ b/res/ATTRACT/NIGHT.STALKER
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/NIGHT.STALKER=A
+NIGHT.STALKER=A
 NIGHT.STALKER=0
 
 [eof]
diff --git a/res/ATTRACT/NM b/res/ATTRACT/NM
index 447bfb2f7..76c78d1da 100644
--- a/res/ATTRACT/NM
+++ b/res/ATTRACT/NM
@@ -4,6 +4,6 @@
 #
 
 NM=C
-ACTION.HGR/NM=A
+NM=A
 
 [eof]
diff --git a/res/ATTRACT/OID.ZONE b/res/ATTRACT/OID.ZONE
index 0cedb2500..6f546b7fe 100644
--- a/res/ATTRACT/OID.ZONE
+++ b/res/ATTRACT/OID.ZONE
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/OID.ZONE=A
+OID.ZONE=A
 
 [eof]
diff --git a/res/ATTRACT/OM b/res/ATTRACT/OM
index e5eb72e37..d01736183 100644
--- a/res/ATTRACT/OM
+++ b/res/ATTRACT/OM
@@ -4,7 +4,7 @@
 #
 
 OM=C
-ACTION.HGR/OM=A
+OM=A
 OM=0
 
 [eof]
diff --git a/res/ATTRACT/ORBITRON b/res/ATTRACT/ORBITRON
index 2e8e9848c..ac263ef23 100644
--- a/res/ATTRACT/ORBITRON
+++ b/res/ATTRACT/ORBITRON
@@ -4,6 +4,6 @@
 #
 
 ORBITRON=C
-ACTION.HGR/ORBITRON=A
+ORBITRON=A
 
 [eof]
diff --git a/res/ATTRACT/OUTPOST b/res/ATTRACT/OUTPOST
index ab759c25a..19eab6340 100644
--- a/res/ATTRACT/OUTPOST
+++ b/res/ATTRACT/OUTPOST
@@ -4,6 +4,6 @@
 #
 
 OUTPOST=C
-ACTION.HGR/OUTPOST=A
+OUTPOST=A
 
 [eof]
diff --git a/res/ATTRACT/OUTWORLD b/res/ATTRACT/OUTWORLD
index d2739cd18..34dd7af6e 100644
--- a/res/ATTRACT/OUTWORLD
+++ b/res/ATTRACT/OUTWORLD
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/OUTWORLD2=A
-ACTION.HGR/OUTWORLD=A
+OUTWORLD2=A
+OUTWORLD=A
 
 [eof]
diff --git a/res/ATTRACT/PACMAN b/res/ATTRACT/PACMAN
index 9a9b81e9c..b2628f2b0 100644
--- a/res/ATTRACT/PACMAN
+++ b/res/ATTRACT/PACMAN
@@ -4,8 +4,8 @@
 #
 
 PACMAN=C
-ACTION.HGR/PACMAN2=A
-ACTION.HGR/PACMAN=A
+PACMAN2=A
+PACMAN=A
 PACMAN=0
 
 [eof]
diff --git a/res/ATTRACT/PAPERBOY b/res/ATTRACT/PAPERBOY
index a364390a4..89970da85 100644
--- a/res/ATTRACT/PAPERBOY
+++ b/res/ATTRACT/PAPERBOY
@@ -4,6 +4,6 @@
 #
 
 PAPERBOY=C
-ACTION.HGR/PAPERBOY=A
+PAPERBOY=A
 
 [eof]
diff --git a/res/ATTRACT/PB b/res/ATTRACT/PB
index d4856a925..96b9fe64b 100644
--- a/res/ATTRACT/PB
+++ b/res/ATTRACT/PB
@@ -4,6 +4,6 @@
 #
 
 PB=C
-ACTION.HGR/PB=A
+PB=A
 
 [eof]
diff --git a/res/ATTRACT/PENETRATOR b/res/ATTRACT/PENETRATOR
index 5b26c967b..b2c96efe1 100644
--- a/res/ATTRACT/PENETRATOR
+++ b/res/ATTRACT/PENETRATOR
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/PENETRATOR2=A
-ACTION.HGR/PENETRATOR=A
+PENETRATOR2=A
+PENETRATOR=A
 
 [eof]
diff --git a/res/ATTRACT/PENTAPUS b/res/ATTRACT/PENTAPUS
index bdaad9f43..1f8c8a3e8 100644
--- a/res/ATTRACT/PENTAPUS
+++ b/res/ATTRACT/PENTAPUS
@@ -3,8 +3,8 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/PENTAPUS2=A
-ACTION.HGR/PENTAPUS3=A
-ACTION.HGR/PENTAPUS=A
+PENTAPUS2=A
+PENTAPUS3=A
+PENTAPUS=A
 
 [eof]
diff --git a/res/ATTRACT/PEST.PATROL b/res/ATTRACT/PEST.PATROL
index d778d6c43..0322d7ccd 100644
--- a/res/ATTRACT/PEST.PATROL
+++ b/res/ATTRACT/PEST.PATROL
@@ -4,8 +4,8 @@
 #
 
 PEST.PATROL=C
-ACTION.HGR/PEST.PATROL2=A
-ACTION.HGR/PEST.PATROL=A
+PEST.PATROL2=A
+PEST.PATROL=A
 PEST.PATROL=0
 
 [eof]
diff --git a/res/ATTRACT/PHANTOMS.FIVE b/res/ATTRACT/PHANTOMS.FIVE
index abb2b855e..772a466ff 100644
--- a/res/ATTRACT/PHANTOMS.FIVE
+++ b/res/ATTRACT/PHANTOMS.FIVE
@@ -4,6 +4,6 @@
 #
 
 PHANTOMS.FIVE=C
-ACTION.HGR/PHANTOMS.FIVE=A
+PHANTOMS.FIVE=A
 
 [eof]
diff --git a/res/ATTRACT/PHASER.FIRE b/res/ATTRACT/PHASER.FIRE
index b4dd3a6b5..2aa7eeb6d 100644
--- a/res/ATTRACT/PHASER.FIRE
+++ b/res/ATTRACT/PHASER.FIRE
@@ -4,7 +4,7 @@
 #
 
 PHASER.FIRE=C
-ACTION.HGR/PHASER.FIRE=A
+PHASER.FIRE=A
 PHASER.FIRE=0
 
 [eof]
diff --git a/res/ATTRACT/PHOTAR b/res/ATTRACT/PHOTAR
index 6b81faf01..0af74654b 100644
--- a/res/ATTRACT/PHOTAR
+++ b/res/ATTRACT/PHOTAR
@@ -4,7 +4,7 @@
 #
 
 PHOTAR=C
-ACTION.HGR/PHOTAR2=A
-ACTION.HGR/PHOTAR=A
+PHOTAR2=A
+PHOTAR=A
 
 [eof]
diff --git a/res/ATTRACT/PICNIC.PARANOIA b/res/ATTRACT/PICNIC.PARANOIA
index 55d60ed46..097b6ad63 100644
--- a/res/ATTRACT/PICNIC.PARANOIA
+++ b/res/ATTRACT/PICNIC.PARANOIA
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/PICNIC.PARANOIA=A
+PICNIC.PARANOIA=A
 
 [eof]
diff --git a/res/ATTRACT/PITFALL.II b/res/ATTRACT/PITFALL.II
index 84fe18ebb..c1245bb30 100644
--- a/res/ATTRACT/PITFALL.II
+++ b/res/ATTRACT/PITFALL.II
@@ -4,8 +4,8 @@
 #
 
 PITFALL.II=C
-ACTION.HGR/PITFALL.II2=A
-ACTION.HGR/PITFALL.II=A
+PITFALL.II2=A
+PITFALL.II=A
 PITFALL.II=0
 
 [eof]
diff --git a/res/ATTRACT/PITSTOP.II b/res/ATTRACT/PITSTOP.II
index e12bcb92b..b0b579838 100644
--- a/res/ATTRACT/PITSTOP.II
+++ b/res/ATTRACT/PITSTOP.II
@@ -4,6 +4,6 @@
 #
 
 PITSTOP.II=C
-ACTION.HGR/PITSTOP.II=A
+PITSTOP.II=A
 
 [eof]
diff --git a/res/ATTRACT/PLASMANIA b/res/ATTRACT/PLASMANIA
index 5b6072299..b5cff0d21 100644
--- a/res/ATTRACT/PLASMANIA
+++ b/res/ATTRACT/PLASMANIA
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/PLASMANIA=A
+PLASMANIA=A
 PLASMANIA=0
 
 [eof]
diff --git a/res/ATTRACT/PM b/res/ATTRACT/PM
index 68ccbe1dc..d1d31446c 100644
--- a/res/ATTRACT/PM
+++ b/res/ATTRACT/PM
@@ -4,7 +4,7 @@
 #
 
 PM=C
-ACTION.HGR/PM=A
+PM=A
 PM=0
 
 [eof]
diff --git a/res/ATTRACT/POOYAN b/res/ATTRACT/POOYAN
index a4103652c..ffab802c4 100644
--- a/res/ATTRACT/POOYAN
+++ b/res/ATTRACT/POOYAN
@@ -4,7 +4,7 @@
 #
 
 POOYAN=C
-ACTION.HGR/POOYAN=A
+POOYAN=A
 POOYAN=0
 
 [eof]
diff --git a/res/ATTRACT/PP b/res/ATTRACT/PP
index f03be8ba4..29b168ebe 100644
--- a/res/ATTRACT/PP
+++ b/res/ATTRACT/PP
@@ -4,53 +4,53 @@
 #
 
 PP=C
-ACTION.HGR/POPL01AGOTSWORD=A
-ACTION.HGR/POPL01BCAREFUL=A
-ACTION.HGR/POPL01CFIGHT=A
-ACTION.HGR/POPL01DCUTSCENE=A
-ACTION.HGR/POPL02ADRINK=A
-ACTION.HGR/POPL02BWHICHPOT=A
-ACTION.HGR/POPL02CHOLDON=A
-ACTION.HGR/POPL03ACHOMP=A
-ACTION.HGR/POPL03BLEAPOFFA=A
-ACTION.HGR/POPL03COHSHIII=A
-ACTION.HGR/POPL03DSKELETON=A
-ACTION.HGR/POPL03ECUTSCENE=A
-ACTION.HGR/POPL04ATIMING=A
-ACTION.HGR/POPL04BMIRRORMI=A
-ACTION.HGR/POPL04CNEGATIVL=A
-ACTION.HGR/POPL05ABYEBYE=A
-ACTION.HGR/POPL05BTHIEF=A
-ACTION.HGR/POPL05CCHEATING=A
-ACTION.HGR/POPL05DCUTSCENE=A
-ACTION.HGR/POPL06ANOTHELPI=A
-ACTION.HGR/POPL07AEXPLOIT1=A
-ACTION.HGR/POPL07BEXPLOIT2=A
-ACTION.HGR/POPL07CWHEEE=A
-ACTION.HGR/POPL07DCUTSCENE=A
-ACTION.HGR/POPL08AHOLDON=A
-ACTION.HGR/POPL08BTIMING=A
-ACTION.HGR/POPL08CSOCLOSE=A
-ACTION.HGR/POPL08DMOUSERES=A
-ACTION.HGR/POPL08ECUTSCENE=A
-ACTION.HGR/POPL09AWHATSUP=A
-ACTION.HGR/POPL09BHARDPLAC=A
-ACTION.HGR/POPL09CEWWW=A
-ACTION.HGR/POPL09DGRANDHAL=A
-ACTION.HGR/POPL10ADECISION=A
-ACTION.HGR/POPL10BRUN=A
-ACTION.HGR/POPL10CCRASH=A
-ACTION.HGR/POPL11AJUMP=A
-ACTION.HGR/POPL11BRUN=A
-ACTION.HGR/POPL11CWHEEE=A
-ACTION.HGR/POPL11DCUTSCENE=A
-ACTION.HGR/POPL12ACRAZYCLI=A
-ACTION.HGR/POPL12BSHINY=A
-ACTION.HGR/POPL12CENGARDE=A
-ACTION.HGR/POPL12DLEAPOFFA=A
-ACTION.HGR/POPL12ECAVEIN=A
-ACTION.HGR/POPL12FBOSS=A
-ACTION.HGR/POPL13AHUG=A
-ACTION.HGR/POPL13BMOUSE=A
+POPL01AGOTSWORD=A
+POPL01BCAREFUL=A
+POPL01CFIGHT=A
+POPL01DCUTSCENE=A
+POPL02ADRINK=A
+POPL02BWHICHPOT=A
+POPL02CHOLDON=A
+POPL03ACHOMP=A
+POPL03BLEAPOFFA=A
+POPL03COHSHIII=A
+POPL03DSKELETON=A
+POPL03ECUTSCENE=A
+POPL04ATIMING=A
+POPL04BMIRRORMI=A
+POPL04CNEGATIVL=A
+POPL05ABYEBYE=A
+POPL05BTHIEF=A
+POPL05CCHEATING=A
+POPL05DCUTSCENE=A
+POPL06ANOTHELPI=A
+POPL07AEXPLOIT1=A
+POPL07BEXPLOIT2=A
+POPL07CWHEEE=A
+POPL07DCUTSCENE=A
+POPL08AHOLDON=A
+POPL08BTIMING=A
+POPL08CSOCLOSE=A
+POPL08DMOUSERES=A
+POPL08ECUTSCENE=A
+POPL09AWHATSUP=A
+POPL09BHARDPLAC=A
+POPL09CEWWW=A
+POPL09DGRANDHAL=A
+POPL10ADECISION=A
+POPL10BRUN=A
+POPL10CCRASH=A
+POPL11AJUMP=A
+POPL11BRUN=A
+POPL11CWHEEE=A
+POPL11DCUTSCENE=A
+POPL12ACRAZYCLI=A
+POPL12BSHINY=A
+POPL12CENGARDE=A
+POPL12DLEAPOFFA=A
+POPL12ECAVEIN=A
+POPL12FBOSS=A
+POPL13AHUG=A
+POPL13BMOUSE=A
 
 [eof]
diff --git a/res/ATTRACT/PR b/res/ATTRACT/PR
index 120cc0344..9ee338218 100644
--- a/res/ATTRACT/PR
+++ b/res/ATTRACT/PR
@@ -4,6 +4,6 @@
 #
 
 PR=C
-ACTION.HGR/PR=A
+PR=A
 
 [eof]
diff --git a/res/ATTRACT/PULSAR.II b/res/ATTRACT/PULSAR.II
index ef954e5af..57c97345d 100644
--- a/res/ATTRACT/PULSAR.II
+++ b/res/ATTRACT/PULSAR.II
@@ -4,6 +4,6 @@
 #
 
 PULSAR.II=C
-ACTION.HGR/PULSAR.II=A
+PULSAR.II=A
 
 [eof]
diff --git a/res/ATTRACT/QUADRANT.6112 b/res/ATTRACT/QUADRANT.6112
index 682f00a5a..d3abbbe62 100644
--- a/res/ATTRACT/QUADRANT.6112
+++ b/res/ATTRACT/QUADRANT.6112
@@ -4,6 +4,6 @@
 #
 
 QUADRANT.6112=C
-ACTION.HGR/QUADRANT.6112=A
+QUADRANT.6112=A
 
 [eof]
diff --git a/res/ATTRACT/RANDAMN b/res/ATTRACT/RANDAMN
index f1710842f..dc6921021 100644
--- a/res/ATTRACT/RANDAMN
+++ b/res/ATTRACT/RANDAMN
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/RANDAMN=A
+RANDAMN=A
 
 [eof]
diff --git a/res/ATTRACT/RASTER.BLASTER b/res/ATTRACT/RASTER.BLASTER
index a6e045e6a..d0c879296 100644
--- a/res/ATTRACT/RASTER.BLASTER
+++ b/res/ATTRACT/RASTER.BLASTER
@@ -4,6 +4,6 @@
 #
 
 RASTER.BLASTER=C
-ACTION.HGR/RASTER.BLASTER=A
+RASTER.BLASTER=A
 
 [eof]
diff --git a/res/ATTRACT/RED.ALERT b/res/ATTRACT/RED.ALERT
index e15cae841..809eb751e 100644
--- a/res/ATTRACT/RED.ALERT
+++ b/res/ATTRACT/RED.ALERT
@@ -4,6 +4,6 @@
 #
 
 RED.ALERT=C
-ACTION.HGR/RED.ALERT=A
+RED.ALERT=A
 
 [eof]
diff --git a/res/ATTRACT/RENEGADE b/res/ATTRACT/RENEGADE
index 04e24d9ee..22c87c363 100644
--- a/res/ATTRACT/RENEGADE
+++ b/res/ATTRACT/RENEGADE
@@ -4,7 +4,7 @@
 #
 
 RENEGADE=C
-ACTION.HGR/RENEGADE2=A
-ACTION.HGR/RENEGADE=A
+RENEGADE2=A
+RENEGADE=A
 
 [eof]
diff --git a/res/ATTRACT/REPTON b/res/ATTRACT/REPTON
index dc47a62a5..998f3512f 100644
--- a/res/ATTRACT/REPTON
+++ b/res/ATTRACT/REPTON
@@ -4,7 +4,7 @@
 #
 
 REPTON=C
-ACTION.HGR/REPTON=A
+REPTON=A
 REPTON=0
 
 [eof]
diff --git a/res/ATTRACT/RESCUE.RAIDERS b/res/ATTRACT/RESCUE.RAIDERS
index cc8a52c38..f942016c8 100644
--- a/res/ATTRACT/RESCUE.RAIDERS
+++ b/res/ATTRACT/RESCUE.RAIDERS
@@ -4,8 +4,8 @@
 #
 
 RESCUE.RAIDERS=C
-ACTION.HGR/RESCUE.RAIDERS2=A
-ACTION.HGR/RESCUE.RAIDERS3=A
-ACTION.HGR/RESCUE.RAIDERS=A
+RESCUE.RAIDERS2=A
+RESCUE.RAIDERS3=A
+RESCUE.RAIDERS=A
 
 [eof]
diff --git a/res/ATTRACT/RI b/res/ATTRACT/RI
index 41f376522..de33c1a12 100644
--- a/res/ATTRACT/RI
+++ b/res/ATTRACT/RI
@@ -4,7 +4,7 @@
 #
 
 RI=C
-ACTION.HGR/RI2=A
-ACTION.HGR/RI=A
+RI2=A
+RI=A
 
 [eof]
diff --git a/res/ATTRACT/RIBBIT b/res/ATTRACT/RIBBIT
index 224e5425e..3b280f3fc 100644
--- a/res/ATTRACT/RIBBIT
+++ b/res/ATTRACT/RIBBIT
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/RIBBIT=A
+RIBBIT=A
 
 [eof]
diff --git a/res/ATTRACT/RM b/res/ATTRACT/RM
index bc0e4ba96..46ca1b0f3 100644
--- a/res/ATTRACT/RM
+++ b/res/ATTRACT/RM
@@ -4,11 +4,11 @@
 #
 
 RM=C
-ACTION.HGR/RAID.OVR.MOSCW1=A
-ACTION.HGR/RAID.OVR.MOSCW2=A
-ACTION.HGR/RAID.OVR.MOSCW3=A
-ACTION.HGR/RAID.OVR.MOSCW4=A
-ACTION.HGR/RAID.OVR.MOSCW5=A
-ACTION.HGR/RAID.OVR.MOSCW6=A
+RAID.OVR.MOSCW1=A
+RAID.OVR.MOSCW2=A
+RAID.OVR.MOSCW3=A
+RAID.OVR.MOSCW4=A
+RAID.OVR.MOSCW5=A
+RAID.OVR.MOSCW6=A
 
 [eof]
diff --git a/res/ATTRACT/ROADBLOCK b/res/ATTRACT/ROADBLOCK
index e9c875c36..55d352766 100644
--- a/res/ATTRACT/ROADBLOCK
+++ b/res/ATTRACT/ROADBLOCK
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/ROADBLOCK=A
+ROADBLOCK=A
 
 [eof]
diff --git a/res/ATTRACT/ROBOTRON.2084 b/res/ATTRACT/ROBOTRON.2084
index cbe9b55db..553b5a5cf 100644
--- a/res/ATTRACT/ROBOTRON.2084
+++ b/res/ATTRACT/ROBOTRON.2084
@@ -4,7 +4,7 @@
 #
 
 ROBOTRON.2084=C
-ACTION.HGR/ROBOTRON.2084=A
+ROBOTRON.2084=A
 ROBOTRON.2084=0
 
 [eof]
diff --git a/res/ATTRACT/ROUND.ABOUT b/res/ATTRACT/ROUND.ABOUT
index b838ec998..bfbebd8a9 100644
--- a/res/ATTRACT/ROUND.ABOUT
+++ b/res/ATTRACT/ROUND.ABOUT
@@ -4,6 +4,6 @@
 #
 
 ROUND.ABOUT=C
-ACTION.HGR/ROUND.ABOUT=A
+ROUND.ABOUT=A
 
 [eof]
diff --git a/res/ATTRACT/RR b/res/ATTRACT/RR
index d52fbf28b..abd69149d 100644
--- a/res/ATTRACT/RR
+++ b/res/ATTRACT/RR
@@ -5,6 +5,6 @@
 
 RR=C
 ACTION.DHGR/RR=B
-ACTION.HGR/RR=A
+RR=A
 
 [eof]
diff --git a/res/ATTRACT/RUN.FOR.IT b/res/ATTRACT/RUN.FOR.IT
index 9bd058c7a..28ccce036 100644
--- a/res/ATTRACT/RUN.FOR.IT
+++ b/res/ATTRACT/RUN.FOR.IT
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/RUN.FOR.IT2=A
-ACTION.HGR/RUN.FOR.IT=A
+RUN.FOR.IT2=A
+RUN.FOR.IT=A
 
 [eof]
diff --git a/res/ATTRACT/RUSSKI.DUCK b/res/ATTRACT/RUSSKI.DUCK
index b05ad07b5..69e5ee787 100644
--- a/res/ATTRACT/RUSSKI.DUCK
+++ b/res/ATTRACT/RUSSKI.DUCK
@@ -4,6 +4,6 @@
 #
 
 RUSSKI.DUCK=C
-ACTION.HGR/RUSSKI.DUCK=A
+RUSSKI.DUCK=A
 
 [eof]
diff --git a/res/ATTRACT/S2 b/res/ATTRACT/S2
index 6d84b0704..57b2234b6 100644
--- a/res/ATTRACT/S2
+++ b/res/ATTRACT/S2
@@ -4,7 +4,7 @@
 #
 
 S2=C
-ACTION.HGR/S2=A
-ACTION.HGR/SPY.STRIKES.BA2=A
+S2=A
+SPY.STRIKES.BA2=A
 
 [eof]
diff --git a/res/ATTRACT/SABOTAGE b/res/ATTRACT/SABOTAGE
index 46e8e0bba..db600fe0c 100644
--- a/res/ATTRACT/SABOTAGE
+++ b/res/ATTRACT/SABOTAGE
@@ -4,6 +4,6 @@
 #
 
 SABOTAGE=C
-ACTION.HGR/SABOTAGE=A
+SABOTAGE=A
 
 [eof]
diff --git a/res/ATTRACT/SAMMY.LIGHTFOOT b/res/ATTRACT/SAMMY.LIGHTFOOT
index 7e45b74f5..a20b31f5a 100644
--- a/res/ATTRACT/SAMMY.LIGHTFOOT
+++ b/res/ATTRACT/SAMMY.LIGHTFOOT
@@ -4,7 +4,7 @@
 #
 
 SAMMY.LIGHTFOOT=C
-ACTION.HGR/SAMMY.LIGHTFOOT=A
+SAMMY.LIGHTFOOT=A
 SAMMY.LIGHTFOOT=0
 
 [eof]
diff --git a/res/ATTRACT/SARACEN b/res/ATTRACT/SARACEN
index 04f86ef50..5b787ccdc 100644
--- a/res/ATTRACT/SARACEN
+++ b/res/ATTRACT/SARACEN
@@ -4,6 +4,6 @@
 #
 
 SARACEN=C
-ACTION.HGR/SARACEN=A
+SARACEN=A
 
 [eof]
diff --git a/res/ATTRACT/SC b/res/ATTRACT/SC
index c14e6cf86..a4279616c 100644
--- a/res/ATTRACT/SC
+++ b/res/ATTRACT/SC
@@ -3,8 +3,8 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/SC=A
-ACTION.HGR/SITUATION.CRTC2=A
-ACTION.HGR/SITUATION.CRTC3=A
+SC=A
+SITUATION.CRTC2=A
+SITUATION.CRTC3=A
 
 [eof]
diff --git a/res/ATTRACT/SD b/res/ATTRACT/SD
index 2b6efa1ce..7ef3526fa 100644
--- a/res/ATTRACT/SD
+++ b/res/ATTRACT/SD
@@ -4,7 +4,7 @@
 #
 
 SD=C
-ACTION.HGR/SD=A
+SD=A
 SD=0
 
 [eof]
diff --git a/res/ATTRACT/SEA.DRAGON b/res/ATTRACT/SEA.DRAGON
index 24e9ba477..e1e887fbb 100644
--- a/res/ATTRACT/SEA.DRAGON
+++ b/res/ATTRACT/SEA.DRAGON
@@ -4,8 +4,8 @@
 #
 
 SEA.DRAGON=C
-ACTION.HGR/SEA.DRAGON2=A
-ACTION.HGR/SEA.DRAGON3=A
-ACTION.HGR/SEA.DRAGON=A
+SEA.DRAGON2=A
+SEA.DRAGON3=A
+SEA.DRAGON=A
 
 [eof]
diff --git a/res/ATTRACT/SEAFOX b/res/ATTRACT/SEAFOX
index a4881a231..134968406 100644
--- a/res/ATTRACT/SEAFOX
+++ b/res/ATTRACT/SEAFOX
@@ -4,7 +4,7 @@
 #
 
 SEAFOX=C
-ACTION.HGR/SEAFOX2=A
-ACTION.HGR/SEAFOX=A
+SEAFOX2=A
+SEAFOX=A
 
 [eof]
diff --git a/res/ATTRACT/SERPENTINE b/res/ATTRACT/SERPENTINE
index 753e3a5a3..d2de1aadb 100644
--- a/res/ATTRACT/SERPENTINE
+++ b/res/ATTRACT/SERPENTINE
@@ -4,7 +4,7 @@
 #
 
 SERPENTINE=C
-ACTION.HGR/SERPENTINE=A
+SERPENTINE=A
 SERPENTINE=0
 
 [eof]
diff --git a/res/ATTRACT/SHAMUS b/res/ATTRACT/SHAMUS
index 1fec359aa..9d6271940 100644
--- a/res/ATTRACT/SHAMUS
+++ b/res/ATTRACT/SHAMUS
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/SHAMUS2=A
-ACTION.HGR/SHAMUS=A
+SHAMUS2=A
+SHAMUS=A
 
 [eof]
diff --git a/res/ATTRACT/SHORT.CIRCUIT b/res/ATTRACT/SHORT.CIRCUIT
index b7ea8bbe3..f3ec7eb93 100644
--- a/res/ATTRACT/SHORT.CIRCUIT
+++ b/res/ATTRACT/SHORT.CIRCUIT
@@ -4,7 +4,7 @@
 #
 
 SHORT.CIRCUIT=C
-ACTION.HGR/SHORT.CIRCUIT2=A
-ACTION.HGR/SHORT.CIRCUIT=A
+SHORT.CIRCUIT2=A
+SHORT.CIRCUIT=A
 
 [eof]
diff --git a/res/ATTRACT/SKYFOX b/res/ATTRACT/SKYFOX
index 25f7cd208..97c4057cd 100644
--- a/res/ATTRACT/SKYFOX
+++ b/res/ATTRACT/SKYFOX
@@ -4,9 +4,9 @@
 #
 
 SKYFOX=C
-ACTION.HGR/SKYFOX2=A
-ACTION.HGR/SKYFOX3=A
-ACTION.HGR/SKYFOX4=A
-ACTION.HGR/SKYFOX=A
+SKYFOX2=A
+SKYFOX3=A
+SKYFOX4=A
+SKYFOX=A
 
 [eof]
diff --git a/res/ATTRACT/SNACK.ATTACK b/res/ATTRACT/SNACK.ATTACK
index fe55c24cf..27a3c898b 100644
--- a/res/ATTRACT/SNACK.ATTACK
+++ b/res/ATTRACT/SNACK.ATTACK
@@ -4,6 +4,6 @@
 #
 
 SNACK.ATTACK=C
-ACTION.HGR/SNACK.ATTACK=A
+SNACK.ATTACK=A
 
 [eof]
diff --git a/res/ATTRACT/SNAKE.BYTE b/res/ATTRACT/SNAKE.BYTE
index edf93343b..7667f88c6 100644
--- a/res/ATTRACT/SNAKE.BYTE
+++ b/res/ATTRACT/SNAKE.BYTE
@@ -4,7 +4,7 @@
 #
 
 SNAKE.BYTE=C
-ACTION.HGR/SNAKE.BYTE=A
+SNAKE.BYTE=A
 SNAKE.BYTE=0
 
 [eof]
diff --git a/res/ATTRACT/SNEAKERS b/res/ATTRACT/SNEAKERS
index b702212fd..f4d25a6d4 100644
--- a/res/ATTRACT/SNEAKERS
+++ b/res/ATTRACT/SNEAKERS
@@ -4,11 +4,11 @@
 #
 
 SNEAKERS=C
-ACTION.HGR/SNEAKERS2=A
-ACTION.HGR/SNEAKERS3=A
-ACTION.HGR/SNEAKERS4=A
-ACTION.HGR/SNEAKERS5=A
-ACTION.HGR/SNEAKERS=A
+SNEAKERS2=A
+SNEAKERS3=A
+SNEAKERS4=A
+SNEAKERS5=A
+SNEAKERS=A
 SNEAKERS=0
 
 [eof]
diff --git a/res/ATTRACT/SNOGGLE b/res/ATTRACT/SNOGGLE
index 338ae2828..a984c9ffa 100644
--- a/res/ATTRACT/SNOGGLE
+++ b/res/ATTRACT/SNOGGLE
@@ -4,6 +4,6 @@
 #
 
 SNOGGLE=C
-ACTION.HGR/SNOGGLE=A
+SNOGGLE=A
 
 [eof]
diff --git a/res/ATTRACT/SOLO.FLIGHT b/res/ATTRACT/SOLO.FLIGHT
index f715267ab..ece921737 100644
--- a/res/ATTRACT/SOLO.FLIGHT
+++ b/res/ATTRACT/SOLO.FLIGHT
@@ -4,6 +4,6 @@
 #
 
 SOLO.FLIGHT=C
-ACTION.HGR/SOLO.FLIGHT=A
+SOLO.FLIGHT=A
 
 [eof]
diff --git a/res/ATTRACT/SPACE.EGGS b/res/ATTRACT/SPACE.EGGS
index 60020b595..5added60a 100644
--- a/res/ATTRACT/SPACE.EGGS
+++ b/res/ATTRACT/SPACE.EGGS
@@ -4,7 +4,7 @@
 #
 
 SPACE.EGGS=C
-ACTION.HGR/SPACE.EGGS=A
+SPACE.EGGS=A
 SPACE.EGGS=0
 
 [eof]
diff --git a/res/ATTRACT/SPACE.QUARKS b/res/ATTRACT/SPACE.QUARKS
index 8d9bec340..c5c81fe72 100644
--- a/res/ATTRACT/SPACE.QUARKS
+++ b/res/ATTRACT/SPACE.QUARKS
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/SPACE.QUARKS=A
+SPACE.QUARKS=A
 SPACE.QUARKS=0
 
 [eof]
diff --git a/res/ATTRACT/SPACE.RAIDERS b/res/ATTRACT/SPACE.RAIDERS
index abf633803..a09a70ca7 100644
--- a/res/ATTRACT/SPACE.RAIDERS
+++ b/res/ATTRACT/SPACE.RAIDERS
@@ -4,6 +4,6 @@
 #
 
 SPACE.RAIDERS=C
-ACTION.HGR/SPACE.RAIDERS=A
+SPACE.RAIDERS=A
 
 [eof]
diff --git a/res/ATTRACT/SPARE.CHANGE b/res/ATTRACT/SPARE.CHANGE
index 86be15375..da9bf1cdb 100644
--- a/res/ATTRACT/SPARE.CHANGE
+++ b/res/ATTRACT/SPARE.CHANGE
@@ -4,7 +4,7 @@
 #
 
 SPARE.CHANGE=C
-ACTION.HGR/SPARE.CHANGE=A
+SPARE.CHANGE=A
 SPARE.CHANGE=0
 SPCARTOON.1=0
 SPCARTOON.2=0
diff --git a/res/ATTRACT/SPECTRE b/res/ATTRACT/SPECTRE
index 9e1edc642..3dc83c4d3 100644
--- a/res/ATTRACT/SPECTRE
+++ b/res/ATTRACT/SPECTRE
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/SPECTRE=A
+SPECTRE=A
 
 [eof]
diff --git a/res/ATTRACT/SPIDER.RAID b/res/ATTRACT/SPIDER.RAID
index 6d889c1ed..152f5f9d0 100644
--- a/res/ATTRACT/SPIDER.RAID
+++ b/res/ATTRACT/SPIDER.RAID
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/SPIDER.RAID=A
+SPIDER.RAID=A
 SPIDER.RAID=0
 
 [eof]
diff --git a/res/ATTRACT/SPINDIZZY b/res/ATTRACT/SPINDIZZY
index 83e001b08..9cf699a5f 100644
--- a/res/ATTRACT/SPINDIZZY
+++ b/res/ATTRACT/SPINDIZZY
@@ -4,6 +4,6 @@
 #
 
 SPINDIZZY=C
-ACTION.HGR/SPINDIZZY=A
+SPINDIZZY=A
 
 [eof]
diff --git a/res/ATTRACT/SPY.HUNTER b/res/ATTRACT/SPY.HUNTER
index 3b45887db..4254db13d 100644
--- a/res/ATTRACT/SPY.HUNTER
+++ b/res/ATTRACT/SPY.HUNTER
@@ -3,8 +3,8 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/SPY.HUNTER2=A
-ACTION.HGR/SPY.HUNTER=A
+SPY.HUNTER2=A
+SPY.HUNTER=A
 SPY.HUNTER=0
 
 [eof]
diff --git a/res/ATTRACT/SS b/res/ATTRACT/SS
index 97cfd162f..a1f9cfb0e 100644
--- a/res/ATTRACT/SS
+++ b/res/ATTRACT/SS
@@ -4,7 +4,7 @@
 #
 
 SS=C
-ACTION.HGR/SS=A
-ACTION.HGR/SSB=A
+SS=A
+SSB=A
 
 [eof]
diff --git a/res/ATTRACT/SS2 b/res/ATTRACT/SS2
index 02b2480af..60760cad9 100644
--- a/res/ATTRACT/SS2
+++ b/res/ATTRACT/SS2
@@ -4,7 +4,7 @@
 #
 
 SS2=C
-ACTION.HGR/SS2=A
-ACTION.HGR/SS2B=A
+SS2=A
+SS2B=A
 
 [eof]
diff --git a/res/ATTRACT/STAR.BLAZER b/res/ATTRACT/STAR.BLAZER
index c1f96eac0..ca3f3fdd5 100644
--- a/res/ATTRACT/STAR.BLAZER
+++ b/res/ATTRACT/STAR.BLAZER
@@ -4,8 +4,8 @@
 #
 
 STAR.BLAZER=C
-ACTION.HGR/STAR.BLAZER2=A
-ACTION.HGR/STAR.BLAZER=A
+STAR.BLAZER2=A
+STAR.BLAZER=A
 STAR.BLAZER=0
 
 [eof]
diff --git a/res/ATTRACT/STAR.CRUISER b/res/ATTRACT/STAR.CRUISER
index 06bf49d96..df68643d0 100644
--- a/res/ATTRACT/STAR.CRUISER
+++ b/res/ATTRACT/STAR.CRUISER
@@ -4,6 +4,6 @@
 #
 
 STAR.CRUISER=C
-ACTION.HGR/STAR.CRUISER=A
+STAR.CRUISER=A
 
 [eof]
diff --git a/res/ATTRACT/STAR.THIEF b/res/ATTRACT/STAR.THIEF
index 17f28ccca..da35f8ff4 100644
--- a/res/ATTRACT/STAR.THIEF
+++ b/res/ATTRACT/STAR.THIEF
@@ -4,7 +4,7 @@
 #
 
 STAR.THIEF=C
-ACTION.HGR/STAR.THIEF2=A
-ACTION.HGR/STAR.THIEF=A
+STAR.THIEF2=A
+STAR.THIEF=A
 
 [eof]
diff --git a/res/ATTRACT/STARBLASTER b/res/ATTRACT/STARBLASTER
index 7202e8ec1..abf544e6e 100644
--- a/res/ATTRACT/STARBLASTER
+++ b/res/ATTRACT/STARBLASTER
@@ -4,6 +4,6 @@
 #
 
 STARBLASTER=C
-ACTION.HGR/STARBLASTER=A
+STARBLASTER=A
 
 [eof]
diff --git a/res/ATTRACT/STARGATE b/res/ATTRACT/STARGATE
index bfaa73273..3cb92bb21 100644
--- a/res/ATTRACT/STARGATE
+++ b/res/ATTRACT/STARGATE
@@ -3,8 +3,8 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/STARGATE2=A
-ACTION.HGR/STARGATE=A
+STARGATE2=A
+STARGATE=A
 STARGATE=0
 
 [eof]
diff --git a/res/ATTRACT/STARGLIDER b/res/ATTRACT/STARGLIDER
index f2ef86620..2dd276842 100644
--- a/res/ATTRACT/STARGLIDER
+++ b/res/ATTRACT/STARGLIDER
@@ -4,6 +4,6 @@
 #
 
 STARGLIDER=C
-ACTION.HGR/STARGLIDER=A
+STARGLIDER=A
 
 [eof]
diff --git a/res/ATTRACT/STATION.5 b/res/ATTRACT/STATION.5
index 0951b50bb..c9df18759 100644
--- a/res/ATTRACT/STATION.5
+++ b/res/ATTRACT/STATION.5
@@ -4,6 +4,6 @@
 #
 
 STATION.5=C
-ACTION.HGR/STATION.5=A
+STATION.5=A
 
 [eof]
diff --git a/res/ATTRACT/STELLAR.7 b/res/ATTRACT/STELLAR.7
index f7efde04a..68bb1f929 100644
--- a/res/ATTRACT/STELLAR.7
+++ b/res/ATTRACT/STELLAR.7
@@ -4,7 +4,7 @@
 #
 
 STELLAR.7=C
-ACTION.HGR/STELLAR.7=A
+STELLAR.7=A
 STELLAR.7=0
 
 [eof]
diff --git a/res/ATTRACT/SU b/res/ATTRACT/SU
index fc0ba0753..cea549835 100644
--- a/res/ATTRACT/SU
+++ b/res/ATTRACT/SU
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/SU=A
+SU=A
 
 [eof]
diff --git a/res/ATTRACT/SUCCESSION b/res/ATTRACT/SUCCESSION
index f106903d3..261a5164b 100644
--- a/res/ATTRACT/SUCCESSION
+++ b/res/ATTRACT/SUCCESSION
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/SUCCESSION=A
+SUCCESSION=A
 
 [eof]
diff --git a/res/ATTRACT/SUPER.BUNNY b/res/ATTRACT/SUPER.BUNNY
index dfec203c9..185a33d00 100644
--- a/res/ATTRACT/SUPER.BUNNY
+++ b/res/ATTRACT/SUPER.BUNNY
@@ -4,6 +4,6 @@
 #
 
 SUPER.BUNNY=C
-ACTION.HGR/SUPER.BUNNY=A
+SUPER.BUNNY=A
 
 [eof]
diff --git a/res/ATTRACT/SUPER.HUEY b/res/ATTRACT/SUPER.HUEY
index 8e2716e5c..28cc69229 100644
--- a/res/ATTRACT/SUPER.HUEY
+++ b/res/ATTRACT/SUPER.HUEY
@@ -4,6 +4,6 @@
 #
 
 SUPER.HUEY=C
-ACTION.HGR/SUPER.HUEY=A
+SUPER.HUEY=A
 
 [eof]
diff --git a/res/ATTRACT/SUPER.ZAXXON b/res/ATTRACT/SUPER.ZAXXON
index ddfc3c8b3..d0377b609 100644
--- a/res/ATTRACT/SUPER.ZAXXON
+++ b/res/ATTRACT/SUPER.ZAXXON
@@ -4,7 +4,7 @@
 #
 
 SUPER.ZAXXON=C
-ACTION.HGR/SUPER.ZAXXON2=A
-ACTION.HGR/SUPER.ZAXXON=A
+SUPER.ZAXXON2=A
+SUPER.ZAXXON=A
 
 [eof]
diff --git a/res/ATTRACT/SWASHBUCKLER b/res/ATTRACT/SWASHBUCKLER
index b771c6b94..59b642f7e 100644
--- a/res/ATTRACT/SWASHBUCKLER
+++ b/res/ATTRACT/SWASHBUCKLER
@@ -4,6 +4,6 @@
 #
 
 SWASHBUCKLER=C
-ACTION.HGR/SWASHBUCKLER=A
+SWASHBUCKLER=A
 
 [eof]
diff --git a/res/ATTRACT/TAPPER b/res/ATTRACT/TAPPER
index f946f6603..2e8ee66c5 100644
--- a/res/ATTRACT/TAPPER
+++ b/res/ATTRACT/TAPPER
@@ -4,6 +4,6 @@
 #
 
 TAPPER=C
-ACTION.HGR/TAPPER=A
+TAPPER=A
 
 [eof]
diff --git a/res/ATTRACT/TB b/res/ATTRACT/TB
index 756203e4d..6fc002db6 100644
--- a/res/ATTRACT/TB
+++ b/res/ATTRACT/TB
@@ -4,7 +4,7 @@
 #
 
 TB=C
-ACTION.HGR/TB=A
+TB=A
 TB=0
 
 [eof]
diff --git a/res/ATTRACT/TC b/res/ATTRACT/TC
index 3b00214bb..f7266853b 100644
--- a/res/ATTRACT/TC
+++ b/res/ATTRACT/TC
@@ -5,8 +5,8 @@
 
 TC=C
 ACTION.DHGR/TC=B
-ACTION.HGR/TC2=A
-ACTION.HGR/TC3=A
-ACTION.HGR/TC=A
+TC2=A
+TC3=A
+TC=A
 
 [eof]
diff --git a/res/ATTRACT/TELEPORT b/res/ATTRACT/TELEPORT
index a2ac51115..5e815cf3c 100644
--- a/res/ATTRACT/TELEPORT
+++ b/res/ATTRACT/TELEPORT
@@ -4,6 +4,6 @@
 #
 
 TELEPORT=C
-ACTION.HGR/TELEPORT=A
+TELEPORT=A
 
 [eof]
diff --git a/res/ATTRACT/TETRIS b/res/ATTRACT/TETRIS
index aa58f9cf8..35b0a2c5c 100644
--- a/res/ATTRACT/TETRIS
+++ b/res/ATTRACT/TETRIS
@@ -8,11 +8,11 @@ ACTION.DHGR/TETRIS2=B
 ACTION.DHGR/TETRIS3=B
 ACTION.DHGR/TETRIS4=B
 ACTION.DHGR/TETRIS=B
-ACTION.HGR/TETRIS2=A
-ACTION.HGR/TETRIS3=A
-ACTION.HGR/TETRIS4=A
-ACTION.HGR/TETRIS5=A
-ACTION.HGR/TETRIS6=A
-ACTION.HGR/TETRIS=A
+TETRIS2=A
+TETRIS3=A
+TETRIS4=A
+TETRIS5=A
+TETRIS6=A
+TETRIS=A
 
 [eof]
diff --git a/res/ATTRACT/THE.BILESTOAD b/res/ATTRACT/THE.BILESTOAD
index d0412eac1..91920cd16 100644
--- a/res/ATTRACT/THE.BILESTOAD
+++ b/res/ATTRACT/THE.BILESTOAD
@@ -4,7 +4,7 @@
 #
 
 THE.BILESTOAD=C
-ACTION.HGR/THE.BILESTOAD2=A
-ACTION.HGR/THE.BILESTOAD=A
+THE.BILESTOAD2=A
+THE.BILESTOAD=A
 
 [eof]
diff --git a/res/ATTRACT/THE.DAM.BUSTERS b/res/ATTRACT/THE.DAM.BUSTERS
index 8b975d037..bea990b10 100644
--- a/res/ATTRACT/THE.DAM.BUSTERS
+++ b/res/ATTRACT/THE.DAM.BUSTERS
@@ -4,6 +4,6 @@
 #
 
 THE.DAM.BUSTERS=C
-ACTION.HGR/THE.DAM.BUSTERS=A
+THE.DAM.BUSTERS=A
 
 [eof]
diff --git a/res/ATTRACT/THE.GOONIES b/res/ATTRACT/THE.GOONIES
index b11e2f915..3ff226fce 100644
--- a/res/ATTRACT/THE.GOONIES
+++ b/res/ATTRACT/THE.GOONIES
@@ -4,12 +4,12 @@
 #
 
 THE.GOONIES=C
-ACTION.HGR/THE.GOONIES2=A
-ACTION.HGR/THE.GOONIES3=A
-ACTION.HGR/THE.GOONIES4=A
-ACTION.HGR/THE.GOONIES5=A
-ACTION.HGR/THE.GOONIES6=A
-ACTION.HGR/THE.GOONIES=A
+THE.GOONIES2=A
+THE.GOONIES3=A
+THE.GOONIES4=A
+THE.GOONIES5=A
+THE.GOONIES6=A
+THE.GOONIES=A
 THE.GOONIES=0
 
 [eof]
diff --git a/res/ATTRACT/THE.HEIST b/res/ATTRACT/THE.HEIST
index 984cc1b4c..e7ff3acca 100644
--- a/res/ATTRACT/THE.HEIST
+++ b/res/ATTRACT/THE.HEIST
@@ -4,15 +4,15 @@
 #
 
 THE.HEIST=C
-ACTION.HGR/THE.HEIST01=A
-ACTION.HGR/THE.HEIST02=A
-ACTION.HGR/THE.HEIST03=A
-ACTION.HGR/THE.HEIST04=A
-ACTION.HGR/THE.HEIST05=A
-ACTION.HGR/THE.HEIST06=A
-ACTION.HGR/THE.HEIST07=A
-ACTION.HGR/THE.HEIST08=A
-ACTION.HGR/THE.HEIST09=A
-ACTION.HGR/THE.HEIST10=A
+THE.HEIST01=A
+THE.HEIST02=A
+THE.HEIST03=A
+THE.HEIST04=A
+THE.HEIST05=A
+THE.HEIST06=A
+THE.HEIST07=A
+THE.HEIST08=A
+THE.HEIST09=A
+THE.HEIST10=A
 
 [eof]
diff --git a/res/ATTRACT/THE.SPACE.ARK b/res/ATTRACT/THE.SPACE.ARK
index c92037c48..d0ed89ce6 100644
--- a/res/ATTRACT/THE.SPACE.ARK
+++ b/res/ATTRACT/THE.SPACE.ARK
@@ -4,6 +4,6 @@
 #
 
 THE.SPACE.ARK=C
-ACTION.HGR/THE.SPACE.ARK=A
+THE.SPACE.ARK=A
 
 [eof]
diff --git a/res/ATTRACT/THEXDER b/res/ATTRACT/THEXDER
index 106360e29..dfd161804 100644
--- a/res/ATTRACT/THEXDER
+++ b/res/ATTRACT/THEXDER
@@ -8,7 +8,7 @@ ACTION.DHGR/THEXDER2=B
 ACTION.DHGR/THEXDER3=B
 ACTION.DHGR/THEXDER4=B
 ACTION.DHGR/THEXDER=B
-ACTION.HGR/THEXDER2=A
-ACTION.HGR/THEXDER=A
+THEXDER2=A
+THEXDER=A
 
 [eof]
diff --git a/res/ATTRACT/THIEF b/res/ATTRACT/THIEF
index 550393f7c..a73eef1c2 100644
--- a/res/ATTRACT/THIEF
+++ b/res/ATTRACT/THIEF
@@ -4,6 +4,6 @@
 #
 
 THIEF=C
-ACTION.HGR/THIEF=A
+THIEF=A
 
 [eof]
diff --git a/res/ATTRACT/THRESHOLD b/res/ATTRACT/THRESHOLD
index 981180e77..df6b6edb7 100644
--- a/res/ATTRACT/THRESHOLD
+++ b/res/ATTRACT/THRESHOLD
@@ -4,6 +4,6 @@
 #
 
 THRESHOLD=C
-ACTION.HGR/THRESHOLD=A
+THRESHOLD=A
 
 [eof]
diff --git a/res/ATTRACT/THUNDER.BOMBS b/res/ATTRACT/THUNDER.BOMBS
index d087a6019..f5cab4983 100644
--- a/res/ATTRACT/THUNDER.BOMBS
+++ b/res/ATTRACT/THUNDER.BOMBS
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/THUNDER.BOMBS=A
+THUNDER.BOMBS=A
 
 [eof]
diff --git a/res/ATTRACT/TITAN.CRONUS b/res/ATTRACT/TITAN.CRONUS
index 914200fcb..eb6612a27 100644
--- a/res/ATTRACT/TITAN.CRONUS
+++ b/res/ATTRACT/TITAN.CRONUS
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/TITAN.CRONUS2=A
-ACTION.HGR/TITAN.CRONUS=A
+TITAN.CRONUS2=A
+TITAN.CRONUS=A
 
 [eof]
diff --git a/res/ATTRACT/TOMAHAWK b/res/ATTRACT/TOMAHAWK
index eb4fdfa4b..eb080297a 100644
--- a/res/ATTRACT/TOMAHAWK
+++ b/res/ATTRACT/TOMAHAWK
@@ -4,6 +4,6 @@
 #
 
 TOMAHAWK=C
-ACTION.HGR/TOMAHAWK=A
+TOMAHAWK=A
 
 [eof]
diff --git a/res/ATTRACT/TRACK.ATTACK b/res/ATTRACT/TRACK.ATTACK
index 92d4caa3f..59842e7d2 100644
--- a/res/ATTRACT/TRACK.ATTACK
+++ b/res/ATTRACT/TRACK.ATTACK
@@ -4,6 +4,6 @@
 #
 
 TRACK.ATTACK=C
-ACTION.HGR/TRACK.ATTACK=A
+TRACK.ATTACK=A
 
 [eof]
diff --git a/res/ATTRACT/TRIAD b/res/ATTRACT/TRIAD
index db4b7ecb4..cd2ce59d5 100644
--- a/res/ATTRACT/TRIAD
+++ b/res/ATTRACT/TRIAD
@@ -4,7 +4,7 @@
 #
 
 TRIAD=C
-ACTION.HGR/TRIAD2=A
-ACTION.HGR/TRIAD=A
+TRIAD2=A
+TRIAD=A
 
 [eof]
diff --git a/res/ATTRACT/TU b/res/ATTRACT/TU
index 35fb48659..72de84afa 100644
--- a/res/ATTRACT/TU
+++ b/res/ATTRACT/TU
@@ -3,6 +3,6 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/TU=A
+TU=A
 
 [eof]
diff --git a/res/ATTRACT/TUNNEL.TERROR b/res/ATTRACT/TUNNEL.TERROR
index edafa592f..dbc964127 100644
--- a/res/ATTRACT/TUNNEL.TERROR
+++ b/res/ATTRACT/TUNNEL.TERROR
@@ -3,7 +3,7 @@
 # This file is automatically generated
 #
 
-ACTION.HGR/TUNNEL.TERROR=A
+TUNNEL.TERROR=A
 TUNNEL.TERROR=0
 
 [eof]
diff --git a/res/ATTRACT/TWERPS b/res/ATTRACT/TWERPS
index d59aed995..65d5e89d1 100644
--- a/res/ATTRACT/TWERPS
+++ b/res/ATTRACT/TWERPS
@@ -4,7 +4,7 @@
 #
 
 TWERPS=C
-ACTION.HGR/TWERPS2=A
-ACTION.HGR/TWERPS=A
+TWERPS2=A
+TWERPS=A
 
 [eof]
diff --git a/res/ATTRACT/UD b/res/ATTRACT/UD
index d333f96e5..c25340baf 100644
--- a/res/ATTRACT/UD
+++ b/res/ATTRACT/UD
@@ -4,6 +4,6 @@
 #
 
 UD=C
-ACTION.HGR/UD=A
+UD=A
 
 [eof]
diff --git a/res/ATTRACT/VINDICATOR b/res/ATTRACT/VINDICATOR
index 4ece51cdd..619848a1a 100644
--- a/res/ATTRACT/VINDICATOR
+++ b/res/ATTRACT/VINDICATOR
@@ -4,8 +4,8 @@
 #
 
 VINDICATOR=C
-ACTION.HGR/VINDICATOR2=A
-ACTION.HGR/VINDICATOR=A
+VINDICATOR2=A
+VINDICATOR=A
 VINDICATOR=0
 
 [eof]
diff --git a/res/ATTRACT/WARP.DESTROYER b/res/ATTRACT/WARP.DESTROYER
index dae9e9321..7418fdd44 100644
--- a/res/ATTRACT/WARP.DESTROYER
+++ b/res/ATTRACT/WARP.DESTROYER
@@ -4,7 +4,7 @@
 #
 
 WARP.DESTROYER=C
-ACTION.HGR/WARP.DESTROYER=A
+WARP.DESTROYER=A
 WARP.DESTROYER=0
 
 [eof]
diff --git a/res/ATTRACT/WAVY.NAVY b/res/ATTRACT/WAVY.NAVY
index 4996625b4..ae4c46798 100644
--- a/res/ATTRACT/WAVY.NAVY
+++ b/res/ATTRACT/WAVY.NAVY
@@ -4,11 +4,11 @@
 #
 
 WAVY.NAVY=C
-ACTION.HGR/WAVY.NAVY2=A
-ACTION.HGR/WAVY.NAVY3=A
-ACTION.HGR/WAVY.NAVY4=A
-ACTION.HGR/WAVY.NAVY5=A
-ACTION.HGR/WAVY.NAVY=A
+WAVY.NAVY2=A
+WAVY.NAVY3=A
+WAVY.NAVY4=A
+WAVY.NAVY5=A
+WAVY.NAVY=A
 WAVY.NAVY=0
 
 [eof]
diff --git a/res/ATTRACT/WAYOUT b/res/ATTRACT/WAYOUT
index 6dd0b5f3a..754b9f5c6 100644
--- a/res/ATTRACT/WAYOUT
+++ b/res/ATTRACT/WAYOUT
@@ -4,7 +4,7 @@
 #
 
 WAYOUT=C
-ACTION.HGR/WAYOUT2=A
-ACTION.HGR/WAYOUT=A
+WAYOUT2=A
+WAYOUT=A
 
 [eof]
diff --git a/res/ATTRACT/WF b/res/ATTRACT/WF
index 8ea313815..d07266f57 100644
--- a/res/ATTRACT/WF
+++ b/res/ATTRACT/WF
@@ -4,8 +4,8 @@
 #
 
 WF=C
-ACTION.HGR/WF1=A
-ACTION.HGR/WF2=A
-ACTION.HGR/WF=A
+WF1=A
+WF2=A
+WF=A
 
 [eof]
diff --git a/res/ATTRACT/WILLY.BYTE b/res/ATTRACT/WILLY.BYTE
index 62f31b4d1..ba4a31038 100644
--- a/res/ATTRACT/WILLY.BYTE
+++ b/res/ATTRACT/WILLY.BYTE
@@ -4,9 +4,9 @@
 #
 
 WILLY.BYTE=C
-ACTION.HGR/WILLY.BYTE2=A
-ACTION.HGR/WILLY.BYTE3=A
-ACTION.HGR/WILLY.BYTE4=A
-ACTION.HGR/WILLY.BYTE=A
+WILLY.BYTE2=A
+WILLY.BYTE3=A
+WILLY.BYTE4=A
+WILLY.BYTE=A
 
 [eof]
diff --git a/res/ATTRACT/XEVIOUS b/res/ATTRACT/XEVIOUS
index d48650cd6..abbb5698b 100644
--- a/res/ATTRACT/XEVIOUS
+++ b/res/ATTRACT/XEVIOUS
@@ -4,7 +4,7 @@
 #
 
 XEVIOUS=C
-ACTION.HGR/XEVIOUS2=A
-ACTION.HGR/XEVIOUS=A
+XEVIOUS2=A
+XEVIOUS=A
 
 [eof]
diff --git a/res/ATTRACT/ZARGS b/res/ATTRACT/ZARGS
index e1c35dc9e..d0c5d53dd 100644
--- a/res/ATTRACT/ZARGS
+++ b/res/ATTRACT/ZARGS
@@ -4,6 +4,6 @@
 #
 
 ZARGS=C
-ACTION.HGR/ZARGS=A
+ZARGS=A
 
 [eof]
diff --git a/res/ATTRACT/ZAXXON b/res/ATTRACT/ZAXXON
index b4c61c9d2..d607f76b8 100644
--- a/res/ATTRACT/ZAXXON
+++ b/res/ATTRACT/ZAXXON
@@ -4,8 +4,8 @@
 #
 
 ZAXXON=C
-ACTION.HGR/ZAXXON2=A
-ACTION.HGR/ZAXXON3=A
-ACTION.HGR/ZAXXON=A
+ZAXXON2=A
+ZAXXON3=A
+ZAXXON=A
 
 [eof]
diff --git a/res/ATTRACT/ZENITH b/res/ATTRACT/ZENITH
index e90a63af5..a311f6f28 100644
--- a/res/ATTRACT/ZENITH
+++ b/res/ATTRACT/ZENITH
@@ -4,6 +4,6 @@
 #
 
 ZENITH=C
-ACTION.HGR/ZENITH=A
+ZENITH=A
 
 [eof]
diff --git a/res/_FileInformation.txt b/res/_FileInformation.txt
index 175835c13..80e6e977a 100644
--- a/res/_FileInformation.txt
+++ b/res/_FileInformation.txt
@@ -18,6 +18,14 @@ PRELAUNCH.IDX=Type(06),AuxType(6000),Access(C3)
 PRELAUNCH.ALL=Type(06),AuxType(0106),Access(C3)
 ARTWORK.IDX=Type(06),AuxType(2000),Access(C3)
 ARTWORK.ALL=Type(06),AuxType(1FF8),Access(C3)
+HGR0.IDX=Type(06),AuxType(4000),Access(C3)
+HGR1.IDX=Type(06),AuxType(4000),Access(C3)
+HGR2.IDX=Type(06),AuxType(4000),Access(C3)
+HGR3.IDX=Type(06),AuxType(4000),Access(C3)
+HGR4.IDX=Type(06),AuxType(4000),Access(C3)
+HGR5.IDX=Type(06),AuxType(4000),Access(C3)
+HGR6.IDX=Type(06),AuxType(4000),Access(C3)
+HGR.ALL=Type(06),AuxType(3FF8),Access(C3)
 COVER=Type(06),AuxType(2000),Access(C3)
 TITLE=Type(06),AuxType(2000),Access(C3)
 HELP=Type(06),AuxType(2000),Access(C3)
diff --git a/src/constants.a b/src/constants.a
index ac77db58c..406126ebc 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -149,7 +149,7 @@ CHEATS_ENABLED = %00001000
 iCurBlockLo    = $D401               ; constant
 iCurBlockHi    = $D403               ; constant
 launchpatch    = $D655               ; glue.launch.a
-iAddToPath     = $FE61               ; Roger Rabbit, avoid, use Infiltrator 2 style instead
+iAddToPath     = $FE5C               ; Roger Rabbit, avoid, use Infiltrator 2 style instead
 itraverse      = $D94C               ; Roger Rabbit, avoid, use Infiltrator 2 style instead
 ldrhi          = $56                 ; constant
 namlo          = $57                 ; constant
diff --git a/src/prodos.path.a b/src/prodos.path.a
index 4763f2961..8f219a61b 100644
--- a/src/prodos.path.a
+++ b/src/prodos.path.a
@@ -65,9 +65,16 @@ kAnimatedTitleDirectory
          !byte 15
          !raw  "TITLE.ANIMATED/"
 
-kHGRActionDirectory
-         !byte 11
-         !raw  "ACTION.HGR/"
+kHGRActionIndexFile
+         !byte 8
+         !raw  "HGR"
+gHGRActionIndexNumber
+         !raw  "_"
+         !raw  ".IDX"
+
+kHGRActionDataFile
+         !byte 7
+         !raw  "HGR.ALL"
 
 kDHGRActionDirectory
          !byte 12
diff --git a/src/ui.attract.hgr.a b/src/ui.attract.hgr.a
index 453b3ad6a..4296fc0cd 100644
--- a/src/ui.attract.hgr.a
+++ b/src/ui.attract.hgr.a
@@ -49,10 +49,20 @@ HGRActionSlideshow
 ;------------------------------------------------------------------------------
 HGRSingle
          +ST16 @fname
-         jsr   LoadFile              ; load compressed HGR screenshot at $3FF8
-         !word kRootDirectory
+
+         jsr   LoadHGRActionIndex
+
+         jsr   okvs_find
+         !word HGRActionIndexPtr
 @fname   !word $FDFD                 ; SMC
+         +ST16 @indexRecordPtr
+
+         jsr   LoadIndexedFile       ; load compressed HGR screenshot at $3FF8
+         !word kHGRActionDataFile
          !word $3FF8
+@indexRecordPtr
+         !word $FDFD                 ; SMC
+
          jsr   DecompressHGR
          jsr   LoadHGRTransition     ; load transition effect code at $6000
          jmp   ExecuteTransitionAt6000AndWait
@@ -141,7 +151,7 @@ HGRActionCallback
          bit   KBD
          bmi   HGRRTS
 
-         +ST16 +
+         +ST16 @fname
 
          jsr   FindGameInActionSlideshow
          ; if game name is not found (C will be set here), it means the game
@@ -155,9 +165,37 @@ HGRActionCallback
          +LD16 WINDEX                ; save game index in case user hits RETURN
          +ST16 gGameToLaunch         ; while it's visible (we'll launch it)
 
-         jsr   LoadFile              ; load compressed HGR screenshot at $3FF8
-         !word kHGRActionDirectory
-+        !word $FDFD                 ; SMC
+         +LD16 @fname
+         jsr   LoadHGRActionIndex
+
+         jsr   okvs_find
+         !word HGRActionIndexPtr
+@fname   !word $FDFD                 ; SMC
+         +ST16 @indexRecordPtr
+
+         jsr   LoadIndexedFile       ; load compressed HGR screenshot at $3FF8
+         !word kHGRActionDataFile
          !word $3FF8
+@indexRecordPtr
+         !word $FDFD                 ; SMC
+
          jsr   DecompressHGR
          jmp   DrawGameTitleInActionSlideshow
+
+LoadHGRActionIndex
+         +ST16 PTR
+         ldy   #1
+         lda   (PTR), y
+         sec
+         sbc   #$41
+         lsr
+         lsr
+         clc
+         adc   #$30                  ; A = "0".."6" (ASCII)
+         sta   gHGRActionIndexNumber ; part of kHGRActionIndexFile
+         jsr   LoadFile              ; load index file into $4000
+         !word kRootDirectory
+         !word kHGRActionIndexFile
+HGRActionIndexPtr
+         !word $4000
+         rts