--- a/tools/lib64gfx.h	Wed Feb 25 03:53:07 2015 +0200
+++ b/tools/lib64gfx.h	Wed Feb 25 03:53:34 2015 +0200
@@ -57,6 +57,7 @@
     D64_FMT_MC           = 0x0001,
     D64_FMT_ILACE        = 0x0002,
     D64_FMT_FLI          = 0x0004,
+    D64_FMT_CHAR         = 0x0008,
 
     D64_FMT_MODE_MASK    = 0x000f,
 
@@ -75,6 +76,13 @@
     D64_ILACE_RES,
 };
 
+enum
+{
+    D64_CHCFG_SCREEN,
+    D64_CHCFG_LINEAR = 1,
+};
+
+
 typedef struct
 {
     BOOL multicolor, xexpand, yexpand;
@@ -89,6 +97,16 @@
     D64_CHR_HIRES,
 };
 
+enum
+{
+    DC_D020,
+    DC_BGCOL,
+    DC_D021,
+    DC_D022,
+    DC_D023,
+    DC_D024,
+};
+
 typedef struct
 {
     int mode, color;
@@ -121,7 +139,7 @@
         extradata[C64_SCR_EXTRADATA],
         d020, bgcolor, d022, d023, d024;
 
-    Uint8 charset[C64_MAX_CHARS][C64_CHR_HEIGHT * C64_CHR_WIDTH];
+    Uint8 charmem[C64_MAX_CHARS][C64_CHR_HEIGHT * C64_CHR_WIDTH];
     DMC64Sprite sprites[C64_MAX_SPRITES];
 } DMC64Image;
 
@@ -131,12 +149,15 @@
     DT_COLOR_RAM,
     DT_BITMAP,
     DT_SCREEN_RAM,
-    DT_BGCOLOR,
-    DT_BGCOLOR_SET,
+    DT_COLOR_REG,
+    DT_COLOR_SET,
     DT_EXTRADATA,
 
     DT_DEC_FUNCTION,
     DT_ENC_FUNCTION,
+
+    DT_CHAR_DATA,
+    DT_CHAR_CONFIG,
     
     DT_LAST,
 };