17 files changed, 183 insertions, 183 deletions
diff --git a/demos/modules/gdisp/arcsectors/gfxconf.h b/demos/modules/gdisp/arcsectors/gfxconf.h
index df6d85c0..b2c64fbd 100644
--- a/demos/modules/gdisp/arcsectors/gfxconf.h
+++ b/demos/modules/gdisp/arcsectors/gfxconf.h
@@ -31,17 +31,17 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GDISP			GFXON
 
 /* Features for the GDISP subsystem. */
-#define GDISP_NEED_VALIDATION	TRUE
-#define GDISP_NEED_ARCSECTORS	TRUE
+#define GDISP_NEED_VALIDATION	GFXON
+#define GDISP_NEED_ARCSECTORS	GFXON
 
 
 #endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/basics/gfxconf.h b/demos/modules/gdisp/basics/gfxconf.h
index a37ef1e7..931f2fe7 100644
--- a/demos/modules/gdisp/basics/gfxconf.h
+++ b/demos/modules/gdisp/basics/gfxconf.h
@@ -31,17 +31,17 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GDISP			GFXON
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION	TRUE
-#define GDISP_NEED_CLIP			TRUE
+#define GDISP_NEED_VALIDATION	GFXON
+#define GDISP_NEED_CLIP			GFXON
 
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gdisp/circles/gfxconf.h b/demos/modules/gdisp/circles/gfxconf.h
index 4bb605ac..a0534700 100644
--- a/demos/modules/gdisp/circles/gfxconf.h
+++ b/demos/modules/gdisp/circles/gfxconf.h
@@ -31,25 +31,25 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
-#define GFX_USE_GMISC			TRUE
+#define GFX_USE_GDISP			GFXON
+#define GFX_USE_GMISC			GFXON
 
 /* Features for the GDISP subsystem. */
-#define GDISP_NEED_VALIDATION	TRUE
-#define GDISP_NEED_CLIP			TRUE
-#define GDISP_NEED_CIRCLE		TRUE
-#define GDISP_NEED_ELLIPSE		TRUE
-#define GDISP_NEED_ARC			TRUE
+#define GDISP_NEED_VALIDATION	GFXON
+#define GDISP_NEED_CLIP			GFXON
+#define GDISP_NEED_CIRCLE		GFXON
+#define GDISP_NEED_ELLIPSE		GFXON
+#define GDISP_NEED_ARC			GFXON
 
 /* Features for the GMISC subsystem */
-#define GMISC_NEED_FIXEDTRIG	TRUE
-#define GMISC_NEED_FASTTRIG		TRUE
+#define GMISC_NEED_FIXEDTRIG	GFXON
+#define GMISC_NEED_FASTTRIG		GFXON
 
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gdisp/fonts/gfxconf.h b/demos/modules/gdisp/fonts/gfxconf.h
index 1ea84e1b..2e24dd64 100644
--- a/demos/modules/gdisp/fonts/gfxconf.h
+++ b/demos/modules/gdisp/fonts/gfxconf.h
@@ -31,41 +31,41 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GDISP			GFXON
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION	TRUE
-#define GDISP_NEED_CLIP			TRUE
-#define GDISP_NEED_TEXT			TRUE
-#define GDISP_NEED_ANTIALIAS	TRUE
+#define GDISP_NEED_VALIDATION	GFXON
+#define GDISP_NEED_CLIP			GFXON
+#define GDISP_NEED_TEXT			GFXON
+#define GDISP_NEED_ANTIALIAS	GFXON
 
 /* GDISP - fonts to include */
-#define GDISP_INCLUDE_USER_FONTS				TRUE
-#define GDISP_INCLUDE_FONT_UI1					FALSE
-#define GDISP_INCLUDE_FONT_UI2					TRUE
-#define GDISP_INCLUDE_FONT_LARGENUMBERS			FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS10			FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12			FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16			FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS20			FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS24			FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS32			FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12		FALSE
-#define GDISP_INCLUDE_FONT_FIXED_10x20			FALSE
-#define GDISP_INCLUDE_FONT_FIXED_7x14			FALSE
-#define GDISP_INCLUDE_FONT_FIXED_5x8			FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA		FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA		FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA      TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA		FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA		FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA	FALSE
+#define GDISP_INCLUDE_USER_FONTS				GFXON
+#define GDISP_INCLUDE_FONT_UI1					GFXOFF
+#define GDISP_INCLUDE_FONT_UI2					GFXON
+#define GDISP_INCLUDE_FONT_LARGENUMBERS			GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS10			GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12			GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16			GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS20			GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24			GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS32			GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12		GFXOFF
+#define GDISP_INCLUDE_FONT_FIXED_10x20			GFXOFF
+#define GDISP_INCLUDE_FONT_FIXED_7x14			GFXOFF
+#define GDISP_INCLUDE_FONT_FIXED_5x8			GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA		GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA		GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA      GFXON
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA		GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA		GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA	GFXOFF
 
 
 #endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/fonts_cyrillic/gfxconf.h b/demos/modules/gdisp/fonts_cyrillic/gfxconf.h
