diff --git a/Android.bp b/Android.bp
index 18f8fdd69f0cc25fab8d7ee469b0ccd0d4e0ea8e..0d9a68b7c6095f54a59e111811a16b6af3de7da7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,6 +26,8 @@ android_app {
         "setupdesign",
         "SystemUISharedLib",
         "org.lineageos.platform.internal",
+        "androidx.browser_browser",
+        "elib",
     ],
 
     libs: ["telephony-common"],
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f9fdd4a694b5b5944993448187eaf23f5e5c0131..63cc5fb55c8be13a4bacf65ea7d12a75a743d5ea 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,6 +25,7 @@
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
     <uses-permission android:name="android.permission.MANAGE_USERS" />
+    <uses-permission android:name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
     <uses-permission android:name="lineageos.permission.HARDWARE_ABSTRACTION_ACCESS" />
@@ -256,6 +257,45 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".EAccountManagerActivity"
+                  android:label="@string/activity_label_empty"
+                  android:excludeFromRecents="true"
+                  android:configChanges="mcc|mnc"
+                  android:immersive="true"
+                  android:exported="false"
+                  android:windowSoftInputMode="stateAlwaysHidden">
+            <intent-filter>
+                <action android:name="org.lineageos.setupwizard.E_ACCOUNT_MANAGER_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".ParentalControlActivity"
+                  android:label="@string/activity_label_empty"
+                  android:excludeFromRecents="true"
+                  android:configChanges="mcc|mnc"
+                  android:immersive="true"
+                  android:exported="false"
+                  android:windowSoftInputMode="stateAlwaysHidden">
+            <intent-filter>
+                <action android:name="org.lineageos.setupwizard.E_PARENTAL_CONTROL_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".FindMyDeviceActivity"
+                  android:label="@string/activity_label_empty"
+                  android:excludeFromRecents="true"
+                  android:configChanges="mcc|mnc"
+                  android:immersive="true"
+                  android:exported="false"
+                  android:windowSoftInputMode="stateAlwaysHidden">
+            <intent-filter>
+                <action android:name="org.lineageos.setupwizard.E_FIND_MY_DEVICE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        
         <activity
             android:name=".backup.RestoreIntroActivity"
             android:label="@string/activity_label_empty"
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..7a4a3ea2424c09fbe48d455aed1eaa94d9124835
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
\ No newline at end of file
diff --git a/privapp_whitelist_org.lineageos.setupwizard.xml b/privapp_whitelist_org.lineageos.setupwizard.xml
index a003841dfe148091fa2eb447a700c8cf6e3b72bc..a13a20669109242e965c6436f0572c451768af2b 100644
--- a/privapp_whitelist_org.lineageos.setupwizard.xml
+++ b/privapp_whitelist_org.lineageos.setupwizard.xml
@@ -11,6 +11,7 @@
         <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED" />
         <permission name="android.permission.INTERACT_ACROSS_USERS" />
         <permission name="android.permission.MANAGE_USERS" />
+        <permission name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
         <permission name="android.permission.SET_TIME" />
         <permission name="android.permission.SET_TIME_ZONE" />
diff --git a/res/drawable/ic_account_manager_screen.xml b/res/drawable/ic_account_manager_screen.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5a7778b902875e9f25f3520a6a19259ab44a1b87
--- /dev/null
+++ b/res/drawable/ic_account_manager_screen.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS Project
+    Copyright (c) 2018-2021 E FOUNDATION
+
+    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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="?android:colorControlNormal"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z" />
+</vector>
diff --git a/res/drawable/ic_find_my_device.xml b/res/drawable/ic_find_my_device.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dd15df1d22c664768b6ea89a994618f91341b434
--- /dev/null
+++ b/res/drawable/ic_find_my_device.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="42"
+    android:viewportHeight="42"
+    android:width="42dp"
+    android:height="42dp">
+    <path
+        android:pathData="M33.25 1.75H15.75C13.825 1.75 12.25 3.325 12.25 5.25V8.75H15.75V7H33.25V35H15.75V33.25H12.25L12.25 36.75C12.25 38.675 13.825 40.25 15.75 40.25H33.25C35.175 40.25 36.75 38.675 36.75 36.75V5.25C36.75 3.325 35.175 1.75 33.25 1.75Z"
+        android:fillColor="#0086FF" />
+    <path
+        android:pathData="M14.7945 13.8886C18.1115 14.2545 20.7445 16.8875 21.1104 20.2045H22.749V21.7954H21.1104C20.7445 25.1125 18.1115 27.7454 14.7945 28.1113V29.75H13.2036V28.1113C9.88652 27.7454 7.25357 25.1125 6.88766 21.7954H5.24902V20.2045H6.88766C7.25357 16.8875 9.88652 14.2545 13.2036 13.8886V12.25H14.7945V13.8886ZM9.62483 21C9.62483 18.5828 11.5826 16.625 13.9998 16.625C16.417 16.625 18.3748 18.5828 18.3748 21C18.3748 23.4172 16.417 25.375 13.9998 25.375C11.5826 25.375 9.62483 23.4172 9.62483 21Z"
+        android:fillType="evenOdd"
+        android:fillColor="#0086FF" />
+    <path
+        android:pathData="M14 19.25C13.0331 19.25 12.25 20.0331 12.25 21C12.25 21.9669 13.0331 22.75 14 22.75C14.9669 22.75 15.75 21.9669 15.75 21C15.75 20.0331 14.9669 19.25 14 19.25Z"
+        android:fillColor="#0086FF" />
+    <path
+        android:pathData="M19.25 19.25H22.75V22.75H19.25V19.25Z"
+        android:fillColor="#0086FF" />
+    <path
+        android:pathData="M12.25 12.25H15.75V15.75H12.25V12.25Z"
+        android:fillColor="#0086FF" />
+    <path
+        android:pathData="M5.25 19.25H8.75V22.75H5.25V19.25Z"
+        android:fillColor="#0086FF" />
+    <path
+        android:pathData="M12.25 26.25H15.75V29.75H12.25V26.25Z"
+        android:fillColor="#0086FF" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/logo.xml b/res/drawable/logo.xml
index 1828e873ada7a9d68b7dc4f0b69acc30925f6144..baf2fc7407e81412f7a1fdb90d4941054dc63906 100644
--- a/res/drawable/logo.xml
+++ b/res/drawable/logo.xml
@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2017-2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
+    Copyright (c) 2018-2022 E FOUNDATION
+
+    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.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="260dp"
-    android:viewportWidth="512"
-    android:viewportHeight="260">
-
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1024.0"
+    android:viewportHeight="1024.0">
     <path
