diff --git a/LICENSE b/LICENSE
index cdec959c8d679837df7ffb7bc79839189a661c38..dd240aca7aa468fa93939ba95ad422a477f2f121 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,6 @@
    Copyright 2011-15 The CyanogenMod Project
              2017    The LineageOS Project
+             2019-21 E FOUNDATION
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/build/target/product/lineage_sdk_phone_arm64.mk b/build/target/product/lineage_sdk_phone_arm64.mk
index a1f5afa847eb1db221c37b4d231f7eceaa5f3c71..988d50036b2e3005fb9a583970b0c151ee7a9e13 100644
--- a/build/target/product/lineage_sdk_phone_arm64.mk
+++ b/build/target/product/lineage_sdk_phone_arm64.mk
@@ -15,6 +15,9 @@
 $(call inherit-product, device/generic/goldfish/64bitonly/product/sdk_phone64_arm64.mk)
 $(call inherit-product, vendor/lineage/build/target/product/lineage_sdk_phone_arm64_board.mk)
 
+# Inherit tablet common Lineage stuff
+$(call inherit-product, vendor/lineage/config/tablet.mk)
+
 include vendor/lineage/build/target/product/lineage_generic_target.mk
 
 # Always build modules from source
@@ -25,7 +28,7 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 
 # Overrides
 PRODUCT_NAME := lineage_sdk_phone_arm64
