diff --git a/Source/Build.cmd b/Source/Build.cmd
index b0d0b750..7626a350 100644
--- a/Source/Build.cmd
+++ b/Source/Build.cmd
@@ -5,8 +5,8 @@ setlocal
 call BuildProp || exit /b
 call BuildShared || exit /b
 call BuildBP || exit /b
-call BuildROM %* || exit /b
 call BuildImages || exit /b
+call BuildROM %* || exit /b
 call BuildZRC || exit /b
 call BuildZ1RCC || exit /b
 call BuildZZRCC || exit /b
@@ -15,4 +15,4 @@ call BuildFZ80 || exit /b
 
 if "%1" == "dist" (
   call Clean || exit /b
-)
\ No newline at end of file
+)
diff --git a/Source/HBIOS/Build.cmd b/Source/HBIOS/Build.cmd
index 88a3c701..f85df9d3 100644
--- a/Source/HBIOS/Build.cmd
+++ b/Source/HBIOS/Build.cmd
@@ -89,10 +89,9 @@ call :asm usrrom || exit /b
 call :asm updater || exit /b
 call :asm imgpad2 || exit /b
 
-::
-:: Build components in Sub folders
-::
-pushd SysConfig && call Build || exit /b & popd
+:: Sysconf builds as both BIN and COM files
+tasm -t%CPUType% -g3 -fFF -dROMWBW sysconf.asm sysconf.bin sysconf_bin.lst || exit /b
+tasm -t%CPUType% -g3 -fFF -dCPM sysconf.asm sysconf.com sysconf_com.lst || exit /b
 
 ::
 :: Create additional ROM bank images by assembling components into
@@ -102,7 +101,7 @@ pushd SysConfig && call Build || exit /b & popd
 ::
 
 copy /b romldr.bin + dbgmon.bin + ..\zsdos\zsys_wbw.bin + ..\cpm22\cpm_wbw.bin osimg.bin || exit /b
