diff --git a/config/packages.mk b/config/packages.mk
index 6eb6495..84e28cc 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -13,7 +13,8 @@
     OpenDelta \
     Turbo \
     OmniRecord \
-    WallpaperPicker2
+    WallpaperPicker2 \
+    ThemePicker
 
 # Additional tools
 PRODUCT_PACKAGES += \
diff --git a/prebuilt/etc/permissions/privapp-permissions-omni.xml b/prebuilt/etc/permissions/privapp-permissions-omni.xml
index b6a8f89..5ed75ad 100644
--- a/prebuilt/etc/permissions/privapp-permissions-omni.xml
+++ b/prebuilt/etc/permissions/privapp-permissions-omni.xml
@@ -77,4 +77,9 @@
         <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
     </privapp-permissions>
 
+    <privapp-permissions package="com.android.customization">
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
+        <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
+    </privapp-permissions>
 </permissions>
diff --git a/utils/emulator/packages.mk b/utils/emulator/packages.mk
index 907e9a7..0d77903 100644
--- a/utils/emulator/packages.mk
+++ b/utils/emulator/packages.mk
@@ -14,7 +14,8 @@
     OpenDelta \
     Turbo \
     OmniRecord \
-    WallpaperPicker2
+    WallpaperPicker2 \
+    ThemePicker
 
 # Additional tools
 PRODUCT_PACKAGES += \