For all source files update integer types to the new gI8 etc type names

23 files changed, 115 insertions, 115 deletions

diff --git a/demos/modules/gadc/gwinosc.c b/demos/modules/gadc/gwinosc.c
index b018fe7e..b9154d11 100644
--- a/demos/modules/gadc/gwinosc.c
+++ b/demos/modules/gadc/gwinosc.c
@@ -57,7 +57,7 @@ static const gwinVMT scopeVMT = {
 		0,						// The after-clear routine
 };
 
-GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint32_t physdev, uint32_t frequency) {
+GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, gU32 physdev, gU32 frequency) {
 	/* Initialise the base class GWIN */
 	if (!(gs = (GScopeObject *)_gwindowCreate(g, &gs->g, pInit, &scopeVMT, 0)))
 		return 0;
@@ -87,7 +87,7 @@ void gwinScopeWaitForTrace(GHandle gh) {
 	adcsample_t		*pa;
 	gCoord			*pc;
 	GDataBuffer		*pd;
-	uint8_t			shr;
+	gU8			shr;
 #if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
 	gBool			rdytrigger;
 	int				flsamples;
diff --git a/demos/modules/gadc/gwinosc.h b/demos/modules/gadc/gwinosc.h
index 15ef2f3a..49b6e032 100644
--- a/demos/modules/gadc/gwinosc.h
+++ b/demos/modules/gadc/gwinosc.h
@@ -80,7 +80,7 @@ extern "C" {
 	/**
 	 * Create a scope window.
 	 */
-	GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint32_t physdev, uint32_t frequency);
+	GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, gU32 physdev, gU32 frequency);
 	#define gwinScopeCreate(gs,pI,pd,f)		gwinGScopeCreate(GDISP,gs,pI,pd,f)
 
 	/**
diff --git a/demos/modules/gaudio/oscilloscope/gwinosc.c b/demos/modules/gaudio/oscilloscope/gwinosc.c
index e46640e8..001dbc68 100644
--- a/demos/modules/gaudio/oscilloscope/gwinosc.c
+++ b/demos/modules/gaudio/oscilloscope/gwinosc.c
@@ -64,7 +64,7 @@ static const gwinVMT scopeVMT = {
 		0,						// The after-clear routine
 };
 
-GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
+GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, gU16 channel, gU32 frequency, ArrayDataFormat format) {
 	/* Make sure the audio parameters are valid first */
 	if (!gaudioRecordInit(channel, frequency, format))
 		return 0;
@@ -100,10 +100,10 @@ void gwinScopeWaitForTrace(GHandle gh) {
 	int				i;
 	gCoord			x, y;
 	gCoord			yoffset;
-	uint8_t			*pa8;
-	uint16_t		*pa16;
+	gU8			*pa8;
+	gU16		*pa16;
 	gCoord			*pc;
-	uint8_t			shr;
+	gU8			shr;
 
 	#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
 		gBool			rdytrigger;
@@ -132,8 +132,8 @@ void gwinScopeWaitForTrace(GHandle gh) {
 
 	x = gs->nextx;
 	pc = gs->lastscopetrace+x;
-	pa8 = (uint8_t *)(paud+1);
-	pa16 = (uint16_t *)(paud+1);
+	pa8 = (gU8 *)(paud+1);
+	pa16 = (gU16 *)(paud+1);
 
 	#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
 		rdytrigger = gFalse;
diff --git a/demos/modules/gaudio/oscilloscope/gwinosc.h b/demos/modules/gaudio/oscilloscope/gwinosc.h
index e77a61b2..99e81dad 100644
--- a/demos/modules/gaudio/oscilloscope/gwinosc.h
+++ b/demos/modules/gaudio/oscilloscope/gwinosc.h
@@ -81,7 +81,7 @@ extern "C" {
 	/**
 	 * Create a scope window.
 	 */
-	GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint16_t channel, uint32_t frequency, ArrayDataFormat format);
+	GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, gU16 channel, gU32 frequency, ArrayDataFormat format);
 	#define gwinScopeCreate(gs,pI,ch,f,fmt)		gwinGScopeCreate(GDISP,gs,pI,ch,f,fmt)
 
 	/**
diff --git a/demos/modules/gaudio/play-vs1053/main.c b/demos/modules/gaudio/play-vs1053/main.c
index 8cfa60f6..663bcd12 100644
--- a/demos/modules/gaudio/play-vs1053/main.c
+++ b/demos/modules/gaudio/play-vs1053/main.c
@@ -46,8 +46,8 @@ int main(void) {
 	gFont			font;
 	GFILE			*f;
 	char 			*errmsg;
-	uint32_t		toplay;
-	uint32_t		len;
+	gU32		toplay;
+	gU32		len;
 	GDataBuffer		*pd;
 
 	// Initialise everything
diff --git a/demos/modules/gaudio/play-wave/main.c b/demos/modules/gaudio/play-wave/main.c
index c6a5ea84..8b54d185 100644
--- a/demos/modules/gaudio/play-wave/main.c
+++ b/demos/modules/gaudio/play-wave/main.c
@@ -48,10 +48,10 @@ int main(void) {
 	gFont			font;
 	GFILE			*f;
 	char 			*errmsg;
-	uint32_t		toplay;
-	uint32_t		frequency;
+	gU32		toplay;
+	gU32		frequency;
 	ArrayDataFormat datafmt;
-	uint32_t		len;
+	gU32		len;
 	GDataBuffer		*pd;
 
 	// Initialise everything
@@ -92,8 +92,8 @@ repeatplay:
 	}
 
 	// Read the fmt block
-	len = (((uint32_t)(uint8_t)whdr[16])<<0) | (((uint32_t)(uint8_t)whdr[17])<<8)
-					| (((uint32_t)(uint8_t)whdr[18])<<16) | (((uint32_t)(uint8_t)whdr[19])<<24);
+	len = (((gU32)(gU8)whdr[16])<<0) | (((gU32)(gU8)whdr[17])<<8)
+					| (((gU32)(gU8)whdr[18])<<16) | (((gU32)(gU8)whdr[19])<<24);
 	if (len > sizeof(whdr) || len < 16) {
 		errmsg = "Err: Bad fmt len";
 		goto theend;
@@ -123,8 +123,8 @@ repeatplay:
 	#endif
 
 	// Get the sample frequency (little endian format) and format
-	frequency = (((uint32_t)(uint8_t)whdr[4])<<0) | (((uint32_t)(uint8_t)whdr[5])<<8)
-					| (((uint32_t)(uint8_t)whdr[6])<<16) | (((uint32_t)(uint8_t)whdr[7])<<24);
+	frequency = (((gU32)(gU8)whdr[4])<<0) | (((gU32)(gU8)whdr[5])<<8)
+					| (((gU32)(gU8)whdr[6])<<16) | (((gU32)(gU8)whdr[7])<<24);
 	datafmt = whdr[14] == 8 ? ARRAY_DATA_8BITUNSIGNED : ARRAY_DATA_16BITSIGNED;
 
 	// Initialise the audio output device
@@ -146,8 +146,8 @@ repeatplay:
 		}
 
 		// Get the block length (little endian format)
-		toplay = (((uint32_t)(uint8_t)whdr[4])<<0) | (((uint32_t)(uint8_t)whdr[5])<<8)
-						| (((uint32_t)(uint8_t)whdr[6])<<16) | (((uint32_t)(uint8_t)whdr[7])<<24);
+		toplay = (((gU32)(gU8)whdr[4])<<0) | (((gU32)(gU8)whdr[5])<<8)
+						| (((gU32)(gU8)whdr[6])<<16) | (((gU32)(gU8)whdr[7])<<24);
 
 		// Stop scanning when this is a data block
 		if (whdr[0] == 'd' && whdr[1] == 'a' && whdr[2] == 't' && whdr[3] == 'a')
diff --git a/demos/modules/gdisp/arcsectors/main.c b/demos/modules/gdisp/arcsectors/main.c
index 6a9a2737..4943f423 100644
--- a/demos/modules/gdisp/arcsectors/main.c
+++ b/demos/modules/gdisp/arcsectors/main.c
@@ -31,7 +31,7 @@
 
 int main(void) {
 	gCoord		width, height, r1, r2, cx, cy;
-	uint8_t		sectors;
+	gU8		sectors;
 
     // Initialize and clear the display
     gfxInit();
diff --git a/demos/modules/gdisp/fonts/font_Apple12.h b/demos/modules/gdisp/fonts/font_Apple12.h
index 38e124d7..512612a9 100644
--- a/demos/modules/gdisp/fonts/font_Apple12.h
+++ b/demos/modules/gdisp/fonts/font_Apple12.h
@@ -11,7 +11,7 @@
 #error The font file is not compatible with this version of mcufont.
 #endif
 
-static const uint8_t mf_rlefont_phpoXxi1Y_dictionary_data[193] = {
+static const gU8 mf_rlefont_phpoXxi1Y_dictionary_data[193] = {
     0x04, 0x81, 0x04, 0x01, 0x81, 0x04, 0x0d, 0x81, 0x05, 0x80, 0x03, 0x80, 0x0b, 0x80, 0x09, 0x81, 
     0x08, 0x83, 0x06, 0x01, 0x80, 0x08, 0x02, 0x81, 0x02, 0x81, 0x06, 0x84, 0x04, 0x80, 0x0a, 0x81, 
     0x02, 0x0f, 0x80, 0x85, 0x02, 0x04, 0x81, 0x04, 0x81, 0x81, 0x06, 0x31, 0x81, 0x08, 0x08, 0x82, 
@@ -27,7 +27,7 @@ static const uint8_t mf_rlefont_phpoXxi1Y_dictionary_data[193] = {
     0xc7, 
 };
 
-static const uint16_t mf_rlefont_phpoXxi1Y_dictionary_offsets[76] = {
+static const gU16 mf_rlefont_phpoXxi1Y_dictionary_offsets[76] = {
     0x0000, 0x0003, 0x0006, 0x0008, 0x000a, 0x000c, 0x0011, 0x0013, 
     0x0016, 0x0018, 0x001b, 0x001d, 0x0021, 0x0023, 0x0025, 0x0029, 
     0x002b, 0x002d, 0x002e, 0x0031, 0x0033, 0x0036, 0x0037, 0x0039, 
@@ -40,7 +40,7 @@ static const uint16_t mf_rlefont_phpoXxi1Y_dictionary_offsets[76] = {
     0x00b5, 0x00b8, 0x00bc, 0x00c1, 
 };
 
-static const uint8_t mf_rlefont_phpoXxi1Y_glyph_data_0[954] = {
+static const gU8 mf_rlefont_phpoXxi1Y_glyph_data_0[954] = {
     0x0c, 0x00, 0x10, 0x0c, 0x32, 0x4b, 0x4b, 0x2d, 0x31, 0x10, 0x0d, 0x2f, 0x1a, 0x4d, 0x4d, 0x4d, 
     0x4d, 0x37, 0x10, 0x0c, 0x00, 0x1a, 0x4d, 0x4d, 0x19, 0x80, 0x8b, 0x70, 0x44, 0xd1, 0x1b, 0x83, 
     0x64, 0x4d, 0x4d, 0x4d, 0x37, 0x10, 0x0c, 0x5c, 0x22, 0x9f, 0x3c, 0x9e, 0x29, 0x93, 0x4e, 0x4d, 
@@ -103,7 +103,7 @@ static const uint8_t mf_rlefont_phpoXxi1Y_glyph_data_0[954] = {
     0x35, 0x85, 0x80, 0x10, 0x0c, 0x24, 0x3d, 0x8a, 0x7a, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpoXxi1Y_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phpoXxi1Y_glyph_offsets_0[95] = {
     0x0000, 0x0003, 0x000a, 0x0013, 0x0026, 0x0034, 0x0041, 0x0051, 
     0x0056, 0x0061, 0x006d, 0x007c, 0x0083, 0x008b, 0x0091, 0x0097, 
     0x009f, 0x00ac, 0x00b3, 0x00bd, 0x00c7, 0x00d0, 0x00db, 0x00e7, 
diff --git a/demos/modules/gdisp/fonts/font_FreePixel10.h b/demos/modules/gdisp/fonts/font_FreePixel10.h
index a9a74018..30e3cddf 100644
--- a/demos/modules/gdisp/fonts/font_FreePixel10.h
+++ b/demos/modules/gdisp/fonts/font_FreePixel10.h
@@ -11,7 +11,7 @@
 #error The font file is not compatible with this version of mcufont.
 #endif
 
-static const uint8_t mf_bwfont_phpdxISdS_glyph_data_0[888] = {
+static const gU8 mf_bwfont_phpdxISdS_glyph_data_0[888] = {
     0x00, 0x00, 0x00, 0x00, 0x7c, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 
     0x88, 0x00, 0xfc, 0x01, 0x88, 0x00, 0xfc, 0x01, 0x88, 0x00, 0x00, 0x00, 0x98, 0x00, 0x04, 0x01, 
     0xfe, 0x01, 0x24, 0x01, 0xe8, 0x00, 0x00, 0x00, 0x08, 0x01, 0xd4, 0x00, 0x28, 0x01, 0x90, 0x02, 
@@ -70,7 +70,7 @@ static const uint8_t mf_bwfont_phpdxISdS_glyph_data_0[888] = {
     0x00, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 
 };
 
-static const uint16_t mf_bwfont_phpdxISdS_glyph_offsets_0[96] = {
+static const gU16 mf_bwfont_phpdxISdS_glyph_offsets_0[96] = {
     0x0000, 0x0000, 0x0003, 0x0008, 0x000d, 0x0013, 0x0019, 0x001e, 
     0x0021, 0x0025, 0x0028, 0x002c, 0x0031, 0x0034, 0x0038, 0x003b, 
     0x0040, 0x0045, 0x0049, 0x004e, 0x0053, 0x0058, 0x005d, 0x0062, 
@@ -85,7 +85,7 @@ static const uint16_t mf_bwfont_phpdxISdS_glyph_offsets_0[96] = {
     0x019f, 0x01a4, 0x01a9, 0x01ad, 0x01b1, 0x01b4, 0x01b8, 0x01bc, 
 };
 
-static const uint8_t mf_bwfont_phpdxISdS_glyph_widths_0[95] = {
+static const gU8 mf_bwfont_phpdxISdS_glyph_widths_0[95] = {
     0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 
     0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 
     0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 
diff --git a/demos/modules/gdisp/fonts/font_GeosansLight11.h b/demos/modules/gdisp/fonts/font_GeosansLight11.h
index be6c674f..896b8948 100644
--- a/demos/modules/gdisp/fonts/font_GeosansLight11.h
+++ b/demos/modules/gdisp/fonts/font_GeosansLight11.h
@@ -11,7 +11,7 @@
 #error The font file is not compatible with this version of mcufont.
 #endif
 
-static const uint8_t mf_rlefont_phppBNCNS_dictionary_data[123] = {
+static const gU8 mf_rlefont_phppBNCNS_dictionary_data[123] = {
     0x12, 0x80, 0x02, 0x80, 0x02, 0x83, 0x05, 0x01, 0x80, 0x06, 0x01, 0x83, 0x04, 0x04, 0x84, 0x05, 
     0x80, 0x03, 0x80, 0x05, 0x03, 0x80, 0x09, 0x80, 0x06, 0x81, 0x06, 0x27, 0x02, 0x80, 0x06, 0x02, 
     0x82, 0x03, 0x04, 0x80, 0x07, 0x01, 0x80, 0x02, 0x80, 0x03, 0x80, 0x81, 0x80, 0x06, 0x0b, 0x06, 
@@ -22,7 +22,7 @@ static const uint8_t mf_rlefont_phppBNCNS_dictionary_data[123] = {
     0x2d, 0x1f, 0x2e, 0x1f, 0x1c, 0x00, 0x21, 0xf5, 0x49, 0xa6, 0xfa, 
 };
 
-static const uint16_t mf_rlefont_phppBNCNS_dictionary_offsets[50] = {
+static const gU16 mf_rlefont_phppBNCNS_dictionary_offsets[50] = {
     0x0000, 0x0001, 0x0005, 0x0007, 0x000a, 0x000d, 0x000f, 0x0011, 
     0x0014, 0x0019, 0x001b, 0x001c, 0x001f, 0x0022, 0x0025, 0x0027, 
     0x0029, 0x002b, 0x002c, 0x002e, 0x002f, 0x0030, 0x0035, 0x0037, 
@@ -32,7 +32,7 @@ static const uint16_t mf_rlefont_phppBNCNS_dictionary_offsets[50] = {
     0x007a, 0x007b, 
 };
 
-static const uint8_t mf_rlefont_phppBNCNS_glyph_data_0[731] = {
+static const gU8 mf_rlefont_phppBNCNS_glyph_data_0[731] = {
     0x03, 0x00, 0x10, 0x03, 0x1b, 0x33, 0x2b, 0x27, 0x10, 0x02, 0xc7, 0x64, 0x10, 0x06, 0x2b, 0xce, 
     0x64, 0x8b, 0x98, 0x64, 0x8b, 0x1e, 0x10, 0x06, 0xfc, 0x2f, 0x3f, 0x3f, 0x3a, 0x39, 0xe8, 0x85, 
     0x98, 0x54, 0x86, 0x24, 0x1e, 0x10, 0x05, 0xe6, 0x2c, 0x91, 0x94, 0x87, 0x39, 0x1f, 0x37, 0xe6, 
@@ -81,7 +81,7 @@ static const uint8_t mf_rlefont_phppBNCNS_glyph_data_0[731] = {
     0x10, 0x02, 0x2a, 0x3d, 0x33, 0x27, 0x10, 0x05, 0x22, 0xe2, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phppBNCNS_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phppBNCNS_glyph_offsets_0[95] = {
     0x0000, 0x0003, 0x0009, 0x000d, 0x0017, 0x0026, 0x0034, 0x0040, 
     0x0044, 0x0049, 0x0050, 0x0055, 0x005c, 0x0061, 0x0066, 0x006a, 
     0x0071, 0x007c, 0x0080, 0x0089, 0x0094, 0x00a0, 0x00a9, 0x00b2, 
diff --git a/demos/modules/gdisp/fonts/font_GeosansLight11_aa.h b/demos/modules/gdisp/fonts/font_GeosansLight11_aa.h
index 78a90c24..333c8c97 100644
--- a/demos/modules/gdisp/fonts/font_GeosansLight11_aa.h
+++ b/demos/modules/gdisp/fonts/font_GeosansLight11_aa.h
@@ -11,7 +11,7 @@
 #error The font file is not compatible with this version of mcufont.
 #endif
 
-static const uint8_t mf_rlefont_phpTJ5Kmd_dictionary_data[201] = {
+static const gU8 mf_rlefont_phpTJ5Kmd_dictionary_data[201] = {
     0x02, 0x06, 0xc7, 0x02, 0x03, 0x0d, 0xc3, 0xc5, 0x01, 0x05, 0x08, 0xc7, 0x08, 0x04, 0x01, 0xc1, 
     0xc6, 0x06, 0x0c, 0x06, 0x01, 0xc7, 0x06, 0xd8, 0xc6, 0x09, 0x38, 0x09, 0xd7, 0x01, 0xc6, 0xc7, 
     0x02, 0xc7, 0x07, 0x0a, 0x07, 0xc4, 0x01, 0x39, 0xc8, 0xc2, 0xc7, 0x02, 0xc1, 0x03, 0xc7, 0xc8, 
@@ -27,7 +27,7 @@ static const uint8_t mf_rlefont_phpTJ5Kmd_dictionary_data[201] = {
     0x54, 0x09, 0x29, 0x05, 0x2d, 0x1e, 0x03, 0x1a, 0x37, 
 };
 
-static const uint16_t mf_rlefont_phpTJ5Kmd_dictionary_offsets[84] = {
+static const gU16 mf_rlefont_phpTJ5Kmd_dictionary_offsets[84] = {
     0x0000, 0x0001, 0x0004, 0x0005, 0x0006, 0x0009, 0x000a, 0x000b, 
     0x000d, 0x000e, 0x0012, 0x0013, 0x0014, 0x0017, 0x0018, 0x001a, 
     0x001b, 0x001c, 0x001d, 0x001f, 0x0023, 0x0024, 0x0025, 0x0027, 
@@ -41,7 +41,7 @@ static const uint16_t mf_rlefont_phpTJ5Kmd_dictionary_offsets[84] = {
     0x00c1, 0x00c5, 0x00c7, 0x00c9, 
 };
 
-static const uint8_t mf_rlefont_phpTJ5Kmd_glyph_data_0[1615] = {
+static const gU8 mf_rlefont_phpTJ5Kmd_glyph_data_0[1615] = {
     0x03, 0x00, 0x10, 0x03, 0x1b, 0x5c, 0x5c, 0x05, 0x46, 0x09, 0x10, 0x02, 0x22, 0x05, 0x59, 0x3a, 
     0x10, 0x06, 0x1a, 0x46, 0x3e, 0x3e, 0x23, 0x02, 0x04, 0x07, 0x05, 0x4e, 0x23, 0x3e, 0x03, 0x01, 
     0x23, 0x3f, 0x05, 0x07, 0x55, 0x1d, 0x3e, 0x3e, 0x10, 0x06, 0x1b, 0x02, 0x09, 0x0b, 0x09, 0x32, 
@@ -145,7 +145,7 @@ static const uint8_t mf_rlefont_phpTJ5Kmd_glyph_data_0[1615] = {
     0x36, 0x1e, 0x2a, 0x2c, 0x60, 0x26, 0x05, 0x04, 0x10, 0x05, 0x27, 0x04, 0x40, 0x3d, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpTJ5Kmd_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phpTJ5Kmd_glyph_offsets_0[95] = {
     0x0000, 0x0003, 0x000b, 0x0011, 0x0029, 0x004b, 0x006b, 0x008e, 
     0x0094, 0x00a4, 0x00b7, 0x00c1, 0x00ca, 0x00d3, 0x00da, 0x00de, 
     0x00ed, 0x010a, 0x0112, 0x0126, 0x0145, 0x015d, 0x0177, 0x0194, 
diff --git a/demos/modules/gdisp/fonts/font_babyblue11_aa.h b/demos/modules/gdisp/fonts/font_babyblue11_aa.h
index 031c7453..343b10e0 100644
--- a/demos/modules/gdisp/fonts/font_babyblue11_aa.h
+++ b/demos/modules/gdisp/fonts/font_babyblue11_aa.h
@@ -11,7 +11,7 @@
 #error The font file is not compatible with this version of mcufont.
 #endif
 
-static const uint8_t mf_rlefont_phptTISF3_dictionary_data[311] = {
+static const gU8 mf_rlefont_phptTISF3_dictionary_data[311] = {
     0x1b, 0x01, 0xc5, 0xc6, 0x01, 0x04, 0x03, 0x02, 0x05, 0xca, 0x03, 0xca, 0x03, 0x08, 0x06, 0x0b, 
     0xc1, 0xc8, 0xca, 0x09, 0xea, 0x03, 0xc5, 0xc6, 0x04, 0xc2, 0x04, 0xc5, 0xc6, 0x01, 0xc3, 0xc4, 
     0x22, 0x09, 0xc1, 0xe3, 0x05, 0xc5, 0xca, 0xd8, 0xc6, 0x04, 0xe3, 0xc2, 0x04, 0xc5, 0xca, 0xd8, 
@@ -34,7 +34,7 @@ static const uint8_t mf_rlefont_phptTISF3_dictionary_data[311] = {
     0x2b, 0x1b, 0x03, 0x0a, 0x50, 0x1c, 0x48, 
 };
 
-static const uint16_t mf_rlefont_phptTISF3_dictionary_offsets[100] = {
+static const gU16 mf_rlefont_phptTISF3_dictionary_offsets[100] = {
     0x0000, 0x0001, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000d, 
     0x000e, 0x000f, 0x0010, 0x0013, 0x0014, 0x0015, 0x0018, 0x001a, 
     0x001e, 0x0021, 0x002a, 0x0030, 0x0031, 0x0033, 0x0035, 0x0037, 
@@ -50,7 +50,7 @@ static const uint16_t mf_rlefont_phptTISF3_dictionary_offsets[100] = {
     0x0131, 0x0133, 0x0135, 0x0137, 
 };
 
-static const uint8_t mf_rlefont_phptTISF3_glyph_data_0[1487] = {
+static const gU8 mf_rlefont_phptTISF3_glyph_data_0[1487] = {
     0x03, 0x00, 0x10, 0x02, 0x64, 0x66, 0x03, 0x04, 0x47, 0x28, 0x03, 0x23, 0x35, 0x09, 0x1b, 0x25, 
     0x0a, 0x20, 0x35, 0x09, 0x10, 0x06, 0x00, 0x23, 0x08, 0x3c, 0x02, 0x1d, 0x72, 0x0b, 0x2d, 0x72, 
     0x0b, 0x2d, 0x09, 0x4a, 0x1d, 0x09, 0x4a, 0x10, 0x06, 0x1c, 0x74, 0x44, 0x03, 0x0b, 0x03, 0x1d, 
@@ -146,7 +146,7 @@ static const uint8_t mf_rlefont_phptTISF3_glyph_data_0[1487] = {
     0x18, 0x01, 0x02, 0x01, 0x44, 0x1b, 0x07, 0x38, 0x07, 0x41, 0x78, 0x4e, 0x04, 0x03, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phptTISF3_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phptTISF3_glyph_offsets_0[95] = {
     0x0000, 0x0003, 0x000a, 0x0015, 0x0028, 0x004f, 0x0070, 0x008e, 
     0x0094, 0x00a2, 0x00b0, 0x00c3, 0x00d7, 0x00df, 0x00e6, 0x00eb, 
     0x00f9, 0x0103, 0x0111, 0x0123, 0x013a, 0x014f, 0x0166, 0x017a, 
diff --git a/demos/modules/gdisp/fonts/font_hellovetica11.h b/demos/modules/gdisp/fonts/font_hellovetica11.h
index d82e8e71..3b35ef6c 100644
--- a/demos/modules/gdisp/fonts/font_hellovetica11.h
+++ b/demos/modules/gdisp/fonts/font_hellovetica11.h
@@ -11,7 +11,7 @@
 #error The font file is not compatible with this version of mcufont.
 #endif
 
-static const uint8_t mf_rlefont_phptWBvQt_dictionary_data[244] = {
+static const gU8 mf_rlefont_phptWBvQt_dictionary_data[244] = {
     0x05, 0x07, 0x0b, 0x80, 0x0c, 0x0a, 0x03, 0x80, 0x80, 0x05, 0x81, 0x05, 0x80, 0x05, 0x81, 0x05, 
     0x80, 0x05, 0x81, 0x05, 0x80, 0x07, 0x80, 0x01, 0x32, 0x87, 0x04, 0x80, 0x06, 0x81, 0x06, 0x80, 
     0x04, 0x81, 0x02, 0x84, 0x04, 0x80, 0x0c, 0x80, 0x0c, 0x80, 0x07, 0x80, 0x04, 0x80, 0x01, 0x80, 
@@ -30,7 +30,7 @@ static const uint8_t mf_rlefont_phptWBvQt_dictionary_data[244] = {
     0x8e, 0x0f, 0x3c, 0x8c, 
 };
 
-static const uint16_t mf_rlefont_phptWBvQt_dictionary_offsets[70] = {
+static const gU16 mf_rlefont_phptWBvQt_dictionary_offsets[70] = {
     0x0000, 0x0001, 0x0002, 0x0005, 0x0006, 0x0008, 0x0018, 0x0019, 
     0x001a, 0x001e, 0x0023, 0x0024, 0x0025, 0x002b, 0x002f, 0x0032, 
     0x0037, 0x0039, 0x003c, 0x003e, 0x0041, 0x0047, 0x0049, 0x004c, 
@@ -42,7 +42,7 @@ static const uint16_t mf_rlefont_phptWBvQt_dictionary_offsets[70] = {
     0x00e6, 0x00ea, 0x00ec, 0x00ef, 0x00f1, 0x00f4, 
 };
 
-static const uint8_t mf_rlefont_phptWBvQt_glyph_data_0[725] = {
+static const gU8 mf_rlefont_phptWBvQt_glyph_data_0[725] = {
     0x02, 0x00, 0x10, 0x05, 0x47, 0x4d, 0x24, 0x1b, 0x1b, 0x1a, 0x10, 0x06, 0xe6, 0x5c, 0x5c, 0x5c, 
     0x0f, 0x10, 0x03, 0x00, 0x10, 0x03, 0x47, 0x0f, 0x10, 0x05, 0x2a, 0x47, 0x4e, 0x06, 0x1e, 0x33, 
     0xc0, 0x10, 0x05, 0x2a, 0xfe, 0x10, 0x05, 0x33, 0x3a, 0x33, 0x33, 0xa4, 0x10, 0x05, 0x33, 0x3b, 
@@ -91,7 +91,7 @@ static const uint8_t mf_rlefont_phptWBvQt_glyph_data_0[725] = {
     0x1f, 0x10, 0x01, 0x00, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phptWBvQt_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phptWBvQt_glyph_offsets_0[95] = {
     0x0000, 0x0003, 0x000b, 0x0012, 0x0012, 0x0012, 0x0012, 0x0015, 
     0x0000, 0x0000, 0x0012, 0x0012, 0x0019, 0x001d, 0x0022, 0x0000, 
     0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 
diff --git a/demos/modules/gdisp/fonts/font_hellovetica11_aa.h b/demos/modules/gdisp/fonts/font_hellovetica11_aa.h
index 194c1216..53a625a6 100644
--- a/demos/modules/gdisp/fonts/font_hellovetica11_aa.h
+++ b/demos/modules/gdisp/fonts/font_hellovetica11_aa.h
@@ -11,7 +11,7 @@
 #error The font file is not compatible with this version of mcufont.
 #endif
 
-static const uint8_t mf_rlefont_phpMM3UuI_dictionary_data[351] = {
+static const gU8 mf_rlefont_phpMM3UuI_dictionary_data[351] = {
     0x0d, 0xc4, 0xce, 0x07, 0xc5, 0x80, 0xc2, 0x02, 0xc5, 0x80, 0xc2, 0x02, 0xc5, 0x80, 0xc2, 0x05, 
     0xc5, 0x80, 0xc2, 0x05, 0x03, 0xc5, 0x80, 0xc2, 0x40, 0x32, 0xf2, 0x0c, 0x83, 0x0c, 0xf4, 0x1d, 
     0x06, 0xc5, 0x2d, 0x40, 0x04, 0x80, 0xc7, 0xf6, 0x06, 0xc7, 0xc6, 0x80, 0xc2, 0x09, 0x80, 0xc2, 
@@ -36,7 +36,7 @@ static const uint8_t mf_rlefont_phpMM3UuI_dictionary_data[351] = {
     0x32, 0x32, 0x30, 0x83, 0x30, 0x06, 0x2e, 0x2e, 0x2e, 0x1a, 0x38, 0x18, 0x05, 0x4d, 0x1b, 
 };
 
-static const uint16_t mf_rlefont_phpMM3UuI_dictionary_offsets[98] = {
+static const gU16 mf_rlefont_phpMM3UuI_dictionary_offsets[98] = {
     0x0000, 0x0001, 0x0003, 0x0007, 0x000b, 0x0014, 0x0018, 0x0020, 
     0x0022, 0x0023, 0x0025, 0x0028, 0x0029, 0x002b, 0x002e, 0x0031, 
     0x0036, 0x0039, 0x003b, 0x003f, 0x0040, 0x0042, 0x0043, 0x0044, 
@@ -52,7 +52,7 @@ static const uint16_t mf_rlefont_phpMM3UuI_dictionary_offsets[98] = {
     0x015c, 0x015f, 
 };
 
-static const uint8_t mf_rlefont_phpMM3UuI_glyph_data_0[1386] = {
+static const gU8 mf_rlefont_phpMM3UuI_glyph_data_0[1386] = {
     0x02, 0x00, 0x10, 0x06, 0x6a, 0x64, 0x2b, 0x18, 0x60, 0x10, 0x08, 0x1b, 0x6b, 0x6b, 0x6b, 0x2a, 
     0x10, 0x03, 0x00, 0x10, 0x05, 0x2d, 0x56, 0x38, 0x10, 0x06, 0x2b, 0x33, 0x38, 0x38, 0x10, 0x06, 
     0x1e, 0x10, 0x06, 0x33, 0x60, 0x10, 0x06, 0x48, 0x6c, 0x4a, 0x3e, 0x3f, 0x31, 0x60, 0x10, 0x06, 
@@ -142,7 +142,7 @@ static const uint8_t mf_rlefont_phpMM3UuI_glyph_data_0[1386] = {
     0x6c, 0x2b, 0x4e, 0x22, 0x23, 0x29, 0x10, 0x01, 0x00, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpMM3UuI_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phpMM3UuI_glyph_offsets_0[95] = {
     0x0000, 0x0003, 0x000a, 0x0011, 0x0011, 0x0011, 0x0011, 0x0014, 
     0x0000, 0x0000, 0x0011, 0x0011, 0x0019, 0x001f, 0x0022, 0x0000, 
     0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 
diff --git a/demos/modules/gdisp/fonts/font_pf_ronda_seven11_aa.h b/demos/modules/gdisp/fonts/font_pf_ronda_seven11_aa.h
index e20e9815..ba5cd8f3 100644
--- a/demos/modules/gdisp/fonts/font_pf_ronda_seven11_aa.h
+++ b/demos/modules/gdisp/fonts/font_pf_ronda_seven11_aa.h
@@ -11,7 +11,7 @@
 #error The font file is not compatible with this version of mcufont.
 #endif
 
-static const uint8_t mf_rlefont_phpMbOYHb_dictionary_data[226] = {
+static const gU8 mf_rlefont_phpMbOYHb_dictionary_data[226] = {
     0x80, 0x04, 0x02, 0x81, 0x03, 0x80, 0x03, 0x04, 0x07, 0x03, 0x80, 0x0b, 0x18, 0x02, 0x01, 0x83, 
     0x09, 0x0a, 0x03, 0x32, 0x84, 0x32, 0x81, 0x0b, 0x40, 0x07, 0x84, 0xc6, 0x83, 0x08, 0x80, 0x0b, 
     0x80, 0x0b, 0x80, 0x08, 0x80, 0x05, 0x40, 0x15, 0x06, 0xcb, 0x04, 0x31, 0xc6, 0x01, 0x80, 0x01, 
@@ -29,7 +29,7 @@ static const uint8_t mf_rlefont_phpMbOYHb_dictionary_data[226] = {
     0x1c, 0x0b, 
 };
 
-static const uint16_t mf_rlefont_phpMbOYHb_dictionary_offsets[81] = {
+static const gU16 mf_rlefont_phpMbOYHb_dictionary_offsets[81] = {
     0x0000, 0x0002, 0x0004, 0x0007, 0x0008, 0x0009, 0x000c, 0x000d, 
     0x000e, 0x0010, 0x0011, 0x0012, 0x0013, 0x0015, 0x0017, 0x0018, 
     0x001a, 0x001c, 0x001e, 0x0024, 0x0026, 0x0028, 0x002b, 0x002d, 
@@ -43,7 +43,7 @@ static const uint16_t mf_rlefont_phpMbOYHb_dictionary_offsets[81] = {
     0x00e2, 
 };
 
-static const uint8_t mf_rlefont_phpMbOYHb_glyph_data_0[1283] = {
+static const gU8 mf_rlefont_phpMbOYHb_glyph_data_0[1283] = {
     0x04, 0x00, 0x10, 0x04, 0x46, 0x48, 0x0d, 0xc4, 0x1e, 0x39, 0x10, 0x06, 0x51, 0x38, 0x57, 0x1b, 
     0xa8, 0x10, 0x08, 0x46, 0x0f, 0x38, 0x94, 0x42, 0x8e, 0x39, 0x0c, 0x0f, 0x0c, 0x18, 0x94, 0x42, 
     0x8e, 0x39, 0x0a, 0x0f, 0x0a, 0x2b, 0xac, 0x84, 0xac, 0x84, 0xac, 0x10, 0x08, 0x23, 0x40, 0x1e, 
@@ -127,7 +127,7 @@ static const uint8_t mf_rlefont_phpMbOYHb_glyph_data_0[1283] = {
     0x42, 0x64, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpMbOYHb_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phpMbOYHb_glyph_offsets_0[95] = {
     0x0000, 0x0003, 0x000b, 0x0012, 0x002c, 0x0057, 0x006c, 0x008d, 
     0x0090, 0x00a5, 0x00b6, 0x00cb, 0x00d4, 0x00db, 0x00e0, 0x00e5, 
     0x00f9, 0x0103, 0x010a, 0x0124, 0x013a, 0x0152, 0x015e, 0x0170, 
diff --git a/demos/modules/gdisp/fonts_cyrillic/userfonts.h b/demos/modules/gdisp/fonts_cyrillic/userfonts.h
index 4cb6b503..97d4bb7c 100644
--- a/demos/modules/gdisp/fonts_cyrillic/userfonts.h
+++ b/demos/modules/gdisp/fonts_cyrillic/userfonts.h
@@ -11,7 +11,7 @@
 #error The font file is not compatible with this version of mcufont.
 #endif
 
-static const uint8_t mf_rlefont_php6ySCWY_dictionary_data[352] = {
+static const gU8 mf_rlefont_php6ySCWY_dictionary_data[352] = {
     0x11, 0x09, 0x80, 0x03, 0x0f, 0x80, 0x0f, 0x80, 0x41, 0x01, 0x80, 0xc5, 0x80, 0xce, 0xc6, 0x0f, 
     0x80, 0x0e, 0x02, 0x09, 0x80, 0x09, 0x0b, 0xc2, 0xce, 0x04, 0x0f, 0x0d, 0xc1, 0xcc, 0x05, 0x80, 
     0x09, 0x80, 0x05, 0x80, 0xce, 0xc2, 0x01, 0x80, 0xc3, 0x40, 0x01, 0xce, 0xc7, 0x06, 0x80, 0x03, 
@@ -36,7 +36,7 @@ static const uint8_t mf_rlefont_php6ySCWY_dictionary_data[352] = {
     0x29, 0x22, 0x4e, 0x1a, 0x45, 0x3e, 0x31, 0x1f, 0x1b, 0x1b, 0x4c, 0x56, 0x01, 0x28, 0x1a, 0x23, 
 };
 
-static const uint16_t mf_rlefont_php6ySCWY_dictionary_offsets[138] = {
+static const gU16 mf_rlefont_php6ySCWY_dictionary_offsets[138] = {
     0x0000, 0x0001, 0x0003, 0x0004, 0x0008, 0x000b, 0x000d, 0x000f, 
     0x0011, 0x0012, 0x0013, 0x0014, 0x0016, 0x0017, 0x0019, 0x001a, 
     0x001b, 0x001c, 0x001e, 0x0022, 0x0024, 0x0027, 0x0029, 0x002b, 
@@ -57,7 +57,7 @@ static const uint16_t mf_rlefont_php6ySCWY_dictionary_offsets[138] = {
     0x015e, 0x0160, 
 };
 
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_0[1460] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_0[1460] = {
     0x06, 0x00, 0x10, 0x02, 0x3c, 0x1b, 0x1b, 0x27, 0x01, 0x1f, 0x07, 0x10, 0x04, 0x38, 0x3f, 0x67, 
     0x70, 0x06, 0x0c, 0x28, 0x43, 0x08, 0x10, 0x08, 0x00, 0x3c, 0xa0, 0x5a, 0x37, 0x07, 0x19, 0xcc, 
     0x32, 0xa0, 0x5a, 0x37, 0x07, 0x60, 0xa6, 0x4c, 0xa6, 0x10, 0x08, 0x46, 0x1f, 0x5f, 0x56, 0x33, 
@@ -152,7 +152,7 @@ static const uint8_t mf_rlefont_php6ySCWY_glyph_data_0[1460] = {
     0x05, 0x0c, 0x36, 0x10, 
 };
 
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_0[95] = {
     0x0000, 0x0003, 0x000c, 0x0017, 0x002a, 0x0043, 0x0071, 0x0093, 
     0x0098, 0x00a3, 0x00af, 0x00bb, 0x00c2, 0x00c8, 0x00ce, 0x00d1, 
     0x00e8, 0x0100, 0x0106, 0x011c, 0x012e, 0x0147, 0x0156, 0x016b, 
@@ -167,7 +167,7 @@ static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_0[95] = {
     0x053c, 0x0554, 0x056e, 0x0580, 0x058d, 0x0594, 0x05a4, 
 };
 
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_1[1341] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_1[1341] = {
     0x06, 0x00, 0x10, 0x02, 0x3c, 0x7e, 0x01, 0x9e, 0x10, 0x00, 0x02, 0x3c, 0x7e, 0x0f, 0x7e, 0x0d, 
     0x06, 0x28, 0x18, 0x0d, 0x1b, 0x10, 0x05, 0x18, 0x61, 0x5c, 0x5f, 0x84, 0x24, 0x0d, 0x0f, 0x43, 
     0x5f, 0x0b, 0x01, 0x29, 0x5f, 0x52, 0x35, 0x5f, 0x06, 0x0d, 0x8a, 0x97, 0x27, 0x0c, 0x5f, 0x4a, 
@@ -254,7 +254,7 @@ static const uint8_t mf_rlefont_php6ySCWY_glyph_data_1[1341] = {
     0x06, 0x2e, 0x34, 0x7f, 0x5f, 0x0b, 0x0e, 0x02, 0x3e, 0x08, 0x2d, 0x39, 0x10, 
 };
 
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_1[96] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_1[96] = {
     0x0000, 0x0003, 0x0009, 0x0009, 0x0009, 0x0009, 0x000a, 0x0016, 
     0x0009, 0x0032, 0x0009, 0x0042, 0x0009, 0x0009, 0x004f, 0x0009, 
     0x005f, 0x006a, 0x0075, 0x007c, 0x0084, 0x0009, 0x0009, 0x0089, 
@@ -269,24 +269,24 @@ static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_1[96] = {
     0x04ce, 0x04df, 0x04f1, 0x04fa, 0x050c, 0x0513, 0x0522, 0x0530, 
 };
 
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_2[17] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_2[17] = {
     0x05, 0x21, 0x07, 0x08, 0x28, 0x5a, 0x42, 0x70, 0x08, 0x57, 0x01, 0x24, 0x08, 0x21, 0x06, 0x01, 
     0x10, 
 };
 
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_2[1] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_2[1] = {
     0x0000, 
 };
 
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_3[16] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_3[16] = {
     0x06, 0x38, 0x05, 0x0e, 0x58, 0x02, 0x08, 0x32, 0x8f, 0x4c, 0x08, 0x01, 0x05, 0x0c, 0x36, 0x10, 
 };
 
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_3[1] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_3[1] = {
     0x0000, 
 };
 
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_4[1096] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_4[1096] = {
     0x08, 0xac, 0x4c, 0x18, 0x37, 0x6e, 0x0f, 0x8f, 0x10, 0x00, 0x08, 0x38, 0x93, 0x1e, 0x6a, 0x2a, 
     0x37, 0x75, 0x2b, 0x10, 0x08, 0x38, 0x37, 0x01, 0x19, 0x1b, 0x33, 0x43, 0x19, 0x81, 0x81, 0x33, 
     0x1e, 0x10, 0x08, 0x8d, 0x9a, 0x29, 0x22, 0xc5, 0x35, 0x60, 0xc2, 0x8a, 0x22, 0xc5, 0x35, 0x19, 
@@ -358,7 +358,7 @@ static const uint8_t mf_rlefont_php6ySCWY_glyph_data_4[1096] = {
     0x0f, 0x2f, 0x76, 0x6c, 0x08, 0x49, 0x0d, 0x10, 
 };
 
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_4[81] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_4[81] = {
     0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 
     0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x000a, 
     0x0014, 0x0022, 0x0034, 0x003a, 0x0052, 0x0059, 0x0081, 0x0093, 
@@ -372,7 +372,7 @@ static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_4[81] = {
     0x0438, 
 };
 
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_5[159] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_5[159] = {
     0x06, 0x27, 0x62, 0x3c, 0x8f, 0x10, 0x08, 0x5e, 0x2e, 0x37, 0x2d, 0x10, 0x00, 0x02, 0x38, 0x06, 
     0x7e, 0x0a, 0x7e, 0x0d, 0x07, 0x10, 0x02, 0x3c, 0x05, 0x87, 0x10, 0x02, 0x1c, 0x04, 0x20, 0x0e, 
     0x10, 0x04, 0x38, 0x06, 0x07, 0x09, 0x04, 0x24, 0x4f, 0x07, 0x40, 0x5f, 0x0d, 0x08, 0x5c, 0x10, 
@@ -385,7 +385,7 @@ static const uint8_t mf_rlefont_php6ySCWY_glyph_data_5[159] = {
     0x5a, 0x08, 0x10, 0x05, 0x62, 0x5a, 0x08, 0x20, 0x78, 0x28, 0x78, 0x5f, 0x5a, 0x08, 0x10, 
 };
 
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_5[40] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_5[40] = {
     0x0000, 0x0006, 0x000c, 0x000c, 0x000c, 0x000d, 0x0016, 0x001b, 
     0x000c, 0x0021, 0x0030, 0x003b, 0x000c, 0x000c, 0x000c, 0x0044, 
     0x000c, 0x000c, 0x000c, 0x004a, 0x000c, 0x000c, 0x000c, 0x000c, 
@@ -393,14 +393,14 @@ static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_5[40] = {
     0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x0085, 0x0093, 
 };
 
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_6[50] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_6[50] = {
     0x0d, 0x38, 0x0b, 0x08, 0x26, 0x0b, 0x00, 0x64, 0x1e, 0xd4, 0x42, 0xcc, 0x58, 0x29, 0xd4, 0x34, 
     0x07, 0xe8, 0x58, 0x29, 0x00, 0xcc, 0x34, 0x06, 0xf6, 0x64, 0x1e, 0x21, 0xc8, 0x34, 0x4a, 0x60, 
     0xc6, 0x5d, 0x67, 0x91, 0xc5, 0xc5, 0x34, 0x10, 0x00, 0x06, 0x62, 0x51, 0x03, 0x0b, 0x60, 0xb4, 
     0x1d, 0x10, 
 };
 
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_6[13] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_6[13] = {
     0x0000, 0x0028, 0x0028, 0x0028, 0x0028, 0x0028, 0x0028, 0x0028, 
     0x0028, 0x0028, 0x0028, 0x0028, 0x0029, 
 };
diff --git a/demos/modules/ginput/keyboard/main.c b/demos/modules/ginput/keyboard/main.c
index d6a987b0..0e10de8b 100644
--- a/demos/modules/ginput/keyboard/main.c
+++ b/demos/modules/ginput/keyboard/main.c
@@ -98,7 +98,7 @@ int main(void) {
 		if (pk->bytecount) {
 			gwinPrintf(GW, " Keys:");
 			for (i = 0; i < pk->bytecount; i++)
-				gwinPrintf(GW, " 0x%02X", (int)(uint8_t)pk->c[i]);
+				gwinPrintf(GW, " 0x%02X", (int)(gU8)pk->c[i]);
 			gwinPrintf(GW, " [");
 			for (i = 0; i < pk->bytecount; i++)
 				gwinPrintf(GW, "%c", pk->c[i] >= ' ' && pk->c[i] <= '~' ? pk->c[i] : ' ');
diff --git a/demos/modules/gtrans/basic/userfonts.h b/demos/modules/gtrans/basic/userfonts.h
index b00d1889..2ae28ed5 100644
--- a/demos/modules/gtrans/basic/userfonts.h
+++ b/demos/modules/gtrans/basic/userfonts.h
@@ -11,7 +11,7 @@
 #error The font file is not compatible with this version of mcufont.
 #endif
 
-static const uint8_t mf_rlefont_phpRVS9jE_dictionary_data[1423] = {
+static const gU8 mf_rlefont_phpRVS9jE_dictionary_data[1423] = {
     0x05, 0xc2, 0xce, 0x29, 0x0a, 0x15, 0x0d, 0x07, 0x86, 0x13, 0x85, 0x80, 0x16, 0x80, 0x16, 0x80, 
     0x08, 0x33, 0xcd, 0xde, 0x80, 0x06, 0x80, 0x0f, 0x80, 0x06, 0x80, 0x01, 0x0f, 0xc3, 0xcb, 0x0e, 
     0x01, 0x80, 0x01, 0x80, 0x13, 0x82, 0x0c, 0x03, 0xc1, 0x40, 0x0b, 0xcd, 0xc2, 0x04, 0x89, 0x16, 
@@ -103,7 +103,7 @@ static const uint8_t mf_rlefont_phpRVS9jE_dictionary_data[1423] = {
     0x3e, 0x00, 0x5a, 0x1d, 0x0b, 0x04, 0x1b, 0x2c, 0x96, 0x28, 0x29, 0x21, 0x27, 0x5d, 0x89, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_dictionary_offsets[233] = {
+static const gU16 mf_rlefont_phpRVS9jE_dictionary_offsets[233] = {
     0x0000, 0x0001, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 
     0x000a, 0x000b, 0x0011, 0x0012, 0x0014, 0x001c, 0x001d, 0x001f, 
     0x0020, 0x0023, 0x0025, 0x0026, 0x0027, 0x0029, 0x002b, 0x002e, 
@@ -136,7 +136,7 @@ static const uint16_t mf_rlefont_phpRVS9jE_dictionary_offsets[233] = {
     0x058f, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_0[2382] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_0[2382] = {
     0x05, 0x00, 0x10, 0x06, 0x52, 0xfe, 0xfe, 0x0e, 0x56, 0x0d, 0x25, 0x34, 0x4e, 0x10, 0x06, 0x4c, 
     0x73, 0x94, 0x9d, 0x29, 0xcd, 0x10, 0x0d, 0x56, 0xf9, 0x09, 0x0a, 0x00, 0x67, 0x03, 0x3e, 0x0d, 
     0x53, 0xa8, 0x3e, 0x8e, 0x02, 0x00, 0x09, 0x0a, 0x27, 0x8e, 0x2a, 0x20, 0x25, 0x0a, 0x09, 0x00, 
@@ -288,7 +288,7 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_0[2382] = {
     0x1c, 0x21, 0x1d, 0x58, 0x30, 0x0f, 0x64, 0x10, 0x0d, 0x22, 0x75, 0xdf, 0xfc, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_0[95] = {
     0x0000, 0x0003, 0x000e, 0x0016, 0x0053, 0x0086, 0x00af, 0x00f4, 
     0x00f8, 0x011c, 0x0145, 0x015f, 0x0169, 0x0173, 0x0178, 0x017d, 
     0x019c, 0x01d5, 0x01e1, 0x020d, 0x023a, 0x025c, 0x027f, 0x02bb, 
@@ -303,7 +303,7 @@ static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_0[95] = {
     0x08d4, 0x0900, 0x090a, 0x090f, 0x0928, 0x092e, 0x0948, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_1[1970] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_1[1970] = {
     0x0a, 0x00, 0x10, 0x06, 0x2d, 0x4e, 0x00, 0x34, 0x0d, 0x56, 0x0e, 0x56, 0x3f, 0x10, 0x0a, 0x56, 
     0xf9, 0x4e, 0x35, 0x2c, 0x7a, 0x0f, 0x64, 0x25, 0x9b, 0x3c, 0x74, 0x02, 0x09, 0x45, 0xa9, 0x4b, 
     0x45, 0x60, 0x4b, 0x45, 0x43, 0x4b, 0x45, 0x60, 0x4b, 0x45, 0xa9, 0x4b, 0x25, 0x9b, 0x3c, 0x74, 
@@ -430,7 +430,7 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_1[1970] = {
     0x05, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_1[128] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_1[128] = {
     0x0000, 0x0003, 0x000e, 0x003a, 0x0050, 0x0083, 0x00ad, 0x00b5, 
     0x00ed, 0x00f1, 0x013d, 0x015b, 0x0180, 0x0186, 0x018b, 0x01d8, 
     0x01dc, 0x01f0, 0x01fe, 0x0212, 0x022a, 0x0231, 0x024d, 0x0272, 
@@ -449,25 +449,25 @@ static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_1[128] = {
     0x075b, 0x075b, 0x075b, 0x075b, 0x075b, 0x075b, 0x0787, 0x079b, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_2[11] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_2[11] = {
     0x05, 0x33, 0xe6, 0x33, 0x1a, 0xe5, 0x10, 0x03, 0x59, 0xb5, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_2[2] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_2[2] = {
     0x0000, 0x0007, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_3[43] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_3[43] = {
     0x09, 0x52, 0xfe, 0x0f, 0x9b, 0x06, 0x31, 0x0f, 0x04, 0x3c, 0x31, 0x48, 0x05, 0x31, 0x05, 0x0f, 
     0x02, 0x31, 0x0a, 0xa2, 0x30, 0x55, 0xfe, 0x1f, 0x10, 0x04, 0x4c, 0xf7, 0x3b, 0x0f, 0x6e, 0x31, 
     0x8e, 0x07, 0x3b, 0x63, 0xa2, 0x30, 0x03, 0x8e, 0x56, 0xf7, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_3[2] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_3[2] = {
     0x0000, 0x0019, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_4[183] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_4[183] = {
     0x11, 0x52, 0x9b, 0x7a, 0x0e, 0x2a, 0x20, 0x37, 0x05, 0x86, 0x02, 0x4b, 0x1d, 0x03, 0x60, 0x33, 
     0x0f, 0x25, 0x09, 0x07, 0x18, 0x0f, 0x25, 0x2e, 0x28, 0x27, 0x3a, 0x0f, 0x20, 0x92, 0x3a, 0x0f, 
     0x25, 0x2e, 0x28, 0x27, 0x09, 0x07, 0x18, 0x0f, 0x25, 0x03, 0x60, 0x33, 0x0f, 0x45, 0x06, 0x86, 
@@ -482,72 +482,72 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_4[183] = {
     0xdc, 0x01, 0x08, 0x23, 0xb1, 0xc9, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_4[16] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_4[16] = {
     0x0000, 0x0039, 0x007c, 0x007c, 0x007c, 0x007c, 0x007c, 0x007c, 
     0x007c, 0x007c, 0x007c, 0x007c, 0x007d, 0x0090, 0x009b, 0x00ad, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_5[24] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_5[24] = {
     0x09, 0x32, 0xcd, 0xd7, 0x1d, 0x9b, 0x60, 0xdd, 0x10, 0x00, 0x0c, 0x32, 0xe3, 0x40, 0x20, 0xbc, 
     0x10, 0x09, 0x22, 0xeb, 0xdc, 0xd1, 0xf6, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_5[7] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_5[7] = {
     0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x000a, 0x0011, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_6[40] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_6[40] = {
     0x0a, 0xf9, 0xa1, 0x97, 0x3e, 0x63, 0x0f, 0x06, 0x30, 0x0a, 0x83, 0x76, 0x3e, 0x2c, 0x0c, 0x31, 
     0x06, 0x2a, 0x48, 0x31, 0x8a, 0x1c, 0x4f, 0x1c, 0x76, 0x30, 0x6b, 0x1c, 0xa6, 0x1c, 0x5a, 0x1c, 
     0x46, 0x30, 0xa8, 0x01, 0x3b, 0x97, 0x50, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_6[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_6[1] = {
     0x0000, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_7[12] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_7[12] = {
     0x08, 0x00, 0x22, 0x57, 0xcb, 0x5d, 0x10, 0x08, 0x22, 0xeb, 0xdc, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_7[2] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_7[2] = {
     0x0000, 0x0007, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_8[51] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_8[51] = {
     0x08, 0x52, 0xcc, 0x04, 0x10, 0x08, 0x2d, 0xe6, 0x10, 0x08, 0x79, 0x9e, 0x50, 0x31, 0x6a, 0xe7, 
     0x6a, 0xe7, 0x9e, 0x50, 0x10, 0x08, 0x1e, 0x78, 0x4a, 0x1c, 0x65, 0x1c, 0x7c, 0x0e, 0x10, 0x08, 
     0x4c, 0xf0, 0x10, 0x08, 0x00, 0x22, 0x84, 0x0c, 0x0a, 0x45, 0x9b, 0x60, 0x04, 0x3d, 0x45, 0x6d, 
     0x00, 0xa0, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_8[6] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_8[6] = {
     0x0000, 0x0005, 0x0009, 0x0015, 0x001f, 0x0023, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_9[63] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_9[63] = {
     0x0c, 0x2d, 0x71, 0xaa, 0x25, 0x58, 0x99, 0x9b, 0x06, 0x64, 0x2b, 0x9b, 0x2e, 0x9b, 0x68, 0x2b, 
     0x09, 0x06, 0x1e, 0x5e, 0x2b, 0x68, 0x32, 0x9b, 0x0d, 0x37, 0x72, 0x28, 0x89, 0xd5, 0x19, 0x2b, 
     0x0c, 0x06, 0x1e, 0x51, 0x2b, 0x08, 0x76, 0x35, 0x2c, 0x62, 0x37, 0x2c, 0x0e, 0x0b, 0x01, 0x2c, 
     0x4d, 0x02, 0x1d, 0x57, 0x50, 0x00, 0x9e, 0x0f, 0x06, 0x2b, 0x74, 0x70, 0x77, 0x02, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_9[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_9[1] = {
     0x0000, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_10[49] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_10[49] = {
     0x09, 0x38, 0x75, 0x44, 0x0e, 0x20, 0x0d, 0x1d, 0x0c, 0x06, 0x98, 0x02, 0x00, 0x05, 0x43, 0x45, 
     0xac, 0x35, 0x9a, 0x3e, 0x0e, 0x0a, 0x35, 0xa4, 0x25, 0x63, 0x0f, 0x06, 0x35, 0x0c, 0x05, 0x45, 
     0x98, 0x02, 0x35, 0x3d, 0x25, 0x0b, 0x0d, 0x38, 0x0f, 0x02, 0x45, 0x0e, 0x0a, 0x38, 0x8d, 0x09, 
     0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_10[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_10[1] = {
     0x0000, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_11[235] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_11[235] = {
     0x08, 0xd0, 0x75, 0x97, 0x20, 0x10, 0x10, 0xd0, 0x75, 0x20, 0x2f, 0x10, 0x00, 0x05, 0x4c, 0x44, 
     0x1c, 0x09, 0x83, 0x7d, 0x0f, 0x10, 0x05, 0x52, 0x97, 0x30, 0x67, 0x0c, 0x30, 0x07, 0x60, 0x30, 
     0x0c, 0x06, 0x10, 0x05, 0x5c, 0x75, 0x0f, 0xfa, 0x33, 0x5e, 0x1c, 0x6f, 0x10, 0x08, 0x4c, 0x44, 
@@ -565,7 +565,7 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_11[235] = {
     0x08, 0x0e, 0x30, 0x07, 0x6a, 0x31, 0xab, 0x02, 0x30, 0x09, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_11[40] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_11[40] = {
     0x0000, 0x0006, 0x000c, 0x000c, 0x000c, 0x000d, 0x0016, 0x0023, 
     0x000c, 0x002d, 0x003c, 0x0047, 0x000c, 0x0053, 0x005b, 0x0065, 
     0x000c, 0x000c, 0x000c, 0x007a, 0x000c, 0x000c, 0x000c, 0x000c, 
@@ -573,26 +573,26 @@ static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_11[40] = {
     0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x00c0, 0x00d5, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_12[46] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_12[46] = {
     0x0a, 0x69, 0x51, 0x48, 0x0b, 0x04, 0x45, 0x0a, 0x4f, 0x01, 0x02, 0x8d, 0x25, 0x51, 0x18, 0x07, 
     0x25, 0x46, 0x31, 0x0b, 0x20, 0x0c, 0x3e, 0x4e, 0x32, 0x0b, 0x77, 0x0b, 0x3b, 0x46, 0x1c, 0x51, 
     0x18, 0x07, 0x45, 0x0a, 0x4f, 0x01, 0x91, 0x0f, 0x3e, 0x9a, 0x48, 0x0b, 0x04, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_12[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_12[1] = {
     0x0000, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_13[26] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_13[26] = {
     0x10, 0x52, 0x20, 0x08, 0x00, 0x07, 0x85, 0x9d, 0x0f, 0x0b, 0x01, 0x0a, 0x85, 0x9d, 0x0f, 0x49, 
     0x05, 0x85, 0x9d, 0x85, 0x0c, 0x28, 0x9d, 0x73, 0x28, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_13[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_13[1] = {
     0x0000, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_14[360] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_14[360] = {
     0x08, 0x40, 0xf9, 0xee, 0x0f, 0x64, 0x3b, 0x61, 0x55, 0x6f, 0x30, 0x61, 0x1c, 0xa1, 0x3e, 0x07, 
     0x0d, 0x0e, 0x08, 0x98, 0x45, 0x07, 0x6a, 0x01, 0xa1, 0x0d, 0x45, 0x50, 0x35, 0x67, 0x0a, 0x45, 
     0x3d, 0x63, 0x0f, 0x04, 0x45, 0x0a, 0x06, 0x8f, 0x0d, 0x0a, 0x27, 0x2c, 0x0a, 0x0e, 0x8c, 0x10, 
@@ -618,7 +618,7 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_14[360] = {
     0x08, 0x1c, 0x08, 0x03, 0x31, 0x0b, 0x86, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_14[42] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_14[42] = {
     0x0000, 0x0030, 0x0030, 0x0030, 0x0031, 0x0030, 0x0030, 0x0030, 
     0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x006c, 0x0030, 0x007c, 
     0x00af, 0x0030, 0x0030, 0x00b4, 0x0030, 0x0030, 0x0030, 0x00d5, 
@@ -627,16 +627,16 @@ static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_14[42] = {
     0x0030, 0x0141, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_15[23] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_15[23] = {
     0x0d, 0x18, 0x75, 0xdf, 0xfc, 0x01, 0x2b, 0x63, 0xac, 0x0e, 0x0b, 0x99, 0x01, 0x58, 0x1d, 0x0d, 
     0x55, 0x02, 0x06, 0xac, 0x0e, 0xfc, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_15[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_15[1] = {
     0x0000, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_16[106] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_16[106] = {
     0x0d, 0x1e, 0x5c, 0x5a, 0x30, 0x07, 0x65, 0x27, 0x77, 0x77, 0x3e, 0x98, 0x03, 0x31, 0x74, 0x06, 
     0x3e, 0x77, 0x77, 0x27, 0x03, 0x86, 0x30, 0x0a, 0x07, 0x10, 0x00, 0x0d, 0x32, 0x5c, 0x7e, 0x7a, 
     0x25, 0x9b, 0x07, 0xac, 0x6d, 0x03, 0x2b, 0x63, 0x7a, 0x0d, 0x09, 0x87, 0x45, 0x0f, 0x64, 0x31, 
@@ -646,11 +646,11 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_16[106] = {
     0x6d, 0x02, 0x45, 0x0d, 0x09, 0x55, 0x00, 0x1a, 0x2f, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_16[6] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_16[6] = {
     0x0000, 0x001a, 0x001a, 0x001a, 0x001b, 0x0042, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_17[72] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_17[72] = {
     0x08, 0x22, 0x63, 0x04, 0x1c, 0x0b, 0x0b, 0x30, 0x26, 0x4f, 0x31, 0x6e, 0x90, 0x3e, 0x9b, 0x0b, 
     0x35, 0x5b, 0x45, 0x09, 0x04, 0x35, 0x05, 0x09, 0x1d, 0x2c, 0x0c, 0x33, 0x0c, 0x01, 0x25, 0x8a, 
     0x33, 0x05, 0x08, 0x25, 0x76, 0x33, 0x6b, 0x25, 0x5f, 0x33, 0x4a, 0x25, 0x6b, 0x33, 0x76, 0x45, 
@@ -658,17 +658,17 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_17[72] = {
     0x6f, 0x31, 0x0b, 0x0b, 0x30, 0x63, 0x04, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_17[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_17[1] = {
     0x0000, 
 };
 
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_18[47] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_18[47] = {
     0x0a, 0x52, 0x44, 0x97, 0x4b, 0x27, 0x0c, 0x05, 0x35, 0x4b, 0x9d, 0x31, 0x0f, 0x20, 0x92, 0xc6, 
     0x72, 0xc6, 0x72, 0xc6, 0x72, 0xc6, 0x72, 0x10, 0x0a, 0x52, 0x58, 0x77, 0x45, 0x6a, 0x35, 0x4b, 
     0x9d, 0x72, 0x1e, 0x0f, 0x2a, 0x72, 0xc6, 0x72, 0xc6, 0x72, 0xc6, 0x72, 0xc6, 0x72, 0x10, 
 };
 
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_18[2] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_18[2] = {
     0x0000, 0x0018, 
 };
 
diff --git a/demos/modules/gwin/console/main.c b/demos/modules/gwin/console/main.c
index 9cd4af76..057fa61d 100644
--- a/demos/modules/gwin/console/main.c
+++ b/demos/modules/gwin/console/main.c
@@ -33,7 +33,7 @@
 GHandle GW1, GW2, GW3;
 
 int main(void) {
-	uint8_t i;
+	gU8 i;
 	gFont	font1, font2;
 
 	/* initialize and clear the display */
diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c
index 18e15046..d3ea97f8 100644
--- a/demos/modules/gwin/frame/main.c
+++ b/demos/modules/gwin/frame/main.c
@@ -8,7 +8,7 @@ static GHandle      ghButton1, ghButton2, ghButton3;
 static GHandle      ghWindow1;
 
 static void _updateColor(void) {
-    uint32_t color;
+    gU32 color;
 
     color  = (unsigned)gwinSliderGetPosition(ghSliderR) << 16;
     color |= (unsigned)gwinSliderGetPosition(ghSliderG) <<  8;
diff --git a/demos/modules/gwin/graph/main.c b/demos/modules/gwin/graph/main.c
index 19c6c76c..4a89dd04 100644
--- a/demos/modules/gwin/graph/main.c
+++ b/demos/modules/gwin/graph/main.c
@@ -63,7 +63,7 @@ static const GGraphStyle GraphStyle2 = {
  
 int main(void) {
     GHandle     gh;
-    uint16_t    i;
+    gU16    i;
  
     gfxInit();
  
diff --git a/demos/modules/gwin/keyboard/main.c b/demos/modules/gwin/keyboard/main.c
index 29f5f519..f1f47032 100644
--- a/demos/modules/gwin/keyboard/main.c
+++ b/demos/modules/gwin/keyboard/main.c
@@ -121,7 +121,7 @@ int main(void) {
 			if (pk->bytecount) {
 				gwinPrintf(ghConsole, " Keys:");
 				for (i = 0; i < pk->bytecount; i++)
-					gwinPrintf(ghConsole, " 0x%02X", (int)(uint8_t)pk->c[i]);
+					gwinPrintf(ghConsole, " 0x%02X", (int)(gU8)pk->c[i]);
 				gwinPrintf(ghConsole, " [");
 				for (i = 0; i < pk->bytecount; i++)
 					gwinPrintf(ghConsole, "%c", pk->c[i] >= ' ' && pk->c[i] <= '~' ? pk->c[i] : ' ');
diff --git a/demos/modules/gwin/textedit/main.c b/demos/modules/gwin/textedit/main.c
index 034d01aa..42dad5f4 100644
--- a/demos/modules/gwin/textedit/main.c
+++ b/demos/modules/gwin/textedit/main.c
@@ -145,7 +145,7 @@ int main(void) {
 		if (pk->bytecount) {
 			gwinPrintf(ghConsole, " Keys:");
 			for (i = 0; i < pk->bytecount; i++)
-				gwinPrintf(ghConsole, " 0x%02X", (int)(uint8_t)pk->c[i]);
+				gwinPrintf(ghConsole, " 0x%02X", (int)(gU8)pk->c[i]);
 			gwinPrintf(ghConsole, " [");
 			for (i = 0; i < pk->bytecount; i++)
 				gwinPrintf(ghConsole, "%c", pk->c[i] >= ' ' && pk->c[i] <= '~' ? pk->c[i] : ' ');