-PRODUCT_MODEL := LineageOS Android SDK built for arm64
+PRODUCT_MODEL := /e/ os Android SDK built for arm64
 
 PRODUCT_SDK_ADDON_NAME := lineage
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := vendor/lineage/build/target/product/source.properties
diff --git a/build/target/product/lineage_sdk_phone_x86_64.mk b/build/target/product/lineage_sdk_phone_x86_64.mk
index 59fe59d4b1caa170510ba5ee1ebc5305375db5dc..fa7af98032fd62c5dd7afcf9d9568a7c78241675 100644
--- a/build/target/product/lineage_sdk_phone_x86_64.mk
+++ b/build/target/product/lineage_sdk_phone_x86_64.mk
@@ -17,6 +17,9 @@ $(call inherit-product, device/generic/goldfish/64bitonly/product/sdk_phone64_x8
 include vendor/lineage/build/target/product/lineage_generic_target.mk
 include device/generic/goldfish/board/kernel/x86_64.mk
 
+# Inherit tablet common Lineage stuff
+$(call inherit-product, vendor/lineage/config/tablet.mk)
+
 # Always build modules from source
 PRODUCT_MODULE_BUILD_FROM_SOURCE := true
 
@@ -25,7 +28,7 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 
 # Overrides
 PRODUCT_NAME := lineage_sdk_phone_x86_64
-PRODUCT_MODEL := LineageOS Android SDK built for x86_64
+PRODUCT_MODEL := /e/ os Android SDK built for x86_64
 
 PRODUCT_SDK_ADDON_NAME := lineage
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := $(LOCAL_PATH)/source.properties
diff --git a/build/target/product/security/lineage.x509.pem b/build/target/product/security/lineage.x509.pem
deleted file mode 100644
index edbe469525be21f89ca6610cecf033ff8a0c4001..0000000000000000000000000000000000000000
--- a/build/target/product/security/lineage.x509.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDszCCApugAwIBAgIJAOEEE8dzw8VPMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApXYXNoaW5ndG9uMRAwDgYDVQQHDAdTZWF0dGxlMRIw
-EAYDVQQKDAlMaW5lYWdlT1MxEjAQBgNVBAsMCUxpbmVhZ2VPUzESMBAGA1UEAwwJ
-TGluZWFnZU9TMB4XDTE3MDEwNzA0MjEyNVoXDTQ0MDUyNTA0MjEyNVowcDELMAkG
-A1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUx
-EjAQBgNVBAoMCUxpbmVhZ2VPUzESMBAGA1UECwwJTGluZWFnZU9TMRIwEAYDVQQD
-DAlMaW5lYWdlT1MwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmTdPh
-+EIDj/A/Z7jpvwlTD8KRPLU+NlTHjsINvIsecRNijKWrwIYFYMtELBtR+Yttzl5Z
-xJA38n9k9IrvBJCrmRBvCAeiEw4aizqs2DTmVvCFS2Amd7ZsAHsUwtDCjQ3GE0He
-ZI2HnbWannnhKIhzGjuxxh+1j3JawHHeErYQk97MVoWsJHTO4s8i8ORL8ghBDZHF
-0fYKp5RVSIIrrXVqcOD+F8g/NeX6Wb5N0rRGBI+bQjMhhv8KpH7TnCEN6f2YHFVx
-nsjzDKrEQVwhYF8T9X0OzfBoLEhOlFZ0jevoDi8uCxz0f7ldkv/0Zz4W9jeB87LH
-zUuQQEGr6134UFmZAgMBAAGjUDBOMB0GA1UdDgQWBBRyljIn1mxMTV+gkWrCLHk8
-1F9DXDAfBgNVHSMEGDAWgBRyljIn1mxMTV+gkWrCLHk81F9DXDAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCKJH4ByccucWfewkmT8j9TnAdhjCgZ7k0+
-rpbSgxc66+ESRpQFxMSAUu8exy8pSawGd7SerFBVvqL+dajdPfyLPM+I+xDEoMJ3
-ncKGHoC0RRKMGEhc4rS090/wOJJHZZtThlcjdND5vybMwmHngzl8o4CNWhneJvjb
-hNkqxocrC9vGCsdo5Kx00ULn8sXVwcq7yl0bqtuSMlKxm6CVA3DVVnB8N8OZyTam
-fgj9F0jOpWVtit1/ohd+1jB5bY3g+ulXCydKBFkJhNXAZf4welNG61SWLkH1gNGk
-SEYxEuLV9JGjm7n5oqDKxYVcKKNfvbGtSmrqsq6i+QVuc/xIdzfr
------END CERTIFICATE-----
-
diff --git a/build/tasks/bacon.mk b/build/tasks/bacon.mk
index 272a4b8efa60ff2f6c3f935bb6567b79df77782d..57c5d9cd145b2213f455c9ab78ac1f677c7cc26b 100644
--- a/build/tasks/bacon.mk
+++ b/build/tasks/bacon.mk
@@ -16,7 +16,7 @@
 # -----------------------------------------------------------------
 # Lineage OTA update package
 
-LINEAGE_TARGET_PACKAGE := $(PRODUCT_OUT)/lineage-$(LINEAGE_VERSION).zip
+LINEAGE_TARGET_PACKAGE := $(PRODUCT_OUT)/e-$(LINEAGE_VERSION).zip
 
 SHA256 := prebuilts/build-tools/path/$(HOST_PREBUILT_TAG)/sha256sum
 
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index ee8ad82ada49bab81714787ec4be9280fab8f381..959dab6549d523ce036e5ae7404f69bc94219da1 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -91,6 +91,16 @@ ifneq ($(TARGET_USES_MTK_APNS_CONF),)
     $(call soong_config_set,lineageGlobalVars,uses_mtk_apns_conf,$(TARGET_USES_MTK_APNS_CONF))
 endif
 
+# MTK APNs
+ifneq ($(TARGET_USES_MTK_APNS_CONF),)
+    # The vendor/apn file selection logic relies on old namespace
+    # Bring back old namespace to keep having single branch for vendor/apn
+    $(call add_soong_config_namespace,lineageGlobalVars)
+    $(call add_soong_config_var,lineageGlobalVars,uses_mtk_apns_conf)
+    # Set our soong config variable into old namespace
+    $(call soong_config_set,lineageGlobalVars,uses_mtk_apns_conf,$(TARGET_USES_MTK_APNS_CONF))
+endif
+
 # Surfaceflinger
 ifneq ($(TARGET_SURFACEFLINGER_UDFPS_LIB),)
     $(error TARGET_SURFACEFLINGER_UDFPS_LIB is deprecated, please migrate to soong_config_set,surfaceflinger,udfps_lib)
diff --git a/config/common.mk b/config/common.mk
index 1e4a825fb0429b9b0d834065908d65ed1e28c292..1330d6d639c1b502e7c9c0da51db8cb86d77b3f1 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -46,11 +46,7 @@ endif
 # Backup Tool
 PRODUCT_COPY_FILES += \
     vendor/lineage/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
-    vendor/lineage/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
-    vendor/lineage/prebuilt/common/bin/50-lineage.sh:$(TARGET_COPY_OUT_SYSTEM)/addon.d/50-lineage.sh
-
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
-    system/addon.d/50-lineage.sh
+    vendor/lineage/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions 
 
 ifneq ($(strip $(AB_OTA_PARTITIONS) $(AB_OTA_POSTINSTALL_CONFIG)),)
 PRODUCT_COPY_FILES += \
@@ -282,12 +278,11 @@ CUSTOM_LOCALES += \
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/crowdin/overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/crowdin/overlay
 
-PRODUCT_EXTRA_RECOVERY_KEYS += \
-    vendor/lineage/build/target/product/security/lineage
-
 include vendor/lineage/config/version.mk
 
 -include vendor/lineage-priv/keys/keys.mk
 
 -include $(WORKSPACE)/build_env/image-auto-bits.mk
--include vendor/lineage/config/partner_gms.mk
+
+# Include configuration for eos
+$(call inherit-product, vendor/eos/config/common.mk)
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index 758a5b43d6b22f6b191de87c55ebe000d72f8638..b078c8a1fc46475f09ae09921a1cc09c94310886 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -8,11 +8,6 @@ include vendor/lineage/config/aosp_audio.mk
 # Include Lineage audio files
 include vendor/lineage/config/lineage_audio.mk
 
-# Default notification/alarm sounds
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.config.notification_sound=Argon.ogg \
-    ro.config.alarm_alert=Hassium.ogg
-
 # Apps
 PRODUCT_PACKAGES += \
     AvatarPicker \
@@ -35,7 +30,7 @@ PRODUCT_DEXPREOPT_SPEED_APPS += \
 endif
 
 PRODUCT_PACKAGES += \
-    Launcher3Overlay
+    BlissLauncherOverlay
 
 # Charger
 PRODUCT_PACKAGES += \
@@ -73,6 +68,7 @@ PRODUCT_PACKAGES += \
     IconPackVictorLauncherOverlay \
     IconPackVictorSettingsOverlay \
     IconPackVictorSystemUIOverlay \
+    IconShapeCircleOverlay \
     IconShapePebbleOverlay \
     IconShapeRoundedRectOverlay \
     IconShapeSquareOverlay \
@@ -83,7 +79,19 @@ PRODUCT_PACKAGES += \
 
 # Legal
 PRODUCT_SYSTEM_PROPERTIES += \
-    ro.lineagelegal.url=https://lineageos.org/legal
+    ro.lineagelegal.url=https://lineageos.org/legal \
+    ro.elegal.url=https://e.foundation/legal
+
+ifdef CI_PIPELINE_ID
+    PRODUCT_SYSTEM_PROPERTIES += \
+        ro.cm.build.pipeline.id=$(CI_PIPELINE_ID)
+endif
+
+ifdef CI_PIPELINE_IID
+    PRODUCT_SYSTEM_PROPERTIES += \
+        ro.cm.build.pipeline.iid=$(CI_PIPELINE_IID)
+endif
+
 
 # Media
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
@@ -111,3 +119,6 @@ PRODUCT_PACKAGES += \
     LineageBlackTheme \
     ThemePicker \
     ThemesStub
+
+# Include configuration for eos
+$(call inherit-product, vendor/eos/config/common_mobile.mk)
diff --git a/config/common_mobile_full.mk b/config/common_mobile_full.mk
index 22b1acf2f9d30123a9c21a86150bec980c2af4ae..99cc6bc8aa0bdd56e7bcb3ae3e8e3a5adee952da 100644
--- a/config/common_mobile_full.mk
+++ b/config/common_mobile_full.mk
@@ -21,7 +21,7 @@ PRODUCT_PACKAGES += \
     Aperture
 endif
 
-ifneq ($(TARGET_EXCLUDES_AUDIOFX),true)
+ifeq ($(TARGET_INCLUDES_AUDIOFX),true)
 PRODUCT_PACKAGES += \
     AudioFX
 endif
diff --git a/config/partner_gms.mk b/config/partner_gms.mk
deleted file mode 100644
index e754da30d40afda12492bdb0dd54db9929db4f8c..0000000000000000000000000000000000000000
--- a/config/partner_gms.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-ifeq ($(WITH_GMS),true)
-    # Special handling for Android TV
-    ifeq ($(PRODUCT_IS_ATV),true)
-        ifneq (,$(wildcard vendor/partner_gms-tv))
-            ifneq ($(GMS_MAKEFILE),)
-                # Specify the GMS makefile you want to use, for example:
-                #   - gms.mk            - default Android TV GMS
-                #   - gms_gtv.mk        - default Google TV GMS
-                #   - gms_minimal.mk    - minimal Android TV GMS
-                $(call inherit-product, vendor/partner_gms-tv/products/$(GMS_MAKEFILE))
-            else
-                $(call inherit-product-if-exists, vendor/partner_gms-tv/products/gms.mk)
-            endif
-            $(call inherit-product-if-exists, vendor/partner_gms-tv/products/mainline_modules.mk)
-        endif
-    # Special handling for Android Automotive
-    else ifeq ($(PRODUCT_IS_AUTOMOTIVE),true)
-        ifneq (,$(wildcard vendor/partner_gms-car))
-            ifneq ($(GMS_MAKEFILE),)
-                $(call inherit-product, vendor/partner_gms-car/products/$(GMS_MAKEFILE))
-            else
-                $(call inherit-product-if-exists, vendor/partner_gms-car/products/gms.mk)
-            endif
-        endif
-   else
-        ifneq (,$(wildcard vendor/partner_gms))
-            # Specify the GMS makefile you want to use, for example:
-            #   - fi.mk             - Project Fi
-            #   - gms.mk            - default GMS
-            #   - gms_go.mk         - low ram devices
-            #   - gms_go_2gb.mk     - low ram devices (2GB)
-            #   - gms_64bit_only.mk - devices supporting 64-bit only
-            #   - gms_minimal.mk    - minimal GMS
-            ifneq ($(GMS_MAKEFILE),)
-                $(call inherit-product, vendor/partner_gms/products/$(GMS_MAKEFILE))
-            else
-                $(call inherit-product-if-exists, vendor/partner_gms/products/gms.mk)
-            endif
-        endif
-
-        ifneq (,$(wildcard vendor/partner_modules))
-            # Specify the mainline module makefile you want to use, for example:
-            #   - mainline_modules.mk              - updatable apex
-            #   - mainline_modules_flatten_apex.mk - flatten apex
-            #   - mainline_modules_low_ram.mk      - low ram devices
-            ifneq ($(MAINLINE_MODULES_MAKEFILE),)
-                $(call inherit-product, vendor/partner_modules/build/$(MAINLINE_MODULES_MAKEFILE))
-            endif
-        endif
-    endif
-endif
diff --git a/config/tablet.mk b/config/tablet.mk
index dff7e7b7096e918935c01252bd0232433b706c88..dc2d839cd7f64c91252f8e8466d71e1bf0a75c68 100644
--- a/config/tablet.mk
+++ b/config/tablet.mk
@@ -6,3 +6,6 @@ PRODUCT_COPY_FILES += \
 
 # Tablet-specific overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/tablet
+
+PRODUCT_PACKAGES += \
+    BackgroundsTablet
diff --git a/config/telephony.mk b/config/telephony.mk
index 0c6ebba88de3311046181caa58b872e5d41c8502..fb67949025de6b2cdf1a9fb33b827ed1179e6aab 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -16,15 +16,15 @@ PRODUCT_PACKAGES += \
     messaging \
     Stk
 
-# Default ringtone
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.config.ringtone=Orion.ogg
-
 # Tethering - allow without requiring a provisioning app
 # (for devices that check this)
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     net.tethering.noprovisioning=true
 
-# Disable mobile data by default
+# Enable mobile data by default
 PRODUCT_PRODUCT_PROPERTIES += \
-    ro.com.android.mobiledata=false
+    ro.com.android.prov_mobiledata=true \
+    ro.com.android.mobiledata=true
+
+# Include configuration for eos
+$(call inherit-product, vendor/eos/config/telephony.mk)
diff --git a/config/version.mk b/config/version.mk
index 985693f0a27995f64299a769089d438e06847750..df92f7dbf368a3a0023b6f744b674b40d64a0f62 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -1,5 +1,16 @@
-PRODUCT_VERSION_MAJOR = 23
-PRODUCT_VERSION_MINOR = 0
+ANDROID_LETTER := a16
+PRODUCT_VERSION_MAJOR = 3
+PRODUCT_VERSION_MINOR = 3
+PRODUCT_VERSION_MAINTENANCE := 0
+PRODUCT_PRERELEASE_STRING =
+
+ifdef PRODUCT_PRERELEASE
+    ifdef PRODUCT_PRERELEASE_VERSION
+        PRODUCT_PRERELEASE_STRING = -$(PRODUCT_PRERELEASE).$(PRODUCT_PRERELEASE_VERSION)
+    else
+        PRODUCT_PRERELEASE_STRING = -$(PRODUCT_PRERELEASE)
+    endif
+endif
 
 ifeq ($(LINEAGE_VERSION_APPEND_TIME_OF_DAY),true)
     LINEAGE_BUILD_DATE := $(shell date -u +%Y%m%d_%H%M%S)
@@ -18,7 +29,7 @@ ifndef LINEAGE_BUILDTYPE
 endif
 
 # Filter out random types, so it'll reset to UNOFFICIAL
-ifeq ($(filter RELEASE NIGHTLY SNAPSHOT EXPERIMENTAL,$(LINEAGE_BUILDTYPE)),)
+ifeq ($(filter test community official partner,$(LINEAGE_BUILDTYPE)),)
     LINEAGE_BUILDTYPE := UNOFFICIAL
     LINEAGE_EXTRAVERSION :=
 endif
@@ -29,17 +40,22 @@ ifeq ($(LINEAGE_BUILDTYPE), UNOFFICIAL)
     endif
 endif
 
-LINEAGE_VERSION_SUFFIX := $(LINEAGE_BUILD_DATE)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
+LINEAGE_VERSION_SUFFIX := $(LINEAGE_BUILD_DATE)$(CI_PIPELINE_ID)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
 
 # Internal version
-LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(LINEAGE_VERSION_SUFFIX)
+ifeq ($(PRODUCT_VERSION_MAINTENANCE),0)
+    LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)$(PRODUCT_PRERELEASE_STRING)-$(ANDROID_LETTER)-$(LINEAGE_VERSION_SUFFIX)
+else
+    PRODUCT_VERSION_OPTIONAL := .$(PRODUCT_VERSION_MAINTENANCE)
+    LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_PRERELEASE_STRING)-$(ANDROID_LETTER)-$(LINEAGE_VERSION_SUFFIX)
+endif
 
 # Display version
