diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f01e7779057d55c3e2f9d091c60879e100af9deb
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,7 @@
+stages:
+  - update-from-upstream
+
+include:
+  - project: 'e/templates'
+    ref: master
+    file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'
diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..14e376dfe311edbe978ef25e43d34222e0d37e98
--- /dev/null
+++ b/res/values/e_strings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- About App -->
+    <string name="preferences_about_app">Contacts is forked from LineageOS Contacts</string>
+
+    <!-- Authors -->
+    <string name="preferences_authors">Authors</string>
+
+    <!-- Source Code-->
+    <string name="preferences_source_code">Source code</string>
+
+    <!-- License -->
+    <string name="preferences_licence">Licence</string>
+
+    <!-- Contact Information -->
+    <string name="preferences_app_info_title">Contacts information</string>
+    <string name="preferences_app_info">Contacts is an open source App for Android</string>
+
+    <!--Explanation with icon of Drawer in Contacts. Your medical information ie. Date of birth, Bloodtype, allergic details can be recorded for reference. -->
+    <string name="menu_emergency_information_txt">Emergency information</string>
+</resources>
diff --git a/res/xml/preference_about.xml b/res/xml/preference_about.xml
index a109db68ed657688ffda3cbf1d005e05ff93fa03..9258a60d751cd79d425444b638dbe33ebb1224fc 100644
--- a/res/xml/preference_about.xml
+++ b/res/xml/preference_about.xml
@@ -15,11 +15,37 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+            android:icon="@null"
+            android:key="contacts_info"
+            android:summary="@string/preferences_app_info"
+            android:title="@string/preferences_app_info_title" />
+
     <Preference
             android:icon="@null"
             android:key="@string/pref_build_version_key"
             android:title="@string/about_build_version"/>
 
+    <Preference
+            android:icon="@null"
+            android:key="about_app"
+            android:title="@string/preferences_about_app" />
+
+    <Preference
+            android:icon="@null"
+            android:key="license"
+            android:title="@string/preferences_licence" />
+
+    <Preference
+            android:icon="@null"
+            android:key="authors"
+            android:title="@string/preferences_authors" />
+
+    <Preference
+            android:icon="@null"
+            android:key="source_code"
+            android:title="@string/preferences_source_code" />
+
     <Preference
             android:icon="@null"
             android:key="@string/pref_open_source_licenses_key"
diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index 19da5bc81c202949428d28765e51d8b28e35865b..4e6d61f3759da2e99c28e836a6f1f46c9d1e0880 100644
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -782,7 +782,7 @@ public class RawContactEditorView extends LinearLayout implements View.OnClickLi
         }
 
         // If we're saving a new contact and there are multiple accounts, add the account selector.
-        if (mHasNewContact && !mIsUserProfile && mAccounts.size() > 1) {
+        if (mHasNewContact && mAccounts.size() > 1) {
             addAccountSelector(mCurrentRawContactDelta);
         }
     }
diff --git a/src/com/android/contacts/model/account/AccountComparator.java b/src/com/android/contacts/model/account/AccountComparator.java
index 70ccf494fb78694222497e7e2d1827d3f1e87f96..8bc8fbbf76707a9b6121630f02d3df900d1f3b9a 100644
--- a/src/com/android/contacts/model/account/AccountComparator.java
+++ b/src/com/android/contacts/model/account/AccountComparator.java
@@ -38,13 +38,13 @@ public class AccountComparator implements Comparator<AccountWithDataSet> {
             return -1;
         } else if (a.name == null || a.type == null) {
             return 1;
-        } else if (isWritableGoogleAccount(a) && a.equals(mDefaultAccount)) {
+        } else if (isWritableEAccount(a) && a.equals(mDefaultAccount)) {
             return -1;
-        } else if (isWritableGoogleAccount(b) && b.equals(mDefaultAccount)) {
+        } else if (isWritableEAccount(b) && b.equals(mDefaultAccount)) {
             return 1;
-        } else if (isWritableGoogleAccount(a) && !isWritableGoogleAccount(b)) {
+        } else if (isWritableEAccount(a) && !isWritableEAccount(b)) {
             return -1;
-        } else if (isWritableGoogleAccount(b) && !isWritableGoogleAccount(a)) {
+        } else if (isWritableEAccount(b) && !isWritableEAccount(a)) {
             return 1;
         } else {
             int diff = a.name.compareToIgnoreCase(b.name);
@@ -65,7 +65,7 @@ public class AccountComparator implements Comparator<AccountWithDataSet> {
         }
     }
 
