diff --git a/res/DEMO/LAZER.SILK b/res/DEMO/LAZER.SILK
index 4d668fe2d..a31d0cfcb 100755
Binary files a/res/DEMO/LAZER.SILK and b/res/DEMO/LAZER.SILK differ
diff --git a/res/DEMO/LOST.TOMB b/res/DEMO/LOST.TOMB
index 1f426b012..22caea69c 100755
Binary files a/res/DEMO/LOST.TOMB and b/res/DEMO/LOST.TOMB differ
diff --git a/res/DEMO/MOON.PATROL b/res/DEMO/MOON.PATROL
index 344e19652..d0b8a6b4f 100755
Binary files a/res/DEMO/MOON.PATROL and b/res/DEMO/MOON.PATROL differ
diff --git a/res/DEMO/N.O.R.A.D b/res/DEMO/N.O.R.A.D
index 99295fed7..c0ed8191f 100755
Binary files a/res/DEMO/N.O.R.A.D and b/res/DEMO/N.O.R.A.D differ
diff --git a/res/DEMO/NIBBLER b/res/DEMO/NIBBLER
index fa3456b4c..fac9f0bef 100755
Binary files a/res/DEMO/NIBBLER and b/res/DEMO/NIBBLER differ
diff --git a/res/DEMO/OM b/res/DEMO/OM
index d25593c32..7da8c3f74 100755
Binary files a/res/DEMO/OM and b/res/DEMO/OM differ
diff --git a/res/DEMO/PACMAN b/res/DEMO/PACMAN
index a9baaf68a..a527d19ed 100644
Binary files a/res/DEMO/PACMAN and b/res/DEMO/PACMAN differ
diff --git a/res/DEMO/PEST.PATROL b/res/DEMO/PEST.PATROL
index 39b52daf3..8181f1098 100755
Binary files a/res/DEMO/PEST.PATROL and b/res/DEMO/PEST.PATROL differ
diff --git a/res/DEMO/PHASER.FIRE b/res/DEMO/PHASER.FIRE
index 9163e9d26..6e5c25719 100755
Binary files a/res/DEMO/PHASER.FIRE and b/res/DEMO/PHASER.FIRE differ
diff --git a/res/DEMO/PITFALL.II b/res/DEMO/PITFALL.II
index c08d93534..732e83c15 100755
Binary files a/res/DEMO/PITFALL.II and b/res/DEMO/PITFALL.II differ
diff --git a/res/DEMO/POOYAN b/res/DEMO/POOYAN
index de2b3342c..c30ad8617 100755
Binary files a/res/DEMO/POOYAN and b/res/DEMO/POOYAN differ
diff --git a/res/DEMO/SNAKE.BYTE b/res/DEMO/SNAKE.BYTE
index e327c3309..135e94fbd 100755
Binary files a/res/DEMO/SNAKE.BYTE and b/res/DEMO/SNAKE.BYTE differ
diff --git a/res/DEMO/SNEAKERS b/res/DEMO/SNEAKERS
index 6e110acd9..9869b8bcd 100644
Binary files a/res/DEMO/SNEAKERS and b/res/DEMO/SNEAKERS differ
diff --git a/res/DEMO/SPACE.EGGS b/res/DEMO/SPACE.EGGS
index 93adb7b6e..536baf15e 100755
Binary files a/res/DEMO/SPACE.EGGS and b/res/DEMO/SPACE.EGGS differ
diff --git a/res/DEMO/SPACE.QUARKS b/res/DEMO/SPACE.QUARKS
index 6f2ea8b5f..54f1977ce 100755
Binary files a/res/DEMO/SPACE.QUARKS and b/res/DEMO/SPACE.QUARKS differ
diff --git a/res/DEMO/SPIDER.RAID b/res/DEMO/SPIDER.RAID
index 8a4828d89..22f097d1e 100755
Binary files a/res/DEMO/SPIDER.RAID and b/res/DEMO/SPIDER.RAID differ
diff --git a/res/DEMO/SPY.HUNTER b/res/DEMO/SPY.HUNTER
index fb6dc3ced..09c4e5d14 100755
Binary files a/res/DEMO/SPY.HUNTER and b/res/DEMO/SPY.HUNTER differ
diff --git a/res/DEMO/STAR.BLAZER b/res/DEMO/STAR.BLAZER
index 14dc3b03a..212f3345e 100755
Binary files a/res/DEMO/STAR.BLAZER and b/res/DEMO/STAR.BLAZER differ
diff --git a/res/DEMO/STARGATE b/res/DEMO/STARGATE
index e51fe2abe..a3756ea51 100755
Binary files a/res/DEMO/STARGATE and b/res/DEMO/STARGATE differ
diff --git a/res/DEMO/TUNNEL.TERROR b/res/DEMO/TUNNEL.TERROR
index 325dbc769..ef9613295 100755
Binary files a/res/DEMO/TUNNEL.TERROR and b/res/DEMO/TUNNEL.TERROR differ
diff --git a/res/DEMO/WAVY.NAVY b/res/DEMO/WAVY.NAVY
index bea826aa3..bbdf2469a 100644
Binary files a/res/DEMO/WAVY.NAVY and b/res/DEMO/WAVY.NAVY differ
diff --git a/res/GAMES.CONF b/res/GAMES.CONF
index 7279d4122..e6c9f1ad3 100755
--- a/res/GAMES.CONF
+++ b/res/GAMES.CONF
@@ -245,14 +245,14 @@
 00011,LA=Lamb Chops!
 00010,LANCASTER=Lancaster
 10001,LASER.BOUNCE=Laser Bounce
