diff --git a/app/build.gradle b/app/build.gradle
index 6dded367f7..574f6baeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -66,6 +66,7 @@ android {
 dependencies {
     implementation project(":libraries:designsystem")
     implementation project(":libraries:matrix")
+    implementation project(":features:onboarding")
     implementation project(":features:login")
     implementation project(":features:roomlist")
     implementation project(":features:messages")
diff --git a/app/src/main/java/io/element/android/x/MainActivity.kt b/app/src/main/java/io/element/android/x/MainActivity.kt
index 8b335cba6f..99937203d1 100644
--- a/app/src/main/java/io/element/android/x/MainActivity.kt
+++ b/app/src/main/java/io/element/android/x/MainActivity.kt
@@ -15,6 +15,7 @@ import com.ramcosta.composedestinations.DestinationsNavHost
 import com.ramcosta.composedestinations.rememberNavHostEngine
 import io.element.android.x.designsystem.ElementXTheme
 import io.element.android.x.destinations.LoginScreenNavigationDestination
+import io.element.android.x.destinations.OnBoardingScreenNavigationDestination
 import kotlinx.coroutines.runBlocking
 
 class MainActivity : ComponentActivity() {
@@ -37,7 +38,7 @@ private fun MainScreen(viewModel: MainViewModel) {
     val navController = engine.rememberNavController()
     val startRoute = runBlocking {
         if (!viewModel.isLoggedIn()) {
-            LoginScreenNavigationDestination
+            OnBoardingScreenNavigationDestination
         } else {
             viewModel.restoreSession()
             NavGraphs.root.startRoute
diff --git a/app/src/main/java/io/element/android/x/Navigation.kt b/app/src/main/java/io/element/android/x/Navigation.kt
index cba9804824..6604136649 100644
--- a/app/src/main/java/io/element/android/x/Navigation.kt
+++ b/app/src/main/java/io/element/android/x/Navigation.kt
@@ -8,18 +8,33 @@ import com.ramcosta.composedestinations.navigation.popUpTo
 import io.element.android.x.destinations.LoginScreenNavigationDestination
 import io.element.android.x.destinations.MessagesScreenNavigationDestination
 import io.element.android.x.destinations.RoomListScreenNavigationDestination
+import io.element.android.x.destinations.OnBoardingScreenNavigationDestination
 import io.element.android.x.features.login.LoginScreen
 import io.element.android.x.features.messages.MessagesScreen
+import io.element.android.x.features.onboarding.OnBoardingScreen
 import io.element.android.x.features.roomlist.RoomListScreen
 import io.element.android.x.matrix.core.RoomId
 
+@Destination
+@Composable
+fun OnBoardingScreenNavigation(navigator: DestinationsNavigator) {
+    OnBoardingScreen(
+        onSignUp = {
+            // TODO
+        },
+        onSignIn = {
+            navigator.navigate(LoginScreenNavigationDestination)
+        }
+    )
+}
+
 @Destination
 @Composable
 fun LoginScreenNavigation(navigator: DestinationsNavigator) {
     LoginScreen(
         onLoginWithSuccess = {
             navigator.navigate(RoomListScreenNavigationDestination) {
-                popUpTo(LoginScreenNavigationDestination) {
+                popUpTo(OnBoardingScreenNavigationDestination) {
                     inclusive = true
                 }
             }
@@ -36,7 +51,7 @@ fun RoomListScreenNavigation(navigator: DestinationsNavigator) {
             navigator.navigate(MessagesScreenNavigationDestination(roomId = roomId.value))
         },
         onSuccessLogout = {
-            navigator.navigate(LoginScreenNavigationDestination) {
+            navigator.navigate(OnBoardingScreenNavigationDestination) {
                 popUpTo(RoomListScreenNavigationDestination) {
                     inclusive = true
                 }
diff --git a/features/onboarding/.gitignore b/features/onboarding/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/features/onboarding/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/features/onboarding/build.gradle.kts b/features/onboarding/build.gradle.kts
new file mode 100644
index 0000000000..5c67c8df53
--- /dev/null
+++ b/features/onboarding/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    id("io.element.android-compose")
+}
+
+android {
+    namespace = "io.element.android.x.features.onboarding"
+}
+
+dependencies {
+    implementation(project(":libraries:core"))
+    implementation(project(":libraries:elementresources"))
+    implementation(project(":libraries:designsystem"))
+    implementation(libs.mavericks.compose)
+    implementation(libs.timber)
+    implementation(libs.accompanist.pager)
+    implementation(libs.accompanist.pagerindicator)
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.3")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+}
\ No newline at end of file
diff --git a/features/onboarding/consumer-rules.pro b/features/onboarding/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/features/onboarding/proguard-rules.pro b/features/onboarding/proguard-rules.pro
new file mode 100644
index 0000000000..ff59496d81
--- /dev/null
+++ b/features/onboarding/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/features/onboarding/src/androidTest/java/io/element/android/x/features/login/ExampleInstrumentedTest.kt b/features/onboarding/src/androidTest/java/io/element/android/x/features/login/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000000..ba9eb96b15
--- /dev/null
+++ b/features/onboarding/src/androidTest/java/io/element/android/x/features/login/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package io.element.android.x.features.login
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("io.element.android.x.features.login.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/features/onboarding/src/main/AndroidManifest.xml b/features/onboarding/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..a5918e68ab
--- /dev/null
+++ b/features/onboarding/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingActions.kt b/features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingActions.kt
new file mode 100644
index 0000000000..d95c6f3a4a
--- /dev/null
+++ b/features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingActions.kt
@@ -0,0 +1,5 @@
+package io.element.android.x.features.onboarding
+
+sealed interface OnBoardingActions {
+    data class GoToPage(val page: Int) : OnBoardingActions
+}
diff --git a/features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingScreen.kt b/features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingScreen.kt
new file mode 100644
index 0000000000..d71c9d9721
--- /dev/null
+++ b/features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingScreen.kt
@@ -0,0 +1,147 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package io.element.android.x.features.onboarding
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.airbnb.mvrx.compose.collectAsState
+import com.airbnb.mvrx.compose.mavericksViewModel
+import com.google.accompanist.pager.ExperimentalPagerApi
+import com.google.accompanist.pager.HorizontalPager
+import com.google.accompanist.pager.HorizontalPagerIndicator
+import com.google.accompanist.pager.rememberPagerState
+import io.element.android.x.designsystem.components.VectorButton
+
+@Composable
+fun OnBoardingScreen(
+    viewModel: OnBoardingViewModel = mavericksViewModel(),
+    onSignUp: () -> Unit = { },
+    onSignIn: () -> Unit = { },
+) {
+    val state: OnBoardingViewState by viewModel.collectAsState()
+    OnBoardingContent(
+        state,
+        onSignUp = onSignUp,
+        onSignIn = onSignIn,
+    )
+}
+
+
+@OptIn(ExperimentalPagerApi::class)
+@Composable
+fun OnBoardingContent(
+    state: OnBoardingViewState,
+    onSignUp: () -> Unit,
+    onSignIn: () -> Unit,
+) {
+    val carrouselState = remember { SplashCarouselStateFactory().create() }
+    Surface(
+        color = MaterialTheme.colorScheme.background,
+    ) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(vertical = 16.dp)
+        ) {
+            Column(
+                modifier = Modifier.fillMaxSize(),
+            ) {
+                val pagerState = rememberPagerState()
+                // pagerState.scrollToPage(state.currentPage)
+                HorizontalPager(
+                    modifier = Modifier.weight(1f),
+                    count = carrouselState.items.size,
+                    state = pagerState,
+                ) { page ->
+                    // Our page content
+                    OnBoardingPage(carrouselState.items[page])
+                }
+                HorizontalPagerIndicator(
+                    pagerState = pagerState,
+                    modifier = Modifier
+                        .align(CenterHorizontally)
+                        .padding(16.dp),
+                )
+                VectorButton(
+                    text = "CREATE ACCOUNT",
+                    onClick = {
+                        onSignUp()
+                    },
+                    enabled = true,
+                    modifier = Modifier
+                        .align(CenterHorizontally)
+                        .padding(top = 16.dp)
+                )
+                VectorButton(
+                    text = "I ALREADY HAVE AN ACCOUNT",
+                    onClick = {
+                        onSignIn()
+                    },
+                    enabled = true,
+                    modifier = Modifier
+                        .align(CenterHorizontally)
+                        .padding(top = 16.dp)
+                )
+            }
+        }
+    }
+}
+
+@Composable
+fun OnBoardingPage(
+    item: SplashCarouselState.Item,
+) {
+    Box {
+        /*
+        Image(
+            painterResource(id = item.pageBackground),
+            contentDescription = null,
+            modifier = Modifier.fillMaxSize()
+        )
+         */
+        Column(
+            modifier = Modifier.padding(vertical = 16.dp, horizontal = 32.dp)
+        ) {
+            Image(
+                painterResource(id = item.image),
+                contentDescription = null,
+                modifier = Modifier
+                    .align(CenterHorizontally)
+                    .size(192.dp)
+                    .padding(16.dp)
+            )
+            Text(
+                text = stringResource(id = item.title),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .align(CenterHorizontally)
+                    .padding(8.dp),
+                textAlign = TextAlign.Center,
+                fontWeight = FontWeight.Bold,
+                fontSize = 24.sp,
+            )
+            Text(
+                text = stringResource(id = item.body),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .align(CenterHorizontally),
+                textAlign = TextAlign.Center,
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingViewModel.kt b/features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingViewModel.kt
new file mode 100644
index 0000000000..a0d6ef359a
--- /dev/null
+++ b/features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingViewModel.kt
@@ -0,0 +1,19 @@
+package io.element.android.x.features.onboarding
+
+import com.airbnb.mvrx.MavericksViewModel
+
+class OnBoardingViewModel(initialState: OnBoardingViewState) :
+    MavericksViewModel<OnBoardingViewState>(initialState) {
+
+    fun handle(action: OnBoardingActions) {
+        when (action) {
+            is OnBoardingActions.GoToPage -> handleGoToPage(action)
+        }
+    }
+
+    private fun handleGoToPage(action: OnBoardingActions.GoToPage) {
+        setState {
+            copy(currentPage = action.page)
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingViewState.kt b/features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingViewState.kt
new file mode 100644
index 0000000000..0262bdd339
--- /dev/null
+++ b/features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingViewState.kt
@@ -0,0 +1,7 @@
+package io.element.android.x.features.onboarding
+
+import com.airbnb.mvrx.MavericksState
+
+data class OnBoardingViewState(
+    val currentPage: Int = 0,
+) : MavericksState
diff --git a/features/onboarding/src/main/java/io/element/android/x/features/onboarding/SplashCarouselState.kt b/features/onboarding/src/main/java/io/element/android/x/features/onboarding/SplashCarouselState.kt
new file mode 100644
index 0000000000..f9b0bb9dfb
--- /dev/null
+++ b/features/onboarding/src/main/java/io/element/android/x/features/onboarding/SplashCarouselState.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * 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 io.element.android.x.features.onboarding
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+
+data class SplashCarouselState(
+        val items: List<Item>
+) {
+    data class Item(
+            @StringRes val title: Int,
+            @StringRes val body: Int,
+            @DrawableRes val image: Int,
+            @DrawableRes val pageBackground: Int
+    )
+}
diff --git a/features/onboarding/src/main/java/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt b/features/onboarding/src/main/java/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt
new file mode 100644
index 0000000000..e80f591062
--- /dev/null
+++ b/features/onboarding/src/main/java/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt
@@ -0,0 +1,56 @@
+package io.element.android.x.features.onboarding
+
+import androidx.annotation.DrawableRes
+import io.element.android.x.element.resources.R as ElementR
+
+class SplashCarouselStateFactory() {
+    fun create(): SplashCarouselState {
+        val lightTheme = true
+        fun background(@DrawableRes lightDrawable: Int) =
+            if (lightTheme) lightDrawable else R.drawable.bg_color_background
+
+        fun hero(@DrawableRes lightDrawable: Int, @DrawableRes darkDrawable: Int) =
+            if (lightTheme) lightDrawable else darkDrawable
+        return SplashCarouselState(
+            listOf(
+                SplashCarouselState.Item(
+                    ElementR.string.ftue_auth_carousel_secure_title,
+                    ElementR.string.ftue_auth_carousel_secure_body,
+                    hero(
+                        R.drawable.ic_splash_conversations,
+                        R.drawable.ic_splash_conversations_dark
+                    ),
+                    background(R.drawable.bg_carousel_page_1)
+                ),
+                SplashCarouselState.Item(
+                    ElementR.string.ftue_auth_carousel_control_title,
+                    ElementR.string.ftue_auth_carousel_control_body,
+                    hero(R.drawable.ic_splash_control, R.drawable.ic_splash_control_dark),
+                    background(R.drawable.bg_carousel_page_2)
+                ),
+                SplashCarouselState.Item(
+                    ElementR.string.ftue_auth_carousel_encrypted_title,
+                    ElementR.string.ftue_auth_carousel_encrypted_body,
+                    hero(R.drawable.ic_splash_secure, R.drawable.ic_splash_secure_dark),
+                    background(R.drawable.bg_carousel_page_3)
+                ),
+                SplashCarouselState.Item(
+                    collaborationTitle(),
+                    ElementR.string.ftue_auth_carousel_workplace_body,
+                    hero(
+                        R.drawable.ic_splash_collaboration,
+                        R.drawable.ic_splash_collaboration_dark
+                    ),
+                    background(R.drawable.bg_carousel_page_4)
+                )
+            )
+        )
+    }
+
+    private fun collaborationTitle(): Int {
+        return when {
+            true -> R.string.cut_the_slack_from_teams
+            else -> ElementR.string.ftue_auth_carousel_workplace_title
+        }
+    }
+}
diff --git a/features/onboarding/src/main/res/drawable-hdpi/ic_splash_collaboration.webp b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_collaboration.webp
new file mode 100644
index 0000000000..7042e030d0
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_collaboration.webp differ
diff --git a/features/onboarding/src/main/res/drawable-hdpi/ic_splash_collaboration_dark.webp b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_collaboration_dark.webp
new file mode 100644
index 0000000000..6e4297183a
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_collaboration_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-hdpi/ic_splash_control.webp b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_control.webp
new file mode 100644
index 0000000000..82c04e402b
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_control.webp differ
diff --git a/features/onboarding/src/main/res/drawable-hdpi/ic_splash_control_dark.webp b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_control_dark.webp
new file mode 100644
index 0000000000..0d0c6ad78b
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_control_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-hdpi/ic_splash_conversations.webp b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_conversations.webp
new file mode 100644
index 0000000000..ee9604c1f1
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_conversations.webp differ
diff --git a/features/onboarding/src/main/res/drawable-hdpi/ic_splash_conversations_dark.webp b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_conversations_dark.webp
new file mode 100644
index 0000000000..c5cdf4e6fe
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_conversations_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-hdpi/ic_splash_secure.webp b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_secure.webp
new file mode 100644
index 0000000000..a880031ada
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_secure.webp differ
diff --git a/features/onboarding/src/main/res/drawable-hdpi/ic_splash_secure_dark.webp b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_secure_dark.webp
new file mode 100644
index 0000000000..65ef9f35ff
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-hdpi/ic_splash_secure_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_collaboration.webp b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_collaboration.webp
new file mode 100644
index 0000000000..d32d9f6026
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_collaboration.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_collaboration_dark.webp b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_collaboration_dark.webp
new file mode 100644
index 0000000000..04af9e2db4
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_collaboration_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_control.webp b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_control.webp
new file mode 100644
index 0000000000..972d91d5d0
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_control.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_control_dark.webp b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_control_dark.webp
new file mode 100644
index 0000000000..cbbea1ae87
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_control_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_conversations.webp b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_conversations.webp
new file mode 100644
index 0000000000..4057edfc66
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_conversations.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_conversations_dark.webp b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_conversations_dark.webp
new file mode 100644
index 0000000000..e3b7f22c1a
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_conversations_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_secure.webp b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_secure.webp
new file mode 100644
index 0000000000..b8c772bde2
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_secure.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_secure_dark.webp b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_secure_dark.webp
new file mode 100644
index 0000000000..d4c1f97652
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xhdpi/ic_splash_secure_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_collaboration.webp b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_collaboration.webp
new file mode 100644
index 0000000000..8feed1f9f9
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_collaboration.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_collaboration_dark.webp b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_collaboration_dark.webp
new file mode 100644
index 0000000000..02e44fbf44
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_collaboration_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_control.webp b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_control.webp
new file mode 100644
index 0000000000..99d4c4049d
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_control.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_control_dark.webp b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_control_dark.webp
new file mode 100644
index 0000000000..9afa384f27
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_control_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_conversations.webp b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_conversations.webp
new file mode 100644
index 0000000000..99a4c0c6f5
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_conversations.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_conversations_dark.webp b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_conversations_dark.webp
new file mode 100644
index 0000000000..361981eec7
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_conversations_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_secure.webp b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_secure.webp
new file mode 100644
index 0000000000..114421453e
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_secure.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_secure_dark.webp b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_secure_dark.webp
new file mode 100644
index 0000000000..737bcbdf17
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxhdpi/ic_splash_secure_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_collaboration.webp b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_collaboration.webp
new file mode 100644
index 0000000000..1dc31f6447
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_collaboration.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_collaboration_dark.webp b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_collaboration_dark.webp
new file mode 100644
index 0000000000..943f2b9ba8
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_collaboration_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_control.webp b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_control.webp
new file mode 100644
index 0000000000..9375475513
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_control.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_control_dark.webp b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_control_dark.webp
new file mode 100644
index 0000000000..905851dc26
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_control_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_conversations.webp b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_conversations.webp
new file mode 100644
index 0000000000..0d669312f5
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_conversations.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_conversations_dark.webp b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_conversations_dark.webp
new file mode 100644
index 0000000000..c5c4b2ccdd
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_conversations_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_secure.webp b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_secure.webp
new file mode 100644
index 0000000000..6a2a3fda56
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_secure.webp differ
diff --git a/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_secure_dark.webp b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_secure_dark.webp
new file mode 100644
index 0000000000..b792cb16ea
Binary files /dev/null and b/features/onboarding/src/main/res/drawable-xxxhdpi/ic_splash_secure_dark.webp differ
diff --git a/features/onboarding/src/main/res/drawable/bg_carousel_page_1.xml b/features/onboarding/src/main/res/drawable/bg_carousel_page_1.xml
new file mode 100644
index 0000000000..fa3aea4cab
--- /dev/null
+++ b/features/onboarding/src/main/res/drawable/bg_carousel_page_1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="@integer/rtl_mirror_flip"
+        android:endColor="#3372C7DA"
+        android:startColor="#33BBE7CF" />
+</shape>
\ No newline at end of file
diff --git a/features/onboarding/src/main/res/drawable/bg_carousel_page_2.xml b/features/onboarding/src/main/res/drawable/bg_carousel_page_2.xml
new file mode 100644
index 0000000000..f696823a6e
--- /dev/null
+++ b/features/onboarding/src/main/res/drawable/bg_carousel_page_2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="@integer/rtl_mirror_flip"
+        android:endColor="#33B972DA"
+        android:startColor="#3372C7DA" />
+</shape>
\ No newline at end of file
diff --git a/features/onboarding/src/main/res/drawable/bg_carousel_page_3.xml b/features/onboarding/src/main/res/drawable/bg_carousel_page_3.xml
new file mode 100644
index 0000000000..b114f9c804
--- /dev/null
+++ b/features/onboarding/src/main/res/drawable/bg_carousel_page_3.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="@integer/rtl_mirror_flip"
+        android:endColor="#330DBD8B"
+        android:startColor="#33B972DA" />
+</shape>
\ No newline at end of file
diff --git a/features/onboarding/src/main/res/drawable/bg_carousel_page_4.xml b/features/onboarding/src/main/res/drawable/bg_carousel_page_4.xml
new file mode 100644
index 0000000000..e8ee364431
--- /dev/null
+++ b/features/onboarding/src/main/res/drawable/bg_carousel_page_4.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="@integer/rtl_mirror_flip"
+        android:endColor="#33BBE7CF"
+        android:startColor="#330DBD8B" />
+</shape>
\ No newline at end of file
diff --git a/features/onboarding/src/main/res/drawable/bg_color_background.xml b/features/onboarding/src/main/res/drawable/bg_color_background.xml
new file mode 100644
index 0000000000..2542ff2b1d
--- /dev/null
+++ b/features/onboarding/src/main/res/drawable/bg_color_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?android:colorBackground" />
+</shape>
\ No newline at end of file
diff --git a/features/onboarding/src/main/res/drawable/bg_gradient_ftue_breaker.xml b/features/onboarding/src/main/res/drawable/bg_gradient_ftue_breaker.xml
new file mode 100644
index 0000000000..cdd4c20a4d
--- /dev/null
+++ b/features/onboarding/src/main/res/drawable/bg_gradient_ftue_breaker.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <gradient
+                android:angle="@integer/rtl_mirror_flip"
+                android:endColor="#55DFD1FF"
+                android:startColor="#55A5F2E0" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:angle="90"
+                android:endColor="@android:color/transparent"
+                android:startColor="?android:colorBackground" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/features/onboarding/src/main/res/values/strings.xml b/features/onboarding/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..e996efefaf
--- /dev/null
+++ b/features/onboarding/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="cut_the_slack_from_teams">Cut the slack from teams.</string>
+</resources>
\ No newline at end of file
diff --git a/features/onboarding/src/test/java/io/element/android/x/features/login/ExampleUnitTest.kt b/features/onboarding/src/test/java/io/element/android/x/features/login/ExampleUnitTest.kt
new file mode 100644
index 0000000000..bcc403cdbf
--- /dev/null
+++ b/features/onboarding/src/test/java/io/element/android/x/features/login/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package io.element.android.x.features.login
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3329cad5d3..955a773c86 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -63,6 +63,8 @@ accompanist_permission = { module = "com.google.accompanist:accompanist-permissi
 accompanist_material = { module = "com.google.accompanist:accompanist-navigation-material", version.ref = "accompanist" }
 accompanist_systemui = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
 accompanist_placeholder = { module = "com.google.accompanist:accompanist-placeholder-material", version.ref = "accompanist" }
+accompanist_pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" }
+accompanist_pagerindicator = { module = "com.google.accompanist:accompanist-pager-indicators", version.ref = "accompanist" }
 
 # Test
 test_junit = { module = "junit:junit", version.ref = "test_junit" }
diff --git a/libraries/core/src/main/java/io/element/android/x/core/data/StableCharSequence.kt b/libraries/core/src/main/java/io/element/android/x/core/data/StableCharSequence.kt
index 29e72c95f1..0475b41599 100644
--- a/libraries/core/src/main/java/io/element/android/x/core/data/StableCharSequence.kt
+++ b/libraries/core/src/main/java/io/element/android/x/core/data/StableCharSequence.kt
@@ -9,3 +9,5 @@ class StableCharSequence(val charSequence: CharSequence) {
     override fun hashCode() = hash
     override fun equals(other: Any?) = other is StableCharSequence && other.hash == hash
 }
+
+fun CharSequence.toStableCharSequence() = StableCharSequence(this)
diff --git a/libraries/core/src/main/res/values-ldrtl/integers.xml b/libraries/core/src/main/res/values-ldrtl/integers.xml
new file mode 100644
index 0000000000..88b587c96f
--- /dev/null
+++ b/libraries/core/src/main/res/values-ldrtl/integers.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <integer name="rtl_x_multiplier">-1</integer>
+    <integer name="rtl_mirror_flip">180</integer>
+
+</resources>
\ No newline at end of file
diff --git a/libraries/core/src/main/res/values/integers.xml b/libraries/core/src/main/res/values/integers.xml
new file mode 100644
index 0000000000..4b147b3a98
--- /dev/null
+++ b/libraries/core/src/main/res/values/integers.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <integer name="rtl_x_multiplier">1</integer>
+    <integer name="rtl_mirror_flip">0</integer>
+
+</resources>
\ No newline at end of file
diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorButton.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorButton.kt
index ee7c188f8c..70198103eb 100644
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorButton.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorButton.kt
@@ -7,11 +7,11 @@ import androidx.compose.ui.Modifier
 
 
 @Composable
-fun VectorButton(text: String, enabled: Boolean, onClick: () -> Unit, modifier: Modifier? = null) {
+fun VectorButton(text: String, enabled: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) {
     Button(
         onClick = onClick,
         enabled = enabled,
-        modifier = modifier ?: Modifier
+        modifier = modifier
     ) {
         Text(text = text)
     }
diff --git a/libraries/elementresources/src/main/res/values/strings.xml b/libraries/elementresources/src/main/res/values/strings.xml
index 450eb64849..f6168565b0 100644
--- a/libraries/elementresources/src/main/res/values/strings.xml
+++ b/libraries/elementresources/src/main/res/values/strings.xml
@@ -193,7 +193,7 @@
     <string name="initial_sync_start_importing_account_data">Initial sync:\nImporting account data</string>
 
     <string name="initial_sync_request_title">Initial sync request</string>
-    <string name="initial_sync_request_content">${app_name} needs to perform a clear cache to be up to date, for the following reason:\n%s\n\nNote that this action will restart the app and it may take some time.</string>
+    <string name="initial_sync_request_content">ElementX needs to perform a clear cache to be up to date, for the following reason:\n%s\n\nNote that this action will restart the app and it may take some time.</string>
     <string name="initial_sync_request_reason_unignored_users">- Some users have been unignored</string>
 
     <string name="event_status_sent_message">Message sent</string>
@@ -521,8 +521,8 @@
     <string name="start_voice_call_prompt_msg">Are you sure that you want to start a voice call?</string>
     <string name="start_video_call_prompt_msg">Are you sure that you want to start a video call?</string>
 
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="call_failed_no_connection">${app_name} Call Failed</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="call_failed_no_connection">ElementX Call Failed</string>
     <string name="call_failed_no_connection_description">Failed to establish real time connection.\nPlease ask the administrator of your homeserver to configure a TURN server in order for calls to work reliably.</string>
 
     <string name="call_select_sound_device">Select Sound Device</string>
@@ -584,8 +584,8 @@
     <!-- request again e2e key -->
     <string name="e2e_re_request_encryption_key">Re-request encryption keys from your other sessions.</string>
 
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="e2e_re_request_encryption_key_dialog_content">Please launch ${app_name} on another device that can decrypt the message so it can send the keys to this session.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="e2e_re_request_encryption_key_dialog_content">Please launch ElementX on another device that can decrypt the message so it can send the keys to this session.</string>
 
     <!-- Mels -->
     <plurals name="membership_changes">
@@ -605,8 +605,8 @@
     <string name="settings_call_category">Calls</string>
     <string name="settings_call_show_confirmation_dialog_title">Prevent accidental call</string>
     <string name="settings_call_show_confirmation_dialog_summary">Ask for confirmation before starting a call</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_call_ringtone_use_app_ringtone">Use default ${app_name} ringtone for incoming calls</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_call_ringtone_use_app_ringtone">Use default ElementX ringtone for incoming calls</string>
     <string name="settings_call_ringtone_title">Incoming call ringtone</string>
     <string name="settings_call_ringtone_dialog_title">Select ringtone for calls:</string>
 
@@ -643,12 +643,12 @@
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Information</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="permissions_rationale_msg_record_audio">${app_name} needs permission to access your microphone to perform audio calls.</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="permissions_rationale_msg_camera_and_audio">${app_name} needs permission to access your camera and your microphone to perform video calls.\n\nPlease allow access on the next pop-ups to be able to make the call.</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="permissions_rationale_msg_notification">${app_name} needs permission to display notifications. Notifications can display your messages, your invitations, etc.\n\nPlease allow access on the next pop-ups to be able to view notification.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="permissions_rationale_msg_record_audio">ElementX needs permission to access your microphone to perform audio calls.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="permissions_rationale_msg_camera_and_audio">ElementX needs permission to access your camera and your microphone to perform video calls.\n\nPlease allow access on the next pop-ups to be able to make the call.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="permissions_rationale_msg_notification">ElementX needs permission to display notifications. Notifications can display your messages, your invitations, etc.\n\nPlease allow access on the next pop-ups to be able to view notification.</string>
 
     <string name="permissions_denied_qr_code">To scan a QR code, you need to allow camera access.</string>
     <string name="permissions_denied_add_contact">Allow permission to access your contacts.</string>
@@ -868,7 +868,7 @@
     <string name="settings_troubleshoot_test_system_settings_title">System Settings.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Notifications are enabled in the system settings.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Notifications are disabled in the system settings.\nPlease check system settings.</string>
-    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} needs the permission to show notifications.\nPlease grant the permission.</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">ElementX needs the permission to show notifications.\nPlease grant the permission.</string>
     <string name="open_settings">Open Settings</string>
     <string name="grant_permission">Grant Permission</string>
 
@@ -879,8 +879,8 @@
 
     <string name="settings_troubleshoot_test_device_settings_title">Session Settings.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Notifications are enabled for this session.</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_troubleshoot_test_device_settings_failed">Notifications are not enabled for this session.\nPlease check the ${app_name} settings.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_troubleshoot_test_device_settings_failed">Notifications are not enabled for this session.\nPlease check the ElementX settings.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Enable</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Custom Settings.</string>
@@ -889,19 +889,19 @@
 
     <string name="settings_troubleshoot_test_play_services_title">Play Services Check</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK is available and up-to-date.</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_troubleshoot_test_play_services_failed">${app_name} uses Google Play Services to deliver push messages but it doesn’t seem to be configured correctly:\n%1$s</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_troubleshoot_test_play_services_failed">ElementX uses Google Play Services to deliver push messages but it doesn’t seem to be configured correctly:\n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Fix Play Services</string>
 
     <string name="settings_troubleshoot_test_fcm_title">Firebase Token</string>
     <string name="settings_troubleshoot_test_fcm_success">FCM token successfully retrieved:\n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Failed to retrieved FCM token:\n%1$s</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]\nThis error is out of control of ${app_name} and according to Google, this error indicates that the device has too many apps registered with FCM. The error only occurs in cases where there are extreme numbers of apps, so it should not affect the average user.</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]\nThis error is out of control of ${app_name}. It can occur for several reasons. Maybe it will work if you retry later, you can also check that Google Play Service is not restricted in data usage in the system settings, or that your device clock is correct, or it can happen on custom ROM.</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]\nThis error is out of control of ${app_name}. There is no Google account on the phone. Please open the account manager and add a Google account.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]\nThis error is out of control of ElementX and according to Google, this error indicates that the device has too many apps registered with FCM. The error only occurs in cases where there are extreme numbers of apps, so it should not affect the average user.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]\nThis error is out of control of ElementX. It can occur for several reasons. Maybe it will work if you retry later, you can also check that Google Play Service is not restricted in data usage in the system settings, or that your device clock is correct, or it can happen on custom ROM.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]\nThis error is out of control of ElementX. There is no Google account on the phone. Please open the account manager and add a Google account.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Add Account</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">Token Registration</string>
@@ -923,20 +923,20 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">Start on boot</string>
     <string name="settings_troubleshoot_test_service_boot_success">Service will start when the device is restarted.</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_troubleshoot_test_service_boot_failed">The service will not start when the device is restarted, you will not receive notifications until ${app_name} has been opened once.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_troubleshoot_test_service_boot_failed">The service will not start when the device is restarted, you will not receive notifications until ElementX has been opened once.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Enable Start on boot</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Check background restrictions</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_troubleshoot_test_bg_restricted_success">Background restrictions are disabled for ${app_name}. This test should be run using mobile data (no WIFI).\n%1$s</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Background restrictions are enabled for ${app_name}.\nWork that the app tries to do will be aggressively restricted while it is in the background, and this could affect notifications.\n%1$s</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_troubleshoot_test_bg_restricted_success">Background restrictions are disabled for ElementX. This test should be run using mobile data (no WIFI).\n%1$s</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Background restrictions are enabled for ElementX.\nWork that the app tries to do will be aggressively restricted while it is in the background, and this could affect notifications.\n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Disable restrictions</string>
 
     <string name="settings_troubleshoot_test_battery_title">Battery Optimization</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_troubleshoot_test_battery_success">${app_name} is not affected by Battery Optimization.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_troubleshoot_test_battery_success">ElementX is not affected by Battery Optimization.</string>
     <string name="settings_troubleshoot_test_battery_failed">If a user leaves a device unplugged and stationary for a period of time, with the screen off, the device enters Doze mode. This prevents apps from accessing the network and defers their jobs, syncs, and standard alarms. </string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignore Optimization</string>
 
@@ -976,11 +976,11 @@
     <string name="settings_background_sync">Background synchronization</string>
     <string name="settings_background_fdroid_sync_mode">Background Sync Mode</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimized for battery</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_background_fdroid_sync_mode_battery_description">${app_name} will sync in background in way that preserves the device’s limited resources (battery).\nDepending on your device resource state, the sync may be deferred by the operating system.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_background_fdroid_sync_mode_battery_description">ElementX will sync in background in way that preserves the device’s limited resources (battery).\nDepending on your device resource state, the sync may be deferred by the operating system.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimized for real time</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_background_fdroid_sync_mode_real_time_description">${app_name} will sync in background periodically at precise time (configurable).\nThis will impact radio and battery usage, there will be a permanent notification displayed stating that ${app_name} is listening for events.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_background_fdroid_sync_mode_real_time_description">ElementX will sync in background periodically at precise time (configurable).\nThis will impact radio and battery usage, there will be a permanent notification displayed stating that ElementX is listening for events.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">No background sync</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">You will not be notified of incoming messages when the app is in background.</string>
 
@@ -1059,12 +1059,12 @@
     <!-- analytics -->
     <string name="settings_analytics">Analytics</string>
     <string name="settings_opt_in_of_analytics">Send analytics data</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_opt_in_of_analytics_summary">${app_name} collects anonymous analytics to allow us to improve the application.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_opt_in_of_analytics_summary">ElementX collects anonymous analytics to allow us to improve the application.</string>
 
-    <string name="analytics_opt_in_title">Help improve ${app_name}</string>
+    <string name="analytics_opt_in_title">Help improve ElementX</string>
     <!-- The template will be replaced by the value of the resource analytics_opt_in_content_link -->
-    <string name="analytics_opt_in_content">Help us identify issues and improve ${app_name} by sharing anonymous usage data. To understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.\n\nYou can read all our terms %s.</string>
+    <string name="analytics_opt_in_content">Help us identify issues and improve ElementX by sharing anonymous usage data. To understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.\n\nYou can read all our terms %s.</string>
     <string name="analytics_opt_in_content_link">here</string>
     <string name="analytics_opt_in_list_item_1">We <b>don\'t</b> record or profile any account data</string>
     <string name="analytics_opt_in_list_item_2">We <b>don\'t</b> share information with third parties</string>
@@ -1083,7 +1083,7 @@
     <string name="settings_integration_allow">Allow integrations</string>
     <string name="settings_integration_manager">Integration manager</string>
 
-    <string name="legals_application_title">${app_name} policy</string>
+    <string name="legals_application_title">ElementX policy</string>
     <string name="legals_home_server_title">Your homeserver policy</string>
     <string name="legals_identity_server_title">Your identity server policy</string>
     <string name="legals_third_party_notices">Third party libraries</string>
@@ -1504,8 +1504,8 @@
 
     <!-- Key Backup -->
 
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="keys_backup_passphrase_not_empty_error_message">Please delete the passphrase if you want ${app_name} to generate a recovery key.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="keys_backup_passphrase_not_empty_error_message">Please delete the passphrase if you want ElementX to generate a recovery key.</string>
 
     <string name="keys_backup_setup_step1_title">Never lose encrypted messages</string>
     <string name="keys_backup_setup_step1_description">Messages in encrypted rooms are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.\n\nSecurely back up your keys to avoid losing them.</string>
@@ -1735,7 +1735,7 @@
 
     <string name="preference_help">Help</string>
     <string name="preference_help_title">Help and support</string>
-    <string name="preference_help_summary">Get help with using ${app_name}</string>
+    <string name="preference_help_summary">Get help with using ElementX</string>
     <string name="preference_versions">Versions</string>
     <string name="preference_system_settings">System settings</string>
 
@@ -1964,8 +1964,8 @@
     <string name="ftue_auth_carousel_secure_body">Secure and independent communication that gives you the same level of privacy as a face-to-face conversation in your own home.</string>
     <string name="ftue_auth_carousel_control_body">Choose where your conversations are kept, giving you control and independence. Connected via Matrix.</string>
     <string name="ftue_auth_carousel_encrypted_body">End-to-end encrypted and no phone number required. No ads or datamining.</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="ftue_auth_carousel_workplace_body">${app_name} is also great for the workplace. It’s trusted by the world’s most secure organisations.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="ftue_auth_carousel_workplace_body">ElementX is also great for the workplace. It’s trusted by the world’s most secure organisations.</string>
 
     <string name="ftue_auth_use_case_title">Who will you chat to the most?</string>
     <string name="ftue_auth_use_case_subtitle">We\'ll help you get connected</string>
@@ -2214,8 +2214,8 @@
     <string name="soft_logout_clear_data_dialog_title">Clear data</string>
     <string name="soft_logout_clear_data_dialog_content">Clear all data currently stored on this device?\nSign in again to access your account data and messages.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">You’ll lose access to secure messages unless you sign in to recover your encryption keys.</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="soft_logout_sso_not_same_user_error">The current session is for user %1$s and you provide credentials for user %2$s. This is not supported by ${app_name}.\nPlease first clear data, then sign in again on another account.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="soft_logout_sso_not_same_user_error">The current session is for user %1$s and you provide credentials for user %2$s. This is not supported by ElementX.\nPlease first clear data, then sign in again on another account.</string>
 
     <string name="permalink_malformed">Your matrix.to link was malformed</string>
     <string name="permalink_unsupported_groups">Cannot open this link: communities have been replaced by spaces</string>
@@ -2237,8 +2237,8 @@
     <string name="autocomplete_limited_results">Showing only the first results, type more letters…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Fail-fast</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_developer_mode_fail_fast_summary">${app_name} may crash more often when an unexpected error occurs</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_developer_mode_fail_fast_summary">ElementX may crash more often when an unexpected error occurs</string>
 
     <string name="settings_developer_mode_show_info_on_screen_title">Show debug info on screen</string>
     <string name="settings_developer_mode_show_info_on_screen_summary">Show some useful info to help debugging the application</string>
@@ -2346,10 +2346,10 @@
     <string name="room_member_open_or_create_dm">Direct message</string>
     <string name="room_member_jump_to_read_receipt">Jump to read receipt</string>
 
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="rendering_event_error_type_of_event_not_handled">${app_name} does not handle events of type \'%1$s\'</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="rendering_event_error_exception">${app_name} encountered an issue when rendering content of event with id \'%1$s\'</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="rendering_event_error_type_of_event_not_handled">ElementX does not handle events of type \'%1$s\'</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="rendering_event_error_exception">ElementX encountered an issue when rendering content of event with id \'%1$s\'</string>
 
     <string name="unignore">Unignore</string>
 
@@ -2475,8 +2475,8 @@
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Keys are already up to date!</string>
 
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="login_default_session_public_name">${app_name} Android</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="login_default_session_public_name">ElementX Android</string>
 
     <string name="settings_key_requests">Key Requests</string>
     <string name="settings_export_trail">Export Audit</string>
@@ -2607,15 +2607,15 @@
     <string name="error_saving_media_file">Could not save media file</string>
     <string name="change_password_summary">Set a new account password…</string>
 
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="use_other_session_content_description">Use the latest ${app_name} on your other devices, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} for Android, or another cross-signing capable Matrix client</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="app_desktop_web">${app_name} Web\n${app_name} Desktop</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="app_ios_android">${app_name} iOS\n${app_name} Android</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="use_other_session_content_description">Use the latest ElementX on your other devices, ElementX Web, ElementX Desktop, ElementX iOS, ElementX for Android, or another cross-signing capable Matrix client</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="app_desktop_web">ElementX Web\nElementX Desktop</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="app_ios_android">ElementX iOS\nElementX Android</string>
     <string name="or_other_mx_capable_client">or another cross-signing capable Matrix client</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="use_latest_app">Use the latest ${app_name} on your other devices:</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="use_latest_app">Use the latest ElementX on your other devices:</string>
     <string name="command_description_discard_session">Forces the current outbound group session in an encrypted room to be discarded</string>
     <string name="command_description_discard_session_not_handled">Only supported in encrypted rooms</string>
     <!-- first will be replaced by recovery_passphrase, second will be replaced by recovery_key-->
@@ -2670,10 +2670,10 @@
     <string name="inviting_users_to_room">Inviting users…</string>
     <string name="invite_users_to_room_title">Invite Users</string>
     <string name="invite_friends">Invite friends</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="invite_friends_text">Hey, talk to me on ${app_name}: %s</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="invite_friends_rich_title">🔐️ Join me on ${app_name}</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="invite_friends_text">Hey, talk to me on ElementX: %s</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="invite_friends_rich_title">🔐️ Join me on ElementX</string>
     <string name="invitation_sent_to_one_user">Invitation sent to %1$s</string>
     <string name="invitations_sent_to_two_users">Invitations sent to %1$s and %2$s</string>
     <string name="not_a_valid_qr_code">"It's not a valid matrix QR code"</string>
@@ -2694,13 +2694,13 @@
 
     <string name="open_terms_of">Open terms of %s</string>
     <string name="disconnect_identity_server_dialog_content">Disconnect from the identity server %s?</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="identity_server_error_outdated_identity_server">This identity server is outdated. ${app_name} support only API V2.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="identity_server_error_outdated_identity_server">This identity server is outdated. ElementX support only API V2.</string>
     <string name="identity_server_error_outdated_home_server">This operation is not possible. The homeserver is outdated.</string>
     <string name="identity_server_error_no_identity_server_configured">Please first configure an identity server.</string>
     <string name="identity_server_error_terms_not_signed">Please first accepts the terms of the identity server in the settings.</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="identity_server_error_bulk_sha256_not_supported">For your privacy, ${app_name} only supports sending hashed user email addresses and phone numbers.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="identity_server_error_bulk_sha256_not_supported">For your privacy, ElementX only supports sending hashed user email addresses and phone numbers.</string>
     <string name="identity_server_error_binding_error">The association has failed.</string>
     <string name="identity_server_error_no_current_binding_error">There is no current association with this identifier.</string>
     <string name="identity_server_user_consent_not_provided">The user consent has not been provided.</string>
@@ -2794,17 +2794,17 @@
     <string name="settings_security_pin_code_summary">If you want to reset your PIN, tap Forgot PIN to logout and reset.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Enable biometrics</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Enable device specific biometrics, like fingerprints and face recognition.</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN code is the only way to unlock ${app_name}.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN code is the only way to unlock ElementX.</string>
     <string name="settings_security_pin_code_use_biometrics_error">Could not enable biometric authentication.</string>
     <string name="settings_security_pin_code_notifications_title">Show content in notifications</string>
     <string name="settings_security_pin_code_notifications_summary_on">Show details like room names and message content.</string>
     <string name="settings_security_pin_code_notifications_summary_off">Only display number of unread messages in a simple notification.</string>
     <string name="settings_security_pin_code_grace_period_title">Require PIN after 2 minutes</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_security_pin_code_grace_period_summary_on">PIN code is required after 2 minutes of not using ${app_name}.</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="settings_security_pin_code_grace_period_summary_off">PIN code is required every time you open ${app_name}.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_security_pin_code_grace_period_summary_on">PIN code is required after 2 minutes of not using ElementX.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="settings_security_pin_code_grace_period_summary_off">PIN code is required every time you open ElementX.</string>
     <string name="settings_security_pin_code_change_pin_title">Change PIN</string>
     <string name="settings_security_pin_code_change_pin_summary">Change your current PIN</string>
     <string name="error_opening_banned_room">Can\'t open a room where you are banned from.</string>
@@ -2863,8 +2863,8 @@
     <string name="call_slide_to_end_conference">Slide to end the call</string>
 
     <string name="re_authentication_activity_title">Re-Authentication Needed</string>
-    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="re_authentication_default_confirm_text">${app_name} requires you to enter your credentials to perform this action.</string>
+    <!-- Note to translators: the translation MUST contain the string "ElementX", which will be replaced by the application name -->
+    <string name="re_authentication_default_confirm_text">ElementX requires you to enter your credentials to perform this action.</string>
     <string name="authentication_error">Failed to authenticate</string>
 
     <string name="a11y_screenshot">Screenshot</string>
@@ -3113,7 +3113,7 @@
 
     <string name="link_this_email_settings_link">Link this email address with your account</string>
     <!-- %s will be replaced by the value of link_this_email_settings_link and styled as a link -->
-    <string name="link_this_email_with_your_account">%s in Settings to receive invites directly in ${app_name}.</string>
+    <string name="link_this_email_with_your_account">%s in Settings to receive invites directly in ElementX.</string>
 
     <string name="labs_enable_latex_maths">Enable LaTeX mathematics</string>
     <string name="restart_the_application_to_apply_changes">Restart the application for the change to take effect.</string>
@@ -3184,8 +3184,8 @@
     <string name="location_share_live_select_duration_option_1">15 minutes</string>
     <string name="location_share_live_select_duration_option_2">1 hour</string>
     <string name="location_share_live_select_duration_option_3">8 hours</string>
-    <string name="location_not_available_dialog_title">${app_name} could not access your location</string>
-    <string name="location_not_available_dialog_content">${app_name} could not access your location. Please try again later.</string>
+    <string name="location_not_available_dialog_title">ElementX could not access your location</string>
+    <string name="location_not_available_dialog_content">ElementX could not access your location. Please try again later.</string>
     <string name="location_share_external">Open with</string>
     <string name="location_timeline_failed_to_load_map">Failed to load map</string>
     <string name="location_share_loading_map_error">Unable to load map\nThis home server may not be configured to display maps.</string>
@@ -3198,7 +3198,7 @@
     <string name="location_share_live_stop">Stop</string>
     <!-- Examples of usage: 6h 15min 30sec left/15min 30sec left/30 sec left-->
     <string name="location_share_live_remaining_time">%1$s left</string>
-    <string name="live_location_sharing_notification_title">${app_name} Live Location</string>
+    <string name="live_location_sharing_notification_title">ElementX Live Location</string>
     <string name="live_location_sharing_notification_description">Location sharing is in progress</string>
     <string name="labs_enable_live_location">Enable Live Location Sharing</string>
     <string name="labs_enable_live_location_summary">Temporary implementation: locations persist in room history</string>
@@ -3241,7 +3241,7 @@
     <string name="room_message_autocomplete_notification">Room notification</string>
 
     <!-- Screen sharing -->
-    <string name="screen_sharing_notification_title">${app_name} Screen Sharing</string>
+    <string name="screen_sharing_notification_title">ElementX Screen Sharing</string>
     <string name="screen_sharing_notification_description">Screen sharing is in progress</string>
 
     <string name="unifiedpush_getdistributors_dialog_title">Choose how to receive notifications</string>
@@ -3388,14 +3388,14 @@
     <!-- Note to translators: for RTL languages, Spaces will be at the bottom left. Please translate "bottom-left" instead of "bottom-right". Thanks!-->
     <string name="home_empty_space_no_rooms_message">Spaces are a new way to group rooms and people. Add an existing room, or create a new one, using the bottom-right button.</string>
     <!--  Note to translators: %s will be replaces with current user displayname -->
-    <string name="home_empty_no_rooms_title">Welcome to ${app_name},\n%s.</string>
+    <string name="home_empty_no_rooms_title">Welcome to ElementX,\n%s.</string>
     <string name="home_empty_no_rooms_message">The all-in-one secure chat app for teams, friends and organisations. Create a chat, or join an existing room, to get started.</string>
     <string name="home_empty_no_unreads_title">Nothing to report.</string>
     <string name="home_empty_no_unreads_message">This is where your unread messages will show up, when you have some.</string>
 
     <string name="onboarding_new_app_layout_welcome_title">Welcome to a new view!</string>
     <!--    Note to translators: for RTL languages, menu will be at the bottom left. Please translate "bottom-left" instead of "bottom-right". Thanks!-->
-    <string name="onboarding_new_app_layout_welcome_message">To simplify your ${app_name}, tabs are now optional. Manage them using the top-right menu.</string>
+    <string name="onboarding_new_app_layout_welcome_message">To simplify your ElementX, tabs are now optional. Manage them using the top-right menu.</string>
     <string name="onboarding_new_app_layout_spaces_title">Access Spaces</string>
     <!--    Note to translators: for RTL languages, Spaces will be at the bottom left. Please translate "bottom-left" instead of "bottom-right". Thanks!-->
     <string name="onboarding_new_app_layout_spaces_message">Access your Spaces (bottom-right) faster and easier than ever before.</string>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 66d4dabfa7..e91979bfdb 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -22,6 +22,7 @@ include(":libraries:core")
 include(":libraries:matrix")
 include(":libraries:textcomposer")
 include(":libraries:elementresources")
+include(":features:onboarding")
 include(":features:login")
 include(":features:roomlist")
 include(":features:messages")