diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_2x2.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_2x2.xml
new file mode 100644
index 00000000..26d38b44
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_2x2.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source 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">
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer, Messaging -->
+
+    <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" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
+        <favorite launcher:uri="sms:" />
+        <favorite launcher:uri="smsto:" />
+        <favorite launcher:uri="mms:" />
+        <favorite launcher:uri="mmsto:" />
+    </resolve>
+
+</favorites>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_3x3.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_3x3.xml
new file mode 100644
index 00000000..26d38b44
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_3x3.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source 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">
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer, Messaging -->
+
+    <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" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
+        <favorite launcher:uri="sms:" />
+        <favorite launcher:uri="smsto:" />
+        <favorite launcher:uri="mms:" />
+        <favorite launcher:uri="mmsto:" />
+    </resolve>
+
+</favorites>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_4x4.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_4x4.xml
index b99cab45..12263a12 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_4x4.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_4x4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod Project
+<!-- Copyright (C) 2009 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -17,15 +17,16 @@
 <favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
 
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Phone, Messenger, [All Apps], Browser, Camera -->
+    <!-- Dialer, Messaging, Browser, Camera -->
+
     <resolve
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="0"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="com.android.dialer"
-            launcher:className="com.android.dialer.DialtactsActivity" />
+        <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" />
     </resolve>
 
     <resolve
@@ -33,34 +34,20 @@
         launcher:screen="1"
         launcher:x="1"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="org.smssecure.smssecure"
-            launcher:className="org.smssecure.smssecure.ConversationListActivity" />
-        <favorite
-            launcher:packageName="com.android.messaging"
-            launcher:className="com.android.messaging.ui.conversationlist.ConversationListActivity" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
+        <favorite launcher:uri="sms:" />
+        <favorite launcher:uri="smsto:" />
+        <favorite launcher:uri="mms:" />
+        <favorite launcher:uri="mmsto:" />
     </resolve>
 
     <resolve
         launcher:container="-101"
         launcher:screen="3"
-        launcher:x="2"
+        launcher:x="3"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="us.spotco.fennec_dos"
-            launcher:className="org.mozilla.gecko.LauncherActivity" />
-        <favorite
-            launcher:packageName="org.mozilla.fennec_fdroid"
-            launcher:className="org.mozilla.gecko.LauncherActivity" />
-        <favorite
-            launcher:packageName="org.gnu.icecat"
-            launcher:className="org.mozilla.gecko.LauncherActivity" />
-        <favorite
-            launcher:packageName="org.mozilla.firefox"
-            launcher:className="org.mozilla.gecko.LauncherActivity" />
-        <favorite
-            launcher:packageName="org.chromium.chrome"
-            launcher:className="org.chromium.chrome.ChromeLauncherActivity" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
+        <favorite launcher:uri="http://www.example.com/" />
     </resolve>
 
     <resolve
@@ -68,18 +55,8 @@
         launcher:screen="4"
         launcher:x="4"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="org.lineageos.snap"
-            launcher:className="com.android.camera.CameraLauncher" />
-        <favorite
-            launcher:packageName="org.cyanogenmod.snap"
-            launcher:className="com.android.camera.CameraLauncher" />
-        <favorite
-            launcher:packageName="com.android.camera2"
-            launcher:className="com.android.camera.CameraLauncher" />
-        <favorite
-            launcher:packageName="net.sourceforge.opencamera"
-            launcher:className="net.sourceforge.opencamera.MainActivity" />
+        <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
     </resolve>
 
 </favorites>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_4x5.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_4x5.xml
new file mode 100644
index 00000000..12263a12
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_4x5.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source 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">
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer, Messaging, 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" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
+        <favorite launcher:uri="sms:" />
+        <favorite launcher:uri="smsto:" />
+        <favorite launcher:uri="mms:" />
+        <favorite launcher:uri="mmsto:" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
+        <favorite launcher:uri="http://www.example.com/" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
+    </resolve>
+
+</favorites>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x5.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x5.xml
index b99cab45..12263a12 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x5.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod Project
+<!-- Copyright (C) 2009 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -17,15 +17,16 @@
 <favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
 
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Phone, Messenger, [All Apps], Browser, Camera -->
+    <!-- Dialer, Messaging, Browser, Camera -->
+
     <resolve
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="0"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="com.android.dialer"
-            launcher:className="com.android.dialer.DialtactsActivity" />
+        <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" />
     </resolve>
 
     <resolve
@@ -33,34 +34,20 @@
         launcher:screen="1"
         launcher:x="1"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="org.smssecure.smssecure"
-            launcher:className="org.smssecure.smssecure.ConversationListActivity" />
-        <favorite
-            launcher:packageName="com.android.messaging"
-            launcher:className="com.android.messaging.ui.conversationlist.ConversationListActivity" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
+        <favorite launcher:uri="sms:" />
+        <favorite launcher:uri="smsto:" />
+        <favorite launcher:uri="mms:" />
+        <favorite launcher:uri="mmsto:" />
     </resolve>
 
     <resolve
         launcher:container="-101"
         launcher:screen="3"
