diff --git a/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml b/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml
index bf2a665..d60d25f 100644
--- a/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml
+++ b/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml
@@ -73,20 +73,6 @@
         launcher:spanY="1" />
 
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.DialtactsContactsEntryActivity"
-        launcher:screen="2"
-        launcher:x="1"
-        launcher:y="3" />
-
-    <favorite
-        launcher:packageName="com.google.android.apps.maps"
-        launcher:className="com.google.android.maps.MapsActivity"
-        launcher:screen="2"
-        launcher:x="3"
-        launcher:y="3" />
-
-    <favorite
         launcher:packageName="com.android.mms"
         launcher:className="com.android.mms.ui.ConversationList"
         launcher:screen="2"
@@ -94,6 +80,13 @@
         launcher:y="3" />
 
     <favorite
+        launcher:packageName="com.android.contacts"
+        launcher:className="com.android.contacts.DialtactsContactsEntryActivity"
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="3" />
+
+    <favorite
         launcher:packageName="com.android.vending"
         launcher:className="com.android.vending.AssetBrowserActivity"
         launcher:screen="2"
@@ -104,20 +97,22 @@
         launcher:packageName="com.android.deskclock"
         launcher:className="com.android.deskclock.DeskClock"
         launcher:screen="2"
-        launcher:x="0"
-        launcher:y="2" />
-
-    <favorite
-        launcher:packageName="org.abrantix.rockon.rockonnggl.cm"
-        launcher:className="org.abrantix.rockon.rockonnggl.RockOnNextGenGL"
-        launcher:screen="2"
         launcher:x="3"
-        launcher:y="2" />
+        launcher:y="3" />
 
     <!--  Right screen [3] -->
+    <appwidget
+        launcher:packageName="com.android.music"
+        launcher:className="com.android.music.MediaAppWidgetProvider4x2"
+        launcher:screen="3"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+
     <favorite
-        launcher:packageName="com.google.android.gm"
-        launcher:className="com.google.android.gm.ConversationListActivityGmail"
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
         launcher:screen="3"
         launcher:x="1"
         launcher:y="3" />