-00010,LAZER.SILK=Lazer Silk
+00011,LAZER.SILK=Lazer Silk
 00070,LEMMINGS=Lemmings
 00010,LEMM.SIR=Lemmings (Sirius)
 00010,LL=Lethal Labyrinth
 00000,LP=Little Computer People
 00011,LC=Lock 'n' Chase
 00070,LODE.RUNNER=Lode Runner
-10030,LOST.TOMB=Lost Tomb
+10031,LOST.TOMB=Lost Tomb
 00001,LUNAR.EXPLORER=Lunar Explorer
 00040,LUNAR.LEEPERS=Lunar Leepers
 00010,M.I.R.V=M I R V
@@ -280,32 +280,32 @@
 10060,MT=Mission on Thunderhead
 00010,MONSTER.MASH=Monster Mash
 00011,MZ=Montezuma's Revenge
-00010,MOON.PATROL=Moon Patrol
+00011,MOON.PATROL=Moon Patrol
 00011,MOUSKATTACK=Mouskattack
 00010,MC=Mr. Cool
 10010,MD=Mr. Do!
 10011,MR=Mr. Robot
 00011,MP=Ms. Pacman
 00010,MUTANT=Mutant
-00000,N.O.R.A.D=N O R A D
+00001,N.O.R.A.D=N O R A D
 00001,NARNIA=Narnia
 00040,NEON=Neon
 00011,NEPTUNE=Neptune
 00071,NT=Neut Tower
 10000,NEUTRONS=Neutrons
-00040,NIBBLER=Nibbler
+00041,NIBBLER=Nibbler
 00001,NIGHT.CRAWLER=Night Crawler
 00070,NM=Night Mission Pinball
 00010,NIGHT.STALKER=Night Stalker
 00010,NI=Nightmare Gallery
-00010,OM=O'Riley's Mine
+00011,OM=O'Riley's Mine
 00010,OID.ZONE=Oid Zone
 10010,OI=Oil's Well
 00071,ORBITRON=Orbitron
 00000,OW=Out of This World
 00011,OUTPOST=Outpost
 00001,OUTWORLD=Outworld
-00010,PACMAN=Pacman
+00011,PACMAN=Pacman
 10001,PAIPEC=Paipec
 00011,PB=Pandora's Box
 01010,PAPERBOY=Paperboy
@@ -314,24 +314,24 @@
 10010,PENETRATOR=Penetrator
 00010,PENGO=Pengo
 10010,PENTAPUS=Pentapus
-00010,PEST.PATROL=Pest Patrol
+00011,PEST.PATROL=Pest Patrol
 10011,PHANTOMS.FIVE=Phantoms Five
 00010,PR=Pharaoh's Revenge
-00010,PHASER.FIRE=Phaser Fire
+00011,PHASER.FIRE=Phaser Fire
 00001,PHOTAR=Photar
 00051,PICNIC.PARANOIA=Picnic Paranoia
 00010,PM=Pie-Man
 00011,PIG.PEN=Pig Pen
 10031,PILL.BOX=Pill Box
 01150,PIPE.DREAM=Pipe Dream