-        android:fillColor="@color/lineage_accent"
-        android:pathData="M416,128a39.92,39.92,0,0,0-31.11,14.87l-1.5-.6A294.79,294.79,0,0,0,336,128.14s0-.09,0-.14a80,80,0,1,0-160,0s0,.09,0,.13l-1.72
-.38 a293.48,293.48,0,0,0-45.67,13.76l-1.5 .6
-a40,40,0,1,0,7.39,14.28h0a277.33,277.33,0,0,1,43.1-13,80,80,0,0,0,156.73,0,277.3,277.3,0,0,1,43.11,13h0A40,40,0,1,0,416,128ZM96,192a24,24,0,1,1,24-24A24,24,0,0,1,96,192Zm160,0a64,64,0,1,1,64-64A64.07,64.07,0,0,1,256,192Zm160,0a24,24,0,1,1,24-24A24,24,0,0,1,416,192ZM288,128a32,32,0,1,1-32-32A32,32,0,0,1,288,128Z" />
+        android:fillColor="@color/e_alpha_base"
+        android:pathData="M511.9,578.8c-65.6,0 -119,-53.4 -119,-119c0,-65.6 53.4,-119 119,-119s119,53.4 119,119c0,12.4 -10.1,22.5 -22.5,22.5h-96.5c-12.4,0 -22.5,-10.1 -22.5,-22.5c0,-12.4 10.1,-22.5 22.5,-22.5h70.5c-9.5,-29.8 -37.6,-51.5 -70.5,-51.5c-40.8,0 -74,33.2 -74,74c0,40.8 33.2,74 74,74c12.4,0 22.5,10.1 22.5,22.5C534.4,568.7 524.3,578.8 511.9,578.8z" />
 </vector>
diff --git a/res/drawable/welcome_logo.xml b/res/drawable/welcome_logo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a40ce6c7dbc6cca9e67d2d78f10b1e405b9bca9e
--- /dev/null
+++ b/res/drawable/welcome_logo.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2018-2022 E FOUNDATION
+
+    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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="56"
+    android:viewportHeight="56">
+  <path
+      android:pathData="M28.098,55.958C12.721,55.958 0.211,43.448 0.211,28.07C0.211,12.693 12.721,0.183 28.098,0.183C43.476,0.183 55.986,12.693 55.986,28.07C55.986,30.983 53.626,33.342 50.714,33.342H28.098C25.186,33.342 22.826,30.983 22.826,28.07C22.826,25.158 25.186,22.798 28.098,22.798H44.624C42.387,15.804 35.826,10.727 28.098,10.727C18.536,10.727 10.755,18.508 10.755,28.07C10.755,37.635 18.536,45.414 28.098,45.414C31.011,45.414 33.37,47.773 33.37,50.686C33.37,53.598 31.011,55.958 28.098,55.958Z"
+      android:fillColor="@color/e_alpha_base"/>
+</vector>
diff --git a/res/layout/setup_e_account_manager.xml b/res/layout/setup_e_account_manager.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ec74a7d3b20a3db4f8de32055b247acbf5d7bdbb
--- /dev/null
+++ b/res/layout/setup_e_account_manager.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018-2021 E FOUNDATION
+
+     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.
+-->
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame">
+
+        <FrameLayout android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <ScrollView android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="16sp"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:text="@string/e_account_manager_setup_summary" />
+
+                    <Button
+                        android:id="@+id/create_account"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/create_account"
+                        android:textSize="14sp"
+                        android:textAllCaps="true"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="80dp"
+                        style="@style/SudGlifButton.Primary" />
+
+                    <Button
+                        android:id="@+id/sign_in"
+                        android:text="@string/sign_in"
+                        android:textSize="14sp"
+                        android:textAllCaps="true"
+                        android:layout_gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        style="@style/SudGlifButton.Secondary" />
+
+
+
+                </LinearLayout>
+            </ScrollView>
+        </FrameLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:showSkipButton="false" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/setup_find_my_device.xml b/res/layout/setup_find_my_device.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6532057271480f792c053cce6e3f82ec4b037886
--- /dev/null
+++ b/res/layout/setup_find_my_device.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018-2025 E FOUNDATION
+
+     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.
+-->
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame">
+
+        <FrameLayout android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <ScrollView android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="16sp"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:text="@string/find_my_device_setup_summary_part_1" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="16sp"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:text="@string/find_my_device_setup_summary_part_2" />
+
+                    <Button
+                        android:id="@+id/activate_find_my_device"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/activate_find_my_device"
+                        android:textSize="14sp"
+                        android:textAllCaps="true"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="80dp"
+                        style="@style/SudGlifButton.Primary" />
+                </LinearLayout>
+            </ScrollView>
+        </FrameLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:showSkipButton="false" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/setup_parental_control.xml b/res/layout/setup_parental_control.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6d36ee0f85a93c182c3a10e8240caed8a98519c5
--- /dev/null
+++ b/res/layout/setup_parental_control.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018-2021 E FOUNDATION
+
+     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.
+-->
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame">
+
+        <FrameLayout android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <ScrollView android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="16sp"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:text="@string/parental_control_setup_summary" />
+
+                    <TextView
+                        android:id="@+id/more_info_textview"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="16sp"
+                        android:textColor="?android:colorAccent"
+                        android:text="@string/more_info_text"
+                        android:clickable="true"
+                        android:focusable="true" />
+
+                    <Button
+                        android:id="@+id/activate_parental_control"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/activate_parental_control"
+                        android:textSize="14sp"
+                        android:textAllCaps="true"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="80dp"
+                        style="@style/SudGlifButton.Primary" />
+                        
+                </LinearLayout>
+            </ScrollView>
+        </FrameLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:showSkipButton="false" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/update_recovery_page.xml b/res/layout/update_recovery_page.xml
index 6ecc3667fc41803c88462d614adb2f2d061b3e6b..220413de9b3f8a747460163579321f5ed4b0d2a7 100644
--- a/res/layout/update_recovery_page.xml
+++ b/res/layout/update_recovery_page.xml
@@ -53,7 +53,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/update_recovery_setting"
+                            android:text="@string/update_recovery_setting_e"
                             android:textStyle="bold"
                             style="@style/SudCheckBox.Multiline" />
 
diff --git a/res/layout/welcome_activity.xml b/res/layout/welcome_activity.xml
index 97ea0b27d51ceac46a55fc9188f950822aa9e3be..3a164250ddfd58e2715b4dc66305ea2d194d8b53 100644
--- a/res/layout/welcome_activity.xml
+++ b/res/layout/welcome_activity.xml
@@ -10,42 +10,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:gravity="center_vertical">
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="2" />
-
-            <ImageView
-                android:id="@+id/brand_logo"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:src="@drawable/logo" />
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="0.5" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:orientation="vertical">
+        android:layout_height="match_parent" >
 
             <LinearLayout
                 style="@style/SudContentFrame"
