diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po
index a7f49131..19052cf5 100644
Binary files a/.Floppies/A2OSX.BOOT.po and b/.Floppies/A2OSX.BOOT.po differ
diff --git a/.Floppies/A2OSX.BOOT.woz b/.Floppies/A2OSX.BOOT.woz
index a2ce9f02..cebec1c8 100644
Binary files a/.Floppies/A2OSX.BOOT.woz and b/.Floppies/A2OSX.BOOT.woz differ
diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index f21b488d..43cc9ab5 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/LIB/LIBGUI.S.FON.txt b/LIB/LIBGUI.S.FON.txt
index 8597b1a5..54d43da3 100644
--- a/LIB/LIBGUI.S.FON.txt
+++ b/LIB/LIBGUI.S.FON.txt
@@ -4,18 +4,20 @@ NEW
 FON.Init		>LDYA L.SYSX7
 				jsr FON.Load
 				bcs .9
-				sta hSYSFON
+
+				stx hSYSFON
+
+				>LDYA L.SYSX7B
+				jsr FON.Load
+				bcs .9
+
+				stx hSYSFONB
 
 *				ldy #S.FON.PixH
 *				>SYSCALL2 GetStkObjProp
 				lda #7
 				sta SYSFON.H
 
-				>LDYA L.SYSX7B
-				jsr FON.Load
-				bcs .9
-				sta hSYSFONB
-
 .9				rts
 *--------------------------------------
 FON.Load		>PUSHYA
diff --git a/LIB/LIBGUI.S.WND.txt b/LIB/LIBGUI.S.WND.txt
index 0ad9e9ac..1a3459a3 100644
--- a/LIB/LIBGUI.S.WND.txt
+++ b/LIB/LIBGUI.S.WND.txt
@@ -333,19 +333,37 @@ WND.PaintTitle	ldx #S.CB-1
 				lda hSYSFONB
 				sta CB.Cache+S.CB.hFont
 				
+				ldy #S.OBJ.X1
+				lda (ZPPtr1),y
+				clc
+				adc #1
+				sta CB.Cache+S.CB.X1
+				iny
+				lda (ZPPtr1),y
+				adc #0
+				sta CB.Cache+S.CB.X1+1
+				
+				iny						#S.OBJ.Y1
+				
+				lda (ZPPtr1),y
+				clc
+				adc #1
+				sta CB.Cache+S.CB.Y1
+				iny
+				lda (ZPPtr1),y
+				adc #0
+				sta CB.Cache+S.CB.Y1+1
+				
+				
+				
 				ldy #S.WND.TITLE
 				lda (ZPPtr1),y
 				sta CB.Cache+S.CB.TxtPtr
 				iny
 				lda (ZPPtr1),y
 				sta CB.Cache+S.CB.TxtPtr+1
-			>DEBUG
+
 				jsr GFXWrite.CB
-
-			clc
-			rts
-
-
 				bcs .9
 	
 				ldx #0