diff --git a/images/apple/DRAWL.po b/images/apple/DRAWL.po
index 560e432b..5c8e674e 100644
Binary files a/images/apple/DRAWL.po and b/images/apple/DRAWL.po differ
diff --git a/images/apple/PLEIADES-2.20-BLD.po b/images/apple/PLEIADES-2.20-BLD.po
new file mode 100644
index 00000000..09f7f545
Binary files /dev/null and b/images/apple/PLEIADES-2.20-BLD.po differ
diff --git a/images/apple/PLEIADES-2.20-DEMOS.po b/images/apple/PLEIADES-2.20-DEMOS.po
new file mode 100644
index 00000000..32a14e07
Binary files /dev/null and b/images/apple/PLEIADES-2.20-DEMOS.po differ
diff --git a/images/apple/PLEIADES-2.20-FPSOS.po b/images/apple/PLEIADES-2.20-FPSOS.po
new file mode 100644
index 00000000..800bf9af
Binary files /dev/null and b/images/apple/PLEIADES-2.20-FPSOS.po differ
diff --git a/images/apple/PLEIADES-2.20-INET.po b/images/apple/PLEIADES-2.20-INET.po
new file mode 100644
index 00000000..a7bb0d66
Binary files /dev/null and b/images/apple/PLEIADES-2.20-INET.po differ
diff --git a/images/apple/PLEIADES-2.20-INST.po b/images/apple/PLEIADES-2.20-INST.po
new file mode 100644
index 00000000..c1a5e038
Binary files /dev/null and b/images/apple/PLEIADES-2.20-INST.po differ
diff --git a/images/apple/PLEIADES-2.20-SYS.po b/images/apple/PLEIADES-2.20-SYS.po
new file mode 100644
index 00000000..c066000c
Binary files /dev/null and b/images/apple/PLEIADES-2.20-SYS.po differ
diff --git a/images/apple/PLASMA-2.20.po b/images/apple/PLEIADES-2.20.po
similarity index 90%
rename from images/apple/PLASMA-2.20.po
rename to images/apple/PLEIADES-2.20.po
index 9ccfc862..9ea99bc6 100644
Binary files a/images/apple/PLASMA-2.20.po and b/images/apple/PLEIADES-2.20.po differ
diff --git a/images/apple/PLFORTH.PO b/images/apple/PLFORTH.po
similarity index 100%
rename from images/apple/PLFORTH.PO
rename to images/apple/PLFORTH.po
diff --git a/src/dhgr.tk/demos/startrek/fillshape.pla b/src/dhgr.tk/demos/startrek/fillshape.pla
new file mode 100644
index 00000000..2aa6a103
--- /dev/null
+++ b/src/dhgr.tk/demos/startrek/fillshape.pla
@@ -0,0 +1,217 @@
+include "inc/cmdsys.plh"
+include "inc/lines.plh"
+include "inc/vblank.plh"
+include "dhgr.tk/inc/dhgrlib.plh"
+include "dhgr.tk/inc/dhgrutils.plh"
+//
+// Pattern fill
+//
+const PAT_WIDTH  = SCR_WIDTH
+const PAT_HEIGHT = 2
+word pattern
+//
+// Polygon variables
+//
+word leftedge, rightedge  // Edge arrays
+byte polytop,  polybottom // Poly top and bottom extents
+byte startvx, startvy     // Starting poly vertex
+byte polyvx, polyvy       // Current poly vertex
+byte sin90[] // first 90 degrees of sin in fixed s.15 format
+byte =     0>>7,   571>>7,  1143>>7,  1714>>7,  2285>>7,  2855>>7,  3425>>7,  3993>>7
+byte =  4560>>7,  5126>>7,  5690>>7,  6252>>7,  6812>>7,  7371>>7,  7927>>7,  8480>>7
+byte =  9032>>7,  9580>>7, 10125>>7, 10668>>7, 11207>>7, 11743>>7, 12275>>7, 12803>>7
+byte = 13327>>7, 13848>>7, 14364>>7, 14876>>7, 15383>>7, 15886>>7, 16383>>7, 16876>>7
+byte = 17364>>7, 17846>>7, 18323>>7, 18794>>7, 19260>>7, 19720>>7, 20173>>7, 20621>>7
+byte = 21062>>7, 21497>>7, 21926>>7, 22347>>7, 22762>>7, 23170>>7, 23571>>7, 23964>>7
+byte = 24351>>7, 24730>>7, 25101>>7, 25465>>7, 25821>>7, 26169>>7, 26509>>7, 26841>>7
+byte = 27165>>7, 27481>>7, 27788>>7, 28087>>7, 28377>>7, 28659>>7, 28932>>7, 29196>>7
+byte = 29451>>7, 29697>>7, 29935>>7, 30163>>7, 30381>>7, 30591>>7, 30791>>7, 30982>>7
+byte = 31164>>7, 31336>>7, 31498>>7, 31651>>7, 31794>>7, 31928>>7, 32051>>7, 32165>>7
+byte = 32270>>7, 32364>>7, 32449>>7, 32523>>7, 32588>>7, 32643>>7, 32688>>7, 32723>>7
+byte = 32748>>7, 32763>>7, 32767>>7
+//
+// Sin and Cos
+//
+def sinext(deg)#1
+  return (sin90[deg] << 7) | (sin90[deg] >> 1)
+end
+def sin(deg)#1
+  while deg > 360; deg = deg - 360; loop
+  while deg < 0; deg = deg + 360; loop
+  if deg <= 90
+    return sinext(deg)
+  elsif deg <= 180
+    return sinext(180 - deg)
+  elsif deg <= 270
+    return -sinext(deg - 180)
+  fin
+  return -sinext(360 - deg)
+end
+def cos(deg)#1
+  return sin(deg + 90)
+end
+//
+// Create pattern pixmap for filling
+//
+export def setPattern(clr1, clr2, dither)#0
+  word patfill, clr
+
+  if not pattern
+    pattern = heapalloc(SCR_WIDTH * PAT_HEIGHT)
+  fin
+  //
+  // Even scanlines
+  //
+  clr = dither & 1 ?? clr2 :: clr1
+  patfill = clr | (clr << 8)
+  clr = dither & 2 ?? clr2 :: clr1
+  patfill = patfill | (clr << 4) | (clr << 12)
+  memset(pattern, patfill, SCR_WIDTH/2)
+  patfill = (patfill << 4) | clr // Rotate pattern for odd pixel
+  memset(pattern + SCR_WIDTH, patfill, SCR_WIDTH/2)
+  //
+  // Odd scanlines
+  //
+  clr = dither & 4 ?? clr2 :: clr1
+  patfill = clr | (clr << 8)
+  clr = dither & 8 ?? clr2 :: clr1
+  patfill = patfill | (clr << 4) | (clr << 12)
+  memset(pattern + SCR_WIDTH/2, patfill, SCR_WIDTH/2)
+  patfill = (patfill << 4) | clr  // Rotate pattern for odd pixel
+  memset(pattern + SCR_WIDTH + SCR_WIDTH/2, patfill, SCR_WIDTH/2)
+end
+export def patrnRect(left, top, right, bottom)#0
+  word patscan
+  byte width, y
+
+  width = right - left + 1
+  patscan = pattern + (left & 1 ?? SCR_WIDTH :: 0)
+  for y = top to bottom
+    dcgrPixMap(left, y, width, 1, patscan + (y & 1 ?? (SCR_WIDTH/2) :: 0))
+  next
+end
+export def solidRect(left, top, right, bottom)#0
+  byte l7, r7, x
+
+  l7 = (left | 7) / 7
+  r7 = right / 7
+  if l7 < r7
+    dhgrClearBl7(l7, top, r7 - l7, bottom - top + 1)
+  fin
+  l7 = l7 * 7
+  if l7 > left
+    for x = l7-1 downto left
+      dcgrVLin(top, bottom, x)
+    next
+  fin
+  r7 = r7 * 7
+  if r7 < right
+    for x = r7 to right
+      dcgrVLin(top, bottom, x)
+    next
+  fin
+end
+//
+// Convex polygon
+//
+def setEdge(x, y)#0
+  if x < leftedge->[y];  leftedge->[y]  = x; fin
+  if x > rightedge->[y]; rightedge->[y] = x; fin
+end
+export def startPoly(x, y)#0
+  setlineplot(@setEdge)
+  leftedge  = heapalloc(SCR_HEIGHT)
+  rightedge = heapalloc(SCR_HEIGHT)
+  memset(leftedge,  $FFFF, SCR_HEIGHT)
+  memset(rightedge, $0000, SCR_HEIGHT)
+  polytop    = y
+  polybottom = y
+  startvx    = x
+  startvy    = y
+  polyvx     = x
+  polyvy     = y
+end
+export def addVertex(x, y)#0
+  if y < polytop;    polytop    = y; fin
+  if y > polybottom; polybottom = y; fin
+  line(polyvx, polyvy, x, y)
+  polyvx     = x
+  polyvy     = y
+end
+export def patrnPoly(x, y)#0
+  var width
+  byte left
+
+  if y < polytop;    polytop    = y; fin
+  if y > polybottom; polybottom = y; fin
+  line(polyvx, polyvy, x, y)
+  line(x, y, startvx, startvy)
+  for y = polytop to polybottom
+    left  = leftedge->[y]
+    width = rightedge->[y] - left + 1
+    if width > 0
+      dcgrPixMap(left, y, width, 1, \
+                pattern + (left & 1 ?? SCR_WIDTH     :: 0) \
+                        + (y    & 1 ?? (SCR_WIDTH/2) :: 0))
+    fin
+  next
+  heaprelease(leftedge)
+end
+export def solidPoly(x, y)#0
+  byte left, right
+
+  if y < polytop;    polytop    = y; fin
+  if y > polybottom; polybottom = y; fin
+  line(polyvx, polyvy, x, y)
+  line(x, y, startvx, startvy)
+  for y = polytop to polybottom
+    left  = leftedge->[y]
+    right = rightedge->[y]
+    if right >= left
+      dcgrHLin(left, right, y)
+    fin
+  next
+  heaprelease(leftedge)
+end
+//
+// Ellipse
+//
+export def solidEllip(xorg, yorg, width, height)#0
+  var x, y, angle
+
+  for angle = 0 to 90 step 90 / height
+    x = ((cos(angle) >> 8) * width) >> 8
+    y = ((sin(angle) >> 8) * height) >> 8
+    dcgrHLin(xorg - x, xorg + x, yorg + y)
+    dcgrHLin(xorg - x, xorg + x, yorg - y)
+  next
+end
+export def patrnEllip(xorg, yorg, width, height)#0
+  var x, y, angle, left, len, scan
+
+  for angle = 0 to 90 step 90 / height
+    x = ((cos(angle) >> 8) * width) >> 8
+    y = ((sin(angle) >> 8) * height) >> 8
+    left = xorg - x
+    len  = x * 2
+    if len == 0; len = 1; fin
+    scan = yorg + y
+    dcgrPixMap(left, scan, len, 1, \
+               pattern + (left & 1 ?? SCR_WIDTH     :: 0) \
+                       + (scan & 1 ?? (SCR_WIDTH/2) :: 0))
+    scan = yorg - y
+    dcgrPixMap(left, scan, len, 1, \
+               pattern + (left & 1 ?? SCR_WIDTH     :: 0) \
+                       + (scan & 1 ?? (SCR_WIDTH/2) :: 0))
+  next
+end
+export def frame(left, top, right, bottom, thickness)#0
+  while thickness
+    thickness--
+    dcgrHLin(left + thickness, right  - thickness, top    + thickness)
+    dcgrHLin(left + thickness, right  - thickness, bottom - thickness)
+    dcgrVLin(top  + thickness, bottom - thickness, left   + thickness)
+    dcgrVLin(top  + thickness, bottom - thickness, right  - thickness)
+  loop
+end
+
diff --git a/src/dhgr.tk/demos/startrek/startrek.pla b/src/dhgr.tk/demos/startrek/startrek.pla
index 830befb4..408c31c8 100644
--- a/src/dhgr.tk/demos/startrek/startrek.pla
+++ b/src/dhgr.tk/demos/startrek/startrek.pla
@@ -1,8 +1,28 @@
 include "inc/cmdsys.plh"