@@ -57,6 +24,15 @@
                 android:paddingEnd="@dimen/welcome_content_container_padding_end"
                 android:paddingBottom="@dimen/welcome_content_container_padding_bottom">
 
+                <ImageView
+                android:id="@+id/brand_logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:scaleType="centerCrop"
+                android:src="@drawable/welcome_logo"
+                android:adjustViewBounds="true"
+                android:layout_marginBottom="32dp" />
+
                 <TextView
                     style="@style/WelcomeTitle"
                     android:id="@+id/welcome_title"
@@ -78,6 +54,7 @@
                         style="@style/SudGlifButton.Secondary"
                         android:layout_width="fill_parent"
                         android:layout_height="fill_parent"
+                        android:layout_marginTop="50dp"
                         android:layout_gravity="center_vertical"
                         android:drawableStart="@drawable/ic_eye"
                         android:gravity="start|center"
@@ -88,13 +65,13 @@
                 </LinearLayout>
             </LinearLayout>
 
-        </LinearLayout>
 
         <LinearLayout
             style="@style/SudGlifButtonBar.Stackable"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom">
+            android:layout_gravity="bottom"
+            android:layout_alignParentBottom="true">
 
             <Button
                 android:id="@+id/emerg_dialer"
@@ -107,7 +84,6 @@
                 android:layout_width="0.0dip"
                 android:layout_height="0.0dip"
                 android:layout_weight="1.0" />
-
             <Button
                 android:id="@+id/skip"
                 style="@style/SudGlifButton.Secondary"
@@ -128,5 +104,5 @@
                 android:layout_height="wrap_content"
                 android:text="@string/start" />
         </LinearLayout>
-    </LinearLayout>
-</com.google.android.setupdesign.GlifLayout>
+    </RelativeLayout>
+</com.google.android.setupdesign.GlifLayout>
\ No newline at end of file
diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index 7c87abd6344333d5ce0af067c8b6c838aa3ddbe5..fe7f1ed699a5815ada609940bb04d549a9f63e9e 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -2,6 +2,7 @@
 <!--
      SPDX-FileCopyrightText: 2016 The CyanogenMod Project
      SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2018-2024 E FOUNDATION
      SPDX-License-Identifier: Apache-2.0
 -->
 <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
@@ -41,14 +42,22 @@
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end"
         id="datetime">
-        <result wizard:action="restore" />
+        <result wizard:action="e_parental_control_settings" />
     </WizardAction>
 
+    <WizardAction
+        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_PARENTAL_CONTROL_SETTINGS;end"
+        id="e_parental_control_settings">
+        <result wizard:action="location_settings" />
+    </WizardAction>
+
+<!--
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end"
         id="restore">
         <result wizard:action="location_settings" />
     </WizardAction>
+-->
 
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end"
@@ -59,20 +68,24 @@
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end"
         id="device_specific">
-        <result wizard:action="recovery_update" />
+        <result wizard:action="biometric_settings" />
     </WizardAction>
 
+<!--
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end"
         id="recovery_update">
-        <result wizard:action="lineage_settings" />
+        <result wizard:action="biometric_settings" />
     </WizardAction>
+-->
 
+<!--
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end"
         id="lineage_settings">
         <result wizard:action="biometric_settings" />
     </WizardAction>
+-->
 
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end"
@@ -83,6 +96,12 @@
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end"
         id="lockscreen_settings">
+        <result wizard:action="e_find_my_device_settings" />
+    </WizardAction>
+
+    <WizardAction
+        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_FIND_MY_DEVICE_SETTINGS;end"
+        id="e_find_my_device_settings">
         <result wizard:action="theme_settings" />
     </WizardAction>
 
@@ -95,6 +114,12 @@
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end"
         id="navigation_settings">
+        <result wizard:action="e_account_manager_settings" />
+    </WizardAction>
+
+    <WizardAction
+        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_ACCOUNT_MANAGER_SETTINGS;end"
+        id="e_account_manager_settings">
         <result wizard:action="finish" />
     </WizardAction>
 
