diff --git a/overlay/softwaregl/packages/apps/Trebuchet/res/values/strings.xml b/overlay/softwaregl/packages/apps/Trebuchet/res/values/strings.xml
new file mode 100644
index 00000000..48d1d874
--- /dev/null
+++ b/overlay/softwaregl/packages/apps/Trebuchet/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2019 ADHOC
+*
+* 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.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="calls">Calls</string>
+    <string name="browsers">Browsers</string>
+</resources>
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 02c5f5ff..25275ae4 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
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod Project
+<!-- Copyright (C) 2019 ADHOC
+               (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.
@@ -15,138 +16,85 @@
 -->
 
 <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="4"
-        launcher:spanY="2" />
+    <!-- Single screen [1] -->
+    <favorite
+            launcher:packageName="com.simplemobiletools.gallery.pro"
+            launcher:className="com.simplemobiletools.gallery.pro.activities.SplashActivity.Orange"
+            launcher:screen="1"
+            launcher:x="3"
+            launcher:y="2" />
 
     <favorite
             launcher:packageName="com.android.contacts"
             launcher:className="com.android.contacts.activities.PeopleActivity"
             launcher:screen="1"
+            launcher:x="0"
+            launcher:y="3" />
+
+    <favorite
+            launcher:packageName="com.fsck.k9"
+            launcher:className="com.fsck.k9.activity.Accounts"
+            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="com.android.calculator2"
+            launcher:className="com.android.calculator2.Calculator"
+            launcher:screen="1"
+            launcher:x="2"
+            launcher:y="3" />
 
     <favorite
-            launcher:packageName="fil.libre.repwifiapp"
-            launcher:className="fil.libre.repwifiapp.activities.MainActivity"
+            launcher:packageName="com.android.camera"
+            launcher:className="com.android.camera.Camera"
             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="4"
-        launcher:spanY="2" />
-
-    <favorite
-        launcher:packageName="com.android.email"
-        launcher:className="com.android.email.activity.Welcome"
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="3" />
-
-    <resolve
-        launcher:screen="2"
-        launcher:x="1"
-        launcher:y="3" >
-        <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="2"
-        launcher:y="3" />
-
-    <favorite
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.Settings"
-        launcher:screen="2"
-        launcher:x="3"
-        launcher:y="3" />
-
     <!-- 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" />
+    <folder
+            launcher:title="@string/calls"
+            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:packageName="org.linphone"
+                    launcher:className="org.linphone.activities.LinphoneLauncherActivity" />
+    </folder>
 
-        <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>
+    <favorite
+            launcher:packageName="org.smssecure.smssecure"
+            launcher:className="org.smssecure.smssecure.RoutingActivity"
+            launcher:container="-101"
+            launcher:screen="1"
+            launcher:x="1"
+            launcher:y="0" />
 
-    <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>
+    <favorite
+            launcher:packageName="eu.siacs.conversations"
+            launcher:className="eu.siacs.conversations.ui.ConversationActivity"
+            launcher:container="-101"
+            launcher:screen="3"
+            launcher:x="2"
+            launcher:y="0" />
 
-    <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>
+    <folder
+            launcher:title="@string/browsers"
+            launcher:container="-101"
+            launcher:screen="4"
+            launcher:x="4"
+            launcher:y="0" >
+            <favorite
+                    launcher:packageName="com.stoutner.privacybrowser.standard"
+                    launcher:className="com.stoutner.privacybrowser.activities.MainWebViewActivity" />
+            <favorite
+                    launcher:packageName="org.torproject.torbrowser_alpha"
+                    launcher:className="org.torproject.torbrowser_alpha.App" />
+    </folder>
 
 </favorites>