-include "inc/lines.plh"
+//include "inc/lines.plh"
 include "inc/vblank.plh"
 include "dhgr.tk/inc/dhgrlib.plh"
 include "dhgr.tk/inc/dhgrutils.plh"
+import fillshape
+  //
+  // Dither matrices
+  //
+  const DITHER0   = $00
+  const DITHER25  = $04
+  const DITHER50  = $06
+  const DITHER75  = $07
+  const DITHER100 = $0F
+  predef setPattern(clr1, clr2, dither)#0
+  predef patrnRect(left, top, right, bottom)#0
+  predef solidRect(left, top, right, bottom)#0
+  predef startPoly(x, y)#0
+  predef addVertex(x, y)#0
+  predef patrnPoly(x, y)#0
+  predef solidPoly(x, y)#0
+  predef solidEllip(xorg, yorg, width, height)#0
+  predef patrnEllip(xorg, yorg, width, height)#0
+  predef frame(left, top, right, bottom, thickness)#0
+end
 
 sysflags resxtxt1|reshgr1|resxhgr1
 //
@@ -43,234 +63,14 @@ const ENT_W7 = 5
 const ENT_H  = 43
 const ENT_SZ = ENT_W7*4*ENT_H
 //
-// Dither matrices
-//
-const DITHER0   = $00
-const DITHER25  = $04
-const DITHER50  = $06
-const DITHER75  = $07
-const DITHER100 = $0F
-byte[] dither   = DITHER0, DITHER25, DITHER50, DITHER75, DITHER100
-var sin90[] // first 90 degrees of sin in fixed s.15 format
-var =     0,   571,  1143,  1714,  2285,  2855,  3425,  3993
-var =  4560,  5126,  5690,  6252,  6812,  7371,  7927,  8480
-var =  9032,  9580, 10125, 10668, 11207, 11743, 12275, 12803
-var = 13327, 13848, 14364, 14876, 15383, 15886, 16383, 16876
-var = 17364, 17846, 18323, 18794, 19260, 19720, 20173, 20621
-var = 21062, 21497, 21926, 22347, 22762, 23170, 23571, 23964
-var = 24351, 24730, 25101, 25465, 25821, 26169, 26509, 26841
-var = 27165, 27481, 27788, 28087, 28377, 28659, 28932, 29196
-var = 29451, 29697, 29935, 30163, 30381, 30591, 30791, 30982
-var = 31164, 31336, 31498, 31651, 31794, 31928, 32051, 32165
-var = 32270, 32364, 32449, 32523, 32588, 32643, 32688, 32723
-var = 32748, 32763, 32767
-//
-// Pattern fill
-//
-const PAT_WIDTH  = SCR_WIDTH
-const PAT_HEIGHT = 2
-word pattern
-//
-// Polygon variables
-//
-word leftedge, rightedge  // Edge arrays
-byte polytop,  polybottom // Poly top and bottom extents
-byte startvx, startvy     // Starting poly vertex
-byte polyvx, polyvy       // Current poly vertex
-//
 // Random seed
 //