diff --git a/res/values-de/e_strings.xml b/res/values-de/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..16c492e39b91be0d25cee22985d6c4081c83dd8e
--- /dev/null
+++ b/res/values-de/e_strings.xml
@@ -0,0 +1,34 @@
+<?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">
+    <string name="update_recovery_setting_e">Aktualisiert das Recovery mit dem OS</string>
+    <string name="update_recovery_description_e">Aktualisiert das Recovery beim ersten Booten nach jeder Aktualisierung.</string>
+    <string name="update_recovery_title_e">Recovery aktualisieren</string>
+    <string name="setup_welcome_message_e">Willkommen bei
+\n/e/OS</string>
+    <string name="sign_in">Anmelden</string>
+    <string name="create_account">Konto erstellen</string>
+    <string name="e_account_manager_setup_configure">Anmelden</string>
+    <string name="e_account_manager_setup_summary">Melde dich mit deiner e.email oder murena.io ID an, um dein persönliches Konto mit diesem Telefon zu verknüpfen. Dies wird die Synchronisation von E-Mails, Kontakten, Kalenderereignissen, Bilder, Videos, Notizen und Aufgaben zwischen diesem Telefon und deiner persönlichen Cloud ermöglichen.</string>
+    <string name="e_account_manager_setup_title">Synchronisiere dein Cloud-Konto</string>
+    <string name="activate_parental_control">Elternaufsicht aktivieren</string>
+    <string name="parental_control_setup_title">Elternaufsicht einstellen</string>
+    <string name="parental_control_setup_summary">Diese App bietet einen Schutz gegen unangemessene Inhalte für Ihre Kinder und Jugendliche. Sie können diese Funktion aktivieren, wenn Sie Ihr Gerät den Kindern leihen oder wenn das Gerät für sie bestimmt ist. Für mehr Informationen besuchen Sie bitte</string>
+    <string name="activate_find_my_device">Find my Device aktivieren</string>
+    <string name="find_my_device_setup_title">Find my Device einrichten</string>
+    <string name="find_my_device_setup_summary_part_1">Find my Device hilft Ihnen, den Standort dieses Telefons zu ermitteln, falls Sie es verlegt haben.</string>
+    <string name="find_my_device_setup_summary_part_2">Erstellen Sie einen Geheimcode und senden Sie ihn einfach per SMS an dieses Gerät. Es antwortet automatisch mit den Koordinaten Ihres Telefons.</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-es/e_strings.xml b/res/values-es/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c0061f0b3d7c6108baba62505d542860e46b6705
--- /dev/null
+++ b/res/values-es/e_strings.xml
@@ -0,0 +1,31 @@
+<?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">
+    <string name="setup_welcome_message_e">Bienvenido a
+\n/e/OS</string>
+    <string name="sign_in">Iniciar sesión</string>
+    <string name="create_account">Crear Cuenta</string>
+    <string name="update_recovery_setting_e">Actualizar Recovery junto con el sistema operativo</string>
+    <string name="update_recovery_description_e">Actualiza Recovery en el primer arranque posterior a cada actualización.</string>
+    <string name="update_recovery_title_e">Actualizar Recovery</string>
+    <string name="e_account_manager_setup_configure">Iniciar sesión</string>
+    <string name="e_account_manager_setup_summary">Inicia sesión con tu ID de e.email o murena.io para conectar tu cuenta personal con este teléfono. Esto te permitirá sincronizar tus correos electrónicos, contactos, calendario, imágenes, vídeos, notas y tareas entre este teléfono y tu nube personal.</string>
+    <string name="e_account_manager_setup_title">Sincroniza tu cuenta en la nube</string>
+    <string name="activate_find_my_device">Activar Find my Device</string>
+    <string name="find_my_device_setup_title">Configurar Find my Device</string>
+    <string name="find_my_device_setup_summary_part_1">Find my Device le ayudará a localizar este teléfono en caso de pérdida.</string>
+    <string name="find_my_device_setup_summary_part_2">Genere un código secreto y envíelo simplemente por SMS a este dispositivo; responderá automáticamente con las coordenadas de su teléfono.</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-fr/e_strings.xml b/res/values-fr/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2361efdab86a059418291f374f5b489b8f201504
--- /dev/null
+++ b/res/values-fr/e_strings.xml
@@ -0,0 +1,34 @@
+<?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">
+    <string name="setup_welcome_message_e">Bienvenue sur
+\n/e/OS</string>
+    <string name="sign_in">Se connecter</string>
+    <string name="create_account">Créer un compte</string>
+    <string name="e_account_manager_setup_configure">Se connecter</string>
+    <string name="e_account_manager_setup_summary">Identifiez-vous avec votre identifiant e.email ou murena.io pour connecter votre compte personnel avec ce téléphone. Cela activera la synchronisation de vos e-mails, contacts, événements de calendriers, images, vidéos, notes et tâches entre ce téléphone et votre cloud personnel.</string>
+    <string name="e_account_manager_setup_title">Synchronisez votre compte cloud</string>
+    <string name="update_recovery_setting_e">Mettre à jour le Recovery en même temps que l\'OS</string>
+    <string name="update_recovery_description_e">Met à jour le Recovery lors du premier démarrage suivant chaque mise à jour.</string>
+    <string name="update_recovery_title_e">Mettre à jour le Recovery</string>
+    <string name="parental_control_setup_summary">Cette application propose une protection contre les contenus inappropriés pour vos enfants et adolescents. Vous pouvez activer cette fonctionnalité quand vous prêtez votre téléphone à votre enfant ou si cela est leur appareil. Pour en savoir plus à ce sujet, veuillez aller sur</string>
+    <string name="activate_parental_control">Activez le Contrôle Parental</string>
+    <string name="parental_control_setup_title">Paramétrez le Contrôle Parental</string>
+    <string name="activate_find_my_device">Activer Find my Device</string>
+    <string name="find_my_device_setup_title">Configurer Find my Device</string>
+    <string name="find_my_device_setup_summary_part_1">Find my Device vous aidera à retrouver l\'emplacement de ce téléphone en cas de perte.</string>
+    <string name="find_my_device_setup_summary_part_2">Générez un code secret, envoyez-le simplement à cet appareil par SMS, et il répondra automatiquement avec les coordonnées de votre téléphone.</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-is/e_strings.xml b/res/values-is/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ee7d4a80ea76eaf7cf8947bf13558590fe52ad8b
--- /dev/null
+++ b/res/values-is/e_strings.xml
@@ -0,0 +1,30 @@
+<?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">
+    <string name="e_account_manager_setup_title">Samstilltu skýjaaðganginn þinn</string>
+    <string name="e_account_manager_setup_summary">Skráðu inn með e.email eða murena.io auðkenni til að tengjast persónulegum aðgangi þínum á þessum síma. Þetta mun samstilla tölvupóstana þína, tengiliði, dagatalsatburði, myndir, myndskeið, glósur og verkefni á milli símans og persónulega tölvuskýsins þíns.</string>
+    <string name="e_account_manager_setup_configure">Skrá inn</string>
+    <string name="create_account">Búa til aðgang</string>
+    <string name="sign_in">Skrá inn</string>
+    <string name="setup_welcome_message_e">Velkomin í
+\n/e/OS</string>
+    <string name="update_recovery_title_e">Uppfæra endurheimtingu</string>
+    <string name="update_recovery_description_e">Uppfærir endurheimtingardiskmynd í fyrstu ræsingu á eftir hverri uppfærslu.</string>
+    <string name="update_recovery_setting_e">Uppfæra endurheimtingu samhliða uppfærslum stýrikerfis</string>
+    <string name="activate_parental_control">Virkja barnalæsingu</string>
+    <string name="parental_control_setup_title">Setja upp barnalæsingu</string>
+    <string name="parental_control_setup_summary">Þetta forrit veitir vörn gegn óviðeigandi efni fyrir börnin þín og unglinga. Þú getur virkjað þessa eiginleika þegar þú lánar símann þinn til barns eða haft þetta virkt á tækjunum þeirra. Til að sjá meira um þetta, skaltu fara á</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-it/e_strings.xml b/res/values-it/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..869444cd54857bdf80951aa8bde70739d776d020
--- /dev/null
+++ b/res/values-it/e_strings.xml
@@ -0,0 +1,31 @@
+<?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">
+    <string name="e_account_manager_setup_configure">Accedi</string>
+    <string name="e_account_manager_setup_summary">Accedi con il tuo ID e.email o murena.io per collegare l\'account a questo telefono. In questo modo sarà possibile sincronizzare email, contatti, eventi del calendario, immagini, video, note e attività tra questo telefono e il proprio cloud.</string>
+    <string name="e_account_manager_setup_title">Sincronizza l\'account cloud</string>
+    <string name="update_recovery_setting_e">Aggiorna la Recovery insieme al SO</string>
+    <string name="update_recovery_description_e">Aggiorna la Recovery al primo riavvio sucessivo ad ogni aggiornamento.</string>
+    <string name="update_recovery_title_e">Aggiorna Recovery</string>
+    <string name="setup_welcome_message_e">Benvenuto a
+\n/e/OS</string>
+    <string name="sign_in">Accedi</string>
+    <string name="create_account">Crea Account</string>
+    <string name="activate_find_my_device">Attiva Find my Device</string>
+    <string name="find_my_device_setup_title">Configura Find my Device</string>
+    <string name="find_my_device_setup_summary_part_1">Find my Device ti aiuterà a individuare la posizione di questo telefono in caso di smarrimento.</string>
+    <string name="find_my_device_setup_summary_part_2">Genera un codice segreto e invialo semplicemente tramite SMS a questo dispositivo; risponderà automaticamente al messaggio con le coordinate del tuo telefono.</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-ja/e_strings.xml b/res/values-ja/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b029acefd6cb6179273667666360aae93ea3cea8
--- /dev/null
+++ b/res/values-ja/e_strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="e_account_manager_setup_title">クラウドのアカウントと同期</string>
+    <string name="e_account_manager_setup_configure">ログイン</string>
+    <string name="create_account">アカウントを作成</string>
+    <string name="sign_in">サインイン</string>
+    <string name="setup_welcome_message_e">/e/OS
+\nにようこそ</string>
+    <string name="update_recovery_title_e">リカバリーのアップデート</string>
+    <string name="e_account_manager_setup_summary">e.emailまたはmurena.ioのIDでログインして、この電話とあなたのアカウントを接続すると、あなたの電子メール、連絡先、カレンダーのイベント、画像、動画、メモ、タスクを、この電話とあなたの個人用クラウドの間で同期できます。</string>
+    <string name="update_recovery_description_e">各アップデートの直後の最初の起動時にリカバリーをアップデート。</string>
+    <string name="update_recovery_setting_e">OSとリカバリーを同時にアップデート</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-nl/e_strings.xml b/res/values-nl/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b1f2bfad39369075a65432c192e24d11f92d2c61
--- /dev/null
+++ b/res/values-nl/e_strings.xml
@@ -0,0 +1,27 @@
+<?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">
+    <string name="sign_in">Inloggen</string>
+    <string name="update_recovery_setting_e">Werk Herstel bij samen met het OS</string>
+    <string name="update_recovery_description_e">Werkt Herstel bij tijdens de eerste opstart na elke update.</string>
+    <string name="update_recovery_title_e">Herstel bijwerken</string>
+    <string name="setup_welcome_message_e">Welkom bij
+\n/e/OS</string>
+    <string name="create_account">Account aanmaken</string>
+    <string name="e_account_manager_setup_configure">Inloggen</string>
+    <string name="e_account_manager_setup_summary">Log in met je e.email of murena.io ID om jouw persoonlijk account te verbinden met deze telefoon. Dit zal synchronisatie inschakelen voor e-mails, contacten, agenda items, afbeeldingen, video\'s, notities en taken tussen deze telefoon en je persoonlijke cloud.</string>
+    <string name="e_account_manager_setup_title">Synchroniseer jouw cloud account</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-ru/e_strings.xml b/res/values-ru/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1c341355c56ab45a8503bfda4f5478a2bebd4cfe
--- /dev/null
+++ b/res/values-ru/e_strings.xml
@@ -0,0 +1,28 @@
+<?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">
+    <string name="update_recovery_setting_e">Обновление Recovery наряду с ОС</string>
+    <string name="update_recovery_description_e">Обновляет Recovery при первой загрузке после каждого обновления.</string>
+    <string name="update_recovery_title_e">Обновление Recovery</string>
+    <string name="setup_welcome_message_e">Добро пожаловать
+\nв /e/OS</string>
+    <string name="sign_in">Войти</string>
+    <string name="e_account_manager_setup_configure">Войти</string>
+    <string name="e_account_manager_setup_summary">Войдите в систему с помощью e.email или murena.io ID , чтобы подключить свою личную учётную запись к этому телефону. Это позволит синхронизировать электронную почту, контакты, события календаря, изображения, видео, заметки и задачи между этим телефоном и вашим личным облаком.</string>
+    <string name="e_account_manager_setup_title">Синхронизируйте свою облачную учётную запись</string>
+    <string name="create_account">Создать учётную запись</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-sv/e_strings.xml b/res/values-sv/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f15d47658a25c6f0f1c94067e9c183436a00de7b
--- /dev/null
+++ b/res/values-sv/e_strings.xml
@@ -0,0 +1,30 @@
+<?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">
+    <string name="create_account">Skapa konto</string>
+    <string name="sign_in">Logga in</string>
+    <string name="setup_welcome_message_e">Välkommen till
+\n/e/OS</string>
+    <string name="update_recovery_title_e">Uppdatera återställningsdata</string>
+    <string name="update_recovery_description_e">Uppdaterar återställningsdata vid första start efter varje uppdatering.</string>
+    <string name="update_recovery_setting_e">Uppdatera återställningsdata tillsammans med operativsystemet</string>
+    <string name="e_account_manager_setup_title">Synka ditt molnkonto</string>
+    <string name="e_account_manager_setup_summary">Logga in med ditt e.email- eller murena.io-konto för att ansluta ditt personliga konto med denna telefon. Detta kommer tillåta dig att synkronisera dina e-post, kalenderhändelser, bilder, videor, anteckningar och uppgifter mellan denna telefon och ditt personliga moln.</string>
+    <string name="e_account_manager_setup_configure">Logga in</string>
+    <string name="activate_parental_control">Aktivera Föräldrakontroll</string>
+    <string name="parental_control_setup_title">Ställ in föräldrakontroll</string>
+    <string name="parental_control_setup_summary">Denna app erbjuder skydd mot olämpligt innehåll för barn och tonåringar. Du kan aktivera funktionen när du lånar ut din telefon till ditt barn eller om det är deras enhet. För att ta reda på mer, gå till</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-uk/e_strings.xml b/res/values-uk/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f5144ce712aff2b30704b03e544a5212f465200b
--- /dev/null
+++ b/res/values-uk/e_strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="update_recovery_setting_e">Оновлення Recovery разом з системою</string>
+    <string name="e_account_manager_setup_configure">Вхід</string>
+    <string name="update_recovery_title_e">Оновлення Recovery</string>
+    <string name="create_account">Створити обліковий запис</string>
+    <string name="e_account_manager_setup_title">Синхронізуйте свій обліковий запис</string>
+    <string name="update_recovery_description_e">Оновлення Recovery при першому завантаженні після кожного оновлення.</string>
+    <string name="setup_welcome_message_e">Ласкаво просимо до
+\n/e/OS</string>
+    <string name="e_account_manager_setup_summary">Увійдіть за допомогою e.email або ідентифікатора murena.io, щоб зв\'язати ваш особистий акаунт з цим телефоном. Це дозволить синхронізувати ваші електронні листи, контакти, події календаря, фотографії, відео, нотатки та завдання на цьому телефоні та у вашій особистій хмарі.</string>
+    <string name="sign_in">Зареєструватися</string>
+</resources>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0363e102b0c87c6510fe7d95c1a8d748b43e8229
--- /dev/null
+++ b/res/values/arrays.xml
@@ -0,0 +1,25 @@
+<?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>
+    <!-- Array resource for allowed brands and devices to toggle 
+        off oem unlocking toggle in Developer options. Only for devices
+        that supports bootloader locking in custom rom -->
+    <string-array name="allowed_brands_and_devices">
+        <!-- Each item represents a combination of allowed brand name and device codename-->
+        <item>google:redfin</item>
+    </string-array>
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 06e36d4ccc8405d512b7793ae05785a08d3532b4..de2d7820c7e42652c8c48d4fa76b85553b82c5ce 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,8 +16,8 @@
     <dimen name="welcome_content_container_padding_bottom">30dp</dimen>
     <dimen name="welcome_content_container_padding_end">24dp</dimen>
     <dimen name="welcome_content_container_padding_start">40dp</dimen>
