diff --git a/include/Mw/TypeDefs.h b/include/Mw/TypeDefs.h
index edad6bf4e..4944105de 100644
--- a/include/Mw/TypeDefs.h
+++ b/include/Mw/TypeDefs.h
@@ -248,10 +248,6 @@ struct _MwMouse {
 	int	button;
 };
 
-enum _MwTTFType {
-	MwTTFTypeUNKNOWN = 0
-};
-
 struct _MwTTFInfo {
 	char* family;
 	int   weight;
diff --git a/src/text/gdi.c b/src/text/gdi.c
index 1ef198583..457b4dc20 100644
--- a/src/text/gdi.c
+++ b/src/text/gdi.c
@@ -1,8 +1,8 @@
 #ifdef USE_GDI_TEXT
 #include <Mw/Milsko.h>
 
-static HANDLE	     WINAPI (*_AddFontMemResourceEx)(PVOID pFileView, DWORD cjSize, PVOID pvResrved, DWORD* pNumFonts) = NULL;
-static BOOL	     WINAPI (*_RemoveFontMemResourceEx)(HANDLE h)						       = NULL;
+static HANDLE(WINAPI* _AddFontMemResourceEx)(PVOID pFileView, DWORD cjSize, PVOID pvResrved, DWORD* pNumFonts) = NULL;
+static BOOL(WINAPI* _RemoveFontMemResourceEx)(HANDLE h)							       = NULL;
 static HANDLE WINAPI _AddFontMemResourceExPolyFill(PVOID pFileView, DWORD cjSize, PVOID pvResrved, DWORD* pNumFonts);
 static BOOL WINAPI   _RemoveFontMemResourceExPolyFill(HANDLE h);
 
@@ -28,7 +28,7 @@ static int GDI_MwDrawText(MwWidget handle, MwFLFont ttf, MwPoint* point, const c
 	tw = MwTextWidth(handle, ttf, text);
 	th = MwTextHeight(handle, ttf, text);
 
-	if(handle->lowlevel->common.type == MwLLBackendGDI) {
+	if(handle->lowlevel->common.type == MwLLBackendGDI && MwGetInteger(handle, MwNmodernLook) == MwFALMwFALSE) {
 		HFONT	 old_font   = SelectObject(handle->lowlevel->gdi.hDC, ttf->font);
 		int	 old_bkmode = SetBkMode(handle->lowlevel->gdi.hDC, TRANSPARENT);
 		COLORREF old_color  = SetTextColor(handle->lowlevel->gdi.hDC, color->gdi.color);