diff --git a/Doc/ChangeLog.txt b/Doc/ChangeLog.txt
index 2bfb7e54..745e2a19 100644
--- a/Doc/ChangeLog.txt
+++ b/Doc/ChangeLog.txt
@@ -30,6 +30,7 @@ Version 3.5
 - WBW: Refactor UART driver for more flexible configuration
 - M?R: Added hour/minute/second display to timer app
 - WBW: Substantial customization of NZ-COM disk image
+- WBW: Refactor build post-processing (ZRC, ZZRCC, etc.)
 
 Version 3.4
 -----------
diff --git a/Doc/RomWBW Applications.pdf b/Doc/RomWBW Applications.pdf
index fce91f38..235305be 100644
Binary files a/Doc/RomWBW Applications.pdf and b/Doc/RomWBW Applications.pdf differ
diff --git a/Doc/RomWBW Disk Catalog.pdf b/Doc/RomWBW Disk Catalog.pdf
index 64e75084..d8bf083a 100644
Binary files a/Doc/RomWBW Disk Catalog.pdf and b/Doc/RomWBW Disk Catalog.pdf differ
diff --git a/Doc/RomWBW Errata.pdf b/Doc/RomWBW Errata.pdf
index 1fc7b2aa..4ecbce4e 100644
Binary files a/Doc/RomWBW Errata.pdf and b/Doc/RomWBW Errata.pdf differ
diff --git a/Doc/RomWBW System Guide.pdf b/Doc/RomWBW System Guide.pdf
index 19f53a3d..3aa685e4 100644
Binary files a/Doc/RomWBW System Guide.pdf and b/Doc/RomWBW System Guide.pdf differ
diff --git a/Doc/RomWBW User Guide.pdf b/Doc/RomWBW User Guide.pdf
index c920585e..0bdf97e8 100644
Binary files a/Doc/RomWBW User Guide.pdf and b/Doc/RomWBW User Guide.pdf differ
diff --git a/ReadMe.md b/ReadMe.md
index fdc9d865..92d0c5a4 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -3,7 +3,7 @@
 **RomWBW ReadMe** \
 Version 3.5 \
 Wayne Warthen  ([wwarthen@gmail.com](mailto:wwarthen@gmail.com)) \
-01 Aug 2024
+19 Aug 2024
 
 # Overview
 
diff --git a/ReadMe.txt b/ReadMe.txt
index 55c3530b..b32c1ebb 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,6 +1,6 @@
 RomWBW ReadMe
 Wayne Warthen (wwarthen@gmail.com)
-01 Aug 2024
+19 Aug 2024
 
 
 
diff --git a/Source/Doc/UserGuide.md b/Source/Doc/UserGuide.md
index 66bd7cda..7175ec3d 100644
--- a/Source/Doc/UserGuide.md
+++ b/Source/Doc/UserGuide.md
@@ -222,46 +222,46 @@ by RomWBW along with the standard pre-built ROM image(s).  RomWBW does
 allow for the creation of ROM images with custom configurations.  This
 is discussed in [Customizing RomWBW].
 
-| **Description**                                                | **Bus** | **ROM Image File**    | **Baud Rate** |
-|----------------------------------------------------------------|---------|-----------------------|--------------:|
-| [RetroBrew Z80 SBC]^1^                                         | ECB     | SBC_std.rom           | 38400         |
-| [RetroBrew Z80 SimH]^1^                                        | -       | SBC_simh.rom          | 38400         |
-| [RetroBrew N8 Z180 SBC]^1^ (date code >= 2312)                 | ECB     | N8_std.rom            | 38400         |
-| [Zeta Z80 SBC]^2^, ParPortProp                                 | -       | ZETA_std.rom          | 38400         |
-| [Zeta V2 Z80 SBC]^2^, ParPortProp                              | -       | ZETA2_std.rom         | 38400         |
-| [Mark IV Z180 SBC]^3^                                          | ECB     | MK4_std.rom           | 38400         |
-| [RCBus Z80 CPU Module]^4^, 512K RAM/ROM                        | RCBus   | RCZ80_std.rom         | 115200        |
-| [RCBus Z80 CPU Module]^4^, 512K RAM/ROM, KIO                   | RCBus   | RCZ80_kio.rom         | 115200        |
-| [RCBus Z180 CPU Module]^4^ w/ external banking                 | RCBus   | RCZ180_ext.rom        | 115200        |
-| [RCBus Z180 CPU Module]^4^ w/ native banking                   | RCBus   | RCZ180_nat.rom        | 115200        |
-| [RCBus Z280 CPU Module]^4^ w/ external banking                 | RCBus   | RCZ180_ext.rom        | 115200        |
-| [RCBus Z280 CPU Module]^4^ w/ native banking                   | RCBus   | RCZ180_nat.rom        | 115200        |
-| [Easy Z80 SBC]^2^                                              | RCBus   | RCZ80_easy.rom        | 115200        |
-| [Tiny Z80 SBC]^2^                                              | RCBus   | RCZ80_tiny.rom        | 115200        |
-| [Z80-512K CPU/RAM/ROM Module]^2^                               | RCBus   | RCZ80_skz.rom         | 115200        |
-| [Small Computer SC126 Z180 SBC]^5^                             | BP80    | SCZ180_sc126.rom      | 115200        |
-| [Small Computer SC130 Z180 SBC]^5^                             | RCBus   | SCZ180_sc130.rom      | 115200        |
-| [Small Computer SC131 Z180 Pocket Computer]^5^                 | -       | SCZ180_sc131.rom      | 115200        |
-| [Small Computer SC140 Z180 CPU Module]^5^                      | Z50     | SCZ180_sc140.rom      | 115200        |
-| [Small Computer SC503 Z180 CPU Module]^5^                      | Z50     | SCZ180_sc503.rom      | 115200        |
-| [Small Computer SC700 Z180 CPU Module]^5^                      | RCBus   | SCZ180_sc700.rom      | 115200        |
-| [Dyno Z180 SBC]^6^                                             | Dyno    | DYNO_std.rom          | 38400         |
-| [Nhyodyne Z80 MBC]^1^                                          | MBC     | MBC_std.rom           | 38400         |
-| [Rhyophyre Z180 SBC]^1^                                        | -       | RPH_std.rom           | 38400         |
-| [Z80 ZRC CPU Module]^7^                                        | RCBus   | RCZ80_zrc.rom         | 115200        |
-| [Z80 ZRC CPU Module]^7^ ROMless                                | RCBus   | RCZ80_zrc_ram.rom     | 115200        |
-| [Z80 ZRC512 CPU Module]^7^                                     | RCBus   | RCZ80_zrc512.rom      | 115200        |
-| [Z180 Z1RCC CPU Module]^7^                                     | RCBus   | RCZ180_z1rcc.rom      | 115200        |
-| [Z280 ZZRCC CPU Module]^7^                                     | RCBus   | RCZ280_zzrcc.rom      | 115200        |
-| [Z280 ZZRCC CPU Module]^7^ ROMless                             | RCBus   | RCZ280_zzrcc_ram.rom  | 115200        |
-| [Z280 ZZ80MB SBC]^7^                                           | RCBus   | RCZ280_zz80mb.rom     | 115200        |
-| [Z80-Retro SBC]^8^                                             | -       | Z80RETRO_std.rom      | 38400         |
-| [S100 Computers Z180]^9^                                       | S100    | S100_std.rom          | 57600         |
-| [Duodyne Z80 System]^1^                                        | Duo     | DUO_std.rom           | 38400         |
-| [Heath H8 Z80 System]^10^                                      | H8      | HEATH_std.rom         | 115200        |
-| [EP Mini-ITX Z180]^11^                                         | RCBus?  | EPITX_std.rom         | 115200        |
-| [NABU w/ RomWBW Option Board]^10^                              | NABU    | NABU_std.rom          | 115200        |
-| [S100 FPGA Z80]^9^                                             | S100    | FZ80_std.rom          | 9600          |
+| **Description**                                             | **Bus** | **ROM Image File**           | **Baud Rate** |
+|-------------------------------------------------------------|---------|------------------------------|--------------:|
+| [RetroBrew Z80 SBC]^1^                                      | ECB     | SBC_std.rom                  | 38400         |
+| [RetroBrew Z80 SimH]^1^                                     | -       | SBC_simh.rom                 | 38400         |
+| [RetroBrew N8 Z180 SBC]^1^ (date >= 2312)                   | ECB     | N8_std.rom                   | 38400         |
+| [Zeta Z80 SBC]^2^, ParPortProp                              | -       | ZETA_std.rom                 | 38400         |
+| [Zeta V2 Z80 SBC]^2^, ParPortProp                           | -       | ZETA2_std.rom                | 38400         |
+| [Mark IV Z180 SBC]^3^                                       | ECB     | MK4_std.rom                  | 38400         |
+| [RCBus Z80 CPU Module]^4^, 512K RAM/ROM                     | RCBus   | RCZ80_std.rom                | 115200        |
+| [RCBus Z80 CPU Module]^4^, 512K w/KIO                       | RCBus   | RCZ80_kio_std.rom            | 115200        |
+| [RCBus Z180 CPU Module]^4^ w/ ext banking                   | RCBus   | RCZ180_ext_std.rom           | 115200        |
+| [RCBus Z180 CPU Module]^4^ w/ native banking                | RCBus   | RCZ180_nat_std.rom           | 115200        |
+| [RCBus Z280 CPU Module]^4^ w/ ext banking                   | RCBus   | RCZ180_ext_std.rom           | 115200        |
+| [RCBus Z280 CPU Module]^4^ w/ native banking                | RCBus   | RCZ180_nat_std.rom           | 115200        |
+| [Easy Z80 SBC]^2^                                           | RCBus   | RCZ80_easy_std.rom           | 115200        |
+| [Tiny Z80 SBC]^2^                                           | RCBus   | RCZ80_tiny_std.rom           | 115200        |
+| [Z80-512K CPU/RAM/ROM Module]^2^                            | RCBus   | RCZ80_skz_std.rom            | 115200        |
+| [Small Computer SC126 Z180 SBC]^5^                          | BP80    | SCZ180_sc126_std.rom         | 115200        |
+| [Small Computer SC130 Z180 SBC]^5^                          | RCBus   | SCZ180_sc130_std.rom         | 115200        |
+| [Small Computer SC131 Z180 Pocket Comp]^5^                  | -       | SCZ180_sc131_std.rom         | 115200        |
+| [Small Computer SC140 Z180 CPU Module]^5^                   | Z50     | SCZ180_sc140_std.rom         | 115200        |
+| [Small Computer SC503 Z180 CPU Module]^5^                   | Z50     | SCZ180_sc503_std.rom         | 115200        |
+| [Small Computer SC700 Z180 CPU Module]^5^                   | RCBus   | SCZ180_sc700_std.rom         | 115200        |
+| [Dyno Z180 SBC]^6^                                          | Dyno    | DYNO_std.rom                 | 38400         |
+| [Nhyodyne Z80 MBC]^1^                                       | MBC     | MBC_std.rom                  | 38400         |
+| [Rhyophyre Z180 SBC]^1^                                     | -       | RPH_std.rom                  | 38400         |
+| [Z80 ZRC CPU Module]^7^                                     | RCBus   | RCZ80_zrc_std.rom            | 115200        |
+| [Z80 ZRC CPU Module]^7^ ROMless                             | RCBus   | RCZ80_zrc_ram_std.rom        | 115200        |
+| [Z80 ZRC512 CPU Module]^7^                                  | RCBus   | RCZ80_zrc512_std.rom         | 115200        |
+| [Z180 Z1RCC CPU Module]^7^                                  | RCBus   | RCZ180_z1rcc_std.rom         | 115200        |
+| [Z280 ZZRCC CPU Module]^7^                                  | RCBus   | RCZ280_zzrcc_std.rom         | 115200        |
+| [Z280 ZZRCC CPU Module]^7^ ROMless                          | RCBus   | RCZ280_zzrcc_ram_std.rom     | 115200        |
+| [Z280 ZZ80MB SBC]^7^                                        | RCBus   | RCZ280_zz80mb_std.rom        | 115200        |
+| [Z80-Retro SBC]^8^                                          | -       | Z80RETRO_std.rom             | 38400         |
+| [S100 Computers Z180]^9^                                    | S100    | S100_std.rom                 | 57600         |
+| [Duodyne Z80 System]^1^                                     | Duo     | DUO_std.rom                  | 38400         |
+| [Heath H8 Z80 System]^10^                                   | H8      | HEATH_std.rom                | 115200        |
+| [EP Mini-ITX Z180]^11^                                      | RCBus?  | EPITX_std.rom                | 115200        |
+| [NABU w/ RomWBW Option Board]^10^                           | NABU    | NABU_std.rom                 | 115200        |
+| [S100 FPGA Z80]^9^                                          | S100    | FZ80_std.rom                 | 9600          |
 
 | ^1^Designed by Andrew Lynch
 | ^2^Designed by Sergey Kiselev