-    <dimen name="welcome_title_text_size">56sp</dimen>
+    <dimen name="welcome_title_text_size">36sp</dimen>
     <dimen name="welcome_title_padding_bottom">16dp</dimen>
-    <dimen name="welcome_title_line_height">64dp</dimen>
+    <dimen name="welcome_title_line_height">42dp</dimen>
     <dimen name="welcome_accessibility_text_size">20sp</dimen>
 </resources>
diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9cfc996a7c7e0eba8f13b5603afd7c16fb6f2aa3
--- /dev/null
+++ b/res/values/e_strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2025
+  ~ 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">
+    <!-- e.foundation -->
+    <string name="e_account_manager_setup_title">Sync your cloud account</string>
+    <string name="e_account_manager_setup_summary">Log in with your e.email or murena.io ID to connect your personal account with this phone. This will enable to synchronize your emails, contacts, calendar events, pictures, videos, notes and tasks across this phone and your personal cloud.</string>
+    <string name="e_account_manager_setup_configure">Log in</string>
+
+    <string name="create_account">Create Account</string>
+    <string name="sign_in">Sign in</string>
+
+    <string name="setup_welcome_message_e">Welcome to \n/e/OS</string>
+
+    <string name="update_recovery_title_e">Update Recovery</string>
+    <string name="update_recovery_description_e">Updates Recovery on first boot subsequent to every update.</string>
+    <string name="update_recovery_setting_e">Update Recovery alongside the OS</string>
+    <string name="activate_parental_control">Activate Parental Control</string>
+    <string name="parental_control_setup_title">Set up Parental Control</string>
+    <string name="parental_control_setup_summary">This app offers protection against inappropriate content for your children and teenagers. You can activate this feature when lending your phone to your kid or if this is their device. To know more about it please go to</string>
+    <string name="more_info_text" translatable="false">https://doc.e.foundation/support-topics/parental-control</string>
+
+    <!-- Find my device -->
+    <string name="activate_find_my_device">Activate Find my Device</string>
+    <string name="find_my_device_setup_title">Set up Find my Device</string>
+    <string name="find_my_device_setup_summary_part_1">Find my device will help you reveal this phone\'s location in case you can\'t find it.</string>
+    <string name="find_my_device_setup_summary_part_2">Generate a secret code and simply send it to this device via SMS and it will automatically reply to your message with your phone\'s coordinates.</string>
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dbbb76db70ca8812bd694a6ab6901a34f6b7a2c3..3bc93c5c405841e50872f25dff92f80a7a712f9c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -8,6 +8,14 @@
     <style name="Theme.Setup" parent="@style/SudFullDynamicColorThemeGlifV3.DayNight">
         <item name="sucUsePartnerResource">true</item>
         <item name="sudUsePartnerHeavyTheme">true</item>