-LINEAGE_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR)-$(LINEAGE_VERSION_SUFFIX)
+LINEAGE_DISPLAY_VERSION := $(LINEAGE_VERSION)
 
 # LineageOS version properties
 PRODUCT_SYSTEM_PROPERTIES += \
     ro.lineage.version=$(LINEAGE_VERSION) \
     ro.lineage.display.version=$(LINEAGE_DISPLAY_VERSION) \
-    ro.lineage.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR) \
+    ro.lineage.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)$(PRODUCT_VERSION_OPTIONAL) \
     ro.lineage.releasetype=$(LINEAGE_BUILDTYPE)
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png
index c38e6e0d3710e63ecbb42bdf0a481d59f53e5255..62216628de95c525e02cd0c0e06d0f6a114587a1 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
index a60c013e77b7b874895d8893a2842220e821a367..62216628de95c525e02cd0c0e06d0f6a114587a1 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png
index 10b06e32db8b8879c9c4580a05e15e8d364277e9..ee2faf266f5a019b52e018c05809135577c395b0 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png
index 10b06e32db8b8879c9c4580a05e15e8d364277e9..ee2faf266f5a019b52e018c05809135577c395b0 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png
index 4134452c2f09a43de5cf0175e70a653ec80ff56e..62216628de95c525e02cd0c0e06d0f6a114587a1 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png
index 10b06e32db8b8879c9c4580a05e15e8d364277e9..da284b8161ea294c22713312d8dc6451d725c5c8 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png
index 0eceece7d96e9453933cac839886ce8956f21ca3..da284b8161ea294c22713312d8dc6451d725c5c8 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 7ab09ba58bd13522e0040a6ceae35ba86017ea63..4959398b464c347b8cfef92ff214cc27f4652f23 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -38,8 +38,6 @@
         <item>com.google.android.gms</item>
         <!-- The standard AOSP fused location provider -->
         <item>com.android.location.fused</item>