@@ -4648,7 +4648,7 @@ the RomWBW HBIOS configuration.
 
 `\clearpage`{=latex}
 
-#### ROM Image File:  RCZ80_kio.rom
+#### ROM Image File:  RCZ80_kio_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -4691,7 +4691,7 @@ the RomWBW HBIOS configuration.
 
 ### RCBus Z180 CPU Module
 
-#### ROM Image File:  RCZ180_ext.rom
+#### ROM Image File:  RCZ180_ext_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -4736,7 +4736,7 @@ the RomWBW HBIOS configuration.
 
 `\clearpage`{=latex}
 
-#### ROM Image File:  RCZ180_nat.rom
+#### ROM Image File:  RCZ180_nat_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -4783,7 +4783,7 @@ the RomWBW HBIOS configuration.
 
 ### RCBus Z280 CPU Module
 
-#### ROM Image File:  RCZ280_ext.rom
+#### ROM Image File:  RCZ280_ext_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -4826,7 +4826,7 @@ the RomWBW HBIOS configuration.
 
 `\clearpage`{=latex}
 
-#### ROM Image File:  RCZ280_nat.rom
+#### ROM Image File:  RCZ280_nat_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -4870,7 +4870,7 @@ the RomWBW HBIOS configuration.
 
 ### Easy Z80 SBC
 
-#### ROM Image File:  RCZ80_easy.rom
+#### ROM Image File:  RCZ80_easy_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -4915,7 +4915,7 @@ the RomWBW HBIOS configuration.
 
 ### Tiny Z80 SBC
 
-#### ROM Image File:  RCZ80_tiny.rom
+#### ROM Image File:  RCZ80_tiny_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -4959,7 +4959,7 @@ the RomWBW HBIOS configuration.
 
 ### Z80-512K CPU/RAM/ROM Module
 
-#### ROM Image File:  RCZ80_skz.rom
+#### ROM Image File:  RCZ80_skz_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5004,7 +5004,7 @@ the RomWBW HBIOS configuration.
 
 ### Small Computer SC126 Z180 SBC
 
-#### ROM Image File:  SCZ180_sc126.rom
+#### ROM Image File:  SCZ180_sc126_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5052,7 +5052,7 @@ the RomWBW HBIOS configuration.
 
 ### Small Computer SC130 Z180 SBC
 
-#### ROM Image File:  SCZ180_sc130.rom
+#### ROM Image File:  SCZ180_sc130_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5098,9 +5098,9 @@ the RomWBW HBIOS configuration.
 
 `\clearpage`{=latex}
 
-### Small Computer SC131 Z180 Pocket Computer
+### Small Computer SC131 Z180 Pocket Comp
 
-#### ROM Image File:  SCZ180_sc131.rom
+#### ROM Image File:  SCZ180_sc131_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5127,7 +5127,7 @@ the RomWBW HBIOS configuration.
 
 ### Small Computer SC140 Z180 CPU Module
 
-#### ROM Image File:  SCZ180_sc140.rom
+#### ROM Image File:  SCZ180_sc140_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5174,7 +5174,7 @@ the RomWBW HBIOS configuration.
 
 ### Small Computer SC503 Z180 CPU Module
 
-#### ROM Image File:  SCZ180_sc503.rom
+#### ROM Image File:  SCZ180_sc503_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5221,7 +5221,7 @@ the RomWBW HBIOS configuration.
 
 ### Small Computer SC700 Z180 CPU Module
 
