diff --git a/src/mkbld b/src/mkbld
index 5ae92ec..1a80820 100755
--- a/src/mkbld
+++ b/src/mkbld
@@ -29,7 +29,7 @@ cat inc/sdfat.plh          | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/inc/SDFAT.PLH T
 cat inc/sndseq.plh         | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/inc/SNDSEQ.PLH TXT
 cat inc/spiport.plh        | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/inc/SPIPORT.PLH TXT
 cat inc/testlib.plh        | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/inc/TESTLIB.PLH TXT
-cat inc/grafix.plh         | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/inc/GRAFIX.PLH TXT
+#cat inc/grafix.plh         | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/inc/GRAFIX.PLH TXT
 cat inc/lz4.plh            | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/inc/LZ4.PLH TXT
 cat vmsrc/apple/plvmzp.inc | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/inc/PLVMZP.INC TXT
 
diff --git a/src/mkfpsos b/src/mkfpsos
index c326068..c30ccb5 100755
--- a/src/mkfpsos
+++ b/src/mkfpsos
@@ -13,3 +13,7 @@ cat rel/FPU#FE1000                 | ./ac.jar -p   PLASMA-2.1-FPSOS.po sys/FPU R
 cat rel/SANE#FE1000                | ./ac.jar -p   PLASMA-2.1-FPSOS.po sys/SANE REL
 cat ../sysfiles/FP6502.CODE#060000 | ./ac.jar -p   PLASMA-2.1-FPSOS.po sys/FP6502.CODE BIN
 cat ../sysfiles/ELEMS.CODE#060000  | ./ac.jar -p   PLASMA-2.1-FPSOS.po sys/ELEMS.CODE BIN
+cat inc/grafix.plh                 | ./ac.jar -ptx PLASMA-2.1-FPSOS.po bld/inc/GRAFIX.PLH TXT
+cat samplesrc/gfxdemo.pla          | ./ac.jar -ptx PLASMA-2.1-FPSOS.po bld/samples/GFXDEMO.PLA TXT
+cat scripts/grafix.4th             | ./ac.jar -ptx PLASMA-2.1-FPSOS.po sys/scripts/GRAFIX.4TH TXT
+cat scripts/gfxplot.4th            | ./ac.jar -ptx PLASMA-2.1-FPSOS.po bld/scripts/GFXPLOT.4TH TXT
diff --git a/src/mkrel b/src/mkrel
index bb9bb8b..0f4fc5a 100755
--- a/src/mkrel
+++ b/src/mkrel
@@ -68,6 +68,7 @@ cp scripts/fileio.4th         prodos/sys/scripts/FILEIO.4TH.TXT
 cp scripts/grlib.4th          prodos/sys/scripts/GRLIB.4TH.TXT
 cp scripts/dgrlib.4th         prodos/sys/scripts/DGRLIB.4TH.TXT
 cp scripts/hgrlib.4th         prodos/sys/scripts/HGRLIB.4TH.TXT
+cp scripts/grafix.4th         prodos/sys/scripts/GRAFIX.4TH.TXT
 cp scripts/int32.4th          prodos/sys/scripts/INT32.4TH.TXT
 cp scripts/fpu.4th            prodos/sys/scripts/FPU.4TH.TXT
 
@@ -150,6 +151,7 @@ cp scripts/dbounce.4th   prodos/bld/scripts/DBOUNCE.4TH.TXT
 cp scripts/hrbounce.4th  prodos/bld/scripts/HRBOUNCE.4TH.TXT
 cp scripts/plot.4th      prodos/bld/scripts/PLOT.4TH.TXT
 cp scripts/hrplot.4th    prodos/bld/scripts/HRPLOT.4TH.TXT
+cp scripts/gfxplot.4th   prodos/bld/scripts/GFXPLOT.4TH.TXT
 
 #mkdir prodos/bld/examples
 #cp samplesrc/examples/ex.1.pla  prodos/bld/examples/EX.1.PLA.TXT
diff --git a/src/scripts/gfxplot.4th b/src/scripts/gfxplot.4th
index 8369a62..8b8d014 100644
--- a/src/scripts/gfxplot.4th
+++ b/src/scripts/gfxplot.4th
@@ -4,15 +4,15 @@ SRC" GRAFIX.4TH"
 SRC" FPU.4TH"
 
 : DRAWAXIS
-  3 SETMODE
-  1 PENCOLOR
-  0  96 139 96  LINE
-  70 0  70  191 LINE
+  3 GFXSETMODE
+  1 GFXPENCOLOR
+  0  96 139 96  GFXLINE
+  70 0  70  191 GFXLINE
 ;
 
 : PLOTDONE
   KEY DROP
-  -1 SETMODE
+  -1 GFXSETMODE
 ;
 
 FPEXT XSCALE
@@ -24,12 +24,12 @@ FPEXT YSCALE
 DEFER FUNC
 
 : PLOTFUNC
-  3 PENCOLOR
+  3 GFXPENCOLOR
   140 0 DO
     I DUP 69 - >FPINT XSCALE FPEXT@ FP*
     FUNC
     YSCALE FPEXT@ FP* FPINT> 95 +
-    OVER 1+ OVER HGRPLOT HGRPLOT
+    GFXPLOT
   LOOP
 ;
 
diff --git a/src/scripts/grafix.4th b/src/scripts/grafix.4th
index f45bf8c..3c03512 100644
--- a/src/scripts/grafix.4th
+++ b/src/scripts/grafix.4th
@@ -1,14 +1,14 @@
 ' GRAFIX ?ENDSRC
 " GRAFIX"  LOADMOD"  "
-LOOKUP PENCOLOR   PLASMA PENCOLOR
-LOOKUP FILLCOLOR  PLASMA FILLCOLOR
-LOOKUP FILLSCREEN PLASMA FILLSCREEN
-LOOKUP PENMOVE    PLASMA PENMOVE
-LOOKUP PLOT       PLASMA PLOT
-LOOKUP LINE       PLASMA LINE
-LOOKUP LINETO     PLASMA LINETO
-LOOKUP RECT       PLASMA RECT
-LOOKUP FILLRECT   PLASMA FILLRECT
-LOOKUP BITBLT     PLASMA BITBLT
-LOOKUP DRAWMODE   PLASMA DRAWMODE
-LOOKUP SETMODE    PLASMA SETMODE
+LOOKUP PENCOLOR   PLASMA GFXPENCOLOR
+LOOKUP FILLCOLOR  PLASMA GFXFILLCOLOR
+LOOKUP FILLSCREEN PLASMA GFXFILLSCREEN
+LOOKUP PENMOVE    PLASMA GFXPENMOVE
+LOOKUP PLOT       PLASMA GFXPLOT
+LOOKUP LINE       PLASMA GFXLINE
+LOOKUP LINETO     PLASMA GFXLINETO
+LOOKUP RECT       PLASMA GFXRECT
+LOOKUP FILLRECT   PLASMA GFXFILLRECT
+LOOKUP BITBLT     PLASMA GFXBITBLT
+LOOKUP DRAWMODE   PLASMA GFXDRAWMODE
+LOOKUP SETMODE    PLASMA GFXSETMODE