diff --git a/games/ootw/Makefile b/games/ootw/Makefile
index c647e3a8..56b35f86 100644
--- a/games/ootw/Makefile
+++ b/games/ootw/Makefile
@@ -35,39 +35,67 @@ ootw.dsk:	./qboot/QBOOT_DISK1 ./qboot/QLOAD \
 	$(DOS33_RAW) ootw.dsk  26 0 ./ootw_c4/OOTW_C4	0   62
 	$(DOS33_RAW) ootw.dsk  30 0 ./ootw_c5/OOTW_C5	0   41
 
+#ootw_side2.dsk:	HELLO ./title/TITLE \
+#	./ootw_c6/OOTW_C6 ./ootw_c7/OOTW_C7 ./ootw_c8/OOTW_C8 \
+#	./ootw_c9/OOTW_C9 ./ootw_c10/OOTW_C10
+#	cp $(EMPTY_DISK)/empty.dsk ootw_side2.dsk
+#	$(DOS33) -y ootw_side2.dsk SAVE A HELLO HELLO
+#	$(DOS33) -y ootw_side2.dsk BSAVE -a 0xd00 ./title/TITLE
+#	$(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c6/OOTW_C6 OOTW_C6
+#	$(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c7/OOTW_C7 OOTW_C7
+#	$(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c8/OOTW_C8 OOTW_C8
+#	$(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c9/OOTW_C9 OOTW_C9
+#	$(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c10/OOTW_C10 OOTW_C10
 
 
-
-
-
-ootw_side2.dsk:	HELLO ./title/TITLE \
-	./ootw_c6/OOTW_C6 ./ootw_c7/OOTW_C7 ./ootw_c8/OOTW_C8 \
-	./ootw_c9/OOTW_C9 ./ootw_c10/OOTW_C10
+ootw_side2.dsk:	./qboot/QBOOT_DISK2 ./qboot/QLOAD \
+		./ootw_c6/OOTW_C6 ./ootw_c7/OOTW_C7 \
+		./ootw_c8/OOTW_C8 ./ootw_c9/OOTW_C9 ./ootw_c10/OOTW_C10
 	cp $(EMPTY_DISK)/empty.dsk ootw_side2.dsk