+        <item name="android:colorAccent">@color/e_accent</item>
+        <item name="android:colorBackground">@color/e_background</item>
+        <item name="android:windowBackground">@color/e_background</item>
+        <item name="sucSystemNavBarBackgroundColor">@color/e_background</item>
+        <item name="android:navigationBarColor">@color/e_background</item>
+        <item name="sudScrollIndicators">none</item>
+        <item name="android:navigationBarDividerColor">@android:color/transparent</item>
+        <item name="sucSystemNavBarDividerColor">@android:color/transparent</item>
     </style>
 
     <style name="SpinnerItem">
diff --git a/src/org/lineageos/setupwizard/EAccountManagerActivity.java b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..ba3fd9fff37d803f42731ce31c1b306f84f6f093
--- /dev/null
+++ b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2018-2021 E FOUNDATION
+ *
+ * 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.setupwizard;
+
+import static org.lineageos.setupwizard.SetupWizardApp.ACCOUNT_TYPE_E;
+
+import androidx.activity.result.ActivityResult;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.Intent;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.View;
+import android.os.Bundle;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
+
+import org.lineageos.setupwizard.util.SetupWizardUtils;
+
+public class EAccountManagerActivity extends SubBaseActivity {
+
+    public static final String TAG = EAccountManagerActivity.class.getSimpleName();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (LOGV) {
+            logActivityState("onCreate savedInstanceState=" + savedInstanceState);
+        }
+        setNextAllowed(true);
+        setNextText(R.string.skip);
+    }
+
+    @Override
+    protected void onStartSubactivity() {
+        findViewById(R.id.sign_in).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                launchAccountManagerSetup();
+            }
+        });
+        findViewById(R.id.create_account).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(SetupWizardApp.ACTION_CREATE_E_ACCOUNT);
+                startSubactivity(intent);
+            }
+        });
+    }
+
+    @Override
+    protected void onSubactivityResult(ActivityResult activityResult) {
+        Intent data = activityResult.getData();
+        if (data != null && data.getBooleanExtra("onBackPressed", false)) {
+            onStartSubactivity();
+            return;
+        // Check for back press from AccountManager activity
+        } else if (isEAccountAvailable()) {
+            Log.v(TAG, "An E account is already set up; skipping EAccountManagerActivity");
+            nextAction(RESULT_OK);
+        }
+    }
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.setup_e_account_manager;
+    }
+
+    @Override
+    protected int getTitleResId() {
+        return R.string.e_account_manager_setup_title;
+    }
+
+    @Override
+    protected int getIconResId() {
+        return R.drawable.ic_account_manager_screen;
+    }
+
+    private void launchAccountManagerSetup() {
+        Intent intent = new Intent(Settings.ACTION_ADD_ACCOUNT)
+                .putExtra(Settings.EXTRA_ACCOUNT_TYPES, new String[]{ACCOUNT_TYPE_E});
+        startSubactivity(intent);
+    }
+
+    private boolean isEAccountAvailable() {
+        Account[] allAccounts = getSystemService(AccountManager.class).getAccounts();
+        for (Account account : allAccounts) {
+            if (account.type.equals(ACCOUNT_TYPE_E)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/src/org/lineageos/setupwizard/FindMyDeviceActivity.java b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..1e6b78fbf30fe47ab48b212825796431edca3139
--- /dev/null
+++ b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2024 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.setupwizard;
+
+import androidx.activity.result.ActivityResult;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.net.Uri;
+import android.view.View;
+import android.os.Bundle;
+
+import android.util.Log;
+
+import org.lineageos.setupwizard.util.SetupWizardUtils;
+
+public class FindMyDeviceActivity extends SubBaseActivity {
+
+    public static final String TAG = FindMyDeviceActivity.class.getSimpleName();
+
+    private static boolean hasTelephonySupport = true;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (!SetupWizardUtils.hasTelephony(this)) {
+            Log.v(TAG, "Has no telephony support");
+            hasTelephonySupport = false;
+            onNavigateNext();
+            return;
+        }
+        setNextAllowed(true);
+        setNextText(R.string.skip);
+    }
+
+    @Override
+    public void onRestart() {
+        super.onRestart();
+
+        if (!hasTelephonySupport) {
+            onNavigateNext();
+            return;
+        }
+    }
+
+
+    @Override
+    protected void onStartSubactivity() {
+        findViewById(R.id.activate_find_my_device).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Log.v(TAG, "lauch find my device");
+                launchFindMyDevice();
+            }
+        });
+    }
+
+    @Override
+    protected void onSubactivityResult(ActivityResult activityResult) {
+        Intent data = activityResult.getData();
+        if (data != null && data.getBooleanExtra("onBackPressed", false)) {
+            onStartSubactivity();
+            return;
+        // Check for back press
+        } else if(activityResult.getResultCode() == RESULT_OK) {
+            onNavigateNext();
+        }
+    }
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.setup_find_my_device;
+    }
+
+    @Override
+    protected int getTitleResId() {
+        return R.string.find_my_device_setup_title;
+    }
+
+    @Override
+    protected int getIconResId() {
+        return R.drawable.ic_find_my_device;
+    }
+
+    private void launchFindMyDevice() {
+        Intent intent = new Intent();
+        intent.setComponent(
+            new ComponentName("foundation.e.findmydevice",
+                "foundation.e.findmydevice.activity.FindMyDeviceActivity"));
+        startSubactivity(intent);
+    }
+}
diff --git a/src/org/lineageos/setupwizard/LocationSettingsActivity.java b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
index 0e70e9c5619cc3cab4d7668169ba94bc5db17c3f..754dcbe4b56dc676b54b57b431903a1bb5069d45 100644
--- a/src/org/lineageos/setupwizard/LocationSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
@@ -1,6 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2016 The CyanogenMod Project
  * SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+ * SPDX-FileCopyrightText: 2018-2024 E FOUNDATION
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -13,6 +14,7 @@ import android.os.UserManager;
 import android.provider.Settings;
 import android.view.View;
 import android.widget.CheckBox;
