diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 2af7901f..2d7f4052 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/LIB/LIBGUI.S.MENU.txt b/LIB/LIBGUI.S.MENU.txt
index ff2bf8a5..2a668fe8 100644
--- a/LIB/LIBGUI.S.MENU.txt
+++ b/LIB/LIBGUI.S.MENU.txt
@@ -298,28 +298,21 @@ MENU.Enter		jsr MENU.GetDX
 				plx
 				beq .4					no previous selection
 				
-				jsr MENU.FindMItemByID	deselect previous...
-				jsr MENU.GetDX
-				jsr MENU.ShowMItem1
+				jsr MENU.ShowMItemByID	deselect previous...
 				
 .4				ldy #S.MENU.Selected	select new one
 				lda (ZPMENUPtr),y
 				tax
 				
-				jsr .80					go update it
-				
-				ldy #S.MENU.Selected
-				lda (ZPMENUPtr),y
-				tax
-				jsr MENU.FindMItemByID
+				jsr MENU.ShowMItemByID
 
 				ldy #S.MITEM.F
 				lda (ZPPtr1),y
 				cmp #S.MITEM.F.SUBMENU
-				bne .9
-				
-				
+				bne .80
 				
+				>LDYA L.WND.Screen
+				jsr DrawCBPtrToYA1
 				
 				
 				
@@ -338,10 +331,9 @@ MENU.Enter		jsr MENU.GetDX
 				
 				plx
 
-.80				jsr MENU.FindMItemByID
-				jsr MENU.GetDX
-				jsr MENU.ShowMItem1
-				>LDYA L.WND.Screen
+				jsr MENU.ShowMItemByID
+
+.80				>LDYA L.WND.Screen
 				jmp DrawCBPtrToYA1
 				
 .9				rts
@@ -562,6 +554,10 @@ MENU.ShowBorders
 				
 				jmp PutCBCache2CBBuf
 *--------------------------------------
+MENU.ShowMItemByID
+				jsr MENU.FindMItemByID
+				jsr MENU.GetDX
+*--------------------------------------
 MENU.ShowMItem	ldy #S.MITEM.F
 				lda (ZPPtr1),y
 				cmp #S.MITEM.F.SEP
@@ -740,7 +736,6 @@ MENU.IsSelected	phy
 				ldy #S.MENU.Selected
 				lda (ZPMENUPtr),y
 
-				ldx PREFS.MENUCOLOR
 				ldy #S.MITEM.ID
 				cmp (ZPPtr1),y
 				beq .9
@@ -920,12 +915,17 @@ MENU.FindMItemByID
 .1				lda (ZPPtr1)
 				beq .9
 				
+				ldy #S.MITEM.F
+				lda (ZPPtr1),y
+				cmp #S.MITEM.F.SEP
+				beq .7
+				
 				txa
 				ldy #S.MITEM.ID
 				cmp (ZPPtr1),y
 				beq .8
 				
-				jsr MENU.NextMItem
+.7				jsr MENU.NextMItem
 				bra .1
 				
 .8				clc
diff --git a/LIB/LIBGUI.S.MOU.txt b/LIB/LIBGUI.S.MOU.txt
index 9754bb81..4a18403c 100644
--- a/LIB/LIBGUI.S.MOU.txt
+++ b/LIB/LIBGUI.S.MOU.txt
@@ -153,19 +153,20 @@ MOU.CheckOverWND
 				ldx WND.Stack.Top
 				beq .9
 				
-				lda WND.Stack-1,x
+.1				lda WND.Stack-1,x
 				>SYSCALL GetMemPtr
 				>STYA ZPWNDPtr
 				
 				ldy #S.OBJ.F
 				lda (ZPWNDPtr),y
+
 				bit #S.WND.F.BORDER
-				beq .1
-				
+				beq .2
+
 				jsr MOU.ChkWNDBorders
 				bcc .99
 				
-.1				lda ZPWNDPtr
+.2				lda ZPWNDPtr
 				clc
 				adc #S.OBJ.X1
 				tay
@@ -173,12 +174,12 @@ MOU.CheckOverWND
 				adc #0
 
 				jsr MOU.InRectYA
-				bcs .2
+				bcs .3
 				
 				lda #CUR.T.WAIT
 				jmp SetCursor
 
-.2				lda #CUR.T.ARROW
+.3				lda #CUR.T.ARROW
 				jmp SetCursor
 				
 				
