diff --git a/NTMakefile b/NTMakefile
index 63a4a2c9d..c0fc4b069 100644
--- a/NTMakefile
+++ b/NTMakefile
@@ -5,6 +5,7 @@ MW_CFLAGS =  /Iinclude /Iexternal\libz\include /D_MILSKO /D_MILSKO_BUILD /DUSE_G
 MW_LDFLAGS = /DLL
 EXE_CFLAGS = /Iinclude
 EXE_LDFLAGS = 
+
 .SUFFIXES: .obj .c
 all: src\Mw.dll examples\basic\box.exe examples\basic\calculator.exe examples\basic\checkbox.exe examples\basic\clipboard.exe examples\basic\colorpicker.exe examples\basic\combobox.exe examples\basic\example.exe examples\basic\filechooser.exe examples\basic\image.exe examples\basic\listbox.exe examples\basic\messagebox.exe examples\basic\periodic.exe examples\basic\progressbar.exe examples\basic\radiobox.exe examples\basic\rotate.exe examples\basic\scrollbar.exe examples\basic\sevensegment.exe examples\basic\subwindow.exe examples\basic\tab.exe examples\basic\treeview.exe examples\basic\viewport.exe examples\gldemos\boing.exe examples\gldemos\clock.exe examples\gldemos\cube.exe examples\gldemos\gears.exe examples\gldemos\triangle.exe examples\gldemos\tripaint.exe
 lib: src\Mw.dll
diff --git a/WatMakefile b/WatMakefile
index 480f38fe5..504abeefb 100644
--- a/WatMakefile
+++ b/WatMakefile
@@ -3,16 +3,15 @@ CC = wcc386 -bt=nt -q
 !else
 CC = wcc -bt=windows -q
 !endif
-
 LD = wlink option quiet
 
-EXE_CFLAGS = -i=include
 !ifndef %mw16
-MW_CFLAGS = -bd -i=include -i=external/libz/include -d_MILSKO -d_MILSKO_BUILD -dUSE_GDI -dUSE_STB_TRUETYPE -dUSE_STB_IMAGE -dSTBI_NO_SIMD -dMW_OPENGL
+MW_CFLAGS = -bd -i=include -i=external/libz/include -d_MILSKO -d_MILSKO_BUILD -dUSE_GDI -dUSE_STB_IMAGE -dSTBI_NO_SIMD -dUSE_GDI_TEXT -dMW_OPENGL
 MW_LDFLAGS = system nt_dll
+EXE_CFLAGS = -i=include
 EXE_LDFLAGS = system nt
 !else
-MW_CFLAGS = -bd -i=include -i=external/libz/include -d_MILSKO -d_MILSKO_BUILD -dUSE_GDI -dSTBI_NO_SIMD -dNO_IMAGE
+MW_CFLAGS = -bd -i=include -i=external/libz/include -d_MILSKO -d_MILSKO_BUILD -dUSE_GDI -dSTBI_NO_SIMD -dNO_IMAGE -dMW_16
 MW_LDFLAGS = system windows_dll
 EXE_LDFLAGS = system windows
 !endif
@@ -82,8 +81,10 @@ clean: .SYMBOLIC
 	%erase src/text/font/monottf.obj
 	%erase src/text/font/ttf.obj
 	%erase src/text/ft2.obj
+	%erase src/text/gdi.obj
 	%erase src/text/stbtt.obj
 	%erase src/text/text.obj
+	%erase src/truetype.obj
 	%erase src/unicode.obj
 	%erase src/widget/box.obj
 	%erase src/widget/button.obj
@@ -292,7 +293,6 @@ examples/basic/viewport.exe: examples/basic/viewport.obj src/Mw.dll
 examples/basic/viewport.obj: examples/basic/viewport.c
 	$(CC) $(EXE_CFLAGS) -fo=$@ examples/basic/viewport.c
 
-!ifndef %mw16
 examples/gldemos/boing.exe: examples/gldemos/boing.obj src/Mw.dll
 	$(LD) $(EXE_LDFLAGS) name $@ file examples/gldemos/boing.obj library clib3r.lib library src/Mw.lib library opengl32.lib library glu32.lib
 
@@ -328,15 +328,17 @@ examples/gldemos/tripaint.exe: examples/gldemos/tripaint.obj src/Mw.dll
 
 examples/gldemos/tripaint.obj: examples/gldemos/tripaint.c
 	$(CC) $(EXE_CFLAGS) -fo=$@ examples/gldemos/tripaint.c
-!endif
+
 
 !ifndef %mw16
