diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index b6e40c30..a2702778 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/ASM.S.txt b/BIN/ASM.S.txt
index 2ae0912d..18f24c2d 100644
--- a/BIN/ASM.S.txt
+++ b/BIN/ASM.S.txt
@@ -334,6 +334,7 @@ CS.RUN.LOOP		ldy #S.PS.hStdIn
 
 				>LDA.G ASM.PASS			End of pass #2 ??
 				bne .1
+
 				inc
 				sta (pData),y
 
diff --git a/BIN/MEMDUMP.S.txt b/BIN/MEMDUMP.S.txt
index 93faf878..47e6ec0d 100644
--- a/BIN/MEMDUMP.S.txt
+++ b/BIN/MEMDUMP.S.txt
@@ -22,9 +22,9 @@ USED.COUNT		.BS 1
 LINE.COUNT		.BS 1
 bSTOP			.BS 1
 
-ZPReadAux		sta SETREADAUX
+ZPReadAux		sta IO.SETREADAUX
 				lda (ZPPTR1),y
-				sta CLRREADAUX
+				sta IO.CLRREADAUX
 				rts
 ZS.END			.ED
 *--------------------------------------
@@ -454,9 +454,9 @@ CS.QUIT			clc
 				rts
 *--------------------------------------
 CS.END
-ZPCode			sta SETREADAUX
+ZPCode			sta IO.SETREADAUX
 				lda (ZPPTR1),y
-				sta CLRREADAUX
+				sta IO.CLRREADAUX
 				rts
 ZPCodeLen		.EQ *-ZPCode
 *--------------------------------------
diff --git a/BIN/NSCUTIL.S.txt b/BIN/NSCUTIL.S.txt
index f757fd68..01763378 100644
--- a/BIN/NSCUTIL.S.txt
+++ b/BIN/NSCUTIL.S.txt
@@ -173,10 +173,10 @@ CS.QUIT			clc
 NSC.Init		php
 				sei
 
-				lda RDCXROM
+				lda IO.RDCXROM
 				php
 
-				sta SETCXROM
+				sta IO.SETCXROM
 
 				ldx #8
 
@@ -194,7 +194,7 @@ NSC.Init		php
 				plp
 				bmi .8
 
-				sta CLRCXROM
+				sta IO.CLRCXROM
 
 .8				plp
 				rts
@@ -202,10 +202,10 @@ NSC.Init		php
 NSC.Read		php
 				sei
 
-				lda RDCXROM
+				lda IO.RDCXROM
 				php
 
-				sta SETCXROM
+				sta IO.SETCXROM
 
 				jsr NSC.Select
 
@@ -225,7 +225,7 @@ NSC.Read		php
 				plp
 				bmi .8
 
-				sta CLRCXROM
+				sta IO.CLRCXROM
 
 .8				plp
 				rts
@@ -233,10 +233,10 @@ NSC.Read		php
 NSC.Write		php
 				sei
 
-				lda RDCXROM
+				lda IO.RDCXROM
 				php
 
-				sta SETCXROM
+				sta IO.SETCXROM
 
 				jsr NSC.Select
 
@@ -266,7 +266,7 @@ NSC.Write		php
 				plp
 				bmi .8
 
-				sta CLRCXROM
+				sta IO.CLRCXROM
 
 .8				plp
 				rts
diff --git a/BIN/NTPDATE.S.txt b/BIN/NTPDATE.S.txt
index 313d64f4..20f9b13a 100644
--- a/BIN/NTPDATE.S.txt
+++ b/BIN/NTPDATE.S.txt
@@ -373,21 +373,21 @@ SetProDOSTime	lda STime+S.TIME.MONTH
 				asl
 				asl
 				asl
-				sta DATELO
+				sta GP.DATE
 
 				lda STime+S.TIME.YEAR
 				rol
-				sta DATELO+1
+				sta GP.DATE+1
 
 				lda STime+S.TIME.DAY
-				ora DATELO
-				sta DATELO
+				ora GP.DATE
+				sta GP.DATE
 
 				lda STime+S.TIME.HOUR
-				sta TIMELO+1
+				sta GP.TIME+1
 
 				lda STime+S.TIME.MINUTE
-				sta TIMELO
+				sta GP.TIME
 
 				clc
 				rts