-        <!-- The MicroG Unified location provider -->
-        <item>org.microg.nlp</item>
     </string-array>
 
     <string-array name="config_locationExtraPackageNames" translatable="false">
@@ -53,6 +51,9 @@
         <item>com.shannon.imsservice</item>
         <!-- MediaTek ImsService -->
         <item>com.mediatek.ims</item>
+        <!-- The MicroG Unified location provider -->
+        <item>org.microg.nlp.backend.ichnaea</item>
+        <item>org.microg.nlp.backend.nominatim</item>
     </string-array>
 
     <!-- Set this to true to enable the platform's auto-power-save modes like doze and
@@ -74,8 +75,8 @@
     <!--  Maximum number of supported users -->
     <integer name="config_multiuserMaximumUsers">4</integer>
 
-   <!-- Set icon mask to circle -->
-   <string name="config_icon_mask" translatable="false">"M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0"</string>
+    <!-- Set icon mask to circle -->
+    <string name="config_icon_mask">M 78.9068 100.0425 H 21.0206 c -11.6647 0 -21.1077 -9.4484 -21.1077 -21.12 V 21.12 C 0.03 9.4484 9.473 0 21.1377 0 h 57.7688 c 11.6647 0 21.1077 9.4484 21.1077 21.12 v 57.8023 C 100.0146 90.5941 90.5719 100.0425 78.9068 100.0425 z</string>
 
     <!-- Whether action menu items should be displayed in ALLCAPS or not.
          Defaults to true. If this is not appropriate for specific locales