-#### ROM Image File:  SCZ180_sc700.rom
+#### ROM Image File:  SCZ180_sc700_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5381,7 +5381,7 @@ S- MD: TYPE=RAM
 
 ### Z80 ZRC CPU Module
 
-#### ROM Image File:  RCZ80_zrc.rom
+#### ROM Image File:  RCZ80_zrc_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5428,7 +5428,7 @@ S- MD: TYPE=RAM
 
 `\clearpage`{=latex}
 
-#### ROM Image File:  RCZ80_zrc_ram.rom
+#### ROM Image File:  RCZ80_zrc_ram_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5475,7 +5475,7 @@ S- MD: TYPE=RAM
 
 ### Z80 ZRC512 CPU Module
 
-#### ROM Image File:  RCZ80_zrc512.rom
+#### ROM Image File:  RCZ80_zrc512_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5522,7 +5522,7 @@ S- MD: TYPE=RAM
 
 ### Z180 Z1RCC CPU Module
 
-#### ROM Image File:  RCZ180_z1rcc.rom
+#### ROM Image File:  RCZ180_z1rcc_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5568,7 +5568,7 @@ S- MD: TYPE=RAM
 
 ### Z280 ZZRCC CPU Module
 
-#### ROM Image File:  RCZ280_zzrcc.rom
+#### ROM Image File:  RCZ280_zzrcc_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5614,7 +5614,7 @@ S- MD: TYPE=RAM
 
 `\clearpage`{=latex}
 
-#### ROM Image File:  RCZ280_zzrcc_ram.rom
+#### ROM Image File:  RCZ280_zzrcc_ram_std.rom
 
 |                   |               |
 |-------------------|---------------|
@@ -5660,7 +5660,7 @@ S- MD: TYPE=RAM
 
 ### Z280 ZZ80MB SBC
 
-#### ROM Image File:  RCZ280_zz80mb.rom
+#### ROM Image File:  RCZ280_zz80mb_std.rom
 
 |                   |               |
 |-------------------|---------------|
diff --git a/Source/FZ80/Build.cmd b/Source/FZ80/Build.cmd
index 6c6780de..8ca4f6c3 100644
--- a/Source/FZ80/Build.cmd
+++ b/Source/FZ80/Build.cmd
@@ -5,17 +5,20 @@ set TOOLS=../../Tools
 
 set PATH=%TOOLS%\srecord;%PATH%
 
-if exist ..\..\Binary\FZ80_std.rom call :build_fz80
+for %%f in (..\..\Binary\FZ80_*.rom) do call :build %%~nf
 
 goto :eof
 
-:build_fz80
+:build
+echo.
+echo Creating %1 disk image...
+echo.
 
 srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x1B8 0x200 fz80_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x80000 0xE0000 ..\..\Binary\FZ80_std.rom -binary -offset 0x80000 -o temp.dat -binary
-move temp.dat ..\..\Binary\hd1k_fz80_prefix.dat
+srec_cat temp.dat -binary -exclude 0x80000 0xE0000 ..\..\Binary\%1.rom -binary -offset 0x80000 -o temp.dat -binary
+move temp.dat ..\..\Binary\%1_hd1k_prefix.dat
 
-copy /b ..\..\Binary\hd1k_fz80_prefix.dat + ..\..\Binary\hd1k_cpm22.img + ..\..\Binary\hd1k_zsdos.img + ..\..\Binary\hd1k_nzcom.img + ..\..\Binary\hd1k_cpm3.img + ..\..\Binary\hd1k_zpm3.img + ..\..\Binary\hd1k_ws4.img ..\..\Binary\hd1k_fz80_combo.img || exit /b
+copy /b ..\..\Binary\%1_hd1k_prefix.dat + ..\..\Binary\hd1k_cpm22.img + ..\..\Binary\hd1k_zsdos.img + ..\..\Binary\hd1k_nzcom.img + ..\..\Binary\hd1k_cpm3.img + ..\..\Binary\hd1k_zpm3.img + ..\..\Binary\hd1k_ws4.img ..\..\Binary\%1_hd1k_combo.img || exit /b
 
 goto :eof
diff --git a/Source/FZ80/Makefile b/Source/FZ80/Makefile
index eadbbb79..3614280f 100644
--- a/Source/FZ80/Makefile
+++ b/Source/FZ80/Makefile
@@ -1,16 +1,13 @@
-HD1KFZ80PREFIX = hd1k_fz80_prefix.dat
-HD1KFZ80COMBOIMG = hd1k_fz80_combo.img
-FZ80ROM = ../../Binary/FZ80_std.rom
-HD1KIMGS = ../../Binary/hd1k_cpm22.img ../../Binary/hd1k_zsdos.img ../../Binary/hd1k_nzcom.img \
-	../../Binary/hd1k_cpm3.img ../../Binary/hd1k_zpm3.img ../../Binary/hd1k_ws4.img
+DEST=../../Binary
 
-OBJECTS :=
+HD1KIMGS = $(DEST)/hd1k_cpm22.img $(DEST)/hd1k_zsdos.img $(DEST)/hd1k_nzcom.img \
+	$(DEST)/hd1k_cpm3.img $(DEST)/hd1k_zpm3.img $(DEST)/hd1k_ws4.img
 
-ifneq ($(wildcard $(FZ80ROM)),)
-	OBJECTS += $(HD1KFZ80PREFIX) $(HD1KFZ80COMBOIMG)
-endif
+ROMS := $(wildcard $(DEST)/FZ80_*.rom)
+ROMS := $(patsubst $(DEST)/%.rom,%,$(ROMS))
 
-DEST=../../Binary
+OBJECTS := $(patsubst %,%_hd1k_prefix.dat,$(ROMS))
+OBJECTS += $(patsubst %,%_hd1k_combo.img,$(ROMS))
 
 TOOLS = ../../Tools
 
@@ -18,11 +15,11 @@ include $(TOOLS)/Makefile.inc
 
 DIFFPATH = $(DIFFTO)/Binary
 
-$(HD1KFZ80PREFIX):
+%_hd1k_prefix.dat: $(DEST)/%.rom
 	srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x1B8 0x200 fz80_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x80000 0xE0000 $(FZ80ROM) -binary -offset 0x80000 -o temp.dat -binary
+	srec_cat temp.dat -binary -exclude 0x80000 0xE0000 $< -binary -offset 0x80000 -o temp.dat -binary
 	mv temp.dat $@
 
-$(HD1KFZ80COMBOIMG): $(HD1KFZ80PREFIX) $(HD1KIMGS)
+%_hd1k_combo.img: %_hd1k_prefix.dat  $(HD1KIMGS)
 	cat $^ > $@
diff --git a/Source/HBIOS/Build.cmd b/Source/HBIOS/Build.cmd
index f96c522a..d04ba589 100644
--- a/Source/HBIOS/Build.cmd
+++ b/Source/HBIOS/Build.cmd
@@ -211,31 +211,28 @@ call Build ZETA2 std || exit /b
 call Build N8 std || exit /b
 call Build MK4 std || exit /b
 call Build RCZ80 std || exit /b
