diff --git a/Android.bp b/Android.bp
index a5771158376b151482cd6e62fc1da75319cfd3d4..404e3eada5b7061a6f293342c5eaa54ad9077b8f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,6 +36,7 @@ android_app {
         "setupcompat",
         "setupdesign",
         "org.lineageos.platform.internal",
+        "elib",
     ],
 
     libs: ["telephony-common"],
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d68f421c5873451d7da4175fe99a0b94a30d5b7c..3d4413a9ebd6777dc96bdfcd12c416b5c4231396 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <!--
      Copyright (C) 2013 The CyanogenMod Project
      Copyright (C) 2017-2022 The LineageOS Project
+     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.
@@ -45,6 +46,7 @@
     <uses-permission android:name="lineageos.permission.FINISH_SETUP" />
     <uses-permission android:name="lineageos.permission.WRITE_SETTINGS" />
     <uses-permission android:name="lineageos.permission.WRITE_SECURE_SETTINGS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
 
     <permission
         android:name="lineageos.permission.FINISH_SETUP"
@@ -279,6 +281,19 @@
             </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=".backup.RestoreIntroActivity"
                   android:label="@string/activity_label_empty"
                   android:excludeFromRecents="true"
diff --git a/res/drawable/ic_account_manager_screen.xml b/res/drawable/ic_account_manager_screen.xml
new file mode 100644
index 0000000000000000000000000000000000000000..10a546fa8ef0aa67c94086ad23141acadcf420f2
--- /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="@color/black"
+        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/logo.xml b/res/drawable/logo.xml
index ffaf10affc26be441a97b9c732ea64967b2700ec..baf2fc7407e81412f7a1fdb90d4941054dc63906 100644
--- a/res/drawable/logo.xml
+++ b/res/drawable/logo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2017, 2022 The LineageOS Project
+    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.
@@ -15,14 +15,11 @@
     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/update_recovery_page.xml b/res/layout/update_recovery_page.xml
index 5e86aeeaa51c733d71c1441eb70dc741e3232863..61850dcb4a1d02aaab5ecde465bfc4c50bbf3933 100644
--- a/res/layout/update_recovery_page.xml
+++ b/res/layout/update_recovery_page.xml
@@ -65,7 +65,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 6493dc2ed0fd7eef7922995d6c4df17cf8348935..865a1bc2b1dccfb19ea5b7cd1b7c63e993e9e178 100644
--- a/res/layout/welcome_activity.xml
+++ b/res/layout/welcome_activity.xml
@@ -22,42 +22,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"
@@ -69,6 +36,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"
@@ -90,6 +66,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"
@@ -100,13 +77,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"
@@ -119,7 +96,6 @@
                 android:layout_width="0.0dip"
                 android:layout_height="0.0dip"
                 android:layout_weight="1.0" />
-
             <Button
                 android:id="@id/start"
                 style="@style/SudGlifButton.Primary"
@@ -127,5 +103,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 cb404ebfac5795b2855e59c107661e26c76ab543..793177f8f431ce71c83bf02c14a3a292965e9626 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -3,6 +3,7 @@
 <!--
      Copyright (C) 2016 The CyanogenMod Project
      Copyright (C) 2017-2022 The LineageOS Project
+     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.
@@ -52,12 +53,14 @@
     </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="navigation_settings" />
     </WizardAction>
 
+<!--
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings">
         <result wizard:action="navigation_settings" />
     </WizardAction>
+-->
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
         <result wizard:action="biometric_settings" />
@@ -68,12 +71,18 @@
     </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
-        <result wizard:action="restore" />
+        <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>
 
+<!--
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
         <result wizard:action="finish" />
     </WizardAction>
+-->
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
         <result wizard:action="exit" />
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b1ad0a76411b150a796c6d744ade61715d31da34..d4ddb2fa583080529b4d7d0542681f0d1ca8444a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,8 +14,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Einrichtungsassistent</string>
     <string name="next">Weiter</string>
     <string name="skip">Überspringen</string>
