diff --git a/WAYWindow/WAYWindow.h b/WAYWindow/WAYWindow.h
index 5989d10..3272251 100644
--- a/WAYWindow/WAYWindow.h
+++ b/WAYWindow/WAYWindow.h
@@ -27,7 +27,7 @@
  - Check out the WWDC '14 session `Adopting Advanced Features of the New UI of OS X Yosemite´, which provides more details on how to make use of the new Yosemite APIs.
  - Also check out the new APIs in NSScrollView to make use of contentInsets, scrollInsets, and more.
  */
-@interface WAYWindow : NSWindow
+@interface WAYWindow : MouseMovementWindow
 
 /// Returns YES, if the class supports vibrant appearances. Can be used to determine if running on OS X 10.10+
 + (BOOL) supportsVibrantAppearances;
diff --git a/WAYWindow/WAYWindow.m b/WAYWindow/WAYWindow.m
index 8421030..6892a91 100644
--- a/WAYWindow/WAYWindow.m
+++ b/WAYWindow/WAYWindow.m
@@ -318,7 +318,6 @@ - (void) _setUp {
 	kWAYWindowDefaultTrafficLightButtonsLeftMargin = NSMinX(closeButton.frame);
 	kWAYWindowDefaultTrafficLightButtonsTopMargin = NSHeight(closeButton.superview.frame)-NSMaxY(closeButton.frame);
 	
-	self.styleMask |= NSFullSizeContentViewWindowMask;
 	_trafficLightButtonsLeftMargin = kWAYWindowDefaultTrafficLightButtonsLeftMargin;
 	_trafficLightButtonsTopMargin = kWAYWindowDefaultTrafficLightButtonsTopMargin;
 	
@@ -339,6 +338,10 @@ - (void) _setNeedsLayout {
 		frame.origin.x = _trafficLightButtonsLeftMargin +idx*(NSWidth(frame) + 6);
 		[standardButton setFrame:frame];
 	}];
+
+    NSView *themeFrame = self.titleBarView.superview.superview;
+    [themeFrame viewWillStartLiveResize];
+    [themeFrame viewDidEndLiveResize];
 }
 
 #pragma mark - NSWindow Delegate