diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index e48d937d..b7937c1e 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -74,5 +74,5 @@ PRODUCT_PACKAGES += \
 # Themes
 PRODUCT_PACKAGES += \
     LineageBlackTheme \
-    LineageThemesStub \
-    ThemePicker
+    ThemePicker \
+    ThemesStub
diff --git a/overlay/common/packages/apps/ThemePicker/res_override/values/override.xml b/overlay/common/packages/apps/ThemePicker/res_override/values/override.xml
deleted file mode 100644
index 5b78cf2f..00000000
--- a/overlay/common/packages/apps/ThemePicker/res_override/values/override.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-     Copyright (C) 2018 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>
-    <!-- Package of the stub apk containing the themes descriptions -->
-    <string name="themes_stub_package" translatable="false">org.lineageos.customization</string>
-    <!-- Package of the stub apk containing the clock content -->
-    <string name="clocks_stub_package" translatable="false">org.lineageos.customization</string>
-</resources>