diff --git a/headers/private/servers/app/DisplayDriver.h b/headers/private/servers/app/DisplayDriver.h
index 67e6c24be5..c544b81efc 100644
--- a/headers/private/servers/app/DisplayDriver.h
+++ b/headers/private/servers/app/DisplayDriver.h
@@ -307,9 +307,10 @@ class DisplayDriver {
 	virtual void				Unlock() = 0;
 
 	// display mode access
-	virtual void				SetMode(const display_mode &mode) = 0;
-	virtual	void				GetMode(display_mode *mode) = 0;
-	virtual	const display_mode*	DisplayMode() = 0;
+	virtual void				SetMode(const display_mode &mode);
+	virtual	void				GetMode(display_mode *mode);
+			const display_mode*	DisplayMode()
+									{ return &fDisplayMode; }
 	
 	virtual bool				DumpToFile(const char *path) = 0;
 	virtual ServerBitmap*		DumpToBitmap() = 0;
@@ -356,6 +357,8 @@ class DisplayDriver {
 	// needed by Layer
 	virtual	void				ConstrainClippingRegion(BRegion *reg) = 0;
 
+ protected:
+			display_mode		fDisplayMode;
 };
 
 #endif
diff --git a/headers/private/servers/app/Painter.h b/headers/private/servers/app/Painter.h
index c5e7d8a8b0..b8b2014eaa 100644
--- a/headers/private/servers/app/Painter.h
+++ b/headers/private/servers/app/Painter.h
@@ -227,7 +227,7 @@ class Painter {
 
 			void				_RebuildClipping();
 
-			void				_UpdateFont();
+			void				_UpdateFont(const char* pathToFontFile = NULL);
 			void				_UpdateLineWidth();
 
 								// drawing functions stroke/fill
diff --git a/headers/private/servers/app/ServerConfig.h b/headers/private/servers/app/ServerConfig.h
index ae3bfaf623..fa0de5d9a6 100644
--- a/headers/private/servers/app/ServerConfig.h
+++ b/headers/private/servers/app/ServerConfig.h
@@ -38,8 +38,8 @@
 
 // Display driver to be used by the server.
 #ifndef DISPLAYDRIVER
-//#	define DISPLAYDRIVER PAINTERDRIVER
-#	define DISPLAYDRIVER VIEWDRIVER
+#	define DISPLAYDRIVER PAINTERDRIVER
+//#	define DISPLAYDRIVER VIEWDRIVER
 #endif
 
 // Uncomment this if the DisplayDriver should only rely on drawing functions implemented