-var rndseed = $A965
-
+var rndseed = $A64D
 def random#1
-  rndseed = (rndseed >> 3) ^ (rndseed << 13) + $4321
+  rndseed = (rndseed << 8) ^ ((rndseed & $7FFF) >> 7) + $62B3
   return rndseed
 end
 //
-// Create pattern pixmap for filling
-//
-def setPattern(clr1, clr2, dither)#0
-  word patfill, clr
-
-  if not pattern
-    pattern = heapalloc(SCR_WIDTH * PAT_HEIGHT)
-  fin
-  //
-  // Even scanlines
-  //
-  clr = dither & 1 ?? clr2 :: clr1
-  patfill = clr | (clr << 8)
-  clr = dither & 2 ?? clr2 :: clr1
-  patfill = patfill | (clr << 4) | (clr << 12)
-  memset(pattern, patfill, SCR_WIDTH/2)
-  patfill = (patfill << 4) | clr // Rotate pattern for odd pixel
-  memset(pattern + SCR_WIDTH, patfill, SCR_WIDTH/2)
-  //
-  // Odd scanlines
-  //
-  clr = dither & 4 ?? clr2 :: clr1
-  patfill = clr | (clr << 8)
-  clr = dither & 8 ?? clr2 :: clr1
-  patfill = patfill | (clr << 4) | (clr << 12)
-  memset(pattern + SCR_WIDTH/2, patfill, SCR_WIDTH/2)
-  patfill = (patfill << 4) | clr  // Rotate pattern for odd pixel
-  memset(pattern + SCR_WIDTH + SCR_WIDTH/2, patfill, SCR_WIDTH/2)
-end
-//
-// Sin and Cos
-//
-def sin(deg)#1
-  while deg > 360; deg = deg - 360; loop
-  while deg < 0; deg = deg + 360; loop
-  if deg <= 90
-    return sin90[deg]
-  elsif deg <= 180
-    return sin90[180 - deg]
-  elsif deg <= 270
-    return -sin90[deg - 180]
-  fin
-  return -sin90[360 - deg]
-end
-def cos(deg)#1
-  return sin(deg + 90)
-end
-
-def patrnRect(left, top, right, bottom)#0
-  word patscan
-  byte width, y
-
-  width = right - left + 1
-  patscan = pattern + (left & 1 ?? SCR_WIDTH :: 0)
-  for y = top to bottom
-    dcgrPixMap(left, y, width, 1, patscan + (y & 1 ?? (SCR_WIDTH/2) :: 0))
-  next
-end
-def solidRect(left, top, right, bottom)#0
-  byte l7, r7, x
-
-  l7 = (left | 7) / 7
-  r7 = right / 7
-  if l7 < r7
-    dhgrClearBl7(l7, top, r7 - l7, bottom - top + 1)
-  fin
-  l7 = l7 * 7
-  if l7 > left
-    for x = l7-1 downto left
-      dcgrVLin(top, bottom, x)
-    next
-  fin
-  r7 = r7 * 7
-  if r7 < right
-    for x = r7 to right
-      dcgrVLin(top, bottom, x)
-    next
-  fin
-end
-//
-// Convex polygon
-//
-def setEdge(x, y)#0
-  if x < leftedge->[y];  leftedge->[y]  = x; fin
-  if x > rightedge->[y]; rightedge->[y] = x; fin
-end
-def startPoly(x, y)#0
-  setlineplot(@setEdge)
-  leftedge  = heapalloc(SCR_HEIGHT)
-  rightedge = heapalloc(SCR_HEIGHT)
-  memset(leftedge,  $FFFF, SCR_HEIGHT)
-  memset(rightedge, $0000, SCR_HEIGHT)
-  polytop    = y
-  polybottom = y
-  startvx    = x
-  startvy    = y
-  polyvx     = x
-  polyvy     = y
-end
-def addVertex(x, y)#0
-  if y < polytop;    polytop    = y; fin
-  if y > polybottom; polybottom = y; fin
-  line(polyvx, polyvy, x, y)
-  polyvx     = x
-  polyvy     = y
-end
-def patrnPoly(x, y)#0
-  var width
-  byte left
-
-  if y < polytop;    polytop    = y; fin
-  if y > polybottom; polybottom = y; fin
-  line(polyvx, polyvy, x, y)
-  line(x, y, startvx, startvy)
-  for y = polytop to polybottom
-    left  = leftedge->[y]
-    width = rightedge->[y] - left + 1
-    if width > 0
-      dcgrPixMap(left, y, width, 1, \
-                pattern + (left & 1 ?? SCR_WIDTH     :: 0) \
-                        + (y    & 1 ?? (SCR_WIDTH/2) :: 0))
-    fin
-  next
-  heaprelease(leftedge)
-end
-def solidPoly(x, y)#0
-  byte left, right
-
-  if y < polytop;    polytop    = y; fin
-  if y > polybottom; polybottom = y; fin
-  line(polyvx, polyvy, x, y)
-  line(x, y, startvx, startvy)
-  for y = polytop to polybottom
-    left  = leftedge->[y]
-    right = rightedge->[y]
-    if right >= left
-      dcgrHLin(left, right, y)
-    fin
-  next
-  heaprelease(leftedge)
-end
-//
-// Ellipse
-//
-def solidEllip(xorg, yorg, width, height)#0
-  var x, y, angle
-
-  for angle = 0 to 90 step 90 / height
-    x = ((cos(angle) >> 8) * width) >> 8
-    y = ((sin(angle) >> 8) * height) >> 8
-    dcgrHLin(xorg - x, xorg + x, yorg + y)
-    dcgrHLin(xorg - x, xorg + x, yorg - y)
-  next
-end
-def patrnEllip(xorg, yorg, width, height)#0
-  var x, y, angle, left, len, scan
-
-  for angle = 0 to 90 step 90 / height
-    x = ((cos(angle) >> 8) * width) >> 8
-    y = ((sin(angle) >> 8) * height) >> 8
-    left = xorg - x
-    len  = x * 2
-    if len == 0; len = 1; fin
-    scan = yorg + y
-    dcgrPixMap(left, scan, len, 1, \
-               pattern + (left & 1 ?? SCR_WIDTH     :: 0) \
-                       + (scan & 1 ?? (SCR_WIDTH/2) :: 0))
-    scan = yorg - y
-    dcgrPixMap(left, scan, len, 1, \
-               pattern + (left & 1 ?? SCR_WIDTH     :: 0) \
-                       + (scan & 1 ?? (SCR_WIDTH/2) :: 0))
-  next
-end
-
-def frame(left, top, right, bottom, thickness)#0
-  while thickness
-    thickness--
-    dcgrHLin(left + thickness, right  - thickness, top    + thickness)
-    dcgrHLin(left + thickness, right  - thickness, bottom - thickness)
-    dcgrVLin(top  + thickness, bottom - thickness, left   + thickness)
-    dcgrVLin(top  + thickness, bottom - thickness, right  - thickness)
-  loop
-end
-//
 // Draw components
 //
 def drawSurround#0