-src/Mw.dll:  external/libz/src/adler32.obj external/libz/src/compress.obj external/libz/src/crc32.obj external/libz/src/deflate.obj external/libz/src/gzclose.obj external/libz/src/gzlib.obj external/libz/src/gzread.obj external/libz/src/gzwrite.obj external/libz/src/infback.obj external/libz/src/inffast.obj external/libz/src/inflate.obj external/libz/src/inftrees.obj external/libz/src/trees.obj external/libz/src/uncompr.obj external/libz/src/zutil.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/abstract/charset.obj src/abstract/directory.obj src/abstract/dynamic.obj src/abstract/time.obj src/backend/gdi.obj src/color.obj src/core.obj src/cursor/arrow.obj src/cursor/cross.obj src/cursor/default.obj src/cursor/hidden.obj src/cursor/text.obj src/default.obj src/dialog/colorpicker.obj src/dialog/directorychooser.obj src/dialog/filechooser.obj src/dialog/messagebox.obj src/draw.obj src/icon/back.obj src/icon/clock.obj src/icon/computer.obj src/icon/directory.obj src/icon/down.obj src/icon/error.obj src/icon/file.obj src/icon/forward.obj src/icon/info.obj src/icon/left.obj src/icon/news.obj src/icon/note.obj src/icon/right.obj src/icon/search.obj src/icon/up.obj src/icon/warning.obj src/lowlevel.obj src/string.obj src/text/font/boldfont.obj src/text/font/boldmonottf.obj src/text/font/boldttf.obj src/text/font/font.obj src/text/font/monottf.obj src/text/font/ttf.obj src/text/ft2.obj src/text/stbtt.obj src/text/text.obj src/unicode.obj src/widget/box.obj src/widget/button.obj src/widget/calendar.obj src/widget/checkbox.obj src/widget/combobox.obj src/widget/entry.obj src/widget/frame.obj src/widget/image.obj src/widget/label.obj src/widget/listbox.obj src/widget/menu.obj src/widget/numberentry.obj src/widget/opengl.obj src/widget/progressbar.obj src/widget/radiobox.obj src/widget/scrollbar.obj src/widget/separator.obj src/widget/submenu.obj src/widget/subwindow.obj src/widget/tab.obj src/widget/table.obj src/widget/treeview.obj src/widget/viewport.obj src/widget/window.obj
-	$(LD) $(MW_LDFLAGS) option implib=src/Mw.lib name $@  file external/libz/src/adler32.obj file external/libz/src/compress.obj file external/libz/src/crc32.obj file external/libz/src/deflate.obj file external/libz/src/gzclose.obj file external/libz/src/gzlib.obj file external/libz/src/gzread.obj file external/libz/src/gzwrite.obj file external/libz/src/infback.obj file external/libz/src/inffast.obj file external/libz/src/inflate.obj file external/libz/src/inftrees.obj file external/libz/src/trees.obj file external/libz/src/uncompr.obj file external/libz/src/zutil.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/abstract/charset.obj file src/abstract/directory.obj file src/abstract/dynamic.obj file src/abstract/time.obj file src/backend/gdi.obj file src/color.obj file src/core.obj file src/cursor/arrow.obj file src/cursor/cross.obj file src/cursor/default.obj file src/cursor/hidden.obj file src/cursor/text.obj file src/default.obj file src/dialog/colorpicker.obj file src/dialog/directorychooser.obj file src/dialog/filechooser.obj file src/dialog/messagebox.obj file src/draw.obj file src/icon/back.obj file src/icon/clock.obj file src/icon/computer.obj file src/icon/directory.obj file src/icon/down.obj file src/icon/error.obj file src/icon/file.obj file src/icon/forward.obj file src/icon/info.obj file src/icon/left.obj file src/icon/news.obj file src/icon/note.obj file src/icon/right.obj file src/icon/search.obj file src/icon/up.obj file src/icon/warning.obj file src/lowlevel.obj file src/string.obj file src/text/font/boldfont.obj file src/text/font/boldmonottf.obj file src/text/font/boldttf.obj file src/text/font/font.obj file src/text/font/monottf.obj file src/text/font/ttf.obj file src/text/ft2.obj file src/text/stbtt.obj file src/text/text.obj file src/unicode.obj file src/widget/box.obj file src/widget/button.obj file src/widget/calendar.obj file src/widget/checkbox.obj file src/widget/combobox.obj file src/widget/entry.obj file src/widget/frame.obj file src/widget/image.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/menu.obj file src/widget/numberentry.obj file src/widget/opengl.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/widget/scrollbar.obj file src/widget/separator.obj file src/widget/submenu.obj file src/widget/subwindow.obj file src/widget/tab.obj file src/widget/table.obj file src/widget/treeview.obj file src/widget/viewport.obj file src/widget/window.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib library advapi32.lib
+src/Mw.dll:  external/libz/src/adler32.obj external/libz/src/compress.obj external/libz/src/crc32.obj external/libz/src/deflate.obj external/libz/src/gzclose.obj external/libz/src/gzlib.obj external/libz/src/gzread.obj external/libz/src/gzwrite.obj external/libz/src/infback.obj external/libz/src/inffast.obj external/libz/src/inflate.obj external/libz/src/inftrees.obj external/libz/src/trees.obj external/libz/src/uncompr.obj external/libz/src/zutil.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/abstract/charset.obj src/abstract/directory.obj src/abstract/dynamic.obj src/abstract/time.obj src/backend/gdi.obj src/color.obj src/core.obj src/cursor/arrow.obj src/cursor/cross.obj src/cursor/default.obj src/cursor/hidden.obj src/cursor/text.obj src/default.obj src/dialog/colorpicker.obj src/dialog/directorychooser.obj src/dialog/filechooser.obj src/dialog/messagebox.obj src/draw.obj src/icon/back.obj src/icon/clock.obj src/icon/computer.obj src/icon/directory.obj src/icon/down.obj src/icon/error.obj src/icon/file.obj src/icon/forward.obj src/icon/info.obj src/icon/left.obj src/icon/news.obj src/icon/note.obj src/icon/right.obj src/icon/search.obj src/icon/up.obj src/icon/warning.obj src/lowlevel.obj src/string.obj src/text/font/boldfont.obj src/text/font/boldmonottf.obj src/text/font/boldttf.obj src/text/font/font.obj src/text/font/monottf.obj src/text/font/ttf.obj src/text/ft2.obj src/text/gdi.obj src/text/stbtt.obj src/text/text.obj src/truetype.obj src/unicode.obj src/widget/box.obj src/widget/button.obj src/widget/calendar.obj src/widget/checkbox.obj src/widget/combobox.obj src/widget/entry.obj src/widget/frame.obj src/widget/image.obj src/widget/label.obj src/widget/listbox.obj src/widget/menu.obj src/widget/numberentry.obj src/widget/opengl.obj src/widget/progressbar.obj src/widget/radiobox.obj src/widget/scrollbar.obj src/widget/separator.obj src/widget/submenu.obj src/widget/subwindow.obj src/widget/tab.obj src/widget/table.obj src/widget/treeview.obj src/widget/viewport.obj src/widget/window.obj
+	$(LD) $(MW_LDFLAGS) option implib=src/Mw.lib name $@  file external/libz/src/adler32.obj file external/libz/src/compress.obj file external/libz/src/crc32.obj file external/libz/src/deflate.obj file external/libz/src/gzclose.obj file external/libz/src/gzlib.obj file external/libz/src/gzread.obj file external/libz/src/gzwrite.obj file external/libz/src/infback.obj file external/libz/src/inffast.obj file external/libz/src/inflate.obj file external/libz/src/inftrees.obj file external/libz/src/trees.obj file external/libz/src/uncompr.obj file external/libz/src/zutil.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/abstract/charset.obj file src/abstract/directory.obj file src/abstract/dynamic.obj file src/abstract/time.obj file src/backend/gdi.obj file src/color.obj file src/core.obj file src/cursor/arrow.obj file src/cursor/cross.obj file src/cursor/default.obj file src/cursor/hidden.obj file src/cursor/text.obj file src/default.obj file src/dialog/colorpicker.obj file src/dialog/directorychooser.obj file src/dialog/filechooser.obj file src/dialog/messagebox.obj file src/draw.obj file src/icon/back.obj file src/icon/clock.obj file src/icon/computer.obj file src/icon/directory.obj file src/icon/down.obj file src/icon/error.obj file src/icon/file.obj file src/icon/forward.obj file src/icon/info.obj file src/icon/left.obj file src/icon/news.obj file src/icon/note.obj file src/icon/right.obj file src/icon/search.obj file src/icon/up.obj file src/icon/warning.obj file src/lowlevel.obj file src/string.obj file src/text/font/boldfont.obj file src/text/font/boldmonottf.obj file src/text/font/boldttf.obj file src/text/font/font.obj file src/text/font/monottf.obj file src/text/font/ttf.obj file src/text/ft2.obj file src/text/gdi.obj file src/text/stbtt.obj file src/text/text.obj file src/truetype.obj file src/unicode.obj file src/widget/box.obj file src/widget/button.obj file src/widget/calendar.obj file src/widget/checkbox.obj file src/widget/combobox.obj file src/widget/entry.obj file src/widget/frame.obj file src/widget/image.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/menu.obj file src/widget/numberentry.obj file src/widget/opengl.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/widget/scrollbar.obj file src/widget/separator.obj file src/widget/submenu.obj file src/widget/subwindow.obj file src/widget/tab.obj file src/widget/table.obj file src/widget/treeview.obj file src/widget/viewport.obj file src/widget/window.obj library clib3r.lib library opengl32.lib library gdi32.lib library ole32.lib library uuid.lib library user32.lib library advapi32.lib
 !else
