diff --git a/.gitignore b/.gitignore
index 0361113a9e3b292daecf4ce79eb9a9a85b70706c..5fab5acc6e4be1eb1d3fa7bdb50dc63042e4160b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,7 @@
 .DS_Store
 /build
 /captures
-/system_libs/*.jar
 /keystore.properties
 .externalNativeBuild
 .cxx
-*.jks
 local.properties
diff --git a/app/Android.bp b/app/Android.bp
index 4f79f13217074fa00374ab24df4386901ec0148c..14cce603550e611d1ed17d6963d80ff66d259da4 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -10,8 +10,8 @@ android_app {
     // Include SettingsLib and its dependencies
     defaults: ["SettingsLibDefaults"],
 
-    srcs: ["src/main/java/**/*.java"],
-    resource_dirs: ["src/main/res"],
+    srcs: ["src/main/java/**/*.java", "src/main/java/**/*.kt"],
+    resource_dirs: ["src/main/res", "src/main/res_aosp"],
     manifest: "src/main/AndroidManifest.xml",
 
     platform_apis: true,
@@ -33,6 +33,7 @@ android_app {
         "androidx.preference_preference",
         "androidx.recyclerview_recyclerview",
         "com.google.android.material_material",
+        "elib",
     ],
 
     optimize: {
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b339d044838ba507bde7b507e529f3ca72ea2ee0..7faf37fa60b406d1b512e8e1279b13b535e34d9a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -14,15 +14,15 @@ apply {
 
 buildscript {
     repositories {
-        maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.2/.m2")
+        maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/main/.m2")
     }
 
     dependencies {
-        classpath("org.lineageos:gradle-generatebp:+")
+        classpath("org.lineageos:gradle-generatebp:1.23")
     }
 }
 
-val keystorePropertiesFile = rootProject.file("keystore.properties")
+val keystorePropertiesFile = rootProject.file("platform.keystore")
 val keystoreProperties = Properties().apply {
     if (keystorePropertiesFile.exists()) {
         load(keystorePropertiesFile.inputStream())
@@ -30,12 +30,18 @@ val keystoreProperties = Properties().apply {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 35
+
+    sourceSets {
+        getByName("main") {
+            res.srcDirs("src/main/res", "src/main/res_studio")
+        }
+    }
 
     defaultConfig {
         applicationId = "org.lineageos.updater"
-        minSdk = 32
-        targetSdk = 33
+        minSdk = 35
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }
@@ -51,22 +57,25 @@ android {
             )
         }
         getByName("debug") {
-            // Append .dev to package name so we won't conflict with AOSP build.
-            applicationIdSuffix = ".dev"
+            signingConfig = signingConfigs.getByName("debug")
         }
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "21"
+    }
+
+    buildFeatures {
+        buildConfig = true
     }
 
     signingConfigs {
-        create("release") {
+        getByName("debug") {
             (keystoreProperties["keyAlias"] as String?)?.let {
                 keyAlias = it
             }
@@ -87,14 +96,16 @@ android {
 dependencies {
     compileOnly(fileTree(mapOf("dir" to "../system_libs", "include" to listOf("*.jar"))))
 
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.core:core-ktx:1.16.0")
+    implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0")
     implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0")
-    implementation("androidx.preference:preference:1.2.0")
-    implementation("androidx.recyclerview:recyclerview:1.2.1")
-    implementation("com.google.android.material:material:1.9.0-alpha01")
+    implementation("androidx.preference:preference-ktx:1.2.1")
+    implementation("androidx.recyclerview:recyclerview:1.4.0")
+    implementation("com.google.android.material:material:1.12.0")
+
+    implementation("foundation.e:elib:0.0.1-alpha11")
 }
 
 configure<GenerateBpPluginExtension> {
diff --git a/app/privapp_whitelist_org.lineageos.updater.xml b/app/privapp_whitelist_org.lineageos.updater.xml
index d88ad9cb1bdc20bdbf3a9a4f82c89b00f50dba89..6361985ba8bf6185be934610761d68c8f8941860 100644
--- a/app/privapp_whitelist_org.lineageos.updater.xml
+++ b/app/privapp_whitelist_org.lineageos.updater.xml
@@ -16,9 +16,11 @@
 -->
 <permissions>
     <privapp-permissions package="org.lineageos.updater">
+        <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
         <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
         <permission name="android.permission.REBOOT"/>
         <permission name="android.permission.RECOVERY"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>
 </permissions>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5ecd007e30602aab1fa661ec33a1b58fcd6ffc01..dd6c47962d38a10db9b8b4d4a9ffe8ce995a8be5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,8 +11,11 @@
     <uses-permission android:name="android.permission.REBOOT" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.RECOVERY" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
 
     <application
         android:allowBackup="false"
diff --git a/app/src/main/java/org/lineageos/updater/UpdateImporter.java b/app/src/main/java/org/lineageos/updater/UpdateImporter.java
index a557851b46a1c0e7d9e4edf9b04cc71ed83d08a1..ae6c75bd3a9cbcfabb3675c9bfc95e032749b456 100644
--- a/app/src/main/java/org/lineageos/updater/UpdateImporter.java
+++ b/app/src/main/java/org/lineageos/updater/UpdateImporter.java
@@ -18,9 +18,13 @@ package org.lineageos.updater;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.ContentResolver;
 import android.content.Intent;
+import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.ParcelFileDescriptor;
+import android.provider.OpenableColumns;
 import android.util.Log;
 
 import org.lineageos.updater.controller.UpdaterController;
@@ -38,6 +42,9 @@ import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.util.Enumeration;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -45,14 +52,16 @@ public class UpdateImporter {
     private static final int REQUEST_PICK = 9061;
     private static final String TAG = "UpdateImporter";
     private static final String MIME_ZIP = "application/zip";
-    private static final String FILE_NAME = "localUpdate.zip";
+    public static final String FILE_NAME = "localUpdate.zip";
     private static final String METADATA_PATH = "META-INF/com/android/metadata";
     private static final String METADATA_TIMESTAMP_KEY = "post-timestamp=";
+    private static final String METADATA_ANDROID_SDK_KEY = "post-sdk-level=";
 
     private final Activity activity;
     private final Callbacks callbacks;
 
     private Thread workingThread;
+    private String filename;
 
     public UpdateImporter(Activity activity, Callbacks callbacks) {
         this.activity = activity;
@@ -89,6 +98,7 @@ public class UpdateImporter {
             File importedFile = null;
             try {
                 importedFile = importFile(uri);
+                filename = getFileNameFromUri(uri);
                 verifyPackage(importedFile);
 
                 final Update update = buildLocalUpdate(importedFile);
@@ -108,6 +118,29 @@ public class UpdateImporter {
         return true;
     }
 
+    public String getFileNameFromUri(Uri uri) {
+        String fileName = null;
+        if (Objects.equals(uri.getScheme(), "content")) {
+            ContentResolver contentResolver = activity.getContentResolver();
+            Cursor cursor = contentResolver.query(uri, null, null, null, null);
+            if (cursor != null) {
+                try {
+                    if (cursor.moveToFirst()) {
+                        int displayNameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+                        if (displayNameIndex != -1) {
+                            fileName = cursor.getString(displayNameIndex);
+                        }
+                    }
+                } finally {
+                    cursor.close();
+                }
+            }
+        } else if (Objects.equals(uri.getScheme(), "file")) {
+            fileName = uri.getLastPathSegment();
+        }
+        return fileName;
+    }
+
     @SuppressLint("SetWorldReadable")
     @SuppressWarnings("ResultOfMethodCallIgnored")
     private File importFile(Uri uri) throws IOException {
@@ -145,8 +178,18 @@ public class UpdateImporter {
         final long timeStamp = getTimeStamp(file);
         final String buildDate = StringGenerator.getDateLocalizedUTC(
                 activity, DateFormat.MEDIUM, timeStamp);
-        final String name = activity.getString(R.string.local_update_name);
+        String name = activity.getString(R.string.local_update_name);
+        final String androidVersion = getAndroidVersion(file);
         final Update update = new Update();
+
+        if (filename != null) {
+            Pattern pattern = Pattern.compile("-(\\d+\\.\\d+(\\.\\d+)?)");
+            Matcher matcher = pattern.matcher(filename);
+            if (matcher.find()) {
+                name = matcher.group(1);
+            }
+        }
+
         update.setAvailableOnline(false);
         update.setName(name);
         update.setFile(file);
@@ -156,6 +199,8 @@ public class UpdateImporter {
         update.setStatus(UpdateStatus.VERIFIED);
         update.setPersistentStatus(UpdateStatus.Persistent.VERIFIED);
         update.setVersion(String.format("%s (%s)", name, buildDate));
+        update.setAndroidVersion(androidVersion);
+        update.setDisplayVersion(name);
         return update;
     }
 
@@ -179,25 +224,53 @@ public class UpdateImporter {
     }
 
     private long getTimeStamp(File file) {
+        String timeStamp = getFromMetadata(file, METADATA_TIMESTAMP_KEY);
+        if (timeStamp != null) {
+            return Long.parseLong(timeStamp);
+        }
+        return System.currentTimeMillis();
+    }
+
+    private String getAndroidVersion(File file) {
+        String sdkInt = getFromMetadata(file, METADATA_ANDROID_SDK_KEY);
+        if (sdkInt != null) {
+            return getAndroidVersionFromSDKInt(Integer.parseInt(sdkInt));
+        }
+        return String.valueOf(Build.VERSION.RELEASE);
+    }
+
+    public static String getAndroidVersionFromSDKInt(int sdkInt) {
+        return switch (sdkInt) {
+            case Build.VERSION_CODES.Q -> "10";
+            case Build.VERSION_CODES.R -> "11";
+            case Build.VERSION_CODES.S,
+                 Build.VERSION_CODES.S_V2 -> "12";
+            case Build.VERSION_CODES.TIRAMISU -> "13";
+            case Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> "14";
+            case Build.VERSION_CODES.VANILLA_ICE_CREAM -> "15";
+            default -> Build.VERSION.RELEASE;
+        };
+    }
+
+    private String getFromMetadata(File file, String key) {
         try {
             final String metadataContent = readZippedFile(file, METADATA_PATH);
             final String[] lines = metadataContent.split("\n");
             for (String line : lines) {
-                if (!line.startsWith(METADATA_TIMESTAMP_KEY)) {
+                if (!line.startsWith(key)) {
                     continue;
                 }
 
-                final String timeStampStr = line.replace(METADATA_TIMESTAMP_KEY, "");
-                return Long.parseLong(timeStampStr);
+                return line.replace(key, "");
             }
         } catch (IOException e) {
             Log.e(TAG, "Failed to read date from local update zip package", e);
         } catch (NumberFormatException e) {
-            Log.e(TAG, "Failed to parse timestamp number from zip metadata file", e);
+            Log.e(TAG, "Failed to parse from zip metadata file", e);
         }
 
-        Log.e(TAG, "Couldn't find timestamp in zip file, falling back to $now");
-        return System.currentTimeMillis();
+        Log.e(TAG, "Couldn't find metadata in zip file, falling back to 0");
+        return null;
     }
 
     private String readZippedFile(File file, String path) throws IOException {
diff --git a/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java b/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java
index 1fb2c5a04fec93f6938e5c000b246c8dcfc3403d..c8857db00b933d74ddf6c8a301b18cef2005e974 100644
--- a/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java
+++ b/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java
@@ -31,6 +31,7 @@ import androidx.preference.PreferenceManager;
 import org.lineageos.updater.misc.BuildInfoUtils;
 import org.lineageos.updater.misc.Constants;
 import org.lineageos.updater.misc.StringGenerator;
+import org.lineageos.updater.misc.Utils;
 
 import java.text.DateFormat;
 
@@ -60,7 +61,7 @@ public class UpdaterReceiver extends BroadcastReceiver {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
         String buildDate = StringGenerator.getDateLocalizedUTC(context,
                 DateFormat.MEDIUM, preferences.getLong(Constants.PREF_INSTALL_NEW_TIMESTAMP, 0));
-        String buildInfo = context.getString(R.string.list_build_version_date,
+        String buildInfo = context.getString(R.string.e_list_build_version_date,
                 BuildInfoUtils.getBuildVersion(), buildDate);
 
         Intent notificationIntent = new Intent(context, UpdatesActivity.class);
@@ -87,11 +88,13 @@ public class UpdaterReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         if (ACTION_INSTALL_REBOOT.equals(intent.getAction())) {
+            Utils.removeInstalledUpdate(context);
             PowerManager pm = context.getSystemService(PowerManager.class);
             pm.reboot(null);
         } else if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
             SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
             pref.edit().remove(Constants.PREF_NEEDS_REBOOT_ID).apply();
+            Utils.removeInstalledUpdate(context);
 
             if (shouldShowUpdateFailedNotification(context)) {
                 pref.edit().putBoolean(Constants.PREF_INSTALL_NOTIFIED, true).apply();
diff --git a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
index 5fab3f0cc0d5a3f2cbbf12d7e73216e4d7febb47..14171caffc3f451ce6ab36e6504bc7a8542674ae 100644
--- a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
+++ b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
@@ -42,6 +42,7 @@ import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.LinearInterpolator;
 import android.view.animation.RotateAnimation;
+import android.widget.ArrayAdapter;
 import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -54,6 +55,7 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.PreferenceManager;
@@ -79,6 +81,7 @@ import org.lineageos.updater.model.UpdateInfo;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
@@ -116,6 +119,10 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_updates);
 
+        if (UpdaterService.isDeviceRebooted()) {
+            Utils.removeInstalledUpdate(this);
+        }
+
         mUpdateImporter = new UpdateImporter(this, this);
 
         UiModeManager uiModeManager = getSystemService(UiModeManager.class);
@@ -184,8 +191,8 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
         }
 
         TextView headerTitle = findViewById(R.id.header_title);
-        headerTitle.setText(getString(R.string.header_title_text,
-                BuildInfoUtils.getBuildVersion()));
+        headerTitle.setText(getString(R.string.e_header_title_text,
+                BuildInfoUtils.getDisplayVersion()));
 
         updateLastCheckedString();
 
@@ -401,10 +408,12 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
         List<UpdateInfo> sortedUpdates = controller.getUpdates();
         if (sortedUpdates.isEmpty()) {
             findViewById(R.id.no_new_updates_view).setVisibility(View.VISIBLE);
-            findViewById(R.id.recycler_view).setVisibility(View.GONE);
+            findViewById(R.id.content).setVisibility(View.GONE);
+            findViewById(R.id.available_update_header).setVisibility(View.GONE);
         } else {
             findViewById(R.id.no_new_updates_view).setVisibility(View.GONE);
-            findViewById(R.id.recycler_view).setVisibility(View.VISIBLE);
+            findViewById(R.id.content).setVisibility(View.VISIBLE);
+            findViewById(R.id.available_update_header).setVisibility(View.VISIBLE);
             sortedUpdates.sort((u1, u2) -> Long.compare(u2.getTimestamp(), u1.getTimestamp()));
             for (UpdateInfo update : sortedUpdates) {
                 updateIds.add(update.getDownloadId());
@@ -436,7 +445,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
             preferences.edit().putLong(Constants.PREF_LAST_UPDATE_CHECK, millis).apply();
             updateLastCheckedString();
             if (json.exists() && Utils.isUpdateCheckEnabled(this) &&
-                    Utils.checkForNewUpdates(json, jsonNew)) {
+                    Utils.checkForNewUpdates(jsonNew, this)) {
                 UpdatesCheckReceiver.updateRepeatingUpdatesCheck(this);
             }
             // In case we set a one-shot check because of a previous failure
@@ -550,7 +559,8 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
 
     @Override
     public void showSnackbar(int stringId, int duration) {
-        Snackbar.make(findViewById(R.id.main_container), stringId, duration).show();
+        Snackbar.make(findViewById(R.id.main_container), stringId, duration).setTextColor(
+                ContextCompat.getColor(this, foundation.e.elib.R.color.e_background)).show();
     }
 
     private void refreshAnimationStart() {
@@ -564,7 +574,8 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
                 mRefreshIconView.setEnabled(false);
             }
         } else {
-            findViewById(R.id.recycler_view).setVisibility(View.GONE);
+            findViewById(R.id.content).setVisibility(View.GONE);
+            findViewById(R.id.available_update_header).setVisibility(View.GONE);
             findViewById(R.id.no_new_updates_view).setVisibility(View.GONE);
             findViewById(R.id.refresh_progress).setVisibility(View.VISIBLE);
         }
@@ -578,11 +589,13 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
             }
         } else {
             findViewById(R.id.refresh_progress).setVisibility(View.GONE);
-            if (mAdapter.getItemCount() > 0) {
-                findViewById(R.id.recycler_view).setVisibility(View.VISIBLE);
-            } else {
-                findViewById(R.id.no_new_updates_view).setVisibility(View.VISIBLE);
-            }
+        }
+
+        if (mAdapter.getItemCount() > 0) {
+            findViewById(R.id.content).setVisibility(View.VISIBLE);
+            findViewById(R.id.available_update_header).setVisibility(View.VISIBLE);
+        } else {
+            findViewById(R.id.no_new_updates_view).setVisibility(View.VISIBLE);
         }
     }
 
@@ -591,6 +604,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
         View view = LayoutInflater.from(this).inflate(R.layout.preferences_dialog, null);
         Spinner autoCheckInterval = view.findViewById(R.id.preferences_auto_updates_check_interval);
         SwitchCompat autoDelete = view.findViewById(R.id.preferences_auto_delete_updates);
+        SwitchCompat allUpdates = view.findViewById(R.id.preferences_all_updates);
         SwitchCompat meteredNetworkWarning = view.findViewById(
                 R.id.preferences_metered_network_warning);
         SwitchCompat abPerfMode = view.findViewById(R.id.preferences_ab_perf_mode);
@@ -601,11 +615,31 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
         }
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+
+        List<String> intervalList = new ArrayList<>(Arrays.asList(getResources().getStringArray(
+                R.array.menu_auto_updates_check_interval_entries)));
+
+        if (Utils.isDevModeOn(this)) {
+            // Add additional intervals while enabling developer options is on
+            intervalList.addAll(Arrays.asList(getResources().getStringArray(
+                            R.array.menu_auto_updates_check_interval_entries_dev)));
+        } else if (Utils.getUpdateCheckSetting(this) > 3) {
+            prefs.edit().putInt(Constants.PREF_AUTO_UPDATES_CHECK_INTERVAL,
+                    Constants.AUTO_UPDATES_CHECK_INTERVAL_DAILY).apply();
+        }
+
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this,
+                android.R.layout.simple_list_item_1, intervalList);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        autoCheckInterval.setAdapter(adapter);
         autoCheckInterval.setSelection(Utils.getUpdateCheckSetting(this));
-        autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, false));
+
+        autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true));
+        allUpdates.setChecked(prefs.getBoolean(Constants.PREF_ALL_UPDATES, false));
         meteredNetworkWarning.setChecked(prefs.getBoolean(Constants.PREF_METERED_NETWORK_WARNING,
                 prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, true)));
-        abPerfMode.setChecked(prefs.getBoolean(Constants.PREF_AB_PERF_MODE, false));
+        abPerfMode.setChecked(prefs.getBoolean(Constants.PREF_AB_PERF_MODE,
+                Utils.defaultABPerfMode(this)));
 
         if (getResources().getBoolean(R.bool.config_hideRecoveryUpdate)) {
             // Hide the update feature if explicitly requested.
@@ -643,6 +677,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
                             .putInt(Constants.PREF_AUTO_UPDATES_CHECK_INTERVAL,
                                     autoCheckInterval.getSelectedItemPosition())
                             .putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, autoDelete.isChecked())
+                            .putBoolean(Constants.PREF_ALL_UPDATES, allUpdates.isChecked())
                             .putBoolean(Constants.PREF_METERED_NETWORK_WARNING,
                                     meteredNetworkWarning.isChecked())
                             .putBoolean(Constants.PREF_AB_PERF_MODE, abPerfMode.isChecked())
@@ -670,7 +705,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
 
     private void maybeShowWelcomeMessage() {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
-        boolean alreadySeen = preferences.getBoolean(Constants.HAS_SEEN_WELCOME_MESSAGE, false);
+        boolean alreadySeen = preferences.getBoolean(Constants.HAS_SEEN_WELCOME_MESSAGE, true);
         if (alreadySeen) {
             return;
         }
diff --git a/app/src/main/java/org/lineageos/updater/UpdatesCheckReceiver.java b/app/src/main/java/org/lineageos/updater/UpdatesCheckReceiver.java
index 9f454239338717f4a93dedfd3e7354745ce13f53..3b91d3207483628214c32b5199dc3c2521b67124 100644
--- a/app/src/main/java/org/lineageos/updater/UpdatesCheckReceiver.java
+++ b/app/src/main/java/org/lineageos/updater/UpdatesCheckReceiver.java
@@ -24,14 +24,17 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.SystemClock;
+import android.provider.Settings;
 import android.util.Log;
 
 import androidx.core.app.NotificationCompat;
 import androidx.preference.PreferenceManager;
 
 import org.json.JSONException;
+import org.lineageos.updater.controller.UpdaterService;
 import org.lineageos.updater.download.DownloadClient;
 import org.lineageos.updater.misc.Constants;
+import org.lineageos.updater.misc.JsonValidator;
 import org.lineageos.updater.misc.Utils;
 
 import java.io.File;
@@ -51,29 +54,51 @@ public class UpdatesCheckReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(final Context context, Intent intent) {
+        final SharedPreferences preferences =
+                PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = preferences.edit();
+
         if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+            // Check if the current value is empty or null and set anon hash.
+            String anonHash = Settings.Secure.getString(context.getContentResolver(),
+                    Constants.OTA_ANON_HASH);
+            if (anonHash == null || anonHash.isEmpty()) {
+                Settings.Secure.putString(context.getContentResolver(),
+                        Constants.OTA_ANON_HASH, Utils.generateRandomID());
+            }
+
             Utils.cleanupDownloadsDir(context);
+            Utils.removeLocalUpdate(context);
+
+            // Reset resume or update check failed on reboot
+            editor.putBoolean(Constants.AUTO_UPDATE_CHECK_FAILED, false).apply();
+            editor.putString(Constants.RESUME_DOWNLOAD_ID, "").apply();
         }
 
-        final SharedPreferences preferences =
-                PreferenceManager.getDefaultSharedPreferences(context);
+        final File json = Utils.getCachedUpdateList(context);
+        if (json.exists() && !JsonValidator.validateJsonFile(json) && json.delete()) {
+            Log.i(TAG, "Removing cached json file due validation failure");
+        }
 
         if (!Utils.isUpdateCheckEnabled(context)) {
             return;
         }
 
-        if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
-            // Set a repeating alarm on boot to check for new updates once per day
-            scheduleRepeatingUpdatesCheck(context);
-        }
+        // Exact alarms does not support repeating, so update to make it
+        // work like repeating alarms. To check for update at the exact time.
+        updateRepeatingUpdatesCheck(context);
 
         if (!Utils.isNetworkAvailable(context)) {
-            Log.d(TAG, "Network not available, scheduling new check");
-            scheduleUpdatesCheck(context);
+            if (!UpdaterService.isNetworkCallBackActive()) {
+                editor.putBoolean(Constants.AUTO_UPDATE_CHECK_FAILED, true).apply();
+                UpdaterService.setupNetworkCallback(true);
+            }
             return;
+        } else if (UpdaterService.isNetworkCallBackActive()) {
+            editor.putBoolean(Constants.AUTO_UPDATE_CHECK_FAILED, false).apply();
+            UpdaterService.setupNetworkCallback(false);
         }
 
-        final File json = Utils.getCachedUpdateList(context);
         final File jsonNew = new File(json.getAbsolutePath() + UUID.randomUUID());
         String url = Utils.getServerURL(context);
         DownloadClient.DownloadCallback callback = new DownloadClient.DownloadCallback() {
@@ -90,16 +115,19 @@ public class UpdatesCheckReceiver extends BroadcastReceiver {
             @Override
             public void onSuccess() {
                 try {
-                    if (json.exists() && Utils.checkForNewUpdates(json, jsonNew)) {
+                    if (!JsonValidator.validateJsonFile(jsonNew)) {
+                        Log.i(TAG, "Could not parse list, scheduling new check");
+                        scheduleUpdatesCheck(context);
+                        return;
+                    }
+                    if (json.exists() && Utils.checkForNewUpdates(jsonNew, context)) {
                         showNotification(context);
                         updateRepeatingUpdatesCheck(context);
                     }
                     //noinspection ResultOfMethodCallIgnored
                     jsonNew.renameTo(json);
                     long currentMillis = System.currentTimeMillis();
-                    preferences.edit()
-                            .putLong(Constants.PREF_LAST_UPDATE_CHECK, currentMillis)
-                            .apply();
+                    editor.putLong(Constants.PREF_LAST_UPDATE_CHECK, currentMillis).apply();
                     // In case we set a one-shot check because of a previous failure
                     cancelUpdatesCheck(context);
                 } catch (IOException | JSONException e) {
@@ -160,12 +188,10 @@ public class UpdatesCheckReceiver extends BroadcastReceiver {
 
         PendingIntent updateCheckIntent = getRepeatingUpdatesCheckIntent(context);
         AlarmManager alarmMgr = context.getSystemService(AlarmManager.class);
-        alarmMgr.setRepeating(AlarmManager.RTC, System.currentTimeMillis() +
-                Utils.getUpdateCheckInterval(context), Utils.getUpdateCheckInterval(context),
-                updateCheckIntent);
+        long nextCheck = System.currentTimeMillis() + Utils.getUpdateCheckInterval(context);
+        alarmMgr.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, nextCheck, updateCheckIntent);
 
-        Date nextCheckDate = new Date(System.currentTimeMillis() +
-                Utils.getUpdateCheckInterval(context));
+        Date nextCheckDate = new Date(nextCheck);
         Log.d(TAG, "Setting automatic updates check: " + nextCheckDate);
     }
 
@@ -181,14 +207,14 @@ public class UpdatesCheckReceiver extends BroadcastReceiver {
     }
 
     public static void scheduleUpdatesCheck(Context context) {
-        long millisToNextCheck = AlarmManager.INTERVAL_HOUR * 2;
+        long millisToNextCheck = AlarmManager.INTERVAL_FIFTEEN_MINUTES;
         PendingIntent updateCheckIntent = getUpdatesCheckIntent(context);
         AlarmManager alarmMgr = context.getSystemService(AlarmManager.class);
-        alarmMgr.set(AlarmManager.ELAPSED_REALTIME,
-                SystemClock.elapsedRealtime() + millisToNextCheck,
-                updateCheckIntent);
+        long nextCheck = SystemClock.elapsedRealtime() + millisToNextCheck;
+        alarmMgr.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME,
+                nextCheck, updateCheckIntent);
 
-        Date nextCheckDate = new Date(System.currentTimeMillis() + millisToNextCheck);
+        Date nextCheckDate = new Date(nextCheck);
         Log.d(TAG, "Setting one-shot updates check: " + nextCheckDate);
     }
 
diff --git a/app/src/main/java/org/lineageos/updater/UpdatesDbHelper.java b/app/src/main/java/org/lineageos/updater/UpdatesDbHelper.java
index 6c11a60c40289968ac5935cefbbc3f75708fdacf..bf78b829f5009b85ef26692c85389fdaf154e088 100644
--- a/app/src/main/java/org/lineageos/updater/UpdatesDbHelper.java
+++ b/app/src/main/java/org/lineageos/updater/UpdatesDbHelper.java
@@ -30,7 +30,7 @@ import java.util.List;
 
 public class UpdatesDbHelper extends SQLiteOpenHelper {
 
-    public static final int DATABASE_VERSION = 1;
+    public static final int DATABASE_VERSION = 3;
     public static final String DATABASE_NAME = "updates.db";
 
     public static class UpdateEntry implements BaseColumns {
@@ -41,7 +41,9 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
         public static final String COLUMN_NAME_TIMESTAMP = "timestamp";
         public static final String COLUMN_NAME_TYPE = "type";
         public static final String COLUMN_NAME_VERSION = "version";
+        public static final String COLUMN_NAME_DISPLAY_VERSION = "display_version";
         public static final String COLUMN_NAME_SIZE = "size";
+        public static final String COLUMN_NAME_ANDROID_VERSION = "android_version";
     }
 
     private static final String SQL_CREATE_ENTRIES =
@@ -53,7 +55,9 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
                     UpdateEntry.COLUMN_NAME_TIMESTAMP + " INTEGER," +
                     UpdateEntry.COLUMN_NAME_TYPE + " TEXT," +
                     UpdateEntry.COLUMN_NAME_VERSION + " TEXT," +
-                    UpdateEntry.COLUMN_NAME_SIZE + " INTEGER)";
+                    UpdateEntry.COLUMN_NAME_DISPLAY_VERSION + " TEXT," +
+                    UpdateEntry.COLUMN_NAME_SIZE + " INTEGER," +
+                    UpdateEntry.COLUMN_NAME_ANDROID_VERSION + " TEXT)";
 
     private static final String SQL_DELETE_ENTRIES =
             "DROP TABLE IF EXISTS " + UpdateEntry.TABLE_NAME;
@@ -89,7 +93,9 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
         values.put(UpdateEntry.COLUMN_NAME_TIMESTAMP, update.getTimestamp());
         values.put(UpdateEntry.COLUMN_NAME_TYPE, update.getType());
         values.put(UpdateEntry.COLUMN_NAME_VERSION, update.getVersion());
+        values.put(UpdateEntry.COLUMN_NAME_DISPLAY_VERSION, update.getDisplayVersion());
         values.put(UpdateEntry.COLUMN_NAME_SIZE, update.getFileSize());
+        values.put(UpdateEntry.COLUMN_NAME_ANDROID_VERSION, update.getAndroidVersion());
     }
 
     public void removeUpdate(String downloadId) {
@@ -125,8 +131,10 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
                 UpdateEntry.COLUMN_NAME_TIMESTAMP,
                 UpdateEntry.COLUMN_NAME_TYPE,
                 UpdateEntry.COLUMN_NAME_VERSION,
+                UpdateEntry.COLUMN_NAME_DISPLAY_VERSION,
                 UpdateEntry.COLUMN_NAME_STATUS,
                 UpdateEntry.COLUMN_NAME_SIZE,
+                UpdateEntry.COLUMN_NAME_ANDROID_VERSION,
         };
         String sort = UpdateEntry.COLUMN_NAME_TIMESTAMP + " DESC";
         Cursor cursor = db.query(UpdateEntry.TABLE_NAME, projection, selection, selectionArgs,
@@ -146,10 +154,14 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
                 update.setType(cursor.getString(index));
                 index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_VERSION);
                 update.setVersion(cursor.getString(index));
+                index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_DISPLAY_VERSION);
+                update.setDisplayVersion(cursor.getString(index));
                 index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_STATUS);
                 update.setPersistentStatus(cursor.getInt(index));
                 index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_SIZE);
                 update.setFileSize(cursor.getLong(index));
+                index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_ANDROID_VERSION);
+                update.setAndroidVersion(cursor.getString(index));
                 updates.add(update);
             }
             cursor.close();
diff --git a/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java b/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java
index 72045cac10f807f6b0f50c0d0fda974b9c04b71e..6fb9e4af987d3494fa370d2577979f040628b52c 100644
--- a/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java
+++ b/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java
@@ -16,10 +16,9 @@
 package org.lineageos.updater;
 
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
-import android.os.BatteryManager;
+import android.os.Build;
 import android.os.PowerManager;
 import android.text.SpannableString;
 import android.text.format.Formatter;
@@ -57,10 +56,12 @@ import org.lineageos.updater.misc.Utils;
 import org.lineageos.updater.model.UpdateInfo;
 import org.lineageos.updater.model.UpdateStatus;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -70,10 +71,6 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
 
     private static final String TAG = "UpdateListAdapter";
 
-    private static final int BATTERY_PLUGGED_ANY = BatteryManager.BATTERY_PLUGGED_AC
-            | BatteryManager.BATTERY_PLUGGED_USB
-            | BatteryManager.BATTERY_PLUGGED_WIRELESS;
-
     private final float mAlphaDisabledValue;
 
     private List<String> mDownloadIds;
@@ -98,6 +95,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         private final Button mAction;
         private final ImageButton mMenu;
 
+        private final TextView mUpgradeType;
         private final TextView mBuildDate;
         private final TextView mBuildVersion;
         private final TextView mBuildSize;
@@ -112,6 +110,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
             mAction = view.findViewById(R.id.update_action);
             mMenu = view.findViewById(R.id.update_menu);
 
+            mUpgradeType = view.findViewById(R.id.upgrade_type);
             mBuildDate = view.findViewById(R.id.build_date);
             mBuildVersion = view.findViewById(R.id.build_version);
             mBuildSize = view.findViewById(R.id.build_size);
@@ -251,7 +250,8 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         if (update == null) {
             // The update was deleted
             viewHolder.mAction.setEnabled(false);
-            viewHolder.mAction.setText(R.string.action_download);
+            viewHolder.mAction.setText(Utils.isABDevice() ? R.string.e_action_update
+                    : R.string.action_download);
             return;
         }
 
@@ -274,8 +274,13 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
 
         String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,
                 DateFormat.LONG, update.getTimestamp());
-        String buildVersion = mActivity.getString(R.string.list_build_version,
-                update.getVersion());
+        String buildVersion = mActivity.getString(R.string.e_list_build_version,
+                update.getDisplayVersion());
+
+        if (!Build.VERSION.RELEASE.equals(update.getAndroidVersion())) {
+            viewHolder.mUpgradeType.setVisibility(TextView.VISIBLE);
+        }
+
         viewHolder.mBuildDate.setText(buildDate);
         viewHolder.mBuildVersion.setText(buildVersion);
         viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null);
@@ -321,6 +326,37 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         notifyItemRangeChanged(position, getItemCount());
     }
 
+    private AlertDialog.Builder getSpaceDialog(UpdateInfo update) {
+        Resources resources = mActivity.getResources();
+        File updateFile = update.getFile();
+        // Required space before download is 3 x OTA size.
+        long requiredSpace = update.getFileSize() * 3;
+        long availableFreeSpace = Utils.availableFreeSpace();
+
+        // Subtract space depending on the downloaded file size.
+        // Required space after download completed will be 2 x OTA size.
+        if (updateFile != null && updateFile.exists() && updateFile.length() > 0) {
+            requiredSpace -= updateFile.length();
+        }
+
+        if (availableFreeSpace < requiredSpace) {
+            // Not enough space to download file
+            double spaceNeeded = (requiredSpace - availableFreeSpace) / (1024.0 * 1024.0);
+            // Ignore if needed space is below 1 MB, like 0.25
+            // We only show integer part to the user
+            if (spaceNeeded >= 1) {
+                String message = resources.getString(R.string.e_dialog_free_space_low_message_pct,
+                        new DecimalFormat("# MB").format(spaceNeeded));
+                return new AlertDialog.Builder(mActivity)
+                        .setTitle(R.string.e_dialog_free_space_low_title)
+                        .setMessage(message)
+                        .setPositiveButton(android.R.string.ok, null);
+            }
+        }
+
+        return null;
+    }
+
     private void startDownloadWithWarning(final String downloadId) {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mActivity);
         boolean warn = preferences.getBoolean(Constants.PREF_METERED_NETWORK_WARNING, true);
@@ -337,7 +373,8 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                 .setTitle(R.string.update_over_metered_network_title)
                 .setMessage(R.string.update_over_metered_network_message)
                 .setView(checkboxView)
-                .setPositiveButton(R.string.action_download,
+                .setPositiveButton(Utils.isABDevice() ? R.string.e_action_update
+                                : R.string.action_download,
                         (dialog, which) -> {
                             if (checkbox.isChecked()) {
                                 preferences.edit()
@@ -356,9 +393,18 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         final View.OnClickListener clickListener;
         switch (action) {
             case DOWNLOAD:
-                button.setText(R.string.action_download);
+                button.setText(Utils.isABDevice() ? R.string.e_action_update
+                        : R.string.action_download);
                 button.setEnabled(enabled);
-                clickListener = enabled ? view -> startDownloadWithWarning(downloadId) : null;
+                clickListener = enabled ? view -> {
+                    AlertDialog.Builder freeSpaceDialog = getSpaceDialog(
+                            mUpdaterController.getUpdate(downloadId));
+                    if (freeSpaceDialog != null) {
+                        freeSpaceDialog.show();
+                    } else {
+                        startDownloadWithWarning(downloadId);
+                    }
+                } : null;
                 break;
             case PAUSE:
                 button.setText(R.string.action_pause);
@@ -374,7 +420,12 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                         update.getFile().length() == update.getFileSize();
                 clickListener = enabled ? view -> {
                     if (canInstall) {
-                        mUpdaterController.resumeDownload(downloadId);
+                        AlertDialog.Builder freeSpaceDialog = getSpaceDialog(update);
+                        if (freeSpaceDialog != null) {
+                            freeSpaceDialog.show();
+                        } else {
+                            mUpdaterController.resumeDownload(downloadId);
+                        }
                     } else {
                         mActivity.showSnackbar(R.string.snack_update_not_installable,
                                 Snackbar.LENGTH_LONG);
@@ -390,7 +441,10 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                 clickListener = enabled ? view -> {
                     if (canInstall) {
                         AlertDialog.Builder installDialog = getInstallDialog(downloadId);
-                        if (installDialog != null) {
+                        AlertDialog.Builder freeSpaceDialog = getSpaceDialog(update);
+                        if (freeSpaceDialog != null) {
+                            freeSpaceDialog.show();
+                        } else if (installDialog != null) {
                             installDialog.show();
                         }
                     } else {
@@ -463,8 +517,8 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
     }
 
     private AlertDialog.Builder getInstallDialog(final String downloadId) {
-        if (!isBatteryLevelOk()) {
-            Resources resources = mActivity.getResources();
+        Resources resources = mActivity.getResources();
+        if (!Utils.isBatteryLevelOk(mActivity)) {
             String message = resources.getString(R.string.dialog_battery_low_message_pct,
                     resources.getInteger(R.integer.battery_ok_percentage_discharging),
                     resources.getInteger(R.integer.battery_ok_percentage_charging));
@@ -480,26 +534,58 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                     .setPositiveButton(android.R.string.ok, null);
         }
         UpdateInfo update = mUpdaterController.getUpdate(downloadId);
-        int resId;
+
+        int title;
+        String message;
         try {
-            if (Utils.isABUpdate(update.getFile())) {
-                resId = R.string.apply_update_dialog_message_ab;
+            String buildDate =
+                    StringGenerator.getDateLocalizedUTC(
+                            mActivity, DateFormat.MEDIUM, update.getTimestamp());
+            String buildInfoText =
+                    mActivity.getString(
+                            R.string.e_list_build_version_date, update.getVersion(), buildDate);
+
+            if (Build.VERSION.RELEASE.equals(update.getAndroidVersion())) {
+                title = R.string.apply_update_dialog_title;
+                if (Utils.isABUpdate(update.getFile())) {
+                    message =
+                            mActivity.getString(
+                                    R.string.e_apply_update_dialog_message_ab,
+                                    buildInfoText,
+                                    mActivity.getString(android.R.string.ok));
+                } else {
+                    message =
+                            mActivity.getString(
+                                    R.string.e_apply_update_dialog_message,
+                                    buildInfoText,
+                                    mActivity.getString(android.R.string.ok));
+                }
             } else {
-                resId = R.string.apply_update_dialog_message;
+                title = R.string.e_version_upgrade_dialog_title;
+                if (Utils.isABUpdate(update.getFile())) {
+                    message =
+                            mActivity.getString(
+                                    R.string.e_version_upgrade_dialog_message_ab,
+                                    buildInfoText,
+                                    update.getAndroidVersion(),
+                                    mActivity.getString(android.R.string.ok));
+                } else {
+                    message =
+                            mActivity.getString(
+                                    R.string.e_version_upgrade_dialog_message,
+                                    buildInfoText,
+                                    update.getAndroidVersion(),
+                                    mActivity.getString(android.R.string.ok));
+                }
             }
         } catch (IOException e) {
             Log.e(TAG, "Could not determine the type of the update");
             return null;
         }
 
-        String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,
-                DateFormat.MEDIUM, update.getTimestamp());
-        String buildInfoText = mActivity.getString(R.string.list_build_version_date,
-                update.getVersion(), buildDate);
         return new AlertDialog.Builder(mActivity)
-                .setTitle(R.string.apply_update_dialog_title)
-                .setMessage(mActivity.getString(resId, buildInfoText,
-                        mActivity.getString(android.R.string.ok)))
+                .setTitle(title)
+                .setMessage(message)
                 .setPositiveButton(android.R.string.ok,
                         (dialog, which) -> {
                             Utils.triggerUpdate(mActivity, downloadId);
@@ -522,7 +608,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
 
     private void maybeShowInfoDialog() {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mActivity);
-        boolean alreadySeen = preferences.getBoolean(Constants.HAS_SEEN_INFO_DIALOG, false);
+        boolean alreadySeen = preferences.getBoolean(Constants.HAS_SEEN_INFO_DIALOG, true);
         if (alreadySeen) {
             return;
         }
@@ -542,7 +628,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         ContextThemeWrapper wrapper = new ContextThemeWrapper(mActivity,
                 R.style.AppTheme_PopupMenuOverlapAnchor);
         PopupMenu popupMenu = new PopupMenu(wrapper, anchor, Gravity.NO_GRAVITY,
-                R.attr.actionOverflowMenuStyle, 0);
+                com.android.internal.R.attr.actionOverflowMenuStyle, 0);
         popupMenu.inflate(R.menu.menu_action_mode);
 
         boolean shouldShowDelete = canDelete;
@@ -599,21 +685,6 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         }
     }
 
-    private boolean isBatteryLevelOk() {
-        Intent intent = mActivity.registerReceiver(null,
-                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-        if (intent == null || !intent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, false)) {
-            return true;
-        }
-        int percent = Math.round(100.f * intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 100) /
-                intent.getIntExtra(BatteryManager.EXTRA_SCALE, 100));
-        int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
-        int required = (plugged & BATTERY_PLUGGED_ANY) != 0 ?
-                mActivity.getResources().getInteger(R.integer.battery_ok_percentage_charging) :
-                mActivity.getResources().getInteger(R.integer.battery_ok_percentage_discharging);
-        return percent >= required;
-    }
-
     private static boolean isScratchMounted() {
         try (Stream<String> lines = Files.lines(Path.of("/proc/mounts"))) {
             return lines.anyMatch(x -> x.split(" ")[1].equals("/mnt/scratch"));
diff --git a/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java b/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java
index d2dcdf1720ab9f36860a28690209b613128434b6..276affa56f92dc6aceb61d08a8079d398ac0faf4 100644
--- a/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java
+++ b/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java
@@ -209,7 +209,7 @@ class ABUpdateInstaller {
         }
 
         boolean enableABPerfMode = PreferenceManager.getDefaultSharedPreferences(mContext)
-                .getBoolean(Constants.PREF_AB_PERF_MODE, false);
+                .getBoolean(Constants.PREF_AB_PERF_MODE, Utils.defaultABPerfMode(mContext));
         mUpdateEngine.setPerformanceMode(enableABPerfMode);
 
         String zipFileUri = "file://" + file.getAbsolutePath();
diff --git a/app/src/main/java/org/lineageos/updater/controller/UpdaterService.java b/app/src/main/java/org/lineageos/updater/controller/UpdaterService.java
index 8b8b43f659b66ca98e54de9d16bcaa48486a93e2..129b0cc4d82bd918b1227bdb250bcffcddaabe09 100644
--- a/app/src/main/java/org/lineageos/updater/controller/UpdaterService.java
+++ b/app/src/main/java/org/lineageos/updater/controller/UpdaterService.java
@@ -15,6 +15,10 @@
  */
 package org.lineageos.updater.controller;
 
+import static android.os.SystemUpdateManager.STATUS_IN_PROGRESS;
+import static android.os.SystemUpdateManager.STATUS_WAITING_DOWNLOAD;
+import static android.os.SystemUpdateManager.STATUS_WAITING_REBOOT;
+
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -25,9 +29,13 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.ServiceInfo;
+import android.net.ConnectivityManager;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.service.notification.StatusBarNotification;
 import android.text.format.Formatter;
 import android.util.Log;
 
@@ -38,6 +46,7 @@ import androidx.preference.PreferenceManager;
 import org.lineageos.updater.R;
 import org.lineageos.updater.UpdaterReceiver;
 import org.lineageos.updater.UpdatesActivity;
+import org.lineageos.updater.misc.ConnectionStateMonitor;
 import org.lineageos.updater.misc.Constants;
 import org.lineageos.updater.misc.StringGenerator;
 import org.lineageos.updater.misc.Utils;
@@ -48,6 +57,7 @@ import org.lineageos.updater.model.UpdateStatus;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.NumberFormat;
+import java.util.Arrays;
 
 public class UpdaterService extends Service {
 
@@ -71,6 +81,7 @@ public class UpdaterService extends Service {
     private static final int NOTIFICATION_ID = 10;
 
     private final IBinder mBinder = new LocalBinder();
+    private static boolean isNetworkCallBackActive = false;
     private boolean mHasClients;
 
     private BroadcastReceiver mBroadcastReceiver;
@@ -80,11 +91,23 @@ public class UpdaterService extends Service {
 
     private UpdaterController mUpdaterController;
 
+    private static final NetworkRequest networkRequest = new NetworkRequest.Builder()
+            .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
+            .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
+            .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
+            .build();
+    private static ConnectivityManager.NetworkCallback mConnectionStateMonitor;
+    private static ConnectivityManager mConnectivityManager;
+
+    private static boolean mDeviceRebooted = true;
+
     @Override
     public void onCreate() {
         super.onCreate();
 
         mUpdaterController = UpdaterController.getInstance(this);
+        mConnectionStateMonitor = new ConnectionStateMonitor().getInstance(this);
+        mConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
 
         mNotificationManager = getSystemService(NotificationManager.class);
         NotificationChannel notificationChannel = new NotificationChannel(
@@ -246,7 +269,12 @@ public class UpdaterService extends Service {
         return mUpdaterController;
     }
 
+    public static boolean isDeviceRebooted() {
+        return mDeviceRebooted;
+    }
+
     private void tryStopSelf() {
+        if (isNetworkCallBackActive || areNotificationsActive()) return;
         if (!mHasClients && !mUpdaterController.hasActiveDownloads() &&
                 !mUpdaterController.isInstallingUpdate()) {
             Log.d(TAG, "Service no longer needed, stopping");
@@ -254,9 +282,21 @@ public class UpdaterService extends Service {
         }
     }
 
+    private boolean areNotificationsActive() {
+        StatusBarNotification[] notifications = mNotificationManager.getActiveNotifications();
+        return notifications != null && Arrays.stream(notifications)
+                .anyMatch(notification -> notification.getId() == NOTIFICATION_ID ||
+                        notification.getPackageName().equals(getPackageName()));
+    }
+
     private void handleUpdateStatusChange(UpdateInfo update) {
+        SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences.Editor editor = pref.edit();
+        mNotificationBuilder.setPriority(NotificationCompat.PRIORITY_DEFAULT);
+        mDeviceRebooted = false;
         switch (update.getStatus()) {
             case DELETED: {
+                notifySystemUpdaterService(STATUS_WAITING_DOWNLOAD, update);
                 stopForeground(STOP_FOREGROUND_DETACH);
                 mNotificationBuilder.setOngoing(false);
                 mNotificationManager.cancel(NOTIFICATION_ID);
@@ -264,6 +304,7 @@ public class UpdaterService extends Service {
                 break;
             }
             case STARTING: {
+                notifySystemUpdaterService(STATUS_IN_PROGRESS, update);
                 mNotificationBuilder.mActions.clear();
                 mNotificationBuilder.setProgress(0, 0, true);
                 mNotificationStyle.setSummaryText(null);
@@ -280,6 +321,7 @@ public class UpdaterService extends Service {
                 break;
             }
             case DOWNLOADING: {
+                notifySystemUpdaterService(STATUS_IN_PROGRESS, update);
                 String text = getString(R.string.downloading_notification);
                 mNotificationStyle.bigText(text);
                 mNotificationBuilder.setStyle(mNotificationStyle);
@@ -287,6 +329,10 @@ public class UpdaterService extends Service {
                 mNotificationBuilder.addAction(android.R.drawable.ic_media_pause,
                         getString(R.string.pause_button),
                         getPausePendingIntent(update.getDownloadId()));
+                if (isNetworkCallBackActive) {
+                    editor.putString(Constants.RESUME_DOWNLOAD_ID, "").apply();
+                    setupNetworkCallback(false);
+                }
                 mNotificationBuilder.setTicker(text);
                 mNotificationBuilder.setOngoing(true);
                 mNotificationBuilder.setAutoCancel(false);
@@ -294,6 +340,7 @@ public class UpdaterService extends Service {
                 break;
             }
             case PAUSED: {
+                notifySystemUpdaterService(STATUS_WAITING_DOWNLOAD, update);
                 stopForeground(STOP_FOREGROUND_DETACH);
                 // In case we pause before the first progress update
                 mNotificationBuilder.setProgress(100, update.getProgress(), false);
@@ -305,6 +352,10 @@ public class UpdaterService extends Service {
                 mNotificationBuilder.addAction(android.R.drawable.ic_media_play,
                         getString(R.string.resume_button),
                         getResumePendingIntent(update.getDownloadId()));
+                if (isNetworkCallBackActive) {
+                    editor.putString(Constants.RESUME_DOWNLOAD_ID, "").apply();
+                    setupNetworkCallback(false);
+                }
                 mNotificationBuilder.setTicker(text);
                 mNotificationBuilder.setOngoing(false);
                 mNotificationBuilder.setAutoCancel(false);
@@ -313,6 +364,7 @@ public class UpdaterService extends Service {
                 break;
             }
             case PAUSED_ERROR: {
+                notifySystemUpdaterService(STATUS_WAITING_DOWNLOAD, update);
                 stopForeground(STOP_FOREGROUND_DETACH);
                 int progress = update.getProgress();
                 // In case we pause before the first progress update
@@ -329,10 +381,15 @@ public class UpdaterService extends Service {
                 mNotificationBuilder.setOngoing(false);
                 mNotificationBuilder.setAutoCancel(false);
                 mNotificationManager.notify(NOTIFICATION_ID, mNotificationBuilder.build());
+                if (!Utils.isNetworkAvailable(this)) {
+                    editor.putString(Constants.RESUME_DOWNLOAD_ID, update.getDownloadId()).apply();
+                    setupNetworkCallback(true);
+                }
                 tryStopSelf();
                 break;
             }
             case VERIFYING: {
+                notifySystemUpdaterService(STATUS_IN_PROGRESS, update);
                 mNotificationBuilder.setProgress(0, 0, true);
                 mNotificationStyle.setSummaryText(null);
                 mNotificationBuilder.setStyle(mNotificationStyle);
@@ -345,20 +402,56 @@ public class UpdaterService extends Service {
                 break;
             }
             case VERIFIED: {
+                notifySystemUpdaterService(STATUS_IN_PROGRESS, update);
                 stopForeground(STOP_FOREGROUND_DETACH);
                 mNotificationBuilder.setStyle(null);
                 mNotificationBuilder.setSmallIcon(R.drawable.ic_system_update);
                 mNotificationBuilder.setProgress(0, 0, false);
-                String text = getString(R.string.download_completed_notification);
+                String text = getString(R.string.e_download_completed_notification);
+
+                boolean hasRequiredSpace = Utils.availableFreeSpace() > (update.getFileSize() * 2);
+
+                if (!Utils.canInstall(update) || !Utils.isBatteryLevelOk(this)
+                        || !hasRequiredSpace) {
+                    /* Show notification if any of the below condition didn't met. */
+                    text = getString(R.string.blocked_update_dialog_title) + ". ";
+                    if (!Utils.isBatteryLevelOk(this)) {
+                        text = text + getString(R.string.dialog_battery_low_title);
+                    } else if (!hasRequiredSpace) {
+                        text = text + getString(R.string.e_dialog_free_space_low_title);
+                    } else if (!Utils.canInstall(update)) {
+                        text = text + getString(R.string.verification_failed_notification);
+                    }
+                } else if (!Utils.isABDevice()) {
+                    /* Add action to reboot and install for Non-A/B devices. */
+                    mNotificationBuilder.mActions.clear();
+                    mNotificationBuilder.addAction(R.drawable.ic_system_update,
+                            getString(R.string.e_reboot_install),
+                            getInstallationPendingIntent(update.getDownloadId()));
+                }
+
                 mNotificationBuilder.setContentText(text);
                 mNotificationBuilder.setTicker(text);
                 mNotificationBuilder.setOngoing(false);
                 mNotificationBuilder.setAutoCancel(true);
                 mNotificationManager.notify(NOTIFICATION_ID, mNotificationBuilder.build());
-                tryStopSelf();
+
+                /* Make sure these conditions are met before auto install
+                    - Can install package (Is a newer build or downgrade allowed)
+                    - Battery level (Above 30% if discharging or 20% if charging)
+                    - Free space to install (Double the size of the ota zip)
+                */
+                if (Utils.isABDevice() && Utils.canInstall(update)
+                        && Utils.isBatteryLevelOk(this) && hasRequiredSpace) {
+                    Utils.triggerUpdate(this, update.getDownloadId());
+                } else {
+                    tryStopSelf();
+                }
+
                 break;
             }
             case VERIFICATION_FAILED: {
+                notifySystemUpdaterService(STATUS_WAITING_DOWNLOAD, update);
                 stopForeground(STOP_FOREGROUND_DETACH);
                 mNotificationBuilder.setStyle(null);
                 mNotificationBuilder.setSmallIcon(android.R.drawable.stat_sys_warning);
@@ -373,6 +466,7 @@ public class UpdaterService extends Service {
                 break;
             }
             case INSTALLING: {
+                notifySystemUpdaterService(STATUS_IN_PROGRESS, update);
                 mNotificationBuilder.mActions.clear();
                 mNotificationBuilder.setStyle(mNotificationStyle);
                 mNotificationBuilder.setSmallIcon(R.drawable.ic_system_update);
@@ -396,6 +490,7 @@ public class UpdaterService extends Service {
                 break;
             }
             case INSTALLED: {
+                notifySystemUpdaterService(STATUS_WAITING_REBOOT, update);
                 stopForeground(STOP_FOREGROUND_DETACH);
                 mNotificationBuilder.mActions.clear();
                 mNotificationBuilder.setStyle(null);
@@ -407,22 +502,24 @@ public class UpdaterService extends Service {
                         getString(R.string.reboot),
                         getRebootPendingIntent());
                 mNotificationBuilder.setTicker(text);
-                mNotificationBuilder.setOngoing(false);
-                mNotificationBuilder.setAutoCancel(true);
+                mNotificationBuilder.setOngoing(true);
+                mNotificationBuilder.setAutoCancel(false);
+                mNotificationBuilder.setPriority(NotificationCompat.PRIORITY_MAX);
                 mNotificationManager.notify(NOTIFICATION_ID, mNotificationBuilder.build());
 
-                SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
-                boolean deleteUpdate = pref.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, false);
+                boolean deleteUpdate = pref.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true);
                 boolean isLocal = Update.LOCAL_ID.equals(update.getDownloadId());
                 // Always delete local updates
                 if (deleteUpdate || isLocal) {
-                    mUpdaterController.deleteUpdate(update.getDownloadId());
+                    pref.edit().putString(Constants.PREF_NEEDS_DELETE_ID,
+                            update.getDownloadId()).apply();
                 }
 
                 tryStopSelf();
                 break;
             }
             case INSTALLATION_FAILED: {
+                notifySystemUpdaterService(STATUS_WAITING_DOWNLOAD, update);
                 stopForeground(STOP_FOREGROUND_DETACH);
                 mNotificationBuilder.setStyle(null);
                 mNotificationBuilder.setSmallIcon(android.R.drawable.stat_sys_warning);
@@ -437,11 +534,13 @@ public class UpdaterService extends Service {
                 break;
             }
             case INSTALLATION_CANCELLED: {
+                notifySystemUpdaterService(STATUS_WAITING_DOWNLOAD, update);
                 stopForeground(true);
                 tryStopSelf();
                 break;
             }
             case INSTALLATION_SUSPENDED: {
+                notifySystemUpdaterService(STATUS_WAITING_DOWNLOAD, update);
                 stopForeground(STOP_FOREGROUND_DETACH);
                 // In case we pause before the first progress update
                 mNotificationBuilder.setProgress(100, update.getProgress(), false);
@@ -463,6 +562,8 @@ public class UpdaterService extends Service {
         }
     }
 
+    public static boolean isNetworkCallBackActive() { return isNetworkCallBackActive; }
+
     private void handleDownloadProgressChange(UpdateInfo update) {
         int progress = update.getProgress();
         mNotificationBuilder.setProgress(100, progress, false);
@@ -497,12 +598,31 @@ public class UpdaterService extends Service {
     private void setNotificationTitle(UpdateInfo update) {
         String buildDate = StringGenerator.getDateLocalizedUTC(this,
                 DateFormat.MEDIUM, update.getTimestamp());
-        String buildInfo = getString(R.string.list_build_version_date,
+        String buildInfo = getString(R.string.e_list_build_version_date,
                 update.getVersion(), buildDate);
         mNotificationStyle.setBigContentTitle(buildInfo);
         mNotificationBuilder.setContentTitle(buildInfo);
     }
 
+    public static void setupNetworkCallback(boolean shouldEnable) {
+        if (mConnectivityManager == null || mConnectionStateMonitor == null) {
+            Log.e(TAG, "Unable to set network callback");
+            return;
+        }
+        if (shouldEnable) {
+            mConnectivityManager.registerNetworkCallback(networkRequest, mConnectionStateMonitor);
+        } else {
+            try {
+                mConnectivityManager.unregisterNetworkCallback(mConnectionStateMonitor);
+            } catch (IllegalArgumentException | NullPointerException e) {
+                Log.e(TAG, "Network callback was not registered");
+            }
+        }
+
+        isNetworkCallBackActive = shouldEnable;
+        Log.d(TAG, "Network callback enabled: " + shouldEnable);
+    }
+
     private PendingIntent getResumePendingIntent(String downloadId) {
         final Intent intent = new Intent(this, UpdaterService.class);
         intent.setAction(ACTION_DOWNLOAD_CONTROL);
@@ -535,10 +655,22 @@ public class UpdaterService extends Service {
                 PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
 
+    private PendingIntent getInstallationPendingIntent(String downloadId) {
+        final Intent intent = new Intent(this, UpdaterService.class);
+        intent.setAction(ACTION_INSTALL_UPDATE);
+        intent.putExtra(UpdaterService.EXTRA_DOWNLOAD_ID, downloadId);
+        return PendingIntent.getService(this, 0, intent,
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+    }
+
     private PendingIntent getResumeInstallationPendingIntent() {
         final Intent intent = new Intent(this, UpdaterService.class);
         intent.setAction(ACTION_INSTALL_RESUME);
         return PendingIntent.getService(this, 0, intent,
                 PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
+
+    private void notifySystemUpdaterService(int status, UpdateInfo update) {
+        Utils.updateSystemUpdaterService(this, status, update.getVersion());
+    }
 }
diff --git a/app/src/main/java/org/lineageos/updater/download/HttpURLConnectionClient.java b/app/src/main/java/org/lineageos/updater/download/HttpURLConnectionClient.java
index 63067616dd91625788706d4a954cce303a103801..3c494fc9ec8f8dae018d614a32d95fb8d93a0f95 100644
--- a/app/src/main/java/org/lineageos/updater/download/HttpURLConnectionClient.java
+++ b/app/src/main/java/org/lineageos/updater/download/HttpURLConnectionClient.java
@@ -16,6 +16,8 @@
 package org.lineageos.updater.download;
 
 import android.os.SystemClock;
+import android.os.SystemProperties;
+
 import android.util.Log;
 
 import java.io.File;
@@ -32,6 +34,8 @@ import java.util.PriorityQueue;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.lineageos.updater.misc.Constants;
+
 public class HttpURLConnectionClient implements DownloadClient {
 
     private final static String TAG = "HttpURLConnectionClient";
@@ -58,6 +62,11 @@ public class HttpURLConnectionClient implements DownloadClient {
             DownloadClient.DownloadCallback callback,
             boolean useDuplicateLinks) throws IOException {
         mClient = (HttpURLConnection) new URL(url).openConnection();
+
+        String defaultUserAgent = mClient.getRequestProperty("User-Agent");
+        String newUserAgent = defaultUserAgent + " eOS v" + SystemProperties.get(Constants.PROP_BUILD_VERSION);
+        mClient.setRequestProperty("User-Agent", newUserAgent);
+
         mDestination = destination;
         mProgressListener = progressListener;
         mCallback = callback;
diff --git a/app/src/main/java/org/lineageos/updater/misc/BuildInfoUtils.java b/app/src/main/java/org/lineageos/updater/misc/BuildInfoUtils.java
index 4b90a45e545419a51c727fd23581071fba205f54..6a647faf2517460c8cd0084a87e285dfddb68b1d 100644
--- a/app/src/main/java/org/lineageos/updater/misc/BuildInfoUtils.java
+++ b/app/src/main/java/org/lineageos/updater/misc/BuildInfoUtils.java
@@ -29,4 +29,8 @@ public final class BuildInfoUtils {
     public static String getBuildVersion() {
         return SystemProperties.get(Constants.PROP_BUILD_VERSION);
     }
+
+    public static String getDisplayVersion() {
+        return SystemProperties.get(Constants.PROP_BUILD_DISPLAY_VERSION);
+    }
 }
diff --git a/app/src/main/java/org/lineageos/updater/misc/ConnectionStateMonitor.kt b/app/src/main/java/org/lineageos/updater/misc/ConnectionStateMonitor.kt
new file mode 100644
index 0000000000000000000000000000000000000000..edb1b51835791a21231055187856c8fe3693b8b9
--- /dev/null
+++ b/app/src/main/java/org/lineageos/updater/misc/ConnectionStateMonitor.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2022 MURENA SAS
+ *
+ * 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.
+ */
+package org.lineageos.updater.misc
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.net.ConnectivityManager
+import android.net.Network
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import androidx.preference.PreferenceManager
+import org.lineageos.updater.UpdatesCheckReceiver
+import org.lineageos.updater.controller.UpdaterController
+
+class ConnectionStateMonitor {
+    companion object {
+        private var instance: ConnectivityManager.NetworkCallback? = null
+    }
+
+    fun getInstance(context: Context): ConnectivityManager.NetworkCallback {
+        if (instance == null) {
+            instance = networkCallback(context)
+        }
+
+        return instance!!
+    }
+
+    /**
+     * API callbacks to determine which status we currently in
+     * we need the below callbacks:
+     * - onAvailable: device connected to a network of course
+     * - onLost: when the connection completely lost
+     */
+    private fun networkCallback(context: Context) = object: ConnectivityManager.NetworkCallback() {
+        private val tag = "ConnectionStateMonitor"
+        private val pref: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+        private val updaterController: UpdaterController = UpdaterController.getInstance(context)
+
+        private fun checkForUpdatesOrResume() {
+            val downloadId: String = pref.getString(Constants.RESUME_DOWNLOAD_ID, "")!!
+            if (downloadId.isNotEmpty()) {
+                Handler(Looper.getMainLooper()).postDelayed({
+                    updaterController.resumeDownload(
+                        downloadId
+                    )
+                }, 2000L) // 2 seconds
+            }
+            if (pref.getBoolean(Constants.AUTO_UPDATE_CHECK_FAILED, false)) {
+                Handler(Looper.getMainLooper()).postDelayed({
+                    val broadcastIntent = Intent()
+                    broadcastIntent.setClassName(context, UpdatesCheckReceiver::class.java.name)
+                    context.sendBroadcast(broadcastIntent)
+                }, 10000L) // 10 seconds
+            }
+
+        }
+
+        override fun onAvailable(network: Network) {
+            Log.d(tag, "Network available")
+            checkForUpdatesOrResume()
+        }
+
+        override fun onLost(network: Network) {
+            Log.d(tag, "Network not available")
+            checkForUpdatesOrResume()
+        }
+    }
+}
diff --git a/app/src/main/java/org/lineageos/updater/misc/Constants.java b/app/src/main/java/org/lineageos/updater/misc/Constants.java
index dfff5af027413a329ec7890245f45d6f4016ab89..80bae99de8adaef0dbf53717c283b9543c0c0921 100644
--- a/app/src/main/java/org/lineageos/updater/misc/Constants.java
+++ b/app/src/main/java/org/lineageos/updater/misc/Constants.java
@@ -23,18 +23,29 @@ public final class Constants {
     public static final String AB_PAYLOAD_BIN_PATH = "payload.bin";
     public static final String AB_PAYLOAD_PROPERTIES_PATH = "payload_properties.txt";
 
+    public static final String OTA_ANON_HASH = "ota_anon_hash";
+    public static final String RESUME_DOWNLOAD_ID = "resume_download_id";
+    public static final String AUTO_UPDATE_CHECK_FAILED = "auto_update_check_failed";
+
     public static final int AUTO_UPDATES_CHECK_INTERVAL_NEVER = 0;
     public static final int AUTO_UPDATES_CHECK_INTERVAL_DAILY = 1;
     public static final int AUTO_UPDATES_CHECK_INTERVAL_WEEKLY = 2;
     public static final int AUTO_UPDATES_CHECK_INTERVAL_MONTHLY = 3;
+    public static final int AUTO_UPDATES_CHECK_INTERVAL_5_MINUTES = 4;
+    public static final int AUTO_UPDATES_CHECK_INTERVAL_10_MINUTES = 5;
+    public static final int AUTO_UPDATES_CHECK_INTERVAL_30_MINUTES = 6;
 
     public static final String PREF_LAST_UPDATE_CHECK = "last_update_check";
     public static final String PREF_AUTO_UPDATES_CHECK_INTERVAL = "auto_updates_check_interval";
     public static final String PREF_AUTO_DELETE_UPDATES = "auto_delete_updates";
-    public static final String PREF_AB_PERF_MODE = "ab_perf_mode";
+    public static final String PREF_ALL_UPDATES = "all_updates";
+    public static final String PREF_AB_PERF_MODE_OLD = "ab_perf_mode";
+    public static final String PREF_AB_PERF_MODE = "e_ab_perf_mode";
     public static final String PREF_METERED_NETWORK_WARNING = "pref_metered_network_warning";
     public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning";
     public static final String PREF_NEEDS_REBOOT_ID = "needs_reboot_id";
+    public static final String PREF_NEEDS_DELETE_ID = "needs_delete_id";
+    public static final String PREF_NETWORK_CALLBACK_ACTIVE = "pref_network_callback_active";
 
     public static final String UNCRYPT_FILE_EXT = ".uncrypt";
 
@@ -42,12 +53,14 @@ public final class Constants {
     public static final String PROP_ALLOW_MAJOR_UPGRADES = "lineage.updater.allow_major_upgrades";
     public static final String PROP_BUILD_DATE = "ro.build.date.utc";
     public static final String PROP_BUILD_VERSION = "ro.lineage.build.version";
+    public static final String PROP_BUILD_DISPLAY_VERSION = "ro.lineage.display.version";
     public static final String PROP_BUILD_VERSION_INCREMENTAL = "ro.build.version.incremental";
     public static final String PROP_DEVICE = "ro.lineage.device";
     public static final String PROP_NEXT_DEVICE = "ro.updater.next_device";
     public static final String PROP_RELEASE_TYPE = "ro.lineage.releasetype";
     public static final String PROP_UPDATER_ALLOW_DOWNGRADING = "lineage.updater.allow_downgrading";
     public static final String PROP_UPDATER_URI = "lineage.updater.uri";
+    public static final String PROP_VERSION = "ro.lineage.version";
 
     public static final String PREF_INSTALL_OLD_TIMESTAMP = "install_old_timestamp";
     public static final String PREF_INSTALL_NEW_TIMESTAMP = "install_new_timestamp";
diff --git a/app/src/main/java/org/lineageos/updater/misc/JsonValidator.java b/app/src/main/java/org/lineageos/updater/misc/JsonValidator.java
new file mode 100644
index 0000000000000000000000000000000000000000..a1401c8e37c60de94f67c4e688bc2225088c081e
--- /dev/null
+++ b/app/src/main/java/org/lineageos/updater/misc/JsonValidator.java
@@ -0,0 +1,166 @@
+package org.lineageos.updater.misc;
+
+import android.util.Log;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class JsonValidator {
+
+    private static final String TAG = "JsonValidator" ;
+    private static final String[] jsonMainFields = {
+            "error",
+            "id",
+            "response"
+    };
+    private static final String[] requiredFields = {
+            "api_level",
+            "url",
+            "timestamp",
+            "md5sum",
+            "channel",
+            "filename",
+            "romtype",
+            "version",
+            "display_version",
+            "android_version",
+            "id"
+    };
+    private static final String[] optionalFields = {
+            "changes",
+            "pre_version"
+    };
+
+    public static boolean validateJsonFile(File jsonFile) {
+        try {
+            if (!jsonFile.exists()) {
+                Log.i(TAG, "Unable to locate json file");
+                return false;
+            }
+
+            // Read the JSON data from the file
+            BufferedReader reader = new BufferedReader(new FileReader(jsonFile));
+            StringBuilder jsonString = new StringBuilder();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                jsonString.append(line);
+            }
+            reader.close();
+
+            List<String> missingRequiredFields = new ArrayList<>();
+            JSONObject jsonObject = new JSONObject(jsonString.toString());
+            for (String field : jsonMainFields) {
+                if (!isMainFieldValid(jsonObject, field)) {
+                    missingRequiredFields.add(field);
+                }
+            }
+
+            if (!missingRequiredFields.isEmpty()) {
+                Log.i(TAG, "Missing or invalid required field in response object: "
+                        + missingRequiredFields);
+                return false;
+            }
+        } catch (IOException | JSONException e) {
+            Log.i(TAG, "Unable to parse the json file:" + e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateResponseObject(JSONObject responseObject) {
+        List<String> missingRequiredFields = new ArrayList<>();
+        List<String> missingOptionalFields = new ArrayList<>();
+
+        for (String field : requiredFields) {
+            if (!isObjectFieldValid(responseObject, field)) {
+                missingRequiredFields.add(field);
+            }
+        }
+
+        for (String field : optionalFields) {
+            if (!isObjectFieldValid(responseObject, field)) {
+                missingOptionalFields.add(field);
+            }
+        }
+
+        String filename = responseObject.optString("filename", "");
+        if (!missingRequiredFields.isEmpty()) {
+            if (!filename.isEmpty()) {
+                Log.i(TAG, "Missing or invalid required field in response object for "
+                        + filename + ": " + missingRequiredFields);
+            }
+            return false;
+        } else if (!missingOptionalFields.isEmpty() && !filename.isEmpty()) {
+            Log.i(TAG, "Missing or invalid optional field in response object for "
+                    + filename + ": " + missingOptionalFields);
+        }
+
+        return true; // All required fields are present and valid
+    }
+
+    private static boolean isMainFieldValid(JSONObject jsonObject, String field) {
+        if (!jsonObject.has(field)) {
+            return false;
+        }
+
+        String value = jsonObject.optString(field, ""); // Return empty string if field doesn't exist
+
+        switch (field) {
+            case "id":
+            case "error":
+                // Allow null, as it's a valid value
+                return true;
+            case "response":
+                // Check if it's an array with a length >= 0
+                return jsonObject.optJSONArray(field) != null
+                        && jsonObject.optJSONArray(field).length() >= 0;
+            default:
+                return !value.isEmpty();
+        }
+    }
+
+    private static boolean isObjectFieldValid(JSONObject jsonObject, String field) {
+        if (!jsonObject.has(field) || jsonObject.isNull(field)) {
+            return false;
+        }
+
+        String value = jsonObject.optString(field, ""); // Return empty string if field doesn't exist
+        if (value.isEmpty()) {
+            return false;
+        }
+
+        switch (field) {
+            case "datetime":
+            case "timestamp":
+            case "size":
+            case "api_level":
+                return Utils.isInteger(value);
+            case "is_upgrade_supported":
+                return "true".equals(value) || "false".equals(value);
+            case "android_version":
+                // Check if it's a valid Android version number
+                return value.matches("^(\\d+)$|^(\\d+\\.\\d+)$|^(\\d+\\.\\d+\\.\\d+)$");
+            case "md5sum":
+                // Check if it's a valid MD5 checksum
+                return value.matches("^[a-fA-F0-9]{32}$");
+            case "filename":
+                return value.endsWith(".zip");
+            case "id":
+                // Check if it's a valid SHA-256 checksum
+                return value.matches("^[a-fA-F0-9]{64}$");
+            case "url":
+                // Check if it's a valid URL format
+                return value.startsWith("http://") || value.startsWith("https://");
+            default:
+                return true;
+        }
+    }
+}
diff --git a/app/src/main/java/org/lineageos/updater/misc/Utils.java b/app/src/main/java/org/lineageos/updater/misc/Utils.java
index 518c8e72858c65ee4bc73aa756ad7396071aa00d..021dc1a8b549794ed6afe609dc73a83a5ced6dcc 100644
--- a/app/src/main/java/org/lineageos/updater/misc/Utils.java
+++ b/app/src/main/java/org/lineageos/updater/misc/Utils.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2017-2025 The LineageOS Project
+ * Copyright (C) 2025 eFoundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,18 +16,34 @@
  */
 package org.lineageos.updater.misc;
 
+import static android.os.SystemUpdateManager.KEY_STATUS;
+import static android.os.SystemUpdateManager.KEY_TITLE;
+import static android.os.SystemUpdateManager.STATUS_IDLE;
+import static android.os.SystemUpdateManager.STATUS_WAITING_DOWNLOAD;
+
 import android.app.AlarmManager;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
+import android.net.Uri;
+import android.os.BatteryManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.PersistableBundle;
+import android.os.StatFs;
 import android.os.SystemProperties;
+import android.os.SystemUpdateManager;
 import android.os.storage.StorageManager;
+import android.provider.Settings;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -36,7 +53,9 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.lineageos.updater.R;
+import org.lineageos.updater.UpdateImporter;
 import org.lineageos.updater.UpdatesDbHelper;
+import org.lineageos.updater.controller.UpdaterController;
 import org.lineageos.updater.controller.UpdaterService;
 import org.lineageos.updater.model.Update;
 import org.lineageos.updater.model.UpdateBaseInfo;
@@ -46,18 +65,26 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Enumeration;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.UUID;
+import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 public class Utils {
 
+    private static final int BATTERY_PLUGGED_ANY = BatteryManager.BATTERY_PLUGGED_AC
+            | BatteryManager.BATTERY_PLUGGED_USB
+            | BatteryManager.BATTERY_PLUGGED_WIRELESS;
+
     private static final String TAG = "Utils";
+    private static final String CONTENT_URI_PATH = "content://custom.setting.Provider.OTA_SERVER/cte";
 
     private Utils() {
     }
@@ -70,6 +97,11 @@ public class Utils {
         return new File(context.getCacheDir(), "updates.json");
     }
 
+    public static String generateRandomID() {
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+        return "anon" + uuid;
+    }
+
     // This should really return an UpdateBaseInfo object, but currently this only
     // used to initialize UpdateInfo objects
     private static UpdateInfo parseJsonUpdate(JSONObject object) throws JSONException {
@@ -81,14 +113,46 @@ public class Utils {
         update.setFileSize(object.getLong("size"));
         update.setDownloadUrl(object.getString("url"));
         update.setVersion(object.getString("version"));
+        update.setAndroidVersion(object.getString("android_version"));
+        if (object.has("pre_version") && !object.getString("pre_version").isEmpty()) {
+          update.setDisplayVersion(object.getString("version") + "-" + object.getString("pre_version"));
+        } else {
+          update.setDisplayVersion(object.getString("version"));
+        }
         return update;
     }
 
+    public static int parseAndroidVersion(String versionString) {
+        // Parse android versions such as 8.1.0.
+        // Older updates still shows in ota requests.
+        Pattern pattern = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)");
+        Matcher matcher = pattern.matcher(versionString);
+        return matcher.matches() ? Integer.parseInt(Objects.requireNonNull(matcher.group(1)))
+                : Float.valueOf(versionString).intValue();
+    }
+
     public static boolean isCompatible(UpdateBaseInfo update) {
-        if (update.getVersion().compareTo(SystemProperties.get(Constants.PROP_BUILD_VERSION)) < 0) {
-            Log.d(TAG, update.getName() + " is older than current Android version");
-            return false;
+        String updateAndroidVersion = update.getAndroidVersion();
+        if (!updateAndroidVersion.isEmpty()) {
+            final int updateOSVersion = parseAndroidVersion(updateAndroidVersion);
+            final int deviceOSVersion = parseAndroidVersion(Build.VERSION.RELEASE);
+            if (deviceOSVersion > updateOSVersion) {
+                    Log.d(TAG, "Update : Skipping " + update.getName() + " since the installed version "
+                            + deviceOSVersion + " is newer than update " + updateOSVersion);
+                    return false;
+            }
         }
+
+        int[] updateVersionParts = parseSemVer(update.getVersion());
+        int updateMajorVersion = updateVersionParts[0];
+        int updateMinorVersion = updateVersionParts[1];
+        Log.d(TAG, "Update : Major "+updateMajorVersion +" Minor "+ updateMinorVersion );
+
+        int[] deviceVersionParts = parseSemVer(SystemProperties.get(Constants.PROP_BUILD_VERSION));
+        int deviceMajorVersion = deviceVersionParts[0];
+        int deviceMinorVersion = deviceVersionParts[1];
+        Log.d(TAG, "Device : Major "+ deviceMajorVersion +" Minor "+ deviceMinorVersion );
+
         if (!SystemProperties.getBoolean(Constants.PROP_UPDATER_ALLOW_DOWNGRADING, false) &&
                 update.getTimestamp() <= SystemProperties.getLong(Constants.PROP_BUILD_DATE, 0)) {
             Log.d(TAG, update.getName() + " is older than/equal to the current build");
@@ -98,35 +162,46 @@ public class Utils {
             Log.d(TAG, update.getName() + " has type " + update.getType());
             return false;
         }
+        if(updateMajorVersion > deviceMajorVersion){
+            Log.d(TAG, update.getName() + " is Newer to current Major version");
+            return true;
+        }
+        if(updateMajorVersion < deviceMajorVersion){
+            Log.d(TAG, update.getName() + " is Older to current Major version");
+            return false;
+        }
+        if(updateMinorVersion < deviceMinorVersion){
+            Log.d(TAG, update.getName() + " is Older to current Minor version");
+            return false;
+        }
+
         return true;
     }
 
-    private static boolean compareVersions(String a, String b, boolean allowMajorUpgrades) {
-        try {
-            int majorA = Integer.parseInt(a.split("\\.")[0]);
-            int minorA = Integer.parseInt(a.split("\\.")[1]);
+    public static int[] parseSemVer(String versionCode) {
+        String[] versionParts = versionCode.split(Pattern.quote("."));
+        int major = Integer.parseInt(versionParts[0]);
+        int minor = Integer.parseInt(versionParts[1]);
+        return new int[]{ major, minor };
+    }
 
-            int majorB = Integer.parseInt(b.split("\\.")[0]);
-            int minorB = Integer.parseInt(b.split("\\.")[1]);
+    public static long availableFreeSpace() {
+        StatFs stats = new StatFs(Environment.getDataDirectory().getAbsolutePath());
+        return stats.getAvailableBlocksLong() * stats.getBlockSizeLong();
+    }
 
-            // Return early and allow if we allow major version upgrades
-            return (allowMajorUpgrades && majorA > majorB)
-                    || (majorA == majorB && minorA >= minorB);
-        } catch (ArrayIndexOutOfBoundsException | NumberFormatException e) {
-            return false;
-        }
+    // https://stackoverflow.com/a/28527441
+    public static String getFileSize(long size) {
+        if (size <= 0)
+            return "0";
+        final String[] units = new String[] { "B", "KB", "MB", "GB", "TB" };
+        int digitGroups = (int) (Math.log10(size) / Math.log10(1024));
+        return new DecimalFormat("#,##0.#").format(size / Math.pow(1024, digitGroups)) + " " + units[digitGroups];
     }
 
     public static boolean canInstall(UpdateBaseInfo update) {
-        boolean allowMajorUpgrades = SystemProperties.getBoolean(
-                Constants.PROP_ALLOW_MAJOR_UPGRADES, false);
-
         return (SystemProperties.getBoolean(Constants.PROP_UPDATER_ALLOW_DOWNGRADING, false) ||
-                update.getTimestamp() > SystemProperties.getLong(Constants.PROP_BUILD_DATE, 0)) &&
-                compareVersions(
-                        update.getVersion(),
-                        SystemProperties.get(Constants.PROP_BUILD_VERSION),
-                        allowMajorUpgrades);
+                update.getTimestamp() > SystemProperties.getLong(Constants.PROP_BUILD_DATE, 0));
     }
 
     public static List<UpdateInfo> parseJson(File file, boolean compatibleOnly)
@@ -147,6 +222,12 @@ public class Utils {
                 continue;
             }
             try {
+                boolean isValidated = JsonValidator.validateResponseObject(
+                        updatesList.getJSONObject(i));
+                if (!isValidated) {
+                    Log.d(TAG, "Ignoring incompatible update");
+                    continue;
+                }
                 UpdateInfo update = parseJsonUpdate(updatesList.getJSONObject(i));
                 if (!compatibleOnly || isCompatible(update)) {
                     updates.add(update);
@@ -166,10 +247,27 @@ public class Utils {
         String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
                 SystemProperties.get(Constants.PROP_DEVICE));
         String type = SystemProperties.get(Constants.PROP_RELEASE_TYPE).toLowerCase(Locale.ROOT);
+        String anonHash = Settings.Secure.getString(context.getContentResolver(),
+                Constants.OTA_ANON_HASH);
 
         String serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI);
+        if (retrieveStatus(context) != null && retrieveStatus(context).equals("true")
+                && isDevModeOn(context)) {
+            serverUrl = context.getString(R.string.e_ota_staging_server_url);
+        }
+
         if (serverUrl.trim().isEmpty()) {
-            serverUrl = context.getString(R.string.updater_server_url);
+            serverUrl = context.getString(R.string.e_updater_server_url);
+        }
+
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean showAllUpdates = preferences.getBoolean(Constants.PREF_ALL_UPDATES, false)
+                || isDevModeOn(context);
+
+        if (anonHash != null && !anonHash.isEmpty()) {
+            serverUrl += "?ota_anon_hash=" + anonHash + "&strict=" + !showAllUpdates;
+        } else {
+            serverUrl += "?strict=" + !showAllUpdates;
         }
 
         return serverUrl.replace("{device}", device)
@@ -177,6 +275,18 @@ public class Utils {
                 .replace("{incr}", incrementalVersion);
     }
 
+    /*get the status from database that ota option is on or off*/
+    public static String retrieveStatus(Context context) {
+        String status = null;
+        Cursor cursor = context.getContentResolver().query(Uri.parse(CONTENT_URI_PATH), null, "id=?", new String[]{"1"}, "Status");
+        if (cursor.moveToFirst()) {
+            do {
+                status = cursor.getString(cursor.getColumnIndex("Status"));
+            } while (cursor.moveToNext());
+        }
+        return status;
+    }
+
     public static String getUpgradeBlockedURL(Context context) {
         String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
                 SystemProperties.get(Constants.PROP_DEVICE));
@@ -184,9 +294,8 @@ public class Utils {
     }
 
     public static String getChangelogURL(Context context) {
-        String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
-                SystemProperties.get(Constants.PROP_DEVICE));
-        return context.getString(R.string.menu_changelog_url, device);
+        String buildVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION);
+        return context.getString(R.string.e_menu_changelog_url, buildVersion);
     }
 
     public static void triggerUpdate(Context context, String downloadId) {
@@ -220,26 +329,47 @@ public class Utils {
     /**
      * Compares two json formatted updates list files
      *
-     * @param oldJson old update list
      * @param newJson new update list
-     * @return true if newJson has at least a compatible update not available in oldJson
+     * @return true if newJson has an update with higher version than the installed system
      */
-    public static boolean checkForNewUpdates(File oldJson, File newJson)
+    public static boolean checkForNewUpdates(File newJson, Context context)
             throws IOException, JSONException {
-        List<UpdateInfo> oldList = parseJson(oldJson, true);
         List<UpdateInfo> newList = parseJson(newJson, true);
-        Set<String> oldIds = new HashSet<>();
-        for (UpdateInfo update : oldList) {
-            oldIds.add(update.getDownloadId());
-        }
-        // In case of no new updates, the old list should
-        // have all (if not more) the updates
+        int[] deviceVersionParts = parseSemVer(SystemProperties.get(Constants.PROP_BUILD_VERSION));
+        int deviceMajorVersion = deviceVersionParts[0];
+        int deviceMinorVersion = deviceVersionParts[1];
+        int deviceMaintenanceVersion = deviceVersionParts.length > 2 ? deviceVersionParts[2] : 0;
+        int highestMajorVersion = deviceMajorVersion;
+        int highestMinorVersion = deviceMinorVersion;
+        int highestMaintenanceVersion = deviceMaintenanceVersion;
+	    boolean hasUpdate = false;
         for (UpdateInfo update : newList) {
-            if (!oldIds.contains(update.getDownloadId())) {
-                return true;
+            if (isCompatible(update)) {
+                Log.d(TAG, "New compatible update available");
+                int[] updateVersionParts = parseSemVer(update.getVersion());
+                int updateMajorVersion = updateVersionParts[0];
+                int updateMinorVersion = updateVersionParts[1];
+                int updateMaintenanceVersion = updateVersionParts.length > 2
+                        ? updateVersionParts[2] : 0;
+                if (updateMajorVersion * 10000 + updateMinorVersion * 100 + updateMaintenanceVersion
+                        >= highestMajorVersion * 10000 + highestMinorVersion * 100
+                        + highestMaintenanceVersion) {
+                    highestMajorVersion = updateMajorVersion;
+                    highestMinorVersion = updateMinorVersion;
+					highestMaintenanceVersion = updateMaintenanceVersion;
+				}
+				hasUpdate = true;
             }
         }
-        return false;
+        String updateVersion = highestMajorVersion + "." + highestMinorVersion +
+                (highestMaintenanceVersion > 0 ? "." + highestMaintenanceVersion : "");
+        if (hasUpdate) {
+           updateSystemUpdaterService(context, STATUS_WAITING_DOWNLOAD, updateVersion);
+           return true;
+        } else {
+           updateSystemUpdaterService(context, STATUS_IDLE, updateVersion);
+           return false;
+        }
     }
 
     /**
@@ -284,6 +414,14 @@ public class Utils {
         }
     }
 
+    public static void removeLocalUpdate(Context context) {
+        File downloadPath = getDownloadPath(context);
+        File localUpdate = new File(downloadPath, UpdateImporter.FILE_NAME);
+        if (localUpdate.exists()) {
+            Log.d(TAG, "Deleting local update: " + localUpdate.delete());
+        }
+    }
+
     /**
      * Cleanup the download directory, which is assumed to be a privileged location
      * the user can't access and that might have stale files. This can happen if
@@ -300,7 +438,7 @@ public class Utils {
         long prevTimestamp = preferences.getLong(Constants.PREF_INSTALL_OLD_TIMESTAMP, 0);
         String lastUpdatePath = preferences.getString(Constants.PREF_INSTALL_PACKAGE_PATH, null);
         boolean reinstalling = preferences.getBoolean(Constants.PREF_INSTALL_AGAIN, false);
-        boolean deleteUpdates = preferences.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, false);
+        boolean deleteUpdates = preferences.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true);
         if ((buildTimestamp != prevTimestamp || reinstalling) && deleteUpdates &&
                 lastUpdatePath != null) {
             File lastUpdate = new File(lastUpdatePath);
@@ -344,6 +482,18 @@ public class Utils {
         preferences.edit().putBoolean(DOWNLOADS_CLEANUP_DONE, true).apply();
     }
 
+    public static void removeInstalledUpdate(Context context) {
+        SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
+        String downloadId = pref.getString(Constants.PREF_NEEDS_DELETE_ID, null);
+        if (downloadId != null) {
+            UpdaterController controller = UpdaterController.getInstance(context);
+            if (controller != null) {
+                controller.deleteUpdate(downloadId);
+            }
+            pref.edit().remove(Constants.PREF_NEEDS_DELETE_ID).apply();
+        }
+    }
+
     public static File appendSequentialNumber(final File file) {
         String name;
         String extension;
@@ -381,6 +531,18 @@ public class Utils {
         return isAB;
     }
 
+    public static boolean defaultABPerfMode(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean oldPrefValue = prefs.getBoolean(Constants.PREF_AB_PERF_MODE_OLD, false);
+        return (context.getResources().getBoolean(R.bool.config_prioritizeUpdateProcess)
+                || oldPrefValue);
+    }
+
+    public static boolean isDevModeOn(Context context) {
+        return Settings.Global.getInt(context.getContentResolver(),
+                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED , 0) == 1;
+    }
+
     public static boolean hasTouchscreen(Context context) {
         return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN);
     }
@@ -402,7 +564,45 @@ public class Utils {
     public static int getUpdateCheckSetting(Context context) {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
         return preferences.getInt(Constants.PREF_AUTO_UPDATES_CHECK_INTERVAL,
-                Constants.AUTO_UPDATES_CHECK_INTERVAL_WEEKLY);
+                Constants.AUTO_UPDATES_CHECK_INTERVAL_DAILY);
+    }
+
+    public static void updateSystemUpdaterService(Context context, int status, String version) {
+        final SystemUpdateManager updateManager = context.getSystemService(SystemUpdateManager.class);
+
+        final Bundle oldInfo = updateManager.retrieveSystemUpdateInfo();
+        final int oldStatus = oldInfo.getInt(SystemUpdateManager.KEY_STATUS);
+
+        if (status != oldStatus) {
+            PersistableBundle infoBundle = new PersistableBundle();
+            infoBundle.putInt(KEY_STATUS, status);
+            infoBundle.putString(KEY_TITLE, version);
+            updateManager.updateSystemUpdateInfo(infoBundle);
+        }
+    }
+
+    public static boolean isBatteryLevelOk(Context context) {
+        Intent intent = context.registerReceiver(null,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        if (intent == null || !intent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, false)) {
+            return true;
+        }
+        int percent = Math.round(100.f * intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 100) /
+                intent.getIntExtra(BatteryManager.EXTRA_SCALE, 100));
+        int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
+        int required = (plugged & BATTERY_PLUGGED_ANY) != 0 ?
+                context.getResources().getInteger(R.integer.battery_ok_percentage_charging) :
+                context.getResources().getInteger(R.integer.battery_ok_percentage_discharging);
+        return percent >= required;
+    }
+
+    public static boolean isInteger(String value) {
+        try {
+            Integer.parseInt(value);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
     }
 
     public static boolean isUpdateCheckEnabled(Context context) {
@@ -411,6 +611,12 @@ public class Utils {
 
     public static long getUpdateCheckInterval(Context context) {
         switch (Utils.getUpdateCheckSetting(context)) {
+            case Constants.AUTO_UPDATES_CHECK_INTERVAL_5_MINUTES:
+                return AlarmManager.INTERVAL_FIFTEEN_MINUTES / 3;
+            case Constants.AUTO_UPDATES_CHECK_INTERVAL_10_MINUTES:
+                return AlarmManager.INTERVAL_HALF_HOUR / 3;
+            case Constants.AUTO_UPDATES_CHECK_INTERVAL_30_MINUTES:
+                return AlarmManager.INTERVAL_HALF_HOUR;
             case Constants.AUTO_UPDATES_CHECK_INTERVAL_DAILY:
                 return AlarmManager.INTERVAL_DAY;
             case Constants.AUTO_UPDATES_CHECK_INTERVAL_WEEKLY:
diff --git a/app/src/main/java/org/lineageos/updater/model/UpdateBase.java b/app/src/main/java/org/lineageos/updater/model/UpdateBase.java
index 8fcf09c8f962ec56a7787e42ae0f9754325fb521..167e36295c6a0435e77746ade0d0ddd63dfebdf0 100644
--- a/app/src/main/java/org/lineageos/updater/model/UpdateBase.java
+++ b/app/src/main/java/org/lineageos/updater/model/UpdateBase.java
@@ -23,6 +23,8 @@ public class UpdateBase implements UpdateBaseInfo {
     private long mTimestamp;
     private String mType;
     private String mVersion;
+    private String mDisplayVersion;
+    private String mAndroidVersion;
     private long mFileSize;
 
     public UpdateBase() {
@@ -35,6 +37,8 @@ public class UpdateBase implements UpdateBaseInfo {
         mTimestamp = update.getTimestamp();
         mType = update.getType();
         mVersion = update.getVersion();
+        mDisplayVersion = update.getDisplayVersion();
+        mAndroidVersion = update.getAndroidVersion();
         mFileSize = update.getFileSize();
     }
 
@@ -83,6 +87,15 @@ public class UpdateBase implements UpdateBaseInfo {
         mVersion = version;
     }
 
+    @Override
+    public String getDisplayVersion() {
+        return mDisplayVersion;
+    }
+
+    public void setDisplayVersion(String displayVersion) {
+        mDisplayVersion = displayVersion;
+    }
+
     @Override
     public String getDownloadUrl() {
         return mDownloadUrl;
@@ -100,4 +113,13 @@ public class UpdateBase implements UpdateBaseInfo {
     public void setFileSize(long fileSize) {
         mFileSize = fileSize;
     }
+
+    @Override
+    public String getAndroidVersion() {
+        return mAndroidVersion;
+    }
+
+    public void setAndroidVersion(String androidVersion) {
+        mAndroidVersion = androidVersion;
+    }
 }
diff --git a/app/src/main/java/org/lineageos/updater/model/UpdateBaseInfo.java b/app/src/main/java/org/lineageos/updater/model/UpdateBaseInfo.java
index 2041582ad0c613431559f54bb4a04fc6d8aae5ba..aea17bd80661f3ce8cd99919c17cad79490d4a80 100644
--- a/app/src/main/java/org/lineageos/updater/model/UpdateBaseInfo.java
+++ b/app/src/main/java/org/lineageos/updater/model/UpdateBaseInfo.java
@@ -26,7 +26,11 @@ public interface UpdateBaseInfo {
 
     String getVersion();
 
+    String getDisplayVersion();
+
     String getDownloadUrl();
 
     long getFileSize();
+
+    String getAndroidVersion();
 }
diff --git a/app/src/main/res/layout-television/activity_updates.xml b/app/src/main/res/layout-television/activity_updates.xml
index efabfea41ce8a68136e2d69d0c1c982004b3a79a..df63d6c806cb2da120ddd8a5f9d8e2cbd16a6880 100644
--- a/app/src/main/res/layout-television/activity_updates.xml
+++ b/app/src/main/res/layout-television/activity_updates.xml
@@ -105,7 +105,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="@string/list_no_updates"
+                android:text="@string/e_list_no_updates"
                 android:textColor="?android:textColorSecondary" />
         </androidx.core.widget.NestedScrollView>
 
diff --git a/app/src/main/res/layout/activity_updates.xml b/app/src/main/res/layout/activity_updates.xml
index adfe1a27147de46995d227924a449f07be561cfa..1dc5d5e8b8ab94d563baa58a29097e8cd3d047c9 100644
--- a/app/src/main/res/layout/activity_updates.xml
+++ b/app/src/main/res/layout/activity_updates.xml
@@ -15,7 +15,7 @@
         android:fitsSystemWindows="true"
         android:outlineAmbientShadowColor="@android:color/transparent"
         android:outlineSpotShadowColor="@android:color/transparent"
-        android:background="?android:attr/colorPrimary"
+        android:background="@color/toolbar_collapsed"
         android:theme="@style/Theme.CollapsingToolbar.Settings">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
@@ -48,14 +48,24 @@
                 android:paddingStart="16dp"
                 app:layout_collapseMode="parallax">
 
+                <TextView
+                    android:id="@+id/header_current_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="24dp"
+                    android:text="@string/e_current_version"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textSize="16sp" />
+
                 <TextView
                     android:id="@+id/header_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:fontFamily="sans-serif-light"
-                    android:paddingBottom="16dp"
+                    android:paddingBottom="24dp"
+                    android:layout_below="@id/header_current_version"
                     android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="56sp"
+                    android:textSize="30sp"
                     tools:text="LineageOS\n20"/>
 
                 <TextView
@@ -81,7 +91,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/header_build_date"
-                    android:layout_marginTop="8dp"
                     android:textColor="?android:attr/textColorPrimary"
                     android:textSize="12sp"
                     tools:text="Last checked: 1970-01-01"/>
@@ -108,17 +117,37 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="@string/list_no_updates"
+            android:text="@string/e_list_no_updates"
             android:textColor="?android:textColorSecondary" />
     </androidx.core.widget.NestedScrollView>
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
+    <LinearLayout
+        android:id="@+id/content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:paddingBottom="5dp"
-        android:scrollbars="vertical"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:listitem="@layout/update_item_view" />
+        android:orientation="vertical"
+        android:visibility="gone" 
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <TextView
+            android:id="@+id/available_update_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="24dp"
+            android:paddingBottom="24dp"
+            android:paddingStart="16dp"
+            android:textSize="16sp"
+            android:background="@color/toolbar_collapsed"
+            android:visibility="gone"
+            android:text="@string/e_available_updates"
+            android:textColor="?android:textColorPrimary" />
+        
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:paddingBottom="5dp"
+            android:scrollbars="vertical" />
+    </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/preferences_dialog.xml b/app/src/main/res/layout/preferences_dialog.xml
index c1b435605c5ca5c3cabe089f1b3524cac3d6f1e6..f0cb89a0fad5b06eb3058177284cdaddf66c19d3 100644
--- a/app/src/main/res/layout/preferences_dialog.xml
+++ b/app/src/main/res/layout/preferences_dialog.xml
@@ -25,10 +25,17 @@
             android:id="@+id/preferences_auto_updates_check_interval"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:entries="@array/menu_auto_updates_check_interval_entries" />
+            android:layout_weight="1" />
     </LinearLayout>
 
+    <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/preferences_all_updates"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:text="@string/e_pref_all_updates"
+        android:textSize="16sp" />
+
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/preferences_auto_delete_updates"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/update_item_view.xml b/app/src/main/res/layout/update_item_view.xml
index 7198c37dfd44425184b26f8beddb502875b39eeb..fdecfeaddfa5330eca5f5f9849a3924c590a4d97 100644
--- a/app/src/main/res/layout/update_item_view.xml
+++ b/app/src/main/res/layout/update_item_view.xml
@@ -8,100 +8,60 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:nextFocusRight="@+id/update_action"
-    android:layout_marginTop="8dp"
-    android:layout_marginStart="8dp"
-    android:layout_marginEnd="8dp"
-    app:cardCornerRadius="16dp"
+    app:cardCornerRadius="0dp"
     app:contentPadding="16dp">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:weightSum="1"
-        android:baselineAligned="false">
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/build_version"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:alpha="0.87"
-                android:drawablePadding="8dp"
-                android:maxLines="1"
-                android:paddingBottom="8sp"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="16sp"
-                tools:text="LineageOS 20" />
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:weightSum="1"
+            android:baselineAligned="false">
 
-            <TextView
-                android:id="@+id/build_date"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:textSize="14sp"
-                tools:text="18 June 2023" />
+                android:layout_weight="1"
+                android:orientation="vertical">
 
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/build_version"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/progress"
-                    android:visibility="invisible"
-                    tools:visibility="visible">
-
-                    <ProgressBar
-                        android:id="@+id/progress_bar"
-                        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="4sp"
-                        tools:progress="65" />
-
-                    <TextView
-                        android:id="@+id/progress_percent"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingStart="8dp"
-                        android:paddingEnd="8dp"
-                        tools:text="65%" />
-                </LinearLayout>
+                    android:alpha="0.87"
+                    android:drawablePadding="8dp"
+                    android:maxLines="1"
+                    android:paddingBottom="8sp"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textSize="16sp"
+                    tools:text="LineageOS 20" />
 
                 <TextView
-                    android:id="@+id/progress_text"
+                    android:id="@+id/upgrade_type"
+                    android:textColor="@color/theme_accent"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/progress"
-                    android:ellipsize="marquee"
-                    android:singleLine="true"
-                    android:visibility="invisible"
-                    tools:text="162 of 1.1 GB (3 minutes left)"
+                    android:maxLines="1"
+                    android:text="@string/e_version_upgrade_dialog_title"
+                    android:textSize="14sp"
+                    android:visibility="gone"
+                    tools:text="@string/e_version_upgrade_dialog_title"
                     tools:visibility="visible" />
 
                 <TextView
-                    android:id="@+id/build_size"
+                    android:id="@+id/build_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingTop="8sp"
-                    android:singleLine="true"
-                    tools:text="1.1 GB"
-                    tools:visibility="invisible" />
-            </RelativeLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+                    android:maxLines="1"
+                    android:textSize="14sp"
+                    tools:text="18 June 2023" />
+            </LinearLayout>
             <ImageButton
                 android:id="@+id/update_menu"
                 style="?android:attr/actionOverflowButtonStyle"
@@ -110,14 +70,65 @@
                 android:layout_gravity="end"
                 android:padding="8dp"
                 android:contentDescription="@null" />
-            <Button
-                android:id="@id/update_action"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"
-                android:background="?android:selectableItemBackgroundBorderless"
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/progress"
+                android:visibility="invisible"
+                tools:visibility="visible">
+
+                <ProgressBar
+                    android:id="@+id/progress_bar"
+                    style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="4sp"
+                    tools:progress="65" />
+
+                <TextView
+                    android:id="@+id/progress_percent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    tools:text="65%" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/progress_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                tools:text="Pause" />
-        </LinearLayout>
+                android:layout_below="@id/progress"
+                android:ellipsize="marquee"
+                android:singleLine="true"
+                android:visibility="invisible"
+                tools:text="162 of 1.1 GB (3 minutes left)"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/build_size"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="8sp"
+                android:singleLine="true"
+                tools:text="1.1 GB"
+                tools:visibility="invisible" />
+        </RelativeLayout>
+        <Button
+            android:id="@id/update_action"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="8dp"
+            tools:text="Pause" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/menu/menu_toolbar.xml b/app/src/main/res/menu/menu_toolbar.xml
index dbca3d03319d6c82c543d64f914cc914672e4ffd..9b97c5f96bf144dd866e41fbb677789656a90d91 100644
--- a/app/src/main/res/menu/menu_toolbar.xml
+++ b/app/src/main/res/menu/menu_toolbar.xml
@@ -16,6 +16,6 @@
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_show_changelog"
-        android:title="@string/menu_show_changelog"
+        android:title="@string/e_menu_show_changelog"
         app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/values-de/e_strings.xml b/app/src/main/res/values-de/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..66faa810a09fde449b279821cfb96545625c1ac7
--- /dev/null
+++ b/app/src/main/res/values-de/e_strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_list_no_updates">Auf deinem Telefon läuft die neueste /e/OS-Version. Um manuell nach neuen Aktualisierungen zu suchen, verwende die Schaltfläche „Aktualisieren“.</string>
+    <string name="e_header_title_text">/e/OS
+\n%1$s</string>
+    <string name="e_menu_show_changelog">Versionshinweise anzeigen</string>
+    <string name="e_list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>
+    <string name="e_list_build_version">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>
+    <string name="e_available_updates">Verfügbare Aktualisierungen:</string>
+    <string name="e_current_version">Aktuelle Version:</string>
+    <string name="e_menu_auto_updates_check_interval_30_minutes">Alle 30 Minuten</string>
+    <string name="e_menu_auto_updates_check_interval_10_minutes">Alle 10 Minuten</string>
+    <string name="e_menu_auto_updates_check_interval_5_minutes">Alle 5 Minuten</string>
+    <string name="e_dialog_free_space_low_message_pct">Die Aktualisierung kann nicht abgeschlossen werden, weil nicht genug Speicher frei ist. Mindestens <xliff:g id="needed_free_space">%1$s</xliff:g> freier interner Speicher ist nötig, bevor du weitermachst.</string>
+    <string name="e_dialog_free_space_low_title">Platz schaffen</string>
+    <string name="e_action_update">Aktualisierung installieren</string>
+    <string name="e_reboot_install">Neustarten und Installieren</string>
+    <string name="e_download_completed_notification">Aktualisierung ist bereit zur Installation</string>
+    <string name="e_version_upgrade_dialog_message">Sie stehen kurz davor, die höhere Version <xliff:g id="update_name">%1$s</xliff:g> zu installieren, die auf Android <xliff:g id="version_android">%2$s</xliff:g> aufbaut.
+\n
+\nHinweis: Es ist immer eine gute Idee, Ihre Daten vor Versionsänderungen zu sichern.
+\n
+\nWenn Sie <xliff:g id="ok">%3$s</xliff:g> antippen, wird das Gerät in den Wiederherstellungs-Modus neu starten, um die neue Version zu installieren.</string>
+    <string name="e_apply_update_dialog_message_ab">Sie stehen kurz davor, die Aktualisierung <xliff:g id="update_name">%1$s</xliff:g> zu installieren.
+\n
+\nWenn Sie <xliff:g id="ok">%2$s</xliff:g> antippen, wird das Gerät die Aktualisierung im Hintergrund installieren.
+\n
+\nWenn sie abgeschlossen ist, werden Sie zum Neustart aufgefordert.</string>
+    <string name="e_version_upgrade_dialog_message_ab">Sie stehen kurz davor, die höhere Version <xliff:g id="update_name">%1$s</xliff:g> zu installieren, die auf Android <xliff:g id="version_android">%2$s</xliff:g> aufbaut.
+\n
+\nHinweis: Es ist immer eine gute Idee, Ihre Daten vor Versionsänderungen zu sichern.
+\n
+\nWenn Sie <xliff:g id="ok">%3$s</xliff:g> antippen, wird das Gerät die neue Version im Hintergrund installieren.
+\n
+\nWenn sie abgeschlossen ist, werden Sie zum Neustart aufgefordert.</string>
+    <string name="e_apply_update_dialog_message">Sie stehen kurz davor, die Aktualisierung <xliff:g id="update_name">%1$s</xliff:g> zu installieren.
+\n
+\nWenn Sie <xliff:g id="ok">%2$s</xliff:g> antippen, wird das Gerät in den Wiederherstellungs-Modus neu starten, um die Aktualisierung zu installieren.</string>
+    <string name="e_version_upgrade_dialog_title">Versionsaufstieg!</string>
+    <string name="e_pref_all_updates">Alle verfügbaren Aktualisierungen anzeigen</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/e_strings.xml b/app/src/main/res/values-es/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e18ef185976cf0aabeeeb5e92a366d22c4993bcd
--- /dev/null
+++ b/app/src/main/res/values-es/e_strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_current_version">Versión actual:</string>
+    <string name="e_available_updates">Actualizaciones disponibles:</string>
+    <string name="e_dialog_free_space_low_message_pct">La actualización no puede completarse porque no hay suficiente espacio libre. Debes tener al menos <xliff:g id="needed_free_space">%1$s</xliff:g> de espacio libre.</string>
+    <string name="e_dialog_free_space_low_title">Liberar espacio</string>
+    <string name="e_reboot_install">Reiniciar e instalar</string>
+    <string name="e_menu_auto_updates_check_interval_5_minutes">Cada 5 minutos</string>
+    <string name="e_menu_auto_updates_check_interval_10_minutes">Cada 10 minutos</string>
+    <string name="e_menu_auto_updates_check_interval_30_minutes">Cada 30 minutos</string>
+    <string name="e_list_no_updates">Estás usando la última versión de /e/OS. Para comprobar manualmente si hay actualizaciones, usa el botón Actualizar.</string>
+    <string name="e_action_update">Aplicar actualización</string>
+    <string name="e_apply_update_dialog_message">Estás a punto de actualizar a <xliff:g id="update_name">%1$s</xliff:g>.
+\n
+\nSi pulsas <xliff:g id="ok">%2$s</xliff:g>, el dispositivo se reiniciará en modo de recuperación para instalar la actualización.</string>
+    <string name="e_version_upgrade_dialog_title">¡Actualización disponible!</string>
+    <string name="e_list_build_version">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>
+    <string name="e_list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>
+    <string name="e_menu_show_changelog">Mostrar notas de publicación</string>
+    <string name="e_header_title_text">/e/OS
+\n%1$s</string>
+    <string name="e_apply_update_dialog_message_ab">Estás a punto de actualizar a <xliff:g id="update_name">%1$s</xliff:g>.
+\n
+\nSi pulsas <xliff:g id="ok">%2$s</xliff:g>, el dispositivo comenzará la instalación en segundo plano.
+\n
+\nUna vez completada, se te pedirá que reinicies.</string>
+    <string name="e_pref_all_updates">Ver todas las actualizaciones disponibles</string>
+    <string name="e_download_completed_notification">Actualización lista para instalar</string>
+    <string name="e_version_upgrade_dialog_message_ab">Estás a punto de actualizar a <xliff:g id="update_name">%1$s</xliff:g>, basado en Android <xliff:g id="version_android">%2$s</xliff:g>.
+\n
+\nRecuerda: siempre es recomendable hacer una copia de seguridad de tus datos antes de actualizar.
+\n
+\nSi pulsas <xliff:g id="ok">%3$s</xliff:g>, el dispositivo comenzará la instalación en segundo plano.
+\n
+\nUna vez completada, se te pedirá que reinicies.</string>
+    <string name="e_version_upgrade_dialog_message">Estás a punto de actualizar a <xliff:g id="update_name">%1$s</xliff:g>, basado en Android <xliff:g id="version_android">%2$s</xliff:g>.
+\n
+\nRecuerda: siempre es recomendable hacer una copia de seguridad de tus datos antes de actualizar.
+\n
+\nSi pulsas <xliff:g id="ok">%3$s</xliff:g>, el dispositivo se reiniciará en modo de recuperación para instalar la actualización.</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/e_strings.xml b/app/src/main/res/values-fr/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f99b0810b73ad9eaab6e0b2cde645fe56597a501
--- /dev/null
+++ b/app/src/main/res/values-fr/e_strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_list_no_updates">Vous utilisez actuellement la dernière version de /e/OS. Pour vérifier manuellement la présence de mises à jour, utilisez le bouton Actualiser.</string>
+    <string name="e_current_version">Version actuelle :</string>
+    <string name="e_header_title_text">/e/OS
+\n%1$s</string>
+    <string name="e_list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>
+    <string name="e_list_build_version">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>
+    <string name="e_menu_auto_updates_check_interval_30_minutes">Toutes les 30 minutes</string>
+    <string name="e_menu_auto_updates_check_interval_10_minutes">Toutes les 10 minutes</string>
+    <string name="e_menu_auto_updates_check_interval_5_minutes">Toutes les 5 minutes</string>
+    <string name="e_dialog_free_space_low_message_pct">L\'espace disponible n\'est pas suffisant pour installer la mise à jour : merci de libérer au moins <xliff:g id="needed_free_space">%1$s</xliff:g> de mémoire interne pour pouvoir continuer.</string>
+    <string name="e_dialog_free_space_low_title">Libérez de l\'espace</string>
+    <string name="e_menu_show_changelog">Afficher les notes de version</string>
+    <string name="e_available_updates">Mises à jour disponibles :</string>
+    <string name="e_download_completed_notification">La mise à jour est prête à être installée</string>
+    <string name="e_version_upgrade_dialog_message">Vous êtes sur le point d\'effectuer une montée de version vers <xliff:g id="update_name">%1$s</xliff:g>, basée sur Android <xliff:g id="version_android">%2$s</xliff:g>
+\n
+\nRappel : il est recommandé de toujours effectuer une sauvegarde de vos données avant d\'effectuer une montée de version.
+\n
+\nQuand vous appuierez sur <xliff:g id="ok">%3$s</xliff:g>, l\'appareil redémarrera en mode récupération (recovery) pour installer la mise à jour.</string>
+    <string name="e_apply_update_dialog_message_ab">Vous êtes sur le point de mettre à jour votre appareil vers <xliff:g id="update_name">%1$s</xliff:g>.
+\n
+\nQuand vous appuierez sur <xliff:g id="ok">%2$s</xliff:g>, l\'appareil commencera l\'installation en arrière plan.
+\n
+\nUne fois terminée, il vous sera demandé de redémarrer.</string>
+    <string name="e_version_upgrade_dialog_message_ab">Vous êtes sur le point d\'effectuer une montée de version vers <xliff:g id="update_name">%1$s</xliff:g>, basée sur Android <xliff:g id="version_android">%2$s</xliff:g>
+\n
+\nRappel : il est recommandé de toujours effectuer une sauvegarde de vos données avant d\'effectuer une montée de version.
+\n
+\nQuand vous appuierez sur <xliff:g id="ok">%3$s</xliff:g>, l\'appareil commencera l\'installation en arrière plan.
+\n
+\nUne fois terminée, il vous sera demandé de redémarrer.</string>
+    <string name="e_reboot_install">Redémarrer et installer</string>
+    <string name="e_apply_update_dialog_message">Vous êtes sur le point de mettre à jour votre appareil vers <xliff:g id="update_name">%1$s</xliff:g>.
+\n
+\nQuand vous appuierez sur <xliff:g id="ok">%2$s</xliff:g>, l\'appareil redémarrera en mode récupération (recovery) pour installer la mise à jour.</string>
+    <string name="e_action_update">Appliquer la mise à jour</string>
+    <string name="e_version_upgrade_dialog_title">Montée de version !</string>
+    <string name="e_pref_all_updates">Voir toutes les mises à jour disponibles</string>
+</resources>
diff --git a/app/src/main/res/values-is/e_strings.xml b/app/src/main/res/values-is/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b0916ee7b6765455cafa6f7f2f85dfb7c66b0f77
--- /dev/null
+++ b/app/src/main/res/values-is/e_strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_download_completed_notification">Uppfærsla er tilbúin til uppsetningar</string>
+    <string name="e_reboot_install">Endurræsa og setja upp</string>
+    <string name="e_dialog_free_space_low_title">Losa geymslupláss</string>
+    <string name="e_dialog_free_space_low_message_pct">Það er ekki nægilegt pláss eftir til að halda áfram með uppfærsluna: þú þarft fyrst að losa um <xliff:g id="needed_free_space">%1$s</xliff:g> í innri gagnageymslunni.</string>
+    <string name="e_menu_auto_updates_check_interval_5_minutes">Á 5 mínútna fresti</string>
+    <string name="e_menu_auto_updates_check_interval_10_minutes">Á 10 mínútna fresti</string>
+    <string name="e_menu_auto_updates_check_interval_30_minutes">Á 30 mínútna fresti</string>
+    <string name="e_list_no_updates">Þú ert þegar að keyra nýjustu útgáfu /e/OS stýrikerfisins. Til að athuga handvirkt með nýjar uppfærslur, skaltu nota Endurlesa-hnappinn.</string>
+    <string name="e_action_update">Setja inn uppfærslu</string>
+    <string name="e_apply_update_dialog_message">Þú ert í þann mund að setja upp <xliff:g id="update_name">%1$s</xliff:g>.
+\n
+\nEf þú ýtir á <xliff:g id="ok">%2$s</xliff:g>, mun tækið endurræsa sig í endurheimtuham til að setja inn uppfærsluna.</string>
+    <string name="e_apply_update_dialog_message_ab">Þú ert í þann mund að setja upp <xliff:g id="update_name">%1$s</xliff:g>.
+\n
+\nEf þú ýtir á <xliff:g id="ok">%2$s</xliff:g>, mun tækið hefja uppsetninguna í bakgrunnsferli.
+\n
+\nÞegar henni er lokið færðu beiðni um að endurræsa.</string>
+    <string name="e_list_build_version">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>
+    <string name="e_list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>
+    <string name="e_menu_show_changelog">Birta útgáfuupplýsingar</string>
+    <string name="e_header_title_text">/e/OS
+\n%1$s</string>
+    <string name="e_available_updates">Tiltækar uppfærslur:</string>
+    <string name="e_current_version">Núverandi útgáfa:</string>
+    <string name="e_version_upgrade_dialog_title">Uppfærsla útgáfu!</string>
+    <string name="e_version_upgrade_dialog_message">Þú ert í þann mund að uppfæra kerfið í <xliff:g id="update_name">%1$s</xliff:g>, byggt á Android <xliff:g id="version_android">%2$s</xliff:g>
+\n
+\nMundu: alltaf er mælt með því að þú takir öryggisafrit af gögnunum þínum áður en uppfærsla fer fram.
+\n
+\nEf þú ýtir á <xliff:g id="ok">%3$s</xliff:g>, mun tækið endurræsast í endurheimtuham til að setja inn uppfærsluna.</string>
+    <string name="e_version_upgrade_dialog_message_ab">Þú ert í þann mund að uppfæra kerfið í <xliff:g id="update_name">%1$s</xliff:g>, byggt á Android <xliff:g id="version_android">%2$s</xliff:g>
+\n
+\nMundu: alltaf er mælt með því að þú takir öryggisafrit af gögnunum þínum áður en uppfærsla fer fram.
+\n
+\nEf þú ýtir á <xliff:g id="ok">%3$s</xliff:g>, mun tækið byrja að setja inn uppfærsluna í bakgrunni.
+\n
+\nÞegar því er lokið, muntu fá boð um að endurræsa.</string>
+    <string name="e_pref_all_updates">Sjá allar tiltækar uppfærslur</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/e_strings.xml b/app/src/main/res/values-it/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b3b37295d26add459513b2ad78349417dbb6a68e
--- /dev/null
+++ b/app/src/main/res/values-it/e_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_list_no_updates">Stai usando l\'ultima versione di /e/OS. Per verificare manualmente la presenza di aggiornamenti, utilizza il pulsante Aggiorna.</string>
+    <string name="e_header_title_text">/e/OS
+\n%1$s</string>
+    <string name="e_menu_show_changelog">Mostra note di rilascio</string>
+    <string name="e_list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>
+    <string name="e_list_build_version">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>
+    <string name="e_menu_auto_updates_check_interval_30_minutes">Ogni 30 minuti</string>
+    <string name="e_menu_auto_updates_check_interval_10_minutes">Ogni 10 minuti</string>
+    <string name="e_menu_auto_updates_check_interval_5_minutes">Ogni 5 minuti</string>
+    <string name="e_current_version">Versione attuale:</string>
+    <string name="e_available_updates">Agiornamenti disponibili:</string>
+    <string name="e_dialog_free_space_low_message_pct">Non c\'è spazio sufficiente per procedere con l\'aggiornamento; devi liberare almeno altri <xliff:g id="needed_free_space">%1$s</xliff:g> dalla memoria interna.</string>
+    <string name="e_dialog_free_space_low_title">Libera spazio</string>
+    <string name="e_reboot_install">Riavvia e installa</string>
+    <string name="e_action_update">Applica aggiornamento</string>
+    <string name="e_pref_all_updates">Vedere tutti gli aggiornamenti disponibili</string>
+    <string name="e_apply_update_dialog_message">Stai per aggiornare a <xliff:g id="update_name">%1$s</xliff:g>.
+\n
+\nPigiando <xliff:g id="ok">%2$s</xliff:g>, il dispositivo si riavvierà nella modalità ripristino per installare l\'aggiornamento.</string>
+    <string name="e_download_completed_notification">L\'aggiornamento è pronto per essere installato</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index c8a48427221ebdfed2d798b07e4a7f4db1ce2db5..aa2cf345d875ee06041f44e40439f1512d473a79 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -2,9 +2,5 @@
 <resources>
     <color name="theme_primary">#212121</color>
     <color name="theme_primary_dark">#1c1c1c</color>
-    <color name="theme_accent">@*android:color/accent_device_default_dark</color>
-    <color name="background">@android:color/system_neutral1_900</color>
-    <color name="toolbar_collapsed">@android:color/system_neutral1_700</color>
-
     <color name="inverted">#f5f5f5</color>
 </resources>
diff --git a/app/src/main/res/values-nl/e_strings.xml b/app/src/main/res/values-nl/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a129cdc7bff85963ad1559e883dd4cecbece217e
--- /dev/null
+++ b/app/src/main/res/values-nl/e_strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_list_no_updates">Je gebruikt de laatste versie van /e/OS. Gebruik de knop Vernieuwen om handmatig te controleren op nieuwe updates.</string>
+    <string name="e_available_updates">Beschikbare updates:</string>
+    <string name="e_header_title_text">/e/OS
+\n%1$s</string>
+    <string name="e_menu_show_changelog">Toon release notes</string>
+    <string name="e_list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>
+    <string name="e_list_build_version">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>
+    <string name="e_current_version">Huidige versie:</string>
+    <string name="e_menu_auto_updates_check_interval_30_minutes">Elke 30 minuten</string>
+    <string name="e_menu_auto_updates_check_interval_10_minutes">Elke 10 minuten</string>
+    <string name="e_menu_auto_updates_check_interval_5_minutes">Elke 5 minuten</string>
+    <string name="e_dialog_free_space_low_message_pct">Er is niet genoeg geheugen vrij om deze update uit te voeren: je moet eerst nog <xliff:g id="needed_free_space">%1$s</xliff:g> intern geheugen vrijmaken.</string>
+    <string name="e_dialog_free_space_low_title">Geheugen vrij maken</string>
+    <string name="e_action_update">Update uitvoeren</string>
+    <string name="e_reboot_install">Herstarten en installeren</string>
+    <string name="e_download_completed_notification">Update is klaar om geïnstalleerd te worden</string>
+    <string name="e_version_upgrade_dialog_message">Je gaat upgraden naar <xliff:g id="update_name">%1$s</xliff:g>, gebaseerd op Android <xliff:g id="version_android">%2$s</xliff:g> 
+\n 
+\nOpmerking: het wordt altijd aangeraden een back-up te nemen van je data voor dat je een upgrade start. 
+\n 
+\nWanneer je tikt op <xliff:g id="ok">%3$s</xliff:g>, zal het toestel herstarten in \'recovery modus\' om de installatie uit te voeren.</string>
+    <string name="e_apply_update_dialog_message_ab">Je gaat updaten naar <xliff:g id="update_name">%1$s</xliff:g>. 
+\n 
+\nAls je tikt op <xliff:g id="ok">%2$s</xliff:g>, zal het toestel de installatie starten op de achtergrond. 
+\n 
+\nWanneer dit voltooid is, zal je gevraagd worden om te herstarten.</string>
+    <string name="e_version_upgrade_dialog_message_ab">Je gaat upgraden naar <xliff:g id="update_name">%1$s</xliff:g>, gebaseerd op Android <xliff:g id="version_android">%2$s</xliff:g> 
+\n 
+\nOpmerking: het wordt altijd aangeraden een back-up te nemen van je data voor dat je een upgrade start. 
+\n 
+\nWanneer je tikt op <xliff:g id="ok">%3$s</xliff:g>, zal het toestel de upgrade installeren op de achtergrond. 
+\n 
+\nWanneer dit voltooid is, zal je gevraagd worden om te herstarten.</string>
+    <string name="e_apply_update_dialog_message">Je gaat updaten naar <xliff:g id="update_name">%1$s</xliff:g>.
+\n
+\nAls je tikt op <xliff:g id="ok">%2$s</xliff:g>, zal het toestel herstarten in \'recovery mode\' om de update te installeren.</string>
+    <string name="e_version_upgrade_dialog_title">Versie Upgrade!</string>
+    <string name="e_pref_all_updates">Alle beschikbare updates weergeven</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/e_strings.xml b/app/src/main/res/values-ru/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3fd75f6490da6a91b75b38075ccfe41061d224c1
--- /dev/null
+++ b/app/src/main/res/values-ru/e_strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_list_no_updates">Вы используете последнюю версию /e/OS. Чтобы проверить наличие обновлений вручную, используйте кнопку Обновить.</string>
+    <string name="e_header_title_text">/e/OS
+\n%1$s</string>
+    <string name="e_menu_show_changelog">Показать примечания к выпуску</string>
+    <string name="e_list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>
+    <string name="e_list_build_version">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>
+    <string name="e_menu_auto_updates_check_interval_30_minutes">Каждые 30 минут</string>
+    <string name="e_menu_auto_updates_check_interval_10_minutes">Каждые 10 минут</string>
+    <string name="e_menu_auto_updates_check_interval_5_minutes">Каждые 5 минут</string>
+    <string name="e_current_version">Текущая версия:</string>
+    <string name="e_available_updates">Доступные обновления:</string>
+    <string name="e_dialog_free_space_low_message_pct">Для продолжения обновления недостаточно места: сначала необходимо освободить еще <xliff:g id="needed_free_space">%1$s</xliff:g> во внутреннем хранилище.</string>
+    <string name="e_dialog_free_space_low_title">Освободить место</string>
+    <string name="e_action_update">Применить обновление</string>
+    <string name="e_reboot_install">Перезагрузиться и установить</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/e_strings.xml b/app/src/main/res/values-sv/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..23ffcdf86c6d3db85e7651a36115643b5bfb43a7
--- /dev/null
+++ b/app/src/main/res/values-sv/e_strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_menu_auto_updates_check_interval_5_minutes">Var 5:e minut</string>
+    <string name="e_download_completed_notification">Uppdatering är redo att installeras</string>
+    <string name="e_menu_auto_updates_check_interval_10_minutes">Var 10:e minut</string>
+    <string name="e_version_upgrade_dialog_message">Du är på väg att uppgradera till <xliff:g id="update_name">%1$s</xliff:g>, baserad på Android <xliff:g id="version_android">%2$s</xliff:g>
+\n
+\nKom ihåg: det rekommenderas alltid att göra en säkerhetskopiering av din data innan uppgraderingar.
+\n
+\nOm du trycker på <xliff:g id="ok">%3$s</xliff:g>, kommer din enhet att starta om i återställningsläge och installera uppgraderingen.</string>
+    <string name="e_apply_update_dialog_message_ab">Du är på väg att uppdatera <xliff:g id="update_name">%1$s</xliff:g>.
+\n
+\nOm du trycker på <xliff:g id="ok">%2$s</xliff:g> så kommer enheten att påbörja installationen i bakgrunden.
+\n
+\nNär den är slutförd kommer du bli ombedd att starta om.</string>
+    <string name="e_header_title_text">/e/OS
+\n%1$s</string>
+    <string name="e_version_upgrade_dialog_message_ab">Du är på väg att uppgradera till <xliff:g id="update_name">%1$s</xliff:g>, baserad på Android <xliff:g id="version_android">%2$s</xliff:g>.
+\n
+\nKom ihåg: det är alltid rekommenderat att göra en säkerhetskopia av din data innan uppgraderingar.
+\n
+\nOm du trycker på <xliff:g id="ok">%3$s</xliff:g>, kommer enheten att påbörja installation i bakgrunden.
+\n
+\nNär det är färdigt kommer du bli uppmanad att starta om.</string>
+    <string name="e_menu_auto_updates_check_interval_30_minutes">Var 30:e minut</string>
+    <string name="e_reboot_install">Starta om och installera</string>
+    <string name="e_available_updates">Tillgängliga uppdateringar:</string>
+    <string name="e_apply_update_dialog_message">Du är på väg att uppdatera till <xliff:g id="update_name">%1$s</xliff:g>.
+\n
+\nOm du trycker på <xliff:g id="ok">%2$s</xliff:g>, kommer enheten att starta om i återställningsläge och installera uppdateringen.</string>
+    <string name="e_menu_show_changelog">Visa utgåvonoteringar</string>
+    <string name="e_current_version">Aktuell version:</string>
+    <string name="e_action_update">Tillämpa uppdatering</string>
+    <string name="e_version_upgrade_dialog_title">Versionsuppgradering!</string>
+    <string name="e_list_no_updates">Du kör den senaste versionen av /e/OS. För att söka efter uppdateringar manuellt, använd Uppdateringsknappen.</string>
+    <string name="e_list_build_version">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>
+    <string name="e_dialog_free_space_low_title">Frigör utrymme</string>
+    <string name="e_list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>
+    <string name="e_dialog_free_space_low_message_pct">Det finns inte tillräckligt med ledigt utrymme för att fortsätta med uppdateringen. Du måste frigöra ytterligare <xliff:g id="needed_free_space">%1$s</xliff:g> i din interna lagring först.</string>
+    <string name="e_pref_all_updates">Visa alla tillgängliga uppdateringar</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/e_strings.xml b/app/src/main/res/values-tr/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..425326e68e2ebdf124d5cac291d6ca3ce4a87a1f
--- /dev/null
+++ b/app/src/main/res/values-tr/e_strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_download_completed_notification">Güncelleme yükleme için hazır</string>
+    <string name="e_reboot_install">Yeniden başlat ve yükle</string>
+    <string name="e_dialog_free_space_low_title">Cihazda yer açın</string>
+    <string name="e_menu_auto_updates_check_interval_5_minutes">5 dakikada bir</string>
+    <string name="e_menu_auto_updates_check_interval_10_minutes">10 dakikada bir</string>
+    <string name="e_menu_auto_updates_check_interval_30_minutes">Yarım saatte bir</string>
+    <string name="e_list_no_updates">En son /e/OS sürümünü çalıştırıyorsunuz. Güncellemeleri manuel olarak kontrol etmek için Yenile düğmesini kullanın.</string>
+    <string name="e_action_update">Güncellemeyi yükle</string>
+    <string name="e_apply_update_dialog_message_ab"><xliff:g id="update_name">%1$s</xliff:g> güncellemesini yapmak üzeresiniz.
+\n
+\n<xliff:g id="ok">%2$s</xliff:g> tuşuna basarsanız, cihaz arka planda yüklemeye başlayacaktır.
+\n
+\nTamamlandığında, yeniden başlatmanız istenecektir.</string>
+    <string name="e_version_upgrade_dialog_title">Sürüm Güncellemesi!</string>
+    <string name="e_version_upgrade_dialog_message_ab">Android <xliff:g id="update_name">%1$s</xliff:g> sürümüne yükseltmek üzeresiniz <xliff:g id="version_android">%2$s</xliff:g>.
+\n
+\nUnutmayın: yükseltmelerden önce her zaman verilerinizi yedeklemeniz önerilir.
+\n
+\n<xliff:g id="ok">%3$s</xliff:g> tuşuna basarsanız, cihaz arka planda yüklemeye başlayacaktır.
+\n
+\nTamamlandığında, yeniden başlatmanız istenecektir.</string>
+    <string name="e_list_build_version">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>
+    <string name="e_list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>
+    <string name="e_menu_show_changelog">Güncelleme notlarını göster</string>
+    <string name="e_header_title_text">/e/OS
+\n%1$s</string>
+    <string name="e_version_upgrade_dialog_message">Android <xliff:g id="update_name">%1$s</xliff:g> sürümüne yükseltmek üzeresiniz <xliff:g id="version_android">%2$s</xliff:g>
+\n
+\nUnutmayın: yükseltmelerden önce her zaman verilerinizi yedeklemeniz önerilir.
+\n
+\n<xliff:g id="ok">%3$s</xliff:g> tuşuna basarsanız, cihaz güncellemeyi yüklemek için kendini kurtarma modunda yeniden başlatacaktır.</string>
+    <string name="e_apply_update_dialog_message"><xliff:g id="update_name">%1$s</xliff:g> güncellemesini yapmak üzeresiniz.
+\n
+\n<xliff:g id="ok">%2$s</xliff:g> tuşuna basarsanız, cihaz güncellemeyi yüklemek için kendini kurtarma modunda yeniden başlatacaktır.</string>
+    <string name="e_dialog_free_space_low_message_pct">Güncellemeye devam etmek için yeterli alan kalmadı: önce dahili depolama alanında başka bir <xliff:g id="needed_free_space">%1$s</xliff:g> boşaltmalısınız.</string>
+    <string name="e_available_updates">Mevcut güncellemeler:</string>
+    <string name="e_current_version">Mevcut sürüm:</string>
+    <string name="e_pref_all_updates">Mevcut tüm güncellemeleri görün</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/e_strings.xml b/app/src/main/res/values-uk/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f81592c0805e0bbb2194c086da4a9dd7dd8b1e85
--- /dev/null
+++ b/app/src/main/res/values-uk/e_strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_apply_update_dialog_message">Ви збираєтеся оновитися до <xliff:g id="update_name">%1$s</xliff:g>.
+\n
+\nЯкщо ви натиснете <xliff:g id="ok">%2$s</xliff:g>, пристрій перезавантажиться у режим Recovery для встановлення оновлення.</string>
+    <string name="e_menu_auto_updates_check_interval_5_minutes">Кожні 5 хвилин</string>
+    <string name="e_download_completed_notification">Оновлення готове до встановлення</string>
+    <string name="e_menu_auto_updates_check_interval_10_minutes">Кожні 10 хвилин</string>
+    <string name="e_version_upgrade_dialog_message">Ви збираєтеся оновитися до <xliff:g id="update_name">%1$s</xliff:g>, на базі Android <xliff:g id="version_android">%2$s</xliff:g>
+\n
+\nПам\'ятайте: завжди рекомендується створювати резервні копії даних перед оновленням.
+\n
+\nЯкщо ви натиснете <xliff:g id="ok">%3$s</xliff:g>, пристрій перезапуститься у режим Recovery для встановлення оновлення.</string>
+    <string name="e_apply_update_dialog_message_ab">Ви збираєтеся оновитися до <xliff:g id="update_name">%1$s</xliff:g>.
+\n
+\nЯкщо ви натиснете <xliff:g id="ok">%2$s</xliff:g>, пристрій почне встановлення у фоновому режимі.
+\n
+\nПісля завершення вам буде запропоновано перезавантажитися.</string>
+    <string name="e_header_title_text">/e/OS
+\n%1$s</string>
+    <string name="e_version_upgrade_dialog_message_ab">Ви збираєтеся оновитися до <xliff:g id="update_name">%1$s</xliff:g>, на базі Android <xliff:g id="version_android">%2$s</xliff:g>.
+\n
+\nПам\'ятайте: завжди рекомендується створювати резервні копії даних перед оновленням.
+\n
+\nЯкщо ви натиснете <xliff:g id="ok">%3$s</xliff:g>, пристрій почне встановлення у фоновому режимі.
+\n
+\nПісля завершення вам буде запропоновано перезавантажитися.</string>
+    <string name="e_menu_auto_updates_check_interval_30_minutes">Кожні 30 хвилин</string>
+    <string name="e_reboot_install">Перезавантажити та встановити</string>
+    <string name="e_available_updates">Доступні оновлення:</string>
+    <string name="e_menu_show_changelog">Показати примітки до випуску</string>
+    <string name="e_current_version">Поточна версія:</string>
+    <string name="e_action_update">Застосувати оновлення</string>
+    <string name="e_version_upgrade_dialog_title">Оновлення версії!</string>
+    <string name="e_list_no_updates">Ви використовуєте останню версію /e/OS. Щоб вручну перевірити наявність оновлень, скористайтеся кнопкою Оновити.</string>
+    <string name="e_list_build_version">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>
+    <string name="e_dialog_free_space_low_title">Звільніть місце</string>
+    <string name="e_list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>
+    <string name="e_dialog_free_space_low_message_pct">Для продовження оновлення залишилося недостатньо місця: спочатку потрібно звільнити ще <xliff:g id="needed_free_space">%1$s</xliff:g> у внутрішньому сховищі.</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 287c221c07d0919b297bbcbd3c2c778ef220b492..3374dccf6168beae200dde3b215f169b6b7ef063 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -21,4 +21,10 @@
         <item>@string/menu_auto_updates_check_interval_weekly</item>
         <item>@string/menu_auto_updates_check_interval_monthly</item>
     </string-array>
+
+    <string-array name="menu_auto_updates_check_interval_entries_dev" translatable="false">
+        <item>@string/e_menu_auto_updates_check_interval_5_minutes</item>
+        <item>@string/e_menu_auto_updates_check_interval_10_minutes</item>
+        <item>@string/e_menu_auto_updates_check_interval_30_minutes</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b07454393f0098bd37cc622f0724345cd7237a36..01d5a34da0c85addcce81f23bf5d0709283f09d6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,9 +2,9 @@
 <resources>
     <color name="theme_primary">#f5f5f5</color>
     <color name="theme_primary_dark">#e0e0e0</color>
-    <color name="theme_accent">@*android:color/accent_device_default_light</color>
-    <color name="background">@android:color/system_neutral1_50</color>
-    <color name="toolbar_collapsed">@android:color/system_neutral1_100</color>
+    <color name="theme_accent">@color/e_accent</color>
+    <color name="background">@color/e_background</color>
+    <color name="toolbar_collapsed">@color/e_action_bar</color>
     <color name="tv_background">#FF0E0E0F</color>
     <color name="tv_card_background">#222222</color>
 
diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml
index 76ab68622f0142b433f48c2e117175ef348f70ec..16ab670ff81a5f35f992790d5f80524ca7c86bd2 100644
--- a/app/src/main/res/values/config.xml
+++ b/app/src/main/res/values/config.xml
@@ -16,4 +16,5 @@
 -->
 <resources>
     <bool name="config_hideRecoveryUpdate">false</bool>
+    <bool name="config_prioritizeUpdateProcess">false</bool>
 </resources>
diff --git a/app/src/main/res/values/e_strings.xml b/app/src/main/res/values/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..efad00bd71e9f125f32935af6755d55a694f783c
--- /dev/null
+++ b/app/src/main/res/values/e_strings.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- URLs -->
+    <string name="e_updater_server_url" translatable="false">https://ota.ecloud.global/api/v1/{device}/{type}/{incr}</string>
+    <string name="e_ota_staging_server_url" translatable="false"> https://test.ota.ecloud.global/api/v1/{device}/{type}/{incr}</string>
+    <string name="e_menu_changelog_url" translatable="false">https://gitlab.e.foundation/e/os/releases/-/releases/v<xliff:g id="build_version">%1$s</xliff:g>-a15</string>
+
+    <!-- Notifications -->
+    <string name="e_download_completed_notification">Update is ready to be installed</string>
+
+    <!-- Dialogs -->
+    <string name="e_reboot_install">Reboot and install</string>
+    <string name="e_dialog_free_space_low_title">Free up space</string>
+    <string name="e_dialog_free_space_low_message_pct">There is not enough space left to proceed with the update: you must free up another <xliff:g id="needed_free_space">%1$s</xliff:g> in the internal storage first.</string>
+
+    <!-- Auto-update intervals -->
+    <string name="e_menu_auto_updates_check_interval_5_minutes">Every 5 minutes</string>
+    <string name="e_menu_auto_updates_check_interval_10_minutes">Every 10 minutes</string>
+    <string name="e_menu_auto_updates_check_interval_30_minutes">Every 30 minutes</string>
+
+    <!-- Update status and messages -->
+    <string name="e_list_no_updates">You are running the latest /e/OS version. To manually check for updates, use the Refresh button.</string>
+    <string name="e_action_update">Apply update</string>
+    <string name="e_available_updates">Available updates:</string>
+    <string name="e_current_version">Current version:</string>
+    <string name="e_pref_all_updates">See all available updates</string>
+
+    <!-- Update dialog -->
+    <string name="e_apply_update_dialog_message">You are about to update to <xliff:g id="update_name">%1$s</xliff:g>.\n\nIf you press <xliff:g id="ok">%2$s</xliff:g>, the device will restart itself in recovery mode to install the update.</string>
+    <string name="e_apply_update_dialog_message_ab">You are about to update to <xliff:g id="update_name">%1$s</xliff:g>.\n\nIf you press <xliff:g id="ok">%2$s</xliff:g>, the device will begin installing in the background.\n\nOnce completed, you will be prompted to reboot.</string>
+
+    <!-- Version upgrade dialog -->
+    <string name="e_version_upgrade_dialog_title">Version Upgrade!</string>
+    <string name="e_version_upgrade_dialog_message">You are about to upgrade to <xliff:g id="update_name">%1$s</xliff:g>, based on Android <xliff:g id="version_android">%2$s</xliff:g>\n\nRemember: it is always recommended to backup your data before upgrades.\n\nIf you press <xliff:g id="ok">%3$s</xliff:g>, the device will restart itself into recovery mode to install the update.</string>
+    <string name="e_version_upgrade_dialog_message_ab">You are about to upgrade to <xliff:g id="update_name">%1$s</xliff:g>, based on Android <xliff:g id="version_android">%2$s</xliff:g>.\n\nRemember: it is always recommended to backup your data before upgrades.\n\nIf you press <xliff:g id="ok">%3$s</xliff:g>, the device will begin installing in the background.\n\nOnce completed, you will be prompted to reboot.</string>
+
+    <!-- Version Info Display -->
+    <string name="e_list_build_version">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>
+    <string name="e_list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>
+    <string name="e_header_title_text">/e/OS\n%1$s</string>
+
+    <!-- Changelog -->
+    <string name="e_menu_show_changelog">Show release notes</string>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d0fabef581e1154e511114619c30f9e15e278d60..9139e2e9b3c72dfc9d18c57899c7036195201f6c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,7 +8,9 @@
         <item name="android:windowLightStatusBar">@bool/theme_is_light</item>
         <item name="android:windowLightNavigationBar">@bool/theme_is_light</item>
         <item name="android:windowBackground">@color/background</item>
-        <item name="alertDialogTheme">@style/AppTheme.AlertDialogTheme</item>
+        <item name="alertDialogTheme">@style/Dialog</item>
+        <item name="snackbarStyle">@style/Snackbar</item>
+        <item name="switchStyle">@style/Switch</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -28,4 +30,16 @@
     <style name="AppTheme.AlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="dialogCornerRadius">16dp</item>
     </style>
+    <style name="Dialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
+        <item name="android:background">@color/e_floating_background</item>
+        <item name="android:colorAccent">@color/e_accent</item>
+    </style>
+    <style name="Switch" parent="Widget.AppCompat.CompoundButton.Switch">
+        <item name="android:thumb">@drawable/e_switch_thumb</item>
+        <item name="track">@drawable/e_switch_track</item>
+    </style>
+    <style name="Snackbar" parent="Widget.Design.Snackbar">
+        <item name="android:background">@color/e_background_inverse</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/res/values/symbols.xml b/app/src/main/res_aosp/values/symbols.xml
similarity index 91%
rename from app/src/main/res/values/symbols.xml
rename to app/src/main/res_aosp/values/symbols.xml
index f3dc0ba394f8ae3026399bde98b72d154829af7a..992614c0cba99474236ec7ff0838753e84f53e0f 100644
--- a/app/src/main/res/values/symbols.xml
+++ b/app/src/main/res_aosp/values/symbols.xml
@@ -16,4 +16,5 @@
 -->
 <resources>
     <java-symbol type="bool" name="config_hideRecoveryUpdate" />
+    <java-symbol type="bool" name="config_prioritizeUpdateProcess" />
 </resources>
diff --git a/app/src/main/res_studio/values/colors.xml b/app/src/main/res_studio/values/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eed26f051280ed1058ffa120c31aa99bfd3a5c8d
--- /dev/null
+++ b/app/src/main/res_studio/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="settingslib_materialColorInverseOnSurface">@android:color/system_on_surface_dark</color>
+    <color name="settingslib_materialColorPrimary">@*android:color/accent_material_dark</color>
+</resources>
diff --git a/app/src/main/res_studio/values/dimens.xml b/app/src/main/res_studio/values/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e845d69321779245b78b8ef289a98b036aa021f8
--- /dev/null
+++ b/app/src/main/res_studio/values/dimens.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Collapsing toolbar layout dimensions -->
+    <dimen name="settingslib_scrim_visible_height_trigger">137dp</dimen>
+    <dimen name="expanded_title_margin_start">24dp</dimen>
+    <dimen name="expanded_title_margin_end">24dp</dimen>
+</resources>
diff --git a/app/src/main/res_studio/values/strings.xml b/app/src/main/res_studio/values/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..897445b3e1758af489beb4100bfd7126a0384bf1
--- /dev/null
+++ b/app/src/main/res_studio/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Name of a font family to use for headlines in SettingsLib. -->
+    <string name="settingslib_config_headlineFontFamily" translatable="false">sans-serif</string>
+</resources>
diff --git a/app/src/main/res_studio/values/styles.xml b/app/src/main/res_studio/values/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a9ee29b604e0090f8d4a5a5e2120076e81429ea4
--- /dev/null
+++ b/app/src/main/res_studio/values/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.CollapsingToolbar.Settings" parent="@style/Theme.MaterialComponents.DayNight">
+        <item name="elevationOverlayEnabled">true</item>
+        <item name="elevationOverlayColor">?attr/colorPrimary</item>
+        <item name="colorPrimary">@color/settingslib_materialColorInverseOnSurface</item>
+        <item name="colorAccent">@color/settingslib_materialColorPrimary</item>
+    </style>
+
+    <style name="CollapsingToolbarTitle.Collapsed" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+        <item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>
+        <item name="android:textSize">20dp</item>
+    </style>
+
+    <style name="CollapsingToolbarTitle.Expanded" parent="CollapsingToolbarTitle.Collapsed">
+        <item name="android:textSize">36dp</item>
+    </style>
+</resources>
diff --git a/build.gradle.kts b/build.gradle.kts
index c9e8006c7e311e4a5605a2912e3306d7247c3d42..5dd56e2d38908e14d72de4162c0b36b7dbedeb91 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,10 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.7.3" apply false
-    id("com.android.library") version "8.7.3" apply false
-    id("org.jetbrains.kotlin.android") version "1.7.10" apply false
+    id("com.android.application") version "8.10.0" apply false
+    id("com.android.library") version "8.10.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.20" apply false
 }
 
 tasks.register<Delete>("clean").configure {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
diff --git a/gradle.properties b/gradle.properties
index cccbfe6f22597988532e3fc6116d8379d8e2f888..cf0008ddcec95a7dcd7d5f27cbf9b42310eb750e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,5 +21,4 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 09523c0e5490700d1a647ecf95309b5f7f9a8199..ca025c83a7cc5e4f5eb7bc7a5ff8cae62df35ffb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/keystore/platform.jks b/keystore/platform.jks
new file mode 100644
index 0000000000000000000000000000000000000000..b778840542e79c048bcf570aa960243eeb9b9d53
Binary files /dev/null and b/keystore/platform.jks differ
diff --git a/platform.keystore b/platform.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..6932f4ab21f4bcbfd351277aa8dcfe2fa887c8f8
--- /dev/null
+++ b/platform.keystore
@@ -0,0 +1,4 @@
+keyAlias=platform
+keyPassword=platform
+storeFile=../keystore/platform.jks
+storePassword=platform
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f057661cadf7e82cad945d260443b97dd2435940..0b9e92e3adcdacc28861905c40bc7b78d8e15885 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,6 +10,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven ( "https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven" )
     }
 }
 rootProject.name = "Updater"
diff --git a/system_libs/framework.jar b/system_libs/framework.jar
new file mode 100644
index 0000000000000000000000000000000000000000..761650c7631dfd746e444ced955f47281c9f848c
Binary files /dev/null and b/system_libs/framework.jar differ