diff --git a/src/sys/graphics/main.cpp b/src/sys/graphics/main.cpp
index 54a1e1d..3f13f9d 100755
--- a/src/sys/graphics/main.cpp
+++ b/src/sys/graphics/main.cpp
@@ -24,7 +24,7 @@
   buf = new TGfx0();
   buf2 = new TGfx0();
   font = new TDPFont(buf);
-  buf->create(400,400,def_pixfmt_16bpp);
+  buf->create(400,400,def_pixfmt_32bpp);
 //  buf2->create(400,400,def_pixfmt_15bpp);
 //  buf2->alias(*buf,0,3,8,8);
   buf2->clone(*buf);
@@ -35,8 +35,7 @@
   font->SetColor(1);
   font->PutText(0,0,"     World");
  // buf->copyBuf(0,0,*buf,40,0,79,8);
-  for (foo=-10; foo<1255; foo++) 
-    buf->hLine(foo,foo*2,foo,1);
+  buf->rectangle(0,0,15,7,1);
   for (r=0; r<8; r++) {
     for (g=0; g<80; g++)
       if (buf->getPixel(g,r)==1) printf("*"); else printf(" ");
diff --git a/src/sys/graphics/objgfx30.cpp b/src/sys/graphics/objgfx30.cpp
index f25b883..d83f155 100755
--- a/src/sys/graphics/objgfx30.cpp
+++ b/src/sys/graphics/objgfx30.cpp
@@ -653,8 +653,42 @@
     );
     break;
   case 24:
+    asm(
+        "  sub  %%ebx, %%ecx  \n"          //  sub      ecx, ebx
+        "  add  %%esi, %%edi  \n"          //  add      edi, esi
+        "  add  %%ebx, %%ebx  \n"          //  add      ebx, ebx - pix size
+        "  inc  %%ecx         \n"          //  inc      ecx
+        "  add  %%edx, %%ebx  \n"          //  add      ebx, edx - pix size
+        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
+        "  mov  %%eax, %%ebx  \n"          //  mov      ebx, eax
+        "  shr	$16, %%ebx    \n"          //  shr      ebx, 16
+    "hLlop24:                 \n"          
+        "  mov  %%ax, (%%edi) \n"          //  mov      [edi], ax
+        "  mov  %%bl, 2(%%edi)\n"          //  mov      [edi+2], bl
+        "  add  $3, %%edi     \n"          //  add      edi, 3
+        "  dec  %%ecx         \n"          //  dec      ecx
+        "   jnz hLlop24       \n"          
+        :
+        : "D" (Buffer), "S" (LineOfs[y]),           // %0, %1
+          "a" (colour), "b" (x1),                   // %2, %3
+          "c" (x2), "d" (x1)                        // %4, %5
+    );
     break;
   case 32:
+    asm(
+        "  sub  %%ebx, %%ecx  \n"          //  sub      ecx, ebx
+        "  add  %%esi, %%edi  \n"          //  add      edi, esi
+        "  inc  %%ecx         \n"
+        "  shl  $2, %%ebx     \n"          //  shl      ebx, 2
+        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
+        "  rep                \n"
+        "  stosl              \n"   
+        :
+        : "D" (Buffer), "S" (LineOfs[y]),           // %0, %1
+          "a" (colour), "b" (x1),                   // %2, %3
+          "c" (x2)                                  // %4
+    );
+
     break;
   } // switch
 } // TGfx0::hLine
@@ -851,6 +885,15 @@
   return;
 } // TGfx0::setRGBPalette
 
+void
+TGfx0::rectangle(Int32 x1, Int32 y1, Int32 x2, Int32 y2, UInt32 colour) {
+  hLine(x1,x2,y1,colour);  // Horizline has built in clipping
+  vLine(x2,y1,y2,colour);  // vertline has built in clipping too
+  vLine(x1,y1,y2,colour);
+  hLine(x1,x2,y2,colour);
+  return;
+} // TGfx0::rectangle
+
 void 
 TGfx0::unpackRGB(UInt32 colour, UInt8& red, UInt8& green, UInt8& blue) {
   switch (BPP) {
@@ -887,13 +930,115 @@
     blue  = 0;
   }
   return;
-} // TGfx0:unpackRGB
+} // TGfx0::unpackRGB
 
 void
 TGfx0::vFlip(void) {
   return;
 } // TGfx0::vFlip
 