+import android.provider.Settings;
 
 public class LocationSettingsActivity extends BaseSetupWizardActivity {
 
@@ -42,6 +44,8 @@ public class LocationSettingsActivity extends BaseSetupWizardActivity {
         } else {
             locationAgpsAccessView.setVisibility(View.GONE);
         }
+        Settings.Global.putInt(getContentResolver(),
+                    Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE,1);
     }
 
     @Override
diff --git a/src/org/lineageos/setupwizard/ParentalControlActivity.java b/src/org/lineageos/setupwizard/ParentalControlActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..a62570d45da26b598d90bc92d47d5ef8acd95e58
--- /dev/null
+++ b/src/org/lineageos/setupwizard/ParentalControlActivity.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2024 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.setupwizard;
+
+import androidx.activity.result.ActivityResult;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.net.Uri;
+import android.view.View;
+import android.os.Bundle;
+import androidx.browser.customtabs.CustomTabsIntent;
+
+public class ParentalControlActivity extends SubBaseActivity {
+
+     @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setNextAllowed(true);
+        setNextText(R.string.skip);
+    }
+
+    @Override
+    protected void onStartSubactivity() {
+        findViewById(R.id.activate_parental_control).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                launchParentalControl();
+            }
+        });
+        findViewById(R.id.more_info_textview).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String docUrl = getString(R.string.more_info_text);
+                try {
+                    CustomTabsIntent customTabsIntent = new CustomTabsIntent.Builder().setShowTitle(true).build();
+                    customTabsIntent.launchUrl(getApplicationContext(), Uri.parse(docUrl));
+                } catch (Exception e) {
+                    // Fallback to default browser
+                    Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(docUrl));
+                    startActivity(intent);
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void onSubactivityResult(ActivityResult activityResult) {
+        Intent data = activityResult.getData();
+        if (data != null && data.getBooleanExtra("onBackPressed", false)) {
+            onStartSubactivity();
+            return;
+        // Check for back press from Parental control activity
+        } else if(activityResult.getResultCode() == RESULT_OK) {
+            onNavigateNext();
+        }
+
+    }
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.setup_parental_control;
+    }
+
+    @Override
+    protected int getTitleResId() {
+        return R.string.parental_control_setup_title;
+    }
+
+    @Override
+    protected int getIconResId() {
+        return R.drawable.ic_account_manager_screen;
+    }
+
+    private void launchParentalControl() {
+        Intent intent = new Intent();
+        intent.setComponent(new ComponentName("foundation.e.parentalcontrol", "foundation.e.parentalcontrol.MainActivity"));
+        startSubactivity(intent);
+    }
+}
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index d635bfafefd49e6524fd5f09ddd6212082326ac3..e8d3df76e1aa17f20fbeaa3a30c92c99eee954df 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -1,6 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2013 The CyanogenMod Project
  * SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+ * SPDX-FileCopyrightText: 2022 The Calyx Institute
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,10 +9,12 @@ package org.lineageos.setupwizard;
 
 import android.app.Application;
 import android.app.StatusBarManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
+import android.service.oemlock.OemLockManager;
 import android.util.Log;
 
 import org.lineageos.setupwizard.util.SetupWizardUtils;