diff --git a/DRV/DHGR.DRV.S.BLT.txt b/DRV/DHGR.DRV.S.BLT.txt
index c939c68f..5994c33d 100644
--- a/DRV/DHGR.DRV.S.BLT.txt
+++ b/DRV/DHGR.DRV.S.BLT.txt
@@ -44,7 +44,7 @@ BITBLT			>LDYA CB.Cache+S.CB.X1
 				lda CB.Cache+S.CB.DstPtr+1
 				bne .1
 				
-				sta SETREADAUX			DstPtr is AUX hMem
+				sta IO.SETREADAUX		DstPtr is AUX hMem
 				tya
 				>SYSCALL2 GetMemPtr
 				
@@ -79,7 +79,7 @@ BITBLT			>LDYA CB.Cache+S.CB.X1
 				dec ZPTmpByte
 				bne .2
 
-				sta CLRREADAUX
+				sta IO.CLRREADAUX
 BITBLT.RTS		rts
 *--------------------------------------
 BITBLT.0		bit #S.CB.OP.SAVE
@@ -92,7 +92,7 @@ BITBLT.0		bit #S.CB.OP.SAVE
 				tya						DstPtr is AUX hMem
 				>SYSCALL2 GetStkObjPtr
 				
-				sta SETWRITEAUX
+				sta IO.SETWRITEAUX
 				
 .1				>STYA ZPBMSavePtr
 
@@ -125,7 +125,7 @@ BITBLT.0		bit #S.CB.OP.SAVE
 				dec ZPTmpByte
 				bne .2
 
-				sta CLRWRITEAUX
+				sta IO.CLRWRITEAUX
 
 				lda CB.Cache+S.CB.OP
 *--------------------------------------
@@ -136,7 +136,7 @@ BITBLT.1		and #$0F
 				lda CB.Cache+S.CB.SrcPtr+1
 				bne .4
 
-				sta SETREADAUX			SrcPtr is AUX hMem
+				sta IO.SETREADAUX		SrcPtr is AUX hMem
 
 				tya
 				>SYSCALL2 GetMemPtr
@@ -295,7 +295,7 @@ BITBLT.LOOP0	lda CB.Cache+S.CB.OP
 
 				bra BITBLT.LOOP0
 
-.8				sta CLRREADAUX
+.8				sta IO.CLRREADAUX
 				rts
 *--------------------------------------
 BITBLT.LOOPx	ldy Shift.L.LO-1,x		X = 1->6
@@ -399,7 +399,7 @@ BITBLT.LOOPx.7	and #$ff				SELF MODIFIED : #%01110000 get only col2 bites
 
 .2				jmp BITBLT.LOOPx.0
 
-.8				sta CLRREADAUX
+.8				sta IO.CLRREADAUX
 				rts
 *--------------------------------------
 * BM Data/Mask bits :
diff --git a/DRV/DHGR.DRV.S.LINE.txt b/DRV/DHGR.DRV.S.LINE.txt
index 98216218..411caed3 100644
--- a/DRV/DHGR.DRV.S.LINE.txt
+++ b/DRV/DHGR.DRV.S.LINE.txt
@@ -77,7 +77,7 @@ VLINE.MONO		>LDYA CB.Cache+S.CB.X1
 				lsr
 				sta ZPTmpByte			Save COL (DIV)
 
-				ldy #SETPAGE2
+				ldy #IO.SETPAGE2
 				bcc .1
 
 				dey						CLRPAGE2
diff --git a/DRV/DHGR.DRV.S.OSD.txt b/DRV/DHGR.DRV.S.OSD.txt
index 446c0a9d..f598cefa 100644
--- a/DRV/DHGR.DRV.S.OSD.txt
+++ b/DRV/DHGR.DRV.S.OSD.txt
@@ -585,7 +585,7 @@ OSD.YAMultX		stx GBYTE
 				bne .2
 				rts
 *--------------------------------------
-CB.Update		sta CLRWRITEAUX
+CB.Update		sta IO.CLRWRITEAUX
 
 				lda CBX.Cache
 				lsr
@@ -597,7 +597,7 @@ CB.Update		sta CLRWRITEAUX
 				dey
 				bpl .1
 
-				sta SETWRITEAUX
+				sta IO.SETWRITEAUX
 
 				clc
 				rts
diff --git a/DRV/DHGR.DRV.S.PIX.txt b/DRV/DHGR.DRV.S.PIX.txt
index 64e547f7..6c1c61af 100644
--- a/DRV/DHGR.DRV.S.PIX.txt
+++ b/DRV/DHGR.DRV.S.PIX.txt
@@ -31,7 +31,7 @@ SETPIXEL.MONO	>LDYA CB.Cache+S.CB.X1
 
 				iny
 