-call Build RCZ80 kio || exit /b
-call Build RCZ80 easy || exit /b
-call Build RCZ80 tiny || exit /b
-call Build RCZ80 skz || exit /b
-:: call Build RCZ80 mt || exit /b
-:: call Build RCZ80 duart || exit /b
-call Build RCZ80 zrc || exit /b
-call Build RCZ80 zrc_ram || exit /b
-call Build RCZ80 zrc512 || exit /b
-call Build RCZ180 ext || exit /b
-call Build RCZ180 nat || exit /b
-call Build RCZ180 z1rcc || exit /b
-call Build RCZ280 ext || exit /b
-call Build RCZ280 nat || exit /b
-call Build RCZ280 zz80mb || exit /b
-call Build RCZ280 zzrcc || exit /b
-call Build RCZ280 zzrcc_ram || exit /b
-call Build SCZ180 sc126 || exit /b
-call Build SCZ180 sc130 || exit /b
-call Build SCZ180 sc131 || exit /b
-call Build SCZ180 sc140 || exit /b
-call Build SCZ180 sc503 || exit /b
-call Build SCZ180 sc700 || exit /b
+call Build RCZ80 kio_std || exit /b
+call Build RCZ80 easy_std || exit /b
+call Build RCZ80 tiny_std || exit /b
+call Build RCZ80 skz_std || exit /b
+call Build RCZ80 zrc_std || exit /b
+call Build RCZ80 zrc_ram_std || exit /b
+call Build RCZ80 zrc512_std || exit /b
+call Build RCZ180 ext_std || exit /b
+call Build RCZ180 nat_std || exit /b
+call Build RCZ180 z1rcc_std || exit /b
+call Build RCZ280 ext_std || exit /b
+call Build RCZ280 nat_std || exit /b
+call Build RCZ280 zz80mb_std || exit /b
+call Build RCZ280 zzrcc_std || exit /b
+call Build RCZ280 zzrcc_ram_std || exit /b
+call Build SCZ180 sc126_std || exit /b
+call Build SCZ180 sc130_std || exit /b
+call Build SCZ180 sc131_std || exit /b
+call Build SCZ180 sc140_std || exit /b
+call Build SCZ180 sc503_std || exit /b
+call Build SCZ180 sc700_std || exit /b
 call Build DYNO std || exit /b
-call Build UNA std || exit /b
 call Build RPH std || exit /b
 call Build Z80RETRO std || exit /b
 call Build S100 std || exit /b
@@ -245,5 +242,6 @@ call Build EPITX std || exit /b
 :: call Build MON std || exit /b
 call Build NABU std || exit /b
 call Build FZ80 std || exit /b
+call Build UNA std || exit /b
 
 goto :eof
diff --git a/Source/HBIOS/Build.sh b/Source/HBIOS/Build.sh
index 36502acb..bb6dd4ad 100755
--- a/Source/HBIOS/Build.sh
+++ b/Source/HBIOS/Build.sh
@@ -11,48 +11,46 @@ export CPUFAM
 
 if [ "${ROM_PLATFORM}" == "dist" ] ; then
 	echo "!!!DISTRIBUTION BUILD!!!"
-	ROM_PLATFORM="DYNO"; ROM_CONFIG="std"; bash Build.sh
-	ROM_PLATFORM="MK4"; ROM_CONFIG="std"; bash Build.sh
-	ROM_PLATFORM="N8"; ROM_CONFIG="std"; bash Build.sh
-	ROM_PLATFORM="RCZ180"; ROM_CONFIG="ext"; bash Build.sh
-	ROM_PLATFORM="RCZ180"; ROM_CONFIG="nat"; bash Build.sh
-	ROM_PLATFORM="RCZ180"; ROM_CONFIG="z1rcc"; bash Build.sh
-	ROM_PLATFORM="RCZ280"; ROM_CONFIG="ext"; bash Build.sh
-	ROM_PLATFORM="RCZ280"; ROM_CONFIG="nat"; bash Build.sh
-	ROM_PLATFORM="RCZ280"; ROM_CONFIG="zz80mb"; bash Build.sh
-	ROM_PLATFORM="RCZ280"; ROM_CONFIG="zzrcc"; bash Build.sh
-	ROM_PLATFORM="RCZ280"; ROM_CONFIG="zzrcc_ram"; bash Build.sh
-#	ROM_PLATFORM="RCZ80"; ROM_CONFIG="mt"; bash Build.sh
-#	ROM_PLATFORM="RCZ80"; ROM_CONFIG="duart"; bash Build.sh
-	ROM_PLATFORM="RCZ80"; ROM_CONFIG="std"; bash Build.sh
-	ROM_PLATFORM="RCZ80"; ROM_CONFIG="kio"; bash Build.sh
-	ROM_PLATFORM="RCZ80"; ROM_CONFIG="easy"; bash Build.sh
-	ROM_PLATFORM="RCZ80"; ROM_CONFIG="tiny"; bash Build.sh
-	ROM_PLATFORM="RCZ80"; ROM_CONFIG="skz"; bash Build.sh
-	ROM_PLATFORM="RCZ80"; ROM_CONFIG="zrc"; bash Build.sh
-	ROM_PLATFORM="RCZ80"; ROM_CONFIG="zrc_ram"; bash Build.sh
-	ROM_PLATFORM="RCZ80"; ROM_CONFIG="zrc512"; bash Build.sh
-	ROM_PLATFORM="RPH"; ROM_CONFIG="std"; bash Build.sh
 	ROM_PLATFORM="SBC"; ROM_CONFIG="std"; bash Build.sh
 	ROM_PLATFORM="SBC"; ROM_CONFIG="simh"; bash Build.sh
 	ROM_PLATFORM="MBC"; ROM_CONFIG="std"; bash Build.sh
-	ROM_PLATFORM="DUO"; ROM_CONFIG="std"; bash Build.sh
-	ROM_PLATFORM="SCZ180"; ROM_CONFIG="sc126"; bash Build.sh
-	ROM_PLATFORM="SCZ180"; ROM_CONFIG="sc130"; bash Build.sh
-	ROM_PLATFORM="SCZ180"; ROM_CONFIG="sc131"; bash Build.sh
-	ROM_PLATFORM="SCZ180"; ROM_CONFIG="sc140"; bash Build.sh
-	ROM_PLATFORM="SCZ180"; ROM_CONFIG="sc503"; bash Build.sh
-	ROM_PLATFORM="SCZ180"; ROM_CONFIG="sc700"; bash Build.sh
-	ROM_PLATFORM="S100"; ROM_CONFIG="std"; bash Build.sh
-	ROM_PLATFORM="UNA"; ROM_CONFIG="std"; bash Build.sh
-	ROM_PLATFORM="Z80RETRO"; ROM_CONFIG="std"; bash Build.sh
 	ROM_PLATFORM="ZETA"; ROM_CONFIG="std"; bash Build.sh
 	ROM_PLATFORM="ZETA2"; ROM_CONFIG="std"; bash Build.sh
+	ROM_PLATFORM="N8"; ROM_CONFIG="std"; bash Build.sh
+	ROM_PLATFORM="MK4"; ROM_CONFIG="std"; bash Build.sh
+	ROM_PLATFORM="RCZ80"; ROM_CONFIG="std"; bash Build.sh
+	ROM_PLATFORM="RCZ80"; ROM_CONFIG="kio_std"; bash Build.sh
+	ROM_PLATFORM="RCZ80"; ROM_CONFIG="easy_std"; bash Build.sh
+	ROM_PLATFORM="RCZ80"; ROM_CONFIG="tiny_std"; bash Build.sh
+	ROM_PLATFORM="RCZ80"; ROM_CONFIG="skz_std"; bash Build.sh
+	ROM_PLATFORM="RCZ80"; ROM_CONFIG="zrc_std"; bash Build.sh
+	ROM_PLATFORM="RCZ80"; ROM_CONFIG="zrc_ram_std"; bash Build.sh
+	ROM_PLATFORM="RCZ80"; ROM_CONFIG="zrc512_std"; bash Build.sh
+	ROM_PLATFORM="RCZ180"; ROM_CONFIG="ext_std"; bash Build.sh
+	ROM_PLATFORM="RCZ180"; ROM_CONFIG="nat_std"; bash Build.sh
+	ROM_PLATFORM="RCZ180"; ROM_CONFIG="z1rcc_std"; bash Build.sh
+	ROM_PLATFORM="RCZ280"; ROM_CONFIG="ext_std"; bash Build.sh
+	ROM_PLATFORM="RCZ280"; ROM_CONFIG="nat_std"; bash Build.sh
+	ROM_PLATFORM="RCZ280"; ROM_CONFIG="zz80mb_std"; bash Build.sh
+	ROM_PLATFORM="RCZ280"; ROM_CONFIG="zzrcc_std"; bash Build.sh
+	ROM_PLATFORM="RCZ280"; ROM_CONFIG="zzrcc_ram_std"; bash Build.sh
+	ROM_PLATFORM="SCZ180"; ROM_CONFIG="sc126_std"; bash Build.sh
+	ROM_PLATFORM="SCZ180"; ROM_CONFIG="sc130_std"; bash Build.sh
+	ROM_PLATFORM="SCZ180"; ROM_CONFIG="sc131_std"; bash Build.sh
+	ROM_PLATFORM="SCZ180"; ROM_CONFIG="sc140_std"; bash Build.sh
+	ROM_PLATFORM="SCZ180"; ROM_CONFIG="sc503_std"; bash Build.sh
+	ROM_PLATFORM="SCZ180"; ROM_CONFIG="sc700_std"; bash Build.sh
+	ROM_PLATFORM="DYNO"; ROM_CONFIG="std"; bash Build.sh
+	ROM_PLATFORM="RPH"; ROM_CONFIG="std"; bash Build.sh
+	ROM_PLATFORM="Z80RETRO"; ROM_CONFIG="std"; bash Build.sh
+	ROM_PLATFORM="S100"; ROM_CONFIG="std"; bash Build.sh
+	ROM_PLATFORM="DUO"; ROM_CONFIG="std"; bash Build.sh
 	ROM_PLATFORM="HEATH"; ROM_CONFIG="std"; bash Build.sh
 	ROM_PLATFORM="EPITX"; ROM_CONFIG="std"; bash Build.sh
 #	ROM_PLATFORM="MON"; ROM_CONFIG="std"; bash Build.sh
 	ROM_PLATFORM="NABU"; ROM_CONFIG="std"; bash Build.sh
 	ROM_PLATFORM="FZ80"; ROM_CONFIG="std"; bash Build.sh