@@ -89,4 +88,14 @@
     <string name="two_button_navigation">2-Tasten-Steuerung</string>
     <string name="navbar_navigation">3-Tasten-Steuerung</string>
     <string name="hide_gesture_hint">Gestensteuerungshinweis ausblenden</string>
-</resources>
+    <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>
+</resources>
\ No newline at end of file
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 22333e615f016c48ed3ea23b239aa0b9aa10ea5d..da3b6183e2f0cad4f500ce186922ea17a7b1a76b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -14,8 +14,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Asistente de configuración</string>
     <string name="next">Siguiente</string>
     <string name="skip">Omitir</string>
@@ -69,4 +68,34 @@
     <string name="lockscreen_setup_screen_lock_setup">Configurar</string>
     <string name="intro_restore_title">Restaurar aplicaciones y datos</string>
     <string name="intro_restore_button">Restaurar desde copia de seguridad</string>
-</resources>
+    <string name="setup_welcome_message_e">Bienvenido a
+\n/e/OS</string>
+    <string name="hide_gesture_hint">Ocultar sugerencia de navegación por gestos</string>
+    <string name="navbar_navigation">Navegación con 3 botones</string>
+    <string name="two_button_navigation">Navegación con 2 botones</string>
+    <string name="gesture_navigation">Navegación por gestos</string>
+    <string name="navigation_summary">Elija el método de navegación preferido</string>
+    <string name="setup_navigation">Navegación</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>
+\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="intro_restore_subtitle" product="default">Si tiene una copia de seguridad de su último <xliff:g id="name" example="LineageOS">%s</xliff:g> teléfono, puede restaurarlo aquí.</string>
+    <string name="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>
+\n<xliff:g id="pp_find">%2$s</xliff:g></string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> mediante el envío automático de datos de diagnóstico y uso a <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Esta información no se puede utilizar para identificarle y ayuda a los equipos que trabajan en aspectos como la duración de la batería, el rendimiento de las aplicaciones y las nuevas tecnologías. <xliff:g id="name" example="LineageOS">%3$s</xliff:g> características.</string>
+    <string name="setup_welcome_message">Bienvenido a <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
+    <string name="sign_in">Acceder</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, eventos del 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="update_recovery_setting">Actualizar Lineage Recovery junto con el sistema operativo</string>
+    <string name="update_recovery_warning">La recuperación se actualizará en cuanto termines la configuración. Si deseas mantenerlo intacto, desactiva esta función.</string>
+    <string name="update_recovery_description">Actualiza Lineage Recovery en el primer arranque posterior a cada actualización.</string>
+    <string name="update_recovery_title">Actualizar Lineage Recovery</string>
+    <string name="services_find_privacy_policy">Puede leer la política de privacidad en otro dispositivo visitando<xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
+    <string name="services_pp_explanation">Estos servicios trabajan para usted para ampliar las capacidades de su dispositivo. Los datos se utilizarán de acuerdo con <xliff:g id="name" example="LineageOS">%1$s</xliff:g>\'s política de privacidad.</string>
+    <string name="accessibility_settings">Ajustes de accesibilidad</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 905affb690f59ec3339821b9be5388b22d0d2c99..8fb8d45dcbca7c85f32eb712421bafa9be8cf93c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -14,8 +14,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Assistant de configuration</string>
     <string name="next">Suivant</string>
     <string name="skip">Ignorer</string>
@@ -75,4 +74,29 @@
     <string name="update_recovery_description">Met à jour Lineage Recovery au premier démarrage après chaque mise à jour.</string>
     <string name="update_recovery_warning">La récupération sera mise à jour dès que vous aurez terminé la configuration. Si vous souhaitez la garder intacte, veuillez désactiver cette fonctionnalité.</string>
     <string name="update_recovery_setting">Mettre à jour Lineage Recovery en même temps que le système d\'exploitation</string>
