diff --git a/.circleci/config.yml b/.circleci/config.yml
index d9867073..42c583e1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+          key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum  "app/build.gradle.kts" }}
       #      - run:
       #         name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
       #         command: sudo chmod +x ./gradlew
@@ -22,7 +22,7 @@ jobs:
       - save_cache:
           paths:
             - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+          key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum  "app/build.gradle.kts" }}
       - run:
           name: Run Tests
           command: ./gradlew lint test
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index d44d3f25..00000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,212 +0,0 @@
-apply plugin: "com.android.application"
-apply plugin: "kotlin-android"
-apply plugin: "org.jetbrains.kotlin.android"
-
-android {
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
-    }
-
-    signingConfigs {
-        debug {
-            def props = new Properties()
-            def localPropsFile = rootProject.file('local.properties')
-            if (localPropsFile.exists()) {
-                localPropsFile.withInputStream { props.load(it) }
-            }
-
-            storeFile = file(props['storeFile'] ?: "")
-            storePassword = props['storePassword'] ?: ""
-            keyAlias = props['keyAlias'] ?: ""
-            keyPassword = props['keyPassword'] ?: ""
-        }
-    }
-
-    compileSdk 34
-    defaultConfig {
-        applicationId "net.opendasharchive.openarchive"
-        minSdkVersion 29
-        //noinspection OldTargetApi
-        targetSdkVersion 34
-        versionCode 30005
-        versionName "0.7.7"
-        archivesBaseName = "Save-$versionName"
-        multiDexEnabled true
-        vectorDrawables.useSupportLibrary = true
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    flavorDimensions += "free"
-    buildTypes {
-        release {
-            signingConfig signingConfigs.debug
-            minifyEnabled false
-            shrinkResources false
-            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-        }
-
-        debug {
-            signingConfig signingConfigs.debug
-        }
-    }
-    packagingOptions {
-        resources {
-            excludes += ["META-INF/LICENSE.txt", "META-INF/NOTICE.txt", "META-INF/LICENSE", "META-INF/NOTICE", "META-INF/DEPENDENCIES", "LICENSE.txt"]
-        }
-    }
-    productFlavors {
-        releaseflavor {
-            dimension "free"
-            applicationId "net.opendasharchive.openarchive.release"
-        }
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        viewBinding true
-        buildConfig true
-        compose true
-    }
-
-    lint {
-        abortOnError false
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion "1.5.13"
-    }
-
-    namespace "net.opendasharchive.openarchive"
-}
-
-dependencies {
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.9.23"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
-
-//    implementation "androidx.core:core-ktx:1.13.1"
-    implementation "androidx.recyclerview:recyclerview:1.3.2"
-    implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.biometric:biometric:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-    implementation "androidx.legacy:legacy-support-v4:1.0.0"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
-    implementation "androidx.preference:preference-ktx:1.2.1"
-    implementation "androidx.work:work-runtime:2.9.0"
-    implementation "androidx.work:work-runtime-ktx:2.9.0"
-    implementation "androidx.work:work-testing:2.9.0"
-
-    implementation "androidx.compose.ui:ui:1.6.7"
-    implementation "androidx.compose.material3:material3:1.2.1"
-    implementation "androidx.compose.foundation:foundation:1.6.7"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.6.7"
-    implementation "androidx.activity:activity-compose:1.9.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
-
-    implementation "io.insert-koin:koin-core:3.5.3"
-    implementation "io.insert-koin:koin-android:3.5.3"
-    implementation "io.insert-koin:koin-androidx-compose:3.5.3"
-
-    implementation "com.github.satyan:sugar:1.5"
-
-    implementation "com.google.code.gson:gson:2.10.1"
-    implementation "com.squareup.okhttp3:okhttp:4.12.0"
-
-    // adding web dav support: https://github.com/thegrizzlylabs/sardine-android'
-    implementation "com.github.guardianproject:sardine-android:89f7eae512"
-    
-    implementation "com.google.android.material:material:1.11.0"
-    implementation "androidx.compose.material:material-icons-extended:1.6.7"
-
-    implementation "com.github.bumptech.glide:glide:4.16.0"
-    annotationProcessor "com.github.bumptech.glide:compiler:4.16.0"
-    implementation "com.github.derlio:audio-waveform:v1.0.1"
-    implementation "com.github.esafirm:android-image-picker:3.0.0"
-    implementation "com.facebook.fresco:fresco:3.5.0"
-    implementation "com.squareup.picasso:picasso:2.5.2"
-
-    implementation "com.github.abdularis:circularimageview:1.4"
-
-    implementation "org.cleaninsights.sdk:clean-insights-sdk:2.8.0"
-    implementation "info.guardianproject.netcipher:netcipher:2.2.0-alpha"
-
-    //from here: https://github.com/guardianproject/proofmode
-    implementation("org.proofmode:android-libproofmode:1.0.27") {
-
-        transitive = false
-
-        exclude group: "org.bitcoinj"
-        exclude group: "com.google.protobuf"
-        exclude group: "org.slf4j"
-        exclude group: "net.jcip"
-        exclude group: "commons-cli"
-        exclude group: "org.json"
-        exclude group: "com.google.guava"
-        exclude group: "com.google.guava", module: "guava-jdk5"
-        exclude group: "com.google.code.findbugs", module: "annotations"
-        exclude group: "com.squareup.okio", module: "okio"
-    }
-
-    implementation "com.google.guava:guava:31.0.1-jre"
-    implementation "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"
-
-    implementation "org.bouncycastle:bcpkix-jdk15to18:1.72"
-    implementation "org.bouncycastle:bcprov-jdk15to18:1.72"
-    api "org.bouncycastle:bcpg-jdk15to18:1.71"
-
-    implementation "com.tbuonomo:dotsindicator:5.0"
-    implementation "com.guolindev.permissionx:permissionx:1.6.4"
-
-    implementation "com.jakewharton.timber:timber:5.0.1"
-
-    // Google Drive API
-    implementation "com.google.android.gms:play-services-auth:21.1.1"
-    implementation "com.google.http-client:google-http-client-gson:1.42.1"
-    implementation "com.google.api-client:google-api-client-android:1.26.0"
-    implementation "com.google.apis:google-api-services-drive:v3-rev136-1.25.0"
-
-    // Tor
-    implementation "info.guardianproject:tor-android:0.4.7.14"
-    implementation "info.guardianproject:jtorctl:0.4.5.7"
-
-    // New Play libraries
-    implementation "com.google.android.play:asset-delivery:2.2.2"
-    implementation "com.google.android.play:asset-delivery-ktx:2.2.2"
-
-    implementation "com.google.android.play:feature-delivery:2.1.0"
-    implementation "com.google.android.play:feature-delivery-ktx:2.1.0"
-
-    implementation "com.google.android.play:review:2.0.1"
-    implementation "com.google.android.play:review-ktx:2.0.1"
-
-    implementation "com.google.android.play:app-update:2.1.0"
-    implementation "com.google.android.play:app-update-ktx:2.1.0"
-
-    // Tests
-    testImplementation "junit:junit:4.13.2"
-    testImplementation "org.robolectric:robolectric:4.7.3"
-    androidTestImplementation "androidx.test.ext:junit:1.1.5"
-    androidTestImplementation "androidx.test:runner:1.5.2"
-
-    // Pretty Logging
-    implementation "com.orhanobut:logger:2.2.0"
-}
-
-configurations {
-    all*.exclude group: "com.google.guava", module: "listenablefuture"
-}
-
-/**
- testdroid {username '$bbusername'
- password '$bbpassword'
- deviceGroup 'gpdevices'
- mode "FULL_RUN"
- projectName "OASave"}**/
-
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 00000000..eb97e32c
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,262 @@
+import java.util.Properties
+
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
+    id("org.jetbrains.kotlin.plugin.serialization")
+    id("com.google.devtools.ksp")
+}
+android {
+
+    compileSdk = 34
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    defaultConfig {
+        applicationId = "net.opendasharchive.openarchive"
+        minSdk = 29
+        targetSdk = 34
+        versionCode = 30006
+        versionName = "0.7.8"
+        multiDexEnabled = true
+        vectorDrawables.useSupportLibrary = true
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    base {
+        archivesName.set("save-${project.version}")
+    }
+
+    buildFeatures {
+        viewBinding = true
+        buildConfig = true
+        compose = true
+    }
+
+    buildTypes {
+
+        getByName("release") {
+            signingConfig = signingConfigs.getByName("debug")
+            isMinifyEnabled = false
+            isShrinkResources = false
+            applicationIdSuffix = ".release"
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+        }
+
+        getByName("debug") {
+            signingConfig = signingConfigs.getByName("debug")
+            applicationIdSuffix = ".debug"
+            isMinifyEnabled = false
+        }
+    }
+
+    signingConfigs {
+        getByName("debug") {
+            val props = Properties()
+            val localPropsFile = rootProject.file("local.properties")
+            if (localPropsFile.exists()) {
+                localPropsFile.inputStream().use { props.load(it) }
+            }
+
+            storeFile = file(props["storeFile"] as? String ?: "")
+            storePassword = props["storePassword"] as? String ?: ""
+            keyAlias = props["keyAlias"] as? String ?: ""
+            keyPassword = props["keyPassword"] as? String ?: ""
+        }
+    }
+
+    packaging {
+        resources {
+            excludes.addAll(
+                listOf(
+                    "META-INF/LICENSE.txt", "META-INF/NOTICE.txt", "META-INF/LICENSE",
+                    "META-INF/NOTICE", "META-INF/DEPENDENCIES", "LICENSE.txt"
+                )
+            )
+        }
+    }
+
+    lint {
+        abortOnError = false
+    }
+
+    namespace = "net.opendasharchive.openarchive"
+
+    configurations.all {
+        resolutionStrategy {
+            force("org.bouncycastle:bcprov-jdk15to18:1.72")
+            exclude(group = "org.bouncycastle", module = "bcprov-jdk15on")
+        }
+    }
+}
+
+dependencies {
+
+    // Core Kotlin and Coroutines
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
+
+
+    // AndroidX Libraries
+    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("androidx.recyclerview:recyclerview:1.3.2")
+    implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.0")
+    implementation("androidx.constraintlayout:constraintlayout-compose:1.1.0")
+    implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")
+    implementation("androidx.core:core-splashscreen:1.0.1")
+
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.7")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.8.5")
+    implementation("androidx.navigation:navigation-ui-ktx:2.8.5")
+
+    implementation("androidx.preference:preference-ktx:1.2.1")
+    implementation("androidx.biometric:biometric:1.1.0")
+    implementation("androidx.work:work-runtime-ktx:2.9.1")
+    implementation("androidx.security:security-crypto-ktx:1.1.0-alpha06")
+
+    // Compose Preferences
+    implementation("me.zhanghai.compose.preference:library:1.1.1")
+
+    // Material Design
+    implementation("com.google.android.material:material:1.12.0")
+
+    // AndroidX SwipeRefreshLayout
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
+
+    // Compose Libraries
+    implementation("androidx.compose.ui:ui:1.7.6")
+    implementation("androidx.compose.foundation:foundation:1.7.6")
+    implementation("androidx.compose.material3:material3:1.3.1")
+    implementation("androidx.compose.ui:ui-tooling-preview:1.7.6")
+    implementation("androidx.activity:activity-compose:1.9.3")
+    implementation("androidx.compose.material:material-icons-extended:1.7.6")
+
+    // Navigation
+    implementation("androidx.navigation:navigation-compose:2.8.5")
+
+    // Preference
+    implementation("androidx.preference:preference-ktx:1.2.1")
+
+    // Dependency Injection
+    implementation("io.insert-koin:koin-core:4.1.0-Beta5")
+    implementation("io.insert-koin:koin-android:4.1.0-Beta5")
+    implementation("io.insert-koin:koin-androidx-compose:4.1.0-Beta5")
+
+    // Image Libraries
+    implementation("com.github.bumptech.glide:glide:4.16.0")
+    annotationProcessor("com.github.bumptech.glide:compiler:4.16.0")
+    implementation("com.github.esafirm:android-image-picker:3.0.0")
+    implementation("com.squareup.picasso:picasso:2.5.2")
+    implementation("io.coil-kt:coil-compose:2.7.0")
+    implementation("io.coil-kt:coil-video:2.7.0")
+
+    // Networking and Data
+    // Networking
+    implementation("com.squareup.retrofit2:retrofit:2.11.0")
+    implementation("com.squareup.retrofit2:converter-gson:2.11.0")
+    implementation("com.google.code.gson:gson:2.11.0")
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
+    implementation("com.github.guardianproject:sardine-android:89f7eae512")
+
+    // Utility Libraries
+    implementation("com.jakewharton.timber:timber:5.0.1")
+    implementation("com.orhanobut:logger:2.2.0")
+    implementation("com.github.abdularis:circularimageview:1.4")
+    implementation("com.tbuonomo:dotsindicator:5.1.0")
+    implementation("com.guolindev.permissionx:permissionx:1.6.4")
+
+    // Barcode Scanning
+    implementation("com.google.zxing:core:3.4.1")
+    implementation("com.journeyapps:zxing-android-embedded:4.2.0")
+
+    // Security and Encryption
+    implementation("org.bouncycastle:bcpkix-jdk15to18:1.72")
+    implementation("org.bouncycastle:bcprov-jdk15to18:1.72")
+    api("org.bouncycastle:bcpg-jdk15to18:1.71")
+
+    // Google Play Services
+    implementation("com.google.android.gms:play-services-auth:21.3.0")
+//    implementation("com.google.android.play:core-ktx:1.8.1")
+//    implementation("com.google.android.play:asset-delivery-ktx:2.3.0")
+//    implementation("com.google.android.play:feature-delivery-ktx:2.1.0")
+//    implementation("com.google.android.play:review-ktx:2.0.2")
+//    implementation("com.google.android.play:app-update-ktx:2.1.0")
+
+    // Google Drive API
+    implementation("com.google.http-client:google-http-client-gson:1.42.3")
+    implementation("com.google.api-client:google-api-client-android:1.26.0")
+    implementation("com.google.apis:google-api-services-drive:v3-rev136-1.25.0")
+
+    // Tor Libraries
+    implementation("info.guardianproject:tor-android:0.4.7.14")
+    implementation("info.guardianproject:jtorctl:0.4.5.7")
+
+    implementation("org.bitcoinj:bitcoinj-core:0.16.2")
+    implementation("com.eclipsesource.j2v8:j2v8:6.2.1@aar")
+
+    // ProofMode //from here: https://github.com/guardianproject/proofmode
+    implementation("org.proofmode:android-libproofmode:1.0.26") {
+        //transitive = false
+        exclude(group = "org.bitcoinj")
+        exclude(group = "com.google.protobuf")
+        exclude(group = "org.slf4j")
+        exclude(group = "net.jcip")
+        exclude(group = "commons-cli")
+        exclude(group = "org.json")
+        exclude(group = "com.google.guava")
+        exclude(group = "com.google.guava", module = "guava-jdk5")
+        exclude(group = "com.google.code.findbugs", module = "annotations")
+        exclude(group = "com.squareup.okio", module = "okio")
+    }
+
+    // Guava Conflicts
+    implementation("com.google.guava:guava:31.0.1-jre")
+    implementation("com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava")
+
+
+    implementation("com.github.satyan:sugar:1.5")
+
+
+    // adding web dav support: https://github.com/thegrizzlylabs/sardine-android'
+    implementation("com.github.guardianproject:sardine-android:89f7eae512")
+
+
+    implementation("com.github.derlio:audio-waveform:v1.0.1")
+
+
+    implementation("org.cleaninsights.sdk:clean-insights-sdk:2.8.0")
+    implementation("info.guardianproject.netcipher:netcipher:2.2.0-alpha")
+
+
+    // Tests
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("org.robolectric:robolectric:4.10.3")
+    androidTestImplementation("androidx.test.ext:junit:1.2.1")
+    androidTestImplementation("androidx.test:runner:1.6.2")
+    testImplementation("androidx.work:work-testing:2.9.1")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.7.6")
+}
+
+configurations.all {
+    exclude(group = "com.google.guava", module = "listenablefuture")
+}
+
+/**
+testdroid {username '$bbusername'
+password '$bbpassword'
+deviceGroup 'gpdevices'
+mode "FULL_RUN"
+projectName "OASave"}**/
+
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 12125fc7..a6e7fc29 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -2,7 +2,7 @@
 # By default, the flags in this file are appended to flags specified
 # in /home/josh/android-sdks/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
+# directive in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4d250a93..dbdbb8d1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -52,7 +52,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.NoActionBar"
+        android:theme="@style/Theme.SaveApp.Starting"
         tools:ignore="UnusedAttribute,LockedOrientationActivity"
         tools:replace="android:icon,android:allowBackup">
         <!-- task affinity lets us define within which 'task' does a activity belong to.
@@ -64,14 +64,14 @@
             android:exported="false"
             android:label="@string/browse_existing"
             android:taskAffinity=""
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".upload.UploadManagerActivity"
             android:exported="false"
             android:label="@string/title_activity_upload_manager"
             android:taskAffinity=""
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".features.main.MainActivity"
@@ -109,43 +109,58 @@
             android:name=".services.webdav.WebDavActivity"
             android:label="@string/title_activity_login"
             android:taskAffinity=""
+            android:theme="@style/SaveAppTheme.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
 
         <activity
             android:name=".features.internetarchive.presentation.InternetArchiveActivity"
             android:label="@string/title_activity_login"
-            android:taskAffinity="" />
+            android:taskAffinity=""
+            android:theme="@style/SaveAppTheme.NoActionBar" />
+
+        <activity
+            android:name=".services.gdrive.GDriveActivity"
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
-        <activity android:name=".services.gdrive.GDriveActivity" />
+        <activity
+            android:name=".features.settings.SpacesActivity"
+            android:exported="true"
+            android:label="@string/servers"
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".features.settings.FoldersActivity"
             android:exported="false"
-            android:label="@string/folders" />
+            android:label="@string/folders"
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".features.settings.GeneralSettingsActivity"
             android:exported="false"
             android:label="@string/general"
-            android:taskAffinity="" />
+            android:taskAffinity=""
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".features.settings.ProofModeSettingsActivity"
             android:exported="false"
             android:label="@string/proofmode"
-            android:taskAffinity="" />
+            android:taskAffinity=""
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".features.media.PreviewActivity"
             android:exported="false"
             android:label="@string/preview_media"
-            android:taskAffinity="" />
+            android:taskAffinity=""
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".features.media.ReviewActivity"
             android:exported="false"
             android:label="@string/edit_media_info"
             android:taskAffinity=""
+            android:theme="@style/SaveAppTheme.NoActionBar"
             android:windowSoftInputMode="stateHidden" />
 
         <activity
@@ -153,45 +168,50 @@
             android:exported="false"
             android:label="@string/title_activity_first_start"
             android:taskAffinity=""
+            android:theme="@style/SaveAppTheme.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
 
         <activity
             android:name=".features.onboarding.Onboarding23Activity"
             android:exported="false"
             android:noHistory="true"
-            android:taskAffinity="" />
+            android:taskAffinity=""
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".features.onboarding.Onboarding23InstructionsActivity"
             android:exported="false"
-            android:taskAffinity="" />
+            android:taskAffinity=""
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".features.folders.CreateNewFolderActivity"
             android:label="@string/new_folder"
             android:taskAffinity=""
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".features.folders.AddFolderActivity"
             android:taskAffinity=""
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".features.settings.EditFolderActivity"
             android:taskAffinity=""
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".features.settings.ConsentActivity"
             android:label="@string/health_checks"
-            android:taskAffinity="" />
+            android:taskAffinity=""
+            android:theme="@style/SaveAppTheme.NoActionBar" />
 
         <activity
             android:name=".features.settings.passcode.passcode_setup.PasscodeSetupActivity"
             android:label="@string/passcode_setup"
             android:screenOrientation="portrait"
             android:taskAffinity=""
+            android:theme="@style/SaveAppTheme.NoActionBar"
             android:windowSoftInputMode="stateHidden" />
 
         <activity
@@ -200,6 +220,7 @@
             android:label="@string/passcode_entry"
             android:noHistory="true"
             android:screenOrientation="portrait"
+            android:theme="@style/SaveAppTheme.NoActionBar"
             android:windowSoftInputMode="stateHidden" />
 
         <meta-data
diff --git a/app/src/main/java/net/opendasharchive/openarchive/FolderAdapter.kt b/app/src/main/java/net/opendasharchive/openarchive/FolderAdapter.kt
index da8062a1..9428aee2 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/FolderAdapter.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/FolderAdapter.kt
@@ -2,13 +2,14 @@ package net.opendasharchive.openarchive
 
 import android.content.Context
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import net.opendasharchive.openarchive.databinding.RvSimpleRowBinding
+import net.opendasharchive.openarchive.databinding.RvFoldersRowBinding
 import net.opendasharchive.openarchive.db.Project
 import java.lang.ref.WeakReference
 
@@ -16,37 +17,65 @@ interface FolderAdapterListener {
 
     fun projectClicked(project: Project)
 
+    fun projectEdit(project: Project)
+
     fun getSelectedProject(): Project?
 }
 
-class FolderAdapter(listener: FolderAdapterListener?) : ListAdapter<Project, FolderAdapter.ViewHolder>(DIFF_CALLBACK), FolderAdapterListener {
+class FolderAdapter(
+    private val context: Context,
+    listener: FolderAdapterListener?,
+    val isArchived: Boolean = false
+) : ListAdapter<Project, FolderAdapter.ViewHolder>(DIFF_CALLBACK), FolderAdapterListener {
 
-    class ViewHolder(private val binding: RvSimpleRowBinding) : RecyclerView.ViewHolder(binding.root) {
+    inner class ViewHolder(private val binding: RvFoldersRowBinding) : RecyclerView.ViewHolder(binding.root) {
 
         fun bind(listener: WeakReference<FolderAdapterListener>?, project: Project?) {
+
+            val isSelected = listener?.get()?.getSelectedProject()?.id == project?.id
+            itemView.isSelected = isSelected
+
+            val textColorRes = if (isSelected) R.color.colorTertiary else R.color.colorText
+            val iconColorRes = if (isSelected) R.color.colorTertiary else R.color.colorOnBackground
+            val backgroundRes = if (isSelected) R.drawable.item_background_selector else android.R.color.transparent
+
+            binding.root.setBackgroundResource(backgroundRes)
+
             binding.rvTitle.text = project?.description
+            binding.rvTitle.setTextColor(ContextCompat.getColor(context, textColorRes))
 
-            if (listener?.get()?.getSelectedProject()?.id == project?.id) {
-                val icon = ContextCompat.getDrawable(binding.rvIcon.context, R.drawable.baseline_folder_white_24)
-                val color = ContextCompat.getColor(binding.rvIcon.context, R.color.colorPrimary)
-                icon?.setTint(color)
-                binding.rvIcon.setImageDrawable(icon)
+            val icon = if (isSelected) {
+                ContextCompat.getDrawable(context, R.drawable.baseline_folder_white_24)
             } else {
-                val icon = ContextCompat.getDrawable(binding.rvIcon.context, R.drawable.outline_folder_white_24)
-                val color = ContextCompat.getColor(binding.rvIcon.context, R.color.colorOnBackground)
-                icon?.setTint(color)
-                binding.rvIcon.setImageDrawable(icon)
+                ContextCompat.getDrawable(context, R.drawable.outline_folder_white_24)
             }
 
-            binding.rvTitle.setTextColor(getColor(binding.rvTitle.context,
-                listener?.get()?.getSelectedProject()?.id == project?.id))
+            icon?.setTint(ContextCompat.getColor(context, iconColorRes))
+
+            binding.rvIcon.setImageDrawable(icon)
+
+            if (isArchived) {
+                binding.rvEdit.visibility = View.GONE
+            } else {
+                binding.rvEdit.visibility = View.VISIBLE
+            }
+
+
 
             if (project != null) {
-                binding.root.setOnClickListener {
-                    listener?.get()?.projectClicked(project)
+                binding.textContainer.setOnClickListener {
+                    if (isArchived) {
+                        listener?.get()?.projectEdit(project)
+                    } else {
+                        listener?.get()?.projectClicked(project)
+                    }
                 }
-            }
-            else {
+
+                binding.rvEdit.setOnClickListener {
+                    listener?.get()?.projectEdit(project)
+                }
+
+            } else {
                 binding.root.setOnClickListener(null)
             }
         }
@@ -66,7 +95,7 @@ class FolderAdapter(listener: FolderAdapterListener?) : ListAdapter<Project, Fol
         private var highlightColor: Int? = null
         private var defaultColor: Int? = null
 
-        fun getColor(context: Context, highlight: Boolean): Int {
+        fun getColorOld(context: Context, highlight: Boolean): Int {
             if (highlight) {
                 var color = highlightColor
 
@@ -88,19 +117,27 @@ class FolderAdapter(listener: FolderAdapterListener?) : ListAdapter<Project, Fol
 
             return color
         }
+
+        fun getColor(context: Context, highlight: Boolean): Int {
+            return if (highlight) {
+                ContextCompat.getColor(context, R.color.colorPrimary)
+            } else {
+                ContextCompat.getColor(context, R.color.colorOnBackground)
+            }
+        }
     }
 
-    private val mListener: WeakReference<FolderAdapterListener>?
+    private val mListener: WeakReference<FolderAdapterListener>? = WeakReference(listener)
 
     private var mLastSelected: Project? = null
 
-    init {
-        mListener = WeakReference(listener)
-    }
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(RvSimpleRowBinding.inflate(LayoutInflater.from(parent.context),
-            parent, false))
+        return ViewHolder(
+            RvFoldersRowBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent, false
+            )
+        )
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -128,11 +165,17 @@ class FolderAdapter(listener: FolderAdapterListener?) : ListAdapter<Project, Fol
         return mLastSelected
     }
 
+    override fun projectEdit(project: Project) {
+        notifyItemChanged(getIndex(getSelectedProject()))
+        notifyItemChanged(getIndex(project))
+
+        mListener?.get()?.projectEdit(project)
+    }
+
     private fun getIndex(project: Project?): Int {
         return if (project == null) {
             -1
-        }
-        else {
+        } else {
             currentList.indexOf(project)
         }
     }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt b/app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt
index 4f729118..2b26bbdc 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt
@@ -1,9 +1,10 @@
 package net.opendasharchive.openarchive
 
 import android.content.Context
-import com.facebook.drawee.backends.pipeline.Fresco
-import com.facebook.imagepipeline.core.ImagePipelineConfig
-import com.facebook.imagepipeline.decoder.SimpleProgressiveJpegConfig
+import android.util.Log
+import coil.Coil
+import coil.ImageLoader
+import coil.util.Logger
 import com.orm.SugarApp
 import info.guardianproject.netcipher.proxy.OrbotHelper
 import net.opendasharchive.openarchive.core.di.coreModule
@@ -16,6 +17,7 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
 import org.koin.core.logger.Level
+import timber.log.Timber
 
 class SaveApp : SugarApp() {
 
@@ -34,13 +36,17 @@ class SaveApp : SugarApp() {
         }
 
 
-        val config = ImagePipelineConfig.newBuilder(this)
-            .setProgressiveJpegConfig(SimpleProgressiveJpegConfig())
-            .setResizeAndRotateEnabledForNetwork(true)
-            .setDownsampleEnabled(true)
+        val imageLoader = ImageLoader.Builder(this)
+            .logger(object : Logger {
+                override var level = Log.VERBOSE
+
+                override fun log(tag: String, priority: Int, message: String?, throwable: Throwable?) {
+                    Timber.tag("Coil").log(priority, throwable, message)
+                }
+            })
             .build()
 
-        Fresco.initialize(this, config)
+        Coil.setImageLoader(imageLoader)
         Prefs.load(this)
 
         if (Prefs.useTor) initNetCipher()
diff --git a/app/src/main/java/net/opendasharchive/openarchive/SpaceAdapter.kt b/app/src/main/java/net/opendasharchive/openarchive/SpaceAdapter.kt
index b1c1b12b..a548c89c 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/SpaceAdapter.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/SpaceAdapter.kt
@@ -1,12 +1,15 @@
 package net.opendasharchive.openarchive
 
+import android.content.Context
+import android.graphics.Rect
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import net.opendasharchive.openarchive.databinding.RvSimpleRowBinding
+import net.opendasharchive.openarchive.databinding.RvSpacesRowBinding
 import net.opendasharchive.openarchive.db.Space
 import net.opendasharchive.openarchive.util.extensions.scaled
 import java.lang.ref.WeakReference
@@ -15,59 +18,46 @@ interface SpaceAdapterListener {
 
     fun spaceClicked(space: Space)
 
-    fun addSpaceClicked()
+    fun editSpaceClicked(spaceId: Long?)
 
     fun getSelectedSpace(): Space?
 }
 
-class SpaceAdapter(listener: SpaceAdapterListener?) : ListAdapter<Space, SpaceAdapter.ViewHolder>(DIFF_CALLBACK), SpaceAdapterListener {
+class SpaceAdapter(private val context: Context, listener: SpaceAdapterListener?) : ListAdapter<Space, SpaceAdapter.ViewHolder>(DIFF_CALLBACK), SpaceAdapterListener {
 
-    class ViewHolder(private val binding: RvSimpleRowBinding) : RecyclerView.ViewHolder(binding.root) {
+    inner class ViewHolder(private val binding: RvSpacesRowBinding) : RecyclerView.ViewHolder(binding.root) {
 
         fun bind(listener: WeakReference<SpaceAdapterListener>?, space: Space?) {
-            val context = binding.rvTitle.context
 
-            if (listener?.get()?.getSelectedSpace()?.id == space?.id) {
-                val icon = Space.current?.getAvatar(context)?.scaled(32, context)
-                val color = ContextCompat.getColor(binding.rvIcon.context, R.color.colorPrimary)
-                icon?.setTint(color)
-                binding.rvIcon.setImageDrawable(icon)
-            }
-            else {
-                val icon = space?.getAvatar(context)?.scaled(32, context)
-                val color = ContextCompat.getColor(binding.rvIcon.context, R.color.colorOnBackground)
-                icon?.setTint(color)
-                binding.rvIcon.setImageDrawable(icon)
-            }
+            val isSelected = listener?.get()?.getSelectedSpace()?.id == space?.id
+            itemView.isSelected = isSelected
+            val textColorRes = if (isSelected) R.color.colorTertiary else R.color.colorText
+            val iconColorRes = if (isSelected) R.color.colorTertiary else R.color.colorOnBackground
+            val backgroundRes = if (isSelected) R.drawable.item_background_selector else android.R.color.transparent
 
-            if (space?.type == ADD_SPACE_ID) {
-                binding.rvTitle.text = context.getText(R.string.add_another_account)
+            binding.root.setBackgroundResource(backgroundRes)
 
-                val icon = ContextCompat.getDrawable(binding.rvIcon.context, R.drawable.ic_add)
-                binding.rvIcon.setImageDrawable(icon)
+            val icon = space?.getAvatar(context)?.scaled(32, context)
 
-                binding.root.setOnClickListener {
-                    listener?.get()?.addSpaceClicked()
-                }
+            icon?.setTint(ContextCompat.getColor(binding.rvIcon.context, iconColorRes))
+            binding.rvIcon.setImageDrawable(icon)
+
+            binding.rvEdit.setColorFilter(ContextCompat.getColor(binding.rvEdit.context, iconColorRes))
+
+
+            binding.rvTitle.text = space?.friendlyName
+            binding.rvTitle.setTextColor(ContextCompat.getColor(binding.rvTitle.context, textColorRes))
 
-                return
-            } else {
-                binding.rvTitle.text = space?.friendlyName
-            }
 
-            binding.rvTitle.setTextColor(
-                FolderAdapter.getColor(
-                    binding.rvTitle.context,
-                    listener?.get()?.getSelectedSpace()?.id == space?.id
-                )
-            )
+            binding.rvEdit.setOnClickListener {
+                listener?.get()?.editSpaceClicked(space?.id)
+            }
 
             if (space != null) {
                 binding.root.setOnClickListener {
                     listener?.get()?.spaceClicked(space)
                 }
-            }
-            else {
+            } else {
                 binding.root.setOnClickListener(null)
             }
         }
@@ -84,7 +74,6 @@ class SpaceAdapter(listener: SpaceAdapterListener?) : ListAdapter<Space, SpaceAd
             }
         }
 
-        private const val ADD_SPACE_ID = -1
     }
 
     private val mListener = WeakReference(listener)
@@ -92,7 +81,7 @@ class SpaceAdapter(listener: SpaceAdapterListener?) : ListAdapter<Space, SpaceAd
     private var mLastSelected: Space? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(RvSimpleRowBinding.inflate(LayoutInflater.from(parent.context),
+        return ViewHolder(RvSpacesRowBinding.inflate(LayoutInflater.from(parent.context),
             parent, false))
     }
 
@@ -105,22 +94,28 @@ class SpaceAdapter(listener: SpaceAdapterListener?) : ListAdapter<Space, SpaceAd
     fun update(spaces: List<Space>) {
         notifyItemChanged(getIndex(mLastSelected))
 
-        @Suppress("NAME_SHADOWING")
-        val spaces = spaces.toMutableList()
-        spaces.add(Space(ADD_SPACE_ID))
+        //@Suppress("NAME_SHADOWING")
+        //val spaces = spaces.toMutableList()
+        //spaces.add(Space(ADD_SPACE_ID))
 
         submitList(spaces)
     }
 
     override fun spaceClicked(space: Space) {
-        notifyItemChanged(getIndex(getSelectedSpace()))
-        notifyItemChanged(getIndex(space))
+        // Notify previous and new selected items
+        val previousIndex = getIndex(getSelectedSpace())
+        val newIndex = getIndex(space)
+
+        mLastSelected = space
+
+        notifyItemChanged(previousIndex)
+        notifyItemChanged(newIndex)
 
         mListener.get()?.spaceClicked(space)
     }
 
-    override fun addSpaceClicked() {
-        mListener.get()?.addSpaceClicked()
+    override fun editSpaceClicked(spaceId: Long?) {
+        mListener.get()?.editSpaceClicked(spaceId)
     }
 
     override fun getSelectedSpace(): Space? {
@@ -137,4 +132,24 @@ class SpaceAdapter(listener: SpaceAdapterListener?) : ListAdapter<Space, SpaceAd
             currentList.indexOf(space)
         }
     }
+}
+
+class SpaceItemDecoration(private val space: Int) : RecyclerView.ItemDecoration() {
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State
+    ) {
+        // Add space to the bottom of each item except the last one
+        val position = parent.getChildAdapterPosition(view)
+        val itemCount = state.itemCount
+
+        outRect.bottom = space
+
+        // Optional: Add top margin only to the first item
+        if (position == 0) {
+            outRect.top = space
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/core/presentation/components/CustomBottomNavBar.kt b/app/src/main/java/net/opendasharchive/openarchive/core/presentation/components/CustomBottomNavBar.kt
new file mode 100644
index 00000000..d44ab5e9
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/core/presentation/components/CustomBottomNavBar.kt
@@ -0,0 +1,70 @@
+package net.opendasharchive.openarchive.core.presentation.components
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import net.opendasharchive.openarchive.R
+import net.opendasharchive.openarchive.databinding.CustomBottomNavBinding
+
+class CustomBottomNavBar @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr) {
+
+    var onMyMediaClick: (() -> Unit)? = null
+    var onSettingsClick: (() -> Unit)? = null
+
+    var onAddClick: (() -> Unit)? = null
+    var onAddLongClick: (() -> Unit)? = null
+
+    // Inflate the layout
+    private var binding: CustomBottomNavBinding =
+        CustomBottomNavBinding.inflate(LayoutInflater.from(context), this, true)
+
+    init {
+
+
+        // Set up click listeners
+        binding.myMediaButton.setOnClickListener { onMyMediaClick?.invoke() }
+        binding.settingsButton.setOnClickListener { onSettingsClick?.invoke() }
+
+        binding.addButton.setOnClickListener { onAddClick?.invoke() }
+
+
+        binding.myMediaLabel.setOnClickListener {
+            // perform click + play ripple animation
+            binding.myMediaButton.isPressed = true
+            binding.myMediaButton.isPressed = false
+            binding.myMediaButton.performClick()
+        }
+
+        binding.settingsLabel.setOnClickListener {
+            // perform click + play ripple animation
+            binding.settingsButton.isPressed = true
+            binding.settingsButton.isPressed = false
+            binding.settingsButton.performClick()
+        }
+    }
+
+    /**
+     * Updates the highlighted state of the navigation bar buttons.
+     */
+    fun updateSelectedItem(isSettings: Boolean) {
+        if (isSettings) {
+            binding.myMediaButton.setIconResource(R.drawable.outline_perm_media_24)
+            binding.settingsButton.setIconResource(R.drawable.ic_settings_filled)
+        } else {
+            binding.myMediaButton.setIconResource(R.drawable.perm_media_24px)
+            binding.settingsButton.setIconResource(R.drawable.ic_settings)
+        }
+    }
+
+    fun setAddButtonLongClickEnabled() {
+        binding.addButton.setOnLongClickListener {
+            onAddLongClick?.invoke()
+            true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/core/presentation/theme/Colors.kt b/app/src/main/java/net/opendasharchive/openarchive/core/presentation/theme/Colors.kt
index e4e8db82..5380c4c3 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/core/presentation/theme/Colors.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/core/presentation/theme/Colors.kt
@@ -3,9 +3,12 @@ package net.opendasharchive.openarchive.core.presentation.theme
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.colorResource
+import net.opendasharchive.openarchive.R
 
 private val c23_nav_drawer_night = Color(0xff101010)
 private val c23_darker_grey = Color(0xff212021)
@@ -26,6 +29,10 @@ private val c23_teal_20 = Color(0xff003530) // v=20.6 -->
 private val c23_teal_10 = Color(0xff001b19) // v=10.6 -->
 private val c23_powder_blue = Color(0xffaae6e1)
 
+private val inputBackgroundLight = Color(0xfffffbf0)
+private val inputBackgroundDark = Color(0xff212021)
+private val darkPrimary = Color(0xff000A0A)
+
 @Immutable
 data class ColorTheme(
     val material: ColorScheme,
@@ -36,7 +43,8 @@ data class ColorTheme(
     val onDisabledContainer: Color = c23_light_grey,
 )
 
-private val LightColorScheme = ColorTheme(
+@Composable
+internal fun lightColorScheme() = ColorTheme(
     material = lightColorScheme(
 
         primary = c23_teal,
@@ -59,8 +67,8 @@ private val LightColorScheme = ColorTheme(
         errorContainer = Color.Red,
         onErrorContainer = Color.Black,
 
-        background = Color.White,
-        onBackground = Color.Black,
+        background = colorResource(R.color.colorBackground),
+        onBackground = colorResource(R.color.colorOnBackground),
 
         surface = c23_light_grey,
         onSurface = Color.Black,
@@ -76,13 +84,15 @@ private val LightColorScheme = ColorTheme(
         scrim = c23_light_grey,
         surfaceBright = c23_light_grey,
         surfaceContainer = Color.White,
+        surfaceContainerHighest = inputBackgroundLight,
         surfaceDim = c23_light_grey
     ),
 )
 
-private val DarkColorScheme = ColorTheme(
+@Composable
+internal fun darkColorScheme() = ColorTheme(
     material = darkColorScheme(
-        primary = c23_teal,
+        primary = darkPrimary,
         onPrimary = Color.Black,
         primaryContainer = c23_teal,
         onPrimaryContainer = Color.White,
@@ -102,8 +112,8 @@ private val DarkColorScheme = ColorTheme(
         errorContainer = Color.Red,
         onErrorContainer = Color.Black,
 
-        background = Color.Black,
-        onBackground = Color.White,
+        background = colorResource(R.color.colorBackground),
+        onBackground = colorResource(R.color.colorOnBackground),
 
         surface = c23_darker_grey,
         onSurface = Color.White,
@@ -119,11 +129,11 @@ private val DarkColorScheme = ColorTheme(
         scrim = c23_light_grey,
         surfaceBright = c23_grey,
         surfaceContainer = c23_medium_grey,
+        surfaceContainerHighest = inputBackgroundDark,
         surfaceDim = c23_dark_grey
     ),
 )
 
-fun getThemeColors(isDarkTheme: Boolean) = if (isDarkTheme) DarkColorScheme else LightColorScheme
-
-val LocalColors = staticCompositionLocalOf { LightColorScheme }
-
+val LocalColors = staticCompositionLocalOf<ColorTheme> {
+    error("LocalColors not provided. Wrap your composables in the Theme function.")
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/core/presentation/theme/Shape.kt b/app/src/main/java/net/opendasharchive/openarchive/core/presentation/theme/Shape.kt
new file mode 100644
index 00000000..a8cbe804
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/core/presentation/theme/Shape.kt
@@ -0,0 +1,11 @@
+package net.opendasharchive.openarchive.core.presentation.theme
+
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Shapes
+import androidx.compose.ui.unit.dp
+
+val Shapes = Shapes(
+    small = RoundedCornerShape(4.dp),
+    medium = RoundedCornerShape(4.dp),
+    large = RoundedCornerShape(0.dp)
+)
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/core/presentation/theme/Theme.kt b/app/src/main/java/net/opendasharchive/openarchive/core/presentation/theme/Theme.kt
index e0bfbea0..44a74886 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/core/presentation/theme/Theme.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/core/presentation/theme/Theme.kt
@@ -13,7 +13,7 @@ fun Theme(
 ) {
     val isDarkTheme by rememberUpdatedState(newValue = isSystemInDarkTheme())
 
-    val colors = getThemeColors(isDarkTheme)
+    val colors = if (isDarkTheme) darkColorScheme() else lightColorScheme()
 
     val dimensions = getThemeDimensions(isDarkTheme)
 
@@ -23,7 +23,8 @@ fun Theme(
     ) {
         MaterialTheme(
             colorScheme = colors.material,
-            content = content
+            content = content,
+            shapes = Shapes
         )
     }
 }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/core/BaseActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/core/BaseActivity.kt
index cafc804b..06d1a955 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/core/BaseActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/core/BaseActivity.kt
@@ -3,6 +3,8 @@ package net.opendasharchive.openarchive.features.core
 import android.view.MotionEvent
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.appbar.MaterialToolbar
+import net.opendasharchive.openarchive.R
 import net.opendasharchive.openarchive.util.Prefs
 
 abstract class BaseActivity : AppCompatActivity() {
@@ -39,4 +41,25 @@ abstract class BaseActivity : AppCompatActivity() {
             window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
         }
     }
+
+    fun setupToolbar(
+        title: String = "",
+        subtitle: String? = null,
+        showBackButton: Boolean = true
+    ) {
+        val toolbar: MaterialToolbar = findViewById(R.id.common_toolbar)
+        setSupportActionBar(toolbar)
+        supportActionBar?.title = title
+
+        if (subtitle != null) {
+            supportActionBar?.subtitle = subtitle
+        }
+
+        if (showBackButton) {
+            supportActionBar?.setDisplayHomeAsUpEnabled(true)
+            toolbar.setNavigationOnClickListener { onBackPressedDispatcher.onBackPressed() }
+        } else {
+            supportActionBar?.setDisplayHomeAsUpEnabled(false)
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/folders/AddFolderActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/folders/AddFolderActivity.kt
index eb23d402..12dd7285 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/folders/AddFolderActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/folders/AddFolderActivity.kt
@@ -5,16 +5,12 @@ import android.os.Bundle
 import android.view.MenuItem
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
 import net.opendasharchive.openarchive.R
 import net.opendasharchive.openarchive.databinding.ActivityAddFolderBinding
 import net.opendasharchive.openarchive.db.Space
 import net.opendasharchive.openarchive.features.core.BaseActivity
 import net.opendasharchive.openarchive.features.onboarding.SpaceSetupActivity
-import net.opendasharchive.openarchive.util.extensions.Position
 import net.opendasharchive.openarchive.util.extensions.hide
-import net.opendasharchive.openarchive.util.extensions.setDrawable
-import net.opendasharchive.openarchive.util.extensions.tint
 
 class AddFolderActivity : BaseActivity() {
 
@@ -29,48 +25,44 @@ class AddFolderActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        mResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            if (it.resultCode == RESULT_OK) {
-                setResult(RESULT_OK, it.data)
-                finish()
-            }
-            else {
-                val name = it.data?.getStringExtra(EXTRA_FOLDER_NAME)
+        mResultLauncher =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+                if (it.resultCode == RESULT_OK) {
+                    setResult(RESULT_OK, it.data)
+                    finish()
+                } else {
+                    val name = it.data?.getStringExtra(EXTRA_FOLDER_NAME)
 
-                if (!name.isNullOrBlank()) {
-                    val i = Intent(this, CreateNewFolderActivity::class.java)
-                    i.putExtra(EXTRA_FOLDER_NAME, name)
+                    if (!name.isNullOrBlank()) {
+                        val i = Intent(this, CreateNewFolderActivity::class.java)
+                        i.putExtra(EXTRA_FOLDER_NAME, name)
 
-                    mResultLauncher.launch(i)
+                        mResultLauncher.launch(i)
+                    }
                 }
             }
-        }
 
         mBinding = ActivityAddFolderBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
 
-        mBinding.newFolder.setOnClickListener {
+        setupToolbar(
+            title = getString(R.string.add_a_folder),
+            showBackButton = true
+        )
+
+        mBinding.addFolderContainer.setOnClickListener {
             setFolder(false)
         }
 
-        mBinding.browseFolders.setOnClickListener {
+        mBinding.browseFolderContainer.setOnClickListener {
             setFolder(true)
         }
 
-        val arrow = ContextCompat.getDrawable(this, R.drawable.ic_arrow_right)
-        arrow?.tint(ContextCompat.getColor(this, R.color.colorPrimary))
-
-        mBinding.newFolderText.setDrawable(arrow, Position.End, tint = false)
-        mBinding.browseFoldersText.setDrawable(arrow, Position.End, tint = false)
-
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.title = ""
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         // We cannot browse the Internet Archive. Directly forward to creating a project,
         // as it doesn't make sense to show a one-option menu.
         if (Space.current?.tType == Space.Type.INTERNET_ARCHIVE) {
-            mBinding.browseFolders.hide()
+            mBinding.browseFolderContainer.hide()
 
             finish()
             setFolder(false)
@@ -97,7 +89,11 @@ class AddFolderActivity : BaseActivity() {
             return
         }
 
-        mResultLauncher.launch(Intent(this,
-            if (browse) BrowseFoldersActivity::class.java else CreateNewFolderActivity::class.java))
+        mResultLauncher.launch(
+            Intent(
+                this,
+                if (browse) BrowseFoldersActivity::class.java else CreateNewFolderActivity::class.java
+            )
+        )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/folders/BrowseFoldersActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/folders/BrowseFoldersActivity.kt
index 3de2283a..a04be3d3 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/folders/BrowseFoldersActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/folders/BrowseFoldersActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import androidx.activity.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import net.opendasharchive.openarchive.R
 import net.opendasharchive.openarchive.databinding.ActivityBrowseFoldersBinding
@@ -17,9 +18,9 @@ import java.util.Date
 class BrowseFoldersActivity : BaseActivity() {
 
     private lateinit var mBinding: ActivityBrowseFoldersBinding
-    private lateinit var mViewModel: BrowseFoldersViewModel
+    private val mViewModel: BrowseFoldersViewModel by viewModels()
 
-    private var mSelected: BrowseFoldersViewModel.Folder? = null
+    private var mSelected: Folder? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -27,12 +28,10 @@ class BrowseFoldersActivity : BaseActivity() {
         mBinding = ActivityBrowseFoldersBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
 
-        mViewModel = BrowseFoldersViewModel()
-
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-
-        title = getString(R.string.browse_existing)
+        setupToolbar(
+            title = getString(R.string.browse_existing),
+            showBackButton = true
+        )
 
         mBinding.rvFolderList.layoutManager = LinearLayoutManager(this)
 
@@ -42,8 +41,9 @@ class BrowseFoldersActivity : BaseActivity() {
         mViewModel.folders.observe(this) {
             mBinding.projectsEmpty.toggle(it.isEmpty())
 
-            mBinding.rvFolderList.adapter = BrowseFoldersAdapter(it) { name ->
-                mSelected = name
+            mBinding.rvFolderList.adapter = BrowseFoldersAdapter(it) { folder ->
+                this.mSelected = folder
+                invalidateOptionsMenu()
             }
         }
 
@@ -58,16 +58,16 @@ class BrowseFoldersActivity : BaseActivity() {
         return super.onCreateOptionsMenu(menu)
     }
 
+    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
+        val addMenuItem = menu?.findItem(R.id.action_add)
+        addMenuItem?.isVisible = mSelected != null
+        return super.onPrepareOptionsMenu(menu)
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            android.R.id.home -> {
-                finish()
-
-                return true
-            }
             R.id.action_add -> {
                 addFolder(mSelected)
-
                 return true
             }
         }
@@ -75,7 +75,7 @@ class BrowseFoldersActivity : BaseActivity() {
         return super.onOptionsItemSelected(item)
     }
 
-    private fun addFolder(folder: BrowseFoldersViewModel.Folder?) {
+    private fun addFolder(folder: Folder?) {
         if (folder == null) return
         val space = Space.current ?: return
 
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/folders/BrowseFoldersAdapter.kt b/app/src/main/java/net/opendasharchive/openarchive/features/folders/BrowseFoldersAdapter.kt
index 580859f7..cc86d19b 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/folders/BrowseFoldersAdapter.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/folders/BrowseFoldersAdapter.kt
@@ -1,69 +1,68 @@
 package net.opendasharchive.openarchive.features.folders
 
-import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import net.opendasharchive.openarchive.R
 import net.opendasharchive.openarchive.databinding.FolderRowBinding
-import net.opendasharchive.openarchive.util.extensions.clone
-import net.opendasharchive.openarchive.util.extensions.scaled
-import net.opendasharchive.openarchive.util.extensions.tint
 import java.text.SimpleDateFormat
 
 class BrowseFoldersAdapter(
-    private val folders: List<BrowseFoldersViewModel.Folder> = emptyList(),
-    private val onClick: (folder: BrowseFoldersViewModel.Folder) -> Unit
+    private val folders: List<Folder> = emptyList(),
+    private val onClick: (folder: Folder) -> Unit
 ) : RecyclerView.Adapter<BrowseFoldersAdapter.FolderViewHolder>() {
 
     companion object {
-        private var sOriginalColor = 0
-        private var sHighlightColor = 0
-        private var sIcon: Drawable? = null
         private val formatter = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.LONG, SimpleDateFormat.MEDIUM)
     }
 
-    private var mSelected = -1
+    private var mSelected: Folder? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FolderViewHolder {
         val binding = FolderRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         val context = binding.root.context
 
-        if (sOriginalColor == 0) sOriginalColor = binding.name.currentTextColor
-        if (sHighlightColor == 0) sHighlightColor = ContextCompat.getColor(context, R.color.colorPrimary)
-        if (sIcon == null) sIcon = ContextCompat.getDrawable(context, R.drawable.ic_folder)?.scaled(0.75, context)
-
         return FolderViewHolder(binding, onClick)
     }
 
     override fun onBindViewHolder(holder: FolderViewHolder, position: Int) {
-        holder.onBindView(position, mSelected == position)
+        holder.bind(folders[position])
     }
 
-    override fun getItemCount(): Int {
-        return folders.size
-    }
+    override fun getItemCount(): Int = folders.size
+
+    inner class FolderViewHolder(private val binding: FolderRowBinding, private val onClick: (folder: Folder) -> Unit) : RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(folder: Folder) {
+
+            val isSelected = mSelected == folder
+
+            itemView.isSelected = isSelected
 
-    inner class FolderViewHolder(
-        private val binding: FolderRowBinding,
-        private val onClick: (folder: BrowseFoldersViewModel.Folder) -> Unit
-    ) : RecyclerView.ViewHolder(binding.root)
-    {
-        fun onBindView(position: Int, selected: Boolean) {
-            val color = if (selected) sHighlightColor else sOriginalColor
 
-            binding.icon.setImageDrawable(sIcon?.clone()?.tint(color))
-            binding.name.setTextColor(color)
+            val folderIconRes = if (isSelected) R.drawable.ic_folder_selected else R.drawable.ic_folder_unselected
 
-            binding.name.text = folders[position].name
-            binding.timestamp.text = formatter.format(folders[position].modified)
+            binding.icon.setImageDrawable(ContextCompat.getDrawable(binding.icon.context, folderIconRes))
+
+
+            binding.name.text = folder.name
+            binding.timestamp.text = formatter.format(folder.modified)
+
+            binding.rvTick.visibility = if (isSelected) View.VISIBLE else View.INVISIBLE
 
             binding.root.setOnClickListener {
-                mSelected = position
-                this@BrowseFoldersAdapter.notifyDataSetChanged()
+                if (mSelected == folder) return@setOnClickListener
+
+                val previousSelected = mSelected
+                mSelected = folder
+
+                // Notify changes for previous and current selection
+                notifyItemChanged(folders.indexOf(previousSelected))
+                notifyItemChanged(folders.indexOf(mSelected))
 
-                onClick.invoke(folders[position])
+                onClick.invoke(folder)
             }
         }
     }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/folders/BrowseFoldersViewModel.kt b/app/src/main/java/net/opendasharchive/openarchive/features/folders/BrowseFoldersViewModel.kt
index 1ec74006..3eb5945b 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/folders/BrowseFoldersViewModel.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/folders/BrowseFoldersViewModel.kt
@@ -15,9 +15,9 @@ import timber.log.Timber
 import java.io.IOException
 import java.util.Date
 
-class BrowseFoldersViewModel : ViewModel() {
+data class Folder(val name: String, val modified: Date)
 
-    data class Folder(val name: String, val modified: Date)
+class BrowseFoldersViewModel : ViewModel() {
 
     private val mFolders = MutableLiveData<List<Folder>>()
 
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/folders/CreateNewFolderActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/folders/CreateNewFolderActivity.kt
index bf00aa97..ea764496 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/folders/CreateNewFolderActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/folders/CreateNewFolderActivity.kt
@@ -29,9 +29,10 @@ class CreateNewFolderActivity : BaseActivity() {
         mBinding = ActivityCreateNewFolderBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
 
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.title = getString(R.string.new_folder)
+        setupToolbar(
+            title = "Create Folder",
+            showBackButton = true
+        )
 
         mBinding.newFolder.setText(intent.getStringExtra(AddFolderActivity.EXTRA_FOLDER_NAME))
 
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/InternetArchiveActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/InternetArchiveActivity.kt
index be5500f7..c0ba91eb 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/InternetArchiveActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/InternetArchiveActivity.kt
@@ -1,14 +1,19 @@
 package net.opendasharchive.openarchive.features.internetarchive.presentation
 
-import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
-import net.opendasharchive.openarchive.CleanInsightsManager
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.ui.Modifier
+import net.opendasharchive.openarchive.core.presentation.theme.Theme
 import net.opendasharchive.openarchive.db.Space
 import net.opendasharchive.openarchive.features.internetarchive.presentation.components.IAResult
 import net.opendasharchive.openarchive.features.internetarchive.presentation.components.getSpace
+import net.opendasharchive.openarchive.features.internetarchive.presentation.login.ComposeAppBar
 import net.opendasharchive.openarchive.features.main.MainActivity
 
 @Deprecated("use jetpack compose")
@@ -19,9 +24,27 @@ class InternetArchiveActivity : AppCompatActivity() {
         val (space, isNewSpace) = intent.extras.getSpace(Space.Type.INTERNET_ARCHIVE)
 
         setContent {
-            InternetArchiveScreen(space, isNewSpace) {
-                finish(it)
+
+            Theme {
+                Scaffold(
+                    topBar = {
+                        ComposeAppBar(
+                            title = if (isNewSpace) "Add Internet Archive" else "Edit Internet Archive",
+                            onNavigationAction = { finish(IAResult.Cancelled) }
+                        )
+                    }
+                ) { paddingValues ->
+                    Box(modifier = Modifier
+                        .fillMaxSize()
+                        .padding(paddingValues)) {
+                        InternetArchiveScreen(space, isNewSpace) {
+                            finish(it)
+                        }
+                    }
+                }
             }
+
+
         }
     }
 
@@ -33,7 +56,7 @@ class InternetArchiveActivity : AppCompatActivity() {
             }
 
             IAResult.Deleted -> Space.navigate(this)
-            else -> Unit
+            IAResult.Cancelled -> onBackPressed()
         }
     }
 }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/InternetArchiveFragment.kt b/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/InternetArchiveFragment.kt
index 6c934e1f..5aeff9b9 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/InternetArchiveFragment.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/InternetArchiveFragment.kt
@@ -6,16 +6,17 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResult
 import net.opendasharchive.openarchive.db.Space
 import net.opendasharchive.openarchive.features.internetarchive.presentation.components.IAResult
 import net.opendasharchive.openarchive.features.internetarchive.presentation.components.bundleWithNewSpace
 import net.opendasharchive.openarchive.features.internetarchive.presentation.components.bundleWithSpaceId
 import net.opendasharchive.openarchive.features.internetarchive.presentation.components.getSpace
+import net.opendasharchive.openarchive.features.onboarding.BaseFragment
+import net.opendasharchive.openarchive.features.onboarding.ToolbarConfigurable
 
 @Deprecated("only used for backward compatibility")
-class InternetArchiveFragment : Fragment() {
+class InternetArchiveFragment : BaseFragment(), ToolbarConfigurable {
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -58,4 +59,7 @@ class InternetArchiveFragment : Fragment() {
         @JvmStatic
         fun newInstance() = newInstance(args = bundleWithNewSpace())
     }
+
+    override fun getToolbarTitle() = "Internet Archive"
+    override fun shouldShowBackButton() = true
 }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/components/InternetArchiveHeader.kt b/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/components/InternetArchiveHeader.kt
index 2f6d1a07..d1cf343c 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/components/InternetArchiveHeader.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/components/InternetArchiveHeader.kt
@@ -18,12 +18,12 @@ import androidx.compose.ui.graphics.ColorFilter.Companion.tint
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import net.opendasharchive.openarchive.R
+import net.opendasharchive.openarchive.core.presentation.theme.Theme
 import net.opendasharchive.openarchive.core.presentation.theme.ThemeColors
 import net.opendasharchive.openarchive.core.presentation.theme.ThemeDimensions
 
@@ -51,16 +51,10 @@ fun InternetArchiveHeader(modifier: Modifier = Modifier, titleSize: TextUnit = 1
                 contentDescription = stringResource(
                     id = R.string.internet_archive
                 ),
-                colorFilter = tint(colorResource(id = R.color.colorPrimary))
+                colorFilter = tint(colorResource(id = R.color.colorTertiary))
             )
         }
         Column(modifier = Modifier.padding(start = ThemeDimensions.spacing.medium)) {
-            Text(
-                text = stringResource(id = R.string.internet_archive),
-                fontSize = titleSize,
-                fontWeight = FontWeight.Bold,
-                color = ThemeColors.material.onSurface
-            )
             Text(
                 text = stringResource(id = R.string.internet_archive_description),
                 color = ThemeColors.material.onSurfaceVariant
@@ -71,6 +65,9 @@ fun InternetArchiveHeader(modifier: Modifier = Modifier, titleSize: TextUnit = 1
 
 @Composable
 @Preview(showBackground = true)
+@Preview(showBackground = true, uiMode = android.content.res.Configuration.UI_MODE_NIGHT_YES)
 private fun InternetArchiveHeaderPreview() {
-    InternetArchiveHeader()
+    Theme {
+         InternetArchiveHeader()
+    }
 }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/details/InternetArchiveDetailsScreen.kt b/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/details/InternetArchiveDetailsScreen.kt
index c851cde5..d1b434c3 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/details/InternetArchiveDetailsScreen.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/details/InternetArchiveDetailsScreen.kt
@@ -10,9 +10,11 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -22,10 +24,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import net.opendasharchive.openarchive.R
+import net.opendasharchive.openarchive.core.presentation.theme.Theme
 import net.opendasharchive.openarchive.core.presentation.theme.ThemeColors
 import net.opendasharchive.openarchive.core.presentation.theme.ThemeDimensions
 import net.opendasharchive.openarchive.core.state.Dispatch
@@ -33,6 +37,8 @@ import net.opendasharchive.openarchive.db.Space
 import net.opendasharchive.openarchive.features.internetarchive.presentation.components.IAResult
 import net.opendasharchive.openarchive.features.internetarchive.presentation.components.InternetArchiveHeader
 import net.opendasharchive.openarchive.features.internetarchive.presentation.details.InternetArchiveDetailsViewModel.Action
+import net.opendasharchive.openarchive.features.internetarchive.presentation.login.CustomTextField
+import net.opendasharchive.openarchive.features.internetarchive.presentation.login.DefaultScaffoldPreview
 import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
 
@@ -57,6 +63,7 @@ fun InternetArchiveDetailsScreen(space: Space, onResult: (IAResult) -> Unit) {
     InternetArchiveDetailsContent(state, viewModel::dispatch)
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun InternetArchiveDetailsContent(
     state: InternetArchiveDetailsState,
@@ -65,6 +72,7 @@ private fun InternetArchiveDetailsContent(
 
     var isRemoving by remember { mutableStateOf(false) }
 
+
     Box(
         modifier = Modifier
             .fillMaxSize()
@@ -77,53 +85,44 @@ private fun InternetArchiveDetailsContent(
 
             Spacer(Modifier.height(ThemeDimensions.spacing.large))
 
-            Text(
-                text = stringResource(id = R.string.label_username),
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onBackground
-            )
-            Text(
-                text = state.userName,
-                style = MaterialTheme.typography.bodyLarge,
-                color = MaterialTheme.colorScheme.onBackground
+            CustomTextField(
+                label = stringResource(R.string.label_username),
+                value = state.userName,
+                onValueChange = {},
+                enabled = false,
             )
 
-            Text(
-                modifier = Modifier.padding(top = 16.dp),
-                text = stringResource(id = R.string.label_screen_name),
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onBackground
-            )
+            Spacer(Modifier.height(ThemeDimensions.spacing.medium))
 
-            Text(
-                text = state.screenName,
-                style = MaterialTheme.typography.bodyLarge,
-                color = MaterialTheme.colorScheme.onBackground
+            CustomTextField(
+                label = stringResource(R.string.label_screen_name),
+                value = state.screenName,
+                onValueChange = {},
+                enabled = false,
             )
 
-            Text(
-                modifier = Modifier.padding(top = 16.dp),
-                text = stringResource(id = R.string.label_email),
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onBackground
-            )
+            Spacer(Modifier.height(ThemeDimensions.spacing.medium))
+
 
-            Text(
-                text = state.email,
-                style = MaterialTheme.typography.bodyLarge,
-                color = MaterialTheme.colorScheme.onBackground
+            CustomTextField(
+                label = stringResource(R.string.label_email),
+                value = state.email,
+                onValueChange = {},
+                enabled = false,
             )
         }
 
         Button(
             modifier = Modifier
-                .padding(top = 12.dp)
+                .padding(12.dp)
                 .align(Alignment.BottomCenter),
-            shape = RoundedCornerShape(ThemeDimensions.roundedCorner),
             onClick = {
                 isRemoving = true
             },
-            colors = ButtonDefaults.buttonColors(containerColor = ThemeColors.material.error)
+            colors = ButtonDefaults.buttonColors(
+                containerColor = ThemeColors.material.error,
+                contentColor = Color.White
+            )
         ) {
             Text(stringResource(id = R.string.menu_delete))
         }
@@ -149,9 +148,11 @@ private fun RemoveInternetArchiveDialog(onDismiss: () -> Unit, onRemove: () -> U
         },
         text = { Text(stringResource(id = R.string.are_you_sure_you_want_to_remove_this_server_from_the_app)) },
         dismissButton = {
-            OutlinedButton(
+            TextButton(
                 onClick = onDismiss,
-                shape = RoundedCornerShape(ThemeDimensions.roundedCorner)
+                colors = ButtonDefaults.textButtonColors(
+                    contentColor = MaterialTheme.colorScheme.onPrimaryContainer
+                )
             ) {
                 Text(stringResource(id = R.string.action_cancel))
             }
@@ -159,7 +160,10 @@ private fun RemoveInternetArchiveDialog(onDismiss: () -> Unit, onRemove: () -> U
             Button(
                 onClick = onRemove,
                 shape = RoundedCornerShape(ThemeDimensions.roundedCorner),
-                colors = ButtonDefaults.buttonColors(containerColor = ThemeColors.material.error)
+                colors = ButtonDefaults.buttonColors(
+                    containerColor = MaterialTheme.colorScheme.errorContainer,
+                    contentColor = MaterialTheme.colorScheme.onPrimaryContainer
+                )
             ) {
                 Text(stringResource(id = R.string.remove))
             }
@@ -168,18 +172,24 @@ private fun RemoveInternetArchiveDialog(onDismiss: () -> Unit, onRemove: () -> U
 
 @Composable
 @Preview(showBackground = true)
+@Preview(showBackground = true, uiMode = android.content.res.Configuration.UI_MODE_NIGHT_YES)
 private fun InternetArchiveScreenPreview() {
-    InternetArchiveDetailsContent(
-        state = InternetArchiveDetailsState(
-            email = "abc@example.com",
-            userName = "@abc_name",
-            screenName = "ABC Name"
-        )
-    ) {}
+    DefaultScaffoldPreview {
+        InternetArchiveDetailsContent(
+            state = InternetArchiveDetailsState(
+                email = "abc@example.com",
+                userName = "@abc_name",
+                screenName = "ABC Name"
+            )
+        ) {}
+    }
 }
 
 @Composable
 @Preview(showBackground = true)
+@Preview(showBackground = true, uiMode = android.content.res.Configuration.UI_MODE_NIGHT_YES)
 private fun RemoveInternetArchiveDialogPreview() {
-    RemoveInternetArchiveDialog(onDismiss = { }) {}
+    Theme {
+        RemoveInternetArchiveDialog(onDismiss = { }) {}
+    }
 }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/login/InternetArchiveLoginScreen.kt b/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/login/InternetArchiveLoginScreen.kt
index 65267de5..e305ea14 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/login/InternetArchiveLoginScreen.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/presentation/login/InternetArchiveLoginScreen.kt
@@ -8,6 +8,7 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -24,30 +25,41 @@ import androidx.compose.material.icons.filled.Visibility
 import androidx.compose.material.icons.filled.VisibilityOff
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.PlatformImeOptions
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.delay
 import net.opendasharchive.openarchive.R
+import net.opendasharchive.openarchive.core.presentation.theme.Theme
 import net.opendasharchive.openarchive.core.presentation.theme.ThemeColors
 import net.opendasharchive.openarchive.core.presentation.theme.ThemeDimensions
 import net.opendasharchive.openarchive.core.state.Dispatch
@@ -59,6 +71,7 @@ import net.opendasharchive.openarchive.features.internetarchive.presentation.log
 import net.opendasharchive.openarchive.features.internetarchive.presentation.login.InternetArchiveLoginAction.UpdatePassword
 import net.opendasharchive.openarchive.features.internetarchive.presentation.login.InternetArchiveLoginAction.UpdateUsername
 import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.KoinContext
 import org.koin.core.parameter.parametersOf
 import net.opendasharchive.openarchive.features.internetarchive.presentation.login.InternetArchiveLoginAction as Action
 
@@ -68,10 +81,11 @@ fun InternetArchiveLoginScreen(space: Space, onResult: (IAResult) -> Unit) {
         parametersOf(space)
     }
 
-    val state by viewModel.state.collectAsState()
+    val state by viewModel.state.collectAsStateWithLifecycle()
 
     val launcher =
-        rememberLauncherForActivityResult(contract = ActivityResultContracts.StartActivityForResult(),
+        rememberLauncherForActivityResult(
+            contract = ActivityResultContracts.StartActivityForResult(),
             onResult = {})
 
     LaunchedEffect(Unit) {
@@ -116,7 +130,7 @@ private fun InternetArchiveLoginContent(
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .padding(ThemeDimensions.spacing.medium),
+            .padding(16.dp),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
 
@@ -124,57 +138,32 @@ private fun InternetArchiveLoginContent(
             modifier = Modifier.padding(bottom = ThemeDimensions.spacing.large)
         )
 
-        OutlinedTextField(
+        CustomTextField(
             value = state.username,
-            enabled = !state.isBusy,
             onValueChange = { dispatch(UpdateUsername(it)) },
-            label = {
-                Text(stringResource(R.string.label_username))
-            },
-            placeholder = {
-                Text(stringResource(R.string.placeholder_email_or_username))
-            },
-            singleLine = true,
-            shape = RoundedCornerShape(ThemeDimensions.roundedCorner),
-            keyboardOptions = KeyboardOptions(
-                imeAction = ImeAction.Next,
-                autoCorrect = false,
-                keyboardType = KeyboardType.Email
-            ),
+            label = stringResource(R.string.label_username),
+            placeholder = stringResource(R.string.placeholder_email_or_username),
             isError = state.isUsernameError,
+            isLoading = state.isBusy,
+            keyboardType = KeyboardType.Email,
+            imeAction = ImeAction.Next,
         )
 
         Spacer(Modifier.height(ThemeDimensions.spacing.large))
 
-        OutlinedTextField(
+        CustomSecureField(
             value = state.password,
-            enabled = !state.isBusy,
             onValueChange = { dispatch(UpdatePassword(it)) },
-            label = {
-                Text(stringResource(R.string.label_password))
-            },
-            placeholder = {
-                Text(stringResource(R.string.placeholder_password))
-            },
-            singleLine = true,
-            trailingIcon = {
-                IconButton(modifier = Modifier.sizeIn(ThemeDimensions.touchable), onClick = { showPassword = !showPassword }) {
-                    Icon(
-                        imageVector = if (showPassword) Icons.Default.Visibility else Icons.Default.VisibilityOff,
-                        contentDescription = "show password"
-                    )
-                }
-            },
-            shape = RoundedCornerShape(ThemeDimensions.roundedCorner),
-            visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
-            keyboardOptions = KeyboardOptions(
-                keyboardType = KeyboardType.Password,
-                autoCorrect = false,
-                imeAction = ImeAction.Go
-            ),
+            label = stringResource(R.string.label_password),
+            placeholder = stringResource(R.string.placeholder_password),
             isError = state.isPasswordError,
+            isLoading = state.isBusy,
+            keyboardType = KeyboardType.Password,
+            imeAction = ImeAction.Done,
         )
 
+        Spacer(Modifier.height(ThemeDimensions.spacing.large))
+
         AnimatedVisibility(
             visible = state.isLoginError,
             enter = fadeIn(),
@@ -241,11 +230,162 @@ private fun InternetArchiveLoginContent(
 }
 
 @Composable
-@Preview(showBackground = true)
+@Preview(showBackground = true, uiMode = android.content.res.Configuration.UI_MODE_NIGHT_YES)
 private fun InternetArchiveLoginPreview() {
-    InternetArchiveLoginContent(
-        state = InternetArchiveLoginState(
-            username = "user@example.org", password = "abc123"
+    DefaultScaffoldPreview {
+        InternetArchiveLoginContent(
+            state = InternetArchiveLoginState(
+                username = "user@example.org", password = "abc123"
+            )
+        ) {}
+    }
+}
+
+@Composable
+fun DefaultScaffoldPreview(
+    content: @Composable () -> Unit
+) {
+
+    Theme {
+
+        Scaffold(
+            topBar = {
+                ComposeAppBar()
+            }
+        ) { paddingValues ->
+
+            Box(modifier = Modifier.padding(paddingValues), contentAlignment = Alignment.Center) {
+                content()
+            }
+        }
+    }
+
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ComposeAppBar(
+    title: String = "Save App",
+    onNavigationAction: () -> Unit = {}
+) {
+    TopAppBar(
+        title = {
+            Text(title)
+        },
+        navigationIcon = {
+            IconButton(onClick = onNavigationAction) {
+                Icon(painter = painterResource(R.drawable.ic_arrow_back), contentDescription = null)
+            }
+        },
+        colors = TopAppBarDefaults.topAppBarColors(
+            containerColor = MaterialTheme.colorScheme.primary,
+            navigationIconContentColor = Color.White,
+            titleContentColor = Color.White,
+            actionIconContentColor = Color.White
         )
-    ) {}
+    )
+}
+
+@Composable
+fun CustomTextField(
+    modifier: Modifier = Modifier,
+    value: String,
+    onValueChange: (String) -> Unit,
+    label: String,
+    enabled: Boolean = true,
+    placeholder: String? = null,
+    isError: Boolean = false,
+    isLoading: Boolean = false,
+    keyboardType: KeyboardType = KeyboardType.Text,
+    imeAction: ImeAction = ImeAction.Next,
+) {
+
+    TextField(
+        modifier = modifier.fillMaxWidth(),
+        value = value,
+        enabled = !isLoading,
+        onValueChange = onValueChange,
+        label = {
+            Text(label)
+        },
+        placeholder = {
+            placeholder?.let {
+                Text(placeholder)
+            }
+        },
+        singleLine = true,
+        shape = RoundedCornerShape(ThemeDimensions.roundedCorner),
+        keyboardOptions = KeyboardOptions(
+            capitalization = KeyboardCapitalization.None,
+            autoCorrectEnabled = false,
+            keyboardType = keyboardType,
+            imeAction = imeAction,
+            platformImeOptions = PlatformImeOptions(),
+            showKeyboardOnFocus = true,
+            hintLocales = null
+        ),
+        isError = isError,
+        colors = TextFieldDefaults.colors(
+            focusedIndicatorColor = Color.Transparent,
+            unfocusedIndicatorColor = Color.Transparent,
+        ),
+    )
+}
+
+@Composable
+fun CustomSecureField(
+    modifier: Modifier = Modifier,
+    value: String,
+    onValueChange: (String) -> Unit,
+    label: String,
+    placeholder: String,
+    isError: Boolean = false,
+    isLoading: Boolean = false,
+    keyboardType: KeyboardType,
+    imeAction: ImeAction,
+) {
+
+    var showPassword by rememberSaveable {
+        mutableStateOf(false)
+    }
+
+    TextField(
+        modifier = modifier.fillMaxWidth(),
+        value = value,
+        enabled = !isLoading,
+        onValueChange = onValueChange,
+        label = {
+            Text(label)
+        },
+        placeholder = {
+            Text(placeholder)
+        },
+        singleLine = true,
+        shape = RoundedCornerShape(ThemeDimensions.roundedCorner),
+        keyboardOptions = KeyboardOptions(
+            capitalization = KeyboardCapitalization.None,
+            autoCorrectEnabled = false,
+            keyboardType = keyboardType,
+            imeAction = imeAction,
+            platformImeOptions = PlatformImeOptions(),
+            showKeyboardOnFocus = true,
+            hintLocales = null
+        ),
+        visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
+        isError = isError,
+        colors = TextFieldDefaults.colors(
+            focusedIndicatorColor = Color.Transparent,
+            unfocusedIndicatorColor = Color.Transparent,
+        ),
+        trailingIcon = {
+            IconButton(
+                modifier = Modifier.sizeIn(ThemeDimensions.touchable),
+                onClick = { showPassword = !showPassword }) {
+                Icon(
+                    imageVector = if (showPassword) Icons.Default.Visibility else Icons.Default.VisibilityOff,
+                    contentDescription = "show password"
+                )
+            }
+        },
+    )
 }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/main/MainActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/main/MainActivity.kt
index d94a18f3..e513219f 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/main/MainActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/main/MainActivity.kt
@@ -3,72 +3,62 @@ package net.opendasharchive.openarchive.features.main
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
-import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewTreeObserver
+import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import net.opendasharchive.openarchive.FolderAdapter
-import net.opendasharchive.openarchive.FolderAdapterListener
 import net.opendasharchive.openarchive.R
-import net.opendasharchive.openarchive.SpaceAdapter
-import net.opendasharchive.openarchive.SpaceAdapterListener
 import net.opendasharchive.openarchive.databinding.ActivityMainBinding
 import net.opendasharchive.openarchive.db.Project
 import net.opendasharchive.openarchive.db.Space
-import net.opendasharchive.openarchive.extensions.getMeasurments
 import net.opendasharchive.openarchive.features.core.BaseActivity
 import net.opendasharchive.openarchive.features.folders.AddFolderActivity
 import net.opendasharchive.openarchive.features.media.AddMediaDialogFragment
 import net.opendasharchive.openarchive.features.media.AddMediaType
+import net.opendasharchive.openarchive.features.media.ContentPickerFragment
 import net.opendasharchive.openarchive.features.media.MediaLaunchers
 import net.opendasharchive.openarchive.features.media.Picker
 import net.opendasharchive.openarchive.features.media.PreviewActivity
 import net.opendasharchive.openarchive.features.onboarding.Onboarding23Activity
 import net.opendasharchive.openarchive.features.onboarding.SpaceSetupActivity
+import net.opendasharchive.openarchive.features.settings.FoldersActivity
+import net.opendasharchive.openarchive.features.settings.SpacesActivity
 import net.opendasharchive.openarchive.upload.UploadService
 import net.opendasharchive.openarchive.util.AlertHelper
 import net.opendasharchive.openarchive.util.Prefs
 import net.opendasharchive.openarchive.util.ProofModeHelper
-import net.opendasharchive.openarchive.util.extensions.Position
 import net.opendasharchive.openarchive.util.extensions.cloak
 import net.opendasharchive.openarchive.util.extensions.hide
-import net.opendasharchive.openarchive.util.extensions.scaleAndTintDrawable
-import net.opendasharchive.openarchive.util.extensions.scaled
-import net.opendasharchive.openarchive.util.extensions.setDrawable
 import net.opendasharchive.openarchive.util.extensions.show
 import java.text.NumberFormat
-import kotlin.math.roundToInt
 
 
-class MainActivity : BaseActivity(), FolderAdapterListener, SpaceAdapterListener {
+class MainActivity : BaseActivity() {
 
     private var mMenuDelete: MenuItem? = null
 
     private var mSnackBar: Snackbar? = null
 
-    private lateinit var mBinding: ActivityMainBinding
+    private lateinit var binding: ActivityMainBinding
     private lateinit var mPagerAdapter: ProjectAdapter
-    private lateinit var mSpaceAdapter: SpaceAdapter
-    private lateinit var mFolderAdapter: FolderAdapter
 
     private lateinit var mediaLaunchers: MediaLaunchers
 
     private var mLastItem: Int = 0
     private var mLastMediaItem: Int = 0
-    private var serverListOffset: Float = 0F
-    private var serverListCurOffset: Float = 0F
 
-    private var mCurrentItem
-        get() = mBinding.pager.currentItem
+    private var mCurrentPagerItem
+        get() = binding.pager.currentItem
         set(value) {
-            mBinding.pager.currentItem = value
+            binding.pager.currentItem = value
             updateBottomNavbar(value)
         }
 
@@ -79,15 +69,27 @@ class MainActivity : BaseActivity(), FolderAdapterListener, SpaceAdapterListener
             }
         }
 
+    private val folderResultLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == RESULT_OK) {
+                val selectedFolderId = result.data?.getLongExtra("SELECTED_FOLDER_ID", -1)
+                if (selectedFolderId != null && selectedFolderId > -1) {
+                    navigateToFolder(selectedFolderId)
+                }
+            }
+        }
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        installSplashScreen()
 
-        mBinding = ActivityMainBinding.inflate(layoutInflater)
-        setContentView(mBinding.root)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         mediaLaunchers = Picker.register(
             activity = this,
-            root = mBinding.root,
+            root = binding.root,
             project = { getSelectedProject() },
             completed = { media ->
                 refreshCurrentProject()
@@ -97,18 +99,19 @@ class MainActivity : BaseActivity(), FolderAdapterListener, SpaceAdapterListener
                 }
             })
 
-        setSupportActionBar(mBinding.toolbar)
+        setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(false)
         supportActionBar?.title = null
 
         mPagerAdapter = ProjectAdapter(supportFragmentManager, lifecycle)
-        mBinding.pager.adapter = mPagerAdapter
+        binding.pager.adapter = mPagerAdapter
 
-        mBinding.pager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+        binding.pager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
             override fun onPageScrolled(
                 position: Int, positionOffset: Float,
                 positionOffsetPixels: Int
             ) {
+                // Do Nothing
             }
 
             override fun onPageSelected(position: Int) {
@@ -125,81 +128,62 @@ class MainActivity : BaseActivity(), FolderAdapterListener, SpaceAdapterListener
             override fun onPageScrollStateChanged(state: Int) {}
         })
 
-        mBinding.spaceName.setOnClickListener {
-            var newAlpha = 0F
+        setupBottomNavBar()
 
-            if (serverListCurOffset != serverListOffset) {
-                serverListCurOffset = serverListOffset
-                mBinding.spaceName.setDrawable(R.drawable.ic_expand_more, Position.End, 0.75)
-            } else {
-                newAlpha = 1F
-                serverListCurOffset = 0F
-                mBinding.spaceName.setDrawable(R.drawable.ic_expand_less, Position.End, 0.75)
-            }
 
-            mBinding.spaces.visibility = View.VISIBLE
-            mBinding.currentSpaceName.visibility = View.VISIBLE
-            mBinding.newFolder.visibility = View.VISIBLE
-            mBinding.folders.visibility = View.VISIBLE
-
-            mBinding.spaces.animate().translationY(serverListCurOffset).alpha(newAlpha)
-                .withEndAction {
-                    run {
-                        if (newAlpha == 0F) {
-                            mBinding.spaces.hide(false)
-                        }
-                    }
-                }
-            mBinding.currentSpaceName.animate().alpha(1 - newAlpha)
-            mBinding.newFolder.animate().alpha(1 - newAlpha)
-            mBinding.folders.animate().alpha(1 - newAlpha)
+        binding.breadcrumbSpace.setOnClickListener {
+            startActivity(Intent(this, SpacesActivity::class.java))
         }
 
-        updateCurrentSpaceAtDrawer()
-
-        mSpaceAdapter = SpaceAdapter(this)
-        mBinding.spaces.layoutManager = LinearLayoutManager(this)
-        mBinding.spaces.adapter = mSpaceAdapter
-
-        mFolderAdapter = FolderAdapter(this)
-        mBinding.folders.layoutManager = LinearLayoutManager(this)
-        mBinding.folders.adapter = mFolderAdapter
-
-        mBinding.newFolder.scaleAndTintDrawable(Position.Start, 0.75)
-        mBinding.newFolder.setOnClickListener {
-            addFolder()
+        binding.breadcrumbFolder.setOnClickListener {
+            val selectedSpaceId = getSelectedSpace()?.id
+            val selectedProjectId = getSelectedProject()?.id
+            val intent = Intent(this, FoldersActivity::class.java)
+            intent.putExtra(
+                FoldersActivity.EXTRA_SELECTED_SPACE_ID,
+                selectedSpaceId
+            ) // Pass the selected space ID
+            intent.putExtra(
+                FoldersActivity.EXTRA_SELECTED_PROJECT_ID,
+                selectedProjectId
+            ) // Pass the selected project ID
+            folderResultLauncher.launch(intent)
         }
+    }
 
-        mBinding.myMediaButton.setOnClickListener {
-            mCurrentItem = mLastMediaItem
-        }
-        mBinding.myMediaLabel.setOnClickListener {
-            // perform click + play ripple animation
-            mBinding.myMediaButton.isPressed = true
-            mBinding.myMediaButton.isPressed = false
-            mBinding.myMediaButton.performClick()
+    private fun setupBottomNavBar() {
+        binding.bottomNavBar.onMyMediaClick = {
+            mCurrentPagerItem = mLastMediaItem
         }
 
-        mBinding.addButton.setOnClickListener {
-            addClicked(AddMediaType.GALLERY)
-        }
+        binding.bottomNavBar.onAddClick = {
 
-        mBinding.settingsButton.setOnClickListener {
-            mCurrentItem = mPagerAdapter.settingsIndex
+            if (Prefs.addMediaHint) {
+                addClicked(AddMediaType.GALLERY)
+            } else {
+                AlertHelper.show(
+                    context = this,
+                    message = R.string.press_and_hold_options_media_screen_message,
+                    title = R.string.press_and_hold_options_media_screen_title,
+                )
+                Prefs.addMediaHint = true
+            }
         }
-        mBinding.settingsLabel.setOnClickListener {
-            // perform click + play ripple animation
-            mBinding.settingsButton.isPressed = true
-            mBinding.settingsButton.isPressed = false
-            mBinding.settingsButton.performClick()
+
+        binding.bottomNavBar.onSettingsClick = {
+            mCurrentPagerItem = mPagerAdapter.settingsIndex
         }
 
         if (Picker.canPickFiles(this)) {
-            mBinding.addButton.setOnLongClickListener {
-                val addMediaDialogFragment = AddMediaDialogFragment()
-                addMediaDialogFragment.show(supportFragmentManager, addMediaDialogFragment.tag)
+            binding.bottomNavBar.setAddButtonLongClickEnabled()
 
-                true
+            binding.bottomNavBar.onAddLongClick = {
+                //val addMediaDialogFragment = AddMediaDialogFragment()
+                //addMediaDialogFragment.show(supportFragmentManager, addMediaDialogFragment.tag)
+
+                val addMediaBottomSheet =
+                    ContentPickerFragment { actionType -> addClicked(actionType) }
+                addMediaBottomSheet.show(supportFragmentManager, ContentPickerFragment.TAG)
             }
 
             supportFragmentManager.setFragmentResultListener(
@@ -223,6 +207,18 @@ class MainActivity : BaseActivity(), FolderAdapterListener, SpaceAdapterListener
         }
     }
 
+    private fun updateBottomNavbar(position: Int) {
+        binding.bottomNavBar.updateSelectedItem(isSettings = position == mPagerAdapter.settingsIndex)
+        if (position == mPagerAdapter.settingsIndex) {
+            binding.breadcrumbContainer.hide()
+        } else {
+            // Show the breadcrumb container only if there's any server available
+            if (Space.current != null) {
+                binding.breadcrumbContainer.show()
+            }
+        }
+    }
+
     @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
     override fun onStart() {
         super.onStart()
@@ -238,56 +234,27 @@ class MainActivity : BaseActivity(), FolderAdapterListener, SpaceAdapterListener
 
         refreshSpace()
 
-        mCurrentItem = mLastItem
+        mCurrentPagerItem = mLastItem
 
         if (!Prefs.didCompleteOnboarding) {
             startActivity(Intent(this, Onboarding23Activity::class.java))
         }
 
         importSharedMedia(intent)
-
-        if (serverListOffset == 0F) {
-            val dims = mBinding.spaces.getMeasurments()
-            serverListOffset = -dims.second.toFloat()
-            serverListCurOffset = serverListOffset
-            mBinding.spaces.visibility = View.GONE
-            mBinding.spaces.animate().translationY(serverListOffset)
-            mBinding.spaceName.setDrawable(R.drawable.ic_expand_more, Position.End, 0.75)
-        }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_main, menu)
-        mMenuDelete = menu.findItem(R.id.menu_delete)
 
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.menu_folders -> {
+    private fun navigateToFolder(folderId: Long) {
+        val folderIndex = mPagerAdapter.getProjectIndexById(folderId)
+        if (folderIndex >= 0) {
+            binding.pager.setCurrentItem(folderIndex, true)
+            mCurrentPagerItem = folderIndex
 
-                if (mBinding.root.isDrawerOpen(mBinding.folderBar)) {
-                    mBinding.root.closeDrawer(mBinding.folderBar)
-                } else {
-                    mBinding.root.openDrawer(mBinding.folderBar)
-                }
-                true
-            }
-
-            else -> super.onOptionsItemSelected(item)
+        } else {
+            Toast.makeText(this, "Folder not found", Toast.LENGTH_SHORT).show()
         }
     }
 
-    private fun updateCurrentSpaceAtDrawer() {
-        mBinding.currentSpaceName.text = Space.current?.friendlyName
-        mBinding.currentSpaceName.setDrawable(
-            Space.current?.getAvatar(applicationContext)?.scaled(32, applicationContext),
-            Position.Start, tint = true
-        )
-        mBinding.currentSpaceName.compoundDrawablePadding =
-            applicationContext.resources.getDimension(R.dimen.padding_small).roundToInt()
-    }
 
     fun updateAfterDelete(done: Boolean) {
         mMenuDelete?.isVisible = !done
@@ -297,25 +264,16 @@ class MainActivity : BaseActivity(), FolderAdapterListener, SpaceAdapterListener
 
     private fun addFolder() {
         mNewFolderResultLauncher.launch(Intent(this, AddFolderActivity::class.java))
-
-        mBinding.root.closeDrawer(mBinding.folderBar)
     }
 
     private fun refreshSpace() {
-//        val currentSpace = Space.current
-
-//        if (currentSpace != null) {
-//            mBinding.space.setDrawable(
-//                currentSpace.getAvatar(this@MainActivity)
-//                    ?.scaled(32, this@MainActivity), Position.Start, tint = false
-//            )
-        mBinding.spaceName.text = getString(R.string.servers) // currentSpace.friendlyName
-//        } else {
-//            mBinding.space.setDrawable(R.drawable.avatar_default, Position.Start, tint = false)
-//            mBinding.space.text = getString(R.string.app_name)
-//        }
-
-        mSpaceAdapter.update(Space.getAll().asSequence().toList())
+        val currentSpace = Space.current
+        currentSpace?.let { space ->
+            binding.breadcrumbSpace.text = space.friendlyName
+            space.setAvatar(binding.spaceIcon)
+        } ?: run {
+            binding.breadcrumbContainer.visibility = View.INVISIBLE
+        }
 
         refreshProjects()
     }
@@ -325,33 +283,27 @@ class MainActivity : BaseActivity(), FolderAdapterListener, SpaceAdapterListener
 
         mPagerAdapter.updateData(projects)
 
-        mBinding.pager.adapter = mPagerAdapter
+        binding.pager.adapter = mPagerAdapter
 
         setProjectId?.let {
-            mCurrentItem = mPagerAdapter.getProjectIndexById(it, default = 0)
+            mCurrentPagerItem = mPagerAdapter.getProjectIndexById(it, default = 0)
         }
-
-        mFolderAdapter.update(projects)
-
-        refreshCurrentProject()
     }
 
     private fun refreshCurrentProject() {
         val project = getSelectedProject()
 
         if (project != null) {
-            mBinding.pager.post {
+            binding.pager.post {
                 mPagerAdapter.notifyProjectChanged(project)
             }
 
-            project.space?.setAvatar(mBinding.currentFolderIcon)
-            mBinding.currentFolderIcon.show()
+            project.space?.setAvatar(binding.spaceIcon)
+            binding.breadcrumbFolder.text = project.description
+            binding.breadcrumbFolder.show()
 
-            mBinding.currentFolderName.text = project.description
-            mBinding.currentFolderName.show()
         } else {
-            mBinding.currentFolderIcon.cloak()
-            mBinding.currentFolderName.cloak()
+            this@MainActivity.binding.breadcrumbFolder.cloak()
         }
 
         refreshCurrentFolderCount()
@@ -361,24 +313,24 @@ class MainActivity : BaseActivity(), FolderAdapterListener, SpaceAdapterListener
         val project = getSelectedProject()
 
         if (project != null) {
-            mBinding.currentFolderCount.text = NumberFormat.getInstance().format(
+            val count = NumberFormat.getInstance().format(
                 project.collections.map { it.size }
                     .reduceOrNull { acc, count -> acc + count } ?: 0)
-            mBinding.currentFolderCount.show()
 
-//            mBinding.uploadEditButton.toggle(project.isUploading)
+            binding.folderCount.text = count
+            binding.folderCount.show()
+
         } else {
-            mBinding.currentFolderCount.cloak()
-//            mBinding.uploadEditButton.hide()
+            binding.folderCount.cloak()
         }
     }
 
-    private fun importSharedMedia(data: Intent?) {
-        if (data?.action != Intent.ACTION_SEND) return
+    private fun importSharedMedia(imageIntent: Intent?) {
+        if (imageIntent?.action != Intent.ACTION_SEND) return
 
-        val uri = data.data ?: if ((data.clipData?.itemCount
+        val uri = imageIntent.data ?: if ((imageIntent.clipData?.itemCount
                 ?: 0) > 0
-        ) data.clipData?.getItemAt(0)?.uri else null
+        ) imageIntent.clipData?.getItemAt(0)?.uri else null
         val path = uri?.path ?: return
 
         if (path.contains(packageName)) return
@@ -417,64 +369,30 @@ class MainActivity : BaseActivity(), FolderAdapterListener, SpaceAdapterListener
         }
     }
 
-//    private fun showAlertIcon() {
-//        mBinding.alertIcon.show()
-//        TooltipCompat.setTooltipText(
-//            mBinding.alertIcon,
-//            getString(R.string.unsecured_internet_connection)
-//        )
-//    }
-
-    override fun projectClicked(project: Project) {
-        mCurrentItem = mPagerAdapter.projects.indexOf(project)
-
-//        mBinding.root.closeDrawer(mBinding.folderBar)
-
-//        mBinding.spacesCard.disableAnimation {
-//            mBinding.spacesCard.hide()
-//        }
 
-        // make sure that even when navigating to settings and picking a folder there
-        // the dataset will get update correctly
-        mFolderAdapter.notifyDataSetChanged()
+    fun getSelectedProject(): Project? {
+        return mPagerAdapter.getProject(mCurrentPagerItem)
     }
 
-    override fun getSelectedProject(): Project? {
-        return mPagerAdapter.getProject(mCurrentItem)
-    }
-
-    override fun spaceClicked(space: Space) {
-        Space.current = space
-
-        refreshSpace()
-
-        mBinding.root.closeDrawer(mBinding.folderBar)
-
-//        mBinding.spacesCard.disableAnimation {
-//            mBinding.spacesCard.hide()
-//        }
-
-        updateCurrentSpaceAtDrawer()
-    }
-
-    override fun addSpaceClicked() {
-        mBinding.root.closeDrawer(mBinding.folderBar)
-
-        startActivity(Intent(this, SpaceSetupActivity::class.java))
-    }
-
-    override fun getSelectedSpace(): Space? {
+    fun getSelectedSpace(): Space? {
         return Space.current
     }
 
     private fun addClicked(mediaType: AddMediaType) {
 
+        // Check if there's any project selected
         if (getSelectedProject() != null) {
-            when(mediaType) {
-                AddMediaType.CAMERA -> Picker.takePhoto(this@MainActivity, mediaLaunchers.cameraLauncher)
+            when (mediaType) {
+                AddMediaType.CAMERA -> Picker.takePhoto(
+                    this@MainActivity,
+                    mediaLaunchers.cameraLauncher
+                )
+
                 AddMediaType.GALLERY -> Picker.pickMedia(this, mediaLaunchers.imagePickerLauncher)
                 AddMediaType.FILES -> Picker.pickFiles(mediaLaunchers.filePickerLauncher)
             }
+        } else if (Space.current == null) { // Check if there's any space available
+            startActivity(Intent(this, SpaceSetupActivity::class.java))
 
         } else {
 
@@ -498,14 +416,4 @@ class MainActivity : BaseActivity(), FolderAdapterListener, SpaceAdapterListener
             }
         }
     }
-
-    private fun updateBottomNavbar(position: Int) {
-        if (position == mPagerAdapter.settingsIndex) {
-            mBinding.myMediaButton.setIconResource(R.drawable.outline_perm_media_24)
-            mBinding.settingsButton.setIconResource(R.drawable.ic_settings_filled)
-        } else {
-            mBinding.myMediaButton.setIconResource(R.drawable.perm_media_24px)
-            mBinding.settingsButton.setIconResource(R.drawable.ic_settings)
-        }
-    }
 }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/main/MainMediaFragment.kt b/app/src/main/java/net/opendasharchive/openarchive/features/main/MainMediaFragment.kt
index 2e6e6293..b64b3647 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/main/MainMediaFragment.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/main/MainMediaFragment.kt
@@ -24,6 +24,7 @@ import net.opendasharchive.openarchive.db.Collection
 import net.opendasharchive.openarchive.db.Media
 import net.opendasharchive.openarchive.db.MediaAdapter
 import net.opendasharchive.openarchive.db.MediaViewHolder
+import net.opendasharchive.openarchive.db.Space
 import net.opendasharchive.openarchive.upload.BroadcastManager
 import net.opendasharchive.openarchive.util.AlertHelper
 import net.opendasharchive.openarchive.util.extensions.toggle
@@ -128,6 +129,22 @@ class MainMediaFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        if (mProjectId == -1L) {
+            val space = Space.current
+            val text: String = if (space != null) {
+                val projects = space.projects
+                if (projects.isNotEmpty()) {
+                     getString(R.string.tap_to_add)
+                } else {
+                    "Tap the button below to add media folder."
+                }
+            } else {
+                "Tap the button below to add media server."
+            }
+
+            binding.tvWelcomeDescr.text = text
+        }
+
         refresh()
     }
 
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/main/SectionViewHolder.kt b/app/src/main/java/net/opendasharchive/openarchive/features/main/SectionViewHolder.kt
index 78402f26..1cf0d1b5 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/main/SectionViewHolder.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/main/SectionViewHolder.kt
@@ -37,8 +37,7 @@ data class SectionViewHolder(
         collection: Collection,
         media: List<Media>
     ) {
-        if (media.any { it.isUploading })
-        {
+        if (media.any { it.isUploading }) {
             timestamp.setText(R.string.uploading)
 
             val uploaded = media.filter { it.sStatus == Media.Status.Uploaded }.size
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/media/AddMediaDialogFragment.kt b/app/src/main/java/net/opendasharchive/openarchive/features/media/AddMediaDialogFragment.kt
index 1a3a7f8a..8d385aab 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/media/AddMediaDialogFragment.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/media/AddMediaDialogFragment.kt
@@ -18,7 +18,7 @@ class AddMediaDialogFragment : DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val builder = MaterialAlertDialogBuilder(requireContext())
-        mDialogView = onCreateView(LayoutInflater.from(requireContext()), null, savedInstanceState)
+        mDialogView = onCreateView(layoutInflater, null, savedInstanceState)
         builder.setView(mDialogView)
         return builder.create()
     }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/media/ContentPickerFragment.kt b/app/src/main/java/net/opendasharchive/openarchive/features/media/ContentPickerFragment.kt
new file mode 100644
index 00000000..1ea462a8
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/media/ContentPickerFragment.kt
@@ -0,0 +1,46 @@
+package net.opendasharchive.openarchive.features.media
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import net.opendasharchive.openarchive.databinding.FragmentContentPickerBinding
+
+class ContentPickerFragment(private val onMediaPicked: (AddMediaType) -> Unit): BottomSheetDialogFragment() {
+
+    private var _binding: FragmentContentPickerBinding? = null
+    private val binding get() = _binding!!
+
+
+    companion object {
+        const val TAG = "ModalBottomSheet-ContentPickerFragment"
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        _binding = FragmentContentPickerBinding.inflate(inflater, container, false)
+
+
+        binding.actionUploadCamera.setOnClickListener {
+            onMediaPicked(AddMediaType.CAMERA)
+            dismiss()
+        }
+
+        binding.actionUploadMedia.setOnClickListener {
+            onMediaPicked(AddMediaType.GALLERY)
+            dismiss()
+        }
+
+        binding.actionUploadFiles.setOnClickListener {
+            onMediaPicked(AddMediaType.FILES)
+            dismiss()
+        }
+
+
+        return binding.root
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/media/PreviewActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/media/PreviewActivity.kt
index 2e03d24f..e332f4da 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/media/PreviewActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/media/PreviewActivity.kt
@@ -72,9 +72,10 @@ class PreviewActivity : BaseActivity(), View.OnClickListener, PreviewAdapter.Lis
             refresh()
         })
 
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.title = getString(R.string.preview_media)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        setupToolbar(
+            title = getString(R.string.preview_media),
+            showBackButton = true
+        )
 
         mBinding.mediaGrid.layoutManager = GridLayoutManager(this, 2)
         mBinding.mediaGrid.adapter = PreviewAdapter(this)
@@ -87,8 +88,8 @@ class PreviewActivity : BaseActivity(), View.OnClickListener, PreviewAdapter.Lis
 
         if (Picker.canPickFiles(this)) {
             mBinding.btAddMore.setOnLongClickListener {
-                mBinding.addMenu.container.show(animate = true)
-
+                //mBinding.addMenu.container.show(animate = true)
+                initAddMediaBottomSheet()
                 true
             }
 
@@ -121,6 +122,20 @@ class PreviewActivity : BaseActivity(), View.OnClickListener, PreviewAdapter.Lis
         refresh()
     }
 
+    private fun initAddMediaBottomSheet() {
+
+        if (Picker.canPickFiles(this)) {
+            val modalBottomSheet = ContentPickerFragment { action ->
+                when (action) {
+                    AddMediaType.CAMERA -> Picker.takePhoto(this@PreviewActivity, mediaLaunchers.cameraLauncher)
+                    AddMediaType.FILES -> Picker.pickFiles(mediaLaunchers.filePickerLauncher)
+                    AddMediaType.GALLERY -> onClick(mBinding.btAddMore)
+                }
+            }
+            modalBottomSheet.show(supportFragmentManager, ContentPickerFragment.TAG)
+        }
+    }
+
     override fun onResume() {
         super.onResume()
 
@@ -129,56 +144,13 @@ class PreviewActivity : BaseActivity(), View.OnClickListener, PreviewAdapter.Lis
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.menu_preview, menu)
-
         return super.onCreateOptionsMenu(menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            android.R.id.home -> {
-                finish()
-
-                return true
-            }
-
             R.id.menu_upload -> {
-                val queue = {
-                    mMedia.forEach {
-                        it.sStatus = Media.Status.Queued
-                        it.selected = false
-                        it.save()
-                    }
-
-                    finish()
-                }
-
-                if (Prefs.dontShowUploadHint) {
-                    queue()
-                } else {
-                    var doNotShowAgain = false
-
-                    val d = AlertDialog.Builder(ContextThemeWrapper(this, R.style.AlertDialogTheme))
-                        .setTitle(R.string.once_uploaded_you_will_not_be_able_to_edit_media)
-                        .setIcon(R.drawable.baseline_cloud_upload_black_48)
-                        .setPositiveButton(
-                            R.string.got_it
-                        ) { _: DialogInterface, _: Int ->
-                            Prefs.dontShowUploadHint = doNotShowAgain
-                            queue()
-                        }
-                        .setNegativeButton(R.string.lbl_Cancel) { dialog: DialogInterface, _: Int -> dialog.dismiss() }
-                        .setMultiChoiceItems(
-                            arrayOf(getString(R.string.do_not_show_me_this_again)),
-                            booleanArrayOf(false)
-                        )
-                        { _, _, isChecked ->
-                            doNotShowAgain = isChecked
-                        }.show()
-
-                    // hack for making sure this dialog always shows all lines of the pretty long title, even on small screens
-                    d.findViewById<TextView>(androidx.appcompat.R.id.alertTitle)?.maxLines = 99
-
-                }
+                uploadMedia()
                 return true
             }
         }
@@ -262,4 +234,44 @@ class PreviewActivity : BaseActivity(), View.OnClickListener, PreviewAdapter.Lis
 
         Prefs.batchHintShown = true
     }
+
+    private fun uploadMedia() {
+        val queue = {
+            mMedia.forEach {
+                it.sStatus = Media.Status.Queued
+                it.selected = false
+                it.save()
+            }
+
+            finish()
+        }
+
+        if (Prefs.dontShowUploadHint) {
+            queue()
+        } else {
+            var doNotShowAgain = false
+
+            val d = AlertDialog.Builder(ContextThemeWrapper(this, R.style.AlertDialogTheme))
+                .setTitle(R.string.once_uploaded_you_will_not_be_able_to_edit_media)
+                .setIcon(R.drawable.baseline_cloud_upload_black_48)
+                .setPositiveButton(
+                    R.string.got_it
+                ) { _: DialogInterface, _: Int ->
+                    Prefs.dontShowUploadHint = doNotShowAgain
+                    queue()
+                }
+                .setNegativeButton(R.string.lbl_Cancel) { dialog: DialogInterface, _: Int -> dialog.dismiss() }
+                .setMultiChoiceItems(
+                    arrayOf(getString(R.string.do_not_show_me_this_again)),
+                    booleanArrayOf(false)
+                )
+                { _, _, isChecked ->
+                    doNotShowAgain = isChecked
+                }.show()
+
+            // hack for making sure this dialog always shows all lines of the pretty long title, even on small screens
+            d.findViewById<TextView>(androidx.appcompat.R.id.alertTitle)?.maxLines = 99
+
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/media/ReviewActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/media/ReviewActivity.kt
index 691938e7..370f6cf9 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/media/ReviewActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/media/ReviewActivity.kt
@@ -10,7 +10,6 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
 import com.bumptech.glide.Glide
-import com.facebook.drawee.view.SimpleDraweeView
 import com.github.derlio.waveform.SimpleWaveformView
 import com.squareup.picasso.Picasso
 import net.opendasharchive.openarchive.R
@@ -67,8 +66,10 @@ class ReviewActivity : BaseActivity(), View.OnClickListener {
         mBinding = ActivityReviewBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
 
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        setupToolbar(
+            title = getString(R.string.edit_media_info),
+            showBackButton = true
+        )
 
         mStore = intent.getLongArrayExtra(EXTRA_CURRENT_MEDIA_ID)
             ?.map { Media.get(it) }?.filterNotNull() ?: emptyList()
@@ -166,12 +167,12 @@ class ReviewActivity : BaseActivity(), View.OnClickListener {
 
     override fun onClick(view: View?) {
         when (view) {
-            mBinding.waveform, mBinding.image -> {
-                if (mMedia?.mimeType?.startsWith("image") == true) {
-                    val draweeView = SimpleDraweeView(this)
-                    draweeView.setImageURI(mMedia?.fileUri)
-                }
-            }
+//            mBinding.waveform, mBinding.image -> {
+//                if (mMedia?.mimeType?.startsWith("image") == true) {
+//                    val draweeView = SimpleDraweeView(this)
+//                    draweeView.setImageURI(mMedia?.fileUri)
+//                }
+//            }
             mBinding.btFlag -> {
                 showFirstTimeFlag()
 
@@ -285,7 +286,11 @@ class ReviewActivity : BaseActivity(), View.OnClickListener {
     private fun showFirstTimeFlag() {
         if (Prefs.flagHintShown) return
 
-        AlertHelper.show(this, R.string.popup_flag_desc, R.string.popup_flag_title)
+        AlertHelper.show(
+            context = this,
+            message = R.string.popup_flag_desc,
+            title = R.string.popup_flag_title
+        )
 
         Prefs.flagHintShown = true
     }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/onboarding/Onboarding23Activity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/onboarding/Onboarding23Activity.kt
index e5d63df1..1ce30fdf 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/onboarding/Onboarding23Activity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/onboarding/Onboarding23Activity.kt
@@ -45,7 +45,7 @@ class Onboarding23Activity : BaseActivity() {
             mBinding.titleBlock.verifyText,
             mBinding.titleBlock.encryptText
         )) {
-            textView.text = colorizeFirstLetter(textView.text, R.color.colorPrimary)
+            textView.text = colorizeFirstLetter(textView.text, R.color.colorTertiary)
         }
     }
 
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/onboarding/Onboarding23InstructionsActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/onboarding/Onboarding23InstructionsActivity.kt
index 1197cf54..49e8f42e 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/onboarding/Onboarding23InstructionsActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/onboarding/Onboarding23InstructionsActivity.kt
@@ -12,6 +12,7 @@ import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import net.opendasharchive.openarchive.R
 import net.opendasharchive.openarchive.databinding.ActivityOnboarding23InstructionsBinding
 import net.opendasharchive.openarchive.features.core.BaseActivity
+import net.opendasharchive.openarchive.features.main.MainActivity
 import net.opendasharchive.openarchive.util.Prefs
 
 class Onboarding23InstructionsActivity : BaseActivity() {
@@ -119,6 +120,8 @@ class Onboarding23InstructionsActivity : BaseActivity() {
 
     private fun done() {
         Prefs.didCompleteOnboarding = true
-        startActivity(Intent(this, SpaceSetupActivity::class.java))
+        // We are moving space setup to MainActivity
+        startActivity(Intent(this, MainActivity::class.java))
+        finish()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/onboarding/SpaceSetupActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/onboarding/SpaceSetupActivity.kt
index f45f3b55..576d822e 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/onboarding/SpaceSetupActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/onboarding/SpaceSetupActivity.kt
@@ -2,17 +2,30 @@ package net.opendasharchive.openarchive.features.onboarding
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.fragment.app.Fragment
 import net.opendasharchive.openarchive.R
 import net.opendasharchive.openarchive.databinding.ActivitySpaceSetupBinding
 import net.opendasharchive.openarchive.features.core.BaseActivity
+import net.opendasharchive.openarchive.features.internetarchive.presentation.InternetArchiveFragment
 import net.opendasharchive.openarchive.features.main.MainActivity
 import net.opendasharchive.openarchive.features.settings.SpaceSetupFragment
 import net.opendasharchive.openarchive.features.settings.SpaceSetupSuccessFragment
 import net.opendasharchive.openarchive.services.gdrive.GDriveFragment
-import net.opendasharchive.openarchive.features.internetarchive.presentation.InternetArchiveFragment
-import net.opendasharchive.openarchive.services.webdav.WebDavSetupLicenseFragment
-import net.opendasharchive.openarchive.services.internetarchive.Util
 import net.opendasharchive.openarchive.services.webdav.WebDavFragment
+import net.opendasharchive.openarchive.services.webdav.WebDavSetupLicenseFragment
+
+interface ToolbarConfigurable {
+    fun getToolbarTitle(): String
+    fun getToolbarSubtitle(): String? = null
+    fun shouldShowBackButton(): Boolean = true
+}
+
+abstract class BaseFragment : Fragment(), ToolbarConfigurable {
+    override fun onResume() {
+        super.onResume()
+        (activity as? SpaceSetupActivity)?.updateToolbarFromFragment(this)
+    }
+}
 
 class SpaceSetupActivity : BaseActivity() {
 
@@ -28,6 +41,11 @@ class SpaceSetupActivity : BaseActivity() {
         mBinding = ActivitySpaceSetupBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
 
+        setupToolbar(
+            title = "Servers",
+            showBackButton = true
+        )
+
         initSpaceSetupFragmentBindings()
         initWebDavFragmentBindings()
         initWebDavCreativeLicenseBindings()
@@ -36,6 +54,20 @@ class SpaceSetupActivity : BaseActivity() {
         initGDriveFragmentBindings()
     }
 
+    fun updateToolbarFromFragment(fragment: Fragment) {
+        if (fragment is ToolbarConfigurable) {
+            val title = fragment.getToolbarTitle()
+            val subtitle = fragment.getToolbarSubtitle()
+            val showBackButton = fragment.shouldShowBackButton()
+            setupToolbar(title = title, showBackButton = showBackButton)
+            supportActionBar?.subtitle = subtitle
+        } else {
+            // Default toolbar configuration if fragment doesn't implement interface
+            setupToolbar(title = "Servers", showBackButton = true)
+            supportActionBar?.subtitle = null
+        }
+    }
+
     private fun initSpaceSetupSuccessFragmentBindings() {
         supportFragmentManager.setFragmentResultListener(SpaceSetupSuccessFragment.RESP_DONE, this) { _, _ ->
             finishAffinity()
@@ -50,7 +82,6 @@ class SpaceSetupActivity : BaseActivity() {
     private fun initWebDavFragmentBindings() {
         supportFragmentManager.setFragmentResultListener(WebDavFragment.RESP_SAVED, this) { key, bundle ->
             val spaceId = bundle.getLong(WebDavFragment.ARG_SPACE_ID)
-            progress3()
             supportFragmentManager
                 .beginTransaction()
                 .setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left)
@@ -64,7 +95,6 @@ class SpaceSetupActivity : BaseActivity() {
 
 
         supportFragmentManager.setFragmentResultListener(WebDavFragment.RESP_CANCEL, this) { _, _ ->
-            progress1()
             supportFragmentManager
                 .beginTransaction()
                 .setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_right)
@@ -79,7 +109,6 @@ class SpaceSetupActivity : BaseActivity() {
      */
     private fun initWebDavCreativeLicenseBindings() {
         supportFragmentManager.setFragmentResultListener(WebDavSetupLicenseFragment.RESP_SAVED, this) { _, _ ->
-            progress4()
             val message = getString(R.string.you_have_successfully_connected_to_a_private_server)
             supportFragmentManager
                 .beginTransaction()
@@ -93,7 +122,6 @@ class SpaceSetupActivity : BaseActivity() {
         }
 
         supportFragmentManager.setFragmentResultListener(WebDavSetupLicenseFragment.RESP_CANCEL, this) { _, _ ->
-            progress3()
             supportFragmentManager
                 .beginTransaction()
                 .setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_right)
@@ -106,7 +134,6 @@ class SpaceSetupActivity : BaseActivity() {
         supportFragmentManager.setFragmentResultListener(SpaceSetupFragment.RESULT_REQUEST_KEY, this) { _, bundle ->
             when (bundle.getString(SpaceSetupFragment.RESULT_BUNDLE_KEY)) {
                 SpaceSetupFragment.RESULT_VAL_INTERNET_ARCHIVE -> {
-                    progress2()
                     supportFragmentManager
                         .beginTransaction()
                         .setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left)
@@ -119,7 +146,6 @@ class SpaceSetupActivity : BaseActivity() {
                 }
 
                 SpaceSetupFragment.RESULT_VAL_WEBDAV -> {
-                    progress2()
                     supportFragmentManager
                         .beginTransaction()
                         .setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left)
@@ -132,7 +158,6 @@ class SpaceSetupActivity : BaseActivity() {
                 }
 
                 SpaceSetupFragment.RESULT_VAL_GDRIVE -> {
-                    progress2()
                     supportFragmentManager
                         .beginTransaction()
                         .setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left)
@@ -145,7 +170,6 @@ class SpaceSetupActivity : BaseActivity() {
 
     private fun initInternetArchiveFragmentBindings() {
         supportFragmentManager.setFragmentResultListener(InternetArchiveFragment.RESP_SAVED, this) { _, _ ->
-            progress4()
             supportFragmentManager
                 .beginTransaction()
                 .setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left)
@@ -161,7 +185,6 @@ class SpaceSetupActivity : BaseActivity() {
             InternetArchiveFragment.RESP_CANCEL,
             this
         ) { _, _ ->
-            progress1()
             supportFragmentManager
                 .beginTransaction()
                 .setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_right)
@@ -175,7 +198,6 @@ class SpaceSetupActivity : BaseActivity() {
             GDriveFragment.RESP_CANCEL,
             this
         ) { _, _ ->
-            progress1()
             supportFragmentManager
                 .beginTransaction()
                 .setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_right)
@@ -187,7 +209,6 @@ class SpaceSetupActivity : BaseActivity() {
             GDriveFragment.RESP_AUTHENTICATED,
             this
         ) { _, _ ->
-            progress4()
             supportFragmentManager
                 .beginTransaction()
                 .setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left)
@@ -207,44 +228,4 @@ class SpaceSetupActivity : BaseActivity() {
             onActivityResult(requestCode, resultCode, data)
         }
     }
-
-    private fun progress1() {
-        Util.setBackgroundTint(mBinding.progressBlock.dot1, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.bar1, R.color.colorSpaceSetupProgressOff)
-        Util.setBackgroundTint(mBinding.progressBlock.dot2, R.color.colorSpaceSetupProgressOff)
-        Util.setBackgroundTint(mBinding.progressBlock.bar2, R.color.colorSpaceSetupProgressOff)
-        Util.setBackgroundTint(mBinding.progressBlock.dot3, R.color.colorSpaceSetupProgressOff)
-        Util.setBackgroundTint(mBinding.progressBlock.bar3, R.color.colorSpaceSetupProgressOff)
-        Util.setBackgroundTint(mBinding.progressBlock.dot4, R.color.colorSpaceSetupProgressOff)
-    }
-
-    private fun progress2() {
-        Util.setBackgroundTint(mBinding.progressBlock.dot1, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.bar1, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.dot2, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.bar2, R.color.colorSpaceSetupProgressOff)
-        Util.setBackgroundTint(mBinding.progressBlock.dot3, R.color.colorSpaceSetupProgressOff)
-        Util.setBackgroundTint(mBinding.progressBlock.bar3, R.color.colorSpaceSetupProgressOff)
-        Util.setBackgroundTint(mBinding.progressBlock.dot4, R.color.colorSpaceSetupProgressOff)
-    }
-
-    private fun progress3() {
-        Util.setBackgroundTint(mBinding.progressBlock.dot1, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.bar1, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.dot2, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.bar2, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.dot3, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.bar3, R.color.colorSpaceSetupProgressOff)
-        Util.setBackgroundTint(mBinding.progressBlock.dot4, R.color.colorSpaceSetupProgressOff)
-    }
-
-    private fun progress4() {
-        Util.setBackgroundTint(mBinding.progressBlock.dot1, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.bar1, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.dot2, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.bar2, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.dot3, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.bar3, R.color.colorSpaceSetupProgressOn)
-        Util.setBackgroundTint(mBinding.progressBlock.dot4, R.color.colorSpaceSetupProgressOn)
-    }
 }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/ConsentActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/ConsentActivity.kt
index ecb1dad3..69b11260 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/ConsentActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/ConsentActivity.kt
@@ -18,8 +18,7 @@ class ConsentActivity: BaseActivity() {
         mBinding = ActivityConsentBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
 
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        setupToolbar(getString(R.string.health_checks))
 
         mBinding.explainer.text = getString(
             R.string.by_allowing_health_checks_you_give_permission_for_the_app_to_securely_send_health_check_data_to_the_s_team,
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/EditFolderActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/EditFolderActivity.kt
index 2082651a..004e7ce3 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/EditFolderActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/EditFolderActivity.kt
@@ -31,8 +31,8 @@ class EditFolderActivity : BaseActivity() {
         mBinding = ActivityEditFolderBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
 
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        setupToolbar("Edit Folder")
 
         mBinding.folderName.setOnEditorActionListener { _, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_DONE) {
@@ -44,6 +44,9 @@ class EditFolderActivity : BaseActivity() {
 
                     supportActionBar?.title = newName
                     mBinding.folderName.hint = newName
+
+
+                    setupToolbar(newName)
                 }
             }
 
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/FoldersActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/FoldersActivity.kt
index 94e6e959..35c43879 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/FoldersActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/FoldersActivity.kt
@@ -2,7 +2,9 @@ package net.opendasharchive.openarchive.features.settings
 
 import android.content.Intent
 import android.os.Bundle
+import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import net.opendasharchive.openarchive.FolderAdapter
 import net.opendasharchive.openarchive.FolderAdapterListener
@@ -11,71 +13,125 @@ import net.opendasharchive.openarchive.databinding.ActivityFoldersBinding
 import net.opendasharchive.openarchive.db.Project
 import net.opendasharchive.openarchive.db.Space
 import net.opendasharchive.openarchive.features.core.BaseActivity
-import net.opendasharchive.openarchive.util.extensions.hide
-import net.opendasharchive.openarchive.util.extensions.toggle
+import net.opendasharchive.openarchive.features.folders.AddFolderActivity
 
-class FoldersActivity: BaseActivity(), FolderAdapterListener {
+class FoldersActivity : BaseActivity(), FolderAdapterListener {
 
     companion object {
         const val EXTRA_SHOW_ARCHIVED = "show_archived"
+        const val EXTRA_SELECTED_SPACE_ID = "selected_space_id"
+        const val EXTRA_SELECTED_PROJECT_ID = "SELECTED_PROJECT_ID"
     }
 
     private lateinit var mBinding: ActivityFoldersBinding
     private lateinit var mAdapter: FolderAdapter
 
     private var mArchived = false
+    private var mSelectedSpaceId = -1L
+    private var mSelectedProjectId: Long = -1L
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         mArchived = intent.getBooleanExtra(EXTRA_SHOW_ARCHIVED, false)
+        mSelectedSpaceId = intent.getLongExtra(EXTRA_SELECTED_SPACE_ID, -1L)
+        mSelectedProjectId = intent.getLongExtra(EXTRA_SELECTED_PROJECT_ID, -1L)
 
         mBinding = ActivityFoldersBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
 
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.title = getString(if (mArchived) R.string.archived_folders else R.string.folders)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        setupToolbar(
+            title = getString(if (mArchived) R.string.archived_folders else R.string.folders),
+            showBackButton = true
+        )
 
-        mAdapter = FolderAdapter(this)
+        setupRecyclerView()
 
+        setupButtons()
+    }
+
+    private fun setupRecyclerView() {
+        mAdapter = FolderAdapter(context = this, listener = this, isArchived = mArchived)
         mBinding.rvProjects.layoutManager = LinearLayoutManager(this)
         mBinding.rvProjects.adapter = mAdapter
+    }
 
-        mBinding.btViewArchived.toggle(!mArchived)
-        mBinding.btViewArchived.setOnClickListener {
-            val i = Intent(this, FoldersActivity::class.java)
-            i.putExtra(EXTRA_SHOW_ARCHIVED, true)
-
-            startActivity(i)
+    private fun setupButtons() {
+        mBinding.fabAdd.apply {
+            visibility = if (mArchived) View.INVISIBLE else View.VISIBLE
+            setOnClickListener { addFolder() }
         }
     }
 
     override fun onResume() {
         super.onResume()
+        refreshProjects()
+        invalidateOptionsMenu()
+    }
 
-        val projects = if (mArchived) Space.current?.archivedProjects else Space.current?.projects
+    private fun refreshProjects() {
+        val projects = if (mArchived) {
+            Space.current?.archivedProjects
+        } else {
+            Space.current?.projects?.filter { !it.isArchived }
+        } ?: emptyList()
 
-        mAdapter.update(projects ?: emptyList())
+        mAdapter.update(projects)
+    }
+
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.menu_folder_list, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
+        val archivedCount = Space.get(mSelectedSpaceId)?.archivedProjects?.size ?: 0
+        menu?.findItem(R.id.action_archived_folders)?.isVisible = (!mArchived && archivedCount > 0)
+        return super.onPrepareOptionsMenu(menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            finish()
-            return true
-        }
+        return when (item.itemId) {
 
-        return super.onOptionsItemSelected(item)
+            R.id.action_archived_folders -> {
+                navigateToArchivedFolders()
+                true
+            }
+
+            else -> super.onOptionsItemSelected(item)
+        }
     }
 
-    override fun projectClicked(project: Project) {
-        val i = Intent(this, EditFolderActivity::class.java)
-        i.putExtra(EditFolderActivity.EXTRA_CURRENT_PROJECT_ID, project.id)
+    private fun navigateToArchivedFolders() {
+        val intent = Intent(this, FoldersActivity::class.java).apply {
+            putExtra(EXTRA_SHOW_ARCHIVED, true)
+            putExtra(EXTRA_SELECTED_SPACE_ID, mSelectedSpaceId)
+            putExtra(EXTRA_SELECTED_PROJECT_ID, mSelectedProjectId)
+        }
+        startActivity(intent)
+    }
 
-        startActivity(i)
+    private fun addFolder() {
+        val intent = Intent(this, AddFolderActivity::class.java)
+        startActivity(intent)
     }
 
     override fun getSelectedProject(): Project? {
-        return null
+        return Space.current?.projects?.find { it.id == mSelectedProjectId }
+    }
+
+    override fun projectClicked(project: Project) {
+        val resultIntent = Intent()
+        resultIntent.putExtra("SELECTED_FOLDER_ID", project.id)
+        setResult(RESULT_OK, resultIntent)
+        finish() // Close FoldersActivity and return to MainActivity
+    }
+
+    override fun projectEdit(project: Project) {
+        val intent = Intent(this, EditFolderActivity::class.java).apply {
+            putExtra(EditFolderActivity.EXTRA_CURRENT_PROJECT_ID, project.id)
+        }
+        startActivity(intent)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/GeneralSettingsActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/GeneralSettingsActivity.kt
index db392f4b..42b10140 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/GeneralSettingsActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/GeneralSettingsActivity.kt
@@ -158,8 +158,7 @@ class GeneralSettingsActivity: BaseActivity() {
         mBinding = ActivitySettingsContainerBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
 
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        setupToolbar(title = getString(R.string.general))
 
         supportFragmentManager
             .beginTransaction()
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/ProofModeSettingsActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/ProofModeSettingsActivity.kt
index 567ba40f..000b96fc 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/ProofModeSettingsActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/ProofModeSettingsActivity.kt
@@ -151,8 +151,8 @@ class ProofModeSettingsActivity: BaseActivity() {
         mBinding = ActivitySettingsContainerBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
 
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        setupToolbar(getString(R.string.proofmode))
+
 
         supportFragmentManager
             .beginTransaction()
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/SettingsFragment.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/SettingsFragment.kt
index 10d63fa4..57c841e3 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/SettingsFragment.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/SettingsFragment.kt
@@ -1,120 +1,193 @@
 package net.opendasharchive.openarchive.features.settings
 
+import android.app.Activity
+import android.app.AlertDialog
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreferenceCompat
 import net.opendasharchive.openarchive.R
+import net.opendasharchive.openarchive.core.presentation.theme.Theme
 import net.opendasharchive.openarchive.databinding.FragmentSettingsBinding
 import net.opendasharchive.openarchive.db.Space
 import net.opendasharchive.openarchive.features.core.BaseActivity
 import net.opendasharchive.openarchive.features.internetarchive.presentation.InternetArchiveActivity
+import net.opendasharchive.openarchive.features.settings.passcode.PasscodeRepository
+import net.opendasharchive.openarchive.features.settings.passcode.passcode_setup.PasscodeSetupActivity
 import net.opendasharchive.openarchive.services.gdrive.GDriveActivity
 import net.opendasharchive.openarchive.services.webdav.WebDavActivity
+import net.opendasharchive.openarchive.util.Prefs
+import net.opendasharchive.openarchive.util.Theme
 import net.opendasharchive.openarchive.util.extensions.Position
 import net.opendasharchive.openarchive.util.extensions.getVersionName
 import net.opendasharchive.openarchive.util.extensions.openBrowser
 import net.opendasharchive.openarchive.util.extensions.scaled
 import net.opendasharchive.openarchive.util.extensions.setDrawable
 import net.opendasharchive.openarchive.util.extensions.styleAsLink
+import org.koin.android.ext.android.inject
 import kotlin.math.roundToInt
 
-class SettingsFragment : Fragment() {
+class SettingsFragment : PreferenceFragmentCompat() {
 
-    private lateinit var mBinding: FragmentSettingsBinding
+    private val passcodeRepository by inject<PasscodeRepository>()
 
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
+    private var passcodePreference: SwitchPreferenceCompat? = null
 
-        mBinding = FragmentSettingsBinding.inflate(inflater, container, false)
+    private val activityResultLauncher = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) { result ->
+        if (result.resultCode == Activity.RESULT_OK) {
+            val passcodeEnabled = result.data?.getBooleanExtra("passcode_enabled", false) ?: false
+            passcodePreference?.isChecked = passcodeEnabled
+        } else {
+            passcodePreference?.isChecked = false
+        }
+    }
 
+//    override fun onCreateView(
+//        inflater: LayoutInflater,
+//        container: ViewGroup?,
+//        savedInstanceState: Bundle?
+//    ): View? {
+//        return ComposeView(requireContext()).apply {
+//            // Dispose of the Composition when the view's LifecycleOwner
+//            // is destroyed
+//            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+//            setContent {
+//                Theme {
+//                    SettingsScreen()
+//                }
+//            }
+//        }
+//    }
+
+    override fun onCreatePreferences(
+        savedInstanceState: Bundle?,
+        rootKey: String?
+    ) {
+        setPreferencesFromResource(R.xml.prefs_general, rootKey)
+
+
+        passcodePreference = findPreference(Prefs.PASSCODE_ENABLED)
+
+        passcodePreference?.setOnPreferenceChangeListener { _, newValue ->
+            val enabled = newValue as Boolean
+            if (enabled) {
+                // Launch PasscodeSetupActivity
+                val intent = Intent(context, PasscodeSetupActivity::class.java)
+                activityResultLauncher.launch(intent)
+            } else {
+                // Show confirmation dialog
+                AlertDialog.Builder(requireContext())
+                    .setTitle("Disable Passcode")
+                    .setMessage("Are you sure you want to disable the passcode?")
+                    .setPositiveButton("Yes") { _, _ ->
+                        passcodeRepository.clearPasscode()
+                        passcodePreference?.isChecked = false
+
+                        // Update the FLAG_SECURE dynamically
+                        (activity as? BaseActivity)?.updateScreenshotPrevention()
+                    }
+                    .setNegativeButton("No") { _, _ ->
+                        passcodePreference?.isChecked = true
+                    }
+                    .show()
+            }
+            // Return false to avoid the preference updating immediately
+            false
+        }
 
-        mBinding.btGeneral.setDrawable(R.drawable.ic_account_circle, Position.Start, 0.6)
-        mBinding.btGeneral.compoundDrawablePadding =
-            resources.getDimension(R.dimen.padding_small).roundToInt()
-        mBinding.btGeneral.setOnClickListener {
-            val context = context ?: return@setOnClickListener
+        findPreference<Preference>(Prefs.PROHIBIT_SCREENSHOTS)?.setOnPreferenceClickListener { _ ->
+            if (activity is BaseActivity) {
+                // make sure this gets settings change gets applied instantly
+                // (all other activities rely on the hook in BaseActivity.onResume())
+                (activity as BaseActivity).updateScreenshotPrevention()
+            }
 
-            startActivity(Intent(context, GeneralSettingsActivity::class.java))
+            true
         }
 
-        mBinding.btSpace.compoundDrawablePadding =
-            resources.getDimension(R.dimen.padding_small).roundToInt()
-        mBinding.btSpace.setOnClickListener {
-            startSpaceAuthActivity()
+        getPrefByKey<Preference>(R.string.pref_media_servers)?.setOnPreferenceClickListener {
+            startActivity(Intent(context, SpacesActivity::class.java))
+            true
         }
 
-        mBinding.btFolders.setDrawable(R.drawable.ic_folder, Position.Start, 0.6)
-        mBinding.btFolders.compoundDrawablePadding =
-            resources.getDimension(R.dimen.padding_small).roundToInt()
-        mBinding.btFolders.setOnClickListener {
-            val context = context ?: return@setOnClickListener
-
+        getPrefByKey<Preference>(R.string.pref_media_folders)?.setOnPreferenceClickListener {
             startActivity(Intent(context, FoldersActivity::class.java))
+            true
         }
 
-        mBinding.btAbout.text = getString(R.string.action_about, getString(R.string.app_name))
-        mBinding.btAbout.styleAsLink()
-        mBinding.btAbout.setOnClickListener {
-            context?.openBrowser("https://open-archive.org/save")
+        findPreference<Preference>("proof_mode")?.setOnPreferenceClickListener {
+            startActivity(Intent(context, ProofModeSettingsActivity::class.java))
+            true
         }
 
-        mBinding.btPrivacy.styleAsLink()
-        mBinding.btPrivacy.setOnClickListener {
-            context?.openBrowser("https://open-archive.org/privacy")
+        findPreference<Preference>(Prefs.USE_TOR)?.setOnPreferenceChangeListener { _, newValue ->
+            //Prefs.useTor = (newValue as Boolean)
+            //torViewModel.updateTorServiceState()
+            false
         }
 
-        val activity = activity
+        findPreference<Preference>(Prefs.THEME)?.setOnPreferenceChangeListener { _, newValue ->
+            Theme.set(Theme.get(newValue as? String))
 
-        if (activity != null) {
-            mBinding.version.text = getString(
-                R.string.version__,
-                activity.packageManager.getVersionName(activity.packageName)
-            )
+            true
         }
 
-        return mBinding.root
-    }
+        findPreference<Preference>(Prefs.UPLOAD_WIFI_ONLY)?.setOnPreferenceChangeListener { _, newValue ->
+            val intent =
+                Intent(Prefs.UPLOAD_WIFI_ONLY).apply { putExtra("value", newValue as Boolean) }
+            // Replace with shared ViewModel + LiveData
+            // LocalBroadcastManager.getInstance(requireContext()).sendBroadcast(intent)
+            true
+        }
 
-    override fun onResume() {
-        super.onResume()
+        val packageManager = requireActivity().packageManager
+        val versionText = packageManager.getVersionName(requireActivity().packageName)
 
-        updateSpace()
+        findPreference<Preference>("app_version")?.summary = versionText
     }
 
-    private fun updateSpace() {
-        val context = context ?: return
-        val space = Space.current
-
-        if (space != null) {
-            mBinding.btSpace.text = space.friendlyName
-
-            mBinding.btSpace.setDrawable(
-                space.getAvatar(context)?.scaled(24, context),
-                Position.Start, tint = true
-            )
-        } else {
-            mBinding.btSpace.visibility = View.GONE
-        }
+    private fun <T: Preference> getPrefByKey(key: Int): T? {
+        return findPreference(getString(key))
     }
 
-    private fun startSpaceAuthActivity() {
-        val space = Space.current ?: return
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
-        val clazz = when (space.tType) {
-            Space.Type.INTERNET_ARCHIVE -> InternetArchiveActivity::class.java
-            Space.Type.GDRIVE -> GDriveActivity::class.java
-            else -> WebDavActivity::class.java
-        }
-
-        val intent = Intent(context, clazz)
-        intent.putExtra(BaseActivity.EXTRA_DATA_SPACE, space.id)
-
-        startActivity(intent)
+        view.setPadding(0, 16.dpToPx(), 0, 0)
     }
+
+    fun Int.dpToPx(): Int = (this * resources.displayMetrics.density).toInt()
+
+
+//    mBinding.btAbout.text = getString(R.string.action_about, getString(R.string.app_name))
+//    mBinding.btAbout.styleAsLink()
+//    mBinding.btAbout.setOnClickListener {
+//        context?.openBrowser("https://open-archive.org/save")
+//    }
+//
+//    mBinding.btPrivacy.styleAsLink()
+//    mBinding.btPrivacy.setOnClickListener {
+//        context?.openBrowser("https://open-archive.org/privacy")
+//    }
+//
+//    val activity = activity
+//
+//    if (activity != null) {
+//        mBinding.version.text = getString(
+//            R.string.version__,
+//            activity.packageManager.getVersionName(activity.packageName)
+//        )
+//    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/SettingsScreen.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/SettingsScreen.kt
new file mode 100644
index 00000000..d612e334
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/SettingsScreen.kt
@@ -0,0 +1,124 @@
+package net.opendasharchive.openarchive.features.settings
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Info
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.tooling.preview.Preview
+import me.zhanghai.compose.preference.ProvidePreferenceLocals
+import me.zhanghai.compose.preference.listPreference
+import me.zhanghai.compose.preference.preference
+import me.zhanghai.compose.preference.preferenceCategory
+import me.zhanghai.compose.preference.switchPreference
+import net.opendasharchive.openarchive.features.internetarchive.presentation.login.DefaultScaffoldPreview
+
+@Composable
+fun SettingsScreen() {
+
+    val context = LocalContext.current
+
+    ProvidePreferenceLocals {
+        LazyColumn(modifier = Modifier.fillMaxSize()) {
+            // Secure Category
+            preferenceCategory(title = { Text("Secure") }, key = "secure")
+
+            switchPreference(
+                key = "pref_app_passcode",
+                defaultValue = false,
+                title = { Text("Lock app with passcode") },
+                summary = { Text("6 digit passcode") })
+
+            // Archive Category
+            preferenceCategory(title = { Text("Archive") }, key = "archive")
+            preference(
+                key = "pref_media_servers",
+                title = { Text("Media Servers") },
+                summary = { Text("Add or remove media servers") })
+            preference(
+                key = "pref_media_folders",
+                title = { Text("Media Folders") },
+                summary = { Text("Add or remove media folders") })
+
+            // Verify Category
+            preferenceCategory(title = { Text("Verify") }, key = "verify")
+            preference(
+                key = "proof_mode", title = { Text("Proof Mode") })
+
+            // Encrypt Category
+            preferenceCategory(title = { Text("Encrypt") }, key = "encrypt")
+            switchPreference(
+                key = "use_tor",
+                defaultValue = false,
+                title = { Text("Use Tor") },
+                summary = { Text("Enable Tor for encryption") })
+
+            // General Category
+            preferenceCategory(title = { Text("General") }, key = "general")
+            switchPreference(
+                key = "upload_wifi_only",
+                defaultValue = false,
+                title = { Text("Upload over Wi-Fi only") },
+                summary = { Text("Only upload media when connected to Wi-Fi") })
+            listPreference(
+                key = "theme",
+                title = { Text("Theme") },
+                summary = { Text("Choose app theme") },
+                values = listOf(
+                    "light" to "Light", "dark" to "Dark", "system" to "System Default"
+                ),
+                defaultValue = "system"
+            )
+
+            // About Category
+            preferenceCategory(title = { Text("About") }, key = "about")
+            preference(
+                key = "about_app",
+                title = { Text("Save by Open Archive") },
+                summary = { Text("Tap to view about Save App") },
+                onClick = {
+                    // Handle URL intent
+                    openUrl(context, "https://open-archive.org/save")
+                })
+            preference(
+                key = "privacy_policy",
+                title = { Text("Terms & Privacy Policy") },
+                summary = { Text("Tap to view our Terms & Privacy Policy") },
+                onClick = {
+                    // Handle URL intent
+                    openUrl(context, "https://open-archive.org/privacy")
+                })
+            preference(
+                key = "app_version",
+                title = { Text("Version") },
+                summary = { Text("0.7.2.4783") },
+                enabled = false
+            )
+        }
+    }
+}
+
+// Helper function for opening URLs
+
+private fun openUrl(context: Context, url: String) {
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+    context.startActivity(intent)
+}
+
+
+@Preview
+@Composable
+private fun SettingsScreenPreview() {
+    DefaultScaffoldPreview {
+
+        SettingsScreen()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupFragment.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupFragment.kt
index c253ed62..5640b8a8 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupFragment.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupFragment.kt
@@ -6,14 +6,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResult
 import net.opendasharchive.openarchive.databinding.FragmentSpaceSetupBinding
 import net.opendasharchive.openarchive.db.Space
 import net.opendasharchive.openarchive.features.main.MainActivity
+import net.opendasharchive.openarchive.features.onboarding.BaseFragment
 import net.opendasharchive.openarchive.util.extensions.hide
 
-class SpaceSetupFragment : Fragment() {
+class SpaceSetupFragment : BaseFragment() {
 
     private lateinit var mBinding: FragmentSpaceSetupBinding
 
@@ -74,4 +74,8 @@ class SpaceSetupFragment : Fragment() {
         const val RESULT_VAL_INTERNET_ARCHIVE = "internet_archive"
         const val RESULT_VAL_GDRIVE = "gdrive"
     }
+
+    override fun getToolbarTitle() = "Select a Server"
+    override fun getToolbarSubtitle(): String? = null
+    override fun shouldShowBackButton() = true
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupSuccessFragment.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupSuccessFragment.kt
index 0a77766e..a613cdaa 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupSuccessFragment.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupSuccessFragment.kt
@@ -5,11 +5,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResult
 import net.opendasharchive.openarchive.databinding.FragmentSpaceSetupSuccessBinding
+import net.opendasharchive.openarchive.features.onboarding.BaseFragment
 
-class SpaceSetupSuccessFragment : Fragment() {
+class SpaceSetupSuccessFragment : BaseFragment() {
     private lateinit var mBinding: FragmentSpaceSetupSuccessBinding
     private var message = ""
 
@@ -50,4 +50,7 @@ class SpaceSetupSuccessFragment : Fragment() {
                 }
             }
     }
+
+    override fun getToolbarTitle() = "Setup complete"
+    override fun shouldShowBackButton() = false
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpacesActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpacesActivity.kt
new file mode 100644
index 00000000..0e4f8ab9
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpacesActivity.kt
@@ -0,0 +1,81 @@
+package net.opendasharchive.openarchive.features.settings
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import net.opendasharchive.openarchive.R
+import net.opendasharchive.openarchive.SpaceAdapter
+import net.opendasharchive.openarchive.SpaceAdapterListener
+import net.opendasharchive.openarchive.SpaceItemDecoration
+import net.opendasharchive.openarchive.databinding.ActivitySpacesBinding
+import net.opendasharchive.openarchive.db.Space
+import net.opendasharchive.openarchive.features.core.BaseActivity
+import net.opendasharchive.openarchive.features.internetarchive.presentation.InternetArchiveActivity
+import net.opendasharchive.openarchive.features.onboarding.SpaceSetupActivity
+import net.opendasharchive.openarchive.services.gdrive.GDriveActivity
+import net.opendasharchive.openarchive.services.webdav.WebDavActivity
+
+class SpacesActivity : BaseActivity(), SpaceAdapterListener {
+
+    private lateinit var mBinding: ActivitySpacesBinding
+    private lateinit var mAdapter: SpaceAdapter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+
+        mBinding = ActivitySpacesBinding.inflate(layoutInflater)
+        setContentView(mBinding.root)
+
+        setupToolbar(title = "Servers", showBackButton = true)
+
+        mAdapter = SpaceAdapter(context = this, listener = this)
+
+        mBinding.rvProjects.layoutManager = LinearLayoutManager(this)
+        val spacing = resources.getDimensionPixelSize(R.dimen.list_item_spacing)
+        mBinding.rvProjects.addItemDecoration(SpaceItemDecoration(spacing))
+        mBinding.rvProjects.adapter = mAdapter
+
+
+        mBinding.fabAdd.setOnClickListener {
+            startActivity(Intent(this, SpaceSetupActivity::class.java))
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        val projects = Space.getAll().asSequence().toList()
+
+        mAdapter.update(projects)
+    }
+
+    override fun spaceClicked(space: Space) {
+        Space.current = space
+        finish()
+    }
+
+    override fun editSpaceClicked(spaceId: Long?) {
+        startSpaceAuthActivity(spaceId)
+    }
+
+    override fun getSelectedSpace(): Space? {
+        return Space.current
+    }
+
+    private fun startSpaceAuthActivity(spaceId: Long?) {
+        val space = Space.get(spaceId ?: return) ?: return
+
+        val clazz = when (space.tType) {
+            Space.Type.INTERNET_ARCHIVE -> InternetArchiveActivity::class.java
+            Space.Type.GDRIVE -> GDriveActivity::class.java
+            else -> WebDavActivity::class.java
+        }
+
+        val intent = Intent(this@SpacesActivity, clazz)
+        intent.putExtra(EXTRA_DATA_SPACE, space.id)
+
+        startActivity(intent)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/NumericKeypad.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/NumericKeypad.kt
index 6186a99a..57751fee 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/NumericKeypad.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/NumericKeypad.kt
@@ -148,7 +148,7 @@ private fun NumberButton(
                     onClick()
                 }
             )
-            .border(width = 2.dp, color = MaterialTheme.colorScheme.primary, shape = CircleShape)
+            .border(width = 2.dp, color = MaterialTheme.colorScheme.tertiary.copy(alpha = 0.5f), shape = CircleShape)
             .size(72.dp),
         contentAlignment = Alignment.Center
     ) {
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/PasscodeDots.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/PasscodeDots.kt
index a23886ba..a3596aa5 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/PasscodeDots.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/PasscodeDots.kt
@@ -1,5 +1,6 @@
 package net.opendasharchive.openarchive.features.settings.passcode.components
 
+import android.content.res.Configuration
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
@@ -15,8 +16,10 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
+import net.opendasharchive.openarchive.features.internetarchive.presentation.login.DefaultScaffoldPreview
 import kotlin.math.roundToInt
 
 @Composable
@@ -60,11 +63,24 @@ fun PasscodeDots(
                 modifier = Modifier
                     .size(20.dp)
                     .background(
-                        color = if (index < currentPasscodeLength) MaterialTheme.colorScheme.primary
+                        color = if (index < currentPasscodeLength) MaterialTheme.colorScheme.onBackground
                         else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.3f),
                         shape = CircleShape
                     )
             )
         }
     }
+}
+
+@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Preview
+@Composable
+private fun PasswordDotsPreview() {
+
+    DefaultScaffoldPreview {
+        PasscodeDots(
+            passcodeLength = 6,
+            currentPasscodeLength = 3
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryScreen.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryScreen.kt
index 9eecbed5..28a8eb23 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryScreen.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryScreen.kt
@@ -32,6 +32,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.flow.collectLatest
 import net.opendasharchive.openarchive.R
 import net.opendasharchive.openarchive.core.presentation.theme.Theme
+import net.opendasharchive.openarchive.features.internetarchive.presentation.login.DefaultScaffoldPreview
 import net.opendasharchive.openarchive.features.settings.passcode.AppHapticFeedbackType
 import net.opendasharchive.openarchive.features.settings.passcode.HapticManager
 import net.opendasharchive.openarchive.features.settings.passcode.components.MessageManager
@@ -179,6 +180,7 @@ fun PasscodeEntryScreenContent(
                         style = TextStyle(
                             fontSize = 16.sp,
                             fontWeight = FontWeight.Bold,
+                            color = MaterialTheme.colorScheme.onBackground
                         ),
                     )
                 }
@@ -194,7 +196,8 @@ fun PasscodeEntryScreenContent(
                         modifier = Modifier.padding(8.dp),
                         style = TextStyle(
                             fontSize = 16.sp,
-                            fontWeight = FontWeight.Bold
+                            fontWeight = FontWeight.Bold,
+                            color = MaterialTheme.colorScheme.onBackground
                         ),
                     )
                 }
@@ -213,13 +216,15 @@ fun PasscodeEntryScreenContent(
 @Composable
 private fun PasscodeEntryScreenPreview() {
 
-    Theme {
-        PasscodeEntryScreenContent(
-            state = PasscodeEntryScreenState(
-                passcodeLength = 6
-            ),
-            onAction = {},
-            onExit = {},
-        )
+    DefaultScaffoldPreview {
+        Theme {
+            PasscodeEntryScreenContent(
+                state = PasscodeEntryScreenState(
+                    passcodeLength = 6
+                ),
+                onAction = {},
+                onExit = {},
+            )
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupScreen.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupScreen.kt
index e9941b15..b1405697 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupScreen.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupScreen.kt
@@ -32,7 +32,7 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.flow.collectLatest
 import net.opendasharchive.openarchive.R
-import net.opendasharchive.openarchive.core.presentation.theme.Theme
+import net.opendasharchive.openarchive.features.internetarchive.presentation.login.DefaultScaffoldPreview
 import net.opendasharchive.openarchive.features.settings.passcode.AppHapticFeedbackType
 import net.opendasharchive.openarchive.features.settings.passcode.HapticManager
 import net.opendasharchive.openarchive.features.settings.passcode.components.MessageManager
@@ -207,7 +207,7 @@ private fun PasscodeSetupScreenContent(
 @Preview
 @Composable
 private fun PasscodeSetupScreenPreview() {
-    Theme {
+    DefaultScaffoldPreview {
         PasscodeSetupScreenContent(
             state = PasscodeSetupUiState(
                 passcodeLength = 6
diff --git a/app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveActivity.kt
index e8195e35..592cda97 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveActivity.kt
@@ -30,9 +30,7 @@ class GDriveActivity : BaseActivity() {
             if (space != null) removeSpace(space)
         }
 
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.title = getString(R.string.gdrive)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        setupToolbar(getString(R.string.gdrive))
 
         mBinding.gdriveId.setText(space?.displayname ?: "")
     }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveConduit.kt b/app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveConduit.kt
index 2420e134..a28d025f 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveConduit.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveConduit.kt
@@ -20,7 +20,7 @@ import com.google.api.services.drive.model.File
 import info.guardianproject.netcipher.proxy.OrbotHelper
 import net.opendasharchive.openarchive.R
 import net.opendasharchive.openarchive.db.Media
-import net.opendasharchive.openarchive.features.folders.BrowseFoldersViewModel
+import net.opendasharchive.openarchive.features.folders.Folder
 import net.opendasharchive.openarchive.services.Conduit
 import net.opendasharchive.openarchive.util.Prefs
 import org.apache.http.conn.ClientConnectionManager
@@ -174,8 +174,8 @@ class GDriveConduit(media: Media, context: Context) : Conduit(media, context) {
             return parentFolder
         }
 
-        fun listFoldersInRoot(gdrive: Drive): List<BrowseFoldersViewModel.Folder> {
-            val result = ArrayList<BrowseFoldersViewModel.Folder>()
+        fun listFoldersInRoot(gdrive: Drive): List<Folder> {
+            val result = ArrayList<Folder>()
             try {
                 var pageToken: String? = null
                 do {
@@ -185,7 +185,7 @@ class GDriveConduit(media: Media, context: Context) : Conduit(media, context) {
                             .setFields("nextPageToken, files(id, name, createdTime)").execute()
                     for (f in folders.files) {
                         val date = Date(f.createdTime.value)
-                        result.add(BrowseFoldersViewModel.Folder(f.name, date))
+                        result.add(Folder(f.name, date))
                     }
                     pageToken = folders.nextPageToken
                 } while (pageToken != null)
diff --git a/app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveFragment.kt b/app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveFragment.kt
index 4598d2fe..0c58fbd6 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveFragment.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveFragment.kt
@@ -9,7 +9,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.os.bundleOf
 import androidx.core.text.HtmlCompat
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResult
 import com.google.android.gms.auth.api.Auth
 import com.google.android.gms.auth.api.signin.GoogleSignIn
@@ -17,12 +16,12 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
-import net.opendasharchive.openarchive.CleanInsightsManager
 import net.opendasharchive.openarchive.R
 import net.opendasharchive.openarchive.databinding.FragmentGdriveBinding
 import net.opendasharchive.openarchive.db.Space
+import net.opendasharchive.openarchive.features.onboarding.BaseFragment
 
-class GDriveFragment : Fragment() {
+class GDriveFragment : BaseFragment() {
 
     private lateinit var mBinding: FragmentGdriveBinding
 
@@ -150,4 +149,6 @@ class GDriveFragment : Fragment() {
             mBinding.btAuthenticate.isEnabled = true
         }
     }
+
+    override fun getToolbarTitle() = "Google Drive"
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavActivity.kt
index b3959cb6..a6bd2af7 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavActivity.kt
@@ -26,8 +26,7 @@ class WebDavActivity : BaseActivity() {
         mBinding = ActivityWebdavBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
 
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        setupToolbar(title = "Edit Private Server", showBackButton = true)
 
         mSpaceId = intent.getLongExtra(EXTRA_DATA_SPACE, WebDavFragment.ARG_VAL_NEW_SPACE)
 
diff --git a/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavFragment.kt b/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavFragment.kt
index 27737ed4..b935a9ab 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavFragment.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavFragment.kt
@@ -9,7 +9,6 @@ import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResult
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.CoroutineScope
@@ -19,6 +18,7 @@ import net.opendasharchive.openarchive.BuildConfig
 import net.opendasharchive.openarchive.R
 import net.opendasharchive.openarchive.databinding.FragmentWebDavBinding
 import net.opendasharchive.openarchive.db.Space
+import net.opendasharchive.openarchive.features.onboarding.BaseFragment
 import net.opendasharchive.openarchive.services.SaveClient
 import net.opendasharchive.openarchive.services.internetarchive.Util
 import net.opendasharchive.openarchive.util.AlertHelper
@@ -31,7 +31,7 @@ import okhttp3.Response
 import java.io.IOException
 import kotlin.coroutines.suspendCoroutine
 
-class WebDavFragment : Fragment() {
+class WebDavFragment : BaseFragment() {
     private var mSpaceId: Long? = null
     private lateinit var mSpace: Space
 
@@ -51,7 +51,7 @@ class WebDavFragment : Fragment() {
 
         mSpaceId = arguments?.getLong(ARG_SPACE_ID) ?: ARG_VAL_NEW_SPACE
 
-        if (ARG_VAL_NEW_SPACE != mSpaceId) {
+        if (mSpaceId != ARG_VAL_NEW_SPACE) {
             // setup views for editing and existing space
 
             mSpace = Space.get(mSpaceId!!) ?: Space(Space.Type.WEBDAV)
@@ -80,7 +80,6 @@ class WebDavFragment : Fragment() {
 //            }
 
 
-
             binding.btRemove.setOnClickListener {
                 removeProject()
             }
@@ -154,12 +153,6 @@ class WebDavFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         mSnackbar = binding.root.makeSnackBar(getString(R.string.login_activity_logging_message))
-
-        if (BuildConfig.DEBUG) {
-            binding.server.setText("https://nx27277.your-storageshare.de/")
-            binding.username.setText("Upul")
-            binding.password.setText("J7wc(ka_4#9!13h&")
-        }
     }
 
     private fun fixSpaceUrl(url: CharSequence?): Uri? {
@@ -357,4 +350,10 @@ class WebDavFragment : Fragment() {
         @JvmStatic
         fun newInstance() = newInstance(ARG_VAL_NEW_SPACE)
     }
+
+    override fun getToolbarTitle(): String = if (mSpaceId == ARG_VAL_NEW_SPACE) {
+        "Add Private Server"
+    } else {
+        "Edit Private Server"
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavSetupLicenseFragment.kt b/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavSetupLicenseFragment.kt
index 75337de8..d1804df1 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavSetupLicenseFragment.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavSetupLicenseFragment.kt
@@ -7,15 +7,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResult
 import net.opendasharchive.openarchive.R
 import net.opendasharchive.openarchive.databinding.FragmentWebdavSetupLicenseBinding
 import net.opendasharchive.openarchive.db.Space
+import net.opendasharchive.openarchive.features.onboarding.BaseFragment
 import net.opendasharchive.openarchive.features.settings.CcSelector
 import kotlin.properties.Delegates
 
-class WebDavSetupLicenseFragment: Fragment() {
+class WebDavSetupLicenseFragment: BaseFragment() {
 
     private lateinit var binding: FragmentWebdavSetupLicenseBinding
 
@@ -108,4 +108,8 @@ class WebDavSetupLicenseFragment: Fragment() {
             }
         }
     }
+
+    override fun getToolbarTitle() = "Select a License"
+    override fun getToolbarSubtitle(): String? = null
+    override fun shouldShowBackButton() = false
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/upload/UploadManagerActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/upload/UploadManagerActivity.kt
index bc464488..493a1ce1 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/upload/UploadManagerActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/upload/UploadManagerActivity.kt
@@ -59,8 +59,10 @@ class UploadManagerActivity : BaseActivity() {
         mBinding = ActivityUploadManagerBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
 
-        setSupportActionBar(mBinding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        setupToolbar(
+            title = getString(R.string.uploads),
+            showBackButton = true
+        )
 
         mFrag = supportFragmentManager.findFragmentById(R.id.fragUploadManager) as? UploadManagerFragment
     }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/util/Prefs.kt b/app/src/main/java/net/opendasharchive/openarchive/util/Prefs.kt
index 67f55697..23e90f4b 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/util/Prefs.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/util/Prefs.kt
@@ -11,10 +11,10 @@ import org.witness.proofmode.ProofModeConstants
 object Prefs {
     const val PASSCODE_ENABLED = "passcode_enabled"
     private const val DID_COMPLETE_ONBOARDING = "did_complete_onboarding"
-    private const val UPLOAD_WIFI_ONLY = "upload_wifi_only"
+    const val UPLOAD_WIFI_ONLY = "upload_wifi_only"
     private const val NEARBY_USE_BLUETOOTH = "nearby_use_bluetooth"
     private const val NEARBY_USE_WIFI = "nearby_use_wifi"
-    private const val USE_TOR = "use_tor"
+    const val USE_TOR = "use_tor"
     const val PROHIBIT_SCREENSHOTS = "prohibit_screenshots"
     const val USE_PROOFMODE = "use_proofmode"
     const val USE_PROOFMODE_KEY_ENCRYPTION = "proofmode_key_encryption"
@@ -23,6 +23,7 @@ object Prefs {
     private const val CURRENT_SPACE_ID = "current_space"
     private const val FLAG_HINT_SHOWN = "ft.flag"
     private const val BATCH_HINT_SHOWN = "ft.batch"
+    private const val ADD_MEDIA_HINT = "ft.addMedia"
     private const val DONT_SHOW_UPLOAD_HINT = "ft.upload"
     private const val IA_HINT_SHOWN = "ft.ia"
     private const val ADD_FOLDER_HINT_SHOWN = "ft.add_folder"
@@ -120,6 +121,12 @@ object Prefs {
             prefs?.edit()?.putBoolean(FLAG_HINT_SHOWN, value)?.apply()
         }
 
+    var addMediaHint: Boolean
+        get() = prefs?.getBoolean(ADD_MEDIA_HINT, false) ?: false
+        set(value) {
+            prefs?.edit()?.putBoolean(ADD_MEDIA_HINT, value)?.apply()
+        }
+
     var batchHintShown: Boolean
         get() = prefs?.getBoolean(BATCH_HINT_SHOWN, false) ?: false
         set(value) {
diff --git a/app/src/main/java/net/opendasharchive/openarchive/util/Theme.kt b/app/src/main/java/net/opendasharchive/openarchive/util/Theme.kt
index 5099d1cb..ea053a39 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/util/Theme.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/util/Theme.kt
@@ -45,7 +45,7 @@ enum class Theme(val mode: Int) {
          * @param name: Theme name, case insensitive.
          */
         fun get(name: String?): Theme {
-            return values().firstOrNull { it.name.uppercase() == name?.uppercase() } ?: SYSTEM
+            return entries.firstOrNull { it.name.uppercase() == name?.uppercase() } ?: SYSTEM
         }
     }
 }
diff --git a/app/src/main/java/net/opendasharchive/openarchive/util/extensions/TextView.kt b/app/src/main/java/net/opendasharchive/openarchive/util/extensions/TextView.kt
index 98d3b429..f5f9ece8 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/util/extensions/TextView.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/util/extensions/TextView.kt
@@ -44,10 +44,10 @@ fun TextView.setDrawable(drawable: Drawable?, position: Position, scale: Double
 }
 
 fun TextView.styleAsLink() {
-        setText(SpannableString(text).apply {
-            setSpan(URLSpan(""), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-        }, TextView.BufferType.SPANNABLE)
+    setText(SpannableString(text).apply {
+        setSpan(URLSpan(""), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+    }, TextView.BufferType.SPANNABLE)
 
-        isClickable = true
-        isFocusable = true
+    isClickable = true
+    isFocusable = true
 }
\ No newline at end of file
diff --git a/app/src/main/res/animator/custom_fab_animator.xml b/app/src/main/res/animator/custom_fab_animator.xml
new file mode 100644
index 00000000..6c2fe41c
--- /dev/null
+++ b/app/src/main/res/animator/custom_fab_animator.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <set>
+            <objectAnimator
+                android:duration="100"
+                android:propertyName="scaleX"
+                android:valueTo="1.2"
+                android:valueType="floatType" />
+            <objectAnimator
+                android:duration="100"
+                android:propertyName="scaleY"
+                android:valueTo="1.2"
+                android:valueType="floatType" />
+        </set>
+    </item>
+    <item>
+        <set>
+            <objectAnimator
+                android:duration="100"
+                android:propertyName="scaleX"
+                android:valueTo="1"
+                android:valueType="floatType" />
+            <objectAnimator
+                android:duration="100"
+                android:propertyName="scaleY"
+                android:valueTo="1"
+                android:valueType="floatType" />
+        </set>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/hands_mobile_updated.xml b/app/src/main/res/drawable-night/hands_mobile_updated.xml
new file mode 100644
index 00000000..f934e7d2
--- /dev/null
+++ b/app/src/main/res/drawable-night/hands_mobile_updated.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="307dp"
+    android:height="268dp"
+    android:viewportWidth="307"
+    android:viewportHeight="268">
+  <path
+      android:pathData="M159.64,82.26L157.62,86.39C157.62,86.39 151.79,85.81 148.69,88.06C148.69,88.06 147.41,88.77 145.85,90.76C144.3,92.75 144.37,94.49 144.37,94.49C144.37,94.49 144.15,96.82 145.52,98.68C146.89,100.54 148.83,100.97 148.83,100.97C148.83,100.97 151.14,101.68 153.36,100.41C153.36,100.41 154.95,99.61 155.81,98C156.68,96.4 157.39,94.86 157.39,94.86L158.57,92.14L168,69.07L169.15,66.33C169.15,66.33 171.06,61.96 173.41,60.2C173.41,60.2 174.88,58.49 178.45,57.06C182.01,55.62 183.96,55.9 183.96,55.9C183.96,55.9 186.4,55.75 188.54,56.39C190.68,57.04 191.41,57.42 191.41,57.42C191.41,57.42 195.29,59.14 197.7,62.67C200.11,66.21 200.45,68.56 200.45,68.56C200.45,68.56 201.46,72.52 200.58,76.25C199.7,79.98 197.98,82.2 197.98,82.2C197.98,82.2 194.73,87.62 185.79,87.6C185.79,87.6 180.61,88.01 175.43,85.1L177.42,80.92C177.42,80.92 185.7,82.2 189.38,76.29C193.05,70.38 188.1,67.26 188.1,67.26C188.1,67.26 185.45,65.14 181.97,66.81C181.97,66.81 180.44,67.53 179.6,68.78C178.76,70.02 177.96,71.82 177.96,71.82L166.51,99.64C166.51,99.64 164.33,106.26 158.98,109.13C158.98,109.13 156.65,110.44 155.33,110.76C155.33,110.76 153.42,111.83 148.72,111.31C144.02,110.8 140.84,108.14 140.84,108.14C140.84,108.14 137,105.64 135.34,100.86C134.77,99.35 134.38,97.77 134.19,96.17C133.85,93.47 134.82,89.85 134.82,89.85C134.82,89.85 136.84,80 148.73,79.64C148.73,79.64 155.31,79.39 159.64,82.26Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M220.85,256.96C221.97,254.13 222.05,245.99 213.45,236.11C204.86,226.22 202.55,195.44 202.47,181.28C202.47,178.02 202.85,171.35 204.38,170.73C204.18,165.88 207.19,153.98 205.46,145.57C205.43,145.42 205.39,145.27 205.36,145.12M242.76,163.2C242.27,160.99 241.77,158.95 241.28,157.09M240.52,154.38C242.15,154.4 244.38,154.3 246.93,154.01M240.52,154.38C239.47,150.8 238.48,148.04 237.73,146.21M240.52,154.38C240.77,155.24 241.02,156.14 241.28,157.09M270.27,145.95C268.22,147.51 265.9,148.79 263.46,149.85M263.46,149.85C262.32,148.49 260.31,144.87 260.33,140.23M263.46,149.85C257.95,152.24 251.83,153.47 246.93,154.01M275.34,118.86C273.47,118.82 269,119.53 266.09,122.72C265.89,122.93 265.71,123.15 265.53,123.36M262.87,127.74C261.66,130.58 261.06,133.9 260.48,138.17C260.38,138.87 260.34,139.56 260.33,140.23M262.87,127.74C258.03,124.31 248.56,115.77 247.76,108.05M262.87,127.74C263.54,126.16 264.39,124.73 265.53,123.36M249.5,91.9C248.9,93.61 247.71,99.04 247.71,107.02C247.71,107.36 247.73,107.71 247.76,108.05M247.76,108.05C243.91,105.38 237,100.44 231.77,96.38M226.04,91.58C222.23,87.82 226.36,80.23 228.91,76.9M226.04,91.58C221.91,89.86 213.38,86.03 212.38,84.43L212.49,84.11M226.04,91.58C227.26,92.77 229.33,94.48 231.77,96.38M212.49,84.11L214.35,78.9C214.3,78.62 214.15,78.26 213.87,78.1M212.49,84.11C212.04,85.38 210.96,88.33 210.29,90.03C209.62,91.73 208.98,90.4 208.74,89.52C209.63,86.17 211.69,79.26 212.74,78.38C213.24,77.96 213.61,77.94 213.87,78.1M213.87,78.1L215.06,74.39M215.06,74.39C214.59,74.24 213.77,73.6 214.35,72.21C214.92,70.82 216.93,64.64 217.87,61.72C218.27,61.45 218.91,61.16 219.42,61.25M215.06,74.39C215.06,74.96 215.78,74.63 216.14,74.39C216.82,72.72 217.82,70.14 218.65,67.77M219.42,61.25C219.77,61.32 220.06,61.57 220.14,62.17C220.24,62.91 219.54,65.23 218.65,67.77M219.42,61.25L227.48,38.74C228.77,34.18 229.46,24.12 221.87,20.47C214.28,16.81 183.34,6.72 168.81,2.13C165.53,1.59 158.08,2.44 154.55,10.11C152.4,14.77 144.44,37.85 136.46,61.46M122.56,103.03C120.73,100.47 117.39,95.7 115.92,93.25M122.56,103.03C123.67,99.7 124.91,95.94 126.26,91.9M122.56,103.03C122.95,103.42 123.47,103.96 124,104.57M137.13,118.41C137.6,119.96 135.69,120.64 134.68,120.79C133.03,119.03 129.28,115.22 127.52,114.04C125.5,112.68 126.78,111.16 126.73,109.34M137.13,118.41C136.65,116.87 130.32,112.1 127.22,109.92L126.73,109.34M137.13,118.41C138,119.98 138.86,123.57 135.27,125.43C131.12,127.57 121.88,126.73 119.04,125.67M126.73,109.34C126.73,109.17 126.71,109 126.68,108.82C126.57,108.2 126.14,107.39 125.57,106.57M105.2,118.41C107.82,119.38 113.14,121.65 113.37,123.04C113.52,123.88 114.27,124.19 115.22,124.43M105.2,118.41L108.3,107.08M105.2,118.41C102.62,120.17 96.88,123.43 93.62,123.12M52.2,112.56C53.72,111.85 57.54,109.39 60.74,105.22C63.94,101.05 71.66,98.85 75.12,98.27C81.96,96.15 97.3,91.32 103.89,89C112.12,86.11 114.81,90.42 115.22,91.9C115.29,92.14 115.54,92.62 115.92,93.25M115.92,93.25C116.32,92.56 118.95,91.33 126.26,91.9M126.26,91.9C129.32,82.71 132.89,72.03 136.46,61.46M136.46,61.46C131.27,62.9 118.02,66.98 106.51,71.82C92.13,77.87 87.71,73.82 75.84,86.49C63.96,99.17 52.02,105.09 46.83,114.04C41.64,122.98 36.75,135.4 29.82,139.52C24.29,142.81 8.3,153.76 1,158.82M89.98,134.56C87.95,130.32 89.2,122.14 93.14,123.04C93.29,123.08 93.45,123.1 93.62,123.12M93.62,123.12C93.8,126.53 93.74,134.52 92.07,139.26C89.98,145.18 69.03,188.55 57.69,193.31M115.22,124.43L106.69,149.81C105,153.8 103.46,163.16 110.81,168.67L143.75,186.36M115.22,124.43C115.81,124.57 116.48,124.68 117.13,124.86M199.45,118.54C199.22,117.76 199.02,117.08 198.83,116.54C198.3,113.04 198.25,107.89 199.74,103.61M199.45,118.54C200.2,121.23 201.14,125.26 202.16,129.93M199.45,118.54C198.16,122.56 196.56,127.53 194.79,132.95M119.04,125.67C118.82,125.59 118.64,125.51 118.51,125.43C118.08,125.17 117.61,125 117.13,124.86M119.04,125.67L109.85,152.26C108.92,155.2 108.29,161.73 113.25,164.36C118.22,166.98 145.84,181.24 159.03,188.04C161.26,189.37 166.39,190.16 169.11,182.7C171.83,175.23 203.79,82.33 219.42,36.81C220.71,33.81 221.75,27.14 215.54,24.46L209.1,22.4C208.66,22.34 207.71,22.59 207.43,24.14C207.07,26.07 205.04,27.93 200.21,26.2C196.34,24.81 181.09,19.27 173.95,16.67C173.33,15.81 172.38,13.47 173.53,10.95C173.59,10.65 173.38,9.95 172.1,9.59C170.49,9.14 161.35,4.32 157.6,12.81C154.59,19.61 134.99,78.15 125.57,106.57M125.57,106.57C125.1,105.89 124.54,105.2 124,104.57M124,104.57C133.25,76.24 152.59,17.84 155.98,10.95C159.37,4.05 164.72,3.74 166.96,4.45C182.68,9.62 215.28,20.65 219.96,23.43C224.64,26.21 223.82,33.13 222.82,36.24C206.95,82.18 174.38,176.04 171.08,183.92C167.79,191.79 162.11,192.31 159.68,191.58C144.21,183.66 112.76,167.37 110.81,165.51C108.36,163.2 107.35,161.46 107.64,155.35C107.88,150.46 114.07,132.99 117.13,124.86M216.14,97.16C214.73,96.45 213.08,96.02 211.13,95.89C204.7,95.46 201.34,99.05 199.74,103.61M216.14,97.16C218.62,99.56 218.8,104.91 218.59,107.28C215.13,106.81 207.24,106.62 203.37,109.66L199.74,103.61M216.14,97.16C221.76,99.98 223.68,107.2 226.61,117.32M216.14,97.16C217.29,94.41 227.04,95.5 231.77,96.38M223.78,120.92C221.31,120.56 216.12,120.35 215.06,122.46M215.78,118.54C213.77,118.82 209.47,119.86 208.32,121.82M218.65,67.77C220.14,67.75 225.79,69.27 236.49,75.55C249.86,83.4 258.69,82.7 266.15,91.9C272.12,99.26 286.58,114.96 293.06,121.89M293.06,121.89C297,125.92 304.9,135.13 305,139.71C305.05,142.02 303.62,148.6 301.83,155.86M293.06,121.89C294.99,124.79 298.55,132.53 297.36,140.23C296.17,147.92 293.28,153.43 291.99,155.22M296.52,175.81C297.95,170.79 300.06,163 301.83,155.86M301.83,155.86C302.71,156.91 304.21,160.51 303.15,166.48C302.09,172.45 289.26,236.45 282.98,267.7M260.33,140.23C257.88,137.67 253.1,132.08 250.31,126.9M248.72,123.36C248.22,122.89 247.14,122.16 245.5,121.44M248.72,123.36C248.72,122.44 249.03,119.88 250.27,117M248.72,123.36C249.1,124.49 249.65,125.69 250.31,126.9M226.61,117.32C227.74,117.72 231.54,118.72 237.74,119.44C239.34,119.63 240.77,119.91 242.04,120.25M226.61,117.32C227.21,119.39 227.85,121.58 228.58,123.88M246.63,112.62C245.34,113.69 242.61,116.72 242.04,120.25M242.04,120.25C243.38,120.6 244.54,121.02 245.5,121.44M247.29,117.32L245.5,121.44M143.75,186.36L159.68,194.92C163.22,196.27 171.39,196.66 175.74,187.39C178.16,182.22 183.38,167.3 188.57,151.81M143.75,186.36C144.19,187.84 145.4,190.91 147.29,193.51M130.32,196.21C131.93,200.13 138.56,205.35 143.75,207.66C147.9,209.52 150.77,206.08 151.69,204.13C151.79,203.5 151.85,202.56 151.74,201.49M130.32,196.21C128.71,192.28 124.65,191.51 123.04,187.39M130.32,196.21C129.82,194.77 129.39,191.35 131.63,189.13M123.04,187.39C119.86,186.04 113.41,182.81 113.07,180.7M123.04,187.39C122.64,186.56 122.17,184.43 123.46,182.63M113.07,180.7C111.96,180.44 109.54,180.19 108.78,181.22C107.89,182.41 102.07,187.06 100.48,185.82M113.07,180.7C112.12,179.21 110.62,175.37 112.24,171.95M97.32,131.67C93.38,144.92 99.29,182.95 100.18,185.4C100.25,185.58 100.35,185.72 100.48,185.82M151.74,201.49C151.54,199.59 150.83,197.27 149,195.5C148.38,194.9 147.81,194.22 147.29,193.51M151.74,201.49L146.79,196.6L147.29,193.51M100.48,185.82C87.99,197.27 58.15,219.18 38.72,215.32C35.95,215.28 29.68,215.91 26.72,218.8M246.93,154.01C245.88,152.21 243.87,148.32 244.25,147.24M244.25,147.24C244.63,146.16 246.48,141.21 247.35,138.87M244.25,147.24C242.25,147.09 238.15,146.67 237.73,146.21M237.73,146.21C237.4,145.4 237.12,144.77 236.91,144.34C233.03,136.92 230.51,130.01 228.58,123.88M244.13,138.04C243.55,138.45 242.32,139.92 242.04,142.54M250.31,126.9L228.58,123.88M202.16,129.93C199.83,130.74 195.09,132.49 194.79,132.95M202.16,129.93C203.18,134.58 204.28,139.88 205.36,145.12M194.79,132.95C194.17,134.87 193.52,136.84 192.86,138.85M192.86,138.85C191.47,143.08 190.02,147.46 188.57,151.81M192.86,138.85C194.29,139.5 196.58,141.43 195.97,144.38M188.57,151.81C189.93,153.35 193.04,150.65 195.43,145.89C195.7,145.36 195.87,144.86 195.97,144.38M195.97,144.38C198.97,145.01 205.05,146.04 205.36,145.12M267.28,117C266.51,117.66 265.08,119.86 265.53,123.36M241.28,157.09C243.9,159.96 249.55,165.35 251.17,163.91M193.82,18.86C193.98,19.27 194.07,20.06 193.16,19.95C192.26,19.85 187.77,18.2 185.64,17.38C185.38,17.04 185.11,16.35 186.06,16.35C187.02,16.35 191.63,18.02 193.82,18.86ZM183.26,15.39C183.32,15.81 183.28,16.67 182.66,16.67C182.04,16.67 182.08,15.81 182.18,15.39C182.38,15.06 182.87,14.61 183.26,15.39Z"
+      android:strokeWidth="2.64118"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/avd_splash_animator.xml b/app/src/main/res/drawable/avd_splash_animator.xml
new file mode 100644
index 00000000..60d759ba
--- /dev/null
+++ b/app/src/main/res/drawable/avd_splash_animator.xml
@@ -0,0 +1,78 @@
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector
+            android:name="vector"
+            android:width="288dp"
+            android:height="288dp"
+            android:viewportWidth="288"
+            android:viewportHeight="288">
+            <group
+                android:name="group"
+                android:pivotX="144"
+                android:pivotY="144">
+                <path
+                    android:name="path_2"
+                    android:pathData="M 109.905 124.554 L 106.915 130.9 C 106.915 130.9 98.251 130.011 93.649 133.468 C 93.649 133.468 91.758 134.554 89.447 137.616 C 87.135 140.678 87.249 143.345 87.249 143.345 C 87.249 143.345 86.919 146.925 88.956 149.786 C 90.993 152.647 93.859 153.321 93.859 153.321 C 93.859 153.321 97.293 154.407 100.585 152.457 C 100.585 152.457 102.945 151.222 104.228 148.753 C 105.512 146.284 106.565 143.929 106.565 143.929 L 108.316 139.74 L 122.32 104.279 L 124.033 100.066 C 124.033 100.066 126.867 93.349 130.355 90.65 C 130.355 90.65 132.535 88.016 137.828 85.81 C 143.122 83.605 146.019 84.034 146.019 84.034 C 146.019 84.034 149.631 83.804 152.808 84.792 C 155.985 85.78 157.075 86.372 157.075 86.372 C 157.075 86.372 162.835 89.005 166.416 94.442 C 169.997 99.878 170.495 103.491 170.495 103.491 C 170.495 103.491 171.989 109.581 170.682 115.31 C 169.376 121.039 166.821 124.462 166.821 124.462 C 166.821 124.462 161.994 132.79 148.729 132.76 C 148.729 132.76 141.037 133.386 133.347 128.908 L 136.304 122.489 C 136.304 122.489 148.604 124.464 154.054 115.377 C 159.503 106.291 152.149 101.486 152.149 101.486 C 152.149 101.486 148.226 98.228 143.056 100.796 C 143.056 100.796 140.783 101.916 139.538 103.824 C 138.292 105.733 137.109 108.499 137.109 108.499 L 120.112 151.263 C 120.112 151.263 116.874 161.437 108.933 165.847 C 108.933 165.847 105.476 167.856 103.515 168.35 C 103.515 168.35 100.681 169.996 93.706 169.206 C 86.731 168.416 81.996 164.337 81.996 164.337 C 81.996 164.337 76.298 160.485 73.838 153.143 C 72.99 150.821 72.415 148.398 72.125 145.928 C 71.626 141.781 73.058 136.213 73.058 136.213 C 73.058 136.213 76.065 121.069 93.72 120.525 C 93.72 120.529 103.482 120.134 109.905 124.554 Z"
+                    android:fillColor="#00b4a6"
+                    android:strokeWidth="1"/>
+                <path
+                    android:name="path_3"
+                    android:pathData="M 153.19 144.972 C 153.172 143.911 153.155 142.848 152.81 141.852 C 152.116 139.85 150.409 136.986 146.194 136.012 C 139.467 134.456 135.824 135.645 135.824 135.645 C 135.824 135.645 131.051 136.834 127.182 140.015 L 131.2 146.04 C 131.2 146.04 134.703 143.275 138.463 143.028 C 142.223 142.781 143.251 144.287 143.251 144.287 C 143.251 144.287 144.302 145.028 143.928 148.064 C 143.928 148.064 133.714 148.106 129.355 150.575 C 124.996 153.044 124.218 155.086 124.218 155.086 C 124.218 155.086 120.633 161.966 125.153 166.675 C 129.672 171.384 137.484 168.387 137.484 168.387 C 137.484 168.387 140.286 167.004 141.719 165.094 L 141.563 168.42 L 150.353 168.485 C 150.353 168.485 150.006 166.362 152.151 154.238 C 153.269 147.936 153.222 146.704 153.19 144.972 Z M 142.896 156.679 C 142.896 156.679 142.195 159.889 139.393 161.395 C 136.591 162.902 134.605 162.161 134.605 162.161 C 130.121 160.926 132.504 157.025 132.504 157.025 C 134.488 154.63 139.327 154.457 139.327 154.457 L 143.325 154.31 L 142.896 156.679 Z"
+                    android:fillColor="#00b4a6"
+                    android:strokeWidth="1"/>
+                <path
+                    android:name="path_4"
+                    android:pathData="M 153.19 144.972 C 153.172 143.911 153.155 142.848 152.81 141.852 C 152.116 139.85 150.409 136.986 146.194 136.012 C 139.467 134.456 135.824 135.645 135.824 135.645 C 135.824 135.645 131.051 136.834 127.182 140.015 L 131.2 146.04 C 131.2 146.04 134.703 143.275 138.463 143.028 C 142.223 142.781 143.251 144.287 143.251 144.287 C 143.251 144.287 144.302 145.028 143.928 148.064 C 143.928 148.064 133.714 148.106 129.355 150.575 C 124.996 153.044 124.218 155.086 124.218 155.086 C 124.218 155.086 120.633 161.966 125.153 166.675 C 129.672 171.384 137.484 168.387 137.484 168.387 C 137.484 168.387 140.286 167.004 141.719 165.094 L 141.563 168.42 L 150.353 168.485 C 150.353 168.485 150.006 166.362 152.151 154.238 C 153.269 147.936 153.222 146.704 153.19 144.972 Z M 142.896 156.679 C 142.896 156.679 142.195 159.889 139.393 161.395 C 136.591 162.902 134.605 162.161 134.605 162.161 C 130.121 160.926 132.504 157.025 132.504 157.025 C 134.488 154.63 139.327 154.457 139.327 154.457 L 143.325 154.31 L 142.896 156.679 Z"
+                    android:fillColor="#00b4a6"
+                    android:strokeWidth="1"/>
+                <path
+                    android:name="path_5"
+                    android:pathData="M 153.19 144.972 C 153.172 143.911 153.155 142.848 152.81 141.852 C 152.116 139.85 150.409 136.986 146.194 136.012 C 139.467 134.456 135.824 135.645 135.824 135.645 C 135.824 135.645 131.051 136.834 127.182 140.015 L 131.2 146.04 C 131.2 146.04 134.703 143.275 138.463 143.028 C 142.223 142.781 143.251 144.287 143.251 144.287 C 143.251 144.287 144.302 145.028 143.928 148.064 C 143.928 148.064 133.714 148.106 129.355 150.575 C 124.996 153.044 124.218 155.086 124.218 155.086 C 124.218 155.086 120.633 161.966 125.153 166.675 C 129.672 171.384 137.484 168.387 137.484 168.387 C 137.484 168.387 140.286 167.004 141.719 165.094 L 141.563 168.42 L 150.353 168.485 C 150.353 168.485 150.006 166.362 152.151 154.238 C 153.269 147.936 153.222 146.704 153.19 144.972 Z M 142.896 156.679 C 142.896 156.679 142.195 159.889 139.393 161.395 C 136.591 162.902 134.605 162.161 134.605 162.161 C 130.121 160.926 132.504 157.025 132.504 157.025 C 134.488 154.63 139.327 154.457 139.327 154.457 L 143.325 154.31 L 142.896 156.679 Z"
+                    android:fillColor="#00b4a6"
+                    android:strokeWidth="1"/>
+                <path
+                    android:name="path_6"
+                    android:pathData="M 153.19 144.972 C 153.172 143.911 153.155 142.848 152.81 141.852 C 152.116 139.85 150.409 136.986 146.194 136.012 C 139.467 134.456 135.824 135.645 135.824 135.645 C 135.824 135.645 131.051 136.834 127.182 140.015 L 131.2 146.04 C 131.2 146.04 134.703 143.275 138.463 143.028 C 142.223 142.781 143.251 144.287 143.251 144.287 C 143.251 144.287 144.302 145.028 143.928 148.064 C 143.928 148.064 133.714 148.106 129.355 150.575 C 124.996 153.044 124.218 155.086 124.218 155.086 C 124.218 155.086 120.633 161.966 125.153 166.675 C 129.672 171.384 137.484 168.387 137.484 168.387 C 137.484 168.387 140.286 167.004 141.719 165.094 L 141.563 168.42 L 150.353 168.485 C 150.353 168.485 150.006 166.362 152.151 154.238 C 153.269 147.936 153.222 146.704 153.19 144.972 Z M 142.896 156.679 C 142.896 156.679 142.195 159.889 139.393 161.395 C 136.591 162.902 134.605 162.161 134.605 162.161 C 130.121 160.926 132.504 157.025 132.504 157.025 C 134.488 154.63 139.327 154.457 139.327 154.457 L 143.325 154.31 L 142.896 156.679 Z"
+                    android:fillColor="#00b4a6"
+                    android:strokeWidth="1"/>
+                <path
+                    android:name="path_7"
+                    android:pathData="M 153.19 144.972 C 153.172 143.911 153.155 142.848 152.81 141.852 C 152.116 139.85 150.409 136.986 146.194 136.012 C 139.467 134.456 135.824 135.645 135.824 135.645 C 135.824 135.645 131.051 136.834 127.182 140.015 L 131.2 146.04 C 131.2 146.04 134.703 143.275 138.463 143.028 C 142.223 142.781 143.251 144.287 143.251 144.287 C 143.251 144.287 144.302 145.028 143.928 148.064 C 143.928 148.064 133.714 148.106 129.355 150.575 C 124.996 153.044 124.218 155.086 124.218 155.086 C 124.218 155.086 120.633 161.966 125.153 166.675 C 129.672 171.384 137.484 168.387 137.484 168.387 C 137.484 168.387 140.286 167.004 141.719 165.094 L 141.563 168.42 L 150.353 168.485 C 150.353 168.485 150.006 166.362 152.151 154.238 C 153.269 147.936 153.222 146.704 153.19 144.972 Z M 142.896 156.679 C 142.896 156.679 142.195 159.889 139.393 161.395 C 136.591 162.902 134.605 162.161 134.605 162.161 C 130.121 160.926 132.504 157.025 132.504 157.025 C 134.488 154.63 139.327 154.457 139.327 154.457 L 143.325 154.31 L 142.896 156.679 Z M 178.499 136.184 L 167.836 157.382 L 167.708 157.382 L 165.105 136.184 L 154.781 136.184 L 160.48 168.445 L 171.218 168.445 L 189.008 136.184 L 178.499 136.184 Z M 215.766 155.073 C 215.766 155.073 216.825 150.305 216.475 146.9 C 216.126 143.496 214.817 141.246 214.817 141.246 C 214.817 141.246 212.014 136.135 205.941 135.469 C 199.868 134.802 196.249 136.406 196.249 136.406 C 196.249 136.406 192.73 137.863 189.617 141.156 C 186.503 144.449 185.413 149.024 185.413 149.024 C 185.413 149.024 183.856 154.061 185.413 159.724 C 186.969 165.386 191.828 167.691 191.828 167.691 C 191.828 167.691 195.253 169.568 200.235 169.403 C 205.217 169.238 208.082 167.761 208.082 167.761 C 208.082 167.761 212.477 165.522 214.062 163.217 L 207.833 158.015 C 207.833 158.015 206.463 160.254 202.789 161.242 C 201.51 161.441 200.211 161.463 198.927 161.308 C 196.872 161.044 194.879 158.904 194.879 158.904 C 194.879 158.904 193.65 157.437 193.875 155.061 L 215.766 155.073 Z M 196.872 144.773 C 196.872 144.773 200.266 141.414 204.47 142.764 C 208.674 144.114 207.865 148.755 207.865 148.755 L 194.537 148.755 C 195.221 146.095 196.872 144.773 196.872 144.773 Z M 76.897 189.503 C 74.197 189.503 72 191.754 72 194.533 C 72 197.311 74.197 199.561 76.897 199.561 C 79.596 199.561 81.794 197.309 81.794 194.533 C 81.794 191.756 79.601 189.503 76.897 189.503 Z M 76.897 197.537 C 75.474 197.537 74.32 196.161 74.32 194.465 C 74.32 192.769 75.477 191.395 76.897 191.395 C 78.317 191.395 79.472 192.769 79.472 194.465 C 79.472 196.161 78.319 197.537 76.897 197.537 Z M 194.075 189.503 C 191.369 189.503 189.178 191.754 189.178 194.533 C 189.178 197.311 191.369 199.561 194.075 199.561 C 196.78 199.561 198.971 197.309 198.971 194.533 C 198.971 191.756 196.779 189.503 194.075 189.503 Z M 194.075 197.537 C 192.652 197.537 191.498 196.161 191.498 194.465 C 191.498 192.769 192.654 191.395 194.075 191.395 C 195.495 191.395 196.65 192.769 196.65 194.465 C 196.65 196.161 195.497 197.537 194.075 197.537 Z M 92.75 191.52 C 92.75 191.52 91.919 189.89 89.866 189.563 C 89.28 189.459 88.68 189.494 88.109 189.664 C 87.538 189.835 87.009 190.137 86.562 190.55 L 86.047 191.116 L 86.035 189.808 L 83.888 189.795 L 83.875 203.993 L 86.083 203.993 L 86.083 197.977 C 86.083 197.977 87.157 199.322 88.418 199.372 C 88.923 199.392 89.303 199.402 89.575 199.407 C 90.163 199.418 90.744 199.264 91.257 198.96 C 92.198 198.39 92.9 197.466 93.223 196.372 C 94.07 193.717 92.75 191.52 92.75 191.52 Z M 88.654 197.607 C 87.207 197.607 86.034 196.216 86.034 194.501 C 86.034 192.785 87.208 191.396 88.654 191.396 C 90.1 191.396 91.273 192.786 91.273 194.501 C 91.273 196.215 90.102 197.607 88.654 197.607 Z M 102.301 190.211 C 100.09 188.744 97.583 190.046 97.583 190.046 C 97.583 190.046 95.637 191.182 95.326 193.158 C 95.015 195.134 95.326 196.252 95.326 196.252 C 95.326 196.252 95.979 198.442 97.848 199.1 C 99.509 199.685 100.664 199.491 100.902 199.44 C 100.932 199.433 100.96 199.429 100.991 199.425 C 101.541 199.335 102.07 199.129 102.543 198.818 C 103.017 198.508 103.427 198.1 103.749 197.619 L 102.27 196.335 C 102.27 196.335 101.569 197.435 100.728 197.504 C 100.728 197.504 97.786 198.162 97.412 195.215 L 104.091 195.215 C 104.091 195.215 104.509 191.676 102.301 190.211 Z M 101.927 193.602 L 97.394 193.602 C 97.439 193.325 97.502 193.051 97.581 192.783 C 98.328 191.007 100.29 191.315 100.29 191.315 C 102.018 191.657 101.925 193.602 101.925 193.602 L 101.927 193.602 Z M 180.873 190.23 C 178.663 188.762 176.156 190.066 176.156 190.066 C 176.156 190.066 174.209 191.202 173.898 193.176 C 173.587 195.151 173.898 196.271 173.898 196.271 C 173.898 196.271 174.553 198.461 176.42 199.119 C 178.081 199.705 179.238 199.509 179.474 199.459 C 179.504 199.453 179.534 199.447 179.564 199.443 C 180.115 199.354 180.643 199.148 181.117 198.838 C 181.59 198.528 182 198.12 182.321 197.638 L 180.842 196.353 C 180.842 196.353 180.142 197.454 179.301 197.522 C 179.301 197.522 176.358 198.181 175.984 195.234 L 182.665 195.234 C 182.665 195.234 183.085 191.696 180.873 190.23 Z M 180.5 193.622 L 175.974 193.622 C 176.019 193.344 176.081 193.071 176.16 192.802 C 176.907 191.027 178.87 191.335 178.87 191.335 C 180.593 191.675 180.5 193.622 180.5 193.622 Z M 106.332 189.792 L 106.332 199.273 L 108.597 199.273 L 108.597 193.771 C 108.597 193.771 108.69 191.845 110.255 191.548 C 111.82 191.251 112.17 192.659 112.17 192.659 C 112.256 193.007 112.311 193.362 112.333 193.721 L 112.333 199.277 L 114.576 199.277 L 114.576 193.195 C 114.576 193.195 114.4 189.649 111.785 189.545 C 111.785 189.545 109.286 189.137 108.504 191.309 L 108.468 189.754 L 106.332 189.792 Z M 121 193.421 L 116.609 193.421 L 116.609 195.396 L 121 195.396 L 121 193.421 Z M 127.506 189.569 C 124.291 189.248 123.015 190.985 123.015 190.985 L 124.128 192.417 C 124.711 191.852 125.459 191.514 126.249 191.46 L 126.793 191.428 C 127.203 191.401 127.61 191.519 127.95 191.763 C 128.19 191.926 128.378 192.161 128.491 192.438 C 128.603 192.715 128.634 193.021 128.58 193.317 L 126.291 193.449 C 126.291 193.449 123.069 193.639 122.508 195.968 C 121.947 198.298 124.299 199.211 124.299 199.211 C 124.299 199.211 127.103 200.33 128.601 198.059 L 128.666 198.042 L 128.666 199.186 L 130.706 199.186 L 130.706 193.073 C 130.706 193.073 130.721 189.893 127.506 189.569 Z M 127.438 197.475 C 127.262 197.577 127.067 197.638 126.867 197.656 L 125.752 197.656 C 125.612 197.656 125.474 197.621 125.35 197.552 C 125.031 197.371 124.501 196.893 124.746 196.148 C 125.093 195.111 126.688 194.991 126.688 194.991 L 127.966 194.959 L 128.615 194.945 C 128.713 196.639 127.927 197.245 127.438 197.475 Z M 135.409 189.792 L 133.377 189.792 L 133.377 199.273 L 135.595 199.273 L 135.595 193.84 C 135.595 193.84 135.969 191.15 138.602 191.762 L 138.602 189.526 C 138.602 189.526 136.43 189.196 135.532 191.333 L 135.461 191.333 L 135.473 189.802 L 135.409 189.792 Z M 203.13 189.815 L 201.098 189.815 L 201.098 199.298 L 203.316 199.298 L 203.316 193.865 C 203.316 193.865 203.689 191.175 206.323 191.786 L 206.323 189.549 C 206.323 189.549 204.151 189.218 203.252 191.355 L 203.182 191.355 L 203.193 189.824 L 203.13 189.815 Z M 147.373 191.017 L 145.894 192.384 C 145.894 192.384 145.085 191.248 143.356 191.577 C 141.627 191.906 141.597 194.557 141.597 194.557 C 141.597 194.557 141.628 196.88 143.433 197.471 C 145.239 198.062 145.987 196.713 145.987 196.713 L 147.375 198.113 C 147.375 198.113 146.893 199.133 144.977 199.458 C 143.062 199.783 141.412 198.799 141.412 198.799 C 141.412 198.799 139.786 197.794 139.365 195.934 C 139.072 194.639 139.48 192.992 139.769 192.169 C 139.912 191.764 140.141 191.399 140.439 191.104 C 141.003 190.545 142.044 189.695 143.215 189.63 C 144.974 189.531 144.928 189.63 144.928 189.63 C 144.928 189.63 146.597 189.865 147.373 191.017 Z M 148.885 199.166 L 148.885 184.318 L 151.109 184.318 L 151.109 191.182 C 151.109 191.182 151.795 189.761 153.306 189.593 C 154.818 189.424 155.409 189.893 155.409 189.893 C 155.409 189.893 156.903 190.584 157.013 192.395 C 157.123 194.206 157.013 199.161 157.013 199.161 L 154.848 199.161 L 154.848 193.503 C 154.848 193.503 154.802 191.692 153.619 191.547 C 153.27 191.506 152.916 191.548 152.585 191.67 C 152.253 191.793 151.952 191.993 151.703 192.255 C 151.42 192.634 151.227 193.08 151.142 193.556 C 151.002 194.346 151.08 199.168 151.08 199.168 L 148.885 199.166 Z M 161.994 189.766 L 159.705 189.766 L 159.705 199.166 L 161.994 199.166 L 161.994 189.766 Z M 160.85 188.005 C 161.598 188.005 162.205 187.364 162.205 186.574 C 162.205 185.783 161.598 185.142 160.85 185.142 C 160.102 185.142 159.496 185.783 159.496 186.574 C 159.496 187.364 160.102 188.005 160.85 188.005 Z M 163.365 189.766 L 165.81 189.766 L 168.13 196.648 L 170.513 189.766 L 172.925 189.766 L 169.345 199.166 L 166.947 199.166 L 163.365 189.766 Z M 185.983 199.371 C 186.802 199.371 187.465 198.669 187.465 197.803 C 187.465 196.938 186.802 196.236 185.983 196.236 C 185.164 196.236 184.5 196.938 184.5 197.803 C 184.5 198.669 185.164 199.371 185.983 199.371 Z M 216.521 189.816 L 214.488 189.816 L 214.488 191.273 C 214.488 191.273 213.589 189.693 211.977 189.561 C 210.365 189.429 209.466 189.98 209.466 189.98 C 209.466 189.98 207.423 190.77 207.061 193.609 C 206.699 196.449 208.357 198.141 208.357 198.141 C 208.357 198.141 209.041 199.054 210.749 199.376 C 211.765 199.565 212.812 199.321 213.658 198.696 C 213.92 198.491 214.149 198.244 214.336 197.962 L 214.348 199.43 C 214.348 199.43 214.277 201.428 212.433 201.823 C 210.588 202.218 209.035 201.089 209.035 201.089 L 208.404 200.583 L 207.178 202.324 C 207.178 202.324 207.516 203.138 210.331 203.843 C 213.146 204.547 215.2 202.657 215.2 202.657 C 215.2 202.657 216.403 201.534 216.52 199.447 C 216.637 197.36 216.521 189.816 216.521 189.816 Z M 211.844 197.433 C 210.396 197.433 209.222 196.088 209.222 194.419 C 209.222 192.75 210.396 191.403 211.844 191.403 C 213.292 191.403 214.466 192.748 214.466 194.419 C 214.466 196.089 213.292 197.433 211.844 197.433 Z"
+                    android:fillColor="#00b4a6"
+                    android:strokeWidth="1"/>
+            </group>
+        </vector>
+    </aapt:attr>
+    <target android:name="group">
+        <aapt:attr name="android:animation">
+            <set>
+                <objectAnimator
+                    android:propertyName="scaleX"
+                    android:startOffset="200"
+                    android:duration="500"
+                    android:valueFrom="0"
+                    android:valueTo="0.9"
+                    android:valueType="floatType"
+                    android:interpolator="@android:anim/overshoot_interpolator"/>
+                <objectAnimator
+                    android:propertyName="scaleY"
+                    android:startOffset="200"
+                    android:duration="500"
+                    android:valueFrom="0"
+                    android:valueTo="0.9"
+                    android:valueType="floatType"
+                    android:interpolator="@android:anim/overshoot_interpolator"/>
+                <objectAnimator
+                    android:propertyName="rotation"
+                    android:startOffset="250"
+                    android:duration="450"
+                    android:valueFrom="330"
+                    android:valueTo="360"
+                    android:valueType="floatType"
+                    android:interpolator="@android:anim/overshoot_interpolator"/>
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>
diff --git a/app/src/main/res/drawable/baseline_add_24.xml b/app/src/main/res/drawable/baseline_add_24.xml
new file mode 100644
index 00000000..9f83b8fb
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_add_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/bottom_nav_background.xml b/app/src/main/res/drawable/bottom_nav_background.xml
index a9012069..9d289262 100644
--- a/app/src/main/res/drawable/bottom_nav_background.xml
+++ b/app/src/main/res/drawable/bottom_nav_background.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/colorBottomNavbar" />
diff --git a/app/src/main/res/drawable/button.xml b/app/src/main/res/drawable/button.xml
index ff4bc721..1cdaaf9f 100644
--- a/app/src/main/res/drawable/button.xml
+++ b/app/src/main/res/drawable/button.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="8dp" />
-    <solid android:color="@color/colorPrimary" />
+    <solid android:color="@color/buttonBackground" />
 </shape>
diff --git a/app/src/main/res/drawable/gradient_fade.xml b/app/src/main/res/drawable/gradient_fade.xml
new file mode 100644
index 00000000..04f68990
--- /dev/null
+++ b/app/src/main/res/drawable/gradient_fade.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="0"
+        android:startColor="@android:color/transparent"
+        android:endColor="@color/colorBackground"
+        android:type="linear" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/hands_mobile_updated.xml b/app/src/main/res/drawable/hands_mobile_updated.xml
new file mode 100644
index 00000000..57e261b1
--- /dev/null
+++ b/app/src/main/res/drawable/hands_mobile_updated.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="307dp"
+    android:height="268dp"
+    android:viewportWidth="307"
+    android:viewportHeight="268">
+  <path
+      android:pathData="M159.64,82.26L157.62,86.39C157.62,86.39 151.79,85.81 148.69,88.06C148.69,88.06 147.41,88.77 145.85,90.76C144.3,92.75 144.37,94.49 144.37,94.49C144.37,94.49 144.16,96.82 145.52,98.68C146.89,100.54 148.83,100.97 148.83,100.97C148.83,100.97 151.14,101.68 153.36,100.41C153.36,100.41 154.95,99.61 155.81,98C156.68,96.4 157.39,94.86 157.39,94.86L158.57,92.14L168,69.07L169.15,66.33C169.15,66.33 171.06,61.96 173.41,60.2C173.41,60.2 174.88,58.49 178.45,57.06C182.01,55.62 183.96,55.9 183.96,55.9C183.96,55.9 186.4,55.75 188.54,56.39C190.68,57.04 191.41,57.42 191.41,57.42C191.41,57.42 195.29,59.14 197.7,62.67C200.11,66.21 200.45,68.56 200.45,68.56C200.45,68.56 201.46,72.52 200.58,76.25C199.7,79.98 197.98,82.2 197.98,82.2C197.98,82.2 194.73,87.62 185.79,87.6C185.79,87.6 180.61,88.01 175.43,85.1L177.42,80.92C177.42,80.92 185.7,82.2 189.38,76.29C193.05,70.38 188.1,67.26 188.1,67.26C188.1,67.26 185.45,65.14 181.97,66.81C181.97,66.81 180.44,67.53 179.6,68.78C178.76,70.02 177.96,71.82 177.96,71.82L166.51,99.64C166.51,99.64 164.33,106.26 158.98,109.13C158.98,109.13 156.65,110.44 155.33,110.76C155.33,110.76 153.42,111.83 148.72,111.31C144.02,110.8 140.84,108.14 140.84,108.14C140.84,108.14 137,105.64 135.34,100.86C134.77,99.35 134.38,97.77 134.19,96.17C133.85,93.47 134.82,89.85 134.82,89.85C134.82,89.85 136.84,80 148.73,79.64C148.73,79.64 155.31,79.39 159.64,82.26Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M220.85,256.96C221.97,254.13 222.05,245.99 213.45,236.11C204.86,226.22 202.55,195.44 202.47,181.28C202.47,178.02 202.85,171.35 204.38,170.73C204.18,165.88 207.19,153.98 205.46,145.57C205.43,145.42 205.39,145.27 205.36,145.12M242.76,163.2C242.27,160.99 241.77,158.95 241.28,157.09M240.52,154.38C242.15,154.4 244.38,154.3 246.93,154.01M240.52,154.38C239.47,150.8 238.48,148.04 237.73,146.21M240.52,154.38C240.77,155.24 241.02,156.14 241.28,157.09M270.27,145.95C268.22,147.51 265.9,148.79 263.46,149.85M263.46,149.85C262.32,148.49 260.31,144.87 260.33,140.23M263.46,149.85C257.95,152.24 251.83,153.47 246.93,154.01M275.34,118.86C273.47,118.82 269,119.53 266.09,122.72C265.89,122.93 265.71,123.15 265.53,123.36M262.87,127.74C261.66,130.58 261.06,133.9 260.48,138.17C260.38,138.87 260.34,139.56 260.33,140.23M262.87,127.74C258.03,124.31 248.56,115.77 247.76,108.05M262.87,127.74C263.54,126.16 264.39,124.73 265.53,123.36M249.5,91.9C248.9,93.61 247.71,99.04 247.71,107.02C247.71,107.36 247.73,107.71 247.76,108.05M247.76,108.05C243.91,105.38 237,100.44 231.77,96.38M226.04,91.58C222.23,87.82 226.36,80.23 228.91,76.9M226.04,91.58C221.91,89.86 213.38,86.03 212.38,84.43L212.49,84.11M226.04,91.58C227.26,92.77 229.33,94.48 231.77,96.38M212.49,84.11L214.35,78.9C214.3,78.62 214.15,78.26 213.87,78.1M212.49,84.11C212.04,85.38 210.96,88.33 210.29,90.03C209.62,91.73 208.98,90.4 208.74,89.52C209.63,86.17 211.69,79.26 212.74,78.38C213.24,77.96 213.61,77.94 213.87,78.1M213.87,78.1L215.06,74.39M215.06,74.39C214.59,74.24 213.77,73.6 214.35,72.21C214.92,70.82 216.93,64.64 217.87,61.72C218.27,61.45 218.91,61.16 219.42,61.25M215.06,74.39C215.06,74.96 215.78,74.63 216.14,74.39C216.82,72.72 217.82,70.14 218.65,67.77M219.42,61.25C219.77,61.32 220.06,61.57 220.14,62.17C220.24,62.91 219.54,65.23 218.65,67.77M219.42,61.25L227.48,38.74C228.77,34.18 229.46,24.12 221.87,20.47C214.28,16.81 183.34,6.72 168.81,2.13C165.53,1.59 158.08,2.44 154.55,10.11C152.4,14.77 144.44,37.85 136.46,61.46M122.56,103.03C120.73,100.47 117.39,95.7 115.92,93.25M122.56,103.03C123.67,99.7 124.91,95.94 126.26,91.9M122.56,103.03C122.95,103.42 123.47,103.96 124,104.57M137.13,118.41C137.6,119.96 135.69,120.64 134.68,120.79C133.03,119.03 129.28,115.22 127.52,114.04C125.5,112.68 126.78,111.16 126.73,109.34M137.13,118.41C136.65,116.87 130.32,112.1 127.22,109.92L126.73,109.34M137.13,118.41C138,119.98 138.86,123.57 135.27,125.43C131.12,127.57 121.88,126.73 119.04,125.67M126.73,109.34C126.73,109.17 126.71,109 126.68,108.82C126.57,108.2 126.14,107.39 125.57,106.57M105.2,118.41C107.82,119.38 113.14,121.65 113.37,123.04C113.52,123.88 114.27,124.19 115.22,124.43M105.2,118.41L108.3,107.08M105.2,118.41C102.62,120.17 96.88,123.43 93.62,123.12M52.2,112.56C53.72,111.85 57.54,109.39 60.74,105.22C63.94,101.05 71.66,98.85 75.12,98.27C81.96,96.15 97.3,91.32 103.89,89C112.12,86.11 114.81,90.42 115.22,91.9C115.29,92.14 115.54,92.62 115.92,93.25M115.92,93.25C116.32,92.56 118.95,91.33 126.26,91.9M126.26,91.9C129.32,82.71 132.89,72.03 136.46,61.46M136.46,61.46C131.27,62.9 118.02,66.98 106.51,71.82C92.13,77.87 87.71,73.82 75.84,86.49C63.96,99.17 52.02,105.09 46.83,114.04C41.64,122.98 36.75,135.4 29.82,139.52C24.29,142.81 8.3,153.76 1,158.82M89.98,134.56C87.95,130.32 89.2,122.14 93.14,123.04C93.29,123.08 93.45,123.1 93.62,123.12M93.62,123.12C93.8,126.53 93.74,134.52 92.07,139.26C89.98,145.18 69.03,188.55 57.69,193.31M115.22,124.43L106.69,149.81C105,153.8 103.46,163.16 110.81,168.67L143.75,186.36M115.22,124.43C115.81,124.57 116.48,124.68 117.13,124.86M199.45,118.54C199.22,117.76 199.02,117.08 198.83,116.54C198.3,113.04 198.25,107.89 199.74,103.61M199.45,118.54C200.2,121.23 201.14,125.26 202.16,129.93M199.45,118.54C198.16,122.56 196.56,127.53 194.79,132.95M119.04,125.67C118.82,125.59 118.64,125.51 118.51,125.43C118.08,125.17 117.61,125 117.13,124.86M119.04,125.67L109.85,152.26C108.92,155.2 108.29,161.73 113.25,164.36C118.22,166.98 145.84,181.24 159.03,188.04C161.26,189.37 166.39,190.16 169.11,182.7C171.83,175.23 203.79,82.33 219.42,36.81C220.71,33.81 221.75,27.14 215.54,24.46L209.1,22.4C208.66,22.34 207.71,22.59 207.43,24.14C207.07,26.07 205.04,27.93 200.21,26.2C196.34,24.81 181.09,19.27 173.95,16.67C173.33,15.81 172.38,13.47 173.53,10.95C173.59,10.65 173.38,9.95 172.1,9.59C170.49,9.14 161.35,4.32 157.6,12.81C154.59,19.61 134.99,78.15 125.57,106.57M125.57,106.57C125.1,105.89 124.54,105.2 124,104.57M124,104.57C133.25,76.24 152.59,17.84 155.98,10.95C159.37,4.05 164.72,3.74 166.96,4.45C182.68,9.62 215.28,20.65 219.96,23.43C224.64,26.21 223.82,33.13 222.82,36.24C206.95,82.18 174.38,176.04 171.08,183.92C167.79,191.79 162.11,192.31 159.68,191.58C144.21,183.66 112.76,167.37 110.81,165.51C108.36,163.2 107.35,161.46 107.64,155.35C107.88,150.46 114.07,132.99 117.13,124.86M216.14,97.16C214.73,96.45 213.08,96.02 211.13,95.89C204.7,95.46 201.34,99.05 199.74,103.61M216.14,97.16C218.62,99.56 218.8,104.91 218.59,107.28C215.13,106.81 207.24,106.62 203.37,109.66L199.74,103.61M216.14,97.16C221.76,99.98 223.68,107.2 226.61,117.32M216.14,97.16C217.29,94.41 227.04,95.5 231.77,96.38M223.78,120.92C221.31,120.56 216.12,120.35 215.06,122.46M215.78,118.54C213.77,118.82 209.47,119.86 208.32,121.82M218.65,67.77C220.14,67.75 225.79,69.27 236.49,75.55C249.86,83.4 258.69,82.7 266.15,91.9C272.12,99.26 286.58,114.96 293.06,121.89M293.06,121.89C297,125.92 304.9,135.13 305,139.71C305.05,142.02 303.62,148.6 301.83,155.86M293.06,121.89C294.99,124.79 298.55,132.53 297.36,140.23C296.17,147.92 293.28,153.43 291.99,155.22M296.52,175.81C297.95,170.79 300.06,163 301.83,155.86M301.83,155.86C302.71,156.91 304.21,160.51 303.15,166.48C302.09,172.45 289.26,236.45 282.98,267.7M260.33,140.23C257.88,137.67 253.1,132.08 250.31,126.9M248.72,123.36C248.22,122.89 247.14,122.16 245.5,121.44M248.72,123.36C248.72,122.44 249.03,119.88 250.27,117M248.72,123.36C249.1,124.49 249.65,125.69 250.31,126.9M226.61,117.32C227.74,117.72 231.54,118.72 237.74,119.44C239.34,119.63 240.77,119.91 242.04,120.25M226.61,117.32C227.21,119.39 227.85,121.58 228.58,123.88M246.63,112.62C245.34,113.69 242.61,116.72 242.04,120.25M242.04,120.25C243.38,120.6 244.54,121.02 245.5,121.44M247.29,117.32L245.5,121.44M143.75,186.36L159.68,194.92C163.22,196.27 171.39,196.66 175.74,187.39C178.16,182.22 183.38,167.3 188.57,151.81M143.75,186.36C144.19,187.84 145.4,190.91 147.29,193.51M130.32,196.21C131.93,200.13 138.56,205.35 143.75,207.66C147.9,209.52 150.77,206.08 151.69,204.13C151.79,203.5 151.85,202.56 151.74,201.49M130.32,196.21C128.71,192.28 124.65,191.51 123.04,187.39M130.32,196.21C129.82,194.77 129.39,191.35 131.63,189.13M123.04,187.39C119.86,186.04 113.41,182.81 113.07,180.7M123.04,187.39C122.64,186.56 122.17,184.43 123.46,182.63M113.07,180.7C111.96,180.44 109.54,180.19 108.78,181.22C107.89,182.41 102.07,187.06 100.48,185.82M113.07,180.7C112.12,179.21 110.62,175.37 112.24,171.95M97.32,131.67C93.38,144.92 99.29,182.95 100.18,185.4C100.25,185.58 100.35,185.72 100.48,185.82M151.74,201.49C151.54,199.59 150.83,197.27 149,195.5C148.38,194.9 147.81,194.22 147.29,193.51M151.74,201.49L146.79,196.6L147.29,193.51M100.48,185.82C87.99,197.27 58.15,219.18 38.72,215.32C35.95,215.28 29.68,215.91 26.72,218.8M246.93,154.01C245.88,152.21 243.87,148.32 244.25,147.24M244.25,147.24C244.63,146.16 246.48,141.21 247.35,138.87M244.25,147.24C242.25,147.09 238.15,146.67 237.73,146.21M237.73,146.21C237.4,145.4 237.12,144.77 236.91,144.34C233.03,136.92 230.51,130.01 228.58,123.88M244.13,138.04C243.55,138.45 242.32,139.92 242.04,142.54M250.31,126.9L228.58,123.88M202.16,129.93C199.83,130.74 195.09,132.49 194.79,132.95M202.16,129.93C203.18,134.58 204.28,139.88 205.36,145.12M194.79,132.95C194.17,134.87 193.52,136.84 192.86,138.85M192.86,138.85C191.47,143.08 190.02,147.46 188.57,151.81M192.86,138.85C194.29,139.5 196.58,141.43 195.97,144.38M188.57,151.81C189.93,153.35 193.04,150.65 195.43,145.89C195.7,145.36 195.87,144.86 195.97,144.38M195.97,144.38C198.97,145.01 205.05,146.04 205.36,145.12M267.28,117C266.51,117.66 265.08,119.86 265.53,123.36M241.28,157.09C243.9,159.96 249.55,165.35 251.17,163.91M193.82,18.86C193.98,19.27 194.07,20.06 193.16,19.95C192.26,19.85 187.77,18.2 185.64,17.38C185.38,17.04 185.11,16.35 186.06,16.35C187.02,16.35 191.63,18.02 193.82,18.86ZM183.26,15.39C183.32,15.81 183.28,16.67 182.66,16.67C182.04,16.67 182.08,15.81 182.18,15.39C182.38,15.06 182.87,14.61 183.26,15.39Z"
+      android:strokeWidth="2.64118"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
deleted file mode 100644
index 98d63a5c..00000000
--- a/app/src/main/res/drawable/ic_add.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M450,760L450,510L200,510L200,450L450,450L450,200L510,200L510,450L760,450L760,510L510,510L510,760L450,760Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 00000000..075e95dc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 00000000..3c53db7e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_folder_add.xml b/app/src/main/res/drawable/ic_folder_add.xml
new file mode 100644
index 00000000..ce96535d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_add.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m26,23v-3h1v3h3v1h-3v3h-1v-3h-3v-1zM21.6,26h-19.607c-0.547,0 -0.993,-0.444 -0.993,-0.992v-11.008h27v4.207c-0.477,-0.135 -0.98,-0.207 -1.5,-0.207 -3.038,0 -5.5,2.462 -5.5,5.5 0,0.9 0.216,1.75 0.6,2.5zM22.257,27h-20.264c-1.094,0 -1.993,-0.891 -1.993,-1.991v-18.018c0,-1.101 0.897,-1.991 2.003,-1.991h10.997l2,4h11.994c1.109,0 2.006,0.893 2.006,1.995v7.605c1.781,0.91 3,2.763 3,4.9 0,3.038 -2.462,5.5 -5.5,5.5 -1.708,0 -3.234,-0.778 -4.243,-2zM1,13v-6.008c0,-0.536 0.444,-0.992 0.992,-0.992h10.408l1.96,4h12.637c0.549,0 1.003,0.448 1.003,1.001v1.999zM26.5,28c2.485,0 4.5,-2.015 4.5,-4.5s-2.015,-4.5 -4.5,-4.5 -4.5,2.015 -4.5,4.5 2.015,4.5 4.5,4.5z"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_folder_search.xml b/app/src/main/res/drawable/ic_folder_search.xml
new file mode 100644
index 00000000..54664ed8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_search.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m17.309,20.016c-0.77,0.616 -1.746,0.984 -2.809,0.984 -2.485,0 -4.5,-2.015 -4.5,-4.5s2.015,-4.5 4.5,-4.5 4.5,2.015 4.5,4.5c0,1.063 -0.368,2.039 -0.984,2.809l5.348,5.348 -0.707,0.707zM17,9 L15,5h-10.997c-1.106,0 -2.003,0.89 -2.003,1.991v18.018c0,1.1 0.9,1.991 1.993,1.991h25.013c1.101,0 1.993,-0.893 1.993,-1.995v-14.01c0,-1.102 -0.897,-1.995 -2.006,-1.995zM16.36,10 L14.4,6h-10.408c-0.548,0 -0.992,0.455 -0.992,0.992v18.016c0,0.548 0.446,0.992 0.993,0.992h25.014c0.548,0 0.993,-0.445 0.993,-1.001v-13.998c0,-0.553 -0.454,-1.001 -1.003,-1.001zM14.5,20c1.933,0 3.5,-1.567 3.5,-3.5s-1.567,-3.5 -3.5,-3.5 -3.5,1.567 -3.5,3.5 1.567,3.5 3.5,3.5z"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_folder_selected.xml b/app/src/main/res/drawable/ic_folder_selected.xml
new file mode 100644
index 00000000..64c76b60
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_selected.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:strokeWidth="1"
+      android:pathData="m9,13 l2,2 4,-4m-4.586,-4.586 l-1.828,-1.828c-0.375,-0.375 -0.884,-0.586 -1.414,-0.586h-2.172c-1.105,0 -2,0.895 -2,2v11c0,1.105 0.895,2 2,2h14c1.105,0 2,-0.895 2,-2v-8c0,-1.105 -0.895,-2 -2,-2h-7.172c-0.53,0 -1.039,-0.211 -1.414,-0.586z"
+      android:strokeLineJoin="round"
+      android:fillColor="#00000000"
+      android:strokeColor="#09090b"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_folder_unselected.xml b/app/src/main/res/drawable/ic_folder_unselected.xml
new file mode 100644
index 00000000..2d3be5e8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_unselected.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:strokeWidth="1"
+      android:pathData="m3,6c0,-1.105 0.895,-2 2,-2h2.172c0.53,0 1.039,0.211 1.414,0.586l1.828,1.828c0.375,0.375 0.884,0.586 1.414,0.586h7.172c1.105,0 2,0.895 2,2v8c0,1.105 -0.895,2 -2,2h-14c-1.105,0 -2,-0.895 -2,-2z"
+      android:strokeLineJoin="round"
+      android:fillColor="#00000000"
+      android:strokeColor="#09090b"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_image_gallery_line.xml b/app/src/main/res/drawable/ic_image_gallery_line.xml
new file mode 100644
index 00000000..000fe2b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_image_gallery_line.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m32.12,10h-28.24a1.88,1.88 0,0 0,-1.88 1.88v18.24a1.88,1.88 0,0 0,1.88 1.88h28.24a1.88,1.88 0,0 0,1.88 -1.88v-18.24a1.88,1.88 0,0 0,-1.88 -1.88zM32,30h-28v-18h28z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m8.56,19.45a3,3 0,1 0,-3 -3,3 3,0 0,0 3,3zM8.56,14.85a1.6,1.6 0,1 1,-1.56 1.6,1.6 1.6,0 0,1 1.56,-1.6z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m7.9,28 l6,-6 3.18,3.18 -2.82,2.82h2l7.46,-7.46 6.28,6.23v-2l-5.8,-5.77a0.71,0.71 0,0 0,-1 0l-5.16,5.16 -3.67,-3.66a0.71,0.71 0,0 0,-1 0l-7.45,7.5z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m30.14,3a1,1 0,0 0,-1 -1h-22a1,1 0,0 0,-1 1v1h24z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m32.12,7a1,1 0,0 0,-1 -1h-26a1,1 0,0 0,-1 1v1h28z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
new file mode 100644
index 00000000..ef3a1feb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_tick_circle.xml b/app/src/main/res/drawable/ic_tick_circle.xml
new file mode 100644
index 00000000..10d7482c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tick_circle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m12,2c-5.51,0 -10,4.49 -10,10s4.49,10 10,10 10,-4.49 10,-10 -4.49,-10 -10,-10zM16.78,9.7 L11.11,15.37c-0.14,0.14 -0.33,0.22 -0.53,0.22s-0.39,-0.08 -0.53,-0.22l-2.83,-2.83c-0.29,-0.29 -0.29,-0.77 0,-1.06s0.77,-0.29 1.06,0l2.3,2.3 5.14,-5.14c0.29,-0.29 0.77,-0.29 1.06,0s0.29,0.76 0,1.06z"
+      android:fillColor="#292d32"/>
+</vector>
diff --git a/app/src/main/res/drawable/item_background_selector.xml b/app/src/main/res/drawable/item_background_selector.xml
new file mode 100644
index 00000000..65f25966
--- /dev/null
+++ b/app/src/main/res/drawable/item_background_selector.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<!-- State: Selected -->
+<item android:state_selected="true">
+    <shape android:shape="rectangle">
+        <solid android:color="@color/colorPill" />
+        <stroke android:width="1dp" android:color="@color/colorPrimary" />
+        <corners android:radius="8dp" />
+    </shape>
+</item>
+<!-- State: Default (not selected) -->
+<item>
+    <shape android:shape="rectangle">
+        <solid android:color="@android:color/transparent" />
+        <corners android:radius="8dp" />
+    </shape>
+</item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/keyboard_arrow_right.xml b/app/src/main/res/drawable/keyboard_arrow_right.xml
new file mode 100644
index 00000000..4904368f
--- /dev/null
+++ b/app/src/main/res/drawable/keyboard_arrow_right.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/pill_bg.xml b/app/src/main/res/drawable/pill_bg.xml
new file mode 100644
index 00000000..d5bbddae
--- /dev/null
+++ b/app/src/main/res/drawable/pill_bg.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+<stroke
+    android:width="1dp"
+    android:color="@color/colorPill" />
+
+<solid android:color="@color/colorPill" />
+
+<padding
+    android:left="1dp"
+    android:right="1dp"
+    android:bottom="1dp"
+    android:top="1dp" />
+
+<corners android:radius="120dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_dialog.xml b/app/src/main/res/drawable/rounded_dialog.xml
new file mode 100644
index 00000000..5f6dc817
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_dialog.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/colorPill"/>
+    <corners android:topLeftRadius="16dp"
+        android:topRightRadius="16dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/splash_branding_image.xml b/app/src/main/res/drawable/splash_branding_image.xml
new file mode 100644
index 00000000..bea7ce69
--- /dev/null
+++ b/app/src/main/res/drawable/splash_branding_image.xml
@@ -0,0 +1,57 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="145dp"
+    android:height="20dp"
+    android:viewportWidth="145"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M4.9,5.19C2.2,5.19 0,7.44 0,10.22C0,12.99 2.2,15.24 4.9,15.24C7.6,15.24 9.79,12.99 9.79,10.22C9.79,7.44 7.6,5.19 4.9,5.19ZM4.9,13.22C3.47,13.22 2.32,11.84 2.32,10.15C2.32,8.45 3.48,7.08 4.9,7.08C6.32,7.08 7.47,8.45 7.47,10.15C7.47,11.84 6.32,13.22 4.9,13.22Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M122.07,5.19C119.37,5.19 117.18,7.44 117.18,10.22C117.18,12.99 119.37,15.24 122.07,15.24C124.78,15.24 126.97,12.99 126.97,10.22C126.97,7.44 124.78,5.19 122.07,5.19ZM122.07,13.22C120.65,13.22 119.5,11.84 119.5,10.15C119.5,8.45 120.65,7.08 122.07,7.08C123.5,7.08 124.65,8.45 124.65,10.15C124.65,11.84 123.5,13.22 122.07,13.22Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M20.75,7.2C20.75,7.2 19.92,5.57 17.87,5.25C17.28,5.14 16.68,5.18 16.11,5.35C15.54,5.52 15.01,5.82 14.56,6.23L14.05,6.8L14.04,5.49L11.89,5.48L11.88,19.68H14.08V13.66C14.08,13.66 15.16,15 16.42,15.05C16.92,15.07 17.3,15.08 17.57,15.09C18.16,15.1 18.74,14.95 19.26,14.64C20.2,14.07 20.9,13.15 21.22,12.05C22.07,9.4 20.75,7.2 20.75,7.2ZM16.65,13.29C15.21,13.29 14.03,11.9 14.03,10.18C14.03,8.47 15.21,7.08 16.65,7.08C18.1,7.08 19.27,8.47 19.27,10.18C19.27,11.9 18.1,13.29 16.65,13.29Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M30.3,5.89C28.09,4.43 25.58,5.73 25.58,5.73C25.58,5.73 23.64,6.86 23.33,8.84C23.01,10.82 23.33,11.93 23.33,11.93C23.33,11.93 23.98,14.12 25.85,14.78C27.51,15.37 28.66,15.17 28.9,15.12C28.93,15.12 28.96,15.11 28.99,15.11C29.54,15.02 30.07,14.81 30.54,14.5C31.02,14.19 31.43,13.78 31.75,13.3L30.27,12.02C30.27,12.02 29.57,13.12 28.73,13.19C28.73,13.19 25.79,13.84 25.41,10.9H32.09C32.09,10.9 32.51,7.36 30.3,5.89ZM29.93,9.28H25.39C25.44,9.01 25.5,8.73 25.58,8.47C26.33,6.69 28.29,7 28.29,7C30.02,7.34 29.93,9.28 29.93,9.28H29.93Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M108.87,5.91C106.66,4.44 104.16,5.75 104.16,5.75C104.16,5.75 102.21,6.88 101.9,8.86C101.59,10.83 101.9,11.95 101.9,11.95C101.9,11.95 102.55,14.14 104.42,14.8C106.08,15.39 107.24,15.19 107.47,15.14C107.5,15.14 107.53,15.13 107.56,15.13C108.11,15.04 108.64,14.83 109.12,14.52C109.59,14.21 110,13.8 110.32,13.32L108.84,12.04C108.84,12.04 108.14,13.14 107.3,13.2C107.3,13.2 104.36,13.86 103.98,10.92H110.67C110.67,10.92 111.08,7.38 108.87,5.91ZM108.5,9.3H103.97C104.02,9.03 104.08,8.75 104.16,8.48C104.91,6.71 106.87,7.02 106.87,7.02C108.59,7.36 108.5,9.3 108.5,9.3Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M34.33,5.47V14.96H36.6V9.45C36.6,9.45 36.69,7.53 38.26,7.23C39.82,6.93 40.17,8.34 40.17,8.34C40.26,8.69 40.31,9.04 40.33,9.4V14.96H42.58V8.88C42.58,8.88 42.4,5.33 39.79,5.23C39.79,5.23 37.29,4.82 36.5,6.99L36.47,5.44L34.33,5.47Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M49,9.1H44.61V11.08H49V9.1Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M55.51,5.25C52.29,4.93 51.01,6.67 51.01,6.67L52.13,8.1C52.71,7.53 53.46,7.2 54.25,7.14L54.79,7.11C55.2,7.08 55.61,7.2 55.95,7.45C56.19,7.61 56.38,7.84 56.49,8.12C56.6,8.4 56.63,8.7 56.58,9L54.29,9.13C54.29,9.13 51.07,9.32 50.51,11.65C49.95,13.98 52.3,14.89 52.3,14.89C52.3,14.89 55.1,16.01 56.6,13.74L56.67,13.72V14.87H58.71V8.76C58.71,8.76 58.72,5.58 55.51,5.25ZM55.44,13.16C55.26,13.26 55.07,13.32 54.87,13.34H53.75C53.61,13.34 53.47,13.3 53.35,13.23C53.03,13.05 52.5,12.57 52.75,11.83C53.09,10.79 54.69,10.67 54.69,10.67L55.97,10.64L56.61,10.63C56.71,12.32 55.93,12.93 55.44,13.16Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M63.41,5.47H61.38V14.96H63.6V9.52C63.6,9.52 63.97,6.83 66.6,7.44V5.21C66.6,5.21 64.43,4.88 63.53,7.01H63.46L63.47,5.48L63.41,5.47Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M131.13,5.5H129.1V14.98H131.32V9.55C131.32,9.55 131.69,6.86 134.32,7.47V5.23C134.32,5.23 132.15,4.9 131.25,7.04H131.18L131.19,5.51L131.13,5.5Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M75.37,6.7L73.89,8.07C73.89,8.07 73.08,6.93 71.36,7.26C69.63,7.59 69.6,10.24 69.6,10.24C69.6,10.24 69.63,12.56 71.43,13.15C73.24,13.74 73.99,12.4 73.99,12.4L75.37,13.8C75.37,13.8 74.89,14.82 72.98,15.14C71.06,15.47 69.41,14.48 69.41,14.48C69.41,14.48 67.79,13.48 67.36,11.62C67.07,10.32 67.48,8.67 67.77,7.85C67.91,7.45 68.14,7.08 68.44,6.79C69,6.23 70.04,5.38 71.21,5.31C72.97,5.21 72.93,5.31 72.93,5.31C72.93,5.31 74.6,5.55 75.37,6.7Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M76.88,14.85V0H79.11V6.86C79.11,6.86 79.79,5.44 81.31,5.28C82.82,5.11 83.41,5.58 83.41,5.58C83.41,5.58 84.9,6.27 85.01,8.08C85.12,9.89 85.01,14.84 85.01,14.84H82.85V9.19C82.85,9.19 82.8,7.37 81.62,7.23C81.27,7.19 80.92,7.23 80.58,7.35C80.25,7.48 79.95,7.68 79.7,7.94C79.42,8.32 79.23,8.76 79.14,9.24C79,10.03 79.08,14.85 79.08,14.85L76.88,14.85Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M89.99,5.45H87.71V14.85H89.99V5.45Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M88.85,3.69C89.6,3.69 90.2,3.05 90.2,2.26C90.2,1.47 89.6,0.82 88.85,0.82C88.1,0.82 87.5,1.47 87.5,2.26C87.5,3.05 88.1,3.69 88.85,3.69Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M91.37,5.45H93.81L96.13,12.33L98.51,5.45H100.93L97.34,14.85H94.95L91.37,5.45Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M113.98,15.05C114.8,15.05 115.46,14.35 115.46,13.49C115.46,12.62 114.8,11.92 113.98,11.92C113.16,11.92 112.5,12.62 112.5,13.49C112.5,14.35 113.16,15.05 113.98,15.05Z"
+      android:fillColor="#00B4A6"/>
+  <path
+      android:pathData="M144.52,5.5H142.49V6.96C142.49,6.96 141.59,5.38 139.98,5.24C138.37,5.11 137.47,5.66 137.47,5.66C137.47,5.66 135.42,6.45 135.06,9.29C134.7,12.13 136.36,13.82 136.36,13.82C136.36,13.82 137.04,14.74 138.75,15.06C139.76,15.25 140.81,15 141.66,14.38C141.92,14.17 142.15,13.93 142.34,13.64L142.35,15.11C142.35,15.11 142.28,17.11 140.43,17.51C138.59,17.9 137.04,16.77 137.04,16.77L136.4,16.27L135.18,18.01C135.18,18.01 135.52,18.82 138.33,19.53C141.15,20.23 143.2,18.34 143.2,18.34C143.2,18.34 144.4,17.22 144.52,15.13C144.64,13.04 144.52,5.5 144.52,5.5ZM139.84,13.12C138.4,13.12 137.22,11.77 137.22,10.1C137.22,8.43 138.4,7.09 139.84,7.09C141.29,7.09 142.47,8.43 142.47,10.1C142.47,11.77 141.29,13.12 139.84,13.12V13.12Z"
+      android:fillColor="#00B4A6"/>
+</vector>
diff --git a/app/src/main/res/drawable/splash_icon.xml b/app/src/main/res/drawable/splash_icon.xml
new file mode 100644
index 00000000..4e2b4ab7
--- /dev/null
+++ b/app/src/main/res/drawable/splash_icon.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/font/montserrat.xml b/app/src/main/res/font/montserrat.xml
index 560bf61a..60bf7d17 100644
--- a/app/src/main/res/font/montserrat.xml
+++ b/app/src/main/res/font/montserrat.xml
@@ -1,13 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        app:font="@font/montserrat_thin"
+        android:fontStyle="normal"
+        android:fontWeight="100"/>
+    <font
+        app:font="@font/montserrat_extra_light"
+        app:fontStyle="normal"
+        app:fontWeight="200" />
+    <font
+        app:font="@font/montserrat_light"
+        app:fontStyle="normal"
+        app:fontWeight="300" />
     <font
         app:font="@font/montserrat_regular"
         app:fontStyle="normal"
         app:fontWeight="400" />
+    <font
+        app:font="@font/montserrat_medium"
+        app:fontStyle="normal"
+        app:fontWeight="500" />
+    <font
+        app:font="@font/montserrat_semi_bold"
+        app:fontStyle="normal"
+        app:fontWeight="600" />
     <font
         app:font="@font/montserrat_bold"
         app:fontStyle="normal"
         app:fontWeight="700" />
+    <font
+        app:font="@font/montserrat_extra_bold"
+        app:fontStyle="normal"
+        app:fontWeight="800" />
     <font
         app:font="@font/montserrat_black"
         app:fontStyle="normal"
diff --git a/app/src/main/res/font/montserrat_black.ttf b/app/src/main/res/font/montserrat_black.ttf
index 7bb6575c..2d319308 100644
Binary files a/app/src/main/res/font/montserrat_black.ttf and b/app/src/main/res/font/montserrat_black.ttf differ
diff --git a/app/src/main/res/font/montserrat_black_italic.ttf b/app/src/main/res/font/montserrat_black_italic.ttf
new file mode 100644
index 00000000..40c6e1ef
Binary files /dev/null and b/app/src/main/res/font/montserrat_black_italic.ttf differ
diff --git a/app/src/main/res/font/montserrat_bold.ttf b/app/src/main/res/font/montserrat_bold.ttf
index efddc834..02ff6fff 100644
Binary files a/app/src/main/res/font/montserrat_bold.ttf and b/app/src/main/res/font/montserrat_bold.ttf differ
diff --git a/app/src/main/res/font/montserrat_bold_italic.ttf b/app/src/main/res/font/montserrat_bold_italic.ttf
new file mode 100644
index 00000000..998ed88c
Binary files /dev/null and b/app/src/main/res/font/montserrat_bold_italic.ttf differ
diff --git a/app/src/main/res/font/montserrat_extra_bold.ttf b/app/src/main/res/font/montserrat_extra_bold.ttf
new file mode 100644
index 00000000..59225514
Binary files /dev/null and b/app/src/main/res/font/montserrat_extra_bold.ttf differ
diff --git a/app/src/main/res/font/montserrat_extra_bold_italic.ttf b/app/src/main/res/font/montserrat_extra_bold_italic.ttf
new file mode 100644
index 00000000..74155095
Binary files /dev/null and b/app/src/main/res/font/montserrat_extra_bold_italic.ttf differ
diff --git a/app/src/main/res/font/montserrat_extra_light.ttf b/app/src/main/res/font/montserrat_extra_light.ttf
new file mode 100644
index 00000000..491c6ec5
Binary files /dev/null and b/app/src/main/res/font/montserrat_extra_light.ttf differ
diff --git a/app/src/main/res/font/montserrat_extra_light_italic.ttf b/app/src/main/res/font/montserrat_extra_light_italic.ttf
new file mode 100644
index 00000000..23dd23f8
Binary files /dev/null and b/app/src/main/res/font/montserrat_extra_light_italic.ttf differ
diff --git a/app/src/main/res/font/montserrat_italic.ttf b/app/src/main/res/font/montserrat_italic.ttf
new file mode 100644
index 00000000..84bc0f46
Binary files /dev/null and b/app/src/main/res/font/montserrat_italic.ttf differ
diff --git a/app/src/main/res/font/montserrat_italic_set.xml b/app/src/main/res/font/montserrat_italic_set.xml
new file mode 100644
index 00000000..08776a0c
--- /dev/null
+++ b/app/src/main/res/font/montserrat_italic_set.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <font
+        app:font="@font/montserrat_thin_italic"
+        android:fontStyle="italic"
+        android:fontWeight="100"/>
+    <font
+        app:font="@font/montserrat_extra_light_italic"
+        app:fontStyle="italic"
+        app:fontWeight="200" />
+    <font
+        app:font="@font/montserrat_light_italic"
+        app:fontStyle="italic"
+        app:fontWeight="300" />
+    <font
+        app:font="@font/montserrat_italic"
+        app:fontStyle="italic"
+        app:fontWeight="400" />
+    <font
+        app:font="@font/montserrat_medium_italic"
+        app:fontStyle="italic"
+        app:fontWeight="500" />
+    <font
+        app:font="@font/montserrat_semi_bold_italic"
+        app:fontStyle="italic"
+        app:fontWeight="600" />
+    <font
+        app:font="@font/montserrat_bold_italic"
+        app:fontStyle="italic"
+        app:fontWeight="700" />
+    <font
+        app:font="@font/montserrat_extra_bold_italic"
+        app:fontStyle="italic"
+        app:fontWeight="800" />
+    <font
+        app:font="@font/montserrat_black_italic"
+        app:fontStyle="italic"
+        app:fontWeight="900" />
+</font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/montserrat_light.ttf b/app/src/main/res/font/montserrat_light.ttf
new file mode 100644
index 00000000..9d894920
Binary files /dev/null and b/app/src/main/res/font/montserrat_light.ttf differ
diff --git a/app/src/main/res/font/montserrat_light_italic.ttf b/app/src/main/res/font/montserrat_light_italic.ttf
new file mode 100644
index 00000000..bf854d4b
Binary files /dev/null and b/app/src/main/res/font/montserrat_light_italic.ttf differ
diff --git a/app/src/main/res/font/montserrat_medium.ttf b/app/src/main/res/font/montserrat_medium.ttf
new file mode 100644
index 00000000..dfbcfe4f
Binary files /dev/null and b/app/src/main/res/font/montserrat_medium.ttf differ
diff --git a/app/src/main/res/font/montserrat_medium_italic.ttf b/app/src/main/res/font/montserrat_medium_italic.ttf
new file mode 100644
index 00000000..1e674770
Binary files /dev/null and b/app/src/main/res/font/montserrat_medium_italic.ttf differ
diff --git a/app/src/main/res/font/montserrat_regular.ttf b/app/src/main/res/font/montserrat_regular.ttf
index aa9033a8..48ba65ed 100644
Binary files a/app/src/main/res/font/montserrat_regular.ttf and b/app/src/main/res/font/montserrat_regular.ttf differ
diff --git a/app/src/main/res/font/montserrat_semi_bold.ttf b/app/src/main/res/font/montserrat_semi_bold.ttf
new file mode 100644
index 00000000..8dbcdb39
Binary files /dev/null and b/app/src/main/res/font/montserrat_semi_bold.ttf differ
diff --git a/app/src/main/res/font/montserrat_semi_bold_italic.ttf b/app/src/main/res/font/montserrat_semi_bold_italic.ttf
new file mode 100644
index 00000000..8604419a
Binary files /dev/null and b/app/src/main/res/font/montserrat_semi_bold_italic.ttf differ
diff --git a/app/src/main/res/font/montserrat_thin.ttf b/app/src/main/res/font/montserrat_thin.ttf
new file mode 100644
index 00000000..2a85a52c
Binary files /dev/null and b/app/src/main/res/font/montserrat_thin.ttf differ
diff --git a/app/src/main/res/font/montserrat_thin_italic.ttf b/app/src/main/res/font/montserrat_thin_italic.ttf
new file mode 100644
index 00000000..5dc7160a
Binary files /dev/null and b/app/src/main/res/font/montserrat_thin_italic.ttf differ
diff --git a/app/src/main/res/layout/activity_add_folder.xml b/app/src/main/res/layout/activity_add_folder.xml
index 24d35f2c..42438c74 100644
--- a/app/src/main/res/layout/activity_add_folder.xml
+++ b/app/src/main/res/layout/activity_add_folder.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -9,11 +8,10 @@
     android:orientation="vertical"
     tools:context=".features.folders.AddFolderActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" />
+    <include
+        android:id="@+id/common_app_bar"
+        layout="@layout/common_app_bar" />
+
 
     <ScrollView
         android:layout_width="match_parent"
@@ -25,65 +23,149 @@
             android:filterTouchesWhenObscured="true"
             android:gravity="top"
             android:orientation="vertical"
-            android:padding="10dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/add_a_folder"
-                android:textSize="28sp"
-                android:textStyle="bold" />
+                android:layout_marginBottom="24dp"
+                android:orientation="vertical"
+                android:paddingVertical="8dp">
 
-            <TextView
-                android:layout_width="300dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_margin="6dp"
-                android:gravity="center_horizontal"
-                android:text="@string/select_where_to_store_your_media"
-                android:textSize="14sp" />
-
-            <androidx.cardview.widget.CardView
-                android:id="@+id/new_folder"
+                <TextView
+                    style="@style/TextAppearance.AppCompat.Headline"
+                    android:layout_width="300dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_margin="24dp"
+                    android:fontFamily="@font/montserrat"
+                    android:gravity="center_horizontal"
+                    android:text="@string/select_where_to_store_your_media"
+                    android:textSize="18sp" />
+
+
+            </LinearLayout>
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/add_folder_container"
                 android:layout_width="match_parent"
-                android:layout_height="100dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
                 android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-                android:layout_marginVertical="@dimen/activity_vertical_margin"
-                app:cardCornerRadius="@dimen/activity_horizontal_margin">
+                android:layout_marginVertical="16dp"
+                android:background="@drawable/item_background_selector"
+                android:orientation="horizontal"
+                android:padding="8dp">
 
-                <TextView
-                    android:id="@+id/new_folder_text"
-                    android:layout_width="match_parent"
+                <ImageView
+                    android:id="@+id/add_folder_icon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:importantForAccessibility="no"
+                    android:padding="2dp"
+                    android:src="@drawable/ic_folder_add"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:tint="@color/colorText" />
+
+                <LinearLayout
+                    android:id="@+id/add_folder_text_container"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/add_folder_arrow_icon"
+                    app:layout_constraintStart_toEndOf="@id/add_folder_icon"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:gravity=""
+                        android:text="@string/create_a_new_folder"
+                        android:textSize="16sp" />
+
+
+                </LinearLayout>
+
+                <ImageView
+                    android:id="@+id/add_folder_arrow_icon"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-                    android:text="@string/create_a_new_folder"
-                    android:textSize="24sp"
-                    android:textStyle="bold" />
+                    android:src="@drawable/keyboard_arrow_right"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:tint="@color/colorText" />
 
-            </androidx.cardview.widget.CardView>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <androidx.cardview.widget.CardView
-                android:id="@+id/browse_folders"
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/browse_folder_container"
                 android:layout_width="match_parent"
-                android:layout_height="100dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
                 android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-                android:layout_marginVertical="@dimen/activity_vertical_margin"
-                app:cardCornerRadius="@dimen/activity_horizontal_margin">
+                android:layout_marginVertical="16dp"
+                android:background="@drawable/item_background_selector"
+                android:orientation="horizontal"
+                android:padding="8dp">
 
-                <TextView
-                    android:id="@+id/browse_folders_text"
-                    android:layout_width="match_parent"
+                <ImageView
+                    android:id="@+id/browse_folder_icon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:importantForAccessibility="no"
+                    android:padding="2dp"
+                    android:src="@drawable/ic_folder_search"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:tint="@color/colorText" />
+
+                <LinearLayout
+                    android:id="@+id/browse_folder_text_container"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-                    android:text="@string/browse_existing_folders"
-                    android:textSize="24sp"
-                    android:textStyle="bold" />
+                    android:gravity="center_vertical"
+                    android:orientation="vertical"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/browse_folder_arrow_icon"
+                    app:layout_constraintStart_toEndOf="@id/browse_folder_icon"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:gravity=""
+                        android:text="@string/browse_existing_folders"
+                        android:textSize="16sp" />
+
+
+                </LinearLayout>
+
+                <ImageView
+                    android:id="@+id/browse_folder_arrow_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/keyboard_arrow_right"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:tint="@color/colorText" />
+
 
-            </androidx.cardview.widget.CardView>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/activity_browse_folders.xml b/app/src/main/res/layout/activity_browse_folders.xml
index 95bb4860..512ede21 100644
--- a/app/src/main/res/layout/activity_browse_folders.xml
+++ b/app/src/main/res/layout/activity_browse_folders.xml
@@ -1,30 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true"
+    tools:background="@color/colorBackground"
     tools:context=".features.folders.BrowseFoldersActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_folder_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="?attr/actionBarSize" />
+        <include
+            android:id="@+id/app_bar_layout"
+            layout="@layout/common_app_bar" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_folder_list"
+            android:paddingHorizontal="8dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/folder_row" />
+
+    </LinearLayout>
 
     <ProgressBar
         android:id="@+id/progress_bar"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginBottom="8dp" />
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/projects_empty"
@@ -33,6 +45,10 @@
         android:layout_gravity="center"
         android:text="@string/no_more_folders"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_consent.xml b/app/src/main/res/layout/activity_consent.xml
index 9bd25020..85fe89cf 100644
--- a/app/src/main/res/layout/activity_consent.xml
+++ b/app/src/main/res/layout/activity_consent.xml
@@ -5,19 +5,16 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <include
+        android:id="@+id/common_app_bar"
+        layout="@layout/common_app_bar" />
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintTop_toBottomOf="@id/common_app_bar"
         app:layout_constraintBottom_toTopOf="@id/button_container"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
diff --git a/app/src/main/res/layout/activity_create_new_folder.xml b/app/src/main/res/layout/activity_create_new_folder.xml
index 31f0b15c..dd194353 100644
--- a/app/src/main/res/layout/activity_create_new_folder.xml
+++ b/app/src/main/res/layout/activity_create_new_folder.xml
@@ -5,27 +5,24 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true"
+    tools:background="@color/colorBackground"
     tools:context="net.opendasharchive.openarchive.features.folders.CreateNewFolderActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <include
+        android:id="@+id/app_bar_layout"
+        layout="@layout/common_app_bar" />
 
     <TextView
         android:id="@+id/label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_horizontal_margin"
         android:text="@string/folder_name"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+        app:layout_constraintTop_toBottomOf="@id/app_bar_layout" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/folder_name_container"
@@ -42,7 +39,7 @@
             android:id="@+id/new_folder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/create_folder_name"
+            android:hint="Folder Name"
             android:imeOptions="actionDone"
             android:inputType="textNoSuggestions" />
 
diff --git a/app/src/main/res/layout/activity_edit_folder.xml b/app/src/main/res/layout/activity_edit_folder.xml
index 7a1189f6..36ff7d2a 100644
--- a/app/src/main/res/layout/activity_edit_folder.xml
+++ b/app/src/main/res/layout/activity_edit_folder.xml
@@ -6,28 +6,26 @@
     android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true"
     android:orientation="vertical"
+    tools:background="@color/colorBackground"
     tools:context=".features.settings.EditFolderActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+
+    <include
+        android:id="@+id/common_app_bar"
+        layout="@layout/common_app_bar"/>
+
 
     <TextView
         android:id="@+id/label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_vertical_margin"
         android:text="@string/folder_name"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+        app:layout_constraintTop_toBottomOf="@id/common_app_bar" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/folder_name_container"
@@ -50,12 +48,12 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-<!--    Hiding Creative Commons Licensing section from Folder Edit-->
+    <!--    Hiding Creative Commons Licensing section from Folder Edit-->
     <RelativeLayout
-        android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginVertical="@dimen/activity_vertical_margin"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/folder_name_container">
@@ -70,29 +68,44 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/activity_vertical_margin"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintStart_toStartOf="parent">
 
-        <TextView
-            android:id="@+id/bt_remove"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+            android:layout_gravity="center"
             android:layout_weight="50"
-            android:gravity="center"
-            android:text="@string/remove_from_app"
-            android:textColor="@color/colorDanger"
-            android:textStyle="bold" />
-
-        <Button
-            android:id="@+id/bt_archive"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="wrap_content"
+            android:gravity="center">
+
+            <TextView
+                android:id="@+id/bt_remove"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/remove_from_app"
+                android:textColor="@color/colorDanger"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-            android:layout_weight="50"
-            android:text="@string/action_archive_project" />
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_weight="50">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/bt_archive"
+                style="@style/Widget.Material3.Button.TextButton"
+                android:padding="16dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/action_archive_project"
+                android:textColor="@color/colorOnPrimaryContainer"/>
+        </LinearLayout>
+
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_folders.xml b/app/src/main/res/layout/activity_folders.xml
index f3811a72..a9e7ae59 100644
--- a/app/src/main/res/layout/activity_folders.xml
+++ b/app/src/main/res/layout/activity_folders.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true"
     android:orientation="vertical"
+    tools:background="@color/colorBackground"
     tools:context=".features.settings.FoldersActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" />
-
-<!--    Hiding Creating Commons Licensing section from Folder List view-->
-    <RelativeLayout
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/activity_vertical_margin">
+        android:layout_height="match_parent"
+        android:filterTouchesWhenObscured="true"
+        android:orientation="vertical"
+        tools:context=".features.settings.FoldersActivity">
 
+        <!-- Include the common AppBar -->
         <include
-            android:id="@+id/cc"
-            layout="@layout/content_cc" />
+            android:id="@+id/common_app_bar"
+            layout="@layout/common_app_bar" />
 
-    </RelativeLayout>
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_marginHorizontal="8dp"
+            android:id="@+id/rv_projects"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="@dimen/activity_vertical_margin" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_projects"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/activity_vertical_margin"
-        android:layout_marginHorizontal="@dimen/activity_horizontal_margin" />
+    </LinearLayout>
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/bt_view_archived"
-        android:layout_width="match_parent"
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_add"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/activity_vertical_margin"
-        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:text="@string/view_archived_folders" />
+        android:layout_margin="24dp"
+        android:contentDescription="@string/add_a_folder"
+        app:layout_anchor="@id/rv_projects"
+        app:layout_anchorGravity="bottom|end"
+        app:srcCompat="@drawable/baseline_add_24" />
+
 
-</LinearLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_gdrive.xml b/app/src/main/res/layout/activity_gdrive.xml
index d568be3c..bad492e7 100644
--- a/app/src/main/res/layout/activity_gdrive.xml
+++ b/app/src/main/res/layout/activity_gdrive.xml
@@ -7,20 +7,15 @@
     android:filterTouchesWhenObscured="true"
     tools:context=".features.onboarding.SpaceSetupActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <include
+        android:id="@+id/common_app_bar"
+        layout="@layout/common_app_bar" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/edit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
+        app:layout_constraintTop_toBottomOf="@id/common_app_bar">
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/gdrive_id_container"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 14271c49..33734659 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,336 +1,334 @@
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:background="@color/colorBackground"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:filterTouchesWhenObscured="true"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="end">
+    android:layout_height="match_parent">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimary">
 
-        <com.google.android.material.appbar.AppBarLayout
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/colorPrimary">
+            <!--            app:layout_scrollFlags="scroll|enterAlways"-->
 
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize">
+            <ImageView
+                android:layout_width="61dp"
+                android:layout_height="34dp"
+                android:layout_gravity="center"
+                android:importantForAccessibility="no"
+                android:src="@drawable/savelogo"
+                app:tint="@color/colorOnPrimary" />
 
-                <ImageView
-                    android:id="@+id/alertIcon"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:contentDescription="@string/error"
-                    android:src="@drawable/alert"
-                    android:visibility="gone" />
+        </com.google.android.material.appbar.MaterialToolbar>
 
-                <ImageView
-                    android:layout_width="61dp"
-                    android:layout_height="34dp"
-                    android:importantForAccessibility="no"
-                    android:src="@drawable/savelogo" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-            </androidx.appcompat.widget.Toolbar>
 
-        </com.google.android.material.appbar.AppBarLayout>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize">
 
+        <!-- Breadcrumb and Count Container -->
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/breadcrumb_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="?attr/actionBarSize">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/current_folder"
-                android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="8dp"
+            android:layout_marginVertical="@dimen/activity_vertical_margin"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <!-- Horizontal ScrollView for Breadcrumb -->
+            <HorizontalScrollView
+                android:id="@+id/breadcrumb_section"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-                android:layout_marginVertical="@dimen/activity_vertical_margin"
-                app:layout_constraintEnd_toEndOf="parent"
+                android:overScrollMode="never"
+                android:scrollbars="none"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/folder_count"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
-                <ImageView
-                    android:id="@+id/current_folder_icon"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:ignore="ContentDescription" />
-
-                <TextView
-                    android:id="@+id/current_folder_name"
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:textSize="20sp"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/current_folder_icon"
-                    tools:text="Folder Name" />
-
-                <TextView
-                    android:id="@+id/current_folder_count"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:background="@drawable/pill"
-                    tools:text="1"
-                    android:gravity="center"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-<!--                <com.google.android.material.button.MaterialButton-->
-<!--                    android:id="@+id/upload_edit_button"-->
-<!--                    style="@style/Widget.Material3.Button.TextButton"-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="40dp"-->
-<!--                    android:paddingEnd="0dp"-->
-<!--                    android:text="@string/edit"-->
-<!--                    app:icon="@drawable/ic_low_priority"-->
-<!--                    app:iconGravity="textStart"-->
-<!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                    app:layout_constraintEnd_toEndOf="parent"-->
-<!--                    app:layout_constraintTop_toTopOf="parent"-->
-<!--                    tools:ignore="RtlSymmetry" />-->
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.viewpager2.widget.ViewPager2
-                android:id="@+id/pager"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginBottom="2dp"
-                android:layout_marginTop="2dp"
-                app:layout_constraintBottom_toTopOf="@id/bottom_bar"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/current_folder" />
-
-            <LinearLayout
-                android:id="@+id/bottom_bar"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/bottom_nav_height"
-                android:background="@drawable/bottom_nav_background"
-                android:orientation="horizontal"
-                android:weightSum="3"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:baselineAligned="false">
-
-                <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/my_media_button"
-                        android:layout_width="56dp"
-                        android:layout_height="38dp"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginBottom="0dp"
-                        android:backgroundTint="@color/colorBottomNavbar"
-                        android:paddingTop="0dp"
-                        android:paddingBottom="0dp"
-                        app:icon="@drawable/outline_perm_media_24"
-                        app:iconGravity="textStart"
-                        app:iconPadding="0dp"
-                        app:iconSize="36dp"
-                        app:iconTint="@color/colorOnBottomNavbar"
-                        app:rippleColor="@color/c23_light_grey" />
+                    <!-- Space Icon -->
+                    <ImageView
+                        android:id="@+id/space_icon"
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:contentDescription="@string/servers"
+                        android:paddingEnd="4dp" />
 
+                    <!-- Space Chip -->
                     <TextView
-                        android:id="@+id/my_media_label"
+                        android:id="@+id/breadcrumb_space"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/my_media_button"
-                        android:layout_centerHorizontal="true"
                         android:clickable="true"
-                        android:focusable="false"
+                        android:focusable="true"
                         android:padding="0dp"
-                        android:soundEffectsEnabled="false"
-                        android:text="@string/my_media"
-                        android:textSize="12sp"
-                        tools:ignore="KeyboardInaccessibleWidget" />
-
-                </RelativeLayout>
-
-                <FrameLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
+                        android:text="Space Name" />
 
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/add_button"
+                    <!-- Separator -->
+                    <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="8dp"
-                        android:backgroundTint="@color/colorAddButton"
-                        android:paddingTop="0dp"
-                        android:paddingBottom="0dp"
-                        app:icon="@drawable/baseline_add_white_24"
-                        app:iconGravity="textStart"
-                        app:iconPadding="0dp"
-                        app:iconSize="38dp"
-                        app:iconTint="@color/colorOnAddButton"
-                        app:rippleColor="@color/c23_light_grey" />
-
-                </FrameLayout>
-
-                <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/settings_button"
-                        android:layout_width="56dp"
-                        android:layout_height="38dp"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginBottom="0dp"
-                        android:backgroundTint="@color/colorBottomNavbar"
-                        android:paddingTop="0dp"
-                        android:paddingBottom="0dp"
-                        app:icon="@drawable/ic_settings"
-                        app:iconGravity="textStart"
-                        app:iconPadding="0dp"
-                        app:iconSize="36dp"
-                        app:iconTint="@color/colorOnBottomNavbar"
-                        app:rippleColor="@color/c23_light_grey" />
+                        android:src="@drawable/keyboard_arrow_right"
+                        app:tint="@color/colorOnBackground" />
 
+                    <!-- Folder Chip -->
                     <TextView
-                        android:id="@+id/settings_label"
+                        android:id="@+id/breadcrumb_folder"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/settings_button"
-                        android:layout_centerHorizontal="true"
                         android:clickable="true"
-                        android:focusable="false"
+                        android:focusable="true"
+                        android:maxLines="1"
                         android:padding="0dp"
-                        android:soundEffectsEnabled="false"
-                        android:text="@string/action_settings"
-                        android:textSize="12sp"
-                        tools:ignore="KeyboardInaccessibleWidget" />
+                        android:text="Folder Name" />
 
-                </RelativeLayout>
+                    <!-- Add more breadcrumb items as needed -->
 
-            </LinearLayout>
+                </LinearLayout>
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+            </HorizontalScrollView>
 
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+            <!-- Gradient Fade Effect -->
+            <View
+                android:layout_width="72dp"
+                android:layout_height="0dp"
+                android:layout_gravity="end"
+                android:background="@drawable/gradient_fade"
+                app:layout_constraintBottom_toBottomOf="@id/breadcrumb_section"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/breadcrumb_section" />
 
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/folder_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="end"
-        android:clipChildren="true"
-        android:fitsSystemWindows="true">
+            <!-- Folder Count -->
+            <TextView
+                android:id="@+id/folder_count"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:background="@drawable/pill"
+                android:elevation="1dp"
+                android:fontFamily="@font/montserrat"
+                android:gravity="center"
+                android:text="1"
+                android:textColor="@color/colorOnBackground"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        <!--        <androidx.constraintlayout.widget.ConstraintLayout-->
+        <!--            android:id="@+id/current_folder"-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"-->
+        <!--            android:layout_marginVertical="@dimen/activity_vertical_margin"-->
+        <!--            android:visibility="gone"-->
+        <!--            app:layout_constraintEnd_toEndOf="parent"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintTop_toBottomOf="@id/breadcrumb_container">-->
+
+        <!--            <ImageView-->
+        <!--                android:id="@+id/current_folder_icon"-->
+        <!--                android:layout_width="32dp"-->
+        <!--                android:layout_height="32dp"-->
+        <!--                app:layout_constraintBottom_toBottomOf="parent"-->
+        <!--                app:layout_constraintStart_toStartOf="parent"-->
+        <!--                app:layout_constraintTop_toTopOf="parent"-->
+        <!--                tools:ignore="ContentDescription" />-->
+
+        <!--            <TextView-->
+        <!--                android:id="@+id/current_folder_name"-->
+        <!--                android:layout_width="wrap_content"-->
+        <!--                android:layout_height="wrap_content"-->
+        <!--                android:layout_marginStart="16dp"-->
+        <!--                android:textSize="20sp"-->
+        <!--                app:layout_constraintBottom_toBottomOf="parent"-->
+        <!--                app:layout_constraintStart_toEndOf="@id/current_folder_icon"-->
+        <!--                app:layout_constraintTop_toTopOf="parent"-->
+        <!--                tools:text="Folder Name" />-->
+
+        <!--            <TextView-->
+        <!--                android:id="@+id/current_folder_count"-->
+        <!--                android:layout_width="20dp"-->
+        <!--                android:layout_height="20dp"-->
+        <!--                android:background="@drawable/pill"-->
+        <!--                android:gravity="center"-->
+        <!--                app:layout_constraintBottom_toBottomOf="parent"-->
+        <!--                app:layout_constraintEnd_toEndOf="parent"-->
+        <!--                app:layout_constraintTop_toTopOf="parent"-->
+        <!--                tools:text="1" />-->
+
+        <!--                            <com.google.android.material.button.MaterialButton-->
+        <!--                                android:id="@+id/upload_edit_button"-->
+        <!--                                style="@style/Widget.Material3.Button.TextButton"-->
+        <!--                                android:layout_width="wrap_content"-->
+        <!--                                android:layout_height="40dp"-->
+        <!--                                android:paddingEnd="0dp"-->
+        <!--                                android:text="@string/edit"-->
+        <!--                                app:icon="@drawable/ic_low_priority"-->
+        <!--                                app:iconGravity="textStart"-->
+        <!--                                app:layout_constraintBottom_toBottomOf="parent"-->
+        <!--                                app:layout_constraintEnd_toEndOf="parent"-->
+        <!--                                app:layout_constraintTop_toTopOf="parent"-->
+        <!--                                tools:ignore="RtlSymmetry" />-->
+
+        <!--        </androidx.constraintlayout.widget.ConstraintLayout>-->
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/pager"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
+            app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/breadcrumb_container" />
+
+        <net.opendasharchive.openarchive.core.presentation.components.CustomBottomNavBar
+            android:id="@+id/bottom_nav_bar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="?attr/actionBarSize"
-            android:animateLayoutChanges="false"
-            android:backgroundTint="@color/background">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/folders"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginStart="24dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/current_space_name" />
+            android:layout_height="@dimen/bottom_nav_height"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"/>
+
+
+
+<!--        Custom Bottom Bar-->
+<!--        <LinearLayout-->
+<!--            android:visibility="gone"-->
+<!--            android:id="@+id/bottom_bar"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="@dimen/bottom_nav_height"-->
+<!--            android:background="@drawable/bottom_nav_background"-->
+<!--            android:baselineAligned="false"-->
+<!--            android:orientation="horizontal"-->
+<!--            android:weightSum="3"-->
+<!--            app:layout_constraintBottom_toBottomOf="parent"-->
+<!--            app:layout_constraintEnd_toEndOf="parent"-->
+<!--            app:layout_constraintStart_toStartOf="parent">-->
+
+<!--            <RelativeLayout-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="match_parent"-->
+<!--                android:layout_weight="1">-->
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/spaces"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:alpha="0"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/navigation_drawer_header" />
+<!--                <com.google.android.material.button.MaterialButton-->
+<!--                    android:id="@+id/my_media_button"-->
+<!--                    android:layout_width="56dp"-->
+<!--                    android:layout_height="38dp"-->
+<!--                    android:layout_centerHorizontal="true"-->
+<!--                    android:layout_marginTop="8dp"-->
+<!--                    android:layout_marginBottom="0dp"-->
+<!--                    android:backgroundTint="@color/colorBottomNavbar"-->
+<!--                    android:paddingTop="0dp"-->
+<!--                    android:paddingBottom="0dp"-->
+<!--                    app:icon="@drawable/outline_perm_media_24"-->
+<!--                    app:iconGravity="textStart"-->
+<!--                    app:iconPadding="0dp"-->
+<!--                    app:iconSize="24dp"-->
+<!--                    app:iconTint="@color/colorOnBottomNavbar"-->
+<!--                    app:rippleColor="@color/c23_light_grey" />-->
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/navigation_drawer_header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:animateLayoutChanges="false"
-                android:background="@color/colorNavigationDrawerBackground"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
+<!--                <TextView-->
+<!--                    android:id="@+id/my_media_label"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_below="@id/my_media_button"-->
+<!--                    android:layout_centerHorizontal="true"-->
+<!--                    android:clickable="true"-->
+<!--                    android:focusable="false"-->
+<!--                    android:padding="0dp"-->
+<!--                    android:soundEffectsEnabled="false"-->
+<!--                    android:text="@string/my_media"-->
+<!--                    android:textSize="12sp"-->
+<!--                    tools:ignore="KeyboardInaccessibleWidget" />-->
+
+<!--            </RelativeLayout>-->
+
+<!--            <FrameLayout-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="match_parent"-->
+<!--                android:layout_weight="1">-->
+
+
+<!--                <ImageButton-->
+<!--                    android:id="@+id/add_button"-->
+<!--                    android:layout_width="80dp"-->
+<!--                    android:layout_height="42dp"-->
+<!--                    android:layout_gravity="center_horizontal"-->
+<!--                    android:layout_marginTop="16dp"-->
+<!--                    android:layout_marginBottom="8dp"-->
+<!--                    android:background="@drawable/pill_bg"-->
+<!--                    android:backgroundTint="@color/colorAddButton"-->
+<!--                    android:paddingHorizontal="16dp"-->
+<!--                    android:src="@drawable/baseline_add_24"-->
+<!--                    app:rippleColor="@color/c23_light_grey" />-->
+
+<!--            </FrameLayout>-->
+
+<!--            <RelativeLayout-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="match_parent"-->
+<!--                android:layout_weight="1">-->
 
-                <TextView
-                    android:id="@+id/space_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:layout_marginHorizontal="12dp"
-                    android:drawablePadding="@dimen/padding_small"
-                    android:gravity="center_vertical"
-                    android:textSize="24sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <View
-                    android:id="@+id/spaces_header_separator"
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:layout_marginVertical="10dp"
-                    android:alpha="0.5"
-                    android:background="@color/colorOnPrimary"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/space_name" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
+<!--                <com.google.android.material.button.MaterialButton-->
+<!--                    android:id="@+id/settings_button"-->
+<!--                    android:layout_width="56dp"-->
+<!--                    android:layout_height="38dp"-->
+<!--                    android:layout_centerHorizontal="true"-->
+<!--                    android:layout_marginTop="8dp"-->
+<!--                    android:layout_marginBottom="0dp"-->
+<!--                    android:backgroundTint="@color/colorBottomNavbar"-->
+<!--                    android:paddingTop="0dp"-->
+<!--                    android:paddingBottom="0dp"-->
+<!--                    app:icon="@drawable/ic_settings"-->
+<!--                    app:iconGravity="textStart"-->
+<!--                    app:iconPadding="0dp"-->
+<!--                    app:iconSize="24dp"-->
+<!--                    app:iconTint="@color/colorOnBottomNavbar"-->
+<!--                    app:rippleColor="@color/c23_light_grey" />-->
 
-            <TextView
-                android:id="@+id/current_space_name"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_marginHorizontal="8dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:drawablePadding="@dimen/padding_small"
-                android:gravity="center_vertical"
-                android:textSize="20sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/navigation_drawer_header" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/new_folder"
-                style="?attr/materialButtonOutlinedStyle"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_margin="30dp"
-                android:text="@string/new_folder"
-                android:textColor="@color/c23_teal_80"
-                android:textSize="16sp"
-                android:textStyle="bold"
-                app:cornerRadius="10dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:strokeColor="@color/c23_teal_80"
-                app:strokeWidth="3dp" />
+<!--                <TextView-->
+<!--                    android:id="@+id/settings_label"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_below="@id/settings_button"-->
+<!--                    android:layout_centerHorizontal="true"-->
+<!--                    android:clickable="true"-->
+<!--                    android:focusable="false"-->
+<!--                    android:padding="0dp"-->
+<!--                    android:soundEffectsEnabled="false"-->
+<!--                    android:text="@string/action_settings"-->
+<!--                    android:textSize="12sp"-->
+<!--                    tools:ignore="KeyboardInaccessibleWidget" />-->
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+<!--            </RelativeLayout>-->
+
+<!--        </LinearLayout>-->
 
-    </com.google.android.material.navigation.NavigationView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_onboarding23.xml b/app/src/main/res/layout/activity_onboarding23.xml
index f1792b06..29eb9e55 100644
--- a/app/src/main/res/layout/activity_onboarding23.xml
+++ b/app/src/main/res/layout/activity_onboarding23.xml
@@ -55,7 +55,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/get_started"
-                android:textColor="@color/colorOnboarding23GetStarted"
+                android:textColor="@color/colorText"
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
@@ -66,7 +66,7 @@
                 android:adjustViewBounds="true"
                 android:paddingTop="8dp"
                 android:src="@drawable/onboarding23_arrow_right"
-                app:tint="@color/colorOnboarding23GetStarted" />
+                app:tint="@color/colorText" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_onboarding23_instructions.xml b/app/src/main/res/layout/activity_onboarding23_instructions.xml
index 6a204fdd..931e6890 100644
--- a/app/src/main/res/layout/activity_onboarding23_instructions.xml
+++ b/app/src/main/res/layout/activity_onboarding23_instructions.xml
@@ -15,7 +15,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="end"
-        android:background="@color/colorPrimary">
+        android:background="@color/colorTertiary">
 
         <Button
             android:id="@+id/skip_button"
@@ -25,7 +25,7 @@
             android:layout_gravity="top|center_horizontal"
             android:layout_marginTop="24dp"
             android:text="@string/skip"
-            android:textColor="@color/colorBackground" />
+            android:textColor="@color/colorOnPrimary" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
@@ -34,9 +34,9 @@
             android:layout_gravity="bottom|end"
             android:layout_margin="24dp"
             android:contentDescription="@string/next"
-            app:backgroundTint="@color/colorPrimaryBright"
+            app:backgroundTint="@color/colorPrimaryContainer"
             app:srcCompat="@drawable/ic_arrow_right"
-            app:tint="@color/colorBackground" />
+            app:tint="@color/colorOnPrimary" />
     </FrameLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/activity_preview.xml b/app/src/main/res/layout/activity_preview.xml
index bb8c03e2..f33c94a8 100644
--- a/app/src/main/res/layout/activity_preview.xml
+++ b/app/src/main/res/layout/activity_preview.xml
@@ -5,14 +5,9 @@
     android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <include
+        android:id="@+id/common_app_bar"
+        layout="@layout/common_app_bar" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/media_grid"
@@ -21,15 +16,17 @@
         app:layout_constraintBottom_toTopOf="@id/bt_add_more"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+        app:layout_constraintTop_toBottomOf="@id/common_app_bar" />
 
     <Button
+        android:layout_marginVertical="24dp"
         android:id="@+id/bt_add_more"
-        style="?android:attr/buttonBarButtonStyle"
+        style="@style/Widget.Material3.Button.Icon"
+        android:backgroundTint="@color/colorTertiary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/add_more"
-        app:icon="@drawable/ic_add"
+        app:icon="@drawable/baseline_add_24"
         app:layout_constraintBottom_toTopOf="@id/bottom_bar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
@@ -37,6 +34,7 @@
     <LinearLayout
         android:id="@+id/bottom_bar"
         android:layout_width="match_parent"
+        android:layout_marginVertical="24dp"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -45,6 +43,7 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/bt_batch_edit"
             style="?android:attr/buttonBarButtonStyle"
+            app:iconTint="@color/colorTertiary"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -53,6 +52,7 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/bt_select_all"
             style="?android:attr/buttonBarButtonStyle"
+            android:textColor="@color/colorTertiary"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -61,6 +61,7 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/bt_remove"
             style="?android:attr/buttonBarButtonStyle"
+            app:iconTint="@color/colorTertiary"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/app/src/main/res/layout/activity_review.xml b/app/src/main/res/layout/activity_review.xml
index b8aab967..7f2b0aa2 100644
--- a/app/src/main/res/layout/activity_review.xml
+++ b/app/src/main/res/layout/activity_review.xml
@@ -8,21 +8,16 @@
     android:filterTouchesWhenObscured="true"
     tools:context=".features.media.ReviewActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <include
+        android:id="@+id/common_app_bar"
+        layout="@layout/common_app_bar" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintTop_toBottomOf="@id/common_app_bar"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -151,7 +146,7 @@
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/metadata"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintTop_toBottomOf="@id/common_app_bar"
         tools:ignore="HardcodedText" />
 
     <com.google.android.material.button.MaterialButton
@@ -167,7 +162,7 @@
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/metadata"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintTop_toBottomOf="@id/common_app_bar"
         tools:ignore="HardcodedText" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/activity_settings_container.xml b/app/src/main/res/layout/activity_settings_container.xml
index f5e1656e..bb09b3f2 100644
--- a/app/src/main/res/layout/activity_settings_container.xml
+++ b/app/src/main/res/layout/activity_settings_container.xml
@@ -8,11 +8,9 @@
     android:orientation="vertical"
     tools:context=".features.settings.GeneralSettingsActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" />
+    <include
+        android:id="@+id/common_app_bar"
+        layout="@layout/common_app_bar" />
 
     <FrameLayout
         android:id="@+id/container"
diff --git a/app/src/main/res/layout/activity_space_setup.xml b/app/src/main/res/layout/activity_space_setup.xml
index 0af20731..887bcb25 100644
--- a/app/src/main/res/layout/activity_space_setup.xml
+++ b/app/src/main/res/layout/activity_space_setup.xml
@@ -7,14 +7,15 @@
     android:filterTouchesWhenObscured="true"
     tools:context=".features.onboarding.SpaceSetupActivity">
 
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <include
-            android:id="@+id/progress_block"
-            layout="@layout/block_space_setup_progress"
+            android:id="@+id/common_app_bar"
+            layout="@layout/common_app_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
@@ -23,7 +24,7 @@
             android:name="net.opendasharchive.openarchive.features.settings.SpaceSetupFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            tools:layout="@layout/fragment_webdav_setup_license"/>
+            tools:layout="@layout/fragment_space_setup" />
 
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/activity_spaces.xml b/app/src/main/res/layout/activity_spaces.xml
new file mode 100644
index 00000000..91e4bb88
--- /dev/null
+++ b/app/src/main/res/layout/activity_spaces.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:background="@color/colorBackground"
+    tools:context=".features.settings.FoldersActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:filterTouchesWhenObscured="true"
+        android:orientation="vertical"
+        tools:context=".features.settings.FoldersActivity">
+
+        <!-- Include the common AppBar -->
+        <include
+            android:id="@+id/common_app_bar"
+            layout="@layout/common_app_bar" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_marginHorizontal="8dp"
+            android:id="@+id/rv_projects"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="@dimen/activity_vertical_margin" />
+
+    </LinearLayout>
+
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_add"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="24dp"
+        android:contentDescription="@string/add"
+        app:layout_anchor="@id/rv_projects"
+        app:layout_anchorGravity="bottom|end"
+        app:srcCompat="@drawable/baseline_add_24" />
+
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_upload_manager.xml b/app/src/main/res/layout/activity_upload_manager.xml
index 16f1b4a2..c079cba8 100644
--- a/app/src/main/res/layout/activity_upload_manager.xml
+++ b/app/src/main/res/layout/activity_upload_manager.xml
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+    <include
+        android:id="@+id/common_app_bar"
+        layout="@layout/common_app_bar" />
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" />
-
-    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_upload_manager" />
 
diff --git a/app/src/main/res/layout/activity_webdav.xml b/app/src/main/res/layout/activity_webdav.xml
index 860b59f6..14efe68a 100644
--- a/app/src/main/res/layout/activity_webdav.xml
+++ b/app/src/main/res/layout/activity_webdav.xml
@@ -9,16 +9,10 @@
     android:orientation="vertical"
     tools:context="net.opendasharchive.openarchive.services.webdav.WebDavActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:focusable="false"
-        android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:title="@string/private_server" />
+
+    <include
+        android:id="@+id/common_app_bar"
+        layout="@layout/common_app_bar" />
 
 
     <androidx.fragment.app.FragmentContainerView
@@ -30,7 +24,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+        app:layout_constraintTop_toBottomOf="@id/common_app_bar" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/block_onboarding23_title.xml b/app/src/main/res/layout/block_onboarding23_title.xml
index 18b598ba..f4e39c0f 100644
--- a/app/src/main/res/layout/block_onboarding23_title.xml
+++ b/app/src/main/res/layout/block_onboarding23_title.xml
@@ -15,7 +15,7 @@
         android:layout_weight="12"
         android:adjustViewBounds="true"
         android:src="@drawable/save_oa"
-        app:tint="@color/colorPrimary" />
+        app:tint="@color/colorTertiary" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/common_app_bar.xml b/app/src/main/res/layout/common_app_bar.xml
new file mode 100644
index 00000000..0972d872
--- /dev/null
+++ b/app/src/main/res/layout/common_app_bar.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/common_app_bar_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        tools:title="OpenArchive"
+        tools:navigationIcon="@drawable/ic_arrow_back"
+        tools:menu="@menu/menu_folder_list"
+        android:id="@+id/common_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize" />
+
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_cc.xml b/app/src/main/res/layout/content_cc.xml
index 55d4325b..a7c89adf 100644
--- a/app/src/main/res/layout/content_cc.xml
+++ b/app/src/main/res/layout/content_cc.xml
@@ -10,14 +10,15 @@
     android:orientation="vertical"
     android:padding="@dimen/activity_horizontal_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".features.settings.EditFolderActivity"
-    tools:showIn="@layout/activity_space_setup">
+    tools:context=".features.onboarding.SpaceSetupActivity"
+    tools:background="@color/colorBackground"
+    tools:showIn="@layout/fragment_webdav_setup_license">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.SwitchCompat
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/sw_cc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -42,12 +43,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.SwitchCompat
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/sw_nd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:checked="false"
+            android:checked="true"
             android:showText="true"
             android:textOff="@string/answer_no"
             android:textOn="@string/answer_yes" />
@@ -67,7 +68,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.SwitchCompat
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/sw_sa"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -92,7 +93,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.SwitchCompat
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/sw_nc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -111,19 +112,31 @@
 
     </RelativeLayout>
 
-    <TextView
-        android:id="@+id/tv_license"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        tools:text="https://creativecommons.org" />
-
-    <TextView
-        android:id="@+id/bt_learn_more"
+    <LinearLayout
+        android:layout_marginTop="32dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:text="@string/learn_more_about_creative_commons"
-        android:textColor="@color/c23_medium_grey" />
+        android:orientation="vertical">
+
+
+        <TextView
+            android:id="@+id/tv_license"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="@color/colorTertiary"
+            tools:text="https://creativecommons.org" />
+
+        <TextView
+            android:id="@+id/bt_learn_more"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:text="@string/learn_more_about_creative_commons"
+            android:textColor="@color/colorTertiary" />
+
+    </LinearLayout>
+
+
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/bottom_bar.xml b/app/src/main/res/layout/custom_bottom_nav.xml
similarity index 81%
rename from app/src/main/res/layout/bottom_bar.xml
rename to app/src/main/res/layout/custom_bottom_nav.xml
index f11218b9..aad88027 100644
--- a/app/src/main/res/layout/bottom_bar.xml
+++ b/app/src/main/res/layout/custom_bottom_nav.xml
@@ -1,14 +1,14 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/bottom_bar"
     android:layout_width="match_parent"
     android:layout_height="@dimen/bottom_nav_height"
     android:background="@drawable/bottom_nav_background"
+    android:baselineAligned="false"
     android:orientation="horizontal"
-    android:weightSum="3"
-   android:baselineAligned="false">
+    android:weightSum="3">
+
 
     <RelativeLayout
         android:layout_width="0dp"
@@ -22,10 +22,10 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="0dp"
-            android:backgroundTint="@color/colorBottomNavbar"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:paddingTop="0dp"
             android:paddingBottom="0dp"
-            app:icon="@drawable/ic_home"
+            app:icon="@drawable/outline_perm_media_24"
             app:iconGravity="textStart"
             app:iconPadding="0dp"
             app:iconSize="24dp"
@@ -38,7 +38,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/my_media_button"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="-4dp"
             android:clickable="true"
             android:focusable="false"
             android:padding="0dp"
@@ -54,20 +53,18 @@
         android:layout_height="match_parent"
         android:layout_weight="1">
 
-        <com.google.android.material.button.MaterialButton
+
+        <ImageButton
             android:id="@+id/add_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="80dp"
+            android:layout_height="42dp"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="8dp"
+            android:background="@drawable/pill_bg"
             android:backgroundTint="@color/colorAddButton"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
-            app:icon="@drawable/baseline_add_white_24"
-            app:iconGravity="textStart"
-            app:iconPadding="0dp"
-            app:iconSize="38dp"
-            app:iconTint="@color/colorOnAddButton"
+            android:paddingHorizontal="16dp"
+            android:src="@drawable/baseline_add_24"
             app:rippleColor="@color/c23_light_grey" />
 
     </FrameLayout>
@@ -84,6 +81,7 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="0dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:backgroundTint="@color/colorBottomNavbar"
             android:paddingTop="0dp"
             android:paddingBottom="0dp"
@@ -100,7 +98,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/settings_button"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="-4dp"
             android:clickable="true"
             android:focusable="false"
             android:padding="0dp"
diff --git a/app/src/main/res/layout/custom_preference.xml b/app/src/main/res/layout/custom_preference.xml
new file mode 100644
index 00000000..44c499ad
--- /dev/null
+++ b/app/src/main/res/layout/custom_preference.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:clipToPadding="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingRight">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp" />
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:textFontWeight="500"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:textSize="14sp"
+            tools:text="Title" />
+
+
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:maxLines="2"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="11sp"
+            tools:text="Summary" />
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_preference_category.xml b/app/src/main/res/layout/custom_preference_category.xml
new file mode 100644
index 00000000..98e7e46b
--- /dev/null
+++ b/app/src/main/res/layout/custom_preference_category.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/transparent"
+    android:orientation="vertical"
+    android:paddingHorizontal="16dp"
+    android:paddingTop="16dp"
+    android:paddingBottom="8dp">
+
+    <!--  Overriding android ids results automatic setting of title / summary -->
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif"
+        android:lineSpacingExtra="3sp"
+        android:textColor="@color/c23_teal"
+        android:textFontWeight="600"
+        android:textSize="18sp"
+        android:textStyle="normal"
+        tools:text="Secure" />
+
+    <TextView
+        android:id="@android:id/summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif"
+        android:lineSpacingExtra="3sp"
+        android:textColor="@color/colorOnSurface"
+        android:textSize="14sp"
+        android:textStyle="normal"
+        tools:ignore="SmallSp"
+        tools:text="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry’s." />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_preference_divider.xml b/app/src/main/res/layout/custom_preference_divider.xml
new file mode 100644
index 00000000..7fb2f325
--- /dev/null
+++ b/app/src/main/res/layout/custom_preference_divider.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    tools:showIn="@layout/custom_preference" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_preference_info.xml b/app/src/main/res/layout/custom_preference_info.xml
new file mode 100644
index 00000000..94e79bca
--- /dev/null
+++ b/app/src/main/res/layout/custom_preference_info.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:clipToPadding="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingRight">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:contentDescription="@null" />
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:textFontWeight="300"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:text="Title" />
+
+
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:text="Summary" />
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_preference_switch.xml b/app/src/main/res/layout/custom_preference_switch.xml
new file mode 100644
index 00000000..2013b402
--- /dev/null
+++ b/app/src/main/res/layout/custom_preference_switch.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:clipToPadding="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingRight">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp" />
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:textFontWeight="500"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:textSize="14sp"
+            tools:text="Title" />
+
+
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:maxLines="2"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="11sp"
+            tools:text="Summary" />
+
+    </RelativeLayout>
+
+    <com.google.android.material.materialswitch.MaterialSwitch
+        android:id="@android:id/checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@null"
+        android:clickable="false"
+        android:focusable="false" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_preference_widget_switch.xml b/app/src/main/res/layout/custom_preference_widget_switch.xml
new file mode 100644
index 00000000..ad1414a9
--- /dev/null
+++ b/app/src/main/res/layout/custom_preference_widget_switch.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.materialswitch.MaterialSwitch
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:focusable="false"
+    android:clickable="false"
+    android:background="@null" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/folder_row.xml b/app/src/main/res/layout/folder_row.xml
index 39540467..53bf25f5 100644
--- a/app/src/main/res/layout/folder_row.xml
+++ b/app/src/main/res/layout/folder_row.xml
@@ -1,26 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:filterTouchesWhenObscured="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="8dp">
+    android:layout_margin="4dp"
+    android:padding="8dp"
+    android:background="@drawable/item_background_selector"
+    android:filterTouchesWhenObscured="true">
+
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:id="@+id/text_container"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:filterTouchesWhenObscured="true"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingHorizontal="4dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/rv_tick"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/activity_vertical_margin"
-            android:src="@drawable/ic_folder"
-            android:importantForAccessibility="no" />
+            android:importantForAccessibility="no"
+            app:tint="@color/colorOnPrimaryContainer"
+            android:src="@drawable/ic_folder" />
 
         <LinearLayout
+            android:paddingVertical="4dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -29,7 +42,7 @@
                 android:id="@+id/name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="17sp"
+                android:textSize="16sp"
                 android:textStyle="bold"
                 tools:text="Foobar Project" />
 
@@ -41,14 +54,23 @@
                 tools:text="Tuesday, Jan 21, 2023" />
 
         </LinearLayout>
-
     </LinearLayout>
 
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginVertical="8dp"
-        android:background="@color/colorDivider" />
+    <ImageButton
+        android:id="@+id/rv_tick"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="16dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:src="@drawable/ic_tick_circle"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/text_container"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@color/colorTertiary" />
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_content_picker.xml b/app/src/main/res/layout/fragment_content_picker.xml
new file mode 100644
index 00000000..37fecb6a
--- /dev/null
+++ b/app/src/main/res/layout/fragment_content_picker.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/rounded_dialog"
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="16dp"
+        android:orientation="vertical"
+        android:padding="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:padding="16dp"
+            android:layout_marginHorizontal="24dp"
+            style="@style/TextAppearance.Material3.BodyLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Add media using"/>
+
+        <LinearLayout
+            android:layout_marginBottom="24dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="3">
+
+            <LinearLayout
+                android:id="@+id/action_upload_camera"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:minHeight="50dp"
+                    android:src="@drawable/ic_photo_camera"
+                    app:tint="@color/colorOnSurface" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/camera"
+                    android:textAlignment="center" />
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:id="@+id/action_upload_media"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:minHeight="50dp"
+                    android:src="@drawable/ic_image_gallery_line"
+                    app:tint="@color/colorOnSurface" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/photo_gallery"
+                    android:textAlignment="center" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/action_upload_files"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:minHeight="50dp"
+                    android:src="@drawable/ic_description"
+                    app:tint="@color/colorOnSurface" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/files"
+                    android:textAlignment="center" />
+            </LinearLayout>
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:padding="8dp"
+                app:cardBackgroundColor="@color/colorBackground"
+                app:cardCornerRadius="8dp"
+                app:cardElevation="0dp">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="8dp">
+
+                    <ImageView
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:layout_marginEnd="8dp"
+                        android:src="@drawable/ic_photo_camera"
+                        app:tint="@color/colorOnSurface" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="@string/add_camera" />
+
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:padding="8dp"
+                app:cardBackgroundColor="@color/colorBackground"
+                app:cardCornerRadius="8dp"
+                app:cardElevation="4dp">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="8dp">
+
+                    <ImageView
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:layout_marginEnd="8dp"
+                        android:src="@drawable/ic_photo_library"
+                        app:tint="@color/colorOnSurface" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="@string/add_images_or_video" />
+
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:padding="8dp"
+                app:cardBackgroundColor="@color/colorBackground"
+                app:cardCornerRadius="8dp"
+                app:cardElevation="4dp">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="8dp">
+
+                    <ImageView
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:layout_marginEnd="8dp"
+                        android:src="@drawable/ic_description"
+                        app:tint="@color/colorOnSurface" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="@string/add_files" />
+
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main_media.xml b/app/src/main/res/layout/fragment_main_media.xml
index 8b5941ae..aa90f9fb 100644
--- a/app/src/main/res/layout/fragment_main_media.xml
+++ b/app/src/main/res/layout/fragment_main_media.xml
@@ -22,6 +22,13 @@
         </LinearLayout>
     </ScrollView>
 
+    <!-- RecyclerView -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:visibility="gone"
+        android:id="@+id/media_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/add_media_hint"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_media_container.xml b/app/src/main/res/layout/fragment_media_container.xml
new file mode 100644
index 00000000..ce6087b0
--- /dev/null
+++ b/app/src/main/res/layout/fragment_media_container.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- Breadcrumb and Count Container -->
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/breadcrumb_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="8dp"
+        android:layout_marginVertical="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <!-- Horizontal ScrollView for Breadcrumb -->
+        <HorizontalScrollView
+            android:id="@+id/breadcrumb_section"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:overScrollMode="never"
+            android:scrollbars="none"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/folder_count"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <!-- Space Icon -->
+                <ImageView
+                    android:id="@+id/space_icon"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:contentDescription="@string/servers"
+                    android:paddingStart="4dp"
+                    android:paddingEnd="4dp" />
+
+                <!-- Space Chip -->
+                <TextView
+                    android:id="@+id/breadcrumb_space"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:padding="0dp"
+                    android:text="Space Name" />
+
+                <!-- Separator -->
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/keyboard_arrow_right"
+                    app:tint="@color/colorOnBackground" />
+
+                <!-- Folder Chip -->
+                <TextView
+                    android:id="@+id/breadcrumb_folder"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:maxLines="1"
+                    android:padding="0dp"
+                    android:text="Folder Name" />
+
+                <!-- Add more breadcrumb items as needed -->
+
+            </LinearLayout>
+
+        </HorizontalScrollView>
+
+        <!-- Gradient Fade Effect -->
+        <View
+            android:layout_width="72dp"
+            android:layout_height="0dp"
+            android:layout_gravity="end"
+            android:background="@drawable/gradient_fade"
+            app:layout_constraintBottom_toBottomOf="@id/breadcrumb_section"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/breadcrumb_section" />
+
+        <!-- Folder Count -->
+        <TextView
+            android:id="@+id/folder_count"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:background="@drawable/pill"
+            android:elevation="1dp"
+            android:fontFamily="@font/montserrat"
+            android:gravity="center"
+            android:text="1"
+            android:textColor="@color/colorOnBackground"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/pager"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="2dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/breadcrumb_container" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 251a383a..4c2b39c7 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -8,67 +8,82 @@
     android:orientation="vertical"
     tools:context=".features.settings.SettingsFragment">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="top"
-        android:orientation="vertical"
-        android:padding="@dimen/activity_vertical_margin">
+        android:layout_height="wrap_content">
 
-        <TextView
-            android:id="@+id/bt_general"
+        <FrameLayout
+            android:visibility="gone"
+            android:id="@+id/settings_container"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:text="@string/general"
-            android:textSize="22sp" />
+            android:layout_height="wrap_content" />
 
-        <TextView
-            android:id="@+id/bt_space"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:textSize="22sp"
-            tools:text="Space FPO" />
 
-        <TextView
-            android:id="@+id/bt_folders"
+        <LinearLayout
+            android:visibility="visible"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="32dp"
-            android:textSize="22sp"
-            android:text="@string/folders" />
+            android:gravity="top"
+            android:orientation="vertical"
+            android:padding="@dimen/activity_vertical_margin">
 
-        <TextView
-            android:id="@+id/bt_about"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:layout_marginBottom="24dp"
-            android:text="@string/action_about"
-            android:textColor="@color/c23_medium_grey" />
+            <TextView
+                android:id="@+id/bt_general"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="24dp"
+                android:text="@string/general"
+                android:textSize="22sp" />
 
-        <TextView
-            android:id="@+id/bt_privacy"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:text="@string/action_privacy"
-            android:textColor="@color/c23_medium_grey" />
+            <TextView
+                android:id="@+id/bt_space"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="24dp"
+                android:textSize="22sp"
+                tools:text="Space FPO" />
 
-        <TextView
-            android:id="@+id/version"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:textColor="@color/c23_medium_grey"
-            android:textSize="12sp"
-            tools:text="Version 0.0.0" />
+            <TextView
+                android:id="@+id/bt_folders"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="32dp"
+                android:textSize="22sp"
+                android:text="@string/folders" />
+
+            <TextView
+                android:id="@+id/bt_about"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
+                android:layout_marginBottom="24dp"
+                android:text="@string/action_about"
+                android:textColor="@color/c23_medium_grey" />
+
+            <TextView
+                android:id="@+id/bt_privacy"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="24dp"
+                android:text="@string/action_privacy"
+                android:textColor="@color/c23_medium_grey" />
+
+            <TextView
+                android:id="@+id/version"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:textColor="@color/c23_medium_grey"
+                android:textSize="12sp"
+                tools:text="Version 0.0.0" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="@dimen/bottom_nav_padding" />
+
+        </LinearLayout>
 
-        <View
-            android:layout_width="0dp"
-            android:layout_height="@dimen/bottom_nav_padding" />
+    </RelativeLayout>
 
-    </LinearLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_space_setup.xml b/app/src/main/res/layout/fragment_space_setup.xml
index 8ac63e5b..8bbeb09d 100644
--- a/app/src/main/res/layout/fragment_space_setup.xml
+++ b/app/src/main/res/layout/fragment_space_setup.xml
@@ -15,257 +15,250 @@
         android:padding="10dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-            android:gravity="center"
-            android:text="@string/to_get_started_connect_to_a_server_to_store_your_media"
-            android:textSize="20sp"
-            android:textStyle="bold" />
-
-        <TextView
-            android:layout_width="300dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="6dp"
-            android:gravity="center_horizontal"
-            android:text="@string/in_the_side_menu_you_can_add_another_server_and_connect_to_multiple_servers"
-            android:textSize="14sp" />
+            android:layout_marginBottom="24dp"
+            android:orientation="vertical"
+            android:paddingVertical="8dp">
 
-        <com.google.android.material.card.MaterialCardView
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+                android:layout_marginBottom="24dp"
+                android:gravity="center"
+                android:text="@string/to_get_started_connect_to_a_server_to_store_your_media"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginVertical="6dp"
+                android:gravity="center_horizontal"
+                android:text="You can add another server and connect to multiple servers at any time."
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/webdav"
             android:layout_width="match_parent"
-            android:layout_height="120dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-            android:layout_marginVertical="@dimen/activity_vertical_margin"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            app:cardBackgroundColor="@color/colorBackground"
-            app:cardCornerRadius="@dimen/activity_horizontal_margin"
-            app:cardElevation="0dp"
-            app:strokeColor="@color/colorOnBackground"
-            app:strokeWidth="@dimen/border_width">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
+            android:layout_marginVertical="16dp"
+            android:background="@drawable/item_background_selector"
+            android:orientation="horizontal"
+            android:padding="4dp">
+
+            <ImageView
+                android:id="@+id/icon_webdav"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:importantForAccessibility="no"
+                android:padding="2dp"
+                android:src="@drawable/ic_private_server"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
+                android:id="@+id/webdav_texts"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/icon_webdav"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
-                    android:importantForAccessibility="no"
-                    android:padding="2dp"
-                    android:src="@drawable/ic_private_server"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <LinearLayout
-                    android:id="@+id/webdav_texts"
-                    android:layout_width="0dp"
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/icon_next_webdav"
+                app:layout_constraintStart_toEndOf="@id/icon_webdav"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="8dp"
-                    app:layout_constraintEnd_toStartOf="@id/icon_next_webdav"
-                    app:layout_constraintStart_toEndOf="@id/icon_webdav"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/private_server"
-                        android:textSize="20sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/send_directly_to_a_private_server"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <ImageView
-                    android:id="@+id/icon_next_webdav"
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:src="@drawable/onboarding23_arrow_right"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:tint="@color/colorSpaceSetupProgressOn"
-                    android:importantForAccessibility="no" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <com.google.android.material.card.MaterialCardView
+                    android:layout_gravity="center_vertical"
+                    android:gravity=""
+                    android:text="@string/private_server"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/send_directly_to_a_private_server"
+                    android:textSize="12sp"
+                    android:visibility="gone" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/icon_next_webdav"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:importantForAccessibility="no"
+                android:src="@drawable/keyboard_arrow_right"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="@color/colorText" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/internet_archive"
             android:layout_width="match_parent"
-            android:layout_height="120dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-            android:layout_marginVertical="@dimen/activity_vertical_margin"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            app:cardBackgroundColor="@color/colorBackground"
-            app:cardCornerRadius="@dimen/activity_horizontal_margin"
-            app:cardElevation="0dp"
-            app:strokeColor="@color/colorOnBackground"
-            app:strokeWidth="@dimen/border_width">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
+            android:layout_marginVertical="16dp"
+            android:background="@drawable/item_background_selector"
+            android:orientation="horizontal"
+            android:padding="4dp">
+
+            <ImageView
+                android:id="@+id/icon_internet_archive"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:importantForAccessibility="no"
+                android:padding="2dp"
+                android:src="@drawable/ic_internet_archive"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
+                android:id="@+id/internet_archive_texts"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/icon_internet_archive"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
-                    android:importantForAccessibility="no"
-                    android:padding="2dp"
-                    android:src="@drawable/ic_internet_archive"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <LinearLayout
-                    android:id="@+id/internet_archive_texts"
-                    android:layout_width="0dp"
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/icon_next_internet_archive"
+                app:layout_constraintStart_toEndOf="@id/icon_internet_archive"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:text="@string/internet_archive"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="8dp"
-                    app:layout_constraintEnd_toStartOf="@id/icon_next_internet_archive"
-                    app:layout_constraintStart_toEndOf="@id/icon_internet_archive"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/internet_archive"
-                        android:textSize="20sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/upload_to_the_internet_archive"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <ImageView
-                    android:id="@+id/icon_next_internet_archive"
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:src="@drawable/onboarding23_arrow_right"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/internet_archive_texts"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:tint="@color/colorSpaceSetupProgressOn"
-                    android:importantForAccessibility="no" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </com.google.android.material.card.MaterialCardView>
-
-<!--        <com.google.android.material.card.MaterialCardView-->
-<!--            android:id="@+id/gdrive"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="120dp"-->
-<!--            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"-->
-<!--            android:layout_marginVertical="@dimen/activity_vertical_margin"-->
-<!--            android:background="?attr/selectableItemBackground"-->
-<!--            android:clickable="true"-->
-<!--            android:focusable="true"-->
-<!--            app:cardBackgroundColor="@color/colorBackground"-->
-<!--            app:cardCornerRadius="@dimen/activity_horizontal_margin"-->
-<!--            app:cardElevation="0dp"-->
-<!--            app:strokeColor="@color/colorOnBackground"-->
-<!--            app:strokeWidth="@dimen/border_width">-->
-
-<!--            <androidx.constraintlayout.widget.ConstraintLayout-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_gravity="center_vertical"-->
-<!--                android:layout_marginHorizontal="@dimen/activity_horizontal_margin"-->
-<!--                android:orientation="horizontal">-->
-
-<!--                <ImageView-->
-<!--                    android:id="@+id/icon_gdrive"-->
-<!--                    android:layout_width="32dp"-->
-<!--                    android:layout_height="32dp"-->
-<!--                    android:importantForAccessibility="no"-->
-<!--                    android:padding="2dp"-->
-<!--                    android:src="@drawable/logo_drive_2020q4_color_2x_web_64dp"-->
-<!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                    app:layout_constraintStart_toStartOf="parent"-->
-<!--                    app:layout_constraintTop_toTopOf="parent" />-->
-
-<!--                <LinearLayout-->
-<!--                    android:id="@+id/gdrive_texts"-->
-<!--                    android:layout_width="0dp"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:orientation="vertical"-->
-<!--                    android:paddingStart="8dp"-->
-<!--                    android:paddingEnd="8dp"-->
-<!--                    app:layout_constraintEnd_toStartOf="@id/icon_next_gdrive"-->
-<!--                    app:layout_constraintStart_toEndOf="@id/icon_gdrive"-->
-<!--                    app:layout_constraintTop_toTopOf="parent">-->
-
-<!--                    <TextView-->
-<!--                        android:layout_width="wrap_content"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:text="@string/gdrive_tm"-->
-<!--                        android:textSize="20sp"-->
-<!--                        android:textStyle="bold" />-->
-
-<!--                    <TextView-->
-<!--                        android:layout_width="wrap_content"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:text="@string/upload_to_gdrive"-->
-<!--                        android:textSize="14sp" />-->
-
-<!--                </LinearLayout>-->
-
-<!--                <ImageView-->
-<!--                    android:id="@+id/icon_next_gdrive"-->
-<!--                    android:layout_width="18dp"-->
-<!--                    android:layout_height="18dp"-->
-<!--                    android:src="@drawable/onboarding23_arrow_right"-->
-<!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                    app:layout_constraintEnd_toEndOf="parent"-->
-<!--                    app:layout_constraintStart_toEndOf="@id/gdrive_texts"-->
-<!--                    app:layout_constraintTop_toTopOf="parent"-->
-<!--                    app:tint="@color/colorSpaceSetupProgressOn"-->
-<!--                    android:importantForAccessibility="no" />-->
-
-<!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-<!--        </com.google.android.material.card.MaterialCardView>-->
-
-<!--        <Button-->
-<!--            android:id="@+id/skip_for_now_button"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"-->
-<!--            android:layout_marginTop="20dp"-->
-<!--            android:background="@android:color/transparent"-->
-<!--            android:text="Skip for now" />-->
+                    android:text="@string/upload_to_the_internet_archive"
+                    android:textSize="12sp"
+                    android:visibility="gone" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/icon_next_internet_archive"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:importantForAccessibility="no"
+                android:src="@drawable/keyboard_arrow_right"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/internet_archive_texts"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="@color/colorText" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        <!--        <com.google.android.material.card.MaterialCardView-->
+        <!--            android:id="@+id/gdrive"-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="120dp"-->
+        <!--            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"-->
+        <!--            android:layout_marginVertical="@dimen/activity_vertical_margin"-->
+        <!--            android:background="?attr/selectableItemBackground"-->
+        <!--            android:clickable="true"-->
+        <!--            android:focusable="true"-->
+        <!--            app:cardBackgroundColor="@color/colorBackground"-->
+        <!--            app:cardCornerRadius="@dimen/activity_horizontal_margin"-->
+        <!--            app:cardElevation="0dp"-->
+        <!--            app:strokeColor="@color/colorOnBackground"-->
+        <!--            app:strokeWidth="@dimen/border_width">-->
+
+        <!--            <androidx.constraintlayout.widget.ConstraintLayout-->
+        <!--                android:layout_width="match_parent"-->
+        <!--                android:layout_height="wrap_content"-->
+        <!--                android:layout_gravity="center_vertical"-->
+        <!--                android:layout_marginHorizontal="@dimen/activity_horizontal_margin"-->
+        <!--                android:orientation="horizontal">-->
+
+        <!--                <ImageView-->
+        <!--                    android:id="@+id/icon_gdrive"-->
+        <!--                    android:layout_width="32dp"-->
+        <!--                    android:layout_height="32dp"-->
+        <!--                    android:importantForAccessibility="no"-->
+        <!--                    android:padding="2dp"-->
+        <!--                    android:src="@drawable/logo_drive_2020q4_color_2x_web_64dp"-->
+        <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
+        <!--                    app:layout_constraintStart_toStartOf="parent"-->
+        <!--                    app:layout_constraintTop_toTopOf="parent" />-->
+
+        <!--                <LinearLayout-->
+        <!--                    android:id="@+id/gdrive_texts"-->
+        <!--                    android:layout_width="0dp"-->
+        <!--                    android:layout_height="wrap_content"-->
+        <!--                    android:orientation="vertical"-->
+        <!--                    android:paddingStart="8dp"-->
+        <!--                    android:paddingEnd="8dp"-->
+        <!--                    app:layout_constraintEnd_toStartOf="@id/icon_next_gdrive"-->
+        <!--                    app:layout_constraintStart_toEndOf="@id/icon_gdrive"-->
+        <!--                    app:layout_constraintTop_toTopOf="parent">-->
+
+        <!--                    <TextView-->
+        <!--                        android:layout_width="wrap_content"-->
+        <!--                        android:layout_height="wrap_content"-->
+        <!--                        android:text="@string/gdrive_tm"-->
+        <!--                        android:textSize="20sp"-->
+        <!--                        android:textStyle="bold" />-->
+
+        <!--                    <TextView-->
+        <!--                        android:layout_width="wrap_content"-->
+        <!--                        android:layout_height="wrap_content"-->
+        <!--                        android:text="@string/upload_to_gdrive"-->
+        <!--                        android:textSize="14sp" />-->
+
+        <!--                </LinearLayout>-->
+
+        <!--                <ImageView-->
+        <!--                    android:id="@+id/icon_next_gdrive"-->
+        <!--                    android:layout_width="18dp"-->
+        <!--                    android:layout_height="18dp"-->
+        <!--                    android:src="@drawable/onboarding23_arrow_right"-->
+        <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
+        <!--                    app:layout_constraintEnd_toEndOf="parent"-->
+        <!--                    app:layout_constraintStart_toEndOf="@id/gdrive_texts"-->
+        <!--                    app:layout_constraintTop_toTopOf="parent"-->
+        <!--                    app:tint="@color/colorSpaceSetupProgressOn"-->
+        <!--                    android:importantForAccessibility="no" />-->
+
+        <!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
+
+        <!--        </com.google.android.material.card.MaterialCardView>-->
+
+        <!--        <Button-->
+        <!--            android:id="@+id/skip_for_now_button"-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"-->
+        <!--            android:layout_marginTop="20dp"-->
+        <!--            android:background="@android:color/transparent"-->
+        <!--            android:text="Skip for now" />-->
 
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_space_setup_success.xml b/app/src/main/res/layout/fragment_space_setup_success.xml
index cd5c4961..a8bb80a1 100644
--- a/app/src/main/res/layout/fragment_space_setup_success.xml
+++ b/app/src/main/res/layout/fragment_space_setup_success.xml
@@ -39,23 +39,28 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:src="@drawable/hands_mobile"
+                android:importantForAccessibility="no"
+                android:src="@drawable/hands_mobile_updated"
+                android:paddingVertical="32dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/success_message"
-                android:importantForAccessibility="no" />
+                app:layout_constraintTop_toBottomOf="@id/success_message" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/bt_authenticate"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="@dimen/activity_row_padding"
             android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+            android:padding="@dimen/activity_row_padding"
             android:text="@string/action_continue"
+            android:textColor="@color/white"
+            app:backgroundTint="@color/colorTertiary"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             tools:ignore="ButtonStyle" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_web_dav.xml b/app/src/main/res/layout/fragment_web_dav.xml
index c49cc1ad..8a1cac9a 100644
--- a/app/src/main/res/layout/fragment_web_dav.xml
+++ b/app/src/main/res/layout/fragment_web_dav.xml
@@ -1,24 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
+    android:paddingBottom="24dp"
+    tools:background="@color/colorBackground"
     tools:context=".services.webdav.WebDavFragment">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingHorizontal="8dp"
         android:paddingVertical="8dp"
-        android:paddingBottom="@dimen/activity_vertical_margin">
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:id="@+id/email_login_form"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
+            android:paddingHorizontal="16dp"
             app:layout_constraintBottom_toTopOf="@id/button_bar"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -27,7 +33,9 @@
             <LinearLayout
                 android:id="@+id/header"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginVertical="24dp">
 
                 <ImageView
                     android:layout_width="48dp"
@@ -38,11 +46,12 @@
                     android:importantForAccessibility="no"
                     android:padding="12dp"
                     android:src="@drawable/ic_private_server"
-                    app:tint="@color/colorPrimary" />
+                    app:tint="@color/colorTertiary" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:orientation="vertical">
 
                     <TextView
@@ -52,6 +61,7 @@
                         android:text="@string/private_server"
                         android:textFontWeight="700"
                         android:textStyle="bold"
+                        android:visibility="gone"
                         tools:targetApi="p" />
 
                     <TextView
@@ -63,152 +73,207 @@
 
             </LinearLayout>
 
-            <TextView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:text="@string/server_info" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_marginVertical="@dimen/activity_vertical_margin"
+                android:orientation="vertical">
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/server"
+                <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:text="@string/server_info" />
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
                     android:hint="@string/enter_url"
-                    android:inputType="textUri"
-                    android:maxLines="1"
-                    android:singleLine="true" />
+                    android:layout_height="wrap_content"
+                    android:paddingVertical="4dp"
+                    android:layout_marginBottom="8dp">
 
-            </com.google.android.material.textfield.TextInputLayout>
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/server"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textUri"
+                        android:maxLines="1"
+                        android:singleLine="true" />
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/name"
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/server_name_optional"
-                    android:inputType="textNoSuggestions"
-                    android:maxLines="1"
-                    android:singleLine="true" />
+                    android:paddingVertical="4dp"
+                    android:layout_height="wrap_content">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/server_name_optional"
+                        android:inputType="textNoSuggestions"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+
+                </com.google.android.material.textfield.TextInputLayout>
 
-            </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
 
-            <TextView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:text="@string/account" />
+                android:layout_marginVertical="@dimen/activity_vertical_margin"
+                android:orientation="vertical">
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/username"
+                <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/prompt_email"
-                    android:inputType="textNoSuggestions"
-                    android:maxLines="1"
-                    android:singleLine="true" />
+                    android:layout_marginBottom="8dp"
+                    android:text="@string/account" />
 
-            </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingVertical="4dp"
+                    android:layout_marginBottom="8dp">
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/password_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:passwordToggleDrawable="@drawable/show_password_selector"
-                app:passwordToggleEnabled="true">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/username"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/prompt_email"
+                        android:inputType="textNoSuggestions"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/password"
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/password_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/prompt_password"
-                    android:imeActionId="6"
-                    android:imeActionLabel="@string/action_sign_in_short"
-                    android:imeOptions="actionUnspecified"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:singleLine="true" />
+                    android:paddingVertical="4dp"
+                    app:endIconMode="password_toggle">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/prompt_password"
+                        android:imeActionId="6"
+                        android:imeActionLabel="@string/action_sign_in_short"
+                        android:imeOptions="actionDone"
+                        android:inputType="textPassword"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+            </LinearLayout>
 
-            </com.google.android.material.textfield.TextInputLayout>
 
         </LinearLayout>
 
+    </ScrollView>
+
+
+    <LinearLayout
+        android:id="@+id/button_bar_edit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:visibility="visible"
+        android:weightSum="2"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
         <LinearLayout
-            android:id="@+id/button_bar_edit"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
+            android:gravity="center"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:weightSum="2"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+            android:layout_weight="1">
 
             <Button
                 android:id="@+id/bt_remove"
                 style="?android:attr/buttonBarButtonStyle"
-                android:layout_width="0dp"
                 android:textColor="@color/colorDanger"
-                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
                 android:drawableStart="@drawable/ic_delete_danger_24dp"
-                android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-                android:layout_weight="1"
+                android:drawableTint="@color/colorDanger"
+                android:layout_height="wrap_content"
                 android:text="@string/remove_from_app" />
 
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:gravity="center"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
             <Button
                 android:id="@+id/bt_license"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-                android:layout_weight="1"
-                android:text="Licenses"
                 style="?android:attr/buttonBarButtonStyle"
-                tools:ignore="ButtonStyle" />
+                android:textColor="@color/colorTertiary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Licenses" />
 
         </LinearLayout>
 
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/button_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:visibility="gone"
+        android:weightSum="2"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
         <LinearLayout
-            android:visibility="gone"
-            android:id="@+id/button_bar"
-            android:layout_width="match_parent"
+            android:textColor="@color/colorText"
+            android:layout_width="0dp"
+            android:gravity="center"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:weightSum="2"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+            android:layout_weight="1">
 
             <Button
                 android:id="@+id/bt_cancel"
                 style="?android:attr/buttonBarButtonStyle"
-                android:layout_width="0dp"
+                android:textColor="@color/colorText"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-                android:layout_weight="1"
                 android:text="@string/back" />
 
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:gravity="center"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+            android:layout_weight="1"
+            tools:ignore="ButtonStyle">
             <Button
                 android:id="@+id/bt_authenticate"
-                android:layout_width="0dp"
+                android:backgroundTint="@color/buttonBackground"
+                android:paddingHorizontal="24dp"
+                android:paddingVertical="16dp"
+                style="@style/Widget.Material3.Button"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-                android:layout_weight="1"
-                android:text="@string/action_next"
-                style="@style/OAMaterialSignInButtonStyle"
-                tools:ignore="ButtonStyle" />
-
+                android:text="@string/action_next" />
         </LinearLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_webdav_setup_license.xml b/app/src/main/res/layout/fragment_webdav_setup_license.xml
index 548cefc7..73521a9b 100644
--- a/app/src/main/res/layout/fragment_webdav_setup_license.xml
+++ b/app/src/main/res/layout/fragment_webdav_setup_license.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
+    tools:background="@color/colorBackground"
     tools:context=".services.webdav.WebDavSetupLicenseFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -24,18 +25,20 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/description_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
+                android:layout_margin="20dp"
                 android:gravity="center"
-                android:id="@+id/description_text"
+                android:autoLink="web"
                 android:text="Tell us a little more\nabout your new server"
-                android:textColor="@color/colorOnBackgroundTonedDown"
+
                 android:textSize="18sp" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="24dp">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/name"
@@ -55,7 +58,6 @@
 
         </LinearLayout>
 
-
         <LinearLayout
             android:id="@+id/button_bar"
             android:layout_width="match_parent"
@@ -67,26 +69,47 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
-            <Button
-                android:visibility="invisible"
-                android:id="@+id/bt_cancel"
-                style="?android:attr/buttonBarButtonStyle"
+            <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
                 android:layout_weight="1"
-                android:text="@string/back" />
+                android:gravity="center"
+                android:textColor="@color/colorText">
+
+                <Button
+                    android:id="@+id/bt_cancel"
+                    android:visibility="invisible"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/back"
+                    android:textColor="@color/colorText" />
 
-            <Button
-                android:id="@+id/bt_next"
-                style="@style/OAMaterialSignInButtonStyle"
+            </LinearLayout>
+
+
+            <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
                 android:layout_weight="1"
-                android:text="@string/action_next"
-                tools:ignore="ButtonStyle" />
+                android:gravity="center"
+                tools:ignore="ButtonStyle">
+
+                <Button
+                    android:id="@+id/bt_next"
+                    style="@style/Widget.Material3.Button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:backgroundTint="@color/buttonBackground"
+                    android:paddingHorizontal="24dp"
+                    android:paddingVertical="16dp"
+                    android:text="@string/action_next" />
+            </LinearLayout>
 
         </LinearLayout>
+
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/prefs_text.xml b/app/src/main/res/layout/prefs_text.xml
new file mode 100644
index 00000000..1a613a2f
--- /dev/null
+++ b/app/src/main/res/layout/prefs_text.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentEnd="true"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:paddingHorizontal="16dp"
+    android:paddingTop="16dp"
+    android:paddingBottom="8dp"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/prefs_title.xml b/app/src/main/res/layout/prefs_title.xml
deleted file mode 100644
index fded1a88..00000000
--- a/app/src/main/res/layout/prefs_title.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="8dp"
-    android:gravity="center"
-    android:orientation="horizontal">
-    <TextView
-        android:id="@android:id/title"
-        android:layout_weight="1"
-        android:layout_width="0dp"
-        android:textColor="@color/c23_teal"
-        android:layout_height="wrap_content"
-        android:textSize="18sp" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/rv_folders_row.xml b/app/src/main/res/layout/rv_folders_row.xml
new file mode 100644
index 00000000..d8792170
--- /dev/null
+++ b/app/src/main/res/layout/rv_folders_row.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="4dp"
+    app:cardBackgroundColor="@android:color/transparent"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="2dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/item_background_selector"
+        android:filterTouchesWhenObscured="true"
+        android:paddingHorizontal="8dp"
+        android:paddingVertical="16dp">
+
+        <LinearLayout
+            android:id="@+id/text_container"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:filterTouchesWhenObscured="true"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/rv_edit"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:id="@+id/rv_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/folder_name"
+                android:src="@drawable/ic_private_server"/>
+
+            <TextView
+                android:id="@+id/rv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginHorizontal="10dp"
+                android:gravity="center_vertical"
+                android:textSize="16sp" />
+
+
+        </LinearLayout>
+
+
+        <ImageButton
+            android:id="@+id/rv_edit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="16dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_edit"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/text_container"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/colorOnBackground" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/rv_spaces_row.xml b/app/src/main/res/layout/rv_spaces_row.xml
new file mode 100644
index 00000000..d8792170
--- /dev/null
+++ b/app/src/main/res/layout/rv_spaces_row.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="4dp"
+    app:cardBackgroundColor="@android:color/transparent"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="2dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/item_background_selector"
+        android:filterTouchesWhenObscured="true"
+        android:paddingHorizontal="8dp"
+        android:paddingVertical="16dp">
+
+        <LinearLayout
+            android:id="@+id/text_container"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:filterTouchesWhenObscured="true"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/rv_edit"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:id="@+id/rv_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/folder_name"
+                android:src="@drawable/ic_private_server"/>
+
+            <TextView
+                android:id="@+id/rv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginHorizontal="10dp"
+                android:gravity="center_vertical"
+                android:textSize="16sp" />
+
+
+        </LinearLayout>
+
+
+        <ImageButton
+            android:id="@+id/rv_edit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="16dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_edit"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/text_container"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/colorOnBackground" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_section.xml b/app/src/main/res/layout/view_section.xml
index b1e351a6..c85cc961 100644
--- a/app/src/main/res/layout/view_section.xml
+++ b/app/src/main/res/layout/view_section.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mediasection"
+    tools:background="@color/colorBackground"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:filterTouchesWhenObscured="true"
diff --git a/app/src/main/res/menu/menu_folder_list.xml b/app/src/main/res/menu/menu_folder_list.xml
new file mode 100644
index 00000000..33ae94e9
--- /dev/null
+++ b/app/src/main/res/menu/menu_folder_list.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_archived_folders"
+        app:showAsAction="always"
+        android:title="Archived" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 125eb55f..ccc87ee8 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -14,6 +14,7 @@
         tools:ignore="AlwaysShowAction" />
 
     <item
+        android:visible="false"
         android:id="@+id/menu_folders"
         android:icon="@drawable/ic_menu"
         android:orderInCategory="300"
diff --git a/app/src/main/res/values-night/bool.xml b/app/src/main/res/values-night/bool.xml
index 0a075e0e..8d6677fe 100644
--- a/app/src/main/res/values-night/bool.xml
+++ b/app/src/main/res/values-night/bool.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="dayMode">false</bool>
+    <bool name="dayModeInverse">true</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 0f1b27ad..160d3f04 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -3,15 +3,34 @@
 
     <!-- night theme colors -->
 
-    <color name="colorBackground">@color/black</color>
+    <color name="colorBackground">#16161D</color>
     <color name="colorOnBackground">@color/white</color>
+
+    <color name="colorPrimary">#000A0A</color>
     <color name="colorOnPrimary">@color/white</color>
-    <color name="colorPrimary">@color/c23_teal</color>
+    <color name="colorPrimaryContainer">@color/c23_teal</color>
+    <color name="colorOnPrimaryContainer">@color/white</color>
     <color name="colorPrimaryDark">@color/c23_teal_40</color>
+
+    <color name="colorSecondary">@color/c23_teal</color>
+    <color name="colorOnSecondary">@color/black</color>
+    <color name="colorSecondaryContainer">@color/c23_teal_20</color>
+    <color name="colorOnSecondaryContainer">@color/white</color>
+    <color name="colorSecondaryDark">@color/c23_teal_30</color>
+    <color name="colorSecondaryBright">@color/c23_teal_60</color>
+
+    <color name="colorSurface">#16161D</color>
+    <color name="colorOnSurface">@color/c23_light_grey</color>
+    <color name="colorTertiary">@color/c23_teal_60</color>
     <color name="colorText">@color/c23_light_grey</color>
+    <color name="colorError">@color/red</color>
+
+
+    <color name="inputBackground">#212021</color>
+    <color name="buttonBackground">@color/c23_teal_50</color>
     <color name="colorBottomNavbar">@color/c23_darker_grey</color>
     <color name="colorOnBottomNavbar">@color/white</color>
-    <color name="colorAddButton">@color/colorPrimary</color>
+    <color name="colorAddButton">@color/colorOnPrimary</color>
     <color name="colorOnAddButton">@color/colorBackground</color>
     <color name="colorNavigationDrawerBackground">@color/c23_nav_drawer_night</color>
     <color name="colorOnboarding23GetStarted">@color/colorPrimary</color>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 22dd7adc..51105b48 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -10,4 +10,24 @@
         <item>@string/prefs_theme_light</item>
         <item>@string/prefs_theme_dark</item>
     </string-array>
+    <!-- Reply Preference -->
+    <string-array name="reply_entries">
+        <item>Reply</item>
+        <item>Reply to all</item>
+    </string-array>
+
+    <string-array name="reply_values">
+        <item>reply</item>
+        <item>reply_all</item>
+    </string-array>
+
+
+    <string-array name="array_prefs_media_compression_labels">
+        <item>Smaller size</item>
+        <item>Higher quality</item>
+    </string-array>
+    <string-array name="array_prefs_media_compression_values">
+        <item>smaller_size</item>
+        <item>higher_quality</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/bool.xml b/app/src/main/res/values/bool.xml
index f799eca8..e7ddcdf0 100644
--- a/app/src/main/res/values/bool.xml
+++ b/app/src/main/res/values/bool.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="dayMode">true</bool>
+    <bool name="dayModeInverse">false</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0a785dcc..f1930b30 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -74,22 +74,41 @@
 
     <!-- theme day colors -->
 
-    <color name="colorBackground">@color/white</color>
+    <color name="colorBackground">#F5F1E7</color>
     <color name="colorOnBackground">@color/black</color>
     <color name="colorOnBackgroundTonedDown">@color/c23_grey</color>
     <color name="colorOnBackgroundLowContrast">@color/c23_grey</color>
+
+    <color name="colorPrimary">@color/c23_teal</color>
     <color name="colorOnPrimary">@color/white</color>
+    <color name="colorPrimaryContainer">@color/c23_teal</color>
+    <color name="colorOnPrimaryContainer">@color/black</color>
+
     <color name="colorOnPrimaryTonedDown">#ffffff</color>
-    <color name="colorPrimary">@color/c23_teal</color>
     <color name="colorPrimaryDark">@color/c23_teal_40</color>
     <color name="colorPrimaryBright">@color/c23_powder_blue</color>
+    <color name="colorSecondary">@color/c23_teal_40</color>
+    <color name="colorOnSecondary">@color/black</color>
+    <color name="colorSecondaryContainer">@color/c23_teal_90</color>
+    <color name="colorOnSecondaryContainer">@color/black</color>
+    <color name="colorSecondaryDark">@color/c23_teal_30</color>
+    <color name="colorSecondaryBright">@color/c23_teal_60</color>
+
+    <color name="colorSurface">#F5F1E7</color>
+    <color name="colorOnSurface">@color/c23_dark_grey</color>
+
+    <color name="colorTertiary">@color/c23_teal_50</color>
     <color name="colorText">@color/c23_dark_grey</color>
 
+    <color name="colorError">@color/red</color>
+
     <!-- custom day colors -->
+    <color name="inputBackground">#FFFBF0</color>
+    <color name="buttonBackground">@color/c23_teal_60</color>
 
     <color name="colorBottomNavbar">@color/colorPrimary</color>
     <color name="colorOnBottomNavbar">@color/colorOnBackground</color>
-    <color name="colorAddButton">@color/colorBackground</color>
+    <color name="colorAddButton">@color/colorOnPrimary</color>
     <color name="colorOnAddButton">@color/colorOnBackground</color>
     <color name="colorNavigationDrawerBackground">@color/colorBackground</color>
     <color name="colorOnboarding23GetStarted">@color/colorOnBackground</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 776e35d0..e7b5ce57 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
+    <string name="navigation_drawer_open">Drawer Open</string>
+    <string name="navigation_drawer_close">Drawer Closed</string>
+
     <!-- Activities -->
     <string name="app_name" translatable="false">Save</string>
     <string name="app_subtext">Archive Your Media\n<a href="#">learn more</a></string>
@@ -150,7 +153,7 @@
     <string name="secret_key">Secret Key</string>
     <string name="info_archiveorg_keys"><b><i>Save</i></b> needs your Internet Archive account\'s API keys to be able to upload media.</string>
     <string name="action_acquire_keys">Acquire Keys</string>
-    <string name="new_folder">ADD FOLDER</string>
+    <string name="new_folder">Add Folder</string>
     <string name="please_do_not_include_special_characters_in_the_name">Please do not include special characters in the name.</string>
     <string name="are_you_sure_you_want_to_remove_this_server_from_the_app">Are you sure you want to remove this server from the app?</string>
     <string name="folder_name_already_exists">Folder name already exists.</string>
@@ -217,7 +220,7 @@
     </string>
     <string name="intro_text_archive">
     <![CDATA[
-    Keep your media verifiable, safe and organized for the long-term by uploading it to private or public servers like Nextcloud or the Internet Archive.<br><br>
+    Keep your media verifiable, safe and organized for the long-term by uploading it to private or public servers like Nextcloud or the Internet Archive.<br>
     Communicate your intentions for future use by adding a <a href="%1$s" style="text-decoration: underline;">Creative Commons License</a>.
     ]]>
     </string>
@@ -233,7 +236,7 @@
     </string>
     <string name="intro_text_encrypt" translatable="false">
     <![CDATA[
-    <b><i>Save</i></b> always uploads over TLS (Transport Layer Security) to protect your media in transit.<br><br>
+    <b><i>Save</i></b> always uploads over TLS (Transport Layer Security) to protect your media in transit.<br>
     To further enhance security, enable <a href="%1$s" style="text-decoration: underline;">Tor</a> to prevent interception of your media from your phone to the server.
     ]]>
     </string>
@@ -259,6 +262,8 @@
     <string name="got_it">Got it</string>
     <string name="do_not_show_me_this_again">Do not show me this again</string>
     <string name="edit_multiple">Edit Multiple</string>
+    <string name="press_and_hold_options_media_screen_title">Add Media Options</string>
+    <string name="press_and_hold_options_media_screen_message">Tap + to upload an image. Press and hold for more options.</string>
     <string name="press_and_hold_to_select_and_edit_multiple_media">Press and hold to select and edit multiple media.</string>
     <string name="once_uploaded_you_will_not_be_able_to_edit_media">Once uploaded, you will not be able to edit media</string>
     <string name="edit_media_info">Edit Media Info</string>
@@ -317,5 +322,26 @@
     <string name="label_create_login">Create one</string>
     <string name="prompt_no_account">No account?</string>
     <string name="action_continue">Continue</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <!-- Preference Titles -->
+    <string name="messages_header">Messages</string>
+    <string name="sync_header">Sync</string>
+
+    <!-- Messages Preferences -->
+    <string name="signature_title">Your signature</string>
+    <string name="reply_title">Default reply action</string>
+
+    <!-- Sync Preferences -->
+    <string name="sync_title">Sync email periodically</string>
+    <string name="attachment_title">Download incoming attachments</string>
+    <string name="attachment_summary_on">Automatically download attachments for incoming emails
+    </string>
+    <string name="attachment_summary_off">Only download attachments when manually requested</string>
 
+    <string name="pref_media_servers">pref_media_servers</string>
+    <string name="pref_media_folders">pref_media_folders</string>
+    <string name="pref_app_passcode" translatable="false">passcode_enabled</string>
+    <string name="pref_title_secure">Secure</string>
+    <string name="pref_title_archive">Archive</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a20476a3..048f06ee 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,61 +1,131 @@
 <resources>
 
     <!-- themes -->
+    <style name="Theme.SaveApp.Starting" parent="Theme.SplashScreen">
 
-    <style name="OASwitchPreferenceStyle" parent="@style/Preference.SwitchPreferenceCompat.Material">
-        <item name="android:textSize">12sp</item>
+        <item name="windowSplashScreenBackground">@color/colorBackground</item>
+
+        <!-- Use windowSplashScreenAnimatedIcon to add a drawable or an animated
+             drawable. One of these is required. -->
+        <item name="windowSplashScreenAnimatedIcon">@drawable/avd_splash_animator</item>
+        <!-- Required for animated icons. -->
+        <item name="windowSplashScreenAnimationDuration">1000</item>
+
+        <!-- Set the theme of the Activity that directly follows your splash
+        screen. This is required. -->
+        <item name="postSplashScreenTheme">@style/SaveAppTheme.NoActionBar</item>
     </style>
 
-    <style name="AppTheme.NoActionBar" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="SaveAppTheme.NoActionBar" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorSurface">@color/colorSurface</item>
+        <item name="colorOnSurface">@color/colorOnSurface</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorOnPrimary">@color/colorOnPrimary</item>
         <item name="android:colorBackground">@color/colorBackground</item>
-        <item name="android:textColor">@color/colorOnBackground</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar" >@bool/dayMode</item>
-        <item name="android:windowLightNavigationBar" >@bool/dayMode</item>
-        <item name="navigationViewStyle">@style/NavigationViewStyle</item>
-        <item name="appBarLayoutStyle">@style/AppBarStyle</item>
+
+
         <item name="android:textViewStyle">@style/OATextViewStyle</item>
-        <item name="buttonStyle">@style/OAButtonStyle</item>
-        <item name="materialButtonStyle">@style/OAMaterialButtonStyle</item>
+
+        <item name="android:statusBarColor">@color/colorPrimary</item>
+        <item name="android:windowLightStatusBar">@bool/dayMode</item>
+        <item name="android:windowLightNavigationBar">@bool/dayMode</item>
+        <item name="navigationViewStyle">@style/NavigationViewStyle</item>
         <item name="dialogTheme">@style/AppDialogTheme</item>
-        <item name="bottomSheetDialogTheme">@style/AppBottomSheetTheme</item>
+        <item name="bottomSheetDialogTheme">@style/SaveAppBottomSheetTheme</item>
         <item name="alertDialogTheme">@style/AlertDialogTheme</item>
         <item name="materialAlertDialogTheme">@style/AlertMaterialDialogTheme</item>
-        <item name="preferenceTheme">@style/OAPreferenceStyle</item>
-        <item name="switchPreferenceCompatStyle">@style/OASwitchPreferenceStyle</item>
+        <item name="preferenceTheme">@style/ThemeOverlay.SaveApp.Preference</item>
+        <item name="floatingActionButtonStyle">@style/Widget.App.FloatingActionButton</item>
+        <item name="appBarLayoutStyle">@style/SaveApp.Widget.AppBarStyle</item>
+        <item name="toolbarStyle">@style/SaveApp.Widget.MaterialToolbarStyle</item>
+
+
+        <!--        Button Styles-->
+        <item name="buttonStyle">@style/OAButtonStyle</item>
+        <item name="materialButtonStyle">@style/OAMaterialButtonStyle</item>
+        <item name="materialIconButtonStyle">@style/OAMaterialButtonStyle</item>
+        <item name="borderlessButtonStyle">@style/Widget.App.Button.TextButton</item>
+        <item name="materialButtonOutlinedStyle">@style/Widget.App.Button.OutlinedButton</item>
+
+        <!-- button text style -->
+        <item name="textAppearanceLabelLarge">@style/TextAppearance.App.Button</item>
+
+        <!--        For App Bar Action Menu Text Color-->
+        <item name="actionMenuTextColor">@color/white</item>
+        <item name="android:actionMenuTextColor">@color/white</item>
+
+        <!--        Input Layout Style-->
+        <item name="textInputStyle">@style/Widget.SaveApp.TextInputLayout</item>
+
+        <item name="textAppearanceTitleLarge">@style/TextAppearance.App.TitleLarge</item>
+        <item name="textAppearanceTitleMedium">@style/TextAppearance.App.TitleMedium</item>
+        <item name="textAppearanceBodySmall">@style/TextAppearance.App.BodySmall</item>
+        <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.SaveApp.SmallComponent
+        </item>
+        <item name="materialSwitchStyle">@style/Widget.SaveApp.Switch</item>
     </style>
 
 
-    <style name="OAPreferenceStyle" parent="PreferenceThemeOverlay">
-        <item name="android:textSize">16sp</item>
+    <style name="ThemeOverlay.SaveApp.Preference" parent="PreferenceThemeOverlay">
         <item name="android:listDivider">@drawable/save_list_item_spacing_small</item>
         <item name="android:divider">@drawable/save_list_item_spacing_small</item>
-        <item name="android:dividerHeight">1dp</item>
-    </style>
-
-<!--    <style name="MainTheme.NoActionBar" parent="Theme.Material3.DayNight.NoActionBar">-->
-<!--        <item name="colorPrimary">@color/colorPrimary</item>-->
-<!--        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
-<!--        <item name="colorOnPrimary">@color/colorOnPrimary</item>-->
-<!--        <item name="android:colorBackground">@color/colorBackground</item>-->
-<!--        <item name="android:textColor">@color/colorOnBackground</item>-->
-<!--        <item name="android:statusBarColor">@color/colorBackground</item>-->
-<!--        <item name="android:navigationBarColor">@color/colorBottomNavbar</item>-->
-<!--        <item name="android:windowLightStatusBar" tools:targetApi="m">@bool/dayMode</item>-->
-<!--        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/dayMode</item>-->
-<!--        <item name="navigationViewStyle">@style/NavigationViewStyle</item>-->
-<!--        <item name="appBarLayoutStyle">@style/AppBarStyle</item>-->
-<!--        <item name="android:textViewStyle">@style/OATextViewStyle</item>-->
-<!--    </style>-->
-
-    <style name="AppBottomSheetTheme" parent="ThemeOverlay.Material3.DayNight.BottomSheetDialog">
+        <item name="android:dividerHeight">2dp</item>
+        <item name="alertDialogTheme">@style/AlertDialogTheme</item>
+<!--        <item name="preferenceInformationStyle">@style/SaveApp.Preference.Information</item>-->
+<!--        <item name="switchPreferenceCompatStyle">@style/SaveApp.Preference.SwitchPreference</item>-->
+    </style>
+
+    <style name="SaveApp.Preference.Information" parent="@style/Preference.Information">
+        <item name="textSize">11sp</item>
+        <item name="android:textSize">11sp</item>
+    </style>
+
+    <style name="SaveApp.Preference.SwitchPreference" parent="@style/Preference.SwitchPreferenceCompat.Material">
+<!--        <item name="android:widgetLayout">@layout/custom_preference_widget_switch</item>-->
+        <item name="android:textSize">12sp</item>
+    </style>
+
+
+    <!--    <style name="MainTheme.NoActionBar" parent="Theme.Material3.DayNight.NoActionBar">-->
+    <!--        <item name="colorPrimary">@color/colorPrimary</item>-->
+    <!--        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
+    <!--        <item name="colorOnPrimary">@color/colorOnPrimary</item>-->
+    <!--        <item name="android:colorBackground">@color/colorBackground</item>-->
+    <!--        <item name="android:textColor">@color/colorOnBackground</item>-->
+    <!--        <item name="android:statusBarColor">@color/colorBackground</item>-->
+    <!--        <item name="android:navigationBarColor">@color/colorBottomNavbar</item>-->
+    <!--        <item name="android:windowLightStatusBar" tools:targetApi="m">@bool/dayMode</item>-->
+    <!--        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/dayMode</item>-->
+    <!--        <item name="navigationViewStyle">@style/NavigationViewStyle</item>-->
+    <!--        <item name="appBarLayoutStyle">@style/AppBarStyle</item>-->
+    <!--        <item name="android:textViewStyle">@style/OATextViewStyle</item>-->
+    <!--    </style>-->
+
+    <style name="SaveAppBottomSheetTheme" parent="ThemeOverlay.Material3.DayNight.BottomSheetDialog">
+        <item name="shapeAppearanceOverlay">@style/CustomShapeAppearanceBottomSheetDialog</item>
         <item name="buttonStyle">@style/OAButtonStyle</item>
         <item name="materialButtonStyle">@style/OAMaterialButtonStyle</item>
     </style>
 
+    <style name="CustomShapeAppearanceBottomSheetDialog" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSizeTopRight">16dp</item>
+        <item name="cornerSizeTopLeft">16dp</item>
+        <item name="cornerSizeBottomRight">0dp</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+    </style>
+
+    <style name="App.Custom.BottomNavStyle" parent="Widget.Material3.BottomNavigationView">
+        <item name="itemActiveIndicatorStyle">@style/App.Custom.Indicator</item>
+        <item name="backgroundTint">@color/colorPrimary</item>
+    </style>
+
+    <style name="App.Custom.Indicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
+        <item name="android:color">@color/colorPrimaryDark</item>
+    </style>
+
+
     <style name="AppDialogTheme" parent="Theme.AppCompat.DayNight.Dialog">
         <item name="buttonStyle">@style/OAButtonStyle</item>
         <item name="materialButtonStyle">@style/OAMaterialButtonStyle</item>
@@ -68,20 +138,55 @@
 
     <!-- widgets / dialogs / alerts -->
 
-    <style name="AppBarStyle" parent="Widget.Material3.AppBarLayout">
-        <item name="android:background">@color/colorBackground</item>
+    <style name="SaveApp.Widget.AppBarStyle" parent="Widget.Material3.AppBarLayout">
+        <item name="android:background">@color/colorPrimary</item>
+    </style>
+
+    <style name="SaveApp.Widget.MaterialToolbarStyle" parent="Widget.Material3.Toolbar">
+        <item name="colorControlNormal">@color/white</item>
+        <item name="titleTextColor">@color/white</item>
+        <item name="subtitleTextColor">@color/white</item>
+        <item name="navigationIconTint">@color/white</item>
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+    </style>
+
+    <style name="OABottomBarButtonStyle" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:inset">0dp</item>
+        <item name="android:paddingStart">0dp</item>
+        <item name="android:paddingEnd">0dp</item>
+        <item name="android:text">@string/action_settings</item>
+        <item name="android:textColor">@color/tabBarMenuButton</item>
+        <item name="android:textSize">14sp</item>
+        <item name="backgroundTint">@android:color/transparent</item>
+        <item name="icon">@drawable/ic_settings</item>
+        <item name="iconGravity">top</item>
+        <item name="iconPadding">5dp</item>
+        <item name="iconSize">32dp</item>
+        <item name="iconTint">@color/tabBarMenuButton</item>
+    </style>
+
+    <style name="Widget.SaveApp.Switch" parent="Widget.Material3.CompoundButton.MaterialSwitch">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.SaveApp.Switch</item>
+    </style>
+
+    <style name="ThemeOverlay.SaveApp.Switch" parent="">
+        <item name="colorPrimary">@color/colorTertiary</item>
+        <item name="colorSurfaceVariant">@color/red</item>
     </style>
 
     <style name="NavigationViewStyle" parent="Widget.Material3.NavigationView">
         <item name="android:background">@color/colorNavigationDrawerBackground</item>
     </style>
 
-    <style name="AlertDialogTheme" parent="ThemeOverlay.AppCompat.Dialog.Alert">
+    <style name="AlertDialogTheme" parent="ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
-        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textColor">@color/colorTertiary</item>
         <item name="android:textSize">14sp</item>
     </style>
+
     <style name="AlertMaterialDialogTheme" parent="ThemeOverlay.Material3.Dialog.Alert">
         <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
@@ -90,15 +195,34 @@
     </style>
 
     <style name="NegativeButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textColor">@color/colorTertiary</item>
     </style>
 
     <style name="PositiveButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textColor">@color/colorText</item>
     </style>
 
-    <style name="OATextViewStyle">
-        <item name="fontFamily">@font/montserrat</item>
+    <style name="OATextViewStyle" parent="Widget.MaterialComponents.TextView">
+        <item name="android:fontFamily">@font/montserrat</item>
+        <item name="android:textColor">@color/colorText</item>
+        <item name="android:textColorLink">@color/colorTertiary</item>
+    </style>
+
+    <style name="Widget.App.FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Primary">
+        <item name="backgroundTint">@color/colorTertiary</item>
+        <item name="colorOnPrimaryContainer">@color/white</item>
+        <item name="colorContainer">@color/colorTertiary</item>
+        <item name="elevation">6dp</item>
+        <item name="tint">@color/white</item>
+        <item name="android:stateListAnimator">@animator/custom_fab_animator</item>
+        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.App.FloatingActionButton
+        </item>
+    </style>
+
+
+    <style name="ShapeAppearanceOverlay.App.FloatingActionButton" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">64dp</item>
     </style>
 
     <style name="OAMaterialButtonStyle" parent="Widget.Material3.Button">
@@ -107,6 +231,38 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
+    <style name="Widget.App.Button.TextButton" parent="Widget.Material3.Button.TextButton">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Button.TextButton</item>
+        <item name="android:textAppearance">@style/TextAppearance.App.Button</item>
+        <item name="shapeAppearance">@style/ShapeAppearance.App.Button</item>
+    </style>
+
+    <style name="Widget.App.Button.OutlinedButton" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Button.TextButton</item>
+        <item name="android:textAppearance">@style/TextAppearance.App.Button</item>
+        <item name="shapeAppearance">@style/ShapeAppearance.App.Button</item>
+    </style>
+
+    <style name="Widget.App.Button" parent="Widget.Material3.Button">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Button</item>
+        <item name="android:textAppearance">@style/TextAppearance.App.Button</item>
+        <item name="shapeAppearance">@style/ShapeAppearance.App.Button</item>
+    </style>
+
+    <style name="ThemeOverlay.App.Button.TextButton" parent="ThemeOverlay.Material3.Button.TextButton">
+        <item name="colorOnContainer">@color/colorTertiary</item>
+    </style>
+
+    <style name="ThemeOverlay.App.Button" parent="ThemeOverlay.Material3.Button">
+        <item name="colorContainer">@color/colorTertiary</item>
+        <item name="colorOnContainer">@color/colorOnPrimary</item>
+    </style>
+
+    <style name="ShapeAppearance.App.Button" parent="">
+        <item name="cornerFamily">cut</item>
+        <item name="cornerSize">4dp</item>
+    </style>
+
     <style name="OAMaterialSignInButtonStyle" parent="Widget.MaterialComponents.Button">
         <item name="android:background">@drawable/button</item>
         <item name="android:textColor">@color/white</item>
@@ -134,4 +290,66 @@
         <item name="hintTextColor">@color/c23_teal</item>
         <item name="cursorColor">@color/c23_teal</item>
     </style>
+
+    <style name="Widget.SaveApp.TextInputLayout" parent="Widget.Material3.TextInputLayout.FilledBox">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.TextInputLayout</item>
+        <item name="shapeAppearance">@style/ShapeAppearance.SaveApp.SmallComponent</item>
+        <item name="hintTextColor">?attr/colorOnSurface</item>
+
+        <item name="boxStrokeWidth">0dp</item>
+        <item name="boxStrokeWidthFocused">0dp</item>
+        <item name="boxBackgroundColor">@color/inputBackground</item>
+        <item name="boxCornerRadiusTopStart">8dp</item>
+        <item name="boxCornerRadiusTopEnd">8dp</item>
+        <item name="boxCornerRadiusBottomStart">8dp</item>
+        <item name="boxCornerRadiusBottomEnd">8dp</item>
+
+    </style>
+
+    <style name="ThemeOverlay.App.TextInputLayout" parent="">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <!--        <item name="colorOnSurface">@color/colorText</item>-->
+        <item name="colorError">@color/colorError</item>
+        <item name="textAppearanceTitleMedium">@style/TextAppearance.App.TitleMedium</item>
+        <item name="textAppearanceBodySmall">@style/TextAppearance.App.BodySmall</item>
+        <item name="editTextStyle">@style/Widget.Material3.TextInputEditText.FilledBox</item>
+    </style>
+
+    <style name="TextAppearance.App.Button" parent="TextAppearance.Material3.LabelLarge">
+        <item name="fontFamily">@font/montserrat</item>
+        <item name="android:fontFamily">@font/montserrat</item>
+    </style>
+
+    <style name="TextAppearance.App.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
+        <item name="fontFamily">@font/montserrat</item>
+        <item name="android:fontFamily">@font/montserrat</item>
+    </style>
+
+    <style name="TextAppearance.App.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
+        <item name="fontFamily">@font/montserrat</item>
+        <item name="android:fontFamily">@font/montserrat</item>
+    </style>
+
+    <style name="TextAppearance.App.BodySmall" parent="TextAppearance.Material3.BodySmall">
+        <item name="fontFamily">@font/montserrat</item>
+        <item name="android:fontFamily">@font/montserrat</item>
+    </style>
+
+    <style name="ShapeAppearance.SaveApp.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">8dp</item>
+    </style>
+
+
+    <style name="BreadcrumbButtonStyle" parent="Widget.Material3.Button.TextButton">
+        <item name="android:textColor">@color/colorOnBackground</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontStyle">normal</item>
+        <item name="fontFamily">@font/montserrat</item>
+    </style>
+
+    <style name="BreadcrumbChipStyle" parent="Widget.Material3.Chip.Assist">
+        <item name="chipBackgroundColor">@color/colorBackground</item>
+        <item name="chipStrokeWidth">0dp</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/xml/preference_placeholder.xml b/app/src/main/res/xml/preference_placeholder.xml
new file mode 100644
index 00000000..6531aad5
--- /dev/null
+++ b/app/src/main/res/xml/preference_placeholder.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+        android:layout="@layout/custom_preference_category" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/prefs_general.xml b/app/src/main/res/xml/prefs_general.xml
index 916deb7d..f4d93a7a 100644
--- a/app/src/main/res/xml/prefs_general.xml
+++ b/app/src/main/res/xml/prefs_general.xml
@@ -1,113 +1,164 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<PreferenceScreen
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <PreferenceCategory
-        app:layout="@layout/prefs_title"
-        app:title="Secure">
+        android:layout="@layout/custom_preference_category"
+        android:title="@string/pref_title_secure"
+        app:allowDividerAbove="true">
 
         <SwitchPreferenceCompat
-            app:allowDividerAbove="true"
-            app:allowDividerBelow="false"
-            app:defaultValue="false"
+            android:defaultValue="false"
+            android:icon="@null"
+            android:iconSpaceReserved="false"
+            android:key="@string/pref_app_passcode"
+            android:singleLineTitle="false"
+            android:title="Lock app with passcode"
+            app:icon="@null"
             app:iconSpaceReserved="false"
-            app:key="passcode_enabled"
-            app:singleLineTitle="false"
-            app:title="Lock app with passcode" />
+            app:summary="6 digit passcode" />
 
     </PreferenceCategory>
 
     <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:layout="@layout/prefs_title"
-        app:title="@string/connectivity_data">
+        android:layout="@layout/custom_preference_category"
+        android:title="@string/pref_title_archive"
+        app:allowDividerAbove="true">
 
-        <SwitchPreferenceCompat
-            app:allowDividerAbove="false"
-            app:allowDividerBelow="false"
-            app:defaultValue="false"
+        <Preference
+            android:iconSpaceReserved="false"
+            android:key="@string/pref_media_servers"
+            android:singleLineTitle="true"
+            android:summary="Add or remove media servers"
+            android:title="Media Servers"
             app:iconSpaceReserved="false"
-            app:key="upload_wifi_only"
-            app:singleLineTitle="false"
-            app:title="@string/only_upload_media_when_you_are_connected_to_wi_fi" />
+            app:summary="Add or remove media servers"
+            app:title="Media Servers" />
+
+        <Preference
+            android:iconSpaceReserved="false"
+            android:key="@string/pref_media_folders"
+            android:singleLineTitle="true"
+            android:summary="Add or remove media folders"
+            android:title="Media Folders"
+            app:iconSpaceReserved="false" />
+
+        <!--        <ListPreference-->
+        <!--            android:iconSpaceReserved="false"-->
+        <!--            android:key="media_compression"-->
+        <!--            android:singleLineTitle="true"-->
+        <!--            android:summary="%s"-->
+        <!--            android:title="Media Compression"-->
+        <!--            app:allowDividerAbove="true"-->
+        <!--            app:allowDividerBelow="false"-->
+        <!--            app:defaultValue="higher_quality"-->
+        <!--            app:enabled="false"-->
+        <!--            app:entries="@array/array_prefs_media_compression_labels"-->
+        <!--            app:entryValues="@array/array_prefs_media_compression_values"-->
+        <!--            app:iconSpaceReserved="false" />-->
 
     </PreferenceCategory>
 
     <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:layout="@layout/prefs_title"
-        app:title="@string/metadata">
+        android:iconSpaceReserved="false"
+        android:layout="@layout/custom_preference_category"
+        android:title="Verify"
+        app:iconSpaceReserved="false">
 
         <Preference
-            app:allowDividerAbove="false"
-            app:allowDividerBelow="false"
-            app:iconSpaceReserved="false"
-            app:key="proof_mode"
-            app:title="@string/proofmode"
-            app:singleLineTitle="false" />
+            android:iconSpaceReserved="false"
+            android:key="proof_mode"
+            android:singleLineTitle="false"
+            android:title="@string/proofmode"
+            app:iconSpaceReserved="false" />
 
     </PreferenceCategory>
 
-<!--    <PreferenceCategory-->
-<!--        app:iconSpaceReserved="false"-->
-<!--        app:layout="@layout/prefs_title"-->
-<!--        app:title="@string/security">-->
-
-<!--        <SwitchPreferenceCompat-->
-<!--            app:allowDividerAbove="false"-->
-<!--            app:allowDividerBelow="false"-->
-<!--            app:iconSpaceReserved="false"-->
-<!--            app:key="use_tor"-->
-<!--            app:defaultValue="false"-->
-<!--            app:title="@string/prefs_use_tor_title"-->
-<!--            app:singleLineTitle="false"-->
-<!--            app:summary="@string/prefs_use_tor_summary" />-->
-
-<!--        <SwitchPreferenceCompat-->
-<!--            app:allowDividerAbove="false"-->
-<!--            app:allowDividerBelow="false"-->
-<!--            app:iconSpaceReserved="false"-->
-<!--            app:key="prohibit_screenshots"-->
-<!--            app:defaultValue="false"-->
-<!--            app:title="@string/prefs_prohibit_screenshots_title"-->
-<!--            app:singleLineTitle="false"-->
-<!--            app:summary="@string/prefs_prohibit_screenshots_summary" />-->
-
-<!--    </PreferenceCategory>-->
+    <PreferenceCategory
+        android:layout="@layout/custom_preference_category"
+        android:title="Encrypt">
+
+        <SwitchPreferenceCompat
+            android:enabled="false"
+            android:iconSpaceReserved="false"
+            android:key="use_tor"
+            android:singleLineTitle="false"
+            android:summary="@string/prefs_use_tor_summary"
+            android:title="@string/prefs_use_tor_title"
+            app:defaultValue="false"
+            app:enabled="true"
+            app:iconSpaceReserved="false" />
+    </PreferenceCategory>
+
 
     <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:layout="@layout/prefs_title"
-        app:title="@string/prefs_user_interface_title">
+        android:layout="@layout/custom_preference_category"
+        android:title="General">
 
-        <ListPreference
-            app:allowDividerAbove="false"
-            app:allowDividerBelow="false"
+        <SwitchPreferenceCompat
+            android:iconSpaceReserved="false"
+            android:key="upload_wifi_only"
+            android:singleLineTitle="false"
+            android:title="@string/only_upload_media_when_you_are_connected_to_wi_fi"
+            app:defaultValue="false"
             app:iconSpaceReserved="false"
-            app:key="theme"
+            app:singleLineTitle="false" />
+
+        <ListPreference
+            android:dialogTitle="Themessss"
+            android:iconSpaceReserved="false"
+            android:key="theme"
+            android:singleLineTitle="false"
+            android:summary="%s"
+            android:title="@string/prefs_theme_title"
             app:defaultValue="@string/prefs_theme_val_system"
             app:entries="@array/ar_prefs_theme_labels"
             app:entryValues="@array/ar_prefs_theme_val"
-            app:title="@string/prefs_theme_title"
-            app:singleLineTitle="false"
-            app:summary="@string/prefs_theme_summary" />
+            app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true" />
 
     </PreferenceCategory>
 
-<!--    <PreferenceCategory-->
-<!--        app:iconSpaceReserved="false"-->
-<!--        app:layout="@layout/prefs_title"-->
-<!--        app:title="@string/health_checks">-->
-
-<!--        <SwitchPreferenceCompat-->
-<!--            app:allowDividerAbove="false"-->
-<!--            app:allowDividerBelow="false"-->
-<!--            app:iconSpaceReserved="false"-->
-<!--            app:key="health_checks"-->
-<!--            app:title="@string/health_checks"-->
-<!--            app:singleLineTitle="false"-->
-<!--            app:summary="@string/help_improve_the_app_by_running_health_checks_when_uploads_fail" />-->
-
-<!--    </PreferenceCategory>-->
+    <PreferenceCategory
+        android:layout="@layout/custom_preference_category"
+        android:title="About">
+
+        <Preference
+            android:iconSpaceReserved="false"
+            android:key="about_app"
+            android:singleLineTitle="true"
+            android:summary="Tap to view about Save App"
+            android:title="Save by Open Archive"
+            app:enabled="true"
+            app:iconSpaceReserved="false">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="https://open-archive.org/save" />
+        </Preference>
+
+        <Preference
+            android:iconSpaceReserved="false"
+            android:key="privacy_policy"
+            android:singleLineTitle="true"
+            android:summary="Tap to view our Terms &amp; Privacy Policy"
+            android:title="Terms &amp; Privacy Policy"
+            app:enabled="true"
+            app:iconSpaceReserved="false">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="https://open-archive.org/privacy" />
+        </Preference>
+
+        <Preference
+            android:iconSpaceReserved="false"
+            android:key="app_version"
+            android:singleLineTitle="true"
+            android:title="Version"
+            app:enabled="false"
+            app:iconSpaceReserved="false"
+            tools:summary="0.7.2.4783" />
+
+    </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/prefs_proof_mode.xml b/app/src/main/res/xml/prefs_proof_mode.xml
index c2b3a3d6..1f756172 100644
--- a/app/src/main/res/xml/prefs_proof_mode.xml
+++ b/app/src/main/res/xml/prefs_proof_mode.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <SwitchPreferenceCompat
+        android:layout="@layout/custom_preference_switch"
+        app:layout="@layout/custom_preference_switch"
         app:key="use_proofmode"
         app:defaultValue="false"
         app:title="@string/prefs_use_proofmode_title"
@@ -22,8 +25,13 @@
 <!--        app:summary="@string/prefs_share_proofmode_summary" />-->
 
     <Preference
+        android:layout="@layout/custom_preference_info"
+        app:iconSpaceReserved="false"
+        android:iconSpaceReserved="false"
+        app:layout="@layout/custom_preference"
         app:selectable="false"
         app:allowDividerAbove="true"
-        app:summary="@string/proofmode_permissions_explanation" />
+        android:title="@string/proofmode_permissions_explanation"
+        app:title="@string/proofmode_permissions_explanation" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index d360e5c6..00000000
--- a/build.gradle
+++ /dev/null
@@ -1,103 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-
-        maven {
-            url "https://plugins.gradle.org/m2/"
-            content {
-                includeGroupByRegex 'com\\.google.*'
-                includeGroup 'com.squareup'
-                includeGroupByRegex 'commons-.*'
-                includeModule 'org.jdom', 'jdom2'
-                includeModule 'org.ow2', 'ow2'
-                includeGroup 'org.ow2.asm'
-                includeGroupByRegex 'org\\.jetbrains.*'
-                includeGroup 'org.slf4j'
-                includeModule 'org.bitbucket.b_c', 'jose4j'
-                includeModule 'org.checkerframework', 'checker-qual'
-                includeGroup 'net.java.dev.jna'
-                includeModule 'net.java', 'jvnet-parent'
-                includeModule 'javax.annotation', 'javax.annotation-api'
-                includeGroupByRegex 'org\\.apache.*'
-                includeGroupByRegex 'com\\.sun.*'
-                includeModule 'xerces', 'xercesImpl'
-                includeModule 'xml-apis', 'xml-apis'
-                includeGroup 'org.bouncycastle'
-                includeGroupByRegex 'net\\.sf.*'
-                includeModule 'javax.inject', 'javax.inject'
-                includeModule 'org.tensorflow', 'tensorflow-lite-metadata'
-                includeModule 'org.json', 'json'
-                includeGroup 'io.grpc'
-                includeGroup 'io.netty'
-                includeModule 'io.perfmark', 'perfmark-api'
-                includeModule 'org.codehaus.mojo', 'animal-sniffer-annotations'
-                includeGroup 'org.glassfish.jaxb'
-                includeGroupByRegex 'jakarta.*'
-                includeModule 'org.jvnet.staxex', 'stax-ex'
-                includeModule 'gradle.plugin.com.browserstack.gradle', 'browserstack-gradle-plugin'
-                includeGroup 'com.testdroid'
-                includeModule 'log4j', 'log4j'
-                includeModule 'com.fasterxml', 'oss-parent'
-                includeGroupByRegex 'com\\.fasterxml\\.jackson.*'
-                includeModule 'com.neenbedankt.gradle.plugins', 'android-apt'
-                includeModule 'org.sonatype.oss', 'oss-parent'
-                includeModule 'org.eclipse.ee4j', 'project'
-                includeGroup 'org.codehaus.mojo'
-            }
-        }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
-        classpath "com.neenbedankt.gradle.plugins:android-apt:1.8"
-        classpath "com.testdroid:gradle:2.63.1"
-        classpath "gradle.plugin.com.browserstack.gradle:browserstack-gradle-plugin:2.3.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
-    }
-}
-
-
-configurations.configureEach {
-    resolutionStrategy {
-        force "com.android.support:support-v4:$versions.support_v4"
-    }
-}
-
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-
-        maven {
-            url 'https://raw.githubusercontent.com/guardianproject/gpmaven/master'
-            content {
-                includeModule 'org.proofmode', 'android-libproofmode'
-            }
-        }
-
-        maven {
-            url 'https://jitpack.io'
-            content {
-                includeModule 'com.github.esafirm', 'android-image-picker'
-                includeModule 'com.github.derlio', 'audio-waveform'
-                includeModule 'com.github.abdularis', 'circularimageview'
-                includeModule 'com.github.guardianproject', 'sardine-android'
-            }
-        }
-
-        maven {
-            url 'https://jcenter.bintray.com'
-            content {
-                includeModule 'com.amulyakhare', 'com.amulyakhare.textdrawable'
-                includeModule 'com.github.stfalcon', 'frescoimageviewer'
-                includeModule 'me.relex', 'photodraweeview'
-            }
-        }
-    }
-}
-
-tasks.register('clean', Delete) {
-    delete rootProject.getLayout().getBuildDirectory()
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 00000000..37d19d3e
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+    id("com.android.application") version "8.8.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.10-RC2" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.1.10-RC2" apply false
+    id("org.jetbrains.kotlin.plugin.serialization") version "1.8.10" apply false
+    id("com.google.devtools.ksp") version "2.1.10-RC2-1.0.29" apply false
+}
+
+configurations.configureEach {
+    resolutionStrategy {
+        force("com.android.support:support-v4:1.0.0")
+    }
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.buildDir)
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5a016c74..d89419cc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index e7b4def4..00000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 00000000..abaf95ae
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,98 @@
+pluginManagement {
+
+    /**
+     * The pluginManagement.repositories block configures the
+     * repositories Gradle uses to search or download the Gradle plugins and
+     * their transitive dependencies. Gradle pre-configures support for remote
+     * repositories such as JCenter, Maven Central, and Ivy. You can also use
+     * local repositories or define your own remote repositories. Here we
+     * define the Gradle Plugin Portal, Google's Maven repository,
+     * and the Maven Central Repository as the repositories Gradle should use to look for its
+     * dependencies.
+     */
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+
+        maven("https://plugins.gradle.org/m2/") {
+            content {
+                includeGroupByRegex("com\\.google.*")
+                includeGroup("com.squareup")
+                includeGroupByRegex("commons-.*")
+                includeModule("org.jdom", "jdom2")
+                includeModule("org.ow2", "ow2")
+                includeGroup("org.ow2.asm")
+                includeGroupByRegex("org\\.jetbrains.*")
+                includeGroup("org.slf4j")
+                includeModule("org.bitbucket.b_c", "jose4j")
+                includeModule("org.checkerframework", "checker-qual")
+                includeGroup("net.java.dev.jna")
+                includeModule("net.java", "jvnet-parent")
+                includeModule("javax.annotation", "javax.annotation-api")
+                includeGroupByRegex("org\\.apache.*")
+                includeGroupByRegex("com\\.sun.*")
+                includeModule("xerces", "xercesImpl")
+                includeModule("xml-apis", "xml-apis")
+                includeGroup("org.bouncycastle")
+                includeGroupByRegex("net\\.sf.*")
+                includeModule("javax.inject", "javax.inject")
+                includeModule("org.tensorflow", "tensorflow-lite-metadata")
+                includeModule("org.json", "json")
+                includeGroup("io.grpc")
+                includeGroup("io.netty")
+                includeModule("io.perfmark", "perfmark-api")
+                includeModule("org.codehaus.mojo", "animal-sniffer-annotations")
+                includeGroup("org.glassfish.jaxb")
+                includeGroupByRegex("jakarta.*")
+                includeModule("org.jvnet.staxex", "stax-ex")
+                includeGroup("com.testdroid")
+                includeModule("log4j", "log4j")
+                includeModule("com.fasterxml", "oss-parent")
+                includeGroupByRegex("com\\.fasterxml\\.jackson.*")
+                includeModule("org.sonatype.oss", "oss-parent")
+                includeModule("org.eclipse.ee4j", "project")
+                includeGroup("org.codehaus.mojo")
+            }
+        }
+    }
+}
+dependencyResolutionManagement {
+
+    /**
+     * The dependencyResolutionManagement.repositories
+     * block is where you configure the repositories and dependencies used by
+     * all modules in your project, such as libraries that you are using to
+     * create your application. However, you should configure module-specific
+     * dependencies in each module-level build.gradle file. For new projects,
+     * Android Studio includes Google's Maven repository and the Maven Central
+     * Repository by default, but it does not configure any dependencies (unless
+     * you select a template that requires some).
+     */
+
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+
+        gradlePluginPortal()
+        maven("https://raw.githubusercontent.com/guardianproject/gpmaven/master") {
+            content {
+                includeModule("org.proofmode", "android-libproofmode")
+            }
+        }
+
+        maven("https://jitpack.io") {
+            content {
+                includeModule("com.github.esafirm", "android-image-picker")
+                includeModule("com.github.derlio", "audio-waveform")
+                includeModule("com.github.abdularis", "circularimageview")
+                includeModule("com.github.guardianproject", "sardine-android")
+            }
+        }
+    }
+}
+rootProject.name = "save-android-old"
+
+include(":app")