diff --git a/src/prefs/appearance/APRView.cpp b/src/prefs/appearance/APRView.cpp
index ac84300646..2c4598852b 100644
--- a/src/prefs/appearance/APRView.cpp
+++ b/src/prefs/appearance/APRView.cpp
@@ -619,12 +619,13 @@ void APRView::LoadSettings(void)
 	if(port!=B_NAME_NOT_FOUND)
 	{
 		STRACE(("Retrieving settings from app_server\n"));
-		PortLink link(port);
-		PortMessage pmsg;
+		BPortLink link(port);
+		int32 code;
 		
-		link.SetOpCode(AS_GET_UI_COLORS);
-		link.FlushWithReply(&pmsg);
-		pmsg.Read<ColorSet>(currentset);
+		link.StartMessage(AS_GET_UI_COLORS);
+		link.Flush();
+		link.GetNextReply(&code);
+		link.Read<ColorSet>(currentset);
 	}
 	else
 	{
@@ -689,9 +690,9 @@ void APRView::NotifyServer(void)
 	if(port!=B_NAME_NOT_FOUND)
 	{
 		STRACE(("Notifying app_server\n"));
-		PortLink link(port);
+		BPortLink link(port);
 		
-		link.SetOpCode(AS_SET_UI_COLORS);
+		link.StartMessage(AS_SET_UI_COLORS);
 		link.Attach<ColorSet>(*currentset);
 		link.Flush();
 	}
diff --git a/src/prefs/appearance/CurView.cpp b/src/prefs/appearance/CurView.cpp
index 5c64bbdff3..89f8caf4b0 100644
--- a/src/prefs/appearance/CurView.cpp
+++ b/src/prefs/appearance/CurView.cpp
@@ -399,11 +399,12 @@ void CurView::SetDefaults(void)
 	if(port==B_NAME_NOT_FOUND)
 		return;
 		
-	PortLink link(port);
-	PortMessage pmsg;
+	BPortLink link(port);
+	int32 code;
 	
-	link.SetOpCode(AS_SET_SYSCURSOR_DEFAULTS);
-	link.FlushWithReply(&pmsg);
+	link.StartMessage(AS_SET_SYSCURSOR_DEFAULTS);
+	link.Flush();
+	link.GetNextReply(&code);
 
 }
 
diff --git a/src/prefs/appearance/DecView.cpp b/src/prefs/appearance/DecView.cpp
index 65b8bd6cff..5949ee83af 100644
--- a/src/prefs/appearance/DecView.cpp
+++ b/src/prefs/appearance/DecView.cpp
@@ -253,9 +253,9 @@ void DecView::NotifyServer(void)
 		return;
 	
 	
-	PortLink pl(serverport);
-	pl.SetOpCode(AS_SET_DECORATOR);
-	pl.Attach(item->Text(),strlen(item->Text())+1);
+	BPortLink pl(serverport);
+	pl.StartMessage(AS_SET_DECORATOR);
+	pl.AttachString(item->Text());
 	pl.Flush();
 }
 
diff --git a/src/prefs/appearance/PreviewDriver.cpp b/src/prefs/appearance/PreviewDriver.cpp
index e3b0f3df28..a890bbb4ba 100644
--- a/src/prefs/appearance/PreviewDriver.cpp
+++ b/src/prefs/appearance/PreviewDriver.cpp
@@ -156,7 +156,7 @@ void PreviewDriver::SetMode(const display_mode &mode)
 {
 }
 
-void PreviewDriver::FillSolidRect(const BRect &rect, RGBColor &color)
+void PreviewDriver::FillSolidRect(const BRect &rect, const RGBColor &color)
 {
 	view->viewbmp->Lock();
 	drawview->SetHighColor(color.GetColor32());
@@ -180,8 +180,11 @@ void PreviewDriver::FillPatternRect(const BRect &rect, const DrawData *d)
 	view->viewbmp->Unlock();
 }
 
-void PreviewDriver::StrokeSolidLine(const BPoint &start, const BPoint &end, RGBColor &color)
+void PreviewDriver::StrokeSolidLine(int32 x1, int32 y1, int32 x2, int32 y2, const RGBColor &color)
 {
+	BPoint start(x1,y1);
+	BPoint end(x2,y2);
+	
 	view->viewbmp->Lock();
 	drawview->SetHighColor(color.GetColor32());
 	drawview->StrokeLine(start,end);
@@ -190,11 +193,14 @@ void PreviewDriver::StrokeSolidLine(const BPoint &start, const BPoint &end, RGBC
 	view->viewbmp->Unlock();
 }
 
-void PreviewDriver::StrokePatternLine(const BPoint &start, const BPoint &end, const DrawData *d)
+void PreviewDriver::StrokePatternLine(int32 x1, int32 y1, int32 x2, int32 y2, const DrawData *d)
 {
 	if(!d)
 		return;
 	
+	BPoint start(x1,y1);
+	BPoint end(x2,y2);
+
 	view->viewbmp->Lock();
 	drawview->SetHighColor(d->highcolor.GetColor32());
 	drawview->SetLowColor(d->lowcolor.GetColor32());
@@ -204,7 +210,7 @@ void PreviewDriver::StrokePatternLine(const BPoint &start, const BPoint &end, co
 	view->viewbmp->Unlock();
 }
 
-void PreviewDriver::StrokeSolidRect(const BRect &rect, RGBColor &color)
+void PreviewDriver::StrokeSolidRect(const BRect &rect, const RGBColor &color)
 {
 	view->viewbmp->Lock();
 	drawview->SetHighColor(color.GetColor32());
@@ -234,12 +240,12 @@ void PreviewDriver::ReleaseBuffer(void)
 {
 	view->viewbmp->Unlock();
 }
+
 bool PreviewDriver::Lock(bigtime_t timeout=B_INFINITE_TIMEOUT)
 {
-	return view->viewbmp->Lock();
+	return true;
 }
 
 void PreviewDriver::Unlock(void)
 {
-	view->viewbmp->Unlock();
 }
diff --git a/src/prefs/appearance/PreviewDriver.h b/src/prefs/appearance/PreviewDriver.h
index f19a3f1599..4b846d3ac5 100644
--- a/src/prefs/appearance/PreviewDriver.h
+++ b/src/prefs/appearance/PreviewDriver.h
@@ -79,11 +79,11 @@ public:
 	virtual void Unlock(void);
 
 protected:
-	virtual void FillSolidRect(const BRect &rect, RGBColor &color);
+	virtual void FillSolidRect(const BRect &rect, const RGBColor &color);
 	virtual void FillPatternRect(const BRect &rect, const DrawData *d);
-	virtual void StrokeSolidLine(const BPoint &start, const BPoint &end, RGBColor &color);
-	virtual void StrokePatternLine(const BPoint &start, const BPoint &end, const DrawData *d);
-	virtual void StrokeSolidRect(const BRect &rect, RGBColor &color);
+	virtual void StrokeSolidLine(int32 x1, int32 y1, int32 x2, int32 y2, const RGBColor &color);
+	virtual void StrokePatternLine(int32 x1, int32 y1, int32 x2, int32 y2, const DrawData *d);
+	virtual void StrokeSolidRect(const BRect &rect, const RGBColor &color);
 
 	virtual bool AcquireBuffer(FBBitmap *bmp);
 	virtual void ReleaseBuffer(void);