diff --git a/shell/view/Makefile.am b/shell/view/Makefile.am
index dc8570ab..c3c1bc6e 100644
--- a/shell/view/Makefile.am
+++ b/shell/view/Makefile.am
@@ -4,7 +4,6 @@ sugardir = $(pkgdatadir)/shell/view
 sugar_PYTHON =				\
 	__init__.py			\
 	ActivityHost.py			\
-	BuddyActivityView.py		\
 	ConsoleWindow.py		\
 	FirstTimeDialog.py		\
 	BuddyIcon.py			\
diff --git a/shell/view/frame/Makefile.am b/shell/view/frame/Makefile.am
index 01458cc9..c2a0b9fb 100644
--- a/shell/view/frame/Makefile.am
+++ b/shell/view/frame/Makefile.am
@@ -2,7 +2,7 @@ sugardir = $(pkgdatadir)/shell/view/frame
 sugar_PYTHON =				\
 	__init__.py			\
 	ActivitiesBox.py		\
-	RightPanel.py			\
+	FriendsBox.py			\
 	PanelWindow.py			\
 	Frame.py			\
 	ZoomBox.py			\
diff --git a/shell/view/home/Makefile.am b/shell/view/home/Makefile.am
index 39262012..11e221c3 100644
--- a/shell/view/home/Makefile.am
+++ b/shell/view/home/Makefile.am
@@ -2,6 +2,7 @@ sugardir = $(pkgdatadir)/shell/view/home
 sugar_PYTHON =			\
 	__init__.py		\
 	activitiesdonut.py	\
+	FriendView.py		\
 	FriendsBox.py		\
 	HomeBox.py		\
 	HomeWindow.py		\
diff --git a/sugar/session/MatchboxProcess.py b/sugar/session/MatchboxProcess.py
index fccf47a1..4fd47417 100644
--- a/sugar/session/MatchboxProcess.py
+++ b/sugar/session/MatchboxProcess.py
@@ -9,6 +9,7 @@ class MatchboxProcess(Process):
 		options = '-kbdconfig %s ' % kbd_config
 
 		options += '-use_titlebar no '
+		options += '-theme olpc '
 
 		command = 'matchbox-window-manager %s ' % options
 		Process.__init__(self, command)