index dab77ba1..359061de 100644
--- a/demos/modules/gdisp/fonts_cyrillic/gfxconf.h
+++ b/demos/modules/gdisp/fonts_cyrillic/gfxconf.h
@@ -31,26 +31,26 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX subsystems to turn on */
-#define GFX_USE_GDISP				TRUE
+#define GFX_USE_GDISP				GFXON
 
 /* Features for the GDISP subsystem */
-#define GDISP_NEED_VALIDATION		TRUE
-#define GDISP_NEED_CLIP				TRUE
-#define GDISP_NEED_TEXT				TRUE
-#define GDISP_NEED_CIRCLE			TRUE
-#define GDISP_NEED_ELLIPSE			TRUE
-#define GDISP_NEED_ANTIALIAS		TRUE
-#define GDISP_NEED_UTF8				TRUE
-#define GDISP_NEED_TEXT_KERNING		TRUE
+#define GDISP_NEED_VALIDATION		GFXON
+#define GDISP_NEED_CLIP				GFXON
+#define GDISP_NEED_TEXT				GFXON
+#define GDISP_NEED_CIRCLE			GFXON
+#define GDISP_NEED_ELLIPSE			GFXON
+#define GDISP_NEED_ANTIALIAS		GFXON
+#define GDISP_NEED_UTF8				GFXON
+#define GDISP_NEED_TEXT_KERNING		GFXON
 
 /* GDISP - fonts to include */
-#define GDISP_INCLUDE_USER_FONTS	TRUE
+#define GDISP_INCLUDE_USER_FONTS	GFXON
 
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gdisp/images/gfxconf.h b/demos/modules/gdisp/images/gfxconf.h
index 55420275..7a37b48e 100644
--- a/demos/modules/gdisp/images/gfxconf.h
+++ b/demos/modules/gdisp/images/gfxconf.h
@@ -31,30 +31,30 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GDISP			GFXON
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION		TRUE
-#define GDISP_NEED_CLIP				TRUE
-#define GDISP_NEED_IMAGE			TRUE
+#define GDISP_NEED_VALIDATION		GFXON
+#define GDISP_NEED_CLIP				GFXON
+#define GDISP_NEED_IMAGE			GFXON
 #define GDISP_STARTUP_COLOR			HTML2COLOR(0xC0C0C0)
 
 /* GDISP image decoders */
-//#define GDISP_NEED_IMAGE_NATIVE		TRUE
-//#define GDISP_NEED_IMAGE_GIF		TRUE
-#define GDISP_NEED_IMAGE_BMP		TRUE
-//#define GDISP_NEED_IMAGE_JPG		TRUE
-//#define GDISP_NEED_IMAGE_PNG		TRUE
-
-#define GFX_USE_GFILE				TRUE
-#define GFILE_NEED_ROMFS			TRUE
-//#define GFILE_NEED_NATIVEFS			TRUE
+//#define GDISP_NEED_IMAGE_NATIVE		GFXON
+//#define GDISP_NEED_IMAGE_GIF		GFXON
+#define GDISP_NEED_IMAGE_BMP		GFXON
+//#define GDISP_NEED_IMAGE_JPG		GFXON
+//#define GDISP_NEED_IMAGE_PNG		GFXON
+
+#define GFX_USE_GFILE				GFXON
+#define GFILE_NEED_ROMFS			GFXON
+//#define GFILE_NEED_NATIVEFS			GFXON
 
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gdisp/images_animated/gfxconf.h b/demos/modules/gdisp/images_animated/gfxconf.h
index fddda437..edbe126d 100644
--- a/demos/modules/gdisp/images_animated/gfxconf.h
+++ b/demos/modules/gdisp/images_animated/gfxconf.h
@@ -31,28 +31,28 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GDISP			GFXON
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION		TRUE
-#define GDISP_NEED_CLIP				TRUE
-#define GDISP_NEED_IMAGE			TRUE
+#define GDISP_NEED_VALIDATION		GFXON
+#define GDISP_NEED_CLIP				GFXON
+#define GDISP_NEED_IMAGE			GFXON
 
 /* GDISP image decoders */
