diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 3c587c50..8f1df695 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po
index edd31418..02c7827a 100644
Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ
diff --git a/DRV/DHGR.DRV.S.LINE.txt b/DRV/DHGR.DRV.S.LINE.txt
index cd23f5fa..61fe1c6c 100644
--- a/DRV/DHGR.DRV.S.LINE.txt
+++ b/DRV/DHGR.DRV.S.LINE.txt
@@ -30,8 +30,8 @@ HLINE.MONO		>LDYA CB.Cache+S.CB.X1
 .1				ldx LBUF.C1
 				
 .2				tya
-				and LBUF.AND,x
-				sta LBUF.ORA,x
+				and LBUF.MASK,x
+				sta LBUF.DATA,x
 				inx
 				cpx LBUF.C2
 				bcs .2	
@@ -39,7 +39,8 @@ HLINE.MONO		>LDYA CB.Cache+S.CB.X1
 				ldy CB.Cache+S.CB.Y1
 				jmp LBUF.DrawAtY
 				
-HLINE.C16		lda CB.Cache+S.CB.X1
+HLINE.C16		>DEBUG
+				lda CB.Cache+S.CB.X1
 				and #%11111100
 				tay
 				lda CB.Cache+S.CB.X1+1
@@ -71,8 +72,8 @@ HLINE.C16		lda CB.Cache+S.CB.X1
 				tay
 				lda (ZPPalettePtr),y
 				
-				and LBUF.AND,x
-				sta LBUF.ORA,x
+				and LBUF.MASK,x
+				sta LBUF.DATA,x
 				cpx LBUF.C2
 				inx
 				bcc .1	
diff --git a/DRV/DHGR.DRV.S.RECT.txt b/DRV/DHGR.DRV.S.RECT.txt
index b12fa312..5d122521 100644
--- a/DRV/DHGR.DRV.S.RECT.txt
+++ b/DRV/DHGR.DRV.S.RECT.txt
@@ -18,11 +18,11 @@ FILLRECT		jsr HLINE
 				inc CB.Cache+S.CB.Y1
 				ldy CB.Cache+S.CB.Y1
 				cpy CB.Cache+S.CB.Y2
-				bcc .8
+				bcs .8
 			
 .2				jsr LBUF.DrawAtY
-				ldy CB.Cache+S.CB.Y1
 				inc CB.Cache+S.CB.Y1
+				ldy CB.Cache+S.CB.Y1
 				cpy CB.Cache+S.CB.Y2
 				bcc .2
 				
diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt
index c695dc15..5e6328f0 100644
--- a/DRV/DHGR.DRV.S.txt
+++ b/DRV/DHGR.DRV.S.txt
@@ -110,9 +110,6 @@ OPEN			sta A2osX.SCRNDEVS+2	DEV.ID in A
 				inx
 				cpx #3
 				bne .1
-				
-.8				clc
-				rts
 *--------------------------------------
 CONTROL			sta CLRTEXT
 				sta CLRMIXED
@@ -141,6 +138,7 @@ CLOSE			clc
 *--------------------------------------
 WRITE			>STYA ZPCmdPtr
 
+				sta SETHIRES			Make sure SET80STORE active a $2000
 				sta SET80STORE
 
 				lda (ZPCmdPtr)			Get Cmd
@@ -157,7 +155,7 @@ WRITE			>STYA ZPCmdPtr
 				
 				sta CLR80STORE
 				
-.8				clc
+				clc
 				rts
 				
 .10				jmp (J.Cmds,x)				
@@ -172,8 +170,8 @@ LBUF.SetBounds1YA
 				sta LBUF.C1
 				tay
 				
-				lda Mono.Head,x
-				sta	LBUF.AND,y
+				lda C1.MASK,x
+				sta	LBUF.MASK,y
 				rts
 *--------------------------------------
 LBUF.SetBounds2YA
@@ -184,20 +182,20 @@ LBUF.SetBounds2YA
 				cmp LBUF.C1
 				beq .2
 				
