diff --git a/config/common.mk b/config/common.mk
index c2db795c..cf9db005 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -154,6 +154,16 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGE_OVERLAYS += vendor/replicant/overlay/dictionaries
 PRODUCT_PACKAGE_OVERLAYS += vendor/replicant/overlay/common
 
+ifeq ($(USE_OPENGL_RENDERER),true)
+PRODUCT_PACKAGE_OVERLAYS += vendor/replicant/overlay/opengl
+else
+BOARD_EGL_CFG := vendor/replicant/prebuilt/softwaregl/configs/egl.cfg
+
+PRODUCT_PROPERTY_OVERRIDES += ro.softwaregl=true
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/replicant/overlay/softwaregl
+endif
+
 PRODUCT_VERSION_MAJOR = 4
 PRODUCT_VERSION_MINOR = 2
 PRODUCT_VERSION_MAINTENANCE = 2
diff --git a/config/common_full.mk b/config/common_full.mk
index 97137925..82b1e93c 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -13,7 +13,7 @@ $(call inherit-product, frameworks/base/data/videos/VideoPackage2.mk)
 # Include CM audio files
 include vendor/replicant/config/cm_audio.mk
 
-# Optional CM packages
+ifeq ($(USE_OPENGL_RENDERER),true)
 PRODUCT_PACKAGES += \
     HoloSpiralWallpaper \
     MagicSmokeWallpapers \
@@ -23,3 +23,4 @@ PRODUCT_PACKAGES += \
     LiveWallpapersPicker \
     VisualizationWallpapers \
     PhaseBeam
+endif
diff --git a/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace.xml b/overlay/opengl/packages/apps/Trebuchet/res/xml/default_workspace.xml
similarity index 100%
rename from overlay/common/packages/apps/Trebuchet/res/xml/default_workspace.xml
rename to overlay/opengl/packages/apps/Trebuchet/res/xml/default_workspace.xml
diff --git a/overlay/softwaregl/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/softwaregl/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
new file mode 100644
index 00000000..e8f24243
--- /dev/null
+++ b/overlay/softwaregl/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,22 @@
+<?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.
+ */
+-->
+<resources>
+    <fraction name="def_window_animation_scale">0%</fraction>
+    <fraction name="def_window_transition_scale">0%</fraction>
+</resources>
diff --git a/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace.xml b/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace.xml
new file mode 100644
index 00000000..ab2702d9
--- /dev/null
+++ b/overlay/softwaregl/packages/apps/Trebuchet/res/xml/default_workspace.xml
@@ -0,0 +1,122 @@
+<?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/com.cyanogenmod.trebuchet">
+    <!-- Far-left screen [0] -->
+
+    <!-- Left screen [1] -->
+    <appwidget
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge"
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+    <favorite
+        launcher:packageName="com.android.camera"
+        launcher:className="com.android.camera.Camera"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="3" />
+    <favorite
+        launcher:packageName="com.android.gallery"
+        launcher:className="com.android.camera.GalleryPicker"
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="3" />
+
+    <!-- Middle screen [2] -->
+    <appwidget
+        launcher:packageName="com.android.deskclock"
+        launcher:className="com.android.alarmclock.AnalogAppWidgetProvider"
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="0"
+        launcher:spanX="2"
+        launcher:spanY="2" />
+    <favorite
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.ui.activities.HomeActivity"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="3" />
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
+        launcher:screen="2"
+        launcher:x="3"
+        launcher:y="3" />
+
+    <!-- Right screen [3] -->
+    <appwidget
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:screen="3"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="1" />
+    <favorite
+        launcher:packageName="org.fdroid.fdroid"
+        launcher:className="org.fdroid.fdroid.FDroid"
+        launcher:screen="3"
+        launcher:x="1"
+        launcher:y="3" />
+    <favorite
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.Settings"
+        launcher:screen="3"
+        launcher:x="2"
+        launcher:y="3" />
+
+    <!-- Far-right screen [4] -->
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <favorite
+        launcher:packageName="com.android.contacts"
+        launcher:className="com.android.contacts.activities.DialtactsActivity"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.contacts"
+        launcher:className="com.android.contacts.activities.PeopleActivity"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="1"
+        launcher:y="0" />
+    <allapps
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="2"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.mms"
+        launcher:className="com.android.mms.ui.ConversationList"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="3"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.browser"
+        launcher:className="com.android.browser.BrowserActivity"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="4"
+        launcher:y="0" />
+</favorites>
diff --git a/prebuilt/softwaregl/configs/egl.cfg b/prebuilt/softwaregl/configs/egl.cfg
new file mode 100644
index 00000000..c4a14376
--- /dev/null
+++ b/prebuilt/softwaregl/configs/egl.cfg
@@ -0,0 +1 @@
+0 0 android