-</resources>
+    <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="hide_gesture_hint">Masquer les astuces de navigation par gestes</string>
+    <string name="navbar_navigation">Navigation à 3 boutons</string>
+    <string name="two_button_navigation">Navigation à 2 boutons</string>
+    <string name="gesture_navigation">Navigation par gestes</string>
+    <string name="navigation_summary">Choisissez votre mode de navigation préféré</string>
+    <string name="setup_navigation">Navigation</string>
+    <string name="intro_restore_subtitle" product="default">Si vous avez une sauvegarde de votre précédente tablette <xliff:g id="name" example="LineageOS">%s</xliff:g>, vous pouvez la restaurer ici.</string>
+    <string name="services_find_privacy_policy">Vous pouvez lire la politique de confidentialité sur un autre appareil en visitant la page suivante <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
+    <string name="services_pp_explanation">Ces services sont mis en place pour augmenter les capacités de votre appareil. Les données seront utilisées conformément à <xliff:g id="name" example="LineageOS">%1$s</xliff:g>\'s privacy policy.</string>
+    <string name="setup_welcome_message">Bienvenue sur <xliff:g id="name" example="LineageOS">%1$s</xliff:g></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="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> en envoyant automatiquement des données de diagnostics et d\'utilisation à <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Ces informations ne peuvent pas être utilisées pour vous identifier et aident les équipes qui travaillent sur des sujets comme la durée de vie de la batterie, les performances des applications et de nouvelles fonctionnalités <xliff:g id="name" example="LineageOS">%3$s</xliff:g>.</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>
+\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>
+\n<xliff:g id="pp_find">%2$s</xliff:g></string>
+</resources>
\ No newline at end of file
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f8288c7e07e3c0a2d23a70cf74f363124487b4cf..254d42c6b4b29385d0054bc4c109952fac3b429d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -14,8 +14,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Installazione guidata</string>
     <string name="next">Avanti</string>
     <string name="skip">Salta</string>
@@ -89,4 +88,14 @@
     <string name="two_button_navigation">Navigazione con due pulsanti</string>
     <string name="navbar_navigation">Navigazione con tre pulsanti</string>
     <string name="hide_gesture_hint">Nascondi i suggerimenti per la navigazione tramite gesti</string>
-</resources>
+    <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>
+</resources>
\ No newline at end of file
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
index 2c385a1b09768c4b23d30494aad494e5b0917a5d..f0fe392adef593458103402cf367d0ab106edb91 100644
--- a/res/values-night/styles.xml
+++ b/res/values-night/styles.xml
@@ -11,5 +11,11 @@
 
         <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>
     </style>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4040a5622eb30eee1fef22aeffd471aca3753dc4..af1dbdad96f58708c159955745dd148c7b3d659a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -14,8 +14,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Assistent voor instellen</string>
     <string name="next">Volgende</string>
     <string name="skip">Overslaan</string>
@@ -39,7 +38,7 @@
     <string name="sim_missing_summary" product="default">Geen simkaart gedetecteerd in uw telefoon. Om een simkaart te plaatsen, lees de instructie die bij uw telefoon is geleverd.</string>
     <string name="choose_data_sim_summary" product="tablet">Welke simkaart wilt u gebruiken voor mobiel internet? Voor deze simkaart kunnen extra kosten in rekening gebracht worden, omdat deze gebruikt wordt om uw tablet in te stellen.</string>
     <string name="choose_data_sim_summary" product="default">Welke simkaart wilt u gebruiken voor mobiel internet? Voor deze simkaart kunnen extra kosten in rekening gebracht worden, omdat deze gebruikt wordt om uw telefoon in te stellen.</string>
