diff --git a/jelly_star/jelly_star.mk b/jelly_star/jelly_star.mk
index aa8540a..4c5295e 100644
--- a/jelly_star/jelly_star.mk
+++ b/jelly_star/jelly_star.mk
@@ -8,9 +8,39 @@ PRODUCT_DEVICE := jelly_star
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := GSI on ARM64
 
+PRODUCT_COPY_FILES += \
+	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
 PRODUCT_CHARACTERISTICS := device
 PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT :=
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS :=
 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
 PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true
 QSB_ON_FIRST_SCREEN := false
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/jelly_star/overlay
+
+PRODUCT_PACKAGES += \
+	BreezyWeather \
+	Contacts \
+	Conversations \
+	ConverterNow \
+	Davx5 \
+	DeskClock \
+	Etar \
+	Gallery2 \
+	K-9Mail \
+	Linphone \
+	MuPDFViewer \
+	Nextcloud \
+	OpenDocumentReader \
+	SimpleCalculator \
+	SimpleCamera \
+	TranslateYou \
+	TrichromeWebView \
+	Wireguard
+
+PRODUCT_PACKAGES -= \
+	EasterEgg \
+	webview \
+	libwebviewchromium_loader \
+	libwebviewchromium_plat_support
diff --git a/jelly_star/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png b/jelly_star/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
new file mode 100644
index 0000000..14109dc
Binary files /dev/null and b/jelly_star/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png differ
diff --git a/jelly_star/overlay/frameworks/base/core/res/res/values/config.xml b/jelly_star/overlay/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..b3ab443
--- /dev/null
+++ b/jelly_star/overlay/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+	<string-array translatable="false" name="config_tether_usb_regexs">
+		<item>"usb\\d"</item>
+		<item>"rndis\\d"</item>
+	</string-array>
+
+	<string-array translatable="false" name="config_tether_wifi_regexs">
+		<item>"wlan0"</item>
+		<item>"softap.*"</item>
+		<item>"wifi_br0"</item>
+		<item>"wigig0"</item>
+	</string-array>
+
+	<string-array translatable="false" name="config_tether_bluetooth_regexs">
+        <item>bnep\\d</item>
+		<item>"bt-pan"</item>
+	</string-array>
+
+	<bool name="config_enableAutoPowerModes">true</bool>
+	<bool name="config_intrusiveNotificationLed">true</bool>
+	<string name="config_icon_mask" translatable="false">"M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z"</string>
+	<bool name="config_useRoundIcon">true</bool>
+
+	<string name="config_wallpaperCropperPackage">com.android.wallpaperpicker</string>
+	<bool name="config_unplugTurnsOnScreen">true</bool>
+	<integer name="config_multiuserMaximumUsers">5</integer>
+	<bool name="config_enableMultiUserUI">true</bool>
+
+	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
+	<bool name="config_swipe_up_gesture_setting_available">true</bool>
+	<bool name="config_smart_battery_available">true</bool>
+	<dimen name="config_dialogCornerRadius">8.0dip</dimen>
+	<dimen name="config_buttonCornerRadius">4.0dip</dimen>
+
+	<bool name="config_cellBroadcastAppLinks">true</bool>
+
+    <array name="config_availableColorModes">
+        <!-- ColorDisplayManager.COLOR_MODE_NATURAL -->
+        <item>0</item>
+        <!-- ColorDisplayManager.COLOR_MODE_BOOSTED -->
+        <item>1</item>
+        <!-- ColorDisplayManager.COLOR_MODE_SATURATED -->
+        <item>2</item>
+        <!-- ColorDisplayManager.COLOR_MODE_AUTOMATIC -->
+        <item>3</item>
+    </array>
+
+    <bool name="config_supportAudioSourceUnprocessed">true</bool>
+
+    <string name="config_displayLightSensorType" translatable="false">android.sensor.light</string>
+
+    <integer name="config_defaultNightMode">2</integer>
+    
+    <bool name="config_useDevInputEventForAudioJack">true</bool>
+</resources>
diff --git a/jelly_star/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml b/jelly_star/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml
new file mode 100644
index 0000000..1db99d8
--- /dev/null
+++ b/jelly_star/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 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.
+-->
+
+<webviewproviders>
+    <!-- The default WebView implementation -->
+    <webviewprovider description="Vanadium" packageName="app.vanadium.webview" availableByDefault="true">
+    </webviewprovider>
+</webviewproviders>
diff --git a/jelly_star/system.prop b/jelly_star/system.prop
new file mode 100644
index 0000000..7e9a401
--- /dev/null
+++ b/jelly_star/system.prop
@@ -0,0 +1,11 @@
+# Fixed Bluetooth audio
+persist.bluetooth.bluetooth_audio_hal.disabled=true
+persist.sys.bt.unsupport.features=00000000
+persist.sys.bt.unsupport.states=00000000
+persist.sys.bt.unsupport.stdfeatures=000001
+qemu.hw.mainkeys=1
+hw.lcd.width = 716
+hw.lcd.height = 720
+hw.lcd.depth = 24
+hw.lcd.density = 220
+ro.sf.lcd_density=220