-src/Mw.dll:  external/libz/src/adler32.obj external/libz/src/compress.obj external/libz/src/crc32.obj external/libz/src/deflate.obj external/libz/src/gzclose.obj external/libz/src/gzlib.obj external/libz/src/gzread.obj external/libz/src/gzwrite.obj external/libz/src/infback.obj external/libz/src/inffast.obj external/libz/src/inflate.obj external/libz/src/inftrees.obj external/libz/src/trees.obj external/libz/src/uncompr.obj external/libz/src/zutil.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/abstract/charset.obj src/abstract/directory.obj src/abstract/dynamic.obj src/abstract/time.obj src/backend/gdi.obj src/color.obj src/core.obj src/cursor/arrow.obj src/cursor/cross.obj src/cursor/default.obj src/cursor/hidden.obj src/cursor/text.obj src/default.obj src/dialog/colorpicker.obj src/dialog/directorychooser.obj src/dialog/filechooser.obj src/dialog/messagebox.obj src/draw.obj src/icon/back.obj src/icon/clock.obj src/icon/computer.obj src/icon/directory.obj src/icon/down.obj src/icon/error.obj src/icon/file.obj src/icon/forward.obj src/icon/info.obj src/icon/left.obj src/icon/news.obj src/icon/note.obj src/icon/right.obj src/icon/search.obj src/icon/up.obj src/icon/warning.obj src/lowlevel.obj src/string.obj src/text/font/boldfont.obj src/text/font/boldmonottf.obj src/text/font/boldttf.obj src/text/font/font.obj src/text/font/monottf.obj src/text/font/ttf.obj src/text/ft2.obj src/text/stbtt.obj src/text/text.obj src/unicode.obj src/widget/box.obj src/widget/button.obj src/widget/calendar.obj src/widget/checkbox.obj src/widget/combobox.obj src/widget/entry.obj src/widget/frame.obj src/widget/image.obj src/widget/label.obj src/widget/listbox.obj src/widget/menu.obj src/widget/numberentry.obj src/widget/progressbar.obj src/widget/radiobox.obj src/widget/scrollbar.obj src/widget/separator.obj src/widget/submenu.obj src/widget/subwindow.obj src/widget/tab.obj src/widget/table.obj src/widget/treeview.obj src/widget/viewport.obj src/widget/window.obj
-	$(LD) $(MW_LDFLAGS) option implib=src/Mw.lib name $@  file external/libz/src/adler32.obj file external/libz/src/compress.obj file external/libz/src/crc32.obj file external/libz/src/deflate.obj file external/libz/src/gzclose.obj file external/libz/src/gzlib.obj file external/libz/src/gzread.obj file external/libz/src/gzwrite.obj file external/libz/src/infback.obj file external/libz/src/inffast.obj file external/libz/src/inflate.obj file external/libz/src/inftrees.obj file external/libz/src/trees.obj file external/libz/src/uncompr.obj file external/libz/src/zutil.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/abstract/charset.obj file src/abstract/directory.obj file src/abstract/dynamic.obj file src/abstract/time.obj file src/backend/gdi.obj file src/color.obj file src/core.obj file src/cursor/arrow.obj file src/cursor/cross.obj file src/cursor/default.obj file src/cursor/hidden.obj file src/cursor/text.obj file src/default.obj file src/dialog/colorpicker.obj file src/dialog/directorychooser.obj file src/dialog/filechooser.obj file src/dialog/messagebox.obj file src/draw.obj file src/icon/back.obj file src/icon/clock.obj file src/icon/computer.obj file src/icon/directory.obj file src/icon/down.obj file src/icon/error.obj file src/icon/file.obj file src/icon/forward.obj file src/icon/info.obj file src/icon/left.obj file src/icon/news.obj file src/icon/note.obj file src/icon/right.obj file src/icon/search.obj file src/icon/up.obj file src/icon/warning.obj file src/lowlevel.obj file src/string.obj file src/text/font/boldfont.obj file src/text/font/boldmonottf.obj file src/text/font/boldttf.obj file src/text/font/font.obj file src/text/font/monottf.obj file src/text/font/ttf.obj file src/text/ft2.obj file src/text/stbtt.obj file src/text/text.obj file src/unicode.obj file src/widget/box.obj file src/widget/button.obj file src/widget/calendar.obj file src/widget/checkbox.obj file src/widget/combobox.obj file src/widget/entry.obj file src/widget/frame.obj file src/widget/image.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/menu.obj file src/widget/numberentry.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/widget/scrollbar.obj file src/widget/separator.obj file src/widget/submenu.obj file src/widget/subwindow.obj file src/widget/tab.obj file src/widget/table.obj file src/widget/treeview.obj file src/widget/viewport.obj file src/widget/window.obj library clibs.lib
+src/Mw.dll:  external/libz/src/adler32.obj external/libz/src/compress.obj external/libz/src/crc32.obj external/libz/src/deflate.obj external/libz/src/gzclose.obj external/libz/src/gzlib.obj external/libz/src/gzread.obj external/libz/src/gzwrite.obj external/libz/src/infback.obj external/libz/src/inffast.obj external/libz/src/inflate.obj external/libz/src/inftrees.obj external/libz/src/trees.obj external/libz/src/uncompr.obj external/libz/src/zutil.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/abstract/charset.obj src/abstract/directory.obj src/abstract/dynamic.obj src/abstract/time.obj src/backend/gdi.obj src/color.obj src/core.obj src/cursor/arrow.obj src/cursor/cross.obj src/cursor/default.obj src/cursor/hidden.obj src/cursor/text.obj src/default.obj src/dialog/colorpicker.obj src/dialog/directorychooser.obj src/dialog/filechooser.obj src/dialog/messagebox.obj src/draw.obj src/icon/back.obj src/icon/clock.obj src/icon/computer.obj src/icon/directory.obj src/icon/down.obj src/icon/error.obj src/icon/file.obj src/icon/forward.obj src/icon/info.obj src/icon/left.obj src/icon/news.obj src/icon/note.obj src/icon/right.obj src/icon/search.obj src/icon/up.obj src/icon/warning.obj src/lowlevel.obj src/string.obj src/text/font/boldfont.obj src/text/font/boldmonottf.obj src/text/font/boldttf.obj src/text/font/font.obj src/text/font/monottf.obj src/text/font/ttf.obj src/text/ft2.obj src/text/gdi.obj src/text/stbtt.obj src/text/text.obj src/truetype.obj src/unicode.obj src/widget/box.obj src/widget/button.obj src/widget/calendar.obj src/widget/checkbox.obj src/widget/combobox.obj src/widget/entry.obj src/widget/frame.obj src/widget/image.obj src/widget/label.obj src/widget/listbox.obj src/widget/menu.obj src/widget/numberentry.obj src/widget/opengl.obj src/widget/progressbar.obj src/widget/radiobox.obj src/widget/scrollbar.obj src/widget/separator.obj src/widget/submenu.obj src/widget/subwindow.obj src/widget/tab.obj src/widget/table.obj src/widget/treeview.obj src/widget/viewport.obj src/widget/window.obj
+	$(LD) $(MW_LDFLAGS) option implib=src/Mw.lib name $@  file external/libz/src/adler32.obj file external/libz/src/compress.obj file external/libz/src/crc32.obj file external/libz/src/deflate.obj file external/libz/src/gzclose.obj file external/libz/src/gzlib.obj file external/libz/src/gzread.obj file external/libz/src/gzwrite.obj file external/libz/src/infback.obj file external/libz/src/inffast.obj file external/libz/src/inflate.obj file external/libz/src/inftrees.obj file external/libz/src/trees.obj file external/libz/src/uncompr.obj file external/libz/src/zutil.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/abstract/charset.obj file src/abstract/directory.obj file src/abstract/dynamic.obj file src/abstract/time.obj file src/backend/gdi.obj file src/color.obj file src/core.obj file src/cursor/arrow.obj file src/cursor/cross.obj file src/cursor/default.obj file src/cursor/hidden.obj file src/cursor/text.obj file src/default.obj file src/dialog/colorpicker.obj file src/dialog/directorychooser.obj file src/dialog/filechooser.obj file src/dialog/messagebox.obj file src/draw.obj file src/icon/back.obj file src/icon/clock.obj file src/icon/computer.obj file src/icon/directory.obj file src/icon/down.obj file src/icon/error.obj file src/icon/file.obj file src/icon/forward.obj file src/icon/info.obj file src/icon/left.obj file src/icon/news.obj file src/icon/note.obj file src/icon/right.obj file src/icon/search.obj file src/icon/up.obj file src/icon/warning.obj file src/lowlevel.obj file src/string.obj file src/text/font/boldfont.obj file src/text/font/boldmonottf.obj file src/text/font/boldttf.obj file src/text/font/font.obj file src/text/font/monottf.obj file src/text/font/ttf.obj file src/text/ft2.obj file src/text/gdi.obj file src/text/stbtt.obj file src/text/text.obj file src/truetype.obj file src/unicode.obj file src/widget/box.obj file src/widget/button.obj file src/widget/calendar.obj file src/widget/checkbox.obj file src/widget/combobox.obj file src/widget/entry.obj file src/widget/frame.obj file src/widget/image.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/menu.obj file src/widget/numberentry.obj file src/widget/opengl.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/widget/scrollbar.obj file src/widget/separator.obj file src/widget/submenu.obj file src/widget/subwindow.obj file src/widget/tab.obj file src/widget/table.obj file src/widget/treeview.obj file src/widget/viewport.obj file src/widget/window.obj library clib3r.lib library clibs.lib
+
 !endif