-.1				sta CLRPAGE2,y			Select proper BANK
+.1				sta IO.CLRPAGE2,y		Select proper BANK
 
 				lda CB.Cache+S.CB.OP
 *				cmp #S.CB.OP.XOR
@@ -90,7 +90,7 @@ SETPIXEL.C16.YX lda DIV7.0,y			PixelX MOD 7 (range 0->19)
 				lda Color.Masks,x		bits in 1st byte to light?
 				beq .10
 
-				sta SETPAGE2
+				sta IO.SETPAGE2
 				
 				jsr .81
 
@@ -107,7 +107,7 @@ SETPIXEL.C16.YX lda DIV7.0,y			PixelX MOD 7 (range 0->19)
 				lda Color.Masks,x
 				beq .12
 
-				sta SETPAGE2
+				sta IO.SETPAGE2
 				
 				jsr .81
 
@@ -116,7 +116,7 @@ SETPIXEL.C16.YX lda DIV7.0,y			PixelX MOD 7 (range 0->19)
 				lda Color.Masks,x
 				beq .88
 
-.80				sta CLRPAGE2
+.80				sta IO.CLRPAGE2
 				
 .81				and Color.Pixels,y		apply color
 				sta ZPTmpByte
diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt
index 91f15584..bbe633ef 100644
--- a/DRV/DHGR.DRV.S.txt
+++ b/DRV/DHGR.DRV.S.txt
@@ -17,7 +17,7 @@ NEW
 				.MA X2PageY
 				txa
 				lsr
-				ldy #SETPAGE2			col 0,2,4...in AUX mem
+				ldy #IO.SETPAGE2		col 0,2,4...in AUX mem
 				bcc :1					col 1,3,5...in MAIN mem
 
 				dey						CLRPAGE2
@@ -68,25 +68,25 @@ Dev.Detect		>LDYA L.MSG.DETECT
 
 .1				php
 				sei
-				sta SET80STORE
-				sta SETPAGE2
+				sta IO.SET80STORE
+				sta IO.SETPAGE2
 				ldx $400				Save Aux $400
 				lda #$ff				Make sure !=1 for comparing later
 				sta $400
 
-				sta CLRPAGE2
+				sta IO.CLRPAGE2
 				ldy $400				Save Main $400
 				lda #$01				Select Foreground/BKgrnd Colors
 				sta TXT16.ON			Activate 16 color mode
 				sta $400				Store something in Main
-				sta SETPAGE2
+				sta IO.SETPAGE2
 				eor $400				read back AUX, If EVE, must be F/BG colors
 				bne .2
 				dec
 				sta DCB+S.DCB.GFX.S		0=80C,$ff=EVE
 
 .2				stx $400				Set back Aux $400
-				sta CLRPAGE2
+				sta IO.CLRPAGE2
 				sty $400				Set back Main $400
 				sta TXT16.OFF
 				plp
@@ -118,9 +118,9 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				sei
 				>LDYAI $4000
 				>STYA $800
-				sta SETWRITEAUX
+				sta IO.SETWRITEAUX
 				>STYA $800
-				sta CLRWRITEAUX
+				sta IO.CLRWRITEAUX
 
 				jsr ClrScr
 
@@ -221,7 +221,7 @@ OSD.install		>LDYA L.OSD
 
 				ldy #0
 
-				sta SETWRITEAUX
+				sta IO.SETWRITEAUX
 
 .1				inx
 				bne .2
@@ -242,27 +242,27 @@ OSD.install		>LDYA L.OSD
 				inc ZPPtr2+1
 				bra .1
 
-.3				sta CLRWRITEAUX
+.3				sta IO.CLRWRITEAUX
 				rts
 *--------------------------------------
 ClrScr			lda #$55
 
 				ldx #0
 
-				sta SETHIRES
-				sta SET80STORE
+				sta IO.SETHIRES
+				sta IO.SET80STORE
 
 .1				ldy BASEL,x
 				sty ZPPtr1
 				ldy BASEH,x
 				sty ZPPtr1+1
 
-				sta SETPAGE2
+				sta IO.SETPAGE2
 				jsr .2
 
 				eor #$7F
 
-				sta CLRPAGE2
+				sta IO.CLRPAGE2
 				jsr .2
 
 				inx
@@ -474,7 +474,7 @@ WRITE			>STYA ZPIOCTL			NON STANDARD
 				plx
 				jmp (J.Cmds-2,x)
 