+void
+TGfx0::vLine(Int32 x, Int32 y1, Int32 y2, UInt32 colour) {
+  Int32 tmp;
+  if ((Buffer==NULL) || (LineOfs==NULL)) return;
+  if ((UInt32)x>MaxX) return;
+  if (y1>y2) {
+    tmp= y1;
+    y1 = y2;
+    y2 = tmp;
+  } // if
+  if (y1<0) y1 = 0;
+  if (y2>(Int32)MaxY) y2 = MaxY;
+  if (y2<y1) return;
+  switch (BPP) {
+  case 8:
+    asm(
+        "  add  %%esi, %%edi  \n"          //  add      edi, esi
+        "  mov  %6, %%esi     \n"          //  mov      esi, y1
+        "  sub  %%esi, %%ecx  \n"          //  sub      ecx, esi
+        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
+        "  inc  %%ecx         \n"          //  inc      ecx
+        "vLlop8:              \n"          
+        "  mov  %%al, (%%edi) \n"          //  mov      [edi], al
+        "  add  %%edx, %%edi  \n"          //  add      edi, edx
+        "  dec  %%ecx         \n"          //  dec      ecx
+        "   jnz vLlop8        \n"
+        :
+        : "D" (Buffer), "S" (LineOfs[y1]),          // %0, %1
+          "a" (colour), "b" (x),                    // %2, %3
+          "c" (y2), "d" (xRes),                     // %4, %5
+          "m" (y1)                                  // %6
+       );
+    break;
+  case 15:
+  case 16:
+    asm(
+        "  add  %%esi, %%edi  \n"          //  add      edi, esi
+        "  add  %%ebx, %%ebx  \n"          //  add      ebx, ebx - pix size
+        "  mov  %6, %%esi     \n"          //  mov      esi, y1
+        "  sub  %%esi, %%ecx  \n"          //  sub      ecx, esi
+        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
+        "  inc  %%ecx         \n"          //  inc      ecx
+        "vLlop16:             \n"
+        "  mov  %%ax, (%%edi) \n"          //  mov      [edi], ax
+        "  add  %%edx, %%edi  \n"          //  add      edi, edx
+        "  dec  %%ecx         \n"          //  dec      ecx
+        "   jnz vLlop16       \n"
+        :
+        : "D" (Buffer), "S" (LineOfs[y1]),          // %0, %1
+          "a" (colour), "b" (x),                    // %2, %3
+          "c" (y2), "d" (xRes),                     // %4, %5
+          "m" (y1)                                  // %6
+       );
+    break;
+  case 24:
+    asm(
+        "  add  %%esi, %%edi  \n"          //  add      edi, esi
+        "  mov  %%ebx, %%esi  \n"          //  mov      esi, ebx - pix size
+        "  add  %%ebx, %%ebx  \n"          //  add      ebx, ebx - pix size
+        "  add  %%esi, %%ebx  \n"          //  add      ebx, esi - pix size
+        "  mov  %6, %%esi     \n"          //  mov      esi, y1
+        "  sub  %%esi, %%ecx  \n"          //  sub      ecx, esi
+        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
+        "  inc  %%ecx         \n"          //  inc      ecx
+        "  mov  %%eax, %%ebx  \n"          //  mov      ebx, eax
+        "  shr  $16, %%ebx    \n"          //  shr      ebx, 16
+        "vLlop24:             \n"
+        "  mov  %%ax, (%%edi) \n"          //  mov      [edi], eax
+        "  mov  %%bl, 2(%%edi)\n"          //  mov      [edi+2], bl
+        "  add  %%edx, %%edi  \n"          //  add      edi, edx
+        "  dec  %%ecx         \n"          //  dec      ecx
+        "   jnz vLlop24       \n"
+        :
+        : "D" (Buffer), "S" (LineOfs[y1]),          // %0, %1
+          "a" (colour), "b" (x),                    // %2, %3
+          "c" (y2), "d" (xRes),                     // %4, %5
+          "m" (y1)                                  // %6
+       );
+    break;
+  case 32: 
+    asm(
+        "  add  %%esi, %%edi  \n"          //  add      edi, esi
+        "  shl  $2, %%ebx     \n"          //  shl      ebx, 2  - pix size
+        "  mov  %6, %%esi     \n"          //  mov      esi, y1
+        "  sub  %%esi, %%ecx  \n"          //  sub      ecx, esi
+        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
+        "  inc  %%ecx         \n"          //  inc      ecx
+        "vLlop32:             \n"
+        "  mov  %%eax, (%%edi)\n"          //  mov      [edi],al
+        "  add  %%edx, %%edi  \n"          //  add      edi, edx
+        "  dec  %%ecx         \n"          //  dec      ecx
+        "   jnz vLlop32       \n"
+        :
+        : "D" (Buffer), "S" (LineOfs[y1]),          // %0, %1
+          "a" (colour), "b" (x),                    // %2, %3
+          "c" (y2), "d" (xRes),                     // %4, %5
+          "m" (y1)                                  // %6
+       );
+  } // switch
+  return;
+} // TGfx0::vLine
+
 TGfx0::~TGfx0(void) {
   if (DataState == og_Owner) {
     if (pal!=NULL) free(pal);
diff --git a/src/sys/graphics/objgfx30.h b/src/sys/graphics/objgfx30.h
index 6576ddd..59e8488 100755
--- a/src/sys/graphics/objgfx30.h
+++ b/src/sys/graphics/objgfx30.h
@@ -15,28 +15,28 @@
 #endif
 
 #define gm320x200x256   0x13
-#define gm640x480x256   0x101
-#define gm800x600x256   0x103
-#define gm1024x768x256  0x105
-#define gm1280x1024x256 0x107
+#define gm640x480x256   0x4101
+#define gm800x600x256   0x4103
+#define gm1024x768x256  0x4105
+#define gm1280x1024x256 0x4107
 
   /* 32768 color video mode constants */
-#define gm640x480x32k   0x110
-#define gm800x600x32k   0x113
-#define gm1024x768x32k  0x116
-#define gm1280x1024x32k 0x119
+#define gm640x480x32k   0x4110
+#define gm800x600x32k   0x4113
+#define gm1024x768x32k  0x4116
+#define gm1280x1024x32k 0x4119
 
   /* 65536 color video mode constants */
-#define gm640x480x64k   0x111
-#define gm800x600x64k   0x114
-#define gm1024x768x64k  0x117
-#define gm1280x1024x64k 0x11A
+#define gm640x480x64k   0x4111
+#define gm800x600x64k   0x4114
+#define gm1024x768x64k  0x4117
+#define gm1280x1024x64k 0x411A
 
   /* 16.8 million color video mode constants */
-#define gm640x480x16m   0x112
-#define gm800x600x16m   0x115
-#define gm1024x768x16m  0x118
-#define gm1280x1024x16m 0x11B
+#define gm640x480x16m   0x4112
+#define gm800x600x16m   0x4115
+#define gm1024x768x16m  0x4118
+#define gm1280x1024x16m 0x411B
 
 #define RadToDeg 180.0/3.14159265358979;
 
@@ -180,14 +180,14 @@
           // loadPal
           void         putPixel(UInt32, UInt32, UInt32);
           // rawLine
-          // rectangle
+          void         rectangle(Int32, Int32, Int32, Int32, UInt32);
           UInt32       RGB(UInt8, UInt8, UInt8);
           // savePal
           void         setRGBPalette(UInt8, UInt8, UInt8, UInt8);
           void         setTransparentColor(UInt32);
           void         unpackRGB(UInt32, UInt8&, UInt8&, UInt8&);
+          void         vLine(Int32, Int32, Int32, UInt32);
           void         vFlip(void);
-          // vLine
           ~TGfx0(void);
 }; // TGfx0