diff --git a/config/packages.mk b/config/packages.mk
index 7eb0581..1a7b462 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -8,8 +8,6 @@
     OmniChange \
     OmniStoreInstallerPrebuilt \
     OpenDelta \
-    ThemePicker \
-    SystemWebView \
     WallpaperCropper2
 
 # Additional tools
@@ -33,6 +31,8 @@
     OmniRemote
 
 #PRODUCT_PACKAGES += \
+    SystemWebView \
+    ThemePicker \
     OmniOverlayStub \
     omni-overlays