@@ -83,7 +84,7 @@
     <bool name="config_buttonTextAllCaps">false</bool>
 
     <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
-    <bool name="config_useRoundIcon">true</bool>
+    <bool name="config_useRoundIcon">false</bool>
 
     <!-- Whether or not we should show the option to show battery percentage -->
     <bool name="config_battery_percentage_setting_available">false</bool>
@@ -143,14 +144,6 @@
     <!-- Whether this device is supporting the camera toggle -->
     <bool name="config_supportsCamToggle">true</bool>
 
-    <!-- Control the default night mode to use when there is no other mode override set.
-         One of the following values (see UiModeManager.java):
-             0 - MODE_NIGHT_AUTO
-             1 - MODE_NIGHT_NO
-             2 - MODE_NIGHT_YES
-    -->
-    <integer name="config_defaultNightMode">2</integer>
-
     <!-- Boolean indicating whether the HWC setColorTransform function can be performed efficiently
          in hardware. -->
     <bool name="config_setColorTransformAccelerated">true</bool>
@@ -169,6 +162,9 @@
          should also be non-empty.-->
     <string name="config_rawContactsLocalAccountType" translatable="false">com.android.contacts</string>
 
+    <!-- Default component for QR code scanner -->
+    <string name="config_defaultQrCodeComponent" translatable="false">foundation.e.camera/net.sourceforge.opencamera.qr.QrScannerActivity</string>
+
     <!-- Name of the font family to use in the default lockscreen clock -->
     <string name="config_clockFontFamily" translatable="false" />
 </resources>