@@ -26,6 +29,7 @@ public class SetupWizardApp extends Application {
             "com.stevesoltys.seedvault.RESTORE_BACKUP";
     public static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL";
     public static final String ACTION_LOAD = "com.android.wizard.LOAD";
+    public static final String ACTION_CREATE_E_ACCOUNT = "foundation.e.accountmanager.ui.setup.CreateAccountActivity";
 
     public static final String EXTRA_WIZARD_BUNDLE = "wizardBundle";
     public static final String EXTRA_SCRIPT_URI = "scriptUri";
@@ -43,6 +47,7 @@ public class SetupWizardApp extends Application {
     public static final String UPDATE_RECOVERY_PROP = "persist.vendor.recovery_update";
 
     public static final String NAVIGATION_OPTION_KEY = "navigation_option";
+    public static final String ACCOUNT_TYPE_E = "e.foundation.webdav.eelo";
 
     public static final int RADIO_READY_TIMEOUT = 10 * 1000;
 
@@ -64,6 +69,25 @@ public class SetupWizardApp extends Application {
         }
         sStatusBarManager = SetupWizardUtils.disableStatusBar(this);
         mHandler.postDelayed(mRadioTimeoutRunnable, SetupWizardApp.RADIO_READY_TIMEOUT);
+        // If the bootloader is locked, and OEM unlocking is allowed, turn it off
+        if (!Build.IS_EMULATOR && SetupWizardUtils.isOwner()
+                && !SetupWizardUtils.isBootloaderUnlocked(this)
+                && SetupWizardUtils.isOemunlockAllowed(this)) {
+            String manufacturer = Build.MANUFACTURER.toLowerCase();
+            String device = Build.DEVICE.toLowerCase();
+            String[] allowedBrandsAndDevices = getResources().getStringArray(R.array.allowed_brands_and_devices);
+
+            for (String brandAndDevice : allowedBrandsAndDevices) {
+                String[] parts = brandAndDevice.split(":");
+                String allowedBrand = parts[0];
+                String allowedDevice = parts[1];
+
+                if (manufacturer.equals(allowedBrand) && device.equals(allowedDevice)) {
+                    getSystemService(OemLockManager.class).setOemUnlockAllowedByUser(false);
+                    break;
+                }
+            }
+        }
         if (SetupWizardUtils.hasGMS(this)) {
             SetupWizardUtils.disableHome(this);
             if (SetupWizardUtils.isOwner()) {
diff --git a/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java b/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java
index 7ce308085a2559886213990ce6fd2841883c4ed6..af3d3225f1ea11c92933a422da297a1154bd8f11 100644
--- a/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java
+++ b/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java
@@ -29,7 +29,7 @@ public class UpdateRecoveryActivity extends BaseSetupWizardActivity {
         super.onCreate(savedInstanceState);
         mSetupWizardApp = (SetupWizardApp) getApplication();
         getGlifLayout().setDescriptionText(getString(R.string.update_recovery_full_description,
-                getString(R.string.update_recovery_description),
+                getString(R.string.update_recovery_description_e),
                 getString(R.string.update_recovery_warning)));
 
         if (!SetupWizardUtils.hasRecoveryUpdater(this)) {
@@ -77,7 +77,7 @@ public class UpdateRecoveryActivity extends BaseSetupWizardActivity {
 
     @Override
     protected int getTitleResId() {
-        return R.string.update_recovery_title;
+        return R.string.update_recovery_title_e;
     }
 
     @Override
diff --git a/src/org/lineageos/setupwizard/WelcomeActivity.java b/src/org/lineageos/setupwizard/WelcomeActivity.java
index 9d6765e6c0e451d3c2c99bc3a77d9d5d03f468ff..6c7fe364fca73d8db3330e05839404b5b118d330 100644
--- a/src/org/lineageos/setupwizard/WelcomeActivity.java
+++ b/src/org/lineageos/setupwizard/WelcomeActivity.java
@@ -59,7 +59,7 @@ public class WelcomeActivity extends SubBaseActivity {
         if (SetupWizardUtils.isManagedProfile(this)) {
             welcomeTitle.setText(getString(R.string.setup_managed_profile_welcome_message));
         } else {
-            welcomeTitle.setText(getString(R.string.setup_welcome_message,
+            welcomeTitle.setText(getString(R.string.setup_welcome_message_e,
                     getString(R.string.os_name)));
         }
 
diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
index e0ce0c619b67b8bb8aa5aa4b9ca0dff3cddddd24..e1e2aaf6792b96bcea154a8465ac33e60a007691 100644
--- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
+++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
@@ -1,6 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2013 The CyanogenMod Project
  * SPDX-FileCopyrightText: 2017-2025 The LineageOS Project
+ * SPDX-FileCopyrightText: 2022 The Calyx Institute
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -42,6 +43,7 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.telephony.SubscriptionInfo;
+import android.service.oemlock.OemLockManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
@@ -187,7 +189,7 @@ public class SetupWizardUtils {
                     Settings.Secure.TV_USER_SETUP_COMPLETE, 1);
         }
 
-        handleEnableMetrics(context);
+        handleDisableMetrics(context);
         handleNavKeys(context);
         handleRecoveryUpdate();
         handleNavigationOption();
@@ -228,6 +230,22 @@ public class SetupWizardUtils {
         };
     }
 
+    public static boolean isBootloaderUnlocked(Context context) {
+        OemLockManager oemLockManager = context.getSystemService(OemLockManager.class);
+        if (oemLockManager != null) {
+            return oemLockManager.isDeviceOemUnlocked();
+        }
+        return true; // Default to unlocked
+    }
+
+    public static boolean isOemunlockAllowed(Context context) {
+        OemLockManager oemLockManager = context.getSystemService(OemLockManager.class);
+        if (oemLockManager != null) {
+            return oemLockManager.isOemUnlockAllowed();
+        }
+        return true; // Default to unlock allowed
+    }
+
     /**
      * Disable the Home component, which is presumably SetupWizardActivity at this time.
      */
@@ -267,15 +285,9 @@ public class SetupWizardUtils {
                 enabledState, DONT_KILL_APP);
     }
 
-    private static void handleEnableMetrics(Context context) {
-        Bundle privacyData = SetupWizardApp.getSettingsBundle();
-        if (privacyData != null
-                && privacyData.containsKey(KEY_SEND_METRICS)) {
-            LineageSettings.Secure.putInt(context.getContentResolver(),
-                    LineageSettings.Secure.STATS_COLLECTION,
-                    privacyData.getBoolean(KEY_SEND_METRICS)
-                            ? 1 : 0);
-        }
+    private static void handleDisableMetrics(Context context) {
+        LineageSettings.Secure.putInt(context.getContentResolver(),
+            LineageSettings.Secure.STATS_COLLECTION, 0);
     }
 
     private static void handleNavKeys(Context context) {