-    private static boolean isWritableGoogleAccount(AccountWithDataSet account) {
-        return GoogleAccountType.ACCOUNT_TYPE.equals(account.type) && account.dataSet == null;
+    private static boolean isWritableEAccount(AccountWithDataSet account) {
+        return "foundation.e.accountmanager.eelo.address_book".equals(account.type) && account.dataSet == null;
     }
 }
diff --git a/src/com/android/contacts/preference/AboutPreferenceFragment.java b/src/com/android/contacts/preference/AboutPreferenceFragment.java
index 378948033ac42c95473a48016d3e2f765935a76d..272cd043988243a4690a68ecde2396972d0bbca1 100644
--- a/src/com/android/contacts/preference/AboutPreferenceFragment.java
+++ b/src/com/android/contacts/preference/AboutPreferenceFragment.java
@@ -35,8 +35,13 @@ import com.android.contacts.activities.LicenseActivity;
  */
 public class AboutPreferenceFragment extends PreferenceFragment {
 
-    public static final String PRIVACY_POLICY_URL = "http://www.google.com/policies/privacy";
-    public static final String TERMS_OF_SERVICE_URL = "http://www.google.com/policies/terms";
+    public static final String BUILD_VERSION_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/releases";
+    public static final String ABOUT_APP_URL = "https://github.com/LineageOS/android_packages_apps_Contacts";
+    public static final String LICENSE_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/blob/v1-r/NOTICE";
+    public static final String AUTHORS_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts";
+    public static final String SOURCE_CODE_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts";
+    public static final String PRIVACY_POLICY_URL = "https://e.foundation/legal-notice-privacy/";
+    public static final String TERMS_OF_SERVICE_URL = "https://e.foundation/legal-notice-privacy/";
 
     public static AboutPreferenceFragment newInstance() {
         return new AboutPreferenceFragment();
@@ -60,12 +65,14 @@ public class AboutPreferenceFragment extends PreferenceFragment {
             // Nothing
         }
 
-        final Preference licensePreference = findPreference(
-                getString(R.string.pref_open_source_licenses_key));
-        licensePreference.setIntent(new Intent(getActivity(), LicenseActivity.class));
-
+        final Preference buildVersionPreference = findPreference("pref_build_version");
+        final Preference aboutAppPreference = findPreference("about_app");
+        final Preference licensePreference = findPreference("license");
+        final Preference authorsPreference = findPreference("authors");
+        final Preference sourceCodePreference = findPreference("source_code");
         final Preference privacyPolicyPreference = findPreference("pref_privacy_policy");
         final Preference termsOfServicePreference = findPreference("pref_terms_of_service");
+        final Preference openSourceLicensePreference = findPreference(getString(R.string.pref_open_source_licenses_key));
 
         final Preference.OnPreferenceClickListener listener =
                 new Preference.OnPreferenceClickListener() {
@@ -76,6 +83,18 @@ public class AboutPreferenceFragment extends PreferenceFragment {
                         startActivityForUrl(PRIVACY_POLICY_URL);
                     } else if (preference == termsOfServicePreference) {
                         startActivityForUrl(TERMS_OF_SERVICE_URL);
+                    } else if (preference == buildVersionPreference) {
+                        startActivityForUrl(BUILD_VERSION_URL);
+                    } else if (preference == aboutAppPreference) {
+                        startActivityForUrl(ABOUT_APP_URL);
+                    } else if (preference == licensePreference) {
+                        startActivityForUrl(LICENSE_URL);
+                    } else if (preference == authorsPreference) {
+                        startActivityForUrl(AUTHORS_URL);
+                    } else if (preference == sourceCodePreference) {
+                        startActivityForUrl(SOURCE_CODE_URL);
+                    } else if (preference == openSourceLicensePreference) {
+                        startActivity(new Intent(getActivity(), LicenseActivity.class));
                     }
                 } catch (ActivityNotFoundException ex) {
                     Toast.makeText(getContext(), getString(R.string.url_open_error_toast),
@@ -85,6 +104,12 @@ public class AboutPreferenceFragment extends PreferenceFragment {
             }
         };
 
+        buildVersionPreference.setOnPreferenceClickListener(listener);
+        aboutAppPreference.setOnPreferenceClickListener(listener);
+        licensePreference.setOnPreferenceClickListener(listener);
+        authorsPreference.setOnPreferenceClickListener(listener);
+        sourceCodePreference.setOnPreferenceClickListener(listener);
+        openSourceLicensePreference.setOnPreferenceClickListener(listener);
         privacyPolicyPreference.setOnPreferenceClickListener(listener);
         termsOfServicePreference.setOnPreferenceClickListener(listener);
     }