@@ -499,7 +299,7 @@ def idleSpin#0
                ENT_W7, ENT_H, \
                i=>spr_bl7, ENT_W7*4)
     dhgrSurfScr(OP_SRC)
-    waitVBL
+    //waitVBL
     dhgrMemBl7(VIEW_LEFT7, VIEW_TOP, \
                VIEW_WIDTH7, VIEW_HEIGHT, \
                viewbuf, viewspan)
@@ -522,6 +322,7 @@ def idleSpin#0
     idleViewPlot(xpos-12)
     xpos = xpos + 4
   loop
+  heaprelease(viewbuf)
   getc
 end
 //
diff --git a/src/dhgr.tk/makefile b/src/dhgr.tk/makefile
index 4d9a5b30..7b64a269 100644
--- a/src/dhgr.tk/makefile
+++ b/src/dhgr.tk/makefile
@@ -19,6 +19,7 @@ DDCONV        = dhgr.tk/utils/ddfonconv
 PENGUINS      = dhgr.tk/demos/penguins/PENGUINS.REL
 DARTHGR       = dhgr.tk/demos/darthgr/DARTHGR.REL
 STARTREK      = dhgr.tk/demos/startrek/STARTREK.REL
+FILLSHAPE     = dhgr.tk/demos/startrek/FILLSHAPE.REL
 DROGUE        = dhgr.tk/drogue/DROGUE.REL
 DROGUE.MAP    = dhgr.tk/drogue/DROGUE.MAP.REL
 DROGUE.COMBAT = dhgr.tk/drogue/DROGUE.COMBAT.REL