-				lda Mono.Tail,x
-				sta	LBUF.AND,y
+				lda C2.MASK,x
+				sta	LBUF.MASK,y
 				
 				lda #0
 				
 .1				dey
 				cpy LBUF.C1
 				beq .8
-				sta LBUF.AND,y
+				sta LBUF.MASK,y
 				bra .1
 				
-.2				lda Mono.Head,x
-				and Mono.Tail,x
-				sta	LBUF.AND,y
+.2				lda C1.MASK,x
+				and C2.MASK,x
+				sta	LBUF.MASK,y
 .8				rts
 *--------------------------------------
 LBUF.SetOPA		
@@ -214,9 +212,9 @@ LBUF.DrawAtY	lda BASEL,y				setup line Base Ptr
 				sta $C000,x
 				
 				lda (ZPBasePtr),y
-				and LBUF.AND,y
+				and LBUF.MASK,y
 				
-				ora LBUF.ORA,y
+				ora LBUF.DATA,y
 				lda #$ff
 				sta (ZPBasePtr),y
 
@@ -231,9 +229,9 @@ LBUF.DrawAtY.XOR
 				sta $C000,x
 				
 				lda (ZPBasePtr),y
-				and LBUF.AND,y
+				and LBUF.MASK,y
 				
-				eor LBUF.ORA,y
+				eor LBUF.DATA,y
 				sta (ZPBasePtr),y
 
 				iny
@@ -288,9 +286,9 @@ MOD7.lo			.BS 3
 MOD7.hi			.BS 3
 *--------------------------------------
 LBUF.C1			.BS 1
-LBUF.C2			.BS 1
-LBUF.ORA		.BS 80					
-LBUF.AND		.BS 80
+LBUF.C2			.BS 1																	C1				  C2
+LBUF.MASK		.BS 80					Bits to CLR in VMEM & LBUF.DATA from C1 to C2 : 11100000 00000000 00111111
+LBUF.DATA		.BS 80					Bits to SET/ORA/XOR in VMEM from C1 to C2     : 000ccccc cccccccc cc000000
 *--------------------------------------
 XDIV7			.BS 1
 XMOD7			.BS 1
diff --git a/DRV/DHGR.DRV.T.txt b/DRV/DHGR.DRV.T.txt
index 383c70a4..2a0f1b18 100644
--- a/DRV/DHGR.DRV.T.txt
+++ b/DRV/DHGR.DRV.T.txt
@@ -21,15 +21,17 @@ Mono.Masks		.DA	#%00000001
 				.DA #%00100000
 				.DA #%01000000
 *--------------------------------------
-Mono.Head		.DA	#%10000000
-				.DA #%10000001
+C1.MASK			.DA	#%10000000			mod 0.....
+C2.DATA			.DA #%10000001			->C1.DATA
 				.DA #%10000011
 				.DA #%10000111
 				.DA #%10001111
 				.DA #%10011111
-				.DA #%10111111
+				.DA #%10111111			...to 6
 *--------------------------------------
-Mono.Tail		.DA #%11111110
+C1.DATA			.DA #%11111111
+*--------------------------------------
+C2.MASK			.DA #%11111110
 				.DA #%11111100
 				.DA #%11111000
 				.DA #%11110000
diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt
index b7650b89..d9aa9cb6 100644
--- a/SBIN/GUI.S.txt
+++ b/SBIN/GUI.S.txt
@@ -238,7 +238,7 @@ CS.END
 DEVNAME.GFX		>CSTR "GFX"
 DEVNAME.MOUSE	>CSTR "MOU1"
 LIBGUI			>CSTR "libgui.o"
-MSG.INIT		>CSTR "DESKTOP:Init...\r\n"
+MSG.INIT		>CSTR "GUI:Init...\r\n"
 hLIBGUI			.BS 1
 hDevGFX			.BS 1
 hDevMouse		.BS 1