+	ROM_PLATFORM="UNA"; ROM_CONFIG="std"; bash Build.sh
 	exit
 fi
 
diff --git a/Source/HBIOS/Config/RCZ180_ext.asm b/Source/HBIOS/Config/RCZ180_ext_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ180_ext.asm
rename to Source/HBIOS/Config/RCZ180_ext_std.asm
diff --git a/Source/HBIOS/Config/RCZ180_nat.asm b/Source/HBIOS/Config/RCZ180_nat_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ180_nat.asm
rename to Source/HBIOS/Config/RCZ180_nat_std.asm
diff --git a/Source/HBIOS/Config/RCZ180_z1rcc.asm b/Source/HBIOS/Config/RCZ180_z1rcc_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ180_z1rcc.asm
rename to Source/HBIOS/Config/RCZ180_z1rcc_std.asm
diff --git a/Source/HBIOS/Config/RCZ280_ext.asm b/Source/HBIOS/Config/RCZ280_ext_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ280_ext.asm
rename to Source/HBIOS/Config/RCZ280_ext_std.asm
diff --git a/Source/HBIOS/Config/RCZ280_nat.asm b/Source/HBIOS/Config/RCZ280_nat_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ280_nat.asm
rename to Source/HBIOS/Config/RCZ280_nat_std.asm
diff --git a/Source/HBIOS/Config/RCZ280_zz80mb.asm b/Source/HBIOS/Config/RCZ280_zz80mb_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ280_zz80mb.asm
rename to Source/HBIOS/Config/RCZ280_zz80mb_std.asm
diff --git a/Source/HBIOS/Config/RCZ280_zzrcc_ram.asm b/Source/HBIOS/Config/RCZ280_zzrcc_ram_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ280_zzrcc_ram.asm
rename to Source/HBIOS/Config/RCZ280_zzrcc_ram_std.asm
diff --git a/Source/HBIOS/Config/RCZ280_zzrcc.asm b/Source/HBIOS/Config/RCZ280_zzrcc_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ280_zzrcc.asm
rename to Source/HBIOS/Config/RCZ280_zzrcc_std.asm
diff --git a/Source/HBIOS/Config/RCZ80_easy.asm b/Source/HBIOS/Config/RCZ80_easy_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ80_easy.asm
rename to Source/HBIOS/Config/RCZ80_easy_std.asm
diff --git a/Source/HBIOS/Config/RCZ80_kio.asm b/Source/HBIOS/Config/RCZ80_kio_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ80_kio.asm
rename to Source/HBIOS/Config/RCZ80_kio_std.asm
diff --git a/Source/HBIOS/Config/RCZ80_skz.asm b/Source/HBIOS/Config/RCZ80_skz_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ80_skz.asm
rename to Source/HBIOS/Config/RCZ80_skz_std.asm
diff --git a/Source/HBIOS/Config/RCZ80_tiny.asm b/Source/HBIOS/Config/RCZ80_tiny_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ80_tiny.asm
rename to Source/HBIOS/Config/RCZ80_tiny_std.asm
diff --git a/Source/HBIOS/Config/RCZ80_zrc512.asm b/Source/HBIOS/Config/RCZ80_zrc512_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ80_zrc512.asm
rename to Source/HBIOS/Config/RCZ80_zrc512_std.asm
diff --git a/Source/HBIOS/Config/RCZ80_zrc_ram.asm b/Source/HBIOS/Config/RCZ80_zrc_ram_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ80_zrc_ram.asm
rename to Source/HBIOS/Config/RCZ80_zrc_ram_std.asm
diff --git a/Source/HBIOS/Config/RCZ80_zrc.asm b/Source/HBIOS/Config/RCZ80_zrc_std.asm
similarity index 100%
rename from Source/HBIOS/Config/RCZ80_zrc.asm
rename to Source/HBIOS/Config/RCZ80_zrc_std.asm
diff --git a/Source/HBIOS/Config/SCZ180_sc126.asm b/Source/HBIOS/Config/SCZ180_sc126_std.asm
similarity index 100%
rename from Source/HBIOS/Config/SCZ180_sc126.asm
rename to Source/HBIOS/Config/SCZ180_sc126_std.asm
diff --git a/Source/HBIOS/Config/SCZ180_sc130.asm b/Source/HBIOS/Config/SCZ180_sc130_std.asm
similarity index 100%
rename from Source/HBIOS/Config/SCZ180_sc130.asm
rename to Source/HBIOS/Config/SCZ180_sc130_std.asm
diff --git a/Source/HBIOS/Config/SCZ180_sc131.asm b/Source/HBIOS/Config/SCZ180_sc131_std.asm
similarity index 100%
rename from Source/HBIOS/Config/SCZ180_sc131.asm
rename to Source/HBIOS/Config/SCZ180_sc131_std.asm
diff --git a/Source/HBIOS/Config/SCZ180_sc140.asm b/Source/HBIOS/Config/SCZ180_sc140_std.asm
similarity index 100%
rename from Source/HBIOS/Config/SCZ180_sc140.asm
rename to Source/HBIOS/Config/SCZ180_sc140_std.asm
diff --git a/Source/HBIOS/Config/SCZ180_sc503.asm b/Source/HBIOS/Config/SCZ180_sc503_std.asm
similarity index 100%
rename from Source/HBIOS/Config/SCZ180_sc503.asm
rename to Source/HBIOS/Config/SCZ180_sc503_std.asm
diff --git a/Source/HBIOS/Config/SCZ180_sc700.asm b/Source/HBIOS/Config/SCZ180_sc700_std.asm
similarity index 100%
rename from Source/HBIOS/Config/SCZ180_sc700.asm
rename to Source/HBIOS/Config/SCZ180_sc700_std.asm
diff --git a/Source/Images/d_nzcom/u10/desktop.ini b/Source/Images/d_nzcom/u10/desktop.ini
deleted file mode 100644
index 19ba65f3..00000000
--- a/Source/Images/d_nzcom/u10/desktop.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[LocalizedFileNames]
-ZNODES66.LZT=@ZNODES66.LZT,0
-ZFILEB38.LZT=@ZFILEB38.LZT,0
-ZHELPERS.LZT=@ZHELPERS.LZT,0
diff --git a/Source/Images/d_nzcom/u14/desktop.ini b/Source/Images/d_nzcom/u14/desktop.ini
deleted file mode 100644
index 5635658b..00000000
--- a/Source/Images/d_nzcom/u14/desktop.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[LocalizedFileNames]
-NZBLTZ14.CFG=@NZBLTZ14.CFG,0
diff --git a/Source/Z1RCC/Build.cmd b/Source/Z1RCC/Build.cmd
index e7ab0eea..3e32d705 100644
--- a/Source/Z1RCC/Build.cmd
+++ b/Source/Z1RCC/Build.cmd
@@ -5,19 +5,22 @@ set TOOLS=../../Tools
 
 set PATH=%TOOLS%\srecord;%PATH%
 
