diff --git a/graphics/hgr/trench/Makefile b/graphics/hgr/trench/Makefile
new file mode 100644
index 00000000..590d7cf5
--- /dev/null
+++ b/graphics/hgr/trench/Makefile
@@ -0,0 +1,88 @@
+include ../../../Makefile.inc
+
+DOS33 = ../../../utils/dos33fs-utils/dos33
+TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft
+LINKER_SCRIPTS = ../../../linker_scripts
+EMPTY_DISK = ../../../empty_disk
+
+all:	trench.dsk
+
+trench.dsk:	HELLO TRENCH.BAS TRENCH_BOT.BAS XW XW.BAS
+	cp $(EMPTY_DISK)/empty.dsk trench.dsk
+	$(DOS33) -y trench.dsk SAVE A HELLO
+	$(DOS33) -y trench.dsk SAVE A TRENCH.BAS
+	$(DOS33) -y trench.dsk SAVE A TRENCH_BOT.BAS
+#	$(DOS33) -y trench.dsk BSAVE -a 0x0C00 TRENCH
+	$(DOS33) -y trench.dsk SAVE A XW.BAS
+	$(DOS33) -y trench.dsk BSAVE -a 0x70 XW
+
+###
+
+HELLO:	hello.bas
+	$(TOKENIZE) < hello.bas > HELLO
+
+###
+
+TRENCH.BAS:	trench.bas
+	$(TOKENIZE) < trench.bas > TRENCH.BAS
+
+###
+
+TRENCH_BOT.BAS:	trench_bot.bas
+	$(TOKENIZE) < trench_bot.bas > TRENCH_BOT.BAS
+
+
+###
+
+LINES:	lines.o
+	ld65 -o LINES lines.o -C $(LINKER_SCRIPTS)/apple2_c00.inc
+
+lines.o:	lines.s
+	ca65 -o lines.o lines.s -l lines.lst
+
+###
+
+LINES_ROM:	lines_rom.o
+	ld65 -o LINES_ROM lines_rom.o -C $(LINKER_SCRIPTS)/apple2_c00.inc
+
+lines_rom.o:	lines_rom.s
+	ca65 -o lines_rom.o lines_rom.s -l lines_rom.lst
+
+###
+
+HLIN_TEST:	hlin_test.o
+	ld65 -o HLIN_TEST hlin_test.o -C $(LINKER_SCRIPTS)/apple2_c00.inc
+
+hlin_test.o:	hlin_test.s hgr_hlin.s
+	ca65 -o hlin_test.o hlin_test.s -l hlin_test.lst
+
+###
+
+VLIN_TEST:	vlin_test.o
+	ld65 -o VLIN_TEST vlin_test.o -C $(LINKER_SCRIPTS)/apple2_c00.inc
+
+vlin_test.o:	vlin_test.s hgr_vlin.s
+	ca65 -o vlin_test.o vlin_test.s -l vlin_test.lst
+
+
+###
+
+XW.BAS:  xw.bas
+	$(TOKENIZE) < xw.bas > XW.BAS
+
+
+
+###
+
+XW:	xw.o
+	ld65 -o XW xw.o -C $(LINKER_SCRIPTS)/apple2_70_zp.inc
+
+xw.o:	xw.s
+	ca65 -o xw.o xw.s -l xw.lst
+###
+
+
+###
+
+clean:	
+	rm -f *~ *.o *.lst HELLO TRENCH.BAS XW XW.BAS
diff --git a/graphics/hgr/xw/hello.bas b/graphics/hgr/trench/hello.bas
similarity index 100%
rename from graphics/hgr/xw/hello.bas
rename to graphics/hgr/trench/hello.bas
diff --git a/graphics/hgr/trench/trench.bas b/graphics/hgr/trench/trench.bas
new file mode 100644
index 00000000..18fac5da
--- /dev/null
+++ b/graphics/hgr/trench/trench.bas
@@ -0,0 +1,23 @@
+5 HGR2:HCOLOR=7
+20 HPLOT 0,78 TO 136,78 TO 0,114
+30 HPLOT 279,78 TO 144,78 TO 279,114
+'40 HPLOT 136,78 TO 136,88 TO 48,191
+'50 HPLOT 144,78 TO 144,88 TO 232,191
+60 FOR X=0 TO 11
+70 Y2=256-(X*16):IF Y2>191 THEN Y2=191
+80 HPLOT 4+X*12,112-X*3 TO 4+X*12,Y2
+90 HPLOT 276-X*12,112-X*3 TO 276-X*12,Y2
+100 NEXT
+'
+'136
+'124
+'60 HPLOT 112,85 TO 112,112
+'70 HPLOT 100,88 TO 100,128
+'80 HPLOT 88,91 TO 88,144
+'90 HPLOT 76,94 TO 76,160
+'64 97                176
+'52 100               192
+'40 103               208
+'28 106               224
+'16 109               240
+'4  112               256
diff --git a/graphics/hgr/trench/trench_bot.bas b/graphics/hgr/trench/trench_bot.bas
new file mode 100644
index 00000000..5b211287
--- /dev/null
+++ b/graphics/hgr/trench/trench_bot.bas
@@ -0,0 +1,10 @@
+5 HGR:HCOLOR=7:GOSUB 120:HGR2:O=1:GOSUB 120:P=1
+10 POKE230,32+32*P:P=NOTP:POKE49236+P,0:?CHR$(7):GOTO10
+99 END
+'100 HPLOT 0,78 TO 136,78 TO 0,114
+'110 HPLOT 279,78 TO 144,78 TO 279,114
+120 FOR X=0 TO 40
+130 Y2=2*O+256-(X*4):IF Y2>191 THEN Y2=191
+140 HPLOT 2*O+4+X*4,O+112-X*2 TO 2*O+4+X*4,Y2
+'150 HPLOT 276-X*12,1.5*O+112-X*3 TO 276-X*12,Y2
+160 NEXT:RETURN
diff --git a/graphics/hgr/xw/xw.bas b/graphics/hgr/trench/xw.bas
similarity index 100%
rename from graphics/hgr/xw/xw.bas
rename to graphics/hgr/trench/xw.bas
diff --git a/graphics/hgr/xw/xw.s b/graphics/hgr/trench/xw.s
similarity index 100%
rename from graphics/hgr/xw/xw.s
rename to graphics/hgr/trench/xw.s
diff --git a/graphics/hgr/xw/xw.shape b/graphics/hgr/trench/xw.shape
similarity index 100%
rename from graphics/hgr/xw/xw.shape
rename to graphics/hgr/trench/xw.shape
diff --git a/graphics/hgr/xw/Makefile b/graphics/hgr/xw/Makefile
deleted file mode 100644
index 2ddfcaed..00000000
--- a/graphics/hgr/xw/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-include ../../../Makefile.inc
-
-DOS33 = ../../../utils/dos33fs-utils/dos33
-TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft
-LINKER_SCRIPTS = ../../../linker_scripts
-EMPTY_DISK = ../../../empty_disk/empty.dsk
-
-all:	xw.dsk
-
-xw.dsk:	HELLO XW XW.BAS
-	cp $(EMPTY_DISK) xw.dsk
-	$(DOS33) -y xw.dsk SAVE A HELLO
-	$(DOS33) -y xw.dsk SAVE A XW.BAS
-	$(DOS33) -y xw.dsk BSAVE -a 0x70 XW
-
-
-###
-
-HELLO:  hello.bas
-	$(TOKENIZE) < hello.bas > HELLO
-
-###
-
-XW.BAS:  xw.bas
-	$(TOKENIZE) < xw.bas > XW.BAS
-
-
-
-###
-
-XW:	xw.o
-	ld65 -o XW xw.o -C $(LINKER_SCRIPTS)/apple2_70_zp.inc
-
-xw.o:	xw.s
-	ca65 -o xw.o xw.s -l xw.lst
-###
-
-clean:	
-	rm -f *~ *.o *.lst XW