diff --git a/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace_4x4.xml b/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace_4x4.xml
index 15e1809b..02c5f5ff 100644
--- a/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace_4x4.xml
+++ b/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace_4x4.xml
@@ -33,18 +33,26 @@
             launcher:packageName="com.android.contacts"
             launcher:className="com.android.contacts.activities.PeopleActivity"
             launcher:screen="1"
-            launcher:x="2"
+            launcher:x="1"
             launcher:y="3" />
 
     <resolve
         launcher:screen="1"
-        launcher:x="3"
+        launcher:x="2"
         launcher:y="3" >
         <favorite
             launcher:packageName="org.fdroid.fdroid"
             launcher:className="org.fdroid.fdroid.FDroid" />
     </resolve>
 
+    <favorite
+            launcher:packageName="fil.libre.repwifiapp"
+            launcher:className="fil.libre.repwifiapp.activities.MainActivity"
+            launcher:screen="1"
+            launcher:x="3"
+            launcher:y="3" />
+
+
     <!-- Screen [2] -->
 
     <appwidget
diff --git a/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace_5x5.xml b/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace_5x5.xml
new file mode 100644
index 00000000..a64f191c
--- /dev/null
+++ b/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace_5x5.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+    <!-- Far-left screen [0] -->
+
+    <!-- Left screen [1] -->
+
+    <!-- Clock Widget -->
+    <appwidget
+        launcher:packageName="com.cyanogenmod.lockclock"
+        launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider"
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="5"
+        launcher:spanY="2" />
+
+    <favorite
+            launcher:packageName="com.android.contacts"
+            launcher:className="com.android.contacts.activities.PeopleActivity"
+            launcher:screen="1"
+            launcher:x="1"
+            launcher:y="3" />
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="3" >
+        <favorite
+            launcher:packageName="org.fdroid.fdroid"
+            launcher:className="org.fdroid.fdroid.FDroid" />
+    </resolve>
+
+    <favorite
+            launcher:packageName="fil.libre.repwifiapp"
+            launcher:className="fil.libre.repwifiapp.activities.MainActivity"
+            launcher:screen="1"
+            launcher:x="3"
+            launcher:y="3" />
+
+
+    <!-- Screen [2] -->
+
+    <appwidget
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.appwidgets.AppWidgetLarge"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="5"
+        launcher:spanY="2" />
+
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="4" />
+
+    <resolve
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="4" >
+        <favorite
+            launcher:packageName="com.android.gallery"
+            launcher:className="com.android.camera.GalleryPicker" />
+    </resolve>
+
+    <favorite
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="4" />
+
+    <favorite
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.Settings"
+        launcher:screen="2"
+        launcher:x="4"
+        launcher:y="4" />
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer, Messaging, [All Apps], Browser, Camera -->
+    <resolve
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />
+        <favorite launcher:uri="tel:123" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
+
+        <favorite
+            launcher:packageName="com.android.dialer"
+            launcher:className="com.android.dialer.DialtactsActivity" />
+        <favorite
+            launcher:packageName="com.android.contacts"
+            launcher:className="com.android.contacts.activities.PeopleActivity" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.android.messaging"
+            launcher:className="com.android.messaging.ui.conversationlist.ConversationListActivity" />
+        <favorite
+            launcher:packageName="com.android.email"
+            launcher:className="com.android.email.activity.Welcome" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="3"
+        launcher:x="2"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.android.browser"
+            launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.cyngn.browser"
+            launcher:className="com.android.browser.BrowserLauncher" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.android.camera"
+            launcher:className="com.android.camera.Camera" />
+    </resolve>
+
+</favorites>
diff --git a/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace_5x6.xml b/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace_5x6.xml
new file mode 100644
index 00000000..cd62cde6
--- /dev/null
+++ b/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace_5x6.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+    <!-- Far-left screen [0] -->
+
+    <!-- Left screen [1] -->
+
+    <!-- Clock Widget -->
+    <appwidget
+        launcher:packageName="com.cyanogenmod.lockclock"
+        launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider"
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="6"
+        launcher:spanY="2" />
+
+    <favorite
+            launcher:packageName="com.android.contacts"
+            launcher:className="com.android.contacts.activities.PeopleActivity"
+            launcher:screen="1"
+            launcher:x="2"
+            launcher:y="3" />
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="3"
+        launcher:y="3" >
+        <favorite
+            launcher:packageName="org.fdroid.fdroid"
+            launcher:className="org.fdroid.fdroid.FDroid" />
+    </resolve>
+
+    <favorite
+            launcher:packageName="fil.libre.repwifiapp"
+            launcher:className="fil.libre.repwifiapp.activities.MainActivity"
+            launcher:screen="1"
+            launcher:x="4"
+            launcher:y="3" />
+
+
+    <!-- Screen [2] -->
+
+    <appwidget
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.appwidgets.AppWidgetLarge"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="6"
+        launcher:spanY="2" />
+
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="4" />
+
+    <resolve
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="4" >
+        <favorite
+            launcher:packageName="com.android.gallery"
+            launcher:className="com.android.camera.GalleryPicker" />
+    </resolve>
+
+    <favorite
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
+        launcher:screen="2"
+        launcher:x="3"
+        launcher:y="4" />
+
+    <favorite
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.Settings"
+        launcher:screen="2"
+        launcher:x="4"
+        launcher:y="4" />
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer, Messaging, [All Apps], Browser, Camera -->
+    <resolve
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />
+        <favorite launcher:uri="tel:123" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
+
+        <favorite
+            launcher:packageName="com.android.dialer"
+            launcher:className="com.android.dialer.DialtactsActivity" />
+        <favorite
+            launcher:packageName="com.android.contacts"
+            launcher:className="com.android.contacts.activities.PeopleActivity" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.android.messaging"
+            launcher:className="com.android.messaging.ui.conversationlist.ConversationListActivity" />
+        <favorite
+            launcher:packageName="com.android.email"
+            launcher:className="com.android.email.activity.Welcome" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.android.browser"
+            launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.cyngn.browser"
+            launcher:className="com.android.browser.BrowserLauncher" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="5"
+        launcher:x="5"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.android.camera"
+            launcher:className="com.android.camera.Camera" />
+    </resolve>
+
+</favorites>