-#define GDISP_NEED_IMAGE_NATIVE		FALSE
-#define GDISP_NEED_IMAGE_GIF		TRUE
-#define GDISP_NEED_IMAGE_BMP		FALSE
-#define GDISP_NEED_IMAGE_JPG		FALSE
-#define GDISP_NEED_IMAGE_PNG		FALSE
-
-#define GFX_USE_GFILE				TRUE
-#define GFILE_NEED_ROMFS			TRUE
+#define GDISP_NEED_IMAGE_NATIVE		GFXOFF
+#define GDISP_NEED_IMAGE_GIF		GFXON
+#define GDISP_NEED_IMAGE_BMP		GFXOFF
+#define GDISP_NEED_IMAGE_JPG		GFXOFF
+#define GDISP_NEED_IMAGE_PNG		GFXOFF
+
+#define GFX_USE_GFILE				GFXON
+#define GFILE_NEED_ROMFS			GFXON
 
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gdisp/images_animated/main.c b/demos/modules/gdisp/images_animated/main.c
index 039cf584..5f24c0fc 100644
--- a/demos/modules/gdisp/images_animated/main.c
+++ b/demos/modules/gdisp/images_animated/main.c
@@ -36,7 +36,7 @@
  * The ROMFS uses the file "romfs_files.h" to describe the set of files in the ROMFS.
  */
 
-#define USE_IMAGE_CACHE			FALSE						// Only if you want to get performance at the expense of RAM
+#define USE_IMAGE_CACHE			GFXOFF						// Only if you want to get performance at the expense of RAM
 #define MY_BG_COLOR				RGB2COLOR(220, 220, 255)	// Pale blue so we can see the transparent parts
 
 static gdispImage myImage;
diff --git a/demos/modules/gdisp/images_palettes/gfxconf.h b/demos/modules/gdisp/images_palettes/gfxconf.h
index a98776f5..db09cf0b 100644
--- a/demos/modules/gdisp/images_palettes/gfxconf.h
+++ b/demos/modules/gdisp/images_palettes/gfxconf.h
@@ -31,30 +31,30 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GDISP			GFXON
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION		TRUE
-#define GDISP_NEED_CLIP				TRUE
-#define GDISP_NEED_IMAGE			TRUE
+#define GDISP_NEED_VALIDATION		GFXON
+#define GDISP_NEED_CLIP				GFXON
+#define GDISP_NEED_IMAGE			GFXON
 #define GDISP_STARTUP_COLOR			HTML2COLOR(0xC0C0C0)
 
 /* GDISP image decoders */
-//#define GDISP_NEED_IMAGE_NATIVE	TRUE
-//#define GDISP_NEED_IMAGE_GIF		TRUE
-#define GDISP_NEED_IMAGE_BMP		TRUE
-//#define GDISP_NEED_IMAGE_JPG		TRUE
-//#define GDISP_NEED_IMAGE_PNG		TRUE
-
-#define GFX_USE_GFILE				TRUE
-#define GFILE_NEED_ROMFS			TRUE
-//#define GFILE_NEED_NATIVEFS			TRUE
+//#define GDISP_NEED_IMAGE_NATIVE	GFXON
+//#define GDISP_NEED_IMAGE_GIF		GFXON
+#define GDISP_NEED_IMAGE_BMP		GFXON
+//#define GDISP_NEED_IMAGE_JPG		GFXON
+//#define GDISP_NEED_IMAGE_PNG		GFXON
+
+#define GFX_USE_GFILE				GFXON
+#define GFILE_NEED_ROMFS			GFXON
+//#define GFILE_NEED_NATIVEFS			GFXON
 
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gdisp/images_palettes/main.c b/demos/modules/gdisp/images_palettes/main.c
index 7d63088b..ceb9534f 100644
--- a/demos/modules/gdisp/images_palettes/main.c
+++ b/demos/modules/gdisp/images_palettes/main.c
@@ -36,7 +36,7 @@
  * the same time there's still just one copy of the image in memory at all times.
  */
 
-#define USE_PRINTF TRUE
+#define USE_PRINTF GFXON
 
 #include "gfx.h"
 
diff --git a/demos/modules/gdisp/multiple_displays/gfxconf.h b/demos/modules/gdisp/multiple_displays/gfxconf.h
index af71500e..a07c2993 100644
--- a/demos/modules/gdisp/multiple_displays/gfxconf.h
+++ b/demos/modules/gdisp/multiple_displays/gfxconf.h
@@ -31,20 +31,20 @@
 #define _GFXCONF_H
 
 //* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GDISP			GFXON
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION	TRUE
-#define GDISP_NEED_CLIP			TRUE
-#define GDISP_NEED_TEXT			TRUE
+#define GDISP_NEED_VALIDATION	GFXON
+#define GDISP_NEED_CLIP			GFXON
+#define GDISP_NEED_TEXT			GFXON
 
-#define GDISP_INCLUDE_FONT_UI2	TRUE
+#define GDISP_INCLUDE_FONT_UI2	GFXON
 
 /* You must either define GDISP_TOTAL_DISPLAYS or GDISP_DRIVER_LIST for multiple displays.
  * You cannot define both!
@@ -66,15 +66,15 @@
  * as the program doesn't have to detect the hardware method to use on each call.
  *
  * Hardware definitions can be set to:
- * 		- TRUE		- all controllers support this routine
- * 		- FALSE		- no controllers support this routine
+ * 		- GFXON		- all controllers support this routine
+ * 		- GFXOFF	- no controllers support this routine
  * 		- if not specified then the code auto-detects the hardware.
  *
  * e.g
- * 		#define GDISP_HARDWARE_STREAM_WRITE	FALSE
- * 		#define GDISP_HARDWARE_STREAM_READ	FALSE
- * 		#define GDISP_HARDWARE_DRAWPIXEL	TRUE
- * 		#define GDISP_HARDWARE_FILLS		TRUE
+ * 		#define GDISP_HARDWARE_STREAM_WRITE	GFXOFF
+ * 		#define GDISP_HARDWARE_STREAM_READ	GFXOFF
+ * 		#define GDISP_HARDWARE_DRAWPIXEL	GFXON
+ * 		#define GDISP_HARDWARE_FILLS		GFXON
  */
 #if GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX
 	// Emulator
@@ -90,8 +90,8 @@
 /*
  * The following are needed only for the sprintg() call
  */
-#define GFX_USE_GFILE						TRUE
-#define GFILE_NEED_PRINTG					TRUE
-#define GFILE_NEED_STRINGS					TRUE
+#define GFX_USE_GFILE						GFXON
+#define GFILE_NEED_PRINTG					GFXON
+#define GFILE_NEED_STRINGS					GFXON
 
 #endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/multiple_displays/main.c b/demos/modules/gdisp/multiple_displays/main.c
index 0a474d0f..8c590f6d 100644
--- a/demos/modules/gdisp/multiple_displays/main.c
+++ b/demos/modules/gdisp/multiple_displays/main.c
@@ -41,7 +41,7 @@
  * and method 1 for any extra displays.
  */
 
-#define USE_METHOD_1		FALSE
+#define USE_METHOD_1		GFXOFF
 
 #if USE_METHOD_1
 	int main(void) {
diff --git a/demos/modules/gdisp/pixmap/gfxconf.h b/demos/modules/gdisp/pixmap/gfxconf.h
index ddd7d1ec..122caec2 100644
--- a/demos/modules/gdisp/pixmap/gfxconf.h
+++ b/demos/modules/gdisp/pixmap/gfxconf.h
@@ -31,18 +31,18 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GDISP			GFXON
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION	TRUE
-#define GDISP_NEED_CLIP			TRUE
-#define GDISP_NEED_PIXMAP		TRUE
+#define GDISP_NEED_VALIDATION	GFXON
+#define GDISP_NEED_CLIP			GFXON
+#define GDISP_NEED_PIXMAP		GFXON
 
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gdisp/polygons/gfxconf.h b/demos/modules/gdisp/polygons/gfxconf.h
index 51170ecc..d0388c34 100644
--- a/demos/modules/gdisp/polygons/gfxconf.h
+++ b/demos/modules/gdisp/polygons/gfxconf.h
@@ -31,19 +31,19 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
-#define GFX_USE_GMISC           TRUE
+#define GFX_USE_GDISP			GFXON
+#define GFX_USE_GMISC           GFXON
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION	TRUE
-#define GDISP_NEED_CLIP			TRUE
-#define GDISP_NEED_CONVEX_POLYGON TRUE
+#define GDISP_NEED_VALIDATION	GFXON
+#define GDISP_NEED_CLIP			GFXON
+#define GDISP_NEED_CONVEX_POLYGON GFXON
 
 /* For this demo define either:
  * 		GMISC_NEED_MATRIXFLOAT2D		to use floating point math operations
@@ -56,11 +56,11 @@
  * If you choose fixed point you MUST define GMISC_NEED_FIXEDTRIG for this demo.
  */
 
-//#define GMISC_NEED_FASTTRIG                          TRUE
-//#define GMISC_NEED_MATRIXFLOAT2D                     TRUE
+//#define GMISC_NEED_FASTTRIG                          GFXON
+//#define GMISC_NEED_MATRIXFLOAT2D                     GFXON
 
-#define GMISC_NEED_FIXEDTRIG                         TRUE
-#define GMISC_NEED_MATRIXFIXED2D                     TRUE
+#define GMISC_NEED_FIXEDTRIG                         GFXON
+#define GMISC_NEED_MATRIXFIXED2D                     GFXON
 
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gdisp/streaming/gfxconf.h b/demos/modules/gdisp/streaming/gfxconf.h
index 82843184..6d83defe 100644
--- a/demos/modules/gdisp/streaming/gfxconf.h
+++ b/demos/modules/gdisp/streaming/gfxconf.h
@@ -10,22 +10,22 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
-#define GFX_USE_GMISC			TRUE
+#define GFX_USE_GDISP			GFXON
+#define GFX_USE_GMISC			GFXON
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION	TRUE
-#define GDISP_NEED_STREAMING	TRUE
+#define GDISP_NEED_VALIDATION	GFXON
+#define GDISP_NEED_STREAMING	GFXON
 
-#define GFX_USE_GMISC				TRUE
-#define GMISC_NEED_INVSQRT			TRUE
-//#define GMISC_INVSQRT_MIXED_ENDIAN	TRUE
-//#define GMISC_INVSQRT_REAL_SLOW		TRUE
+#define GFX_USE_GMISC				GFXON
+#define GMISC_NEED_INVSQRT			GFXON
+//#define GMISC_INVSQRT_MIXED_ENDIAN	GFXON
+//#define GMISC_INVSQRT_REAL_SLOW		GFXON
 
 #endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/streaming/main.c b/demos/modules/gdisp/streaming/main.c
index 33b69c91..be94608f 100644
--- a/demos/modules/gdisp/streaming/main.c
+++ b/demos/modules/gdisp/streaming/main.c
@@ -42,11 +42,11 @@
  * your processor.
  *
  * You can modify the implementation of invsqrt() by firstly defining
- * 		#define GMISC_INVSQRT_MIXED_ENDIAN	TRUE
+ * 		#define GMISC_INVSQRT_MIXED_ENDIAN	GFXON
  * in your gfxconf.h file.
  *
  * If it still doesn't work then instead define
- * 		#define GMISC_INVSQRT_REAL_SLOW		TRUE
+ * 		#define GMISC_INVSQRT_REAL_SLOW		GFXON
  * in your gfxconf.h file. This should always work although it will probably be slow.
  */
 #define BALLCOLOR1		Red
diff --git a/demos/modules/gdisp/thickarcs/gfxconf.h b/demos/modules/gdisp/thickarcs/gfxconf.h
index 50e3092e..e81b5e06 100644
--- a/demos/modules/gdisp/thickarcs/gfxconf.h
+++ b/demos/modules/gdisp/thickarcs/gfxconf.h
@@ -31,17 +31,17 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GDISP			GFXON
 
 /* Features for the GDISP subsystem. */
-#define GDISP_NEED_VALIDATION	TRUE
-#define GDISP_NEED_ARC			TRUE
+#define GDISP_NEED_VALIDATION	GFXON
+#define GDISP_NEED_ARC			GFXON
 
 
 #endif /* _GFXCONF_H */