+	
 
 
 external/libz/src/adler32.obj: external/libz/src/adler32.c
@@ -461,10 +463,14 @@ src/text/font/ttf.obj: src/text/font/ttf.c
 	$(CC) $(MW_CFLAGS) -fo=$@ src/text/font/ttf.c
 src/text/ft2.obj: src/text/ft2.c
 	$(CC) $(MW_CFLAGS) -fo=$@ src/text/ft2.c
+src/text/gdi.obj: src/text/gdi.c
+	$(CC) $(MW_CFLAGS) -fo=$@ src/text/gdi.c
 src/text/stbtt.obj: src/text/stbtt.c
 	$(CC) $(MW_CFLAGS) -fo=$@ src/text/stbtt.c
 src/text/text.obj: src/text/text.c
 	$(CC) $(MW_CFLAGS) -fo=$@ src/text/text.c
+src/truetype.obj: src/truetype.c
+	$(CC) $(MW_CFLAGS) -fo=$@ src/truetype.c
 src/unicode.obj: src/unicode.c
 	$(CC) $(MW_CFLAGS) -fo=$@ src/unicode.c
 src/widget/box.obj: src/widget/box.c
@@ -491,10 +497,8 @@ src/widget/menu.obj: src/widget/menu.c
 	$(CC) $(MW_CFLAGS) -fo=$@ src/widget/menu.c
 src/widget/numberentry.obj: src/widget/numberentry.c
 	$(CC) $(MW_CFLAGS) -fo=$@ src/widget/numberentry.c