-    <string name="date_time_summary">Selecteer uw tijdzone en pas indien nodig de huidige datum en tijd aan.</string>
+    <string name="date_time_summary">Selecteer uw tijdzone en pas, indien nodig, de huidige datum en tijd aan</string>
     <string name="location_access_summary"><b>Apps toestaan die uw toestemming hebben gevraagd</b> om informatie over uw locatie te gebruiken. Dit kan uw huidige locatie en voorgaande locaties omvatten.</string>
     <string name="setup_mobile_data">Mobiele gegevens inschakelen</string>
     <string name="setup_mobile_data_no_service">Geen verbinding</string>
@@ -51,7 +50,7 @@
     <string name="emergency_call">Noodoproep</string>
     <string name="accessibility_settings">Toegankelijkheidsinstellingen</string>
     <string name="setup_services">Functies van LineageOS</string>
-    <string name="services_pp_explanation">Deze diensten worden gebruikt om de mogelijkheden van uw apparaat uit te breiden. Gegevens zullen worden gebruikt conform het privacybeleid van <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
+    <string name="services_pp_explanation">Deze diensten worden gebruikt om de mogelijkheden van uw apparaat uit te breiden. Gegevens zullen worden gebruikt conform het privacybeleid van <xliff:g id="name" example="LineageOS">%1$s</xliff:g>.</string>
     <string name="services_find_privacy_policy">U kunt het privacybeleid op een ander apparaat lezen door <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g> te bezoeken</string>
     <string name="services_help_improve_cm">Help mee met het verbeteren van <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> door automatisch diagnose- en verbruiksgegevens te verzenden naar  <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Deze informatie kan niet gebruikt worden om u te identificeren en helpt de teams om te werken aan zaken zoals levensduur van de accu, app-prestaties en nieuwe <xliff:g id="name" example="LineageOS">%3$s</xliff:g> features.</string>
@@ -79,7 +78,7 @@
     <string name="intro_restore_subtitle" product="default">Als u een back-up heeft van uw laatste <xliff:g id="name" example="LineageOS">%s</xliff:g> tablet, kunt u deze hier herstellen.</string>
     <string name="intro_restore_button">Backup terugzetten</string>
     <string name="update_recovery_title">Lineage Recovery bijwerken</string>
-    <string name="update_recovery_description">Lineage Recovery updaten bij de eerste start na elke update</string>
+    <string name="update_recovery_description">Lineage Recovery bijwerken bij de eerste opstart na elke update.</string>
     <string name="update_recovery_warning">Recovery zal worden bijgewerkt zodra u de installatie hebt voltooid. Als u dit intact wilt houden, schakelt u deze functie uit.</string>
     <string name="update_recovery_setting">Update Lineage Recovery naast het besturingssysteem</string>
     <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
@@ -89,4 +88,14 @@
     <string name="two_button_navigation">Navigatie met twee knoppen</string>
     <string name="navbar_navigation">Navigatie met drie knoppen</string>
     <string name="hide_gesture_hint">Verberg gebaren navigatiehint</string>
-</resources>
+    <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/strings.xml b/res/values-ru/strings.xml
index a64df00ed97f122e0fdc1dccfc190c044824850a..38c8f467496cff4c3ab0656bf5f5d53c6f447c6e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -14,8 +14,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Мастер настройки</string>
     <string name="next">Далее</string>
     <string name="skip">Пропустить</string>
@@ -24,7 +23,7 @@
     <string name="ok">ОК</string>
     <string name="loading">Секунду\u2026</string>
     <string name="setup_complete">Настройка завершена</string>
-    <string name="setup_welcome">Добро пожаловать!</string>
+    <string name="setup_welcome">Добро пожаловать</string>
     <string name="setup_welcome_message">Добро пожаловать в <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">Язык</string>
     <string name="setup_wifi">Выбрать сеть Wi-Fi</string>
@@ -89,4 +88,14 @@
     <string name="two_button_navigation">Навигация двумя кнопками</string>
     <string name="navbar_navigation">Навигация тремя кнопками</string>
     <string name="hide_gesture_hint">Скрыть подсказку навигации жестами</string>