-if exist ..\..\Binary\RCZ180_z1rcc.rom call :build_z1rcc
+for %%f in (..\..\Binary\RCZ180_z1rcc_*.rom) do call :build %%~nf
 
 goto :eof
 
-:build_z1rcc
+:build
+echo.
+echo Creating %1 disk image...
+echo.
 
 srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x0 0x200 z1rcc_cfldr.bin -binary -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x1B8 0x200 z1rcc_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x1F000 0x20000 z1rcc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x24000 0xA4000 ..\..\Binary\RCZ180_z1rcc.rom -binary -offset 0x24000 -o temp.dat -binary
-move temp.dat ..\..\Binary\hd1k_z1rcc_prefix.dat
+srec_cat temp.dat -binary -exclude 0x24000 0xA4000 ..\..\Binary\%1.rom -binary -offset 0x24000 -o temp.dat -binary
+move temp.dat ..\..\Binary\%1_hd1k_prefix.dat
 
-copy /b ..\..\Binary\hd1k_z1rcc_prefix.dat + ..\..\Binary\hd1k_cpm22.img + ..\..\Binary\hd1k_zsdos.img + ..\..\Binary\hd1k_nzcom.img + ..\..\Binary\hd1k_cpm3.img + ..\..\Binary\hd1k_zpm3.img + ..\..\Binary\hd1k_ws4.img ..\..\Binary\hd1k_z1rcc_combo.img || exit /b
+copy /b ..\..\Binary\%1_hd1k_prefix.dat + ..\..\Binary\hd1k_cpm22.img + ..\..\Binary\hd1k_zsdos.img + ..\..\Binary\hd1k_nzcom.img + ..\..\Binary\hd1k_cpm3.img + ..\..\Binary\hd1k_zpm3.img + ..\..\Binary\hd1k_ws4.img ..\..\Binary\%1_hd1k_combo.img || exit /b
 
 goto :eof
diff --git a/Source/Z1RCC/Makefile b/Source/Z1RCC/Makefile
index 6890e0d7..eac892d6 100644
--- a/Source/Z1RCC/Makefile
+++ b/Source/Z1RCC/Makefile
@@ -1,16 +1,13 @@
-HD1KZ1RCCPREFIX = hd1k_z1rcc_prefix.dat
-HD1KZ1RCCCOMBOIMG = hd1k_z1rcc_combo.img
-Z1RCCROM = ../../Binary/RCZ180_z1rcc.rom
-HD1KIMGS = ../../Binary/hd1k_cpm22.img ../../Binary/hd1k_zsdos.img ../../Binary/hd1k_nzcom.img \
-	../../Binary/hd1k_cpm3.img ../../Binary/hd1k_zpm3.img ../../Binary/hd1k_ws4.img
+DEST=../../Binary
 
-OBJECTS :=
+HD1KIMGS = $(DEST)/hd1k_cpm22.img $(DEST)/hd1k_zsdos.img $(DEST)/hd1k_nzcom.img \
+	$(DEST)/hd1k_cpm3.img $(DEST)/hd1k_zpm3.img $(DEST)/hd1k_ws4.img
 
-ifneq ($(wildcard $(Z1RCCROM)),)
-	OBJECTS += $(HD1KZ1RCCPREFIX) $(HD1KZ1RCCCOMBOIMG)
-endif
+ROMS := $(wildcard $(DEST)/RCZ180_z1rcc_*.rom)
+ROMS := $(patsubst $(DEST)/%.rom,%,$(ROMS))
 
-DEST=../../Binary
+OBJECTS := $(patsubst %,%_hd1k_prefix.dat,$(ROMS))
+OBJECTS += $(patsubst %,%_hd1k_combo.img,$(ROMS))
 
 TOOLS = ../../Tools
 
@@ -18,13 +15,13 @@ include $(TOOLS)/Makefile.inc
 
 DIFFPATH = $(DIFFTO)/Binary
 
-$(HD1KZ1RCCPREFIX):
+%_hd1k_prefix.dat: $(DEST)/%.rom
 	srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x0 0x200 z1rcc_cfldr.bin -binary -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x1B8 0x200 z1rcc_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x1F000 0x20000 z1rcc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x24000 0xA4000 $(Z1RCCROM) -binary -offset 0x24000 -o temp.dat -binary
+	srec_cat temp.dat -binary -exclude 0x24000 0xA4000 $< -binary -offset 0x24000 -o temp.dat -binary
 	mv temp.dat $@
 
-$(HD1KZ1RCCCOMBOIMG): $(HD1KZ1RCCPREFIX) $(HD1KIMGS)
+%_hd1k_combo.img: %_hd1k_prefix.dat  $(HD1KIMGS)
 	cat $^ > $@
diff --git a/Source/ZRC/Build.cmd b/Source/ZRC/Build.cmd
index 181db8ab..65a188aa 100644
--- a/Source/ZRC/Build.cmd
+++ b/Source/ZRC/Build.cmd
@@ -5,34 +5,22 @@ set TOOLS=../../Tools
 
 set PATH=%TOOLS%\srecord;%PATH%
 
-if exist ..\..\Binary\RCZ80_zrc.rom call :build_zrc
-
-if exist ..\..\Binary\RCZ80_zrc_ram.rom call :build_zrc_ram
-
-goto :eof
-
-:build_zrc
-
-srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x0 0x200 zrc_cfldr.bin -binary -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x1B8 0x200 zrc_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zrc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x24000 0xA4000 ..\..\Binary\RCZ80_zrc.rom -binary -offset 0x24000 -o temp.dat -binary
-move temp.dat ..\..\Binary\hd1k_zrc_prefix.dat
-
-copy /b ..\..\Binary\hd1k_zrc_prefix.dat + ..\..\Binary\hd1k_cpm22.img + ..\..\Binary\hd1k_zsdos.img + ..\..\Binary\hd1k_nzcom.img + ..\..\Binary\hd1k_cpm3.img + ..\..\Binary\hd1k_zpm3.img + ..\..\Binary\hd1k_ws4.img ..\..\Binary\hd1k_zrc_combo.img || exit /b
+for %%f in (..\..\Binary\RCZ80_zrc_*.rom) do call :build %%~nf
 
 goto :eof
 
-:build_zrc_ram
+:build
+echo.
+echo Creating %1 disk image...
+echo.
 
 srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x0 0x200 zrc_cfldr.bin -binary -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x1B8 0x200 zrc_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zrc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x24000 0xA4000 ..\..\Binary\RCZ80_zrc_ram.rom -binary -offset 0x24000 -o temp.dat -binary
-move temp.dat ..\..\Binary\hd1k_zrc_ram_prefix.dat
+srec_cat temp.dat -binary -exclude 0x24000 0xA4000 ..\..\Binary\%1.rom -binary -offset 0x24000 -o temp.dat -binary
+move temp.dat ..\..\Binary\%1_hd1k_prefix.dat
 
-copy /b ..\..\Binary\hd1k_zrc_ram_prefix.dat + ..\..\Binary\hd1k_cpm22.img + ..\..\Binary\hd1k_zsdos.img + ..\..\Binary\hd1k_nzcom.img + ..\..\Binary\hd1k_cpm3.img + ..\..\Binary\hd1k_zpm3.img + ..\..\Binary\hd1k_ws4.img ..\..\Binary\hd1k_zrc_ram_combo.img || exit /b
+copy /b ..\..\Binary\%1_hd1k_prefix.dat + ..\..\Binary\hd1k_cpm22.img + ..\..\Binary\hd1k_zsdos.img + ..\..\Binary\hd1k_nzcom.img + ..\..\Binary\hd1k_cpm3.img + ..\..\Binary\hd1k_zpm3.img + ..\..\Binary\hd1k_ws4.img ..\..\Binary\%1_hd1k_combo.img || exit /b
 
 goto :eof