diff --git a/overlay/common/frameworks/base/core/res/res/values/dimens.xml b/overlay/common/frameworks/base/core/res/res/values/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c78bb7a35abcec6022621ab13bb07ca4aabaa35c
--- /dev/null
+++ b/overlay/common/frameworks/base/core/res/res/values/dimens.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2006, 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>
+    <!-- Corner radius of system dialogs -->
+    <dimen name="config_dialogCornerRadius">4dp</dimen>
+    <!-- Corner radius of system buttons -->
+    <dimen name="config_buttonCornerRadius">4dp</dimen>
+    <!-- Corner radius for bottom sheet system dialogs -->
+    <dimen name="config_bottomDialogCornerRadius">8dp</dimen>
+    <!-- Corner radius of system progress bars -->
+    <dimen name="config_progressBarCornerRadius">1000dp</dimen>
+    <!-- System-provided radius for the background view of app widgets. The resolved value of this resource may change at runtime. -->
+    <dimen name="system_app_widget_background_radius">28dp</dimen>
+    <!-- System-provided radius for inner views on app widgets. The resolved value of this resource may change at runtime. -->
+    <dimen name="system_app_widget_inner_radius">20dp</dimen>
+</resources>
diff --git a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
index 37c5f13e501d9ca536051e850a20bceb5a7ea3d8..56398aa873878f7353714f0812568d0055f0081a 100644
--- a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
@@ -34,5 +34,6 @@
         <item>com.android.messaging</item> <!-- AOSP messaging -->
         <item>com.google.android.setupwizard</item> <!-- Google SetupWizard -->
         <item>org.lineageos.setupwizard</item> <!-- LineageOS SetupWizard -->
+        <item>foundation.e.blisslauncher</item> <!--­ Bliss Launcher -->
     </string-array>
 </resources>
diff --git a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
index 0099c83bb5a9375ac8debb23af8e09ae39720fc9..978a7f4e71688c3f5c7dca7b0baf97340f437494 100644
--- a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
@@ -32,5 +32,6 @@
         <item>com.android.dialer</item> <!-- AOSP dialer -->
         <item>com.google.android.apps.messaging</item> <!-- Google messaging to enable text messaging -->
         <item>com.android.messaging</item> <!-- AOSP messaging -->
+        <item>foundation.e.blisslauncher</item> <!-- Bliss Launcher -->
     </string-array>
 </resources>
diff --git a/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml b/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml
index 0c3e41697c1a0577040b037b65830ea7627f6872..16298140a7622344072345b9ff29c83bf76e53b5 100644
--- a/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml
+++ b/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml
@@ -18,7 +18,7 @@
 -->
 <resources>
 
-    <string name="calendar_component_name" translatable="false">org.lineageos.etar/com.android.calendar.AllInOneActivity</string>
+    <string name="calendar_component_name" translatable="false">foundation.e.calendar/com.android.calendar.AllInOneActivity</string>
     <string name="clock_component_name" translatable="false">com.android.deskclock/com.android.deskclock.DeskClockApplication</string>
 
 </resources>
diff --git a/overlay/common/packages/apps/Settings/res/values/strings.xml b/overlay/common/packages/apps/Settings/res/values/strings.xml
deleted file mode 100644
index 93758ea376e05ff2bcdaa82d6adec11150f04204..0000000000000000000000000000000000000000
--- a/overlay/common/packages/apps/Settings/res/values/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 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.
--->
-<resources>
-    <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
-    <string name="help_url_nfc_payment" translatable="false">https://support.google.com/wallet/answer/1347934</string>
-
-    <!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
-    <string name="help_url_fingerprint" translatable="false">https://support.google.com</string>
-</resources>
-
diff --git a/overlay/common/packages/apps/SimpleDeviceConfig/res/values/config.xml b/overlay/common/packages/apps/SimpleDeviceConfig/res/values/config.xml
index 27c587ae987c5124ecf277198616330da78fda63..d43d31178d34047c055e7a9996b3eefbf29718dd 100644
--- a/overlay/common/packages/apps/SimpleDeviceConfig/res/values/config.xml
+++ b/overlay/common/packages/apps/SimpleDeviceConfig/res/values/config.xml
@@ -60,5 +60,8 @@
         <!-- For SeedVault Backup -->
         <item>backup_and_restore/backup_transport_future_timeout_millis=900000</item>
         <item>backup_and_restore/backup_transport_callback_timeout_millis=900000</item>