-.2				sta SETWRITEAUX
+.2				sta IO.SETWRITEAUX
 
 				and #$7f
 				sta CBX.Cache
@@ -488,10 +488,10 @@ WRITE			>STYA ZPIOCTL			NON STANDARD
 				dey
 				bne .3
 
-				sta SETREADAUX
+				sta IO.SETREADAUX
 				jsr X.OSD
-				sta CLRREADAUX
-				sta CLRWRITEAUX
+				sta IO.CLRREADAUX
+				sta IO.CLRWRITEAUX
 				rts
 *--------------------------------------
 * IN:
@@ -562,26 +562,26 @@ DRV.CS.END
 *--------------------------------------
 				.INB usr/src/drv/dhgr.drv.g
 *--------------------------------------
-CONTROL.80C		.DA #SETIOUDIS
-				.DA #CLRTEXT
-*				.DA #SETHIRES
+CONTROL.80C		.DA #IO.SETIOUDIS
+				.DA #IO.CLRTEXT
+*				.DA #IO.SETHIRES
 
-				.DA #CLR80DISP
-				.DA #SETAN3
-				.DA #CLRAN3
-				.DA #SETAN3
-				.DA #CLRAN3
+				.DA #IO.CLR80DISP
+				.DA #IO.SETAN3
+				.DA #IO.CLRAN3
+				.DA #IO.SETAN3
+				.DA #IO.CLRAN3
 
-				.DA #SET80DISP
-				.DA #SETAN3
-				.DA #CLRAN3
-				.DA #SETAN3
+				.DA #IO.SET80DISP
+				.DA #IO.SETAN3
+				.DA #IO.CLRAN3
+				.DA #IO.SETAN3
 
 				.DA #0
 
-CONTROL.EVE		.DA #SETIOUDIS
-				.DA #CLRTEXT
-*				.DA #SETHIRES
+CONTROL.EVE		.DA #IO.SETIOUDIS
+				.DA #IO.CLRTEXT
+*				.DA #IO.SETHIRES
 				.DA #HR1.OFF
 				.DA #HR2.ON
 				.DA #HR3.ON
diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt
index dd92bf81..69128ddc 100644
--- a/DRV/MOUSE.DRV.S.txt
+++ b/DRV/MOUSE.DRV.S.txt
@@ -232,7 +232,7 @@ READ			>STYA ZPBufPtr			NON STANDARD
 				php
 				sei
 				
-				sta CLRPAGE2
+				sta IO.CLRPAGE2
 
 *				ldy #READMOUSE			DONE BY IRQ MANAGER
 *				jsr GOMOUSE
diff --git a/LIB/LIBBLKDEV.S.txt b/LIB/LIBBLKDEV.S.txt
index f8b021ee..1cc575d5 100644
--- a/LIB/LIBBLKDEV.S.txt
+++ b/LIB/LIBBLKDEV.S.txt
@@ -149,7 +149,7 @@ BuildProDOSCat	>PULLW ZPPtr1			DstBuf
 
 				ldx #3
 
-.10				lda DATELO,x
+.10				lda GP.DATE,x
 				sta VolDirHdr.CT,x
 				dex
 				bpl .10
diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt
index 78bba855..49d29900 100644
--- a/LIB/LIBTCPIP.S.SKT.txt
+++ b/LIB/LIBTCPIP.S.SKT.txt
@@ -560,7 +560,7 @@ SKT.AddDataToSktIn
 				ldy SKT.Cache+S.SOCKET.TCP.INHEAD
 
 .1				.DO AUXPIPE=1
-				sta SETWRITEAUX
+				sta IO.SETWRITEAUX
 				.FIN
 
 .2				inx
@@ -583,7 +583,7 @@ SKT.AddDataToSktIn
 				bne .2
 
 				.DO AUXPIPE=1
-				sta CLRWRITEAUX
+				sta IO.CLRWRITEAUX
 				.FIN
 
 				inc ZPTmpPtr1+1
@@ -603,7 +603,7 @@ SKT.AddDataToSktIn
 				rts
 
 .8				.DO AUXPIPE=1
-				sta CLRWRITEAUX
+				sta IO.CLRWRITEAUX
 				.FIN
 				sty SKT.Cache+S.SOCKET.TCP.INHEAD
 
@@ -669,7 +669,7 @@ SKT.AddDataToSktOut
 				pha
 				
 .1				.DO AUXPIPE=1
-				sta SETWRITEAUX
+				sta IO.SETWRITEAUX
 				.FIN
 
 .2				inx