-        launcher:x="2"
+        launcher:x="3"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="us.spotco.fennec_dos"
-            launcher:className="org.mozilla.gecko.LauncherActivity" />
-        <favorite
-            launcher:packageName="org.mozilla.fennec_fdroid"
-            launcher:className="org.mozilla.gecko.LauncherActivity" />
-        <favorite
-            launcher:packageName="org.gnu.icecat"
-            launcher:className="org.mozilla.gecko.LauncherActivity" />
-        <favorite
-            launcher:packageName="org.mozilla.firefox"
-            launcher:className="org.mozilla.gecko.LauncherActivity" />
-        <favorite
-            launcher:packageName="org.chromium.chrome"
-            launcher:className="org.chromium.chrome.ChromeLauncherActivity" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
+        <favorite launcher:uri="http://www.example.com/" />
     </resolve>
 
     <resolve
@@ -68,18 +55,8 @@
         launcher:screen="4"
         launcher:x="4"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="org.lineageos.snap"
-            launcher:className="com.android.camera.CameraLauncher" />
-        <favorite
-            launcher:packageName="org.cyanogenmod.snap"
-            launcher:className="com.android.camera.CameraLauncher" />
-        <favorite
-            launcher:packageName="com.android.camera2"
-            launcher:className="com.android.camera.CameraLauncher" />
-        <favorite
-            launcher:packageName="net.sourceforge.opencamera"
-            launcher:className="net.sourceforge.opencamera.MainActivity" />
+        <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
     </resolve>
 
 </favorites>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x6.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x6.xml
index e22af4dc..12263a12 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x6.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x6.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod Project
+<!-- Copyright (C) 2009 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -17,28 +17,37 @@
 <favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
 
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Phone, Messenger, [All Apps], Browser, Camera -->
+    <!-- Dialer, Messaging, 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" />
+    </resolve>
+
     <resolve
         launcher:container="-101"
         launcher:screen="1"
         launcher:x="1"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="com.android.dialer"
-            launcher:className="com.android.dialer.DialtactsActivity" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
+        <favorite launcher:uri="sms:" />
+        <favorite launcher:uri="smsto:" />
+        <favorite launcher:uri="mms:" />
+        <favorite launcher:uri="mmsto:" />
     </resolve>
 
     <resolve
         launcher:container="-101"
-        launcher:screen="2"
-        launcher:x="2"
+        launcher:screen="3"
+        launcher:x="3"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="org.smssecure.smssecure"
-            launcher:className="org.smssecure.smssecure.ConversationListActivity" />
-        <favorite
-            launcher:packageName="com.android.messaging"
-            launcher:className="com.android.messaging.ui.conversationlist.ConversationListActivity" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
+        <favorite launcher:uri="http://www.example.com/" />
     </resolve>
 
     <resolve
@@ -46,40 +55,8 @@
         launcher:screen="4"
         launcher:x="4"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="us.spotco.fennec_dos"
-            launcher:className="org.mozilla.gecko.LauncherActivity" />
-        <favorite
-            launcher:packageName="org.mozilla.fennec_fdroid"
-            launcher:className="org.mozilla.gecko.LauncherActivity" />
-        <favorite
-            launcher:packageName="org.gnu.icecat"
-            launcher:className="org.mozilla.gecko.LauncherActivity" />
-        <favorite
-            launcher:packageName="org.mozilla.firefox"
-            launcher:className="org.mozilla.gecko.LauncherActivity" />
-        <favorite
-            launcher:packageName="org.chromium.chrome"
-            launcher:className="org.chromium.chrome.ChromeLauncherActivity" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="5"
-        launcher:x="5"
-        launcher:y="0" >
-        <favorite
-            launcher:packageName="org.lineageos.snap"
-            launcher:className="com.android.camera.CameraLauncher" />
-        <favorite
-            launcher:packageName="org.cyanogenmod.snap"
-            launcher:className="com.android.camera.CameraLauncher" />
-        <favorite
-            launcher:packageName="com.android.camera2"
-            launcher:className="com.android.camera.CameraLauncher" />
-        <favorite
-            launcher:packageName="net.sourceforge.opencamera"
-            launcher:className="net.sourceforge.opencamera.MainActivity" />
+        <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
     </resolve>
 
 </favorites>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x7.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x7.xml
new file mode 100644
index 00000000..12263a12
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x7.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source 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">
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer, Messaging, 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" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
+        <favorite launcher:uri="sms:" />
+        <favorite launcher:uri="smsto:" />
+        <favorite launcher:uri="mms:" />
+        <favorite launcher:uri="mmsto:" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
+        <favorite launcher:uri="http://www.example.com/" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
+    </resolve>
+
+</favorites>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_6x5.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_6x5.xml
new file mode 100644
index 00000000..12263a12
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_6x5.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source 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">
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer, Messaging, 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" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
+        <favorite launcher:uri="sms:" />
+        <favorite launcher:uri="smsto:" />
+        <favorite launcher:uri="mms:" />
+        <favorite launcher:uri="mmsto:" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
+        <favorite launcher:uri="http://www.example.com/" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
+    </resolve>
+
+</favorites>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_6x6.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_6x6.xml
new file mode 100644
index 00000000..12263a12
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_6x6.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source 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">
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer, Messaging, 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" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
+        <favorite launcher:uri="sms:" />
+        <favorite launcher:uri="smsto:" />
+        <favorite launcher:uri="mms:" />
+        <favorite launcher:uri="mmsto:" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
+        <favorite launcher:uri="http://www.example.com/" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
+    </resolve>
+
+</favorites>