+
+        <!-- Disable Splash screen for selective apps -->
+        <item>window_manager/splash_screen_exception_list=foundation.e.accountmanager,foundation.e.pwaplayer</item>
     </string-array>
 </resources>
diff --git a/overlay/rro_packages/Launcher3Overlay/Android.bp b/overlay/rro_packages/BlissLauncherOverlay/Android.bp
similarity index 81%
rename from overlay/rro_packages/Launcher3Overlay/Android.bp
rename to overlay/rro_packages/BlissLauncherOverlay/Android.bp
index 8043464fe0bb10caf7b8df65bede11c3bcf3b611..12cb08515c879f78546324e9e3c62fa9a7c27ead 100644
--- a/overlay/rro_packages/Launcher3Overlay/Android.bp
+++ b/overlay/rro_packages/BlissLauncherOverlay/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "Launcher3Overlay",
+    name: "BlissLauncherOverlay",
     product_specific: true,
 }
diff --git a/overlay/rro_packages/Launcher3Overlay/AndroidManifest.xml b/overlay/rro_packages/BlissLauncherOverlay/AndroidManifest.xml
similarity index 72%
rename from overlay/rro_packages/Launcher3Overlay/AndroidManifest.xml
rename to overlay/rro_packages/BlissLauncherOverlay/AndroidManifest.xml
index b87512af0772a2d5013cba64bda11985ea6cc0a1..1f2b84651890caa61f8efd230a994cefc29b2c06 100644
--- a/overlay/rro_packages/Launcher3Overlay/AndroidManifest.xml
+++ b/overlay/rro_packages/BlissLauncherOverlay/AndroidManifest.xml
@@ -4,10 +4,10 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher3.overlay">
+    package="foundation.e.blisslauncher.overlay">
 
     <overlay
         android:isStatic="true"
         android:priority="100"
-        android:targetPackage="com.android.launcher3" />
+        android:targetPackage="foundation.e.blisslauncher" />
 </manifest>
diff --git a/overlay/rro_packages/Launcher3Overlay/res/values/config.xml b/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
similarity index 75%
rename from overlay/rro_packages/Launcher3Overlay/res/values/config.xml
rename to overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
index 401fc9d5e1cee1684648d3d711ce42e37f5a1a46..285d09c4ae79f80ab6fb536b69a73d9c0b72a4a9 100644
--- a/overlay/rro_packages/Launcher3Overlay/res/values/config.xml
+++ b/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
@@ -19,4 +19,7 @@
     <!-- Default packages -->
     <string name="wallpaper_picker_package" translatable="false">com.android.wallpaper</string>
 
+    <string name="calendar_component_name" translatable="false">foundation.e.calendar/com.android.calendar.AllInOneActivity</string>
+    <string name="clock_component_name" translatable="false">com.android.deskclock/com.android.deskclock.DeskClockApplication</string>
+
 </resources>
diff --git a/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml b/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml
index aef5c9ca1131053143bd6c7ceb926d4f4350b972..26c8e2cdb8cc765b9ce7b21b5350ec12c54348c1 100644
--- a/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml
+++ b/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml
@@ -19,4 +19,16 @@
     <!-- Configuration for including DHCP client hostname option -->
     <bool name="config_dhcp_client_hostname">true</bool>
 
+    <!-- HTTP URL for network validation, to use for detecting captive portals. -->
+    <string name="config_captive_portal_http_url" translatable="false">http://connectivity.murena.io</string>
+
+    <!-- HTTPS URL for network validation, to use for confirming internet connectivity. -->
+    <string name="config_captive_portal_https_url" translatable="false">https://connectivity.murena.io</string>
+
+    <!-- List of fallback URLs to use for detecting captive portals. -->
+    <string-array name="config_captive_portal_fallback_urls" translatable="false">
+        <item>http://204.murena.io</item>
+        <item>http://murena.io/generate_204</item>
+    </string-array>
+
 </resources>