-10000,PITFALL.II=Pitfall II
+10001,PITFALL.II=Pitfall II
 00001,PITSTOP.II=Pitstop II
 10001,PLANET.PROTECTR=Planet Protector
 10011,PLANETOIDS=Planetoids
 00010,PLASMANIA=Plasmania
 11110,PLATOON=Platoon
 10001,POLLYWOG=Pollywog
-00010,POOYAN=Pooyan
+00011,POOYAN=Pooyan
 01140,PP=Prince of Persia
 00010,PULSAR.II=Pulsar II
 00011,QUASAR=Quasar
@@ -378,13 +378,13 @@
 00060,SC=Situation Critical
 10060,SKYFOX=Skyfox
 00011,SNACK.ATTACK=Snack Attack
-00010,SNAKE.BYTE=Snake Byte
-00010,SNEAKERS=Sneakers
+00011,SNAKE.BYTE=Snake Byte
+00011,SNEAKERS=Sneakers
 00071,SNOGGLE=Snoggle
 01100,SO=Soko-Ban
-10000,SPACE.EGGS=Space Eggs
+10001,SPACE.EGGS=Space Eggs
 00001,SPACE.KADET=Space Kadet
-00010,SPACE.QUARKS=Space Quarks
+00011,SPACE.QUARKS=Space Quarks
 00001,SPACE.RACE=Space Race
 00001,SPACE.RAIDERS=Space Raiders
 10041,SPACE.RESCUE=Space Rescue
@@ -392,17 +392,17 @@
 00070,SPARE.CHANGE=Spare Change
 00010,SPECTRE=Spectre
 01060,SPELLWIELDER=Spellwielder
-00010,SPIDER.RAID=Spider Raid
+00011,SPIDER.RAID=Spider Raid
 01160,SPIDERBOT=Spiderbot
 10011,SPINDIZZY=Spindizzy
 10030,SPUTNIK.ATTACK=Sputnik Attack
-00010,SPY.HUNTER=Spy Hunter
+00011,SPY.HUNTER=Spy Hunter
 00000,SS=Spy vs Spy
 00000,SS2=Spy vs Spy 2
 01100,SS3=Spy vs Spy 3
 00010,SD=Spy's Demise
 10001,STAR.AVENGER=Star Avenger
-00040,STAR.BLAZER=Star Blazer
+00041,STAR.BLAZER=Star Blazer
 10001,STAR.CLONES=Star Clones
 10011,STAR.CRUISER=Star Cruiser
 00051,STAR.DANCE=Star Dance
@@ -410,7 +410,7 @@
 00011,STAR.THIEF=Star Thief
 10010,STARBALL=Starball
 10011,STARBLASTER=Starblaster
-10030,STARGATE=Stargate
+10031,STARGATE=Stargate
 10060,STARGLIDER=Starglider
 10001,STARMINES=Starmines
 00000,STATION.5=Station 5
