diff --git a/ChangeLog b/ChangeLog
index ad53ff7..ceccd68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-22  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/x11/XGServerEvent.m (-processEvent:): Reenable Richard's
+	frontend based expose code.
+	* Source/x11/XGServerWindow.m (-window::::, -_checkStyle:): Don't
+	use CWBackPixel, as the window background may be different.
+
 2015-03-21  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/x11/XGGeneric.h
diff --git a/Source/x11/XGServerEvent.m b/Source/x11/XGServerEvent.m
index 2d7a420..2c873fa 100644
--- a/Source/x11/XGServerEvent.m
+++ b/Source/x11/XGServerEvent.m
@@ -1065,7 +1065,7 @@ posixFileDescriptor: (NSPosixFileDescriptor*)fileDescriptor
               NSDebugLLog(@"NSEvent", @"Expose frame %d %d %d %d\n",
                           rectangle.x, rectangle.y,
                           rectangle.width, rectangle.height);
-#if 1
+#if 0
               // ignore backing if sub-window
               [self _addExposedRectangle: rectangle : cWin->number : isSubWindow];
 
diff --git a/Source/x11/XGServerWindow.m b/Source/x11/XGServerWindow.m
index 01eb89b..ceb27e6 100644
--- a/Source/x11/XGServerWindow.m
+++ b/Source/x11/XGServerWindow.m
@@ -842,7 +842,7 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
 				context->depth,
 				CopyFromParent,
 				context->visual,
-				(CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect),
+				(CWColormap | CWBorderPixel | CWOverrideRedirect),
 				&window->xwn_attrs);
 
   /*
@@ -2048,7 +2048,9 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
 				context->depth,
 				CopyFromParent,
 				context->visual,
-				(CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect),
+                                // Don't set the CWBackPixel, as the background of the
+                                // window may be different.
+				(CWColormap | CWBorderPixel | CWOverrideRedirect),
 				&window->xwn_attrs);
 
   /*