diff --git a/src/add-ons/decorators/MacDecorator/Jamfile b/src/add-ons/decorators/MacDecorator/Jamfile
index 66226c5524..b053ffde70 100644
--- a/src/add-ons/decorators/MacDecorator/Jamfile
+++ b/src/add-ons/decorators/MacDecorator/Jamfile
@@ -2,6 +2,7 @@ SubDir HAIKU_TOP src add-ons decorators MacDecorator ;
 
 UseBuildFeatureHeaders freetype ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app stackandtile ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
diff --git a/src/add-ons/decorators/MacDecorator/MacDecorator.cpp b/src/add-ons/decorators/MacDecorator/MacDecorator.cpp
index bc7a06524e..9c2a7f4e51 100644
--- a/src/add-ons/decorators/MacDecorator/MacDecorator.cpp
+++ b/src/add-ons/decorators/MacDecorator/MacDecorator.cpp
@@ -43,15 +43,17 @@ MacDecorAddOn::MacDecorAddOn(image_id id, const char* name)
 
 
 Decorator*
-MacDecorAddOn::_AllocateDecorator(DesktopSettings& settings, BRect rect)
+MacDecorAddOn::_AllocateDecorator(DesktopSettings& settings, BRect rect,
+	Desktop* desktop)
 {
-	return new (std::nothrow)MacDecorator(settings, rect);
+	return new (std::nothrow)MacDecorator(settings, rect, desktop);
 }
 
 
-MacDecorator::MacDecorator(DesktopSettings& settings, BRect frame)
+MacDecorator::MacDecorator(DesktopSettings& settings, BRect frame,
+	Desktop* desktop)
 	:
-	Decorator(settings, frame),
+	SATDecorator(settings, frame, desktop),
 	fButtonHighColor((rgb_color) { 232, 232, 232, 255 }),
 	fButtonLowColor((rgb_color) { 128, 128, 128, 255 }),
 	fFrameHighColor((rgb_color) { 255, 255, 255, 255 }),
diff --git a/src/add-ons/decorators/MacDecorator/MacDecorator.h b/src/add-ons/decorators/MacDecorator/MacDecorator.h
index e2c9d1594b..551aeefd58 100644
--- a/src/add-ons/decorators/MacDecorator/MacDecorator.h
+++ b/src/add-ons/decorators/MacDecorator/MacDecorator.h
@@ -13,6 +13,7 @@
 
 #include "DecorManager.h"
 #include "RGBColor.h"
+#include "SATDecorator.h"
 
 
 class MacDecorAddOn : public DecorAddOn {
@@ -21,14 +22,14 @@ public:
 
 protected:
 	virtual Decorator*			_AllocateDecorator(DesktopSettings& settings,
-									BRect rect);
+									BRect rect,	Desktop* desktop);
 };
 
 
-class MacDecorator: public Decorator {
+class MacDecorator: public SATDecorator {
 public:
 								MacDecorator(DesktopSettings& settings,
-									BRect frame);
+									BRect frame,	Desktop* desktop);
 	virtual						~MacDecorator();
 
 			void				Draw(BRect updateRect);
diff --git a/src/add-ons/decorators/WinDecorator/Jamfile b/src/add-ons/decorators/WinDecorator/Jamfile
index 8b261c09ff..e1fc8ad11e 100644
--- a/src/add-ons/decorators/WinDecorator/Jamfile
+++ b/src/add-ons/decorators/WinDecorator/Jamfile
@@ -2,6 +2,7 @@ SubDir HAIKU_TOP src add-ons decorators WinDecorator ;
 
 UseBuildFeatureHeaders freetype ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app stackandtile ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
diff --git a/src/add-ons/decorators/WinDecorator/WinDecorator.cpp b/src/add-ons/decorators/WinDecorator/WinDecorator.cpp
index e233fad424..7bbc468d82 100644
--- a/src/add-ons/decorators/WinDecorator/WinDecorator.cpp
+++ b/src/add-ons/decorators/WinDecorator/WinDecorator.cpp
@@ -43,15 +43,17 @@ WinDecorAddOn::WinDecorAddOn(image_id id, const char* name)
 
 
 Decorator*
-WinDecorAddOn::_AllocateDecorator(DesktopSettings& settings, BRect rect)
+WinDecorAddOn::_AllocateDecorator(DesktopSettings& settings, BRect rect,
+	Desktop* desktop)
 {
-	return new (std::nothrow)WinDecorator(settings, rect);
+	return new (std::nothrow)WinDecorator(settings, rect, desktop);
 }
 
 
-WinDecorator::WinDecorator(DesktopSettings& settings, BRect frame)
+WinDecorator::WinDecorator(DesktopSettings& settings, BRect frame,
+	Desktop* desktop)
 	:
-	Decorator(settings, frame),
+	SATDecorator(settings, frame, desktop),
 	// common colors to both focus and non focus state
 	fFrameHighColor((rgb_color){ 255, 255, 255, 255 }),
 	fFrameMidColor((rgb_color){ 216, 216, 216, 255 }),
diff --git a/src/add-ons/decorators/WinDecorator/WinDecorator.h b/src/add-ons/decorators/WinDecorator/WinDecorator.h
index 5c283ea4b1..26287a1c4c 100644
--- a/src/add-ons/decorators/WinDecorator/WinDecorator.h
+++ b/src/add-ons/decorators/WinDecorator/WinDecorator.h
@@ -11,8 +11,8 @@
 #define WIN_DECORATOR_H
 
 
-#include "Decorator.h"
 #include "DecorManager.h"
+#include "SATDecorator.h"
 
 
 struct rgb_color;
@@ -26,14 +26,14 @@ public:
 
 protected:
 	virtual Decorator*			_AllocateDecorator(DesktopSettings& settings,
-									BRect rect);
+									BRect rect,	Desktop* desktop);
 };
 
 
-class WinDecorator: public Decorator {
+class WinDecorator: public SATDecorator {
 public:
 								WinDecorator(DesktopSettings& settings,
-									BRect frame);
+									BRect frame, Desktop* desktop);
 								~WinDecorator(void);
 
 	virtual	void				Draw(BRect updateRect);