diff --git a/Source/ZRC/Makefile b/Source/ZRC/Makefile
index 72ebba4f..743e0573 100644
--- a/Source/ZRC/Makefile
+++ b/Source/ZRC/Makefile
@@ -1,23 +1,13 @@
-HD1KZRCPREFIX = hd1k_zrc_prefix.dat
-HD1KZRCCOMBOIMG = hd1k_zrc_combo.img
-HD1KZRCRAMPREFIX = hd1k_zrc_ram_prefix.dat
-HD1KZRCRAMCOMBOIMG = hd1k_zrc_ram_combo.img
-ZRCROM = ../../Binary/RCZ80_zrc.rom
-ZRCRAMROM = ../../Binary/RCZ80_zrc_ram.rom
-HD1KIMGS = ../../Binary/hd1k_cpm22.img ../../Binary/hd1k_zsdos.img ../../Binary/hd1k_nzcom.img \
-	../../Binary/hd1k_cpm3.img ../../Binary/hd1k_zpm3.img ../../Binary/hd1k_ws4.img
-
-OBJECTS :=
+DEST=../../Binary
 
-ifneq ($(wildcard $(ZRCROM)),)
-	OBJECTS += $(HD1KZRCPREFIX) $(HD1KZRCCOMBOIMG)
-endif
+HD1KIMGS = $(DEST)/hd1k_cpm22.img $(DEST)/hd1k_zsdos.img $(DEST)/hd1k_nzcom.img \
+	$(DEST)/hd1k_cpm3.img $(DEST)/hd1k_zpm3.img $(DEST)/hd1k_ws4.img
 
-ifneq ($(wildcard $(ZRCRAMROM)),)
-	OBJECTS += $(HD1KZRCRAMPREFIX) $(HD1KZRCRAMCOMBOIMG)
-endif
+ROMS := $(wildcard $(DEST)/RCZ80_zrc_*.rom)
+ROMS := $(patsubst $(DEST)/%.rom,%,$(ROMS))
 
-DEST=../../Binary
+OBJECTS := $(patsubst %,%_hd1k_prefix.dat,$(ROMS))
+OBJECTS += $(patsubst %,%_hd1k_combo.img,$(ROMS))
 
 TOOLS = ../../Tools
 
@@ -25,24 +15,13 @@ include $(TOOLS)/Makefile.inc
 
 DIFFPATH = $(DIFFTO)/Binary
 
-$(HD1KZRCPREFIX):
+%_hd1k_prefix.dat: $(DEST)/%.rom
 	srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x0 0x200 zrc_cfldr.bin -binary -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x1B8 0x200 zrc_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zrc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x24000 0xA4000 $(ZRCROM) -binary -offset 0x24000 -o temp.dat -binary
+	srec_cat temp.dat -binary -exclude 0x24000 0xA4000 $< -binary -offset 0x24000 -o temp.dat -binary
 	mv temp.dat $@
 
-$(HD1KZRCRAMPREFIX):
-	srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x0 0x200 zrc_cfldr.bin -binary -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x1B8 0x200 zrc_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zrc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x24000 0xA4000 $(ZRCRAMROM) -binary -offset 0x24000 -o temp.dat -binary
-	mv temp.dat $@
-
-$(HD1KZRCCOMBOIMG): $(HD1KZRCPREFIX) $(HD1KIMGS)
-	cat $^ > $@
-
-$(HD1KZRCRAMCOMBOIMG): $(HD1KZRCRAMPREFIX) $(HD1KIMGS)
+%_hd1k_combo.img: %_hd1k_prefix.dat  $(HD1KIMGS)
 	cat $^ > $@
diff --git a/Source/ZRC512/Build.cmd b/Source/ZRC512/Build.cmd
index dbc18f58..9e5fc81e 100644
--- a/Source/ZRC512/Build.cmd
+++ b/Source/ZRC512/Build.cmd
@@ -5,19 +5,22 @@ set TOOLS=../../Tools
 
 set PATH=%TOOLS%\srecord;%PATH%
 
-if exist ..\..\Binary\RCZ80_zrc512.rom call :build_zrc512
+for %%f in (..\..\Binary\RCZ80_zrc512_*.rom) do call :build %%~nf
 
 goto :eof
 
-:build_zrc512
+:build
+echo.
+echo Creating %1 disk image...
+echo.
 
 srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x0 0x200 zrc512_cfldr.bin -binary -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x1B8 0x200 zrc512_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zrc512_mon.bin -binary -offset 0x1F000 -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x24000 0xA4000 ..\..\Binary\RCZ80_zrc512.rom -binary -offset 0x24000 -o temp.dat -binary
-move temp.dat ..\..\Binary\hd1k_zrc512_prefix.dat
+srec_cat temp.dat -binary -exclude 0x24000 0xA4000 ..\..\Binary\%1.rom -binary -offset 0x24000 -o temp.dat -binary
+move temp.dat ..\..\Binary\%1_hd1k_prefix.dat
 
-copy /b ..\..\Binary\hd1k_zrc512_prefix.dat + ..\..\Binary\hd1k_cpm22.img + ..\..\Binary\hd1k_zsdos.img + ..\..\Binary\hd1k_nzcom.img + ..\..\Binary\hd1k_cpm3.img + ..\..\Binary\hd1k_zpm3.img + ..\..\Binary\hd1k_ws4.img ..\..\Binary\hd1k_zrc512_combo.img || exit /b
+copy /b ..\..\Binary\%1_hd1k_prefix.dat + ..\..\Binary\hd1k_cpm22.img + ..\..\Binary\hd1k_zsdos.img + ..\..\Binary\hd1k_nzcom.img + ..\..\Binary\hd1k_cpm3.img + ..\..\Binary\hd1k_zpm3.img + ..\..\Binary\hd1k_ws4.img ..\..\Binary\%1_hd1k_combo.img || exit /b
 
 goto :eof
diff --git a/Source/ZRC512/Makefile b/Source/ZRC512/Makefile
index d04611dc..e84c6a5c 100644
--- a/Source/ZRC512/Makefile
+++ b/Source/ZRC512/Makefile
@@ -1,16 +1,13 @@
-HD1KZRC512PREFIX = hd1k_zrc512_prefix.dat
-HD1KZRC512COMBOIMG = hd1k_zrc512_combo.img
-ZRC512ROM = ../../Binary/RCZ80_zrc512.rom
-HD1KIMGS = ../../Binary/hd1k_cpm22.img ../../Binary/hd1k_zsdos.img ../../Binary/hd1k_nzcom.img \
-	../../Binary/hd1k_cpm3.img ../../Binary/hd1k_zpm3.img ../../Binary/hd1k_ws4.img
+DEST=../../Binary
 
-OBJECTS :=
+HD1KIMGS = $(DEST)/hd1k_cpm22.img $(DEST)/hd1k_zsdos.img $(DEST)/hd1k_nzcom.img \
+	$(DEST)/hd1k_cpm3.img $(DEST)/hd1k_zpm3.img $(DEST)/hd1k_ws4.img
 
-ifneq ($(wildcard $(ZRC512ROM)),)
-	OBJECTS += $(HD1KZRC512PREFIX) $(HD1KZRC512COMBOIMG)
-endif
+ROMS := $(wildcard $(DEST)/RCZ80_zrc512_*.rom)
+ROMS := $(patsubst $(DEST)/%.rom,%,$(ROMS))
 
-DEST=../../Binary
+OBJECTS := $(patsubst %,%_hd1k_prefix.dat,$(ROMS))
+OBJECTS += $(patsubst %,%_hd1k_combo.img,$(ROMS))
 
 TOOLS = ../../Tools
 
@@ -18,13 +15,13 @@ include $(TOOLS)/Makefile.inc
 
 DIFFPATH = $(DIFFTO)/Binary
 
-$(HD1KZRC512PREFIX):
+%_hd1k_prefix.dat: $(DEST)/%.rom
 	srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x0 0x200 zrc512_cfldr.bin -binary -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x1B8 0x200 zrc512_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zrc512_mon.bin -binary -offset 0x1F000 -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x24000 0xA4000 $(ZRC512ROM) -binary -offset 0x24000 -o temp.dat -binary
+	srec_cat temp.dat -binary -exclude 0x24000 0xA4000 $< -binary -offset 0x24000 -o temp.dat -binary
 	mv temp.dat $@
 
-$(HD1KZRC512COMBOIMG): $(HD1KZRC512PREFIX) $(HD1KIMGS)
+%_hd1k_combo.img: %_hd1k_prefix.dat  $(HD1KIMGS)
 	cat $^ > $@