diff --git a/prebuilt/common/bin/50-lineage.sh b/prebuilt/common/bin/50-lineage.sh
deleted file mode 100755
index 7ee38454f607b6dfe3552a380e9ddeac7fec9f40..0000000000000000000000000000000000000000
--- a/prebuilt/common/bin/50-lineage.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/sh
-#
-# ADDOND_VERSION=2
-#
-# /system/addon.d/50-lineage.sh
-# During a LineageOS upgrade, this script backs up /system/etc/hosts,
-# /system is formatted and reinstalled, then the file is restored.
-#
-
-. /tmp/backuptool.functions
-
-list_files() {
-cat <<EOF
-etc/hosts
-EOF
-}
-
-case "$1" in
-  backup)
-    list_files | while read FILE DUMMY; do
-      backup_file $S/"$FILE"
-    done
-  ;;
-  restore)
-    list_files | while read FILE REPLACEMENT; do
-      R=""
-      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
-      [ -f "$C/$S/$FILE" ] && restore_file $S/"$FILE" "$R"
-    done
-  ;;
-  pre-backup)
-    # Stub
-  ;;
-  post-backup)
-    # Stub
-  ;;
-  pre-restore)
-    # Stub
-  ;;
-  post-restore)
-    # Stub
-  ;;
-esac
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index ba8bf568dc99823089b6eb5fb3f0a6d0dfa2bc52..1d879f838ff8126c7284cde8557790eecd885497 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -7,7 +7,7 @@ export C=/tmp/backupdir
 export SYSDEV="$(readlink -nf "$2")"
 export SYSFS="$3"
 export TMPDIR=/tmp
-export V=23
+export V=16
 
 export ADDOND_VERSION=3
 
@@ -48,7 +48,7 @@ if [ ! -r $S/build.prop ]; then
   echo "Backup/restore is not possible. Partition is probably empty"
   return 1
 fi
-if ! grep -q "^ro.lineage.version=$V.*" $S/build.prop; then
+if ! grep -q "^ro.build.version.release=$V.*" $S/build.prop; then
   echo "Backup/restore is not possible. Incompatible ROM version: $V"
   return 2
 fi
diff --git a/prebuilt/common/bin/backuptool_ab.sh b/prebuilt/common/bin/backuptool_ab.sh
index 9f61dddac3974224ac897a248e572e3953d234ef..30cddf3596a7df43f08a067aa8c255d397ebccd6 100755
--- a/prebuilt/common/bin/backuptool_ab.sh
+++ b/prebuilt/common/bin/backuptool_ab.sh
@@ -5,7 +5,7 @@
 
 export S=/system
 export C=/postinstall/tmp/backupdir
-export V=23
+export V=16
 
 export ADDOND_VERSION=3
 
@@ -56,7 +56,7 @@ if [ ! -r /system/build.prop ]; then
   echo "Backup/restore is not possible. Partition is probably empty"
   return 1
 fi
-if ! grep -q "^ro.lineage.version=$V.*" /system/build.prop; then
+if ! grep -q "^ro.build.version.release=$V.*" /system/build.prop; then
   echo "Backup/restore is not possible. Incompatible ROM version: $V"
   return 2
 fi
diff --git a/release/aconfig/bp2a/Android.bp b/release/aconfig/bp2a/Android.bp
index efb91462962b22ed5e5ca7983b48085beebb7055..593b3e27f1d62bb847b5a8447b4764da2d97bff2 100644
--- a/release/aconfig/bp2a/Android.bp
+++ b/release/aconfig/bp2a/Android.bp
@@ -16,5 +16,6 @@
 aconfig_value_set {
     name: "aconfig_value_set-lineage-bp2a",
     values: [
+        "aconfig-values-bp1a-com.android.settings.flags-all",
     ],
 }
diff --git a/release/aconfig/bp2a/com.android.settings.flags/Android.bp b/release/aconfig/bp2a/com.android.settings.flags/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..075a1890784ebc56149fa214e2ddd95e141e4a1f
--- /dev/null
+++ b/release/aconfig/bp2a/com.android.settings.flags/Android.bp
@@ -0,0 +1,21 @@
+// Copyright 2025 Google Inc. All rights reserved.
+//
+// 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.
+
+aconfig_values {
+  name: "aconfig-values-bp1a-com.android.settings.flags-all",
+  package: "com.android.settings.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/release/aconfig/bp2a/com.android.settings.flags/homepage_revamp_flag_values.textproto b/release/aconfig/bp2a/com.android.settings.flags/homepage_revamp_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..b6a54631c9c3b959c023dea7c174c65dd4b3a0ba
--- /dev/null
+++ b/release/aconfig/bp2a/com.android.settings.flags/homepage_revamp_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "homepage_revamp"
+  state: DISABLED
+  permission: READ_ONLY
+}