diff --git a/config/common.mk b/config/common.mk
index f6ab3f8..add3264 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -72,6 +72,9 @@
 PRODUCT_COPY_FILES += \
     vendor/cm/prebuilt/common/etc/mkshrc:system/etc/mkshrc
 
+# T-Mobile theme engine
+include vendor/cm/config/themes_common.mk
+
 # Required CM packages
 PRODUCT_PACKAGES += \
     Camera \
diff --git a/config/permissions/com.tmobile.software.themes.xml b/config/permissions/com.tmobile.software.themes.xml
new file mode 100644
index 0000000..f1c2f54
--- /dev/null
+++ b/config/permissions/com.tmobile.software.themes.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<permissions>
+    <feature name="com.tmobile.software.themes" />
+</permissions>
+
diff --git a/config/themes_common.mk b/config/themes_common.mk
new file mode 100644
index 0000000..919b4a1
--- /dev/null
+++ b/config/themes_common.mk
@@ -0,0 +1,8 @@
+# T-Mobile theme engine
+PRODUCT_PACKAGES += \
+       ThemeManager \
+       ThemeChooser \
+       com.tmobile.themes
+
+PRODUCT_COPY_FILES += \
+       vendor/cm/config/permissions/com.tmobile.software.themes.xml:system/etc/permissions/com.tmobile.software.themes.xml