diff --git a/Source/ZZRCC/Build.cmd b/Source/ZZRCC/Build.cmd
index f520b11a..d0e105c4 100644
--- a/Source/ZZRCC/Build.cmd
+++ b/Source/ZZRCC/Build.cmd
@@ -1,41 +1,26 @@
-:: @echo off
+@echo off
 setlocal
 
-set ROMFILE=..\..\Binary\RCZ280_zzrcc.rom
-set ROMSIZE=262144
-
 set TOOLS=../../Tools
 
 set PATH=%TOOLS%\srecord;%PATH%
 
-if exist ..\..\Binary\RCZ280_zzrcc.rom call :build_zzrcc
-
-if exist ..\..\Binary\RCZ280_zzrcc_ram.rom call :build_zzrcc_ram
-
-goto :eof
-
-:build_zzrcc
-
-srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x0 0x200 zzrcc_cfldr.bin -binary -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x1B8 0x200 zzrcc_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zzrcc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x24000 0xA4000 ..\..\Binary\RCZ280_zzrcc.rom -binary -offset 0x24000 -o temp.dat -binary
-move temp.dat ..\..\Binary\hd1k_zzrcc_prefix.dat
-
-copy /b ..\..\Binary\hd1k_zzrcc_prefix.dat + ..\..\Binary\hd1k_cpm22.img + ..\..\Binary\hd1k_zsdos.img + ..\..\Binary\hd1k_nzcom.img + ..\..\Binary\hd1k_cpm3.img + ..\..\Binary\hd1k_zpm3.img + ..\..\Binary\hd1k_ws4.img ..\..\Binary\hd1k_zzrcc_combo.img || exit /b
+for %%f in (..\..\Binary\RCZ280_zzrcc_*.rom) do call :build %%~nf
 
 goto :eof
 
-:build_zzrcc_ram
+:build
+echo.
+echo Creating %1 disk image...
+echo.
 
 srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x0 0x200 zzrcc_cfldr.bin -binary -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x1B8 0x200 zzrcc_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
 srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zzrcc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary
-srec_cat temp.dat -binary -exclude 0x24000 0xA4000 ..\..\Binary\RCZ280_zzrcc_ram.rom -binary -offset 0x24000 -o temp.dat -binary
-move temp.dat ..\..\Binary\hd1k_zzrcc_ram_prefix.dat
+srec_cat temp.dat -binary -exclude 0x24000 0xA4000 ..\..\Binary\%1.rom -binary -offset 0x24000 -o temp.dat -binary
+move temp.dat ..\..\Binary\%1_hd1k_prefix.dat
 
-copy /b ..\..\Binary\hd1k_zzrcc_ram_prefix.dat + ..\..\Binary\hd1k_cpm22.img + ..\..\Binary\hd1k_zsdos.img + ..\..\Binary\hd1k_nzcom.img + ..\..\Binary\hd1k_cpm3.img + ..\..\Binary\hd1k_zpm3.img + ..\..\Binary\hd1k_ws4.img ..\..\Binary\hd1k_zzrcc_ram_combo.img || exit /b
+copy /b ..\..\Binary\%1_hd1k_prefix.dat + ..\..\Binary\hd1k_cpm22.img + ..\..\Binary\hd1k_zsdos.img + ..\..\Binary\hd1k_nzcom.img + ..\..\Binary\hd1k_cpm3.img + ..\..\Binary\hd1k_zpm3.img + ..\..\Binary\hd1k_ws4.img ..\..\Binary\%1_hd1k_combo.img || exit /b
 
 goto :eof
diff --git a/Source/ZZRCC/Makefile b/Source/ZZRCC/Makefile
index f0bbde6a..ea1249c8 100644
--- a/Source/ZZRCC/Makefile
+++ b/Source/ZZRCC/Makefile
@@ -1,23 +1,13 @@
-HD1KZZRCCPREFIX = hd1k_zzrcc_prefix.dat
-HD1KZZRCCCOMBOIMG = hd1k_zzrcc_combo.img
-HD1KZZRCCRAMPREFIX = hd1k_zzrcc_ram_prefix.dat
-HD1KZZRCCRAMCOMBOIMG = hd1k_zzrcc_ram_combo.img
-ZZRCCROM = ../../Binary/RCZ280_zzrcc.rom
-ZZRCCRAMROM = ../../Binary/RCZ280_zzrcc_ram.rom
-HD1KIMGS = ../../Binary/hd1k_cpm22.img ../../Binary/hd1k_zsdos.img ../../Binary/hd1k_nzcom.img \
-	../../Binary/hd1k_cpm3.img ../../Binary/hd1k_zpm3.img ../../Binary/hd1k_ws4.img
-
-OBJECTS :=
+DEST=../../Binary
 
-ifneq ($(wildcard $(ZZRCCROM)),)
-	OBJECTS += $(HD1KZZRCCPREFIX) $(HD1KZZRCCCOMBOIMG)
-endif
+HD1KIMGS = $(DEST)/hd1k_cpm22.img $(DEST)/hd1k_zsdos.img $(DEST)/hd1k_nzcom.img \
+	$(DEST)/hd1k_cpm3.img $(DEST)/hd1k_zpm3.img $(DEST)/hd1k_ws4.img
 
-ifneq ($(wildcard $(ZZRCCRAMROM)),)
-	OBJECTS += $(HD1KZZRCCRAMPREFIX) $(HD1KZZRCCRAMCOMBOIMG)
-endif
+ROMS := $(wildcard $(DEST)/RCZ280_zzrcc_*.rom)
+ROMS := $(patsubst $(DEST)/%.rom,%,$(ROMS))
 
-DEST=../../Binary
+OBJECTS := $(patsubst %,%_hd1k_prefix.dat,$(ROMS))
+OBJECTS += $(patsubst %,%_hd1k_combo.img,$(ROMS))
 
 TOOLS = ../../Tools
 
@@ -25,24 +15,13 @@ include $(TOOLS)/Makefile.inc
 
 DIFFPATH = $(DIFFTO)/Binary
 
-$(HD1KZZRCCPREFIX):
+%_hd1k_prefix.dat: $(DEST)/%.rom
 	srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x0 0x200 zzrcc_cfldr.bin -binary -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x1B8 0x200 zzrcc_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
 	srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zzrcc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x24000 0xA4000 $(ZZRCCROM) -binary -offset 0x24000 -o temp.dat -binary
+	srec_cat temp.dat -binary -exclude 0x24000 0xA4000 $< -binary -offset 0x24000 -o temp.dat -binary
 	mv temp.dat $@
 
-$(HD1KZZRCCRAMPREFIX):
-	srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x0 0x200 zzrcc_cfldr.bin -binary -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x1B8 0x200 zzrcc_ptbl.bin -binary -offset 0x1B8 -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zzrcc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary
-	srec_cat temp.dat -binary -exclude 0x24000 0xA4000 $(ZZRCCRAMROM) -binary -offset 0x24000 -o temp.dat -binary
-	mv temp.dat $@
-
-$(HD1KZZRCCCOMBOIMG): $(HD1KZZRCCPREFIX) $(HD1KIMGS)
-	cat $^ > $@
-
-$(HD1KZZRCCRAMCOMBOIMG): $(HD1KZZRCCRAMPREFIX) $(HD1KIMGS)
+%_hd1k_combo.img: %_hd1k_prefix.dat  $(HD1KIMGS)
 	cat $^ > $@
diff --git a/Source/ver.inc b/Source/ver.inc
index f506baab..14b0c81d 100644
--- a/Source/ver.inc
+++ b/Source/ver.inc
@@ -2,7 +2,7 @@
 #DEFINE	RMN	5
 #DEFINE	RUP	0
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.5.0-dev.69"
+#DEFINE BIOSVER	"3.5.0-dev.70"
 #define rmj	RMJ
 #define rmn	RMN
 #define rup	RUP
diff --git a/Source/ver.lib b/Source/ver.lib
index bfcdfc06..c3777b38 100644
--- a/Source/ver.lib
+++ b/Source/ver.lib
@@ -3,5 +3,5 @@ rmn	equ	5
 rup	equ	0
 rtp	equ	0
 biosver	macro
-	db	"3.5.0-dev.69"
+	db	"3.5.0-dev.70"
 	endm