-copy /b ..\Forth\camel80.bin + nascom.bin + ..\tastybasic\src\tastybasic.bin + game.bin + eastaegg.bin + netboot.mod + updater.bin + SysConfig\sysconfig.bin + usrrom.bin osimg1.bin || exit /b
+copy /b ..\Forth\camel80.bin + nascom.bin + ..\tastybasic\src\tastybasic.bin + game.bin + eastaegg.bin + netboot.mod + updater.bin + sysconf.bin + usrrom.bin osimg1.bin || exit /b
 
 if %Platform%==S100 (
     zxcc slr180 -s100mon/fh
@@ -158,6 +157,8 @@ if exist %ROMName%.rom copy %ROMName%.rom ..\..\Binary || exit /b
 if exist %ROMName%.upd copy %ROMName%.upd ..\..\Binary || exit /b
 if exist %ROMName%.com copy %ROMName%.com ..\..\Binary || exit /b
 
+if exist sysconf.com copy sysconf.com ..\..\Binary\Apps\ || exit /b
+
 goto :eof
 
 ::
diff --git a/Source/HBIOS/Clean.cmd b/Source/HBIOS/Clean.cmd
index 94b8d008..a291a724 100644
--- a/Source/HBIOS/Clean.cmd
+++ b/Source/HBIOS/Clean.cmd
@@ -16,5 +16,3 @@ if exist build.inc del build.inc
 if exist font*.asm del font*.asm
 if exist build_env.cmd del build_env.cmd
 if exist hbios_env.cmd del hbios_env.cmd
-
-pushd SysConfig && call Clean & popd
diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile
index 4370db84..971d6432 100644
--- a/Source/HBIOS/Makefile
+++ b/Source/HBIOS/Makefile
@@ -3,11 +3,9 @@ MOREDIFF = game.bin hbios_rom.bin nascom.bin usrrom.bin \
 	dbgmon.bin hbios_app.bin imgpad2.bin osimg1.bin osimg2.bin romldr.bin \
 	eastaegg.bin hbios_img.bin osimg.bin game.bin updater.bin usrrom.bin
 
-# SUBDIRS = SysConfig
 DEST = ../../Binary
 TOOLS =../../Tools
-OTHERS =  *.img *.rom *.com *.upd *.bin *.hex cpm.sys zsys.sys Build.inc font*.asm *.dat hbios_env.sh \
-	SysConfig/*.com SysConfig/*.bin SysConfig/*.lst
+OTHERS =  *.img *.rom *.com *.upd *.bin *.hex cpm.sys zsys.sys Build.inc font*.asm *.dat hbios_env.sh
 
 # DIFFMAKE = 1
 
@@ -34,7 +32,7 @@ else ifeq ($(CPUFAM),3)
 	TASM=$(BINDIR)/uz80as -t z280
 endif
 
-DEPS=prereq dbgmon.bin romldr.bin nascom.bin tastybasic.bin game.bin eastaegg.bin updater.bin usrrom.bin imgpad2.bin
+DEPS=prereq dbgmon.bin romldr.bin nascom.bin tastybasic.bin game.bin eastaegg.bin updater.bin sysconf.bin usrrom.bin imgpad2.bin
 
 ifeq ($(ROM_PLATFORM),UNA)
 	ROMDEPS=romldr.bin dbgmon.bin
@@ -63,7 +61,7 @@ $(OBJECTS) : $(ROMDEPS)
 	@cat romldr.bin dbgmon.bin ../ZSDOS/zsys_$(BIOS).bin ../CPM22/cpm_$(BIOS).bin >osimg.bin
 	cat romldr.bin dbgmon.bin ../ZSDOS/zsys_$(BIOS).bin >osimg_small.bin
 	if [ $(ROM_PLATFORM) != UNA ] ; then \
-		cat camel80.bin nascom.bin tastybasic.bin game.bin eastaegg.bin netboot.mod updater.bin SysConfig/sysconfig.bin usrrom.bin >osimg1.bin ; \
+		cat camel80.bin nascom.bin tastybasic.bin game.bin eastaegg.bin netboot.mod updater.bin sysconf.bin usrrom.bin >osimg1.bin ; \
 		if [ $(ROM_PLATFORM) = S100 ] ; then \
 			cat s100mon.bin >osimg2.bin ; \
 		else \
@@ -89,7 +87,7 @@ $(OBJECTS) : $(ROMDEPS)
 		fi \
 	fi
 
-prereq: $(FONTS) camel80.bin tastybasic.bin syscon
+prereq: $(FONTS) camel80.bin tastybasic.bin
 
 font%.asm:
 	cp ../Fonts/$@ .
@@ -97,8 +95,11 @@ font%.asm:
 camel80.bin:
 	cp ../Forth/$@ .
 
-syscon:
-	$(MAKE) --directory SysConfig
+sysconf.bin:
+	@$(TASM) -dROMWBW sysconf.asm sysconf.bin sysconf_bin.lst
+
+sysconf.com:
+	@$(TASM) -dCPM sysconf.asm sysconf.com sysconf_com.lst
 
 s100mon.bin:
 	$(ZXCC) $(CPM)/SLR180 -s100mon/FH
diff --git a/Source/HBIOS/Makefile.new b/Source/HBIOS/Makefile.new
index 21191551..c12b94bc 100644
--- a/Source/HBIOS/Makefile.new
+++ b/Source/HBIOS/Makefile.new
@@ -41,9 +41,6 @@ camel80.bin:
 tastybasic.bin:
 	cp ../TastyBasic/src/$@ .
 
-sysconfig.bin:
-	cp SysConfig/$@ .
-
 s100mon.bin:
 	$(ZXCC) $(CPM)/SLR180 -s100mon/FH
 	$(ZXCC) $(CPM)/MLOAD25 -s100mon.bin=s100mon
@@ -103,8 +100,8 @@ UNA_%.osimg.bin: UNA_%.romldr.bin UNA_%.dbgmon.bin
 %.osimg_small.bin: %.romldr.bin %.dbgmon.bin
 	cat $(*F).romldr.bin $(*F).dbgmon.bin ../ZSDOS/zsys_wbw.bin >$@
 
-%.osimg1.bin: camel80.bin %.nascom.bin tastybasic.bin %.game.bin %.eastaegg.bin netboot.mod %.updater.bin sysconfig.bin %.usrrom.bin
-	cat camel80.bin $(*F).nascom.bin tastybasic.bin $(*F).game.bin $(*F).eastaegg.bin netboot.mod $(*F).updater.bin sysconfig.bin $(*F).usrrom.bin >$@
+%.osimg1.bin: camel80.bin %.nascom.bin tastybasic.bin %.game.bin %.eastaegg.bin netboot.mod %.updater.bin sysconf.bin %.usrrom.bin
+	cat camel80.bin $(*F).nascom.bin tastybasic.bin $(*F).game.bin $(*F).eastaegg.bin netboot.mod $(*F).updater.bin sysconf.bin $(*F).usrrom.bin >$@
 	srec_cat $@ -Binary -Crop 0 0x7FFF -Checksum_Negative_Big_Endian 0x7FFF 1 1 -o $@ -Binary
 
 S100_%.imgpad2.bin: s100mon.bin
diff --git a/Source/HBIOS/SysConfig/Build.cmd b/Source/HBIOS/SysConfig/Build.cmd
deleted file mode 100644
index 3b609070..00000000
--- a/Source/HBIOS/SysConfig/Build.cmd
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-setlocal
-
-set TOOLS=../../../Tools
-set PATH=%TOOLS%\tasm32;%PATH%
-set TASMTABS=%TOOLS%\tasm32
-
-tasm -t80 -g3 -fFF -dCPM sysconfig.asm sysconfig.com sysconfig.lst || exit /b
-tasm -t80 -g3 -fFF -dROMWBW sysconfig.asm sysconfig.bin sysconfig.lst || exit /b
-
-copy /Y sysconfig.com ..\..\..\Binary\Apps\ || exit /b
diff --git a/Source/HBIOS/SysConfig/Clean.cmd b/Source/HBIOS/SysConfig/Clean.cmd
deleted file mode 100644
index f408cf0e..00000000
--- a/Source/HBIOS/SysConfig/Clean.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-setlocal
-
-if exist *.com del *.com
-if exist *.lst del *.lst
-if exist *.bin del *.bin
diff --git a/Source/HBIOS/SysConfig/Makefile b/Source/HBIOS/SysConfig/Makefile
deleted file mode 100644
index c44a90e0..00000000
--- a/Source/HBIOS/SysConfig/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-OBJECTS = sysconfig.com sysconfig.bin
-DEST = ../../../Binary/Apps
-NOCOPY = sysconfig.bin
-TOOLS = ../../../Tools
-
-include $(TOOLS)/Makefile.inc
-
-USETASM=1
-
-sysconfig.bin: TASMFLAGS=-dROMWBW
-
-sysconfig.com: TASMFLAGS=-dCPM
diff --git a/Source/HBIOS/SysConfig/README.md b/Source/HBIOS/SysConfig/README.md
deleted file mode 100644
index e9269771..00000000
--- a/Source/HBIOS/SysConfig/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# System Configuration
-
-## Introduction
-
-An utility applicaton that sets NVR Attributes that affect HBIOS and 
-RomWBW Operation. Write to RTC NVRAM to store config is reliant on HBIOS
-
-## Building
-
-TASM (Telemark Assembler) ([Anderson, 1998](##References)).
-
-### RomWBW Version
-
-Is part of the SBCv2 RomWBW distribution. And deployed as a Rom Application
-It is included in Rom Bank 1
-
-### CP/M Version
-
-The resulting `sysconfig.com` command file can be run in CP/M.
-It is copied in the Binary/Apps folder.
-
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index eaa43d09..7495e01d 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -3393,7 +3393,7 @@ NVR_INIT:
 	JR	NZ, NVR_INIT_DEF	; failed to correclty read data
 	;
 	CALL	NVSW_CHECKSUM		; checksum calc into A
-	LD	HL,CB_SWITCHCK		; address of HCB value
+	LD	HL,CB_SWITCHCK		; address of HCB switch checksum value
 	CP	(HL)			; compare Caculated Check, with hcb Check Value
 	JR	Z,NVR_INIT_END		; The same so success
 NVR_INIT_DEF:
@@ -5697,14 +5697,9 @@ SYS_GETFN:
 ;     HL: SWITCH VALUE 8/16 BIT
 ;
 SYS_GETSWITCH:
-;	PUSH	DE
-;	CALL	NVSW_CONFIG		; make sure shadow copy is inited
-;	POP	DE			;
-;	RET	NZ			; Configuration Failed, thus cant continue
-;
 	LD	A,D
 	CP	$FF			; test if want to just get NVRAM status
-	JP	Z,NVSW_STATUS		; Check the Status - Call and Return
+	JR	Z,SYS_GETSWITCH3	; Check the Status - Call and Return
 ;
 	CALL	SWITCH_RES		; D SWITCH NUMBER -> OUT HL address, E FLAGS
 	RET	NZ			; IF NZ FLAG SET THEN ISSUE
@@ -5722,6 +5717,20 @@ SYS_GETSWITCH2:
 	LD	L,C
 	XOR	A			; signal success
 	RET
+;
+; Return Status
+;  A=0   if NVRAM does not exist.     with NZ flag set
+;  A=1   if NVRAM exists, not inited. with NZ flag set
+;  A='W' if NVRAM is fully inited.    with  Z flag set
+;
+; Note the NZ flag can be used to detect and return an error condition
+; where the NVRAM is not fully initialised
+;
+SYS_GETSWITCH3:
+	LD	A,(CB_SWITCHES)		; the status byte
+	CP	'W'			; set NZ based on A = W
+	RET
+;
 #IF ((CPUFAM == CPU_EZ80) & (EZ80TIMER == EZ80TMR_FIRM))
 ; IMPLEMENTED IN EZ80DRV.ASM
 ;
@@ -5974,12 +5983,16 @@ SYS_SET:
 ;     HL: SWITCH VALUE 8/16 BIT
 ;
 SYS_SETSWITCH:
-	CALL	NVSW_STATUS		; Check the status of NV RAM
-	RET	NZ			; IF NZ then we cant continue, return NZ at this point
+	LD	A,(CB_SWITCHES)		; Check the basic status of NV RAM
+	CP	0			; no nv ram is present. ( if = 0 )
+	JR	Z,SWITCH_RES1		; then we cant continue, return NZ at this point
 ;
 	LD	A,D			; switch # argument
 	CP	$FF			; test if want to reset NVRAM
 	JP	Z,NVSW_RESET		; then perform reset function. CALL AND RETURN
+;
+	CALL	SYS_GETSWITCH3		; Check the Full status of NV RAM
+	RET	NZ			; is not fully initialised, so return
 ;
 	LD	B,H			; move value to write into BC
 	LD	C,L
@@ -7571,20 +7584,6 @@ Z2DMAADR2:
 ; ROUTINES FOR NON VOLITILE (NVRAM) SWITCHES
 ;--------------------------------------------------------------------------------------------------
 ;
-; Return Status
-;  A=0   if no NVRAM exists. with NZ flag set
-;  A=1   if NVRAM is present. with Z flag set
-;  A='W' if NVRAM is fullly inited. with Z flag set
-; Note the NZ flag can be used to detect and return an error condition
-;
-NVSW_STATUS:
-	LD	A,(CB_SWITCHES)		; the status byte
-	LD	B,A			; save it
-	AND	1			; applies to 'W' and $01 status, -> 1
-	CP	1			; set NZ based on A = 1
-	LD	A,B			; return the
-	RET
-;
 ; RESET CONTENTS OF NVRAM, STORING INTO
 ; RETURN NONZERO IF WRITTEN - ZERO IF NOT WRITTEN
 ;
diff --git a/Source/HBIOS/romldr.asm b/Source/HBIOS/romldr.asm
index 8d256b70..01736dc3 100644
--- a/Source/HBIOS/romldr.asm
+++ b/Source/HBIOS/romldr.asm
@@ -249,13 +249,88 @@ nofp:
 ;
 #endif
 ;
+;=======================================================================
+; INITIALISE BOOT PROMPT (acmd_*) FROM CONFIG
+;=======================================================================
+#if (BIOS == BIOS_WBW)
+;
+; NVRAM AUTO BOOT CONFIGURATION
+;
+nvrswitch:
+	ld	bc,BC_SYSGET_SWITCH	; HBIOS SysGet NVRAM Switches
+	ld	D,$FF			; get NVR Status - Is NVRam initialised
+	rst	08
+	CP	'W'			; is NV RAM fully inited.
+	JR	NZ,nonvrswitch		; NOT So - Skip the int from nvram
+nvrsw_def:
+	;
+	call	nl			; display message to indicate switches found
+	ld	hl,str_nvswitches
+	call	pstr
+	;
+	ld	bc,BC_SYSGET_SWITCH	; HBIOS SysGet NVRAM Switches
+	ld	D,NVSW_DEFBOOT		; Read Default Boot (disk/Rom) switch
+	rst	08
+	LD	A,H
+	AND	DBOOT_ROM		; Get the Default Boot from ROM Flag
+	JR	NZ,nvrsw_rom		; IF Set as ROM App BOOT, otherwise Disk
+nvrsw_disk:
+	LD	A,H			; (H contains the Disk Unit 0-127)
+	LD	(bootunit),A		; copy the NVRam Unit and Slice
+	LD	A,L			; (L contains the boot slice 0-255)
+	LD	(bootslice),A		; directly into the selected boot
+	LD	L,'~'			; We use the "~" char to signal, DISK BOOT
+					; setting it a the auto cmd (string/char)
+nvrsw_rom:
+	LD	H,0			; Clear high orer byte, leaving L intact
+	LD	(acmd),HL		; Load the Character into auto command
+					; Thus (acma)   = L   (the boot character)
+					;      (acma+1) = H=0 (string terminator)
+nvrsw_auto:
+	ld	bc,BC_SYSGET_SWITCH	; HBIOS SysGet NVRAM Switches
+	ld	D,NVSW_AUTOBOOT		; GET Autoboot switch
+	rst	08
+	ld	A,L
+	AND	ABOOT_AUTO		; Get the autoboot flag
+	JR	Z,prompt		; not set, so directly prompt
+;
+	or	$FF			; auto cmd active value
+	ld	(acmd_act),a		; set the auto command active flag
+;
+	LD	A,L			; the low order byte from SWITCHES
+	AND	ABOOT_TIMEOUT		; Mask out the Timeout
+	LD	B,A			; timeout to high order B.C byte -> x 256
+	XOR	A
+	LD	C,A			; and clear low order C byte
+	SRL	B			; Shift 2 right by 2 bits -> /4
+	RR	C
+	SRL	B
+	RR	C			; BC should now contain timeout * 64
+	ld	(acmd_to),bc		; save auto cmd timeout 64ths of second
+;
+	JR	initautoboot		; init auto boot from NVRAM, ignore Build Config
+;
+nonvrswitch:
+	; no NVRAM switches found, or disabled, continue process from Buid Config
+#endif
+;
 #if (BOOT_TIMEOUT != -1)
+;
+; BUILD CONFIGURATION
+;
 	; Initialize auto command timeout downcounter
 	or	$FF			; auto cmd active value
 	ld	(acmd_act),a		; set flag
-	ld	bc,BOOT_TIMEOUT * 100	; hundredths of seconds
+	ld	bc,BOOT_TIMEOUT * 64	; 1/64's of a second
 	ld	(acmd_to),bc		; save auto cmd timeout
+	; fall through and initialise Auto boot.
+#endif
 ;
+;=======================================================================
+; INIT AUTO BOOT - If autoboot was detected.
+;=======================================================================
+;
+initautoboot:
 	; If timeout is zero, boot auto command immediately
 	ld	a,b			; check for
 	or	c			; ... zero
@@ -265,7 +340,10 @@ nofp:
 	call	pstr			; show it
 	call	autocmd			; handle w/o prompt
 	jr	reprompt		; restart w/ autocmd disable
-#endif
+;
+;=======================================================================
+; BOOT PROMPT
+;=======================================================================
 ;
 prompt:
 	ld	hl,reprompt		; adr of prompt restart routine
@@ -319,7 +397,6 @@ wtkey:
   #endif
 #endif
 ;
-#if (BOOT_TIMEOUT != -1)
 	; check for timeout and handle auto boot here
 	ld	a,(acmd_act)		; get auto cmd active flag
 	or	a			; set flags
@@ -330,9 +407,8 @@ wtkey:
 	jr	z,autocmd		; if so, handle it
 	dec	bc			; decrement
 	ld	(acmd_to),bc		; resave it
-	ld	de,625			; 16us * 625 = 10ms
-	call	vdelay			; 10ms delay
-#endif
+	ld	de,976			; 16us * 976 -> 1/64th of a second.
+	call	vdelay			; 15.6ms delay, 64 in 1 second
 ;
 	jr	wtkey			; loop
 ;
@@ -451,6 +527,9 @@ runcmd:
 	ld	a,(de)			; get character
 	call	upcase			; make upper case
 ;
+	; Auto Command (probably) from NVR default Disk Boot
+	CP	'~'			; We use the "~" char to signal, DISK
+	JP	Z,diskboot		; noting the - (bootunit) (bootslice) have inited.
 	; Attempt built-in commands
 	cp	'H'			; H = display help
 	jp	z,help			; if so, do it
@@ -2298,8 +2377,13 @@ str_err_api	.db	"Unexpected hardware BIOS API failure",0
 acmd		.db	BOOT_DEFAULT	; auto cmd string
 		.db	0
 acmd_len	.equ	$ - acmd	; len of auto cmd
-acmd_act	.db	$FF		; auto cmd active
-acmd_to		.dw	BOOT_TIMEOUT	; auto cmd timeout
+acmd_act	.dw	$00		; inactive by default
+
+#if (BOOT_TIMEOUT > 0)
+acmd_to		.dw	BOOT_TIMEOUT * 64 ; auto cmd timeout (1/64's of sec)
+#else
+acmd_to		.dw	BOOT_TIMEOUT	; auto cmd timeout -1 DISABLE, 0 IMMEDIATE
+#endif
 ;
 ;=======================================================================
 ; Strings
@@ -2490,6 +2574,7 @@ str_user	.db	"User App",0
 str_egg		.db	"",0
 str_net		.db	"Network Boot",0
 str_switches	.db	"FP Switches = 0x",0
+str_nvswitches	.db	"NV Switches Found",0
 newcon		.db	0
 newspeed	.db	0
 ;
diff --git a/Source/HBIOS/SysConfig/sysconfig.asm b/Source/HBIOS/sysconf.asm
similarity index 98%
rename from Source/HBIOS/SysConfig/sysconfig.asm
rename to Source/HBIOS/sysconf.asm
index c2ca2827..866c97b5 100644
--- a/Source/HBIOS/SysConfig/sysconfig.asm
+++ b/Source/HBIOS/sysconf.asm
@@ -20,8 +20,8 @@
 ; Also Based on The Tasty Basic Configuration
 ; Utilitity function were also copied from RomLdr, Assign.
 ;
-#include "../../ver.inc"
-#include "../hbios.inc"
+#include "../ver.inc"
+#include "hbios.inc"
 ;
 ;=======================================================================
 ;
@@ -33,7 +33,7 @@ NVR_LOC		.equ	0100h
 #ifdef ROMWBW
 ;
 #define PLATFORM "ROMWBW"
-#include "../layout.inc"
+#include "layout.inc"
 #endif
 ;
 ;=======================================================================
@@ -152,6 +152,7 @@ main:
 	call	prtstr
 ;
 	CALL	PRT_STATUS		; PRINT STATUS
+	RET	NZ			; status failed complely, SO EXIT
 	ld	de,MSG_MENU		; Print the Main Menu
 	CALL	prtstr
 ;
@@ -274,10 +275,22 @@ PRT_STATUS:
 ; end individual stats
 ;
 	CALL	prtcrlf
+	XOR	A			; success
 	RET
+;
+; Error status handling
+;
 STAT_NOTFOUND:
+	CP	0			; if status is ZERO then this is fatal
+	JR	Z,STAT_NOTFOUND1
 	LD	de,MSG_NOTF
 	CALL	prtstr
+	XOR	A			; success
+	RET
+STAT_NOTFOUND1:
+	LD	de,MSG_NONVR		; print failure status
+	CALL	prtstr
+	OR	$FF			; failure
 	RET
 ;
 ; ======================================================================
@@ -500,6 +513,7 @@ MSG_PROMPT:	.DB	"\r\n"
 		.DB	"$", 0
 MSG_STAT:	.DB	"\r\nCurrent Configuration: ",0
 MSG_NOTF:	.DB	"Config Not Found.\r\n",0
+MSG_NONVR:	.DB	"NVRAM Not Found. Exiting.\r\n",0
 MSG_QUESTION	.DB	"\r\n?\r\n",0
 ;
 ;MSG_PAK:	.DB	"\r\nPress Any Key ...",0
diff --git a/Source/Images/hd_bp.txt b/Source/Images/hd_bp.txt
index 0db9f373..099aa264 100644
--- a/Source/Images/hd_bp.txt
+++ b/Source/Images/hd_bp.txt
@@ -24,7 +24,6 @@
 ../../Binary/Apps/mode.com 15:
 ../../Binary/Apps/rtc.com 15:
 ../../Binary/Apps/survey.com 15:
-../../Binary/Apps/sysconfig.com 15:
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:
diff --git a/Source/Images/hd_cpm22.txt b/Source/Images/hd_cpm22.txt
index cacbf227..99ab40c2 100644
--- a/Source/Images/hd_cpm22.txt
+++ b/Source/Images/hd_cpm22.txt
@@ -20,7 +20,6 @@ d_cpm22/ReadMe.txt 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
-../../Binary/Apps/sysconfig.com 0:
 ../../Binary/Apps/syscopy.com 0:
 ../../Binary/Apps/sysgen.com 0:
 ../../Binary/Apps/talk.com 0:
diff --git a/Source/Images/hd_cpm3.txt b/Source/Images/hd_cpm3.txt
index 005cf6b4..010417c3 100644
--- a/Source/Images/hd_cpm3.txt
+++ b/Source/Images/hd_cpm3.txt
@@ -39,7 +39,6 @@ d_cpm3/ReadMe.txt 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
-../../Binary/Apps/sysconfig.com 0:
 ../../Binary/Apps/syscopy.com 0:
 #../../Binary/Apps/sysgen.com 0:
 #../../Binary/Apps/talk.com 0:
diff --git a/Source/Images/hd_nzcom.txt b/Source/Images/hd_nzcom.txt
index 53d826c4..cf97e497 100644
--- a/Source/Images/hd_nzcom.txt
+++ b/Source/Images/hd_nzcom.txt
@@ -35,7 +35,6 @@ d_zsdos/u0/*.DAT 15:
 ../../Binary/Apps/mode.com 15:
 ../../Binary/Apps/rtc.com 15:
 ../../Binary/Apps/survey.com 15:
-../../Binary/Apps/sysconfig.com 15:
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:
diff --git a/Source/Images/hd_qpm.txt b/Source/Images/hd_qpm.txt
index 436941b4..3aad64c4 100644
--- a/Source/Images/hd_qpm.txt
+++ b/Source/Images/hd_qpm.txt
@@ -24,7 +24,6 @@ d_cpm22/u0/*.* 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
-../../Binary/Apps/sysconfig.com 0:
 ../../Binary/Apps/syscopy.com 0:
 ../../Binary/Apps/sysgen.com 0:
 ../../Binary/Apps/talk.com 0:
diff --git a/Source/Images/hd_z3plus.txt b/Source/Images/hd_z3plus.txt
index 879219e2..1dd901ca 100644
--- a/Source/Images/hd_z3plus.txt
+++ b/Source/Images/hd_z3plus.txt
@@ -46,7 +46,6 @@ d_cpm3/u0/HELP.HLP 0:
 ../../Binary/Apps/mode.com 15:
 ../../Binary/Apps/rtc.com 15:
 ../../Binary/Apps/survey.com 15:
-../../Binary/Apps/sysconfig.com 15:
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:
diff --git a/Source/Images/hd_zpm3.txt b/Source/Images/hd_zpm3.txt
index 28009fd0..f6f8ab47 100644
--- a/Source/Images/hd_zpm3.txt
+++ b/Source/Images/hd_zpm3.txt
@@ -45,7 +45,6 @@ d_cpm3/u0/HELP.HLP 0:
 ../../Binary/Apps/mode.com 15:
 ../../Binary/Apps/rtc.com 15:
 ../../Binary/Apps/survey.com 15:
-../../Binary/Apps/sysconfig.com 15:
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:
diff --git a/Source/Images/hd_zsdos.txt b/Source/Images/hd_zsdos.txt
index d2c389ea..9babd296 100644
--- a/Source/Images/hd_zsdos.txt
+++ b/Source/Images/hd_zsdos.txt
@@ -24,7 +24,6 @@ d_cpm22/u0/*.* 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
-../../Binary/Apps/sysconfig.com 0:
 ../../Binary/Apps/syscopy.com 0:
 ../../Binary/Apps/sysgen.com 0:
 ../../Binary/Apps/talk.com 0:
diff --git a/Source/Makefile b/Source/Makefile
index 012b6cf2..e741cc4c 100644
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -7,7 +7,7 @@
 .ONESHELL:
 .SHELLFLAGS = -ce
 
-all: prop shared bp rom images zrc z1rcc zzrcc zrc512 fz80
+all: prop shared bp images rom zrc z1rcc zzrcc zrc512 fz80
 
 doc:
 	$(MAKE) --directory Doc $(ACTION)