diff --git a/images/apple/DCGR-TK.PO b/images/apple/DCGR-TK.PO
index 72ba7ed..6f7b5f9 100755
Binary files a/images/apple/DCGR-TK.PO and b/images/apple/DCGR-TK.PO differ
diff --git a/src/inc/dcgrlib.plh b/src/inc/dcgrlib.plh
index 57e40cc..a514159 100644
--- a/src/inc/dcgrlib.plh
+++ b/src/inc/dcgrlib.plh
@@ -27,8 +27,8 @@ import dcgrlib
     const CLR_WHITE     = 15
 
     predef dcgrColor(c)#0
-    predef dcgrPlot(x, y)#0
-    predef dcgrPixel(x, y)#1
+    predef dcgrPixel(x, y)#0
+    predef dcgrGetPixel(x, y)#1
     predef dcgrHLin(x1, x2, y)#0
     predef dcgrVLin(y1, y2, x)#0
     predef dcgrBitMap(x, y, bitw, bith, bitptr)#0
diff --git a/src/libsrc/apple/dcgrlib.pla b/src/libsrc/apple/dcgrlib.pla
index ef617be..aa1e784 100644
--- a/src/libsrc/apple/dcgrlib.pla
+++ b/src/libsrc/apple/dcgrlib.pla
@@ -215,7 +215,7 @@ byte dcgrSurface, opScr, opMem
 asm plvmzp#0
 !SOURCE    "vmsrc/plvmzp.inc"
 end
-export asm dcgrPlot(x, y)#0
+export asm dcgrPixel(x, y)#0
         JMP     $1000
 end
 export asm dcgrHLin(x1, x2, y)#0
@@ -404,7 +404,7 @@ asm     _dcgrPlotScrB
         TAY                 ; DIV7
         TXA
         AND     #$07
-        TAX                 ; PIX7
+        TAX                 ; MOD7
 end
 asm     _dcgrPlotScrC
         LDA     $4000,X     ; AUXCLRMSK
@@ -467,7 +467,7 @@ asm     _dcgrOpPlotScrB
         TAY                 ; DIV7
         TXA
         AND     #$07
-        TAX                 ; PIX7
+        TAX                 ; MOD7
 end
 asm     _dcgrOpPlotScrC
         LDA     $4000,X     ; AUXCLRMSK
@@ -855,7 +855,7 @@ asm     _dcgrPlotMemB
         TAY                 ; DIV7
         TXA
         AND     #$07
-        TAX                 ; PIX7
+        TAX                 ; MOD7
 end
 //
 // Plot OP_SRC
@@ -925,7 +925,7 @@ asm     _dcgrOpPlotMemB
         TAY                 ; DIV7
         TXA
         AND     #$07
-        TAX                 ; PIX7
+        TAX                 ; MOD7
 end
 asm     _dcgrOpPlotMemC
         LDA     $4000,X     ; AUXCLRMSK
@@ -2124,9 +2124,9 @@ end
 //
 // Read pixel and return color
 //
-export def dcgrPixel(x, y)#1
+export def dcgrGetPixel(x, y)#1
     byte x7, m7, i
-    word[2] pix7, clr7
+    word[2] pix7
     word amask, mmask
 
     x7 = divmod7[x] >> 3
@@ -2138,14 +2138,11 @@ export def dcgrPixel(x, y)#1
     m7 = divmod7[x] & $07
     amask = auxclrmsk[m7]
     if amask & $80; amask = (amask & $7F) << 8; fin
+    pix7[0] = amask & pix7[0]
     mmask = memclrmsk[m7]
     if mmask & $80; mmask = (mmask & $7F) << 8; fin
-    pix7[0] = pix7[0] & amask
-    pix7[1] = pix7[1] & mmask
+    pix7[1] = mmask & pix7[1]
     for i = 0 to 15
-//        clr7[0] = (auxclrsl[i] | (auxclrsh[i] << 8)) & amask
-//        clr7[1] = (memclrsl[i] | (memclrsh[i] << 8)) & mmask
-//        if pix7[0] == clr7[0] and pix7[1] == clr7[1]
         if pix7[0] == (auxclrsl[i] | (auxclrsh[i] << 8)) & amask
         if pix7[1] == (memclrsl[i] | (memclrsh[i] << 8)) & mmask
             return i // Color match
@@ -2292,7 +2289,7 @@ export def dcgrSurfScr(op)#0
     surfSpan   = 10
     if dcgrSurface == DST_MEMORY
         dcgrSurface    = DST_SCREEN
-        dcgrPlot:1     = @dcgrPlotScr
+        dcgrPixel:1    = @dcgrPlotScr
         dcgrHLin:1     = @dcgrHLinScr
         dcgrVLin:1     = @dcgrVLinScr
         dcgrBitMap:1   = @dcgrBitMapScr
@@ -2315,7 +2312,7 @@ export def dcgrSurfMem(op, memh, memptr, memspan)#0
     surfSpan   = memspan
     if dcgrSurface == DST_SCREEN
         dcgrSurface    = DST_MEMORY
-        dcgrPlot:1     = @extPlotMem
+        dcgrPixel:1    = @extPlotMem
         dcgrHLin:1     = @extHLinMem
         dcgrVLin:1     = @extVLinMem
         dcgrBitMap:1   = @extBitMapMem
diff --git a/src/libsrc/apple/dcgrutils.pla b/src/libsrc/apple/dcgrutils.pla
index 2d7d6d9..64e157c 100644
--- a/src/libsrc/apple/dcgrutils.pla
+++ b/src/libsrc/apple/dcgrutils.pla
@@ -135,7 +135,7 @@ export def dcgrGetPixMap(x, y, w, h)#1
     w--; h--
     for j = 0 to h
         for i = 0 to w step 2
-            ^pixptr = dcgrPixel(i+x, j+y) | (dcgrPixel(i+x+1, j+y) << 4)
+            ^pixptr = dcgrGetPixel(i+x,j+y)|(dcgrGetPixel(i+x+1,j+y)<<4)
             pixptr++
         next
     next
@@ -172,12 +172,12 @@ end
 export def dhgrSet(dhx, y)#0
     dcgrColor(dhgrPix[dhx & $03])
     dcgrOp(OP_OR)
-    dcgrPlot(dhx >> 2, y)
+    dcgrPixel(dhx >> 2, y)
 end
 export def dhgrUnset(dhx, y)#0
     dcgrColor(dhgrMask[dhx & $03])
     dcgrOp(OP_AND)
-    dcgrPlot(dhx >> 2, y)
+    dcgrPixel(dhx >> 2, y)
 end
 export def spriteRead(filestr)#5
     var sprptr, sprsize, xorg, yorg
diff --git a/src/samplesrc/dcgrtest.pla b/src/samplesrc/dcgrtest.pla
index d2f8b43..2e9c087 100644
--- a/src/samplesrc/dcgrtest.pla
+++ b/src/samplesrc/dcgrtest.pla
@@ -210,7 +210,7 @@ def dcgrTest#0
     // Lines
     //
     dcgrSurfScr(OP_SRC)
-    setlineplot(@dcgrPlot)
+    setlineplot(@dcgrPixel)
     setlinespans(@dcgrHLin, @dcgrVLin)
     for i = 0 to 191 step 2
         dcgrColor(i)