-</resources>
+    <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/dimens.xml b/res/values/dimens.xml
index 882885f2c253941cafcf460af3ed368e936a9575..37af65d98c294ce444aaef1be3f1e14b9aa23080 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -42,9 +42,9 @@
     <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/strings.xml b/res/values/strings.xml
index 8253bc5d03e40a31d7d37fb978b3ce89f8880a9a..5575e7bdf35d0f38c97369e58bba7396446267a9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,6 +2,7 @@
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
      Copyright (C) 2017-2020, 2022 The LineageOS Project
+     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.
@@ -115,4 +116,18 @@
     <string name="two_button_navigation">2-button navigation</string>
     <string name="navbar_navigation">3-button navigation</string>
     <string name="hide_gesture_hint">Hide gestural navigation hint</string>
+
+    <!-- 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>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5e7eda71a86702fbb377ed6d6c3784b5027d889c..0782747b18b6cf674b4012709e72c940f00079bb 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -19,6 +19,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..ff08264f0240c010b51497334166334bf72aa6bd
--- /dev/null
+++ b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
@@ -0,0 +1,114 @@
+/*
+ * 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 static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_ACCOUNT_TYPE_E;
+
+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);
+        }
+        setNextText(R.string.skip);
+    }
+
+    @Override
+    protected void onStartSubactivity() {
+        setNextAllowed(true);
+        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);
+                startActivityForResult(intent, SetupWizardApp.REQUEST_CODE_CREATE_E_ACCOUNT);
+            }
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if(resultCode == RESULT_OK) {
+            onNavigateNext();
+        }
+    }
+
+    @Override
+    protected void onSubactivityResult(int requestCode, int resultCode, Intent data) {
+        // AccountManager activity always return resultCode as 0, check manually
+        if (isEAccountAvailable()) {
+            Log.v(TAG, "An E account is already set up; skipping EAccountManagerActivity");
+            nextAction(RESULT_OK);
+        } else {
+            super.onSubactivityResult(requestCode, resultCode, data);
+        }
+    }
+
+    @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, REQUEST_CODE_SETUP_ACCOUNT_TYPE_E);
+    }
+
+    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/FinishActivity.java b/src/org/lineageos/setupwizard/FinishActivity.java
index 95e316615dc72d478f0e1783ffe528d6aa4e5245..bf98805805739f53e97b0f6d0796d63fb47bec84 100644
--- a/src/org/lineageos/setupwizard/FinishActivity.java
+++ b/src/org/lineageos/setupwizard/FinishActivity.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
  * Copyright (C) 2017-2020, 2022 The LineageOS Project
+ * * 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.
@@ -70,6 +71,9 @@ public class FinishActivity extends BaseSetupWizardActivity {
 
     private volatile boolean mIsFinishing = false;
 
+    private static final String OWM =
+            "org.lineageos.openweathermapprovider/org.lineageos.openweathermapprovider.OpenWeatherMapProviderService";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -175,7 +179,8 @@ public class FinishActivity extends BaseSetupWizardActivity {
     }
 
     private void completeSetup() {
-        handleEnableMetrics(mSetupWizardApp);
+        handleDisableMetrics(mSetupWizardApp);
+        setupWeatherProvider();
         handleNavKeys(mSetupWizardApp);
         handleRecoveryUpdate(mSetupWizardApp);
         handleNavigationOption(mSetupWizardApp);
@@ -189,15 +194,14 @@ public class FinishActivity extends BaseSetupWizardActivity {
         startActivityForResult(intent, NEXT_REQUEST);
     }
 
-    private static void handleEnableMetrics(SetupWizardApp setupWizardApp) {
-        Bundle privacyData = setupWizardApp.getSettingsBundle();
-        if (privacyData != null
-                && privacyData.containsKey(KEY_SEND_METRICS)) {
-            LineageSettings.Secure.putInt(setupWizardApp.getContentResolver(),
-                    LineageSettings.Secure.STATS_COLLECTION,
-                    privacyData.getBoolean(KEY_SEND_METRICS)
-                            ? 1 : 0);
-        }
+    private static void handleDisableMetrics(SetupWizardApp setupWizardApp) {
+        LineageSettings.Secure.putInt(setupWizardApp.getContentResolver(),
+            LineageSettings.Secure.STATS_COLLECTION, 0);
+    }
+
+    private void setupWeatherProvider() {
+        LineageSettings.Secure.putString(getContentResolver(),
+                        LineageSettings.Secure.WEATHER_PROVIDER_SERVICE, OWM);
     }
 
     private static void handleNavKeys(SetupWizardApp setupWizardApp) {
diff --git a/src/org/lineageos/setupwizard/LocationSettingsActivity.java b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
index 846020bb0a829fbbf6578b166cb5c8db0cc49917..d547dedd7689c0607e4dadd073dccb49c7e28eb2 100644
--- a/src/org/lineageos/setupwizard/LocationSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
  * Copyright (C) 2017-2021 The LineageOS Project
+ * Copyright (C) 2020-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.
@@ -22,6 +23,7 @@ import android.os.Bundle;
 import android.os.UserHandle;
 import android.view.View;
 import android.widget.CheckBox;
+import android.provider.Settings;
 
 public class LocationSettingsActivity extends BaseSetupWizardActivity {
 
@@ -45,6 +47,8 @@ public class LocationSettingsActivity extends BaseSetupWizardActivity {
                     new UserHandle(UserHandle.USER_CURRENT));
             mLocationAccess.setChecked(!mLocationAccess.isChecked());
         });
+        Settings.Global.putInt(getContentResolver(),
+                    Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE,1);
     }
 
     @Override
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index dcfe3bc8003f97847d4114ee3d51488be7199c6c..a1d7f938c4271c8769e7487f89cfd906e6661777 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -46,6 +46,7 @@ public class SetupWizardApp extends Application {
     public static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL";
     public static final String ACTION_NEXT = "com.android.wizard.NEXT";
     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_HAS_MULTIPLE_USERS = "hasMultipleUsers";
     public static final String EXTRA_TITLE = "title";
@@ -66,6 +67,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 REQUEST_CODE_SETUP_NETWORK = 0;
     public static final int REQUEST_CODE_SETUP_CAPTIVE_PORTAL = 4;
@@ -73,6 +75,8 @@ public class SetupWizardApp extends Application {
     public static final int REQUEST_CODE_SETUP_BIOMETRIC = 7;
     public static final int REQUEST_CODE_SETUP_LOCKSCREEN = 9;
     public static final int REQUEST_CODE_RESTORE = 10;
+    public static final int REQUEST_CODE_SETUP_ACCOUNT_TYPE_E = 11;
+    public static final int REQUEST_CODE_CREATE_E_ACCOUNT = 1;
 
     public static final int RADIO_READY_TIMEOUT = 10 * 1000;
 
diff --git a/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java b/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java
index 2296804791550ee5266ed5bc37b33ed0c41bccfa..5e2be77425ced5a89885258b59ed6d251c7881e9 100644
--- a/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java
+++ b/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java
@@ -42,7 +42,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)) {
@@ -96,7 +96,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 b115f8101ba40e83d379354c422b99d9cf56d556..b169660f084d26366d8479177591cc387551b642 100644
--- a/src/org/lineageos/setupwizard/WelcomeActivity.java
+++ b/src/org/lineageos/setupwizard/WelcomeActivity.java
@@ -50,8 +50,7 @@ public class WelcomeActivity extends BaseSetupWizardActivity {
         FooterButtonStyleUtils.applySecondaryButtonPartnerResource(this, emergButton, true);
 
         TextView welcomeTitle = findViewById(R.id.welcome_title);
-        welcomeTitle.setText(getString(R.string.setup_welcome_message,
-                getString(R.string.os_name)));
+        welcomeTitle.setText(getString(R.string.setup_welcome_message_e));
     }
 
     @Override