@@ -191,26 +192,32 @@ MOU.ChkWNDBorders
 				stz IY
 	
 				ldy #S.OBJ.X1
-				lda MouseData+S.MOUSE.X1
-				eor (ZPWNDPtr),y
+				lda (ZPWNDPtr),y
+				sec
+				sbc #1
+				eor MouseData+S.MOUSE.X1
 				bne .1
 
 				iny
-				lda MouseData+S.MOUSE.X1+1
-				eor (ZPWNDPtr),y
+				lda (ZPWNDPtr),y
+				sbc #0
+				eor MouseData+S.MOUSE.X1+1
 				bne .1
 
 				lda #CUR.T.RESIZEX
 				sta IY
 				
 .1				ldy #S.OBJ.Y1
-				lda MouseData+S.MOUSE.Y1
-				eor (ZPWNDPtr),y
+				lda (ZPWNDPtr),y
+				sec
+				sbc #1
+				eor MouseData+S.MOUSE.Y1
 				bne .3
 
 				iny
+				lda (ZPWNDPtr),y
+				sbc #0
 				lda MouseData+S.MOUSE.Y1+1
-				eor (ZPWNDPtr),y
 				bne .3
 
 				lda IY
@@ -223,13 +230,16 @@ MOU.ChkWNDBorders
 				sta IY
 				
 .3				ldy #S.OBJ.X2
-				lda MouseData+S.MOUSE.X2
-				eor (ZPWNDPtr),y
+				lda (ZPWNDPtr),y
+				clc
+				adc #1
+				eor MouseData+S.MOUSE.X2
 				bne .5
 
 				iny
-				lda MouseData+S.MOUSE.X2+1
-				eor (ZPWNDPtr),y
+				lda (ZPWNDPtr),y
+				adc #0
+				eor MouseData+S.MOUSE.X2+1
 				bne .5
 				
 				lda IY
@@ -242,13 +252,16 @@ MOU.ChkWNDBorders
 				sta IY
 
 .5				ldy #S.OBJ.Y2
-				lda MouseData+S.MOUSE.Y2
-				eor (ZPWNDPtr),y
+				lda (ZPWNDPtr),y
+				clc
+				adc #1
+				eor MouseData+S.MOUSE.Y2
 				bne .7
 
 				iny
-				lda MouseData+S.MOUSE.Y2+1
-				eor (ZPWNDPtr),y
+				lda (ZPWNDPtr),y
+				adc #0
+				eor MouseData+S.MOUSE.Y2+1
 				bne .7
 
 				lda #CUR.T.RESIZEXY1
diff --git a/LIB/LIBGUI.S.WND.txt b/LIB/LIBGUI.S.WND.txt
index c9f502c3..9e88aa83 100644
--- a/LIB/LIBGUI.S.WND.txt
+++ b/LIB/LIBGUI.S.WND.txt
@@ -179,7 +179,12 @@ WND.New			>LDYAI S.WND
 				sta (ZPWNDPtr),y
 
 				>PULLA
-				ldy #S.OBJ.F
+				bit #S.WND.F.RESIZE
+				beq .2
+				
+				ora #S.WND.F.BORDER
+
+.2				ldy #S.OBJ.F
 				sta (ZPWNDPtr),y
 
 				ldy #S.PS.PID
@@ -194,7 +199,7 @@ WND.New			>LDYAI S.WND
 				iny
 				lda L.WND.Desktop+1
 				sta (ZPWNDPtr),y
-
+				
 				txa						ID
 				ldy WND.Stack.Top
 				sta WND.Stack,y
@@ -278,7 +283,7 @@ WND.Show		>SYSCALL2 GetMemPtr
 
 				ldy #S.OBJ.F
 				lda (ZPWNDPtr),y
-				and #S.WND.F.RESIZE+S.WND.F.BORDER
+				and #S.WND.F.BORDER
 				beq .1
 
 				jsr WND.PaintBorders
diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt
index 9ddd9ce6..fc8c44ec 100644
--- a/LIB/LIBGUI.S.txt
+++ b/LIB/LIBGUI.S.txt
@@ -466,7 +466,7 @@ MENU.Sys
 				.DA #4					ID
 				.DA 0					pICON
 				.DA 0					pMENU
-				.DA #0
+				.DA #0					KEYSTR
 				.AZ "Programs"
 
 .4				.DA #.5-*				next