-	$(DOS33) -y ootw_side2.dsk SAVE A HELLO HELLO
-	$(DOS33) -y ootw_side2.dsk BSAVE -a 0xd00 ./title/TITLE
-	$(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c6/OOTW_C6 OOTW_C6
-	$(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c7/OOTW_C7 OOTW_C7
-	$(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c8/OOTW_C8 OOTW_C8
-	$(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c9/OOTW_C9 OOTW_C9
-	$(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c10/OOTW_C10 OOTW_C10
+	$(DOS33_RAW) ootw_side2.dsk  0  0 ./qboot/QBOOT_DISK2	0   1
+	$(DOS33_RAW) ootw_side2.dsk  0  2 ./qboot/QBOOT_DISK2	1   1
+	$(DOS33_RAW) ootw_side2.dsk  0  4 ./qboot/QBOOT_DISK2	2   1
+	$(DOS33_RAW) ootw_side2.dsk  1  0 ./qboot/QLOAD		0   14
+	$(DOS33_RAW) ootw_side2.dsk  2  0 ./ootw_c6/OOTW_C6	0   38
+	$(DOS33_RAW) ootw_side2.dsk  5  0 ./ootw_c7/OOTW_C7	0   38
+	$(DOS33_RAW) ootw_side2.dsk  8  0 ./ootw_c8/OOTW_C8	0   39
+	$(DOS33_RAW) ootw_side2.dsk  11 0 ./ootw_c9/OOTW_C9	0   38
+	$(DOS33_RAW) ootw_side2.dsk  14 0 ./ootw_c10/OOTW_C10	0   38
 
-ootw_side3.dsk:	HELLO ./title/TITLE ./ending/ENDING \
-	./ootw_c11/OOTW_C11 ./ootw_c12/OOTW_C12 ./ootw_c13/OOTW_C13 \
-	./ootw_c14/OOTW_C14 ./ootw_c15/OOTW_C15
+
+#ootw_side3.dsk:	HELLO ./title/TITLE ./ending/ENDING \
+#	./ootw_c11/OOTW_C11 ./ootw_c12/OOTW_C12 ./ootw_c13/OOTW_C13 \
+#	./ootw_c14/OOTW_C14 ./ootw_c15/OOTW_C15
+#	cp $(EMPTY_DISK)/empty.dsk ootw_side3.dsk
+#	$(DOS33) -y ootw_side3.dsk SAVE A HELLO HELLO
+#	$(DOS33) -y ootw_side3.dsk BSAVE -a 0xd00 ./title/TITLE
+#	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c11/OOTW_C11
+#	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c12/OOTW_C12
+#	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c13/OOTW_C13
+#	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c14/OOTW_C14
+#	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c15/OOTW_C15
+#	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ending/ENDING
+
+
+ootw_side3.dsk:	./qboot/QBOOT_DISK3 ./qboot/QLOAD \
+		./ootw_c11/OOTW_C11 ./ootw_c12/OOTW_C12 \
+		./ootw_c13/OOTW_C13 ./ootw_c14/OOTW_C14 ./ootw_c15/OOTW_C15 \
+		./ending/ENDING
 	cp $(EMPTY_DISK)/empty.dsk ootw_side3.dsk
-	$(DOS33) -y ootw_side3.dsk SAVE A HELLO HELLO
-	$(DOS33) -y ootw_side3.dsk BSAVE -a 0xd00 ./title/TITLE
-	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c11/OOTW_C11
-	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c12/OOTW_C12
-	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c13/OOTW_C13
-	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c14/OOTW_C14
-	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c15/OOTW_C15
-	$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ending/ENDING
+	$(DOS33_RAW) ootw_side3.dsk  0  0 ./qboot/QBOOT_DISK3	0   1
+	$(DOS33_RAW) ootw_side3.dsk  0  2 ./qboot/QBOOT_DISK3	1   1
+	$(DOS33_RAW) ootw_side3.dsk  0  4 ./qboot/QBOOT_DISK3	2   1
+	$(DOS33_RAW) ootw_side3.dsk  1  0 ./qboot/QLOAD		0   14
+	$(DOS33_RAW) ootw_side3.dsk  2  0 ./ootw_c11/OOTW_C11	0   38
+	$(DOS33_RAW) ootw_side3.dsk  5  0 ./ootw_c12/OOTW_C12	0   38
+	$(DOS33_RAW) ootw_side3.dsk  8  0 ./ootw_c13/OOTW_C13	0   39
+	$(DOS33_RAW) ootw_side3.dsk  11 0 ./ootw_c14/OOTW_C14	0   38
+	$(DOS33_RAW) ootw_side3.dsk  13 0 ./ootw_c15/OOTW_C15	0   97
+	$(DOS33_RAW) ootw_side3.dsk  19 0 ./ending/ENDING	0   90
 
 ####
 
-qboot/QBOOT:
+qboot/QBOOT_DISK1:
 	cd qboot && make
 
 ####
diff --git a/games/ootw/ending/Makefile b/games/ootw/ending/Makefile
index 77fc12bb..a7620445 100644
--- a/games/ootw/ending/Makefile
+++ b/games/ootw/ending/Makefile
@@ -8,7 +8,7 @@ all:	ENDING
 #####
 
 ENDING:	ending.o
-	ld65 -o ENDING ending.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+	ld65 -o ENDING ending.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
 
 ending.o:	ending.s \
 		credits.s \
diff --git a/games/ootw/ootw_c10/Makefile b/games/ootw/ootw_c10/Makefile
index a34927e6..35201d58 100644
--- a/games/ootw/ootw_c10/Makefile
+++ b/games/ootw/ootw_c10/Makefile
@@ -9,7 +9,7 @@ all:	OOTW_C10
 ####
 
 OOTW_C10:	ootw_c10.o
-	ld65 -o OOTW_C10 ootw_c10.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+	ld65 -o OOTW_C10 ootw_c10.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
 
 ootw_c10.o:	ootw_c10.s \
 	$(COMMON)/gr_copy.s \
diff --git a/games/ootw/ootw_c11/Makefile b/games/ootw/ootw_c11/Makefile
index 50dd6b29..c570e367 100644
--- a/games/ootw/ootw_c11/Makefile
+++ b/games/ootw/ootw_c11/Makefile
@@ -9,7 +9,7 @@ all:	OOTW_C11
 ####
 
 OOTW_C11:	ootw_c11.o
-	ld65 -o OOTW_C11 ootw_c11.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+	ld65 -o OOTW_C11 ootw_c11.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
 
 ootw_c11.o:	ootw_c11.s \
 	$(COMMON)/gr_copy.s \
diff --git a/games/ootw/ootw_c12/Makefile b/games/ootw/ootw_c12/Makefile
index d883c4cf..d29a1887 100644
--- a/games/ootw/ootw_c12/Makefile
+++ b/games/ootw/ootw_c12/Makefile
@@ -9,7 +9,7 @@ all:	OOTW_C12
 ####
 
 OOTW_C12:	ootw_c12.o
-	ld65 -o OOTW_C12 ootw_c12.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+	ld65 -o OOTW_C12 ootw_c12.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
 
 ootw_c12.o:	ootw_c12.s \
 	$(COMMON)/gr_copy.s \
diff --git a/games/ootw/ootw_c13/Makefile b/games/ootw/ootw_c13/Makefile
index c8eabf94..a7e0449b 100644
--- a/games/ootw/ootw_c13/Makefile
+++ b/games/ootw/ootw_c13/Makefile
@@ -9,7 +9,7 @@ all:	OOTW_C13
 ####
 
 OOTW_C13:	ootw_c13.o
-	ld65 -o OOTW_C13 ootw_c13.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+	ld65 -o OOTW_C13 ootw_c13.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
 
 ootw_c13.o:	ootw_c13.s \
 	$(COMMON)/gr_copy.s \
diff --git a/games/ootw/ootw_c14/Makefile b/games/ootw/ootw_c14/Makefile
index 2cca6af3..2e9c80ef 100644
--- a/games/ootw/ootw_c14/Makefile
+++ b/games/ootw/ootw_c14/Makefile
@@ -9,7 +9,7 @@ all:	OOTW_C14
 ####
 
 OOTW_C14:	ootw_c14.o
-	ld65 -o OOTW_C14 ootw_c14.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+	ld65 -o OOTW_C14 ootw_c14.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
 
 ootw_c14.o:	ootw_c14.s \
 	$(COMMON)/gr_copy.s \
diff --git a/games/ootw/ootw_c15/Makefile b/games/ootw/ootw_c15/Makefile
index 3cc58a68..9f8fef3a 100644
--- a/games/ootw/ootw_c15/Makefile
+++ b/games/ootw/ootw_c15/Makefile
@@ -9,7 +9,7 @@ all:	OOTW_C15
 ####
 
 OOTW_C15:	ootw_c15.o
-	ld65 -o OOTW_C15 ootw_c15.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+	ld65 -o OOTW_C15 ootw_c15.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
 
 ootw_c15.o:	ootw_c15.s \
 	$(COMMON)/gr_copy.s \
diff --git a/games/ootw/ootw_c6/Makefile b/games/ootw/ootw_c6/Makefile
index 1e034973..8d70063d 100644
--- a/games/ootw/ootw_c6/Makefile
+++ b/games/ootw/ootw_c6/Makefile
@@ -9,7 +9,7 @@ all:	OOTW_C6
 ####
 
 OOTW_C6:	ootw_c6.o
-	ld65 -o OOTW_C6 ootw_c6.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+	ld65 -o OOTW_C6 ootw_c6.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
 
 ootw_c6.o:	ootw_c6.s \
 	$(COMMON)/gr_copy.s \
diff --git a/games/ootw/ootw_c7/Makefile b/games/ootw/ootw_c7/Makefile
index da7de768..a7fbea43 100644
--- a/games/ootw/ootw_c7/Makefile
+++ b/games/ootw/ootw_c7/Makefile
@@ -9,7 +9,7 @@ all:	OOTW_C7
 ####
 
 OOTW_C7:	ootw_c7.o
-	ld65 -o OOTW_C7 ootw_c7.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+	ld65 -o OOTW_C7 ootw_c7.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
 
 ootw_c7.o:	ootw_c7.s \
 	$(COMMON)/gr_copy.s \
diff --git a/games/ootw/ootw_c8/Makefile b/games/ootw/ootw_c8/Makefile
index da198a80..aaf65df3 100644
--- a/games/ootw/ootw_c8/Makefile
+++ b/games/ootw/ootw_c8/Makefile
@@ -9,7 +9,7 @@ all:	OOTW_C8
 ####
 
 OOTW_C8:	ootw_c8.o
-	ld65 -o OOTW_C8 ootw_c8.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+	ld65 -o OOTW_C8 ootw_c8.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
 
 ootw_c8.o:	ootw_c8.s \
 	$(COMMON)/gr_copy.s \
diff --git a/games/ootw/ootw_c9/Makefile b/games/ootw/ootw_c9/Makefile
index 7cf52e42..e38e2751 100644
--- a/games/ootw/ootw_c9/Makefile
+++ b/games/ootw/ootw_c9/Makefile
@@ -9,7 +9,7 @@ all:	OOTW_C9
 ####
 
 OOTW_C9:	ootw_c9.o
-	ld65 -o OOTW_C9 ootw_c9.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
+	ld65 -o OOTW_C9 ootw_c9.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
 
 ootw_c9.o:	ootw_c9.s \
 	$(COMMON)/gr_copy.s \
diff --git a/games/ootw/qboot/common_defines.inc b/games/ootw/qboot/common_defines.inc
index b704f60a..38f1f1fd 100644
--- a/games/ootw/qboot/common_defines.inc
+++ b/games/ootw/qboot/common_defines.inc
@@ -4,27 +4,23 @@
 ;================================
 ; Loader definitions
 
-LOAD_TITLE	= 0
-LOAD_MIST	= 1
-LOAD_MECHE	= 2
-LOAD_SELENA	= 3
-LOAD_OCTAGON	= 4
-LOAD_VIEWER	= 5
-LOAD_STONEY	= 6
-LOAD_CHANNEL	= 7
-LOAD_CABIN	= 8
-LOAD_DENTIST	= 9
-LOAD_ARBOR	= 10
-LOAD_NIBEL	= 11
-LOAD_SHIP	= 12
-LOAD_GENERATOR	= 13
-LOAD_DNI	= 14
-LOAD_SUB	= 15
-LOAD_TEXT_TITLE	= 16
-LOAD_SAVE1	= 17
-LOAD_SAVE2	= 18
-LOAD_SAVE3	= 19
-LOAD_SAVE4	= 20
-LOAD_SAVE5	= 21
-LOAD_FIRST_SECTOR= 22
+LOAD_INTRO	= 0
+LOAD_C1		= 1
+LOAD_C2		= 2
+LOAD_C3		= 3
+LOAD_C4		= 4
+LOAD_C5		= 5
+LOAD_C6		= 6
+LOAD_C7		= 7
+LOAD_C8		= 8
+LOAD_C9		= 9
+LOAD_C10	= 10
+LOAD_C11	= 11
+LOAD_C12	= 12
+LOAD_C13	= 13
+LOAD_C14	= 14
+LOAD_C15	= 15
+LOAD_ENDING	= 16
+LOAD_TITLE	= 17
+LOAD_FIRST_SECTOR= 18
 
diff --git a/games/ootw/qboot/qload.s b/games/ootw/qboot/qload.s
index 12d271da..d2902700 100644
--- a/games/ootw/qboot/qload.s
+++ b/games/ootw/qboot/qload.s
@@ -132,17 +132,16 @@ fnf_keypress:
 	tax
 
 	; first sector now in $c00
-	;	offset 59
-	;		disk1 = $0a
-	;		disk2 = $32 ('2')
-	;		disk3 = $33 ('3')
+	;		disk1 = $01
+	;		disk2 = $02
+	;		disk3 = $03
 
-	lda	$c59
-	cmp	#$0a
+	lda	$ca5
+	cmp	#$01
 	beq	is_disk1
-	cmp	#$32
+	cmp	#$02
 	beq	is_disk2
-	cmp	#$33
+	cmp	#$03
 	beq	is_disk3
 	bne	change_disk		; unknown disk
 
@@ -195,11 +194,11 @@ load_address_array:
 
 track_array:
         .byte  2,11,17,25	; INTRO,C1,C2,C3
-	.byte 26,30,99,99	; C4,C5,C6,C7
-	.byte 99,99,99,99	; C8,C9,C10,C11
-	.byte 99,99,99,99	; C12,C13,C14,C15
-	.byte 99		; ENDING
-	.byte 99,99		; TITLE,FIRST_SECTOR
+	.byte 26,30, 2, 5	; C4,C5,C6,C7
+	.byte  8,11,14, 2	; C8,C9,C10,C11
+	.byte  5, 8,11,13	; C12,C13,C14,C15
+	.byte 19		; ENDING
+	.byte 99,0		; TITLE,FIRST_SECTOR
 
 
 sector_array:
@@ -213,10 +212,10 @@ sector_array:
 
 length_array:
         .byte 137, 95,125, 14	; INTRO,C1,C2,C3
-	.byte  62, 41,  0,  0	; C4,C5,C6,C7
-	.byte   0,  0,  0,  0	; C8,C9,C10,C11
-	.byte   0,  0,  0,  0	; C12,C13,C14,C15
-	.byte   0		; ENDING
+	.byte  62, 41, 38, 38	; C4,C5,C6,C7
+	.byte  39, 38, 38, 38	; C8,C9,C10,C11
+	.byte  38, 39, 38, 97	; C12,C13,C14,C15
+	.byte  90		; ENDING
 	.byte   1,  1		; TITLE,FIRST_SECTOR