@@ -45,7 +46,7 @@ utils: $(DHGRSPRED) $(DHGREASY) $(DHGRRGB) $(DHGRRGB_C) $(DHGRSHOW) $(DLGRCONV)
 	cp dhgr.tk/utils/*.REL prodos/dhgr.tk/utils
 	cp dhgr.tk/utils/samples/* prodos/dhgr.tk/utils/samples
 
-demos: $(PENGUINS) $(DARTHGR) $(STARTREK)
+demos: $(PENGUINS) $(DARTHGR) $(STARTREK) $(FILLSHAPE)
 	-mkdir prodos/dhgr.tk/
 	-mkdir prodos/dhgr.tk/demos/
 	-mkdir prodos/dhgr.tk/demos/penguins/
@@ -56,6 +57,7 @@ demos: $(PENGUINS) $(DARTHGR) $(STARTREK)
 	cp $(DARTHGR) prodos/dhgr.tk/demos/darthgr/
 	cp dhgr.tk/demos/darthgr/*.BIN prodos/dhgr.tk/demos/darthgr/
 	cp $(STARTREK) prodos/dhgr.tk/demos/startrek/
+	cp $(FILLSHAPE) prodos/dhgr.tk/demos/startrek/
 	cp dhgr.tk/demos/startrek/*.BIN prodos/dhgr.tk/demos/startrek/
 
 drogue: $(DROGUE) $(DROGUE.MAP) $(DROGUE.COMBAT)
@@ -157,6 +159,10 @@ $(STARTREK): dhgr.tk/demos/startrek/startrek.pla dhgr.tk/inc/dhgrlib.plh dhgr.tk
 	./xplasm -AMOW dhgr.tk/demos/startrek/startrek.pla
 	acme --setpc 4094 -o $(STARTREK) dhgr.tk/demos/startrek/startrek.a
 
+$(FILLSHAPE): dhgr.tk/demos/startrek/fillshape.pla dhgr.tk/inc/dhgrlib.plh dhgr.tk/inc/dhgrutils.plh
+	./xplasm -AMOW dhgr.tk/demos/startrek/fillshape.pla
+	acme --setpc 4094 -o $(FILLSHAPE) dhgr.tk/demos/startrek/fillshape.a
+
 $(DROGUE): dhgr.tk/drogue/drogue.pla  dhgr.tk/inc/dhgrlib.plh dhgr.tk/inc/dhgrutils.plh
 	./xplasm -AMOW dhgr.tk/drogue/drogue.pla
 	acme --setpc 4094 -o $(DROGUE) dhgr.tk/drogue/drogue.a
diff --git a/src/lisp/drawl.pla b/src/lisp/drawl.pla
index da3ed83f..66b57667 100644
--- a/src/lisp/drawl.pla
+++ b/src/lisp/drawl.pla
@@ -349,7 +349,7 @@ end
 // REPL
 //
 
-puts("DRAWL (LISP 1.5) v1.0 symbolic processor\n")
+puts("PLEIADES 2.20 DRAWL (LISP 1.5) symbolic processor\n")
 sym_fpint                    = new_sym("FMTFPI")
 sym_fpfrac                   = new_sym("FMTFPF")
 sym_fpint=>natv              = @natv_fpint
diff --git a/src/mk4th b/src/mk4th
index ee33c0ac..29ac29fe 100755
--- a/src/mk4th
+++ b/src/mk4th
@@ -1,4 +1,4 @@
-cp ../sysfiles/BLANK140.po PLFORTH.PO
+cp ../sysfiles/BLANK140.po PLFORTH.po
 java -jar ac.jar -n PLFORTH.PO PLFORTH
 cat ../sysfiles/PRODOS#FF0000      | java -jar ac.jar -p   PLFORTH.PO PRODOS SYS
 cat rel/apple/CMD#061000           | java -jar ac.jar -p   PLFORTH.PO CMD BIN $1000
diff --git a/src/mkbig b/src/mkbig
index a6384f90..4512ab44 100755
--- a/src/mkbig
+++ b/src/mkbig
@@ -1,8 +1,8 @@
 #!/bin/bash
-PO_IMAGE=PLASMA-2.20.po
+PO_IMAGE=PLEIADES-2.20.po
 ./mkrel
 cp ../sysfiles/BLANK32M.po $PO_IMAGE
-java -jar ac.jar -n $PO_IMAGE PLASMA2
+java -jar ac.jar -n $PO_IMAGE PLEIADES
 cat ../sysfiles/PRODOS#FF0000      | java -jar ac.jar -p   $PO_IMAGE PRODOS SYS
 cat rel/apple/CMD#061000           | java -jar ac.jar -p   $PO_IMAGE CMD BIN $1000
 cat rel/apple/CMD.128#061000       | java -jar ac.jar -p   $PO_IMAGE CMD.128 BIN $1000
@@ -303,21 +303,23 @@ cat vmsrc/apple/plvmzp.inc | java -jar ac.jar -ptx $PO_IMAGE bld/inc/PLVMZP.INC
 
 cat dhgr.tk/libs/DHGRLIB.REL     | java -jar ac.jar -p $PO_IMAGE sys/DHGRLIB REL
 cat dhgr.tk/libs/DHGRUTILS.REL   | java -jar ac.jar -p $PO_IMAGE sys/DHGRUTILS REL
-cat dhgr.tk/inc/dhgrlib.plh      | java -jar ac.jar -ptx $PO_IMAGE bld/inc/DHGRLIB.PLH TXT
-cat dhgr.tk/inc/dhgrutils.plh    | java -jar ac.jar -ptx $PO_IMAGE bld/inc/DHGRUTILS.PLH TXT
-cat dhgr.tk/test/DHGRTEST.REL    | java -jar ac.jar -p $PO_IMAGE bld/dhgr/DHGRTEST REL
-cat dhgr.tk/test/dhgrtest.pla    | java -jar ac.jar -ptx $PO_IMAGE bld/dhgr/DHGRTEST.PLA TXT
-cat dhgr.tk/test/ENT.DL.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr/ENT.DL.SPR BIN
-cat dhgr.tk/test/ENT.DN.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr/ENT.DN.SPR BIN
-cat dhgr.tk/test/ENT.DR.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr/ENT.DR.SPR BIN
-cat dhgr.tk/test/ENT.LT.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr/ENT.LT.SPR BIN
-cat dhgr.tk/test/ENT.RT.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr/ENT.RT.SPR BIN
-cat dhgr.tk/test/ENT.UL.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr/ENT.UL.SPR BIN
-cat dhgr.tk/test/ENT.UP.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr/ENT.UP.SPR BIN
-cat dhgr.tk/test/ENT.UR.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr/ENT.UR.SPR BIN
-cat dhgr.tk/test/SPLASH.DHGR.BIN | java -jar ac.jar -p $PO_IMAGE bld/dhgr/SPLASH.DHGR BIN
-cat dhgr.tk/utils/dhgrrgb.pla    | java -jar ac.jar -ptx $PO_IMAGE bld/dhgr/DHGRRGB.PLA TXT
-cat dhgr.tk/utils/dhgrshow.pla   | java -jar ac.jar -ptx $PO_IMAGE bld/dhgr/DHGRSHOW.PLA TXT
+cat dhgr.tk/inc/dhgrlib.plh      | java -jar ac.jar -ptx $PO_IMAGE bld/dhgr.tk/inc/DHGRLIB.PLH TXT
+cat dhgr.tk/inc/dhgrutils.plh    | java -jar ac.jar -ptx $PO_IMAGE bld/dhgr.tk/inc/DHGRUTILS.PLH TXT
+cat dhgr.tk/test/DHGRTEST.REL    | java -jar ac.jar -p $PO_IMAGE bld/dhgr.tk/DHGRTEST REL
+cat dhgr.tk/test/dhgrtest.pla    | java -jar ac.jar -ptx $PO_IMAGE bld/dhgr.tk/DHGRTEST.PLA TXT
+cat dhgr.tk/test/ENT.DL.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr.tk/ENT.DL.SPR BIN
+cat dhgr.tk/test/ENT.DN.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr.tk/ENT.DN.SPR BIN
+cat dhgr.tk/test/ENT.DR.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr.tk/ENT.DR.SPR BIN
+cat dhgr.tk/test/ENT.LT.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr.tk/ENT.LT.SPR BIN
+cat dhgr.tk/test/ENT.RT.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr.tk/ENT.RT.SPR BIN
+cat dhgr.tk/test/ENT.UL.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr.tk/ENT.UL.SPR BIN
+cat dhgr.tk/test/ENT.UP.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr.tk/ENT.UP.SPR BIN
+cat dhgr.tk/test/ENT.UR.SPR.BIN  | java -jar ac.jar -p $PO_IMAGE bld/dhgr.tk/ENT.UR.SPR BIN
+cat dhgr.tk/test/SPLASH.DHGR.BIN | java -jar ac.jar -p $PO_IMAGE bld/dhgr.tk/SPLASH.DHGR BIN
+cat dhgr.tk/utils/dhgrrgb.pla    | java -jar ac.jar -ptx $PO_IMAGE bld/dhgr.tk/DHGRRGB.PLA TXT
+cat dhgr.tk/utils/dhgrshow.pla   | java -jar ac.jar -ptx $PO_IMAGE bld/dhgr.tk/DHGRSHOW.PLA TXT
+cat dhgr.tk/demos/startrek/startrek.pla  | java -jar ac.jar -ptx $PO_IMAGE bld/dhgr.tk/STARTREK.PLA TXT
+cat dhgr.tk/demos/startrek/fillshape.pla | java -jar ac.jar -ptx $PO_IMAGE bld/dhgr.tk/FILLSHAPE.PLA TXT
 cat dhgr.tk/utils/DHGRRGB.REL    | java -jar ac.jar -p $PO_IMAGE dhgr.tk/utils/DHGRRGB REL
 cat dhgr.tk/utils/DHGRSHOW.REL   | java -jar ac.jar -p $PO_IMAGE dhgr.tk/utils/DHGRSHOW REL
 cat dhgr.tk/utils/DHGRSPRED.REL  | java -jar ac.jar -p $PO_IMAGE dhgr.tk/utils/DHGRSPRED REL
diff --git a/src/mkbld b/src/mkbld
index 200b4238..63a30432 100755
--- a/src/mkbld
+++ b/src/mkbld
@@ -1,7 +1,7 @@
 #!/bin/bash
-PO_IMAGE=PLASMA-2.20-BLD.po
+PO_IMAGE=PLEIADES-2.20-BLD.po
 cp ../sysfiles/BLANK140.po $PO_IMAGE
-java -jar ac.jar -n $PO_IMAGE PLASMA.BLD
+java -jar ac.jar -n $PO_IMAGE PLEIADES.BLD
 cat rel/PLASM#FE1000       | java -jar ac.jar -p   $PO_IMAGE bld/PLASM REL
 cat rel/CODEOPT#FE1000     | java -jar ac.jar -p   $PO_IMAGE bld/CODEOPT REL
 cat inc/args.plh           | java -jar ac.jar -ptx $PO_IMAGE bld/inc/ARGS.PLH TXT
diff --git a/src/mkdemos b/src/mkdemos
index 771335b9..34c22183 100755
--- a/src/mkdemos
+++ b/src/mkdemos
@@ -1,7 +1,7 @@
 #!/bin/bash
-PO_IMAGE=PLASMA-2.20-DEMOS.po
+PO_IMAGE=PLEIADES-2.20-DEMOS.po
 cp ../sysfiles/BLANK140.po $PO_IMAGE
-java -jar ac.jar -n $PO_IMAGE PLASMA.DEMOS
+java -jar ac.jar -n $PO_IMAGE PLEIADES.DEMOS
 cat rel/INT32TEST#FE1000         | java -jar ac.jar -p   $PO_IMAGE demos/INT32TEST REL
 cat rel/apple/CONIOTEST#FE1000   | java -jar ac.jar -p   $PO_IMAGE demos/CONIOTEST REL
 cat rel/apple/ROD#FE1000         | java -jar ac.jar -p   $PO_IMAGE demos/ROD REL
diff --git a/src/mkfpsos b/src/mkfpsos
index 78a9cbe5..cfe2338f 100755
--- a/src/mkfpsos
+++ b/src/mkfpsos
@@ -1,7 +1,7 @@
 #!/bin/bash
-PO_IMAGE=PLASMA-2.20-FPSOS.po
+PO_IMAGE=PLEIADES-2.20-FPSOS.po
 cp ../sysfiles/BLANK140.po $PO_IMAGE
-java -jar ac.jar -n $PO_IMAGE PLASMA.FPSOS
+java -jar ac.jar -n $PO_IMAGE PLEIADES.FPSOS
 cat ../sysfiles/SOS.KERNEL#0C0000  | java -jar ac.jar -p   $PO_IMAGE SOS.KERNEL \$0C
 cat ../sysfiles/SOS.DRIVER#0C0000  | java -jar ac.jar -p   $PO_IMAGE SOS.DRIVER \$0C
 cat rel/apple/SOS.INTERP#050000    | java -jar ac.jar -p   $PO_IMAGE SOS.INTERP \$05
diff --git a/src/mkinet b/src/mkinet
index 0eea0e0b..7e45b193 100755
--- a/src/mkinet
+++ b/src/mkinet
@@ -1,7 +1,7 @@
 #!/bin/bash
-PO_IMAGE=PLASMA-2.20-INET.po
+PO_IMAGE=PLEIADES-2.20-INET.po
 cp ../sysfiles/BLANK140.po $PO_IMAGE
-java -jar ac.jar -n $PO_IMAGE PLASMA.INET
+java -jar ac.jar -n $PO_IMAGE PLEIADES.INET
 cat rel/INET#FE1000                | java -jar ac.jar -p   $PO_IMAGE sys/INET REL
 cat rel/DHCP#FE1000                | java -jar ac.jar -p   $PO_IMAGE sys/DHCP REL
 cat rel/ETHERIP#FE1000             | java -jar ac.jar -p   $PO_IMAGE sys/ETHERIP REL
diff --git a/src/mkinst b/src/mkinst
index 76090c65..ca5ed2ae 100755
--- a/src/mkinst
+++ b/src/mkinst
@@ -1,7 +1,7 @@
 #!/bin/bash
-PO_IMAGE=PLASMA-2.20-INST.po
+PO_IMAGE=PLEIADES-2.20-INST.po
 cp ../sysfiles/BLANK140.po $PO_IMAGE
-java -jar ac.jar -n $PO_IMAGE PLASMA.INST
+java -jar ac.jar -n $PO_IMAGE PLEIADES.INST
 cat ../sysfiles/PRODOS#FF0000      | java -jar ac.jar -p   $PO_IMAGE PRODOS SYS
 cat rel/apple/CMD#061000           | java -jar ac.jar -p   $PO_IMAGE CMD BIN $1000
 cat rel/apple/CMD.128#061000       | java -jar ac.jar -p   $PO_IMAGE CMD.128 BIN $1000
diff --git a/src/mksys b/src/mksys
index 9f7db25c..5e1abbe4 100755
--- a/src/mksys
+++ b/src/mksys
@@ -1,7 +1,7 @@
 #!/bin/bash
-PO_IMAGE=PLASMA-2.20-SYS.po
+PO_IMAGE=PLEIADES-2.20-SYS.po
 cp ../sysfiles/BLANK140.po $PO_IMAGE
-java -jar ac.jar -n $PO_IMAGE PLASMA.SYS
+java -jar ac.jar -n $PO_IMAGE PLEIADES.SYS
 #cat ../sysfiles/PRODOS#FF0000      | java -jar ac.jar -p   $PO_IMAGE PRODOS SYS
 #cat rel/apple/CMD#061000           | java -jar ac.jar -p   $PO_IMAGE CMD BIN $1000
 #cat rel/apple/CMD.128#061000       | java -jar ac.jar -p   $PO_IMAGE CMD.128 BIN $1000
diff --git a/src/toolsrc/ed.pla b/src/toolsrc/ed.pla
index 05365f44..ef1289af 100755
--- a/src/toolsrc/ed.pla
+++ b/src/toolsrc/ed.pla
@@ -1589,7 +1589,7 @@ if scrnwidth > 80 // Lookup UltraTerm screen dimensions
     scrnheight = UltraTermHeight[scrnwidth - 81]
     scrnwidth  = UltraTermWidth[scrnwidth  - 81]
 fin
-puts("PLASMA Editor, Version 2.20\n")
+puts("PLEIADES 2.20 Editor\n")
 inittxtbuf
 puts(@filename)
 readtxt(@filename, 0)
diff --git a/src/toolsrc/plasm.pla b/src/toolsrc/plasm.pla
index a008e25f..66de8d91 100755
--- a/src/toolsrc/plasm.pla
+++ b/src/toolsrc/plasm.pla
@@ -511,7 +511,7 @@ include "toolsrc/parse.pla"
 //
 // Look at command line arguments and compile module
 //
-puts("PLASMA Compiler, Version 2.20\n")
+puts("PLASMA 2.20 Compiler\n")
 
 arg = argNext(argFirst)
 if ^arg and ^(arg + 1) == '-'
diff --git a/src/toolsrc/plforth.pla b/src/toolsrc/plforth.pla
index a193475e..4fcc9a9b 100644
--- a/src/toolsrc/plforth.pla
+++ b/src/toolsrc/plforth.pla
@@ -1889,7 +1889,7 @@ end
 //
 // Start FORTH
 //
-puts("FORTH for PLASMA 2.20\n")
+puts("PLEIADES 2.20 FORTH\n")
 if cmdsys:sysver < $0220
   puts("PLASMA >= 2.20 required\n")
   return
diff --git a/src/vmsrc/apple/a1cmd.pla b/src/vmsrc/apple/a1cmd.pla
index a4d0dc95..277f9af9 100755
--- a/src/vmsrc/apple/a1cmd.pla
+++ b/src/vmsrc/apple/a1cmd.pla
@@ -55,7 +55,7 @@ word systemflags  = 0
 // String pool.
 //
 byte autorun[]    = "AUTORUN"
-byte verstr[]     = "\nAPPLE1 PLASMA "
+byte verstr[]     = "\nAPPLE1 PLEAIDES "
 byte freestr[]    = "MEM FREE:$"
 byte errorstr[]   = "ERR:$"
 byte prompt[]     = "PLASMA"
diff --git a/src/vmsrc/apple/cmd.pla b/src/vmsrc/apple/cmd.pla
index 1efb5d92..41ffa6be 100755
--- a/src/vmsrc/apple/cmd.pla
+++ b/src/vmsrc/apple/cmd.pla
@@ -1401,7 +1401,7 @@ heap = @lastdef
 //
 // Print PLASMA version
 //
-prstr("PLASMA 2.20 64K\n")
+prstr("PLEIADES 2.20 64K\n")
 //
 // Init symbol table.
 //
diff --git a/src/vmsrc/apple/cmdjit.pla b/src/vmsrc/apple/cmdjit.pla
index 1273f35b..3493326f 100755
--- a/src/vmsrc/apple/cmdjit.pla
+++ b/src/vmsrc/apple/cmdjit.pla
@@ -1487,7 +1487,7 @@ heap = @lastdef
 //
 // Print PLASMA version
 //
-prstr("PLASMA 2.20 128K\n")
+prstr("PLEIADES 2.20 128K\n")
 //
 // Init symbol table.
 //
diff --git a/src/vmsrc/apple/sossys.pla b/src/vmsrc/apple/sossys.pla
index 29db6cd1..0a9b7061 100755
--- a/src/vmsrc/apple/sossys.pla
+++ b/src/vmsrc/apple/sossys.pla
@@ -1288,7 +1288,7 @@ cmdlnptr = @cmdln
 // Print PLASMA version
 //
 init_cons
-prstr("PLASMA 2.20\n")
+prstr("PLEIADES 2.20\n")
 prstr("MEM:$"); prword(availheap); crout
 //
 // Exec command line parser
diff --git a/src/vmsrc/apple/sossysjit.pla b/src/vmsrc/apple/sossysjit.pla
index 90cb0afc..b86018e0 100755
--- a/src/vmsrc/apple/sossysjit.pla
+++ b/src/vmsrc/apple/sossysjit.pla
@@ -1311,7 +1311,7 @@ cmdlnptr = @cmdln
 // Print PLASMA version
 //
 init_cons
-prstr("PLASMA 2.20 JITC\n")
+prstr("PLEIADES 2.20 JITC\n")
 prstr("MEM:$"); prword(availheap); crout
 //
 // Exec command line parser