@@ -694,7 +694,7 @@ SKT.AddDataToSktOut
 
 				inc ZPTmpPtr1+1
 				.DO AUXPIPE=1
-				sta CLRWRITEAUX
+				sta IO.CLRWRITEAUX
 				.FIN
 				inc SKT.Cache+S.SOCKET.TCP.OUTHEAD+1
 				lda SKT.Cache+S.SOCKET.TCP.OUTHEAD+1
@@ -710,7 +710,7 @@ SKT.AddDataToSktOut
 				bra .1
 
 .8				.DO AUXPIPE=1
-				sta CLRWRITEAUX
+				sta IO.CLRWRITEAUX
 				.FIN
 				sty SKT.Cache+S.SOCKET.TCP.OUTHEAD
 
diff --git a/LIB/LIBTCPIP.S.txt b/LIB/LIBTCPIP.S.txt
index 44d6284b..b96f4475 100644
--- a/LIB/LIBTCPIP.S.txt
+++ b/LIB/LIBTCPIP.S.txt
@@ -290,9 +290,9 @@ GetDynPort		inc DYNPORT.LAST
 CS.END
 *--------------------------------------
 				.DO AUXPIPE=1
-ZP.CODE			sta SETREADAUX
+ZP.CODE			sta IO.SETREADAUX
 				lda (ZPTmpPtr1),y
-				sta CLRREADAUX
+				sta IO.CLRREADAUX
 				rts
 ZP.CODE.Len		.EQ *-ZP.CODE
 				.FIN
diff --git a/SHARED/X.SSC.DRV.S.txt b/SHARED/X.SSC.DRV.S.txt
index c4c16d70..f543ea03 100644
--- a/SHARED/X.SSC.DRV.S.txt
+++ b/SHARED/X.SSC.DRV.S.txt
@@ -584,7 +584,7 @@ READ			php
 				stz ZPCount2+1
 
 				.DO SSCIRQ=1
-				sta SETREADAUX
+				sta IO.SETREADAUX
 				.FIN
 
 READ.10			inc ZPCount
@@ -649,7 +649,7 @@ READ.81			ldy #S.IOCTL.BYTECNT
 				sta (ZPIOCTL),y
 
 				.DO SSCIRQ=1
-				sta CLRREADAUX
+				sta IO.CLRREADAUX
 				.FIN
 				plp
 				clc
@@ -660,7 +660,7 @@ READ.9			lda #MLI.E.IO
 
 READ.99			lda	#E.NODATA
 				.DO SSCIRQ=1
-				sta CLRREADAUX
+				sta IO.CLRREADAUX
 				.FIN
 				plp
 				sec
@@ -671,7 +671,7 @@ WRITE			php
 				jsr READ.WRITE.Init
 
 				.DO SSCIRQ=1
-				sta SETWRITEAUX
+				sta IO.SETWRITEAUX
 				.FIN
 
 WRITE.2			inc ZPCount
@@ -735,7 +735,7 @@ WRITE.4			lda SSC.STATUS-$8F,x
 				.FIN
 
 WRITE.8			.DO SSCIRQ=1
-				sta CLRWRITEAUX
+				sta IO.CLRWRITEAUX
 				.FIN
 				plp
 				clc
@@ -745,7 +745,7 @@ WRITE.9			lda	#MLI.E.IO
 				.HS 2C					BIT ABS
 WRITE.99		lda #E.NODATA
 				.DO SSCIRQ=1
-				sta CLRWRITEAUX
+				sta IO.CLRWRITEAUX
 				.FIN
 				plp
 				sec
@@ -786,8 +786,8 @@ IRQ				ldx DEVSLOTn08F
 *				and #SSC.STATUS.IRQ		Useless
 				bpl IRQ.9				IRQ from this device ? no, exit !!!!Applewin bug #308!!!!
 
-				sta SETREADAUX
-				sta SETWRITEAUX
+				sta IO.SETREADAUX
+				sta IO.SETWRITEAUX
 
 				bit #SSC.STATUS.RDRF	incoming char?
 				beq IRQ.2
@@ -818,8 +818,8 @@ IRQ.OUTBUF		lda $FFFF,y				SELF MODIFIED
 				sta SSC.DATA-$8F,x		write data to clear IRQ
 				inc OUTBUF.TAIL
 
-IRQ.8			sta CLRREADAUX
-				sta CLRWRITEAUX
+IRQ.8			sta IO.CLRREADAUX
+				sta IO.CLRWRITEAUX
 
 				clc
 				rts