diff --git a/app/build.gradle b/app/build.gradle
index fbaed4b1d1..21742e904e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,6 +47,7 @@ android {
 }
 
 dependencies {
+    implementation project(":libraries:ui:theme")
 
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation "androidx.compose.ui:ui:$compose_version"
diff --git a/libraries/ui/theme/.gitignore b/libraries/ui/theme/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/libraries/ui/theme/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/libraries/ui/theme/build.gradle b/libraries/ui/theme/build.gradle
new file mode 100644
index 0000000000..de349eb4b9
--- /dev/null
+++ b/libraries/ui/theme/build.gradle
@@ -0,0 +1,53 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'io.element.android.x.theme'
+    compileSdk 33
+
+    defaultConfig {
+        minSdk 29
+        targetSdk 33
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    buildFeatures {
+        compose true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion compose_version
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.google.android.material:material:1.6.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+    implementation "androidx.compose.ui:ui:$compose_version"
+    implementation 'androidx.compose.material3:material3:1.0.0-rc01'
+    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
+    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
+}
\ No newline at end of file
diff --git a/libraries/ui/theme/consumer-rules.pro b/libraries/ui/theme/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/libraries/ui/theme/proguard-rules.pro b/libraries/ui/theme/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/libraries/ui/theme/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.
+#
+# 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/libraries/ui/theme/src/androidTest/java/io/element/android/x/theme/ExampleInstrumentedTest.kt b/libraries/ui/theme/src/androidTest/java/io/element/android/x/theme/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000000..ab7c61d2d4
--- /dev/null
+++ b/libraries/ui/theme/src/androidTest/java/io/element/android/x/theme/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package io.element.android.x.theme
+
+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.theme.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/libraries/ui/theme/src/main/AndroidManifest.xml b/libraries/ui/theme/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..a5918e68ab
--- /dev/null
+++ b/libraries/ui/theme/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/app/src/main/java/io/element/android/x/ui/theme/Color.kt b/libraries/ui/theme/src/main/java/io/element/android/x/ui/theme/Color.kt
similarity index 100%
rename from app/src/main/java/io/element/android/x/ui/theme/Color.kt
rename to libraries/ui/theme/src/main/java/io/element/android/x/ui/theme/Color.kt
diff --git a/app/src/main/java/io/element/android/x/ui/theme/Theme.kt b/libraries/ui/theme/src/main/java/io/element/android/x/ui/theme/Theme.kt
similarity index 100%
rename from app/src/main/java/io/element/android/x/ui/theme/Theme.kt
rename to libraries/ui/theme/src/main/java/io/element/android/x/ui/theme/Theme.kt
diff --git a/app/src/main/java/io/element/android/x/ui/theme/Type.kt b/libraries/ui/theme/src/main/java/io/element/android/x/ui/theme/Type.kt
similarity index 100%
rename from app/src/main/java/io/element/android/x/ui/theme/Type.kt
rename to libraries/ui/theme/src/main/java/io/element/android/x/ui/theme/Type.kt
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/libraries/ui/theme/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to libraries/ui/theme/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/libraries/ui/theme/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_background.xml
rename to libraries/ui/theme/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/libraries/ui/theme/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to libraries/ui/theme/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/libraries/ui/theme/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to libraries/ui/theme/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/libraries/ui/theme/src/main/res/mipmap-hdpi/ic_launcher.webp
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher.webp
rename to libraries/ui/theme/src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/libraries/ui/theme/src/main/res/mipmap-hdpi/ic_launcher_round.webp
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
rename to libraries/ui/theme/src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/libraries/ui/theme/src/main/res/mipmap-mdpi/ic_launcher.webp
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher.webp
rename to libraries/ui/theme/src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/libraries/ui/theme/src/main/res/mipmap-mdpi/ic_launcher_round.webp
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
rename to libraries/ui/theme/src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/libraries/ui/theme/src/main/res/mipmap-xhdpi/ic_launcher.webp
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher.webp
rename to libraries/ui/theme/src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/libraries/ui/theme/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
rename to libraries/ui/theme/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/libraries/ui/theme/src/main/res/mipmap-xxhdpi/ic_launcher.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
rename to libraries/ui/theme/src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/libraries/ui/theme/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
rename to libraries/ui/theme/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/libraries/ui/theme/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
rename to libraries/ui/theme/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/libraries/ui/theme/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
rename to libraries/ui/theme/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/values/colors.xml b/libraries/ui/theme/src/main/res/values/colors.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to libraries/ui/theme/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/strings.xml b/libraries/ui/theme/src/main/res/values/strings.xml
similarity index 100%
rename from app/src/main/res/values/strings.xml
rename to libraries/ui/theme/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/themes.xml b/libraries/ui/theme/src/main/res/values/themes.xml
similarity index 100%
rename from app/src/main/res/values/themes.xml
rename to libraries/ui/theme/src/main/res/values/themes.xml
diff --git a/app/src/main/res/xml/backup_rules.xml b/libraries/ui/theme/src/main/res/xml/backup_rules.xml
similarity index 100%
rename from app/src/main/res/xml/backup_rules.xml
rename to libraries/ui/theme/src/main/res/xml/backup_rules.xml
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/libraries/ui/theme/src/main/res/xml/data_extraction_rules.xml
similarity index 100%
rename from app/src/main/res/xml/data_extraction_rules.xml
rename to libraries/ui/theme/src/main/res/xml/data_extraction_rules.xml
diff --git a/libraries/ui/theme/src/test/java/io/element/android/x/theme/ExampleUnitTest.kt b/libraries/ui/theme/src/test/java/io/element/android/x/theme/ExampleUnitTest.kt
new file mode 100644
index 0000000000..fac031be5c
--- /dev/null
+++ b/libraries/ui/theme/src/test/java/io/element/android/x/theme/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package io.element.android.x.theme
+
+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/settings.gradle b/settings.gradle
index 85078499a6..a795454907 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,3 +14,4 @@ dependencyResolutionManagement {
 }
 rootProject.name = "ElementX"
 include ':app'
+include ':libraries:ui:theme'