@@ -459,7 +459,7 @@
 00011,TROMPERS=Trompers
 10041,TSUNAMI=Tsunami
 10070,TB=Tubeway ][
-00010,TUNNEL.TERROR=Tunnel Terror
+00011,TUNNEL.TERROR=Tunnel Terror
 00011,TWERPS=Twerps
 10010,UD=Up'n Down
 01110,VICTORY.ROAD=Victory Road
@@ -470,7 +470,7 @@
 00001,WALL.DEFENCE=Wall Defence
 00010,WARGLE=Wargle
 00060,WARP.DESTROYER=Warp Destroyer
-00010,WAVY.NAVY=Wavy Navy
+00011,WAVY.NAVY=Wavy Navy
 00000,WAYOUT=Wayout
 11110,RR=Who Framed Roger Rabbit
 10011,WHOMPER.STOMPER=Whomper Stomper
diff --git a/src/demo/lazer.silk.a b/src/demo/lazer.silk.a
index c8c431214..b660eb9a9 100644
--- a/src/demo/lazer.silk.a
+++ b/src/demo/lazer.silk.a
@@ -8,9 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $404B
@@ -55,7 +54,7 @@
          jmp   ($0020)
 
 title    !byte x_e-x_b
-x_b      !text "X/LAZER.SILK/LAZER.SILK"
+x_b      !text "LAZER.SILK"
 x_e
 
 !if * > $3F0 {
diff --git a/src/demo/lost.tomb.a b/src/demo/lost.tomb.a
index 4a69c487f..a5ef471d8 100644
--- a/src/demo/lost.tomb.a
+++ b/src/demo/lost.tomb.a
@@ -8,10 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT lost_tomb, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $82A
@@ -67,11 +65,9 @@
          +DISABLE_ACCEL
          jmp   $84D
 
-lost_tomb
-         !byte lost_tomb_e-lost_tomb_b
-lost_tomb_b
-         !text "X/LOST.TOMB/LOST.TOMB"
-lost_tomb_e
+title    !byte x_e-x_b
+x_b      !text "LOST.TOMB"
+x_e
 
 !if * > $3F0 {
   !error "code is too large, ends at ", *
diff --git a/src/demo/moon.patrol.a b/src/demo/moon.patrol.a
index db179149b..44aded5df 100644
--- a/src/demo/moon.patrol.a
+++ b/src/demo/moon.patrol.a
@@ -8,10 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $49DD
@@ -55,7 +53,7 @@
          jmp   $919
 
 title    !byte x_e-x_b
-x_b      !text "X/MOON.PATROL/MOON.PATROL"
+x_b      !text "MOON.PATROL"
 x_e
 
 patch    !byte $20,$B8,$0A,$2C,$10,$C0,$A2,$41,$A9,$FF,$20,$A8,$FC,$AD,$00,$C0,$10,$05,$4C,$00,$01,$EA,$EA,$CA,$D0,$EE
diff --git a/src/demo/n.o.r.a.d.a b/src/demo/n.o.r.a.d.a
index 5e61e0ea7..89960309e 100644
--- a/src/demo/n.o.r.a.d.a
+++ b/src/demo/n.o.r.a.d.a
@@ -8,10 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $497E
@@ -42,7 +40,7 @@
          jmp   $0EDD
 
 title    !byte x_e-x_b
-x_b      !text "X/N.O.R.A.D/N.O.R.A.D"
+x_b      !text "N.O.R.A.D"
 x_e
 
 !if * > $3F0 {
diff --git a/src/demo/nibbler.a b/src/demo/nibbler.a
index 87a65bd99..ad5622705 100644
--- a/src/demo/nibbler.a
+++ b/src/demo/nibbler.a
@@ -8,9 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $8A19
@@ -48,7 +47,7 @@
          jmp   $900
 
 title    !byte x_e-x_b
-x_b      !text "X/NIBBLER/NIBBLER"
+x_b      !text "NIBBLER"
 x_e
 
 !if * > $3F0 {
diff --git a/src/demo/orileys.mine.a b/src/demo/orileys.mine.a
index 458ea6dee..6529849c7 100644
--- a/src/demo/orileys.mine.a
+++ b/src/demo/orileys.mine.a
@@ -8,10 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT orileys_mine, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $81D
@@ -75,13 +73,12 @@
          stx   $8326
 
          +DISABLE_ACCEL
+
          jmp   $8FD
 
-orileys_mine
-         !byte orileys_mine_e-orileys_mine_b
-orileys_mine_b
-         !text "X/OM/OM"
-orileys_mine_e
+title    !byte x_e-x_b
+x_b      !text "OM"
+x_e
 
 !if * > $3F0 {
   !error "code is too large, ends at ", *
diff --git a/src/demo/pacman.a b/src/demo/pacman.a
index 5c6c67125..bea2a2e75 100644
--- a/src/demo/pacman.a
+++ b/src/demo/pacman.a
@@ -8,9 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          +NEW_RESET_VECTOR $280
 
@@ -56,7 +55,7 @@
          jmp   $1000
 
 title    !byte x_e-x_b
-x_b      !text "X/PACMAN/PACMAN"
+x_b      !text "PACMAN"
 x_e
 
 !if * > $3F0 {
diff --git a/src/demo/pest.patrol.a b/src/demo/pest.patrol.a
index 3c0ce3bcc..fcd94df81 100644
--- a/src/demo/pest.patrol.a
+++ b/src/demo/pest.patrol.a
@@ -8,9 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $0837
@@ -44,7 +43,7 @@
          jmp   $4003
 
 title    !byte x_e-x_b
-x_b      !text "X/PEST.PATROL/PEST.PATROL"
+x_b      !text "PEST.PATROL"
 x_e
 
 patch    !byte $4C,$00,$01,$AD,$00,$C0,$30,$F8,$4C,$90,$B3
diff --git a/src/demo/phaser.fire.a b/src/demo/phaser.fire.a
index e93b70bcf..5ea285e53 100644
--- a/src/demo/phaser.fire.a
+++ b/src/demo/phaser.fire.a
@@ -8,10 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $402D
@@ -42,9 +40,11 @@
          inx
          stx   $54C2
          stx   $982
+
          +DISABLE_ACCEL
+
          jmp   ($20)
 
 title    !byte x_e-x_b
-x_b      !text "X/PHASER.FIRE/PHASER.FIRE"
+x_b      !text "PHASER.FIRE"
 x_e
diff --git a/src/demo/pitfall.ii.a b/src/demo/pitfall.ii.a
index ca897ad17..d8da4f0f1 100644
--- a/src/demo/pitfall.ii.a
+++ b/src/demo/pitfall.ii.a
@@ -9,9 +9,8 @@
          !source "src/macros.a"
 
          +GAME_REQUIRES_JOYSTICK
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $3D34
@@ -75,7 +74,7 @@ p1       lda   patch, x
 patch    !byte $AD,$88,$C0,$6C,$FC,$FF
 
 title    !byte x_e-x_b
-x_b      !text "X/PITFALL.II/PITFALL.II"
+x_b      !text "PITFALL.II"
 x_e
 
 !if * > $3F0 {
diff --git a/src/demo/pooyan.a b/src/demo/pooyan.a
index 54787dde0..8a55d72f6 100644
--- a/src/demo/pooyan.a
+++ b/src/demo/pooyan.a
@@ -8,9 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $203A
@@ -41,7 +40,7 @@
          jmp   $6000
 
 title    !byte x_e-x_b
-x_b      !text "X/POOYAN/POOYAN"
+x_b      !text "POOYAN"
 x_e
 
 !if * > $3F0 {
diff --git a/src/demo/snake.byte.a b/src/demo/snake.byte.a
index 16a6e7868..fd92e8b23 100644
--- a/src/demo/snake.byte.a
+++ b/src/demo/snake.byte.a
@@ -8,9 +8,9 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
+
          lda   #$B9
          sta   $842
          lda   #$60
@@ -40,12 +40,13 @@
          lda   #$2C
          sta   $7A12
          sta   $7A1A
-         jsr   DisableAccelerator
-         +READ_ROM_NO_WRITE
+
+         +DISABLE_ACCEL
+
          jmp   $7680
 
 title    !byte x_e-x_b
-x_b      !text "X/SNAKE.BYTE/SNAKE.BYTE"
+x_b      !text "SNAKE.BYTE"
 x_e
 
 !if * > $3F0 {
diff --git a/src/demo/sneakers.a b/src/demo/sneakers.a
index 1edc27626..00dd6bccf 100644
--- a/src/demo/sneakers.a
+++ b/src/demo/sneakers.a
@@ -8,9 +8,9 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT sneakers, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
+
          lda   #$60
          sta   $84c7
          jsr   $3ffa      ; decompress
@@ -24,13 +24,14 @@
          sta   $4068, x
          dex
          bpl   -
-         jsr   DisableAccelerator
-         +READ_ROM_NO_WRITE
+
+         +DISABLE_ACCEL
+
          jmp   $9e00
 
-sneakers
-         !byte 19
-         !text "X/SNEAKERS/SNEAKERS"
+title    !byte x_e-x_b
+x_b      !text "SNEAKERS"
+x_e
 
 patch    !byte $10,$03,$4C,$00,$01,$EA,$EA,$A9,$00
 
diff --git a/src/demo/space.eggs.a b/src/demo/space.eggs.a
index b10599a7b..9eb07a389 100644
--- a/src/demo/space.eggs.a
+++ b/src/demo/space.eggs.a
@@ -9,9 +9,8 @@
          !source "src/macros.a"
 
          +GAME_REQUIRES_JOYSTICK
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          +NEW_RESET_VECTOR $280
 
@@ -58,7 +57,7 @@
 patch    !byte $CE,$FF,$4B,$10,$03,$4C,$00,$01,$4C,$B0,$4B
 
 title    !byte x_e-x_b
-x_b      !text "X/SPACE.EGGS/SPACE.EGGS"
+x_b      !text "SPACE.EGGS"
 x_e
 
 !if * > $3F0 {
diff --git a/src/demo/space.quarks.a b/src/demo/space.quarks.a
index 4d4e10f60..cd65de5f9 100644
--- a/src/demo/space.quarks.a
+++ b/src/demo/space.quarks.a
@@ -8,9 +8,9 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT space_quarks, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
+
          lda   #$4C
          sta   $3EC9
          jsr   $3E65      ; decompress/set reset vector
@@ -36,12 +36,13 @@
          sta   $72BD, x
          dex
          bpl   -
-         jsr   DisableAccelerator
-         +READ_ROM_NO_WRITE
+
+         +DISABLE_ACCEL
+
          jmp   $20A
 
-space_quarks
-         !byte 27
-         !text "X/SPACE.QUARKS/SPACE.QUARKS"
+title    !byte x_e-x_b
+x_b      !text "SPACE.QUARKS"
+x_e
 
 patch    !byte $F0,$08,$AD,$00,$C0,$10,$0D,$4C,$00,$01,$CE,$24,$02,$F0,$F8,$68,$68
diff --git a/src/demo/spider.raid.a b/src/demo/spider.raid.a
index 3ad25275e..bd0a4ab19 100644
--- a/src/demo/spider.raid.a
+++ b/src/demo/spider.raid.a
@@ -8,10 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT spider_raid, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $3EFD
@@ -52,14 +50,14 @@
          stx   $99A7
          sec
          rol   $976A
+
          +DISABLE_ACCEL
+
          jmp   $4246
 
-spider_raid
-         !byte spider_raid_e-spider_raid_b
-spider_raid_b
-         !text "X/SPIDER.RAID/SPIDER.RAID"
-spider_raid_e
+title    !byte x_e-x_b
+x_b      !text "SPIDER.RAID"
+x_e
 
 !if * > $3F0 {
   !error "code is too large, ends at ", *
diff --git a/src/demo/spy.hunter.a b/src/demo/spy.hunter.a
index c74982b75..58fc509d8 100644
--- a/src/demo/spy.hunter.a
+++ b/src/demo/spy.hunter.a
@@ -8,10 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #<(callback - 1)
          sta   $4013
@@ -19,7 +17,7 @@
          sta   $4010
          jmp   $4000
 
-callback 
+callback
          +RESET_AND_IRQ_VECTOR $100
          ldy   #0
          sty   $0D8E
@@ -51,9 +49,11 @@ callback
          sta   $E93
          sta   $EB2
          sta   $61C5
+
          +DISABLE_ACCEL
+
          jmp   $0451
 
 title    !byte x_e-x_b
-x_b      !text "X/SPY.HUNTER/SPY.HUNTER"
+x_b      !text "SPY.HUNTER"
 x_e
diff --git a/src/demo/star.blazer.a b/src/demo/star.blazer.a
index 55afcbecb..dee648cc8 100644
--- a/src/demo/star.blazer.a
+++ b/src/demo/star.blazer.a
@@ -8,9 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $722A
@@ -49,7 +48,7 @@ count    !byte $03
 +        jmp   $1750
 
 title    !byte x_e-x_b
-x_b      !text "X/STAR.BLAZER/STAR.BLAZER"
+x_b      !text "STAR.BLAZER"
 x_e
 
 !if * > $3F0 {
diff --git a/src/demo/stargate.a b/src/demo/stargate.a
index 5a24f43e2..bf606dc73 100644
--- a/src/demo/stargate.a
+++ b/src/demo/stargate.a
@@ -9,9 +9,8 @@
          !source "src/macros.a"
 
          +GAME_REQUIRES_JOYSTICK
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #$60
          sta   $4697
@@ -62,7 +61,7 @@
          jmp   $5000
 
 title    !byte x_e-x_b
-x_b      !text "X/STARGATE/STARGATE"
+x_b      !text "STARGATE"
 x_e
 
 !if * > $3F0 {
diff --git a/src/demo/tunnel.terror.a b/src/demo/tunnel.terror.a
index c5cd4d04f..8adb9640b 100644
--- a/src/demo/tunnel.terror.a
+++ b/src/demo/tunnel.terror.a
@@ -8,10 +8,8 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
 
          lda   #1         ; reset vector fix
          sta   $6E13      ; to $3F3
@@ -71,7 +69,7 @@
          jmp   $E00
 
 title    !byte x_e-x_b
-x_b      !text "X/TUNNEL.TERROR/TUNNEL.TERROR"
+x_b      !text "TUNNEL.TERROR"
 x_e
 
 !if * > $BFD0 {
diff --git a/src/demo/wavy.navy.a b/src/demo/wavy.navy.a
index 9c676bd38..9e1914b06 100644
--- a/src/demo/wavy.navy.a
+++ b/src/demo/wavy.navy.a
@@ -8,9 +8,9 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT wavy_navy, $800
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
+
          lda   #$60
          sta   $505d
          jsr   $800       ; decompress
@@ -23,13 +23,14 @@
          inx
          stx   $6B22
          stx   $084C
-         jsr   DisableAccelerator
-         +READ_ROM_NO_WRITE
+
+         +DISABLE_ACCEL
+
          jmp   $800
 
-wavy_navy
-         !byte 21
-         !text "X/WAVY.NAVY/WAVY.NAVY"
+title    !byte x_e-x_b
+x_b      !text "WAVY.NAVY"
+x_e
 
 patch    !byte $AD,$88,$C0,$6C,$FC,$FF
 
diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a
index b83bed2d4..e5275458a 100644
--- a/src/index/artwork.idx.a
+++ b/src/index/artwork.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14683433
+         !be24  14994831
          !le16     5108
diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a
index 57f0ecc55..68d2ac601 100644
--- a/src/index/attract.idx.a
+++ b/src/index/attract.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14631280
+         !be24  14942678
          !le16     5521
diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a
index ca9f43aef..7b36abada 100644
--- a/src/index/cache00.idx.a
+++ b/src/index/cache00.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14567260
+         !be24  14878658
          !le16     3932
diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a
index 4ba7f6472..e9c6621f2 100644
--- a/src/index/cache01.idx.a
+++ b/src/index/cache01.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14581099
+         !be24  14892497
          !le16     4354
diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a
index 73c1d1e2b..87262bea0 100644
--- a/src/index/cache10.idx.a
+++ b/src/index/cache10.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14598389
+         !be24  14909787
          !le16     5527
diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a
index 8cdedd3f2..d3a0d2d42 100644
--- a/src/index/cache11.idx.a
+++ b/src/index/cache11.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14618175
+         !be24  14929573
          !le16     6146
diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a
index 59877de50..562819b39 100644
--- a/src/index/coverfade.idx.a
+++ b/src/index/coverfade.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14688541
+         !be24  14999939
          !le16      410
diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a
index 5bcdc9e6b..5a56a401c 100644
--- a/src/index/credits.idx.a
+++ b/src/index/credits.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14689295
+         !be24  15000693
          !le16      448
diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a
index 52454e86f..286529b1d 100644
--- a/src/index/decrunch.idx.a
+++ b/src/index/decrunch.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14689743
+         !be24  15001141
          !le16      303
diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a
index 67632854d..9fe99859c 100644
--- a/src/index/dfx.idx.a
+++ b/src/index/dfx.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14639441
+         !be24  14950839
          !le16     1640
diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a
index 6d0f1ad08..18419f355 100644
--- a/src/index/dgr.fizzle.idx.a
+++ b/src/index/dgr.fizzle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14689027
+         !be24  15000425
          !le16       67
diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a
index e6db2f324..bc657a62b 100644
--- a/src/index/dgr.idx.a
+++ b/src/index/dgr.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14683374
+         !be24  14994772
          !le16       59
diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a
index 4d1022653..37cdaa465 100644
--- a/src/index/dhgr.idx.a
+++ b/src/index/dhgr.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14681840
+         !be24  14993238
          !le16     1437
diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a
index 2aa407b64..10a04389d 100644
--- a/src/index/dtitle.idx.a
+++ b/src/index/dtitle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14667032
+         !be24  14978430
          !le16      537
diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a
index 415720ea2..b213f91d6 100644
--- a/src/index/fx.idx.a
+++ b/src/index/fx.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14636801
+         !be24  14948199
          !le16     2640
diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a
index 3b0e203c4..e3fdc55d1 100644
--- a/src/index/gamehelp.idx.a
+++ b/src/index/gamehelp.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14641439
+         !be24  14952837
          !le16     6959
diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a
index 4518689ad..7c88d91b0 100644
--- a/src/index/gr.fizzle.idx.a
+++ b/src/index/gr.fizzle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14688951
+         !be24  15000349
          !le16       76
diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a
index ab32243d3..e8f364bc9 100644
--- a/src/index/gr.idx.a
+++ b/src/index/gr.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14683277
+         !be24  14994675
          !le16       97
diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a
index ce127a2f1..77917a394 100644
--- a/src/index/helptext.idx.a
+++ b/src/index/helptext.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14689094
+         !be24  15000492
          !le16      201
diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a
index 587cc6e9c..7b223750d 100644
--- a/src/index/hgr0.idx.a
+++ b/src/index/hgr0.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14667569
+         !be24  14978967
          !le16     4625
diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a
index f8787f20d..a9ca0a72f 100644
--- a/src/index/hgr1.idx.a
+++ b/src/index/hgr1.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14672194
+         !be24  14983592
          !le16     1702
diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a
index 406c174c8..3b088ca59 100644
--- a/src/index/hgr2.idx.a
+++ b/src/index/hgr2.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14673896
+         !be24  14985294
          !le16     1087
diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a
index 2ccc94b53..914d42212 100644
--- a/src/index/hgr3.idx.a
+++ b/src/index/hgr3.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14674983
+         !be24  14986381
          !le16     3279
diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a
index 5053b409b..a3111d253 100644
--- a/src/index/hgr4.idx.a
+++ b/src/index/hgr4.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14678262
+         !be24  14989660
          !le16     2985
diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a
index f13043585..030ae9d2c 100644
--- a/src/index/hgr5.idx.a
+++ b/src/index/hgr5.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14681247
+         !be24  14992645
          !le16      479
diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a
index ea0074f86..9e12b977f 100644
--- a/src/index/hgr6.idx.a
+++ b/src/index/hgr6.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14681726
+         !be24  14993124
          !le16      114
diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a
index 7f03e7b46..1e1fde921 100644
--- a/src/index/joystick.idx.a
+++ b/src/index/joystick.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14690046
+         !be24  15001444
          !le16     2370
diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a
index 2aabc48a7..912abef88 100644
--- a/src/index/miniattract0.idx.a
+++ b/src/index/miniattract0.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14653565
+         !be24  14964963
          !le16     4692
diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a
index 7c163f863..e720a643f 100644
--- a/src/index/miniattract1.idx.a
+++ b/src/index/miniattract1.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14658257
+         !be24  14969655
          !le16     2271
diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a
index 97ce1fced..0770dea9f 100644
--- a/src/index/prelaunch.idx.a
+++ b/src/index/prelaunch.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14624321
+         !be24  14935719
          !le16     6959
diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a
index 0e907af35..9147b18b3 100644
--- a/src/index/search00.idx.a
+++ b/src/index/search00.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14558227
+         !be24  14869625
          !le16     9033
diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a
index 3de943117..0e9075407 100644
--- a/src/index/search01.idx.a
+++ b/src/index/search01.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14571192
+         !be24  14882590
          !le16     9907
diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a
index 518e0ee90..3cc3b765c 100644
--- a/src/index/search10.idx.a
+++ b/src/index/search10.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14585453
+         !be24  14896851
          !le16    12936
diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a
index 2a61a19d6..c59240a77 100644
--- a/src/index/search11.idx.a
+++ b/src/index/search11.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14603916
+         !be24  14915314
          !le16    14259
diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a
index e824d3e91..1c998c1c1 100644
--- a/src/index/sfx.idx.a
+++ b/src/index/sfx.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14641081
+         !be24  14952479
          !le16      358
diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a
index 26197d30f..2fd352455 100644
--- a/src/index/slideshow.idx.a
+++ b/src/index/slideshow.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14648398
+         !be24  14959796
          !le16     5167
diff --git a/src/index/title.idx.a b/src/index/title.idx.a
index 6ab4aef52..2bfc5c8d4 100644
--- a/src/index/title.idx.a
+++ b/src/index/title.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14660528
+         !be24  14971926
          !le16     6504
diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a
index 4c742a351..6cfa6b246 100644
--- a/src/index/xsingle.idx.a
+++ b/src/index/xsingle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  14554745
-         !le16     3482
+         !be24  14865760
+         !le16     3865