-!ifndef %mw16
 src/widget/opengl.obj: src/widget/opengl.c
 	$(CC) $(MW_CFLAGS) -fo=$@ src/widget/opengl.c
-!endif
 src/widget/progressbar.obj: src/widget/progressbar.c
 	$(CC) $(MW_CFLAGS) -fo=$@ src/widget/progressbar.c
 src/widget/radiobox.obj: src/widget/radiobox.c
diff --git a/examples/basic/colorpicker.c b/examples/basic/colorpicker.c
index 65f507ed4..1a5f423ee 100644
--- a/examples/basic/colorpicker.c
+++ b/examples/basic/colorpicker.c
@@ -4,14 +4,14 @@ MwWidget fpicker;
 MwWidget window;
 
 /* This example does nothing on Win16 because we don't support the color picker on it (yet?) */
-#ifdef __WINDOWS__
+#ifdef MW_16
 MwWidget missing_text;
 #else
 MwWidget button;
 #endif
 
-/* don't bother with color picker on win16 */
-#ifndef __WINDOWS__
+/* don't bother with color picker on 16-bit */
+#ifndef MW_16
 void MWAPI file_callback(MwWidget handle, void* user_data, void* call_data) {
 	char   hexColor[8];
 	MwRGB* rgb = call_data;
@@ -46,7 +46,7 @@ int main() {
 				  MwDEFAULT, 640, 480, MwNtitle, "color picker", NULL);
 	MwSetText(window, MwNbackground, MwGetInteger(window, MwNdarkTheme) ? MwDefaultBackground : MwDefaultDarkBackground);
 
-#ifndef __WINDOWS__
+#ifndef MW_16
 	button = MwVaCreateWidget(MwButtonClass, "button", window, 160, 180, 320, 120,
 				  MwNtext, "change window background",
 				  NULL);
diff --git a/external/stb_ds.h b/external/stb_ds.h
index 41c1343d0..c58b00f62 100644
--- a/external/stb_ds.h
+++ b/external/stb_ds.h
@@ -1647,7 +1647,7 @@ typedef struct {
 
 static char buffer[256];
 char*	    strkey(int n) {
-#if defined(_WIN32) || defined(__WINDOWS__) && defined(__STDC_WANT_SECURE_LIB__)
+#if defined(_WIN32) && defined(__STDC_WANT_SECURE_LIB__)
 	sprintf_s(buffer, sizeof(buffer), "test_%d", n);
 #else
 	sprintf(buffer, "test_%d", n);
diff --git a/external/stb_image.h b/external/stb_image.h
index d4fe98fc1..4f2839c23 100644
--- a/external/stb_image.h
+++ b/external/stb_image.h
@@ -1275,12 +1275,12 @@ static void stbi__float_postprocess(float* result, int* x, int* y, int* comp, in
 
 #ifndef STBI_NO_STDIO
 
-#if defined(_WIN32) || defined(__WINDOWS__) && defined(STBI_WINDOWS_UTF8)
+#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8)
 STBI_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char* str, int cbmb, wchar_t* widestr, int cchwide);
 STBI_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t* widestr, int cchwide, char* str, int cbmb, const char* defchar, int* used_default);
 #endif
 
-#if defined(_WIN32) || defined(__WINDOWS__) && defined(STBI_WINDOWS_UTF8)
+#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8)
 STBIDEF int stbi_convert_wchar_to_utf8(char* buffer, size_t bufferlen, const wchar_t* input) {
 	return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int)bufferlen, NULL, NULL);
 }
@@ -1288,7 +1288,7 @@ STBIDEF int stbi_convert_wchar_to_utf8(char* buffer, size_t bufferlen, const wch
 
 static FILE* stbi__fopen(char const* filename, char const* mode) {
 	FILE* f;
-#if defined(_WIN32) || defined(__WINDOWS__) && defined(STBI_WINDOWS_UTF8)
+#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8)
 	wchar_t wMode[64];
 	wchar_t wFilename[1024];
 	if(0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename) / sizeof(*wFilename)))
diff --git a/include/Mw/BaseTypes.h b/include/Mw/BaseTypes.h
index 527dcdecb..a89e5551c 100644
--- a/include/Mw/BaseTypes.h
+++ b/include/Mw/BaseTypes.h
@@ -49,7 +49,7 @@ typedef __int8		MwI8;
 typedef unsigned __int8 MwU8;
 
 #define MW_OTHER_TYPES_DEFINED
-#elif defined(__WINDOWS__)
+#elif defined(MW_16)
 typedef long long	   MwI64;
 typedef unsigned long long MwU64;
 #else
@@ -61,7 +61,7 @@ typedef unsigned long MwU64;
 #ifdef MW_OTHER_TYPES_DEFINED
 #undef MW_OTHER_TYPES_DEFINED
 #else
-#ifdef __WINDOWS__
+#ifdef MW_16
 typedef long	      MwI32;
 typedef unsigned long MwU32;
 
diff --git a/include/Mw/Constants.h b/include/Mw/Constants.h
index 8a9db9e14..514ec21f1 100644
--- a/include/Mw/Constants.h
+++ b/include/Mw/Constants.h
@@ -35,7 +35,7 @@ enum MwALIGNMENT {
 /*!
  * @brief Default
  */
-#ifdef __WINDOWS__
+#ifdef MW_16
 #define MwDEFAULT 0x0ffff
 #else
 #define MwDEFAULT 0x0fffffff
diff --git a/include/Mw/Dialog/ColorPicker.h b/include/Mw/Dialog/ColorPicker.h
index 1a574b282..fdbca92cd 100644
--- a/include/Mw/Dialog/ColorPicker.h
+++ b/include/Mw/Dialog/ColorPicker.h
@@ -12,8 +12,8 @@
 extern "C" {
 #endif
 
-#ifdef __WINDOWS__
-#error Color Picker Widget is not avaliable on Win16
+#ifdef MW_16
+#error Color Picker Widget is not avaliable on 16-bit platforms
 #else
 /*!
  * @brief Creates a color picker
diff --git a/include/Mw/Draw.h b/include/Mw/Draw.h
index a88ae59a8..deefe0fce 100644
--- a/include/Mw/Draw.h
+++ b/include/Mw/Draw.h
@@ -162,7 +162,6 @@ MWDECL unsigned char* MWAPI MwPixmapGetRaw(MwLLPixmap pixmap);
  */
 MWDECL void MWAPI MwPixmapGetSize(MwLLPixmap pixmap, MwRect* rect);
 
-#ifndef __WINDOWS__
 /*!
  * @brief Creates a pixmap from XPM data
  * @param handle Widget
@@ -170,7 +169,6 @@ MWDECL void MWAPI MwPixmapGetSize(MwLLPixmap pixmap, MwRect* rect);
  * @return Pixmap
  */
 MWDECL MwLLPixmap MWAPI MwLoadXPM(MwWidget handle, char** data);
-#endif
 
 /*!
  * @brief Creates a pixmap from icon data
diff --git a/include/Mw/LowLevel.h b/include/Mw/LowLevel.h
index 95adad0fb..07370b5c5 100644
--- a/include/Mw/LowLevel.h
+++ b/include/Mw/LowLevel.h
@@ -343,7 +343,7 @@ MWDECL void (*MwLLRaise)(MwLL handle);
 MWDECL void (*MwLLClip)(MwLL handle, MwRect* rect);
 
 /* font renderer */
-#ifndef __WINDOWS__
+#ifndef MW_16
 MWDECL void MwFLSetup(void);
 
 #ifdef USE_FREETYPE2
diff --git a/src/core.c b/src/core.c
index 85cf12f59..dd0f67ae3 100644
--- a/src/core.c
+++ b/src/core.c
@@ -957,11 +957,7 @@ void MwSetDefault(MwWidget handle) {
 }
 
 void MwHideCursor(MwWidget handle) {
-#ifndef __WINDOWS__
 	MwLLSetCursor(handle->lowlevel, &MwCursorHidden, &MwCursorHiddenMask);
-#else
-	MwLLSetCursor(handle->lowlevel, NULL, NULL);
-#endif
 }
 
 void MwDispatchUserHandler(MwWidget handle, const char* key, void* handler_data) {
@@ -1100,7 +1096,8 @@ int MwLibraryInit(void) {
 #if defined(_WIN32) || defined(__WINDOWS__)
 	/*
 		There's no Windows configuration that Milsko supports that doesn't have winmm.
-		This could maybe be removed?
+		This could maybe be removed? However if we ever get any proof of concept working on Win2.0
+		this could be useful.
 	*/
 	MwLL_winmmLib		 = LoadLibrary("winmm.dll");
 	MwLL_PFN_timeGetTime	 = (void*)GetProcAddress(MwLL_winmmLib, "timeGetTime");
@@ -1121,7 +1118,7 @@ int MwLibraryInit(void) {
 
 	MwColorTableInit();
 
-#ifndef __WINDOWS__
+#ifndef MW_16
 	MwFLSetup();
 #endif
 
diff --git a/src/dialog/colorpicker.c b/src/dialog/colorpicker.c
index 113246ee7..a409936c3 100644
--- a/src/dialog/colorpicker.c
+++ b/src/dialog/colorpicker.c
@@ -1,6 +1,6 @@
 #include <Mw/Milsko.h>
 
-#ifndef __WINDOWS__
+#ifndef MW_16
 
 #define WIN_SIZE 464
 #define PICKER_SIZE 364
diff --git a/src/text/text.c b/src/text/text.c
index e445af61f..156caa1aa 100644
--- a/src/text/text.c
+++ b/src/text/text.c
@@ -9,7 +9,7 @@ void* (*MwFLFontLoad)(unsigned char* data, unsigned int size, int px)
 void (*MwFLFontFree)(void* handle)								       = NULL;
 #endif
 
-#if (defined(USE_FREETYPE2) || defined(USE_STB_TRUETYPE)) && !defined(__WINDOWS__)
+#if (defined(USE_FREETYPE2) || defined(USE_STB_TRUETYPE))
 #define TTF
 #endif
 
diff --git a/tools/genmk.pl b/tools/genmk.pl
index 689e09ef7..be913ea46 100755
--- a/tools/genmk.pl
+++ b/tools/genmk.pl
@@ -112,15 +112,33 @@ sub generate {
     }
 
     open(OUT, ">", $output);
-    print(OUT "CC = $cc\n");
+    if ($type eq "Watcom") {
+        print(OUT "!ifndef %mw16\n");
+        print(OUT "CC = $cc\n");
+        print(OUT "!else\n");
+        print(OUT "CC = wcc -bt=windows -q\n");
+        print(OUT "!endif\n");
+    } else {
+        print(OUT "CC = $cc\n");
+    }
     print(OUT "LD = $link\n");
     print(OUT "\n");
+    if ($type eq "Watcom") {
+        print(OUT "!ifndef %mw16\n");
+    }
     print(OUT
 "MW_CFLAGS = ${cdll} ${inc}include ${inc}external${dir}libz${dir}include ${def}_MILSKO ${def}_MILSKO_BUILD ${def}USE_GDI ${def}USE_STB_IMAGE ${def}STBI_NO_SIMD ${def}USE_GDI_TEXT ${def}MW_OPENGL\n"
     );
     print(OUT "MW_LDFLAGS = $dll\n");
     print(OUT "EXE_CFLAGS = ${inc}include\n");
-    print(OUT "EXE_LDFLAGS = $exe");
+    print(OUT "EXE_LDFLAGS = $exe\n");
+    if ($type eq "Watcom") {
+        print(OUT "!else\n");
+        print(OUT "MW_CFLAGS = -bd ${inc}include ${inc}external/libz/include ${def}_MILSKO ${def}_MILSKO_BUILD ${def}USE_GDI ${def}STBI_NO_SIMD ${def}NO_IMAGE ${def}MW_16\n");
+        print(OUT "MW_LDFLAGS = system windows_dll\n");
+        print(OUT "EXE_LDFLAGS = system windows\n");
+        print(OUT "!endif\n");
+    }
     print(OUT "\n");
 
     if ($suffix) {
@@ -187,11 +205,24 @@ sub generate {
         print(OUT "\n");
     }
     print(OUT "\n");
+    if ($type eq "Watcom") {
+        print(OUT "!ifndef %mw16\n");
+    }
     print(OUT "src${dir}Mw.dll: " . cobjs($dir) . "\n");
     print(  OUT "	\$(LD) \$(MW_LDFLAGS) $c_dllout $dllout\$@ "
           . cobjs($dir, $prefobj)
           . " $needlibs ${lib}opengl32.lib ${lib}gdi32.lib ${lib}ole32.lib ${lib}uuid.lib ${lib}user32.lib ${lib}advapi32.lib\n"
     );
+    if ($type eq "Watcom") {
+        print(OUT "!else\n");
+        print(OUT "src${dir}Mw.dll: " . cobjs($dir) . "\n");
+        print(  OUT "	\$(LD) \$(MW_LDFLAGS) $c_dllout $dllout\$@ "
+              . cobjs($dir, $prefobj)
+              . " $needlibs ${lib}clibs.lib\n"
+        );
+        print(OUT "\n");
+        print(OUT "!endif\n");
+    }
     print(OUT "	$c_dllafter\n");
     print(OUT "\n");