diff --git a/Makefile.win b/Makefile.win
new file mode 100644
index 0000000..0961957
--- /dev/null
+++ b/Makefile.win
@@ -0,0 +1,45 @@
+#
+#  Makefile
+#  WeeGUI
+#
+#  Created by Quinn Dunki on 8/15/14.
+#  One Girl, One Laptop Productions
+#  http://www.quinndunki.com
+#  http://www.quinndunki.com/blondihacks
+#
+
+
+CL65=cl65
+AC=AppleCommander.jar
+ADDR=7b00
+ADDRDEMO=6000
+
+PGM=weegui
+DEMO=asmdemo
+
+all: $(DEMO) $(PGM)
+
+
+$(DEMO):
+#	@PATH=$(PATH):/usr/local/bin; 
+	$(CL65) -t apple2enh --start-addr $(ADDRDEMO) -l$(DEMO).lst $(DEMO).s
+	java -jar $(AC) -d $(PGM).dsk $(DEMO)
+	java -jar $(AC) -p $(PGM).dsk $(DEMO) BIN 0x$(ADDRDEMO) < $(DEMO)
+	rm -f $(DEMO)
+	rm -f $(DEMO).o
+
+$(PGM):
+#	@PATH=$(PATH):/usr/local/bin; 
+	$(CL65) -t apple2enh --start-addr $(ADDR) -l$(PGM).lst $(PGM).s
+	java -jar $(AC) -d $(PGM).dsk $(PGM)
+	java -jar $(AC) -p $(PGM).dsk $(PGM) BIN 0x$(ADDR) < $(PGM)
+	rm -f $(PGM)
+	rm -f $(PGM).o
+#	osascript V2Make.scpt $(PROJECT_DIR) $(DEMO) $(PGM)
+
+clean:
+	rm -f $(DEMO)
+	rm -f $(DEMO).o
+	rm -f $(PGM)
+	rm -f $(PGM).o
+
diff --git a/views.s b/views.s
index de0d059..7d6e464 100644
--- a/views.s
+++ b/views.s
@@ -1026,7 +1026,7 @@ WGPendingViewAction_hasCallback:
 	cmp #WG_FEATURE_RT
 	bne WGPendingViewAction_done
 
-	lda #-1					; Right arrow
+	lda #$FF					; Right arrow
 	jsr WGScrollXBy
 	jsr WGViewFocus
 	jsr WGViewFocusAction	; Trigger application to redraw contents
@@ -1047,7 +1047,7 @@ WGPendingViewAction_up:
 	bra WGPendingViewAction_done
 
 WGPendingViewAction_down:
-	lda #-1					; Down arrow
+	lda #$FF					; Down arrow
 	jsr WGScrollYBy
 	jsr WGViewFocusQuiet
 	jsr WGViewFocusAction	; Trigger application to redraw contents
@@ -1381,7 +1381,7 @@ WGViewPaintAll_next:
 	bne WGViewPaintAll_loop
 
 WGViewPaintAll_done:
-	lda #-1
+	lda #$FF
 	jsr WGSelectView
 
 	RESTORE_AXY
diff --git a/weegui.dsk b/weegui.dsk
index a3ce4ca..54e40e8 100644
Binary files a/weegui.dsk and b/weegui.dsk differ