creating wallpaper dir at launch

* ios: wallpapers

* theme selection

* applied theme colors and preset wallpaper

* more places with background

* one more

* accent color

* defaults

* rename

* background

* no change to cell color

* unneeded

* changes

* no global tint

* defaults

* removed unneeded class

* for merging

README.md

@@ -158,19 +158,20 @@ We are prioritizing users privacy and security - it would be impossible without
 
 Our pledge to our users is that SimpleX protocols are and will remain open, and in public domain, - so anybody can build the future implementations of the clients and the servers. We are building SimpleX platform based on the same principles as email and web, but much more private and secure.
 
-Your donations help us raise more funds - any amount, even the price of the cup of coffee, would make a big difference for us.
+Your donations help us raise more funds – any amount, even the price of the cup of coffee, would make a big difference for us.
 
 It is possible to donate via:
 
-- [GitHub](https://github.com/sponsors/simplex-chat) (commission-free) or [OpenCollective](https://opencollective.com/simplex-chat) (~10% commission).
-- Bitcoin: bc1qd74rc032ek2knhhr3yjq2ajzc5enz3h4qwnxad
+- [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
+- [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
 - Monero: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
-- BCH: bitcoincash:qq6c8vfvxqrk6rhdysgvkhqc24sggkfsx5nqvdlqcg
-- Ethereum: 0xD9ee7Db0AD0dc1Dfa7eD53290199ED06beA04692
+- Bitcoin: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- BCH: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
 - USDT:
-  - Ethereum: 0xD9ee7Db0AD0dc1Dfa7eD53290199ED06beA04692
-- Solana: 7JCf5m3TiHmYKZVr6jCu1KeZVtb9Y1jRMQDU69p5ARnu
-- please ask if you want to donate any other coins.
+  - BNB Smart Chain: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+  - Tron: TNnTrKLBmdy2Wn3cAQR98dAVvWhLskQGfW
+- Ethereum: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+- Solana: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
 
 Thank you,
 

apps/ios/Shared/AppDelegate.swift

@@ -17,6 +17,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
         if #available(iOS 17.0, *) { trackKeyboard() }
         NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
         removePasscodesIfReinstalled()
+        prepareForLaunch()
         return true
     }
 
@@ -141,6 +142,10 @@ class AppDelegate: NSObject, UIApplicationDelegate {
         }
     }
 
+    private func prepareForLaunch() {
+        try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
+    }
+
     static func keepScreenOn(_ on: Bool) {
         UIApplication.shared.isIdleTimerDisabled = on
     }
@@ -148,13 +153,15 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 
 class SceneDelegate: NSObject, ObservableObject, UIWindowSceneDelegate {
     var window: UIWindow?
+    static var windowStatic: UIWindow?
     var windowScene: UIWindowScene?
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
+        UITableView.appearance().backgroundColor = .clear
         guard let windowScene = scene as? UIWindowScene else { return }
         self.windowScene = windowScene
         window = windowScene.keyWindow
-        window?.tintColor = UIColor(cgColor: getUIAccentColorDefault())
-        window?.overrideUserInterfaceStyle = getUserInterfaceStyleDefault()
+        SceneDelegate.windowStatic = windowScene.keyWindow
+        ThemeManager.applyTheme(currentThemeDefault.get())
     }
 }

apps/ios/Shared/Assets.xcassets/wallpaper_cats.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wallpaper_cats@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

apps/ios/Shared/Assets.xcassets/wallpaper_flowers.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wallpaper_flowers@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

apps/ios/Shared/Assets.xcassets/wallpaper_hearts.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wallpaper_hearts@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

apps/ios/Shared/Assets.xcassets/wallpaper_kids.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wallpaper_kids@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

apps/ios/Shared/Assets.xcassets/wallpaper_school.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wallpaper_school@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

apps/ios/Shared/Assets.xcassets/wallpaper_travel.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wallpaper_travel@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

apps/ios/Shared/ContentView.swift

@@ -14,6 +14,8 @@ struct ContentView: View {
     @ObservedObject var alertManager = AlertManager.shared
     @ObservedObject var callController = CallController.shared
     @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
+    @EnvironmentObject var sceneDelegate: SceneDelegate
 
     var contentAccessAuthenticationExtended: Bool
 
@@ -51,6 +53,16 @@ struct ContentView: View {
     }
 
     var body: some View {
+        if #available(iOS 16.0, *) {
+            allViews()
+                .scrollContentBackground(.hidden)
+        } else {
+            // on iOS 15 scroll view background disabled in SceneDelegate
+            allViews()
+        }
+    }
+
+    @ViewBuilder func allViews() -> some View {
         ZStack {
             let showCallArea = chatModel.activeCall != nil && chatModel.activeCall?.callState != .waitCapabilities && chatModel.activeCall?.callState != .invitationAccepted
             // contentView() has to be in a single branch, so that enabling authentication doesn't trigger re-rendering and close settings.
@@ -96,6 +108,8 @@ struct ContentView: View {
                 initializationView()
             }
         }
+        //.tint(theme.colors.primary)
+        .background(theme.colors.background)
         .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
         .sheet(isPresented: $showSettings) {
             SettingsView(showSettings: $showSettings)
@@ -138,6 +152,11 @@ struct ContentView: View {
                 break
             }
         }
+        .onChange(of: colorScheme) { scheme in
+            if sceneDelegate.window?.overrideUserInterfaceStyle == .unspecified {
+                reactOnDarkThemeChanges(scheme == .dark)
+            }
+        }
     }
 
     @ViewBuilder private func contentView() -> some View {
@@ -224,8 +243,8 @@ struct ContentView: View {
         .frame(maxWidth: .infinity, maxHeight: .infinity )
         .background(
             Rectangle()
-                .fill(.background)
-        ) 
+                .fill(theme.colors.background)
+        )
     }
 
     private func mainView() -> some View {

apps/ios/Shared/Model/ChatModel.swift

@@ -422,6 +422,16 @@ final class ChatModel: ObservableObject {
         }
     }
 
+    func updateCurrentUserUiThemes(uiThemes: ThemeModeOverrides?) {
+        guard var current = currentUser else { return }
+        current.uiThemes = uiThemes
+        let i = users.firstIndex(where: { $0.user.userId == current.userId })
+        if let i {
+            users[i].user = current
+        }
+        currentUser = current
+    }
+
     func addLiveDummy(_ chatInfo: ChatInfo) -> ChatItem {
         let cItem = ChatItem.liveDummy(chatInfo.chatType)
         withAnimation {

apps/ios/Shared/Model/ImageUtils.swift

@@ -205,6 +205,43 @@ func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
     }
 }
 
+func saveWallpaperFile(url: URL) -> String? {
+    let destFile = URL(fileURLWithPath: generateNewFileName(getWallpaperDirectory().path + "/" + "wallpaper", "jpg", fullPath: true))
+    do {
+        try FileManager.default.copyItem(atPath: url.path, toPath: destFile.path)
+        return destFile.lastPathComponent
+    } catch {
+        logger.error("FileUtils.saveWallpaperFile error: \(error.localizedDescription)")
+        return nil
+    }
+}
+
+func saveWallpaperFile(image: UIImage) -> String? {
+    let hasAlpha = imageHasAlpha(image)
+    let destFile = URL(fileURLWithPath: generateNewFileName(getWallpaperDirectory().path + "/" + "wallpaper", hasAlpha ? "png" : "jpg", fullPath: true))
+    let dataResized = resizeImageToDataSize(image, maxDataSize: 5_000_000, hasAlpha: hasAlpha)
+    do {
+        try dataResized!.write(to: destFile)
+        return destFile.lastPathComponent
+    } catch {
+        logger.error("FileUtils.saveWallpaperFile error: \(error.localizedDescription)")
+        return nil
+    }
+}
+
+func removeWallpaperFile(fileName: String? = nil) {
+    do {
+        try FileManager.default.contentsOfDirectory(atPath: getWallpaperDirectory().path).forEach {
+            if URL(fileURLWithPath: $0).lastPathComponent == fileName { try FileManager.default.removeItem(atPath: $0) }
+        }
+    } catch {
+        logger.error("FileUtils.removeWallpaperFile error: \(error.localizedDescription)")
+    }
+    if let fileName {
+        WallpaperType.cachedImages.removeValue(forKey: fileName)
+    }
+}
+
 func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
     uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)", fullPath: fullPath)
 }

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -242,14 +242,8 @@ func apiSuspendChat(timeoutMicroseconds: Int) {
     logger.error("apiSuspendChat error: \(String(describing: r))")
 }
 
-func apiSetTempFolder(tempFolder: String, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.setTempFolder(tempFolder: tempFolder), ctrl)
-    if case .cmdOk = r { return }
-    throw r
-}
-
-func apiSetFilesFolder(filesFolder: String, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.setFilesFolder(filesFolder: filesFolder), ctrl)
+func apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String, ctrl: chat_ctrl? = nil) throws {
+    let r = chatSendCmdSync(.apiSetAppFilePaths(filesFolder: filesFolder, tempFolder: tempFolder, assetsFolder: assetsFolder), ctrl)
     if case .cmdOk = r { return }
     throw r
 }
@@ -831,6 +825,21 @@ func apiSetConnectionAlias(connId: Int64, localAlias: String) async throws -> Pe
     throw r
 }
 
+func apiSetUserUIThemes(userId: Int64, themes: ThemeModeOverrides?) async -> Bool {
+    let r = await chatSendCmd(.apiSetUserUIThemes(userId: userId, themes: themes))
+    if case .cmdOk = r { return true }
+    logger.error("apiSetUserUIThemes bad response: \(String(describing: r))")
+    return false
+}
+
+func apiSetChatUIThemes(chatId: ChatId, themes: ThemeModeOverrides?) async -> Bool {
+    let r = await chatSendCmd(.apiSetChatUIThemes(chatId: chatId, themes: themes))
+    if case .cmdOk = r { return true }
+    logger.error("apiSetChatUIThemes bad response: \(String(describing: r))")
+    return false
+}
+
+
 func apiCreateUserAddress() async throws -> String {
     let userId = try currentUserId("apiCreateUserAddress")
     let r = await chatSendCmd(.apiCreateMyAddress(userId: userId))
@@ -1353,8 +1362,7 @@ func initializeChat(start: Bool, confirmStart: Bool = false, dbKey: String? = ni
     if encryptionStartedDefault.get() {
         encryptionStartedDefault.set(false)
     }
-    try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
-    try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
+    try apiSetAppFilePaths(filesFolder: getAppFilesDirectory().path, tempFolder: getTempFilesDirectory().path, assetsFolder: getWallpaperDirectory().deletingLastPathComponent().path)
     try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
     m.chatInitialized = true
     m.currentUser = try apiGetActiveUser()
@@ -1439,8 +1447,7 @@ func startChatWithTemporaryDatabase(ctrl: chat_ctrl) throws -> User? {
     logger.debug("startChatWithTemporaryDatabase")
     let migrationActiveUser = try? apiGetActiveUser(ctrl: ctrl) ?? apiCreateActiveUser(Profile(displayName: "Temp", fullName: ""), ctrl: ctrl)
     try setNetworkConfig(getNetCfg(), ctrl: ctrl)
-    try apiSetTempFolder(tempFolder: getMigrationTempFilesDirectory().path, ctrl: ctrl)
-    try apiSetFilesFolder(filesFolder: getMigrationTempFilesDirectory().path, ctrl: ctrl)
+    try apiSetAppFilePaths(filesFolder: getMigrationTempFilesDirectory().path, tempFolder: getMigrationTempFilesDirectory().path, assetsFolder: getWallpaperDirectory().deletingLastPathComponent().path, ctrl: ctrl)
     _ = try apiStartChat(ctrl: ctrl)
     return migrationActiveUser
 }

apps/ios/Shared/SimpleXApp.swift

@@ -39,6 +39,7 @@ struct SimpleXApp: App {
             // so that it's computed by the time view renders, and not on event after rendering
             ContentView(contentAccessAuthenticationExtended: !authenticationExpired())
                 .environmentObject(chatModel)
+                .environmentObject(AppTheme.shared)
                 .onOpenURL { url in
                     logger.debug("ContentView.onOpenURL: \(url)")
                     chatModel.appOpenUrl = url

apps/ios/Shared/Theme/Theme.swift

@@ -0,0 +1,121 @@
+//
+//  ThemeShared.swift
+//  SimpleX (iOS)
+//
+//  Created by Avently on 14.06.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+import SwiftUI
+import SimpleXChat
+
+var CurrentColors: ThemeManager.ActiveTheme = ThemeManager.currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get()) {
+    didSet {
+        AppTheme.shared.name = CurrentColors.name
+        AppTheme.shared.base = CurrentColors.base
+        AppTheme.shared.colors.updateColorsFrom(CurrentColors.colors)
+        AppTheme.shared.appColors.updateColorsFrom(CurrentColors.appColors)
+        AppTheme.shared.wallpaper.updateWallpaperFrom(CurrentColors.wallpaper)
+        AppTheme.shared.objectWillChange.send()
+    }
+}
+
+var MenuTextColor: Color { if isInDarkTheme() { AppTheme.shared.colors.onBackground.opacity(0.8) } else { Color.black } }
+var NoteFolderIconColor: Color { AppTheme.shared.appColors.primaryVariant2 }
+
+func isInDarkTheme() -> Bool { !CurrentColors.colors.isLight }
+
+class AppTheme: ObservableObject {
+    static let shared = AppTheme(name: CurrentColors.name, base: CurrentColors.base, colors: CurrentColors.colors, appColors: CurrentColors.appColors, wallpaper: CurrentColors.wallpaper)
+
+    var name: String
+    var base: DefaultTheme
+    @ObservedObject var colors: Colors
+    @ObservedObject var appColors: AppColors
+    @ObservedObject var wallpaper: AppWallpaper
+
+    init(name: String, base: DefaultTheme, colors: Colors, appColors: AppColors, wallpaper: AppWallpaper) {
+        self.name = name
+        self.base = base
+        self.colors = colors
+        self.appColors = appColors
+        self.wallpaper = wallpaper
+    }
+}
+
+struct ThemedBackground: ViewModifier {
+    @EnvironmentObject var theme: AppTheme
+
+    func body(content: Content) -> some View {
+        content
+            .background(
+                theme.base == DefaultTheme.SIMPLEX
+                ? LinearGradient(
+                    colors: [
+                        theme.colors.background.lighter(0.4),
+                        theme.colors.background.darker(0.4)
+                    ],
+                    startPoint: .topLeading,
+                    endPoint: .bottomTrailing
+                )
+                : LinearGradient(
+                    colors: [],
+                    startPoint: .topLeading,
+                    endPoint: .bottomTrailing
+                )
+            )
+            .background(
+                theme.base == DefaultTheme.SIMPLEX
+                ? Color.clear
+                : theme.colors.background
+            )
+    }
+}
+
+func reactOnDarkThemeChanges(_ isDark: Bool) {
+    systemInDarkThemeCurrently = isDark
+    //sceneDelegate.window?.overrideUserInterfaceStyle == .unspecified
+    if currentThemeDefault.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.colors.isLight == isDark {
+        // Change active colors from light to dark and back based on system theme
+        ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
+    }
+}
+
+extension ThemeWallpaper {
+    public func importFromString() -> ThemeWallpaper {
+        if preset == nil, let image {
+            // Need to save image from string and to save its path
+            if let data = Data(base64Encoded: dropImagePrefix(image)),
+               let parsed = UIImage(data: data),
+               let filename = saveWallpaperFile(image: parsed) {
+                var copy = self
+                copy.image = nil
+                copy.imageFile = filename
+                return copy
+            } else {
+                return ThemeWallpaper()
+            }
+        } else {
+            return self
+        }
+    }
+
+    func withFilledWallpaperBase64() -> ThemeWallpaper {
+        let aw = toAppWallpaper()
+        let type = aw.type
+        let preset: String? = if case let WallpaperType.Preset(filename, _) = type { filename } else { nil }
+        let scale: Float? = if case let WallpaperType.Preset(_, scale) = type { scale } else { if case let WallpaperType.Image(_, scale, _) = type { scale } else { 1.0 } }
+        let scaleType: WallpaperScaleType? = if case let WallpaperType.Image(_, _, scaleType) = type { scaleType } else { nil }
+        let image: String? = if case WallpaperType.Image = type, let image = type.uiImage { resizeImageToStrSize(image, maxDataSize: 5_000_000) } else { nil }
+        return ThemeWallpaper (
+            preset: preset,
+            scale: scale,
+            scaleType: scaleType,
+            background: aw.background?.toReadableHex(),
+            tint: aw.tint?.toReadableHex(),
+            image: image,
+            imageFile: nil
+        )
+    }
+}

apps/ios/Shared/Theme/ThemeManager.swift

@@ -0,0 +1,263 @@
+//
+//  ThemeManager.swift
+//  SimpleX (iOS)
+//
+//  Created by Avently on 03.06.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+import SwiftUI
+import SimpleXChat
+
+class ThemeManager {
+    struct ActiveTheme {
+        let name: String
+        let base: DefaultTheme
+        let colors: Colors
+        let appColors: AppColors
+        var wallpaper: AppWallpaper = AppWallpaper(background: nil, tint: nil, type: .Empty)
+    }
+
+    private static func systemDarkThemeColors() -> (Colors, DefaultTheme) {
+        switch systemDarkThemeDefault.get() {
+        case DefaultTheme.DARK.themeName: (DarkColorPalette, DefaultTheme.DARK)
+        case DefaultTheme.SIMPLEX.themeName: (SimplexColorPalette, DefaultTheme.SIMPLEX)
+        case DefaultTheme.BLACK.themeName: (BlackColorPalette, DefaultTheme.BLACK)
+        default: (SimplexColorPalette, DefaultTheme.SIMPLEX)
+        }
+    }
+
+    private static func nonSystemThemeName() -> String {
+        let themeName = currentThemeDefault.get()
+        return if themeName != DefaultTheme.SYSTEM_THEME_NAME {
+            themeName
+        } else {
+            systemInDarkThemeCurrently ? systemDarkThemeDefault.get() : DefaultTheme.LIGHT.themeName
+        }
+    }
+
+    static func defaultActiveTheme(_ appSettingsTheme: [ThemeOverrides]) -> ThemeOverrides? {
+        let nonSystemThemeName = nonSystemThemeName()
+        let defaultThemeId = currentThemeIdsDefault.get()[nonSystemThemeName]
+        return appSettingsTheme.getTheme(defaultThemeId)
+    }
+
+    static func defaultActiveTheme(_ perUserTheme: ThemeModeOverrides?, _ appSettingsTheme: [ThemeOverrides]) -> ThemeModeOverride {
+        let perUserTheme = !CurrentColors.colors.isLight ? perUserTheme?.dark : perUserTheme?.light
+        if let perUserTheme {
+            return perUserTheme
+        }
+        let defaultTheme = defaultActiveTheme(appSettingsTheme)
+        return ThemeModeOverride(mode: CurrentColors.base.mode, colors: defaultTheme?.colors ?? ThemeColors(), wallpaper: defaultTheme?.wallpaper)
+    }
+
+    static func currentColors(_ themeOverridesForType: WallpaperType?, _ perChatTheme: ThemeModeOverride?, _ perUserTheme: ThemeModeOverrides?, _ appSettingsTheme: [ThemeOverrides]) -> ActiveTheme {
+        let themeName = currentThemeDefault.get()
+        let nonSystemThemeName = nonSystemThemeName()
+        let defaultTheme = defaultActiveTheme(appSettingsTheme)
+
+        let baseTheme = switch nonSystemThemeName {
+        case DefaultTheme.LIGHT.themeName: ActiveTheme(name: DefaultTheme.LIGHT.themeName, base: DefaultTheme.LIGHT, colors: LightColorPalette.clone(), appColors: LightColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.LIGHT)))
+        case DefaultTheme.DARK.themeName: ActiveTheme(name: DefaultTheme.DARK.themeName, base: DefaultTheme.DARK, colors: DarkColorPalette.clone(), appColors: DarkColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.DARK)))
+        case DefaultTheme.SIMPLEX.themeName: ActiveTheme(name: DefaultTheme.SIMPLEX.themeName, base: DefaultTheme.SIMPLEX, colors: SimplexColorPalette.clone(), appColors: SimplexColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.SIMPLEX)))
+        case DefaultTheme.BLACK.themeName: ActiveTheme(name: DefaultTheme.BLACK.themeName, base: DefaultTheme.BLACK, colors: BlackColorPalette.clone(), appColors: BlackColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.BLACK)))
+        default: ActiveTheme(name: DefaultTheme.LIGHT.themeName, base: DefaultTheme.LIGHT, colors: LightColorPalette.clone(), appColors: LightColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.LIGHT)))
+        }
+
+        let perUserTheme = baseTheme.colors.isLight ? perUserTheme?.light : perUserTheme?.dark
+        let theme = appSettingsTheme.sameTheme(themeOverridesForType ?? perChatTheme?.type ?? perUserTheme?.type ?? defaultTheme?.wallpaper?.toAppWallpaper().type, nonSystemThemeName) ?? defaultTheme
+
+        if theme == nil && perUserTheme == nil && perChatTheme == nil && themeOverridesForType == nil {
+            return ActiveTheme(name: themeName, base: baseTheme.base, colors: baseTheme.colors, appColors: baseTheme.appColors, wallpaper: baseTheme.wallpaper)
+        }
+        let presetWallpaperTheme: ThemeColors? = if let wallpaper = perChatTheme?.wallpaper {
+            if let preset = wallpaper.preset { PresetWallpaper.from(preset)?.colors[baseTheme.base] } else { nil }
+        } else if let wallpaper = perUserTheme?.wallpaper {
+            if let preset = wallpaper.preset { PresetWallpaper.from(preset)?.colors[baseTheme.base] } else { nil }
+        } else {
+            if let preset = theme?.wallpaper?.preset { PresetWallpaper.from(preset)?.colors[baseTheme.base] } else { nil }
+        }
+
+        let themeOrEmpty = theme ?? ThemeOverrides(base: baseTheme.base)
+        let colors = themeOrEmpty.toColors(themeOrEmpty.base, perChatTheme?.colors, perUserTheme?.colors, presetWallpaperTheme)
+        return ActiveTheme(
+            name: themeName,
+            base: baseTheme.base,
+            colors: colors,
+            appColors: themeOrEmpty.toAppColors(themeOrEmpty.base, perChatTheme?.colors, perChatTheme?.type, perUserTheme?.colors, perUserTheme?.type, presetWallpaperTheme),
+            wallpaper: themeOrEmpty.toAppWallpaper(themeOverridesForType, perChatTheme, perUserTheme, colors.background)
+        )
+    }
+
+    static func currentThemeOverridesForExport(_ perChatTheme: ThemeModeOverride?, _ perUserTheme: ThemeModeOverrides?) -> ThemeOverrides {
+        let current = currentColors(nil, perChatTheme, perUserTheme, themeOverridesDefault.get())
+        let wType = current.wallpaper.type
+        let wBackground = current.wallpaper.background
+        let wTint = current.wallpaper.tint
+        let w: ThemeWallpaper? = if case WallpaperType.Empty = wType {
+            nil
+        } else {
+            ThemeWallpaper.from(wType, wBackground?.toReadableHex(), wTint?.toReadableHex()).withFilledWallpaperBase64()
+        }
+        return ThemeOverrides(
+            themeId: "",
+            base: current.base,
+            colors: ThemeColors.from(current.colors, current.appColors),
+            wallpaper: w
+        )
+    }
+
+    static func applyTheme(_ theme: String) {
+        currentThemeDefault.set(theme)
+        CurrentColors = currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
+        SceneDelegate.windowStatic?.tintColor = UIColor(CurrentColors.colors.primary)
+        SceneDelegate.windowStatic?.backgroundColor = UIColor(CurrentColors.colors.background)
+        SceneDelegate.windowStatic?.overrideUserInterfaceStyle = switch currentThemeDefault.get() {
+        case DefaultTheme.LIGHT.themeName: .light
+        case DefaultTheme.SYSTEM_THEME_NAME: .unspecified
+        default: .dark
+        }
+    }
+
+    static func changeDarkTheme(_ theme: String) {
+        systemDarkThemeDefault.set(theme)
+        CurrentColors = currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
+    }
+
+    static func saveAndApplyThemeColor(_ baseTheme: DefaultTheme, _ name: ThemeColor, _ color: Color? = nil, _ pref: CodableDefault<[ThemeOverrides]>? = nil) {
+        let nonSystemThemeName = baseTheme.themeName
+        let pref = pref ?? themeOverridesDefault
+        let overrides = pref.get()
+        let themeId = currentThemeIdsDefault.get()[nonSystemThemeName]
+        let prevValue = overrides.getTheme(themeId) ?? ThemeOverrides(base: baseTheme)
+        pref.set(overrides.replace(prevValue.withUpdatedColor(name, color?.toReadableHex())))
+        var themeIds = currentThemeIdsDefault.get()
+        themeIds[nonSystemThemeName] = prevValue.themeId
+        currentThemeIdsDefault.set(themeIds)
+        CurrentColors = currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
+    }
+
+    static func applyThemeColor(name: ThemeColor, color: Color? = nil, pref: Binding<ThemeModeOverride>) {
+        pref.wrappedValue = pref.wrappedValue.withUpdatedColor(name, color?.toReadableHex())
+    }
+
+    static func saveAndApplyWallpaper(_ baseTheme: DefaultTheme, _ type: WallpaperType?, _ pref: CodableDefault<[ThemeOverrides]>?) {
+        let nonSystemThemeName = baseTheme.themeName
+        let pref = pref ?? themeOverridesDefault
+        let overrides = pref.get()
+        let theme = overrides.sameTheme(type, baseTheme.themeName)
+        var prevValue = theme ?? ThemeOverrides(base: baseTheme)
+        prevValue.wallpaper = if let type {
+            if case WallpaperType.Empty = type {
+                nil as ThemeWallpaper?
+            } else {
+                ThemeWallpaper.from(type, prevValue.wallpaper?.background, prevValue.wallpaper?.tint)
+            }
+        } else {
+            nil
+        }
+        pref.set(overrides.replace(prevValue))
+        var themeIds = currentThemeIdsDefault.get()
+        themeIds[nonSystemThemeName] = prevValue.themeId
+        currentThemeIdsDefault.set(themeIds)
+        CurrentColors = currentColors( nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
+    }
+
+    static func copyFromSameThemeOverrides(_ type: WallpaperType?, _ lowerLevelOverride: ThemeModeOverride?, _ pref: Binding<ThemeModeOverride>) -> Bool {
+        let overrides = themeOverridesDefault.get()
+        let sameWallpaper: ThemeWallpaper? = if let wallpaper = lowerLevelOverride?.wallpaper, lowerLevelOverride?.type?.sameType(type) == true {
+            wallpaper
+        } else {
+            overrides.sameTheme(type, CurrentColors.base.themeName)?.wallpaper
+        }
+        guard let sameWallpaper else {
+            if let type {
+                var w: ThemeWallpaper = ThemeWallpaper.from(type, nil, nil)
+                w.scale = nil
+                w.scaleType = nil
+                pref.wrappedValue = ThemeModeOverride(mode: CurrentColors.base.mode, wallpaper: w)
+            } else {
+                // Make an empty wallpaper to override any top level ones
+                pref.wrappedValue = ThemeModeOverride(mode: CurrentColors.base.mode, wallpaper: ThemeWallpaper())
+            }
+            return true
+        }
+        var type = sameWallpaper.toAppWallpaper().type
+        if case let WallpaperType.Image(filename, scale, scaleType) = type, sameWallpaper.imageFile == filename {
+            // same image file. Needs to be copied first in order to be able to remove the file once it's not needed anymore without affecting main theme override
+            if let filename = saveWallpaperFile(url: getWallpaperFilePath(filename)) {
+                type = WallpaperType.Image(filename, scale, scaleType)
+            } else {
+                logger.error("Error while copying wallpaper from global overrides to chat overrides")
+                return false
+            }
+        }
+        var prevValue = pref.wrappedValue
+        var w = ThemeWallpaper.from(type, nil, nil)
+        w.scale = nil
+        w.scaleType = nil
+        prevValue.colors = ThemeColors()
+        prevValue.wallpaper = w
+        pref.wrappedValue = prevValue
+        return true
+    }
+
+    static func applyWallpaper(_ type: WallpaperType?, _ pref: Binding<ThemeModeOverride>) {
+        var prevValue = pref.wrappedValue
+        prevValue.wallpaper = if let type {
+            ThemeWallpaper.from(type, prevValue.wallpaper?.background, prevValue.wallpaper?.tint)
+        } else {
+            nil
+        }
+        pref.wrappedValue = prevValue
+    }
+
+    static func saveAndApplyThemeOverrides(_ theme: ThemeOverrides, _ pref: CodableDefault<[ThemeOverrides]>? = nil) {
+        let wallpaper = theme.wallpaper?.importFromString()
+        let nonSystemThemeName = theme.base.themeName
+        let pref: CodableDefault<[ThemeOverrides]> = pref ?? themeOverridesDefault
+        let overrides = pref.get()
+        var prevValue = overrides.getTheme(nil, wallpaper?.toAppWallpaper().type, theme.base) ?? ThemeOverrides(base: theme.base)
+        if let imageFile = prevValue.wallpaper?.imageFile {
+            try? FileManager.default.removeItem(at: getWallpaperFilePath(imageFile))
+        }
+        prevValue.base = theme.base
+        prevValue.colors = theme.colors
+        prevValue.wallpaper = wallpaper
+        pref.set(overrides.replace(prevValue))
+        currentThemeDefault.set(nonSystemThemeName)
+        var currentThemeIds = currentThemeIdsDefault.get()
+        currentThemeIds[nonSystemThemeName] = prevValue.themeId
+        currentThemeIdsDefault.set(currentThemeIds)
+        CurrentColors = currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
+    }
+
+    static func resetAllThemeColors(_ pref: CodableDefault<[ThemeOverrides]>? = nil) {
+        let nonSystemThemeName = nonSystemThemeName()
+        let pref: CodableDefault<[ThemeOverrides]> = pref ?? themeOverridesDefault
+        let overrides = pref.get()
+        guard let themeId = currentThemeIdsDefault.get()[nonSystemThemeName],
+              var prevValue = overrides.getTheme(themeId)
+        else { return }
+        prevValue.colors = ThemeColors()
+        prevValue.wallpaper?.background = nil
+        prevValue.wallpaper?.tint = nil
+        pref.set(overrides.replace(prevValue))
+        CurrentColors = currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
+    }
+
+    static func resetAllThemeColors(_ pref: Binding<ThemeModeOverride>) {
+        var prevValue = pref.wrappedValue
+        prevValue.colors = ThemeColors()
+        prevValue.wallpaper?.background = nil
+        prevValue.wallpaper?.tint = nil
+        pref.wrappedValue = prevValue
+    }
+
+    static func removeTheme(_ themeId: String?) {
+        var themes = themeOverridesDefault.get().map { $0 }
+        themes.removeAll(where: { $0.themeId == themeId })
+        themeOverridesDefault.set(themes)
+    }
+}

apps/ios/Shared/Views/Call/AudioDevicePicker.swift

@@ -2,7 +2,7 @@
 //  MPVolumeView.swift
 //  SimpleX (iOS)
 //
-//  Created by Stanislav on 24.04.2024.
+//  Created by Avently on 24.04.2024.
 //  Copyright © 2024 SimpleX Chat. All rights reserved.
 //
 

apps/ios/Shared/Views/Call/IncomingCallView.swift

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct IncomingCallView: View {
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @ObservedObject var cc = CallController.shared
 
     var body: some View {
@@ -43,7 +44,7 @@ struct IncomingCallView: View {
                     cc.endCall(invitation: invitation)
                 }
 
-                callButton("Ignore", "multiply", .accentColor) {
+                callButton("Ignore", "multiply", theme.colors.primary) {
                     cc.activeCallInvitation = nil
                 }
 
@@ -63,7 +64,7 @@ struct IncomingCallView: View {
         .padding(.horizontal, 16)
         .padding(.vertical, 12)
         .frame(maxWidth: .infinity)
-        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .modifier(ThemedBackground())
         .onAppear { dismissAllSheets() }
     }
 

apps/ios/Shared/Views/Chat/ChatInfoView.swift

@@ -90,6 +90,7 @@ enum SendReceipts: Identifiable, Hashable {
 
 struct ChatInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
     @ObservedObject var chat: Chat
     @State var contact: Contact
@@ -241,6 +242,7 @@ struct ChatInfoView: View {
                     }
                 }
             }
+            .modifier(ThemedBackground())
             .navigationBarHidden(true)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
@@ -370,6 +372,7 @@ struct ChatInfoView: View {
             )
             .navigationBarTitleDisplayMode(.inline)
             .navigationTitle("Security code")
+            .modifier(ThemedBackground())
         } label: {
             Label(
                 contact.verified ? "View security code" : "Verify security code",
@@ -386,6 +389,7 @@ struct ChatInfoView: View {
                 currentFeaturesAllowed: contactUserPrefsToFeaturesAllowed(contact.mergedPreferences)
             )
             .navigationBarTitle("Contact preferences")
+            .modifier(ThemedBackground())
             .navigationBarTitleDisplayMode(.large)
         } label: {
             Label("Contact preferences", systemImage: "switch.2")
@@ -434,7 +438,7 @@ struct ChatInfoView: View {
         HStack {
             Text("Network status")
             Image(systemName: "info.circle")
-                .foregroundColor(.accentColor)
+                .foregroundColor(theme.colors.primary)
                 .font(.system(size: 14))
             Spacer()
             Text(chatModel.contactNetworkStatus(contact).statusString)

apps/ios/Shared/Views/Chat/ChatItem/CICallItemView.swift

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct CICallItemView: View {
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var status: CICallStatus
@@ -35,7 +36,7 @@ struct CICallItemView: View {
             case .error: missedCallIcon(sent).foregroundColor(.orange)
             }
 
-            CIMetaView(chat: chat, chatItem: chatItem, showStatus: false, showEdited: false)
+            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary, showStatus: false, showEdited: false)
                 .padding(.bottom, 8)
                 .padding(.horizontal, 12)
         }

apps/ios/Shared/Views/Chat/ChatItem/CIFeaturePreferenceView.swift

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct CIFeaturePreferenceView: View {
     @ObservedObject var chat: Chat
+    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
     var feature: ChatFeature
     var allowed: FeatureAllowed
@@ -45,7 +46,7 @@ struct CIFeaturePreferenceView: View {
             r = r
             + Text(acceptText)
                 .fontWeight(.medium)
-                .foregroundColor(.accentColor)
+                .foregroundColor(theme.colors.primary)
             + Text("  ")
         }
         r = r + chatItem.timestampText

apps/ios/Shared/Views/Chat/ChatItem/CIFileView.swift

@@ -12,6 +12,7 @@ import SimpleXChat
 struct CIFileView: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     let file: CIFile?
     let edited: Bool
 
@@ -170,7 +171,7 @@ struct CIFileView: View {
             case .sndWarning: fileIcon("doc.fill", innerIcon: "exclamationmark.triangle.fill", innerIconSize: 10)
             case .rcvInvitation:
                 if fileSizeValid(file) {
-                    fileIcon("arrow.down.doc.fill", color: .accentColor)
+                    fileIcon("arrow.down.doc.fill", color: theme.colors.primary)
                 } else {
                     fileIcon("doc.fill", color: .orange, innerIcon: "exclamationmark", innerIconSize: 12)
                 }
@@ -182,7 +183,7 @@ struct CIFileView: View {
                     progressView()
                 }
             case .rcvAborted:
-                fileIcon("doc.fill", color: .accentColor, innerIcon: "exclamationmark.arrow.circlepath", innerIconSize: 12)
+                fileIcon("doc.fill", color: theme.colors.primary, innerIcon: "exclamationmark.arrow.circlepath", innerIconSize: 12)
             case .rcvComplete: fileIcon("doc.fill")
             case .rcvCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
             case .rcvError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)

apps/ios/Shared/Views/Chat/ChatItem/CIGroupInvitationView.swift

@@ -11,7 +11,7 @@ import SimpleXChat
 
 struct CIGroupInvitationView: View {
     @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var groupInvitation: CIGroupInvitation
@@ -42,7 +42,7 @@ struct CIGroupInvitationView: View {
                                 .overlay(DetermineWidth())
                             (
                                 Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
-                                    .foregroundColor(inProgress ? .secondary : chatIncognito ? .indigo : .accentColor)
+                                    .foregroundColor(inProgress ? .secondary : chatIncognito ? .indigo : theme.colors.primary)
                                     .font(.callout)
                                 + Text("   ")
                                 + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy)
@@ -65,11 +65,11 @@ struct CIGroupInvitationView: View {
                 }
             }
 
-            CIMetaView(chat: chat, chatItem: chatItem, showStatus: false, showEdited: false)
+            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary, showStatus: false, showEdited: false)
         }
         .padding(.horizontal, 12)
         .padding(.vertical, 6)
-        .background(chatItemFrameColor(chatItem, colorScheme))
+        .background(chatItemFrameColor(chatItem, theme))
         .cornerRadius(18)
         .textSelection(.disabled)
         .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
@@ -99,7 +99,7 @@ struct CIGroupInvitationView: View {
     private func groupInfoView(_ action: Bool) -> some View {
         var color: Color
         if action && !inProgress {
-            color = chatIncognito ? .indigo : .accentColor
+            color = chatIncognito ? .indigo : theme.colors.primary
         } else {
             color = Color(uiColor: .tertiaryLabel)
         }

apps/ios/Shared/Views/Chat/ChatItem/CIInvalidJSONView.swift

@@ -44,6 +44,7 @@ func invalidJSONView(_ json: String) -> some View {
     }
     .frame(maxHeight: .infinity)
     .padding()
+    .modifier(ThemedBackground())
 }
 
 struct CIInvalidJSONView_Previews: PreviewProvider {

apps/ios/Shared/Views/Chat/ChatItem/CIMemberCreatedContactView.swift

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct CIMemberCreatedContactView: View {
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
     
     var body: some View {
@@ -43,7 +44,7 @@ struct CIMemberCreatedContactView: View {
             r = r
             + Text(openText)
                 .fontWeight(.medium)
-                .foregroundColor(.accentColor)
+                .foregroundColor(theme.colors.primary)
             + Text("  ")
         }
         r = r + chatItem.timestampText

apps/ios/Shared/Views/Chat/ChatItem/CIMetaView.swift

@@ -11,8 +11,9 @@ import SimpleXChat
 
 struct CIMetaView: View {
     @ObservedObject var chat: Chat
+    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
-    var metaColor = Color.secondary
+    var metaColor: Color
     var paleMetaColor = Color(UIColor.tertiaryLabel)
     var showStatus = true
     var showEdited = true
@@ -63,6 +64,7 @@ func ciMetaText(
     chatTTL: Int?,
     encrypted: Bool?,
     color: Color = .clear,
+    primaryColor: Color = .accentColor,
     transparent: Bool = false,
     sent: SentCheckmark? = nil,
     showStatus: Bool = true,
@@ -85,7 +87,7 @@ func ciMetaText(
         r = r + statusIconText("arrow.forward", color.opacity(0.67)).font(.caption2)
     }
     if showStatus {
-        if let (icon, statusColor) = meta.statusIcon(color) {
+        if let (icon, statusColor) = meta.statusIcon(color, primaryColor) {
             let t = Text(Image(systemName: icon)).font(.caption2)
             let gap = Text("  ").kerning(-1.25)
             let t1 = t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67))
@@ -112,15 +114,16 @@ private func statusIconText(_ icon: String, _ color: Color) -> Text {
 }
 
 struct CIMetaView_Previews: PreviewProvider {
+    static let metaColor = Color.secondary
     static var previews: some View {
         Group {
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)), metaColor: metaColor)
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)), metaColor: metaColor)
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)), metaColor: metaColor)
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)), metaColor: metaColor)
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)), metaColor: metaColor)
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true), metaColor: metaColor)
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(), metaColor: metaColor)
         }
         .previewLayout(.fixed(width: 360, height: 100))
     }

apps/ios/Shared/Views/Chat/ChatItem/CIRcvDecryptionError.swift

@@ -13,6 +13,7 @@ let decryptErrorReason: LocalizedStringKey = "It can happen when you or your con
 
 struct CIRcvDecryptionError: View {
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     var msgDecryptError: MsgDecryptError
     var msgCount: UInt32
@@ -114,18 +115,18 @@ struct CIRcvDecryptionError: View {
                 }
                 (
                     Text(Image(systemName: "exclamationmark.arrow.triangle.2.circlepath"))
-                        .foregroundColor(syncSupported ? .accentColor : .secondary)
+                        .foregroundColor(syncSupported ? theme.colors.primary : theme.colors.secondary)
                         .font(.callout)
                     + Text(" ")
                     + Text("Fix connection")
-                        .foregroundColor(syncSupported ? .accentColor : .secondary)
+                        .foregroundColor(syncSupported ? theme.colors.primary : theme.colors.secondary)
                         .font(.callout)
                     + Text("   ")
                     + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
                 )
             }
             .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
                 .padding(.horizontal, 12)
         }
         .onTapGesture(perform: { onClick() })
@@ -145,7 +146,7 @@ struct CIRcvDecryptionError: View {
                 + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
             }
             .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
                 .padding(.horizontal, 12)
         }
         .onTapGesture(perform: { onClick() })

apps/ios/Shared/Views/Chat/ChatItem/CIVoiceView.swift

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct CIVoiceView: View {
     @ObservedObject var chat: Chat
+    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
     let recordingFile: CIFile?
     let duration: Int
@@ -92,7 +93,7 @@ struct CIVoiceView: View {
     }
 
     private func metaView() -> some View {
-        CIMetaView(chat: chat, chatItem: chatItem)
+        CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
     }
 }
 
@@ -118,7 +119,7 @@ struct VoiceMessagePlayerTime: View {
 
 struct VoiceMessagePlayer: View {
     @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
     var recordingFile: CIFile?
     var recordingTime: TimeInterval
@@ -244,7 +245,7 @@ struct VoiceMessagePlayer: View {
                 .foregroundColor(color)
                 .padding(.leading, image == "play.fill" ? 4 : 0)
                 .frame(width: 56, height: 56)
-                .background(showBackground ? chatItemFrameColor(chatItem, colorScheme) : .clear)
+                .background(showBackground ? chatItemFrameColor(chatItem, theme) : .clear)
                 .clipShape(Circle())
             if recordingTime > 0 {
                 ProgressCircle(length: recordingTime, progress: $playbackTime)
@@ -266,6 +267,7 @@ struct VoiceMessagePlayer: View {
     }
 
     private struct ProgressCircle: View {
+        @EnvironmentObject var theme: AppTheme
         var length: TimeInterval
         @Binding var progress: TimeInterval?
 
@@ -273,7 +275,7 @@ struct VoiceMessagePlayer: View {
             Circle()
                 .trim(from: 0, to: ((progress ?? TimeInterval(0)) / length))
                 .stroke(
-                    Color.accentColor,
+                    theme.colors.primary,
                     style: StrokeStyle(lineWidth: 3)
                 )
                 .rotationEffect(.degrees(-90))
@@ -288,7 +290,7 @@ struct VoiceMessagePlayer: View {
             .frame(width: size, height: size)
             .foregroundColor(Color(uiColor: .tertiaryLabel))
             .frame(width: 56, height: 56)
-            .background(showBackground ? chatItemFrameColor(chatItem, colorScheme) : .clear)
+            .background(showBackground ? chatItemFrameColor(chatItem, theme) : .clear)
             .clipShape(Circle())
     }
 
@@ -296,7 +298,7 @@ struct VoiceMessagePlayer: View {
         ProgressView()
             .frame(width: 30, height: 30)
             .frame(width: 56, height: 56)
-            .background(showBackground ? chatItemFrameColor(chatItem, colorScheme) : .clear)
+            .background(showBackground ? chatItemFrameColor(chatItem, theme) : .clear)
             .clipShape(Circle())
     }
 

apps/ios/Shared/Views/Chat/ChatItem/DeletedItemView.swift

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct DeletedItemView: View {
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     var chatItem: ChatItem
 
@@ -19,12 +19,12 @@ struct DeletedItemView: View {
             Text(chatItem.content.text)
                 .foregroundColor(.secondary)
                 .italic()
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
                 .padding(.horizontal, 12)
         }
         .padding(.leading, 12)
         .padding(.vertical, 6)
-        .background(chatItemFrameColor(chatItem, colorScheme))
+        .background(chatItemFrameColor(chatItem, theme))
         .cornerRadius(18)
         .textSelection(.disabled)
     }

apps/ios/Shared/Views/Chat/ChatItem/EmojiItemView.swift

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct EmojiItemView: View {
     @ObservedObject var chat: Chat
+    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
 
     var body: some View {
@@ -18,7 +19,7 @@ struct EmojiItemView: View {
             emojiText(chatItem.content.text)
                 .padding(.top, 8)
                 .padding(.horizontal, 6)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
                 .padding(.bottom, 8)
                 .padding(.horizontal, 12)
         }

apps/ios/Shared/Views/Chat/ChatItem/FramedItemView.swift

@@ -9,16 +9,9 @@
 import SwiftUI
 import SimpleXChat
 
-let notesChatColorLight = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.21)
-let notesChatColorDark = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.19)
-let sentColorLight = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.12)
-let sentColorDark = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.17)
-private let sentQuoteColorLight = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.11)
-private let sentQuoteColorDark = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.09)
-
 struct FramedItemView: View {
     @EnvironmentObject var m: ChatModel
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     var chatItem: ChatItem
     @Binding var revealed: Bool
@@ -83,7 +76,10 @@ struct FramedItemView: View {
                     .accessibilityLabel("")
             }
         }
-            .background(chatItemFrameColorMaybeImageOrVideo(chatItem, colorScheme))
+            .onAppear {
+                metaColor = metaColor == .secondary ? theme.colors.secondary : metaColor
+            }
+            .background(chatItemFrameColorMaybeImageOrVideo(chatItem, theme))
             .cornerRadius(18)
             .onPreferenceChange(DetermineWidth.Key.self) { msgWidth = $0 }
 
@@ -175,13 +171,13 @@ struct FramedItemView: View {
                 .font(.caption)
                 .lineLimit(1)
         }
-        .foregroundColor(.secondary)
+        .foregroundColor(theme.colors.secondary)
         .padding(.horizontal, 12)
         .padding(.top, 6)
         .padding(.bottom, pad || (chatItem.quotedItem == nil && chatItem.meta.itemForwarded == nil) ? 6 : 0)
         .overlay(DetermineWidth())
         .frame(minWidth: msgWidth, alignment: .leading)
-        .background(chatItemFrameContextColor(chatItem, colorScheme))
+        .background(chatItemFrameContextColor(chatItem, theme))
         if let mediaWidth = maxMediaWidth(), mediaWidth < maxWidth {
             v.frame(maxWidth: mediaWidth, alignment: .leading)
         } else {
@@ -233,7 +229,7 @@ struct FramedItemView: View {
             // if enable this always, size of the framed voice message item will be incorrect after end of playback
             .overlay { if case .voice = chatItem.content.msgContent {} else { DetermineWidth() } }
             .frame(minWidth: msgWidth, alignment: .leading)
-            .background(chatItemFrameContextColor(chatItem, colorScheme))
+            .background(chatItemFrameContextColor(chatItem, theme))
 
         if let mediaWidth = maxMediaWidth(), mediaWidth < maxWidth {
             v.frame(maxWidth: mediaWidth, alignment: .leading)
@@ -248,7 +244,7 @@ struct FramedItemView: View {
                 VStack(alignment: .leading, spacing: 2) {
                     Text(sender)
                         .font(.caption)
-                        .foregroundColor(.secondary)
+                        .foregroundColor(theme.colors.secondary)
                         .lineLimit(1)
                     ciQuotedMsgTextView(qi, lines: 2)
                 }
@@ -363,22 +359,22 @@ func onlyImageOrVideo(_ ci: ChatItem) -> Bool {
     return false
 }
 
-func chatItemFrameColorMaybeImageOrVideo(_ ci: ChatItem, _ colorScheme: ColorScheme) -> Color {
+func chatItemFrameColorMaybeImageOrVideo(_ ci: ChatItem, _ theme: AppTheme) -> Color {
     onlyImageOrVideo(ci)
     ? Color.clear
-    : chatItemFrameColor(ci, colorScheme)
+    : chatItemFrameColor(ci, theme)
 }
 
-func chatItemFrameColor(_ ci: ChatItem, _ colorScheme: ColorScheme) -> Color {
+func chatItemFrameColor(_ ci: ChatItem, _ theme: AppTheme) -> Color {
     ci.chatDir.sent
-    ? (colorScheme == .light ? sentColorLight : sentColorDark)
-    : Color(uiColor: .tertiarySystemGroupedBackground)
+    ? theme.appColors.sentMessage
+    : theme.appColors.receivedMessage
 }
 
-func chatItemFrameContextColor(_ ci: ChatItem, _ colorScheme: ColorScheme) -> Color {
+func chatItemFrameContextColor(_ ci: ChatItem, _ theme: AppTheme) -> Color {
     ci.chatDir.sent
-    ? (colorScheme == .light ? sentQuoteColorLight : sentQuoteColorDark)
-    : Color(uiColor: .quaternarySystemFill)
+    ? theme.appColors.sentQuote
+    : theme.appColors.receivedQuote
 }
 
 struct FramedItemView_Previews: PreviewProvider {

apps/ios/Shared/Views/Chat/ChatItem/IntegrityErrorItemView.swift

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct IntegrityErrorItemView: View {
     @ObservedObject var chat: Chat
+    @EnvironmentObject var theme: AppTheme
     var msgError: MsgErrorType
     var chatItem: ChatItem
 
@@ -54,6 +55,7 @@ struct IntegrityErrorItemView: View {
 
 struct CIMsgError: View {
     @ObservedObject var chat: Chat
+    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
     var onTap: () -> Void
 
@@ -62,7 +64,7 @@ struct CIMsgError: View {
             Text(chatItem.content.text)
                 .foregroundColor(.red)
                 .italic()
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
                 .padding(.horizontal, 12)
         }
         .padding(.leading, 12)

apps/ios/Shared/Views/Chat/ChatItem/MarkedDeletedItemView.swift

@@ -11,7 +11,7 @@ import SimpleXChat
 
 struct MarkedDeletedItemView: View {
     @EnvironmentObject var m: ChatModel
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     var chatItem: ChatItem
     @Binding var revealed: Bool
@@ -22,7 +22,7 @@ struct MarkedDeletedItemView: View {
         .foregroundColor(.secondary)
         .padding(.horizontal, 12)
         .padding(.vertical, 6)
-        .background(chatItemFrameColor(chatItem, colorScheme))
+        .background(chatItemFrameColor(chatItem, theme))
         .cornerRadius(18)
         .textSelection(.disabled)
     }

apps/ios/Shared/Views/Chat/ChatItemForwardingView.swift

@@ -19,9 +19,6 @@ struct ChatItemForwardingView: View {
 
     @State private var searchText: String = ""
     @FocusState private var searchFocused
-    @State private var alert: SomeAlert?
-    @State private var hasSimplexLink_: Bool?
-    private let chatsToForwardTo = filterChatsToForwardTo()
 
     var body: some View {
         NavigationView {
@@ -38,29 +35,52 @@ struct ChatItemForwardingView: View {
                     }
                 }
         }
-        .alert(item: $alert) { $0.alert }
+        .modifier(ThemedBackground())
     }
 
     @ViewBuilder private func forwardListView() -> some View {
         VStack(alignment: .leading) {
+            let chatsToForwardTo = filterChatsToForwardTo()
             if !chatsToForwardTo.isEmpty {
-                List {
-                    searchFieldView(text: $searchText, focussed: $searchFocused)
-                        .padding(.leading, 2)
-                    let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                    let chats = s == "" ? chatsToForwardTo : chatsToForwardTo.filter { foundChat($0, s) }
-                    ForEach(chats) { chat in
-                        forwardListChatView(chat)
-                            .disabled(chatModel.deletedChats.contains(chat.chatInfo.id))
+                ScrollView {
+                    LazyVStack(alignment: .leading, spacing: 8) {
+                        searchFieldView(text: $searchText, focussed: $searchFocused)
+                            .padding(.leading, 2)
+                        let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
+                        let chats = s == "" ? chatsToForwardTo : chatsToForwardTo.filter { filterChatSearched($0, s) }
+                        ForEach(chats) { chat in
+                            Divider()
+                            forwardListNavLinkView(chat)
+                                .disabled(chatModel.deletedChats.contains(chat.chatInfo.id))
+                        }
                     }
+                    .padding(.horizontal)
+                    .padding(.vertical, 8)
+                    .background(Color(uiColor: .systemBackground))
+                    .cornerRadius(12)
+                    .padding(.horizontal)
                 }
+                .modifier(ThemedBackground())
             } else {
-                emptyList()
+                ZStack {
+                    emptyList()
+                }
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .modifier(ThemedBackground())
             }
         }
     }
 
-    private func foundChat(_ chat: Chat, _ searchStr: String) -> Bool {
+    private func filterChatsToForwardTo() -> [Chat] {
+        var filteredChats = chatModel.chats.filter({ canForwardToChat($0) })
+        if let index = filteredChats.firstIndex(where: { $0.chatInfo.chatType == .local }) {
+            let privateNotes = filteredChats.remove(at: index)
+            filteredChats.insert(privateNotes, at: 0)
+        }
+        return filteredChats
+    }
+
+    private func filterChatSearched(_ chat: Chat, _ searchStr: String) -> Bool {
         let cInfo = chat.chatInfo
         return switch cInfo {
         case let .direct(contact):
@@ -76,70 +96,42 @@ struct ChatItemForwardingView: View {
         }
     }
 
-    private func prohibitedByPref(_ chat: Chat) -> Bool {
-        // preference checks should match checks in compose view
-        let simplexLinkProhibited = hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
-        let fileProhibited = (ci.content.msgContent?.isMediaOrFileAttachment ?? false) && !chat.groupFeatureEnabled(.files)
-        let voiceProhibited = (ci.content.msgContent?.isVoice ?? false) && !chat.chatInfo.featureEnabled(.voice)
-        return switch chat.chatInfo {
-        case .direct: voiceProhibited
-        case .group: simplexLinkProhibited || fileProhibited || voiceProhibited
-        case .local: false
+    private func canForwardToChat(_ chat: Chat) -> Bool {
+        switch chat.chatInfo {
+        case let .direct(contact): contact.sendMsgEnabled && !contact.nextSendGrpInv
+        case let .group(groupInfo): groupInfo.sendMsgEnabled
+        case let .local(noteFolder): noteFolder.sendMsgEnabled
         case .contactRequest: false
         case .contactConnection: false
         case .invalidJSON: false
         }
     }
 
-    private var hasSimplexLink: Bool {
-        if let hasSimplexLink_ { return hasSimplexLink_ }
-        let r =
-            if let mcText = ci.content.msgContent?.text,
-               let parsedMsg = parseSimpleXMarkdown(mcText) {
-                parsedMsgHasSimplexLink(parsedMsg)
-            } else {
-                false
-            }
-        hasSimplexLink_ = r
-        return r
-    }
-
     private func emptyList() -> some View {
         Text("No filtered chats")
             .foregroundColor(.secondary)
             .frame(maxWidth: .infinity)
     }
-    
-    @ViewBuilder private func forwardListChatView(_ chat: Chat) -> some View {
-        let prohibited = prohibitedByPref(chat)
+
+    @ViewBuilder private func forwardListNavLinkView(_ chat: Chat) -> some View {
         Button {
-            if prohibited {
-                alert = SomeAlert(
-                    alert: mkAlert(
-                        title: "Cannot forward message",
-                        message: "Selected chat preferences prohibit this message."
-                    ),
-                    id: "forward prohibited by preferences"
-                )
+            dismiss()
+            if chat.id == fromChatInfo.id {
+                 composeState = ComposeState(
+                     message: composeState.message,
+                     preview: composeState.linkPreview != nil ? composeState.preview : .noPreview,
+                     contextItem: .forwardingItem(chatItem: ci, fromChatInfo: fromChatInfo)
+                 )
             } else {
-                dismiss()
-                if chat.id == fromChatInfo.id {
-                    composeState = ComposeState(
-                        message: composeState.message,
-                        preview: composeState.linkPreview != nil ? composeState.preview : .noPreview,
-                        contextItem: .forwardingItem(chatItem: ci, fromChatInfo: fromChatInfo)
-                    )
-                } else {
-                    composeState = ComposeState.init(forwardingItem: ci, fromChatInfo: fromChatInfo)
-                    chatModel.chatId = chat.id
-                }
+                composeState = ComposeState.init(forwardingItem: ci, fromChatInfo: fromChatInfo)
+                chatModel.chatId = chat.id
             }
         } label: {
             HStack {
                 ChatInfoImage(chat: chat, size: 30)
                     .padding(.trailing, 2)
                 Text(chat.chatInfo.chatViewName)
-                    .foregroundColor(prohibited ? .secondary : .primary)
+                    .foregroundColor(.primary)
                     .lineLimit(1)
                 if chat.chatInfo.incognito {
                     Spacer()
@@ -155,27 +147,6 @@ struct ChatItemForwardingView: View {
     }
 }
 
-private func filterChatsToForwardTo() -> [Chat] {
-    var filteredChats = ChatModel.shared.chats.filter { c in
-        c.chatInfo.chatType != .local && canForwardToChat(c)
-    }
-    if let privateNotes = ChatModel.shared.chats.first(where: { $0.chatInfo.chatType == .local }) {
-        filteredChats.insert(privateNotes, at: 0)
-    }
-    return filteredChats
-}
-
-private func canForwardToChat(_ chat: Chat) -> Bool {
-    switch chat.chatInfo {
-    case let .direct(contact): contact.sendMsgEnabled && !contact.nextSendGrpInv
-    case let .group(groupInfo): groupInfo.sendMsgEnabled
-    case let .local(noteFolder): noteFolder.sendMsgEnabled
-    case .contactRequest: false
-    case .contactConnection: false
-    case .invalidJSON: false
-    }
-}
-
 #Preview {
     ChatItemForwardingView(
         ci: ChatItem.getSample(1, .directSnd, .now, "hello"),

apps/ios/Shared/Views/Chat/ChatItemInfoView.swift

@@ -12,7 +12,7 @@ import SimpleXChat
 struct ChatItemInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     var ci: ChatItem
     @Binding var chatItemInfo: ChatItemInfo?
     @State private var selection: CIInfoTab = .history
@@ -101,12 +101,14 @@ struct ChatItemInfoView: View {
                         Label("History", systemImage: "clock")
                     }
                     .tag(CIInfoTab.history)
+                    .modifier(ThemedBackground())
                 if let qi = ci.quotedItem {
                     quoteTab(qi)
                         .tabItem {
                             Label("In reply to", systemImage: "arrowshape.turn.up.left")
                         }
                         .tag(CIInfoTab.quote)
+                        .modifier(ThemedBackground())
                 }
                 if let forwardedFromItem = chatItemInfo?.forwardedFromChatItem {
                     forwardedFromTab(forwardedFromItem)
@@ -114,6 +116,7 @@ struct ChatItemInfoView: View {
                             Label(local ? "Saved" : "Forwarded", systemImage: "arrowshape.turn.up.forward")
                         }
                         .tag(CIInfoTab.forwarded)
+                        .modifier(ThemedBackground())
                 }
             }
             .onAppear {
@@ -123,6 +126,7 @@ struct ChatItemInfoView: View {
             }
         } else {
             historyTab()
+            .modifier(ThemedBackground())
         }
     }
 
@@ -227,7 +231,7 @@ struct ChatItemInfoView: View {
             textBubble(itemVersion.msgContent.text, itemVersion.formattedText, nil)
                 .padding(.horizontal, 12)
                 .padding(.vertical, 6)
-                .background(chatItemFrameColor(ci, colorScheme))
+                .background(chatItemFrameColor(ci, theme))
                 .cornerRadius(18)
                 .contextMenu {
                     if itemVersion.msgContent.text != "" {
@@ -296,7 +300,7 @@ struct ChatItemInfoView: View {
             textBubble(qi.text, qi.formattedText, qi.getSender(nil))
                 .padding(.horizontal, 12)
                 .padding(.vertical, 6)
-                .background(quotedMsgFrameColor(qi, colorScheme))
+                .background(quotedMsgFrameColor(qi, theme))
                 .cornerRadius(18)
                 .contextMenu {
                     if qi.text != "" {
@@ -320,10 +324,10 @@ struct ChatItemInfoView: View {
         .frame(maxWidth: maxWidth, alignment: .leading)
     }
 
-    func quotedMsgFrameColor(_ qi: CIQuote, _ colorScheme: ColorScheme) -> Color {
+    func quotedMsgFrameColor(_ qi: CIQuote, _ theme: AppTheme) -> Color {
         (qi.chatDir?.sent ?? false)
-        ? (colorScheme == .light ? sentColorLight : sentColorDark)
-        : Color(uiColor: .tertiarySystemGroupedBackground)
+        ? theme.appColors.sentMessage
+        : theme.appColors.receivedMessage
     }
 
     @ViewBuilder private func forwardedFromTab(_ forwardedFromItem: AChatItem) -> some View {
@@ -445,7 +449,7 @@ struct ChatItemInfoView: View {
                     .foregroundColor(.secondary).opacity(0.67)
             }
             let v = Group {
-                if let (icon, statusColor) = status.statusIcon(Color.secondary) {
+                if let (icon, statusColor) = status.statusIcon(theme.colors.secondary, theme.colors.primary) {
                     switch status {
                     case .sndRcvd:
                         ZStack(alignment: .trailing) {

apps/ios/Shared/Views/Chat/ChatView.swift

@@ -14,7 +14,7 @@ private let memberImageSize: CGFloat = 34
 
 struct ChatView: View {
     @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.colorScheme) var colorScheme
+    @State var theme: AppTheme = buildTheme()
     @Environment(\.dismiss) var dismiss
     @Environment(\.presentationMode) var presentationMode
     @Environment(\.scenePhase) var scenePhase
@@ -60,7 +60,16 @@ struct ChatView: View {
                 Divider()
             }
             ZStack(alignment: .trailing) {
+                let wallpaperImage = theme.wallpaper.type.image
+                let wallpaperType = theme.wallpaper.type
+                let backgroundColor = theme.wallpaper.background ?? wallpaperType.defaultBackgroundColor(theme.base, theme.colors.background)
+                let tintColor = theme.wallpaper.tint ?? wallpaperType.defaultTintColor(theme.base)
                 chatItemsList()
+                    .if(wallpaperImage != nil) { view in
+                        view.modifier(
+                            ChatViewBackground(image: wallpaperImage!, imageType: wallpaperType, background: backgroundColor, tint: tintColor)
+                        )
+                    }
                 if let proxy = scrollProxy {
                     floatingButtons(proxy)
                 }
@@ -78,7 +87,9 @@ struct ChatView: View {
         }
         .padding(.top, 1)
         .navigationTitle(cInfo.chatViewName)
+        .background(theme.colors.background)
         .navigationBarTitleDisplayMode(.inline)
+        .environmentObject(theme)
         .onAppear {
             initChatView()
         }
@@ -89,6 +100,7 @@ struct ChatView: View {
                     chat = c
                 }
                 initChatView()
+                theme = buildTheme()
             } else {
                 dismiss()
             }
@@ -384,7 +396,7 @@ struct ChatView: View {
                 circleButton {
                     unreadCountText(unreadAbove)
                         .font(.callout)
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                 }
                 .onTapGesture { scrollUp(proxy) }
                 .contextMenu {
@@ -404,13 +416,13 @@ struct ChatView: View {
                 circleButton {
                     unreadCountText(counts.unreadBelow)
                         .font(.callout)
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                 }
                 .onTapGesture { scrollToBottom(proxy) }
             } else if counts.totalBelow > 16 {
                 circleButton {
                     Image(systemName: "chevron.down")
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                 }
                 .onTapGesture { scrollToBottom(proxy) }
             }
@@ -513,7 +525,7 @@ struct ChatView: View {
             }
         }
     }
-    
+
     @ViewBuilder private func chatItemView(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
         ChatItemWithMenu(
             chat: chat,
@@ -528,7 +540,7 @@ struct ChatView: View {
 
     private struct ChatItemWithMenu: View {
         @EnvironmentObject var m: ChatModel
-        @Environment(\.colorScheme) var colorScheme
+        @EnvironmentObject var theme: AppTheme
         @ObservedObject var chat: Chat
         var chatItem: ChatItem
         var maxWidth: CGFloat
@@ -598,7 +610,7 @@ struct ChatView: View {
                                 .padding(.top, 7)
                         }
                         HStack(alignment: .top, spacing: 8) {
-                            ProfileImage(imageStr: member.memberProfile.image, size: memberImageSize)
+                            ProfileImage(imageStr: member.memberProfile.image, size: memberImageSize, backgroundColor: theme.colors.background)
                                 .onTapGesture {
                                     if chatView.membersLoaded {
                                         selectedMember = m.getGroupMember(member.groupMemberId)
@@ -662,7 +674,8 @@ struct ChatView: View {
                     playbackState: $playbackState,
                     playbackTime: $playbackTime
                 )
-                .uiKitContextMenu(hasImageOrVideo: ci.content.msgContent?.isImageOrVideo == true, maxWidth: maxWidth, itemWidth: $itemWidth, menu: uiMenu, allowMenu: $allowMenu)
+                .environmentObject(theme)
+                .uiKitContextMenu(hasImageOrVideo: ci.content.msgContent?.isImageOrVideo == true, maxWidth: maxWidth, itemWidth: $itemWidth, menu: uiMenu, allowMenu: $allowMenu, backgroundColor: theme.colors.background)
                 .accessibilityLabel("")
                 if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
                     chatItemReactions(ci)
@@ -729,7 +742,7 @@ struct ChatView: View {
                             Text("\(r.totalReacted)")
                                 .font(.caption)
                                 .fontWeight(r.userReacted ? .bold : .light)
-                                .foregroundColor(r.userReacted ? .accentColor : .secondary)
+                                .foregroundColor(r.userReacted ? theme.colors.primary : theme.colors.secondary)
                         }
                     }
                     .padding(.horizontal, 6)
@@ -1219,6 +1232,27 @@ struct ChatView: View {
     }
 }
 
+private func buildTheme() -> AppTheme {
+    if let cId = ChatModel.shared.chatId, let chat = ChatModel.shared.getChat(cId) {
+        let perChatTheme = if case let .direct(contact) = chat.chatInfo {
+            contact.uiThemes?.preferredMode(!AppTheme.shared.colors.isLight)
+        } else if case let .group(groupInfo) = chat.chatInfo {
+            groupInfo.uiThemes?.preferredMode(!AppTheme.shared.colors.isLight)
+        } else {
+            nil as ThemeModeOverride?
+        }
+        let overrides = if perChatTheme != nil {
+            ThemeManager.currentColors(nil, perChatTheme, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
+        } else {
+            nil as ThemeManager.ActiveTheme?
+        }
+        let theme = overrides ?? CurrentColors
+        return AppTheme(name: theme.name, base: theme.base, colors: theme.colors, appColors: theme.appColors, wallpaper: theme.wallpaper)
+    } else {
+        return AppTheme.shared
+    }
+}
+
 struct ToggleNtfsButton: View {
     @ObservedObject var chat: Chat
 

apps/ios/Shared/Views/Chat/ComposeMessage/ComposeFileView.swift

@@ -9,7 +9,7 @@
 import SwiftUI
 
 struct ComposeFileView: View {
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     let fileName: String
     let cancelFile: (() -> Void)
     let cancelEnabled: Bool
@@ -33,7 +33,7 @@ struct ComposeFileView: View {
         .padding(.vertical, 1)
         .padding(.trailing, 12)
         .frame(height: 50)
-        .background(colorScheme == .light ? sentColorLight : sentColorDark)
+        .background(theme.appColors.sentMessage)
         .frame(maxWidth: .infinity)
         .padding(.top, 8)
     }

apps/ios/Shared/Views/Chat/ComposeMessage/ComposeImageView.swift

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct ComposeImageView: View {
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     let images: [String]
     let cancelImage: (() -> Void)
     let cancelEnabled: Bool
@@ -48,7 +48,7 @@ struct ComposeImageView: View {
         }
         .padding(.vertical, 1)
         .padding(.trailing, 12)
-        .background(colorScheme == .light ? sentColorLight : sentColorDark)
+        .background(theme.appColors.sentMessage)
         .frame(maxWidth: .infinity)
         .padding(.top, 8)
     }

apps/ios/Shared/Views/Chat/ComposeMessage/ComposeLinkView.swift

@@ -40,7 +40,7 @@ func getLinkPreview(url: URL, cb: @escaping (LinkPreview?) -> Void) {
 }
 
 struct ComposeLinkView: View {
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     let linkPreview: LinkPreview?
     var cancelPreview: (() -> Void)? = nil
     let cancelEnabled: Bool
@@ -62,7 +62,7 @@ struct ComposeLinkView: View {
         }
         .padding(.vertical, 1)
         .padding(.trailing, 12)
-        .background(colorScheme == .light ? sentColorLight : sentColorDark)
+        .background(theme.appColors.sentMessage)
         .frame(maxWidth: .infinity)
         .padding(.top, 8)
     }

apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift

@@ -254,6 +254,7 @@ enum UploadContent: Equatable {
 
 struct ComposeView: View {
     @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     @Binding var composeState: ComposeState
     @Binding var keyboardVisible: Bool
@@ -286,7 +287,6 @@ struct ComposeView: View {
             if chat.chatInfo.contact?.nextSendGrpInv ?? false {
                 ContextInvitingContactMemberView()
             }
-            // preference checks should match checks in forwarding list
             let simplexLinkProhibited = hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
             let fileProhibited = composeState.attachmentPreview && !chat.groupFeatureEnabled(.files)
             let voiceProhibited = composeState.voicePreview && !chat.chatInfo.featureEnabled(.voice)
@@ -354,10 +354,10 @@ struct ComposeView: View {
                         keyboardVisible: $keyboardVisible,
                         sendButtonColor: chat.chatInfo.incognito
                             ? .indigo.opacity(colorScheme == .dark ? 1 : 0.7)
-                            : .accentColor
+                            : theme.colors.primary
                     )
                     .padding(.trailing, 12)
-                    .background(.background)
+                    .background(theme.colors.background)
                     .disabled(!chat.userCanSend)
 
                     if chat.userIsObserver {
@@ -1066,7 +1066,7 @@ struct ComposeView: View {
         } else {
             nil
         }
-        let simplexLink = parsedMsgHasSimplexLink(parsedMsg)
+        let simplexLink = parsedMsg.contains(where: { ft in ft.format?.isSimplexLink ?? false })
         return (url, simplexLink)
     }
 
@@ -1106,10 +1106,6 @@ struct ComposeView: View {
     }
 }
 
-func parsedMsgHasSimplexLink(_ parsedMsg: [FormattedText]) -> Bool {
-    parsedMsg.contains(where: { ft in ft.format?.isSimplexLink ?? false })
-}
-
 struct ComposeView_Previews: PreviewProvider {
     static var previews: some View {
         let chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])

apps/ios/Shared/Views/Chat/ComposeMessage/ComposeVoiceView.swift

@@ -25,7 +25,7 @@ func voiceMessageTime_(_ time: TimeInterval?) -> String {
 
 struct ComposeVoiceView: View {
     @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     var recordingFileName: String
     @Binding var recordingTime: TimeInterval?
     @Binding var recordingState: VoiceMessageRecordingState
@@ -50,7 +50,7 @@ struct ComposeVoiceView: View {
         }
         .padding(.vertical, 1)
         .frame(height: ComposeVoiceView.previewHeight)
-        .background(colorScheme == .light ? sentColorLight : sentColorDark)
+        .background(theme.appColors.sentMessage)
         .frame(maxWidth: .infinity)
         .padding(.top, 8)
     }
@@ -80,7 +80,7 @@ struct ComposeVoiceView: View {
                     Button {
                         startPlayback()
                     } label: {
-                        playPauseIcon("play.fill")
+                        playPauseIcon("play.fill", theme.colors.primary)
                     }
                     Text(voiceMessageTime_(recordingTime))
                 case .playing:
@@ -88,7 +88,7 @@ struct ComposeVoiceView: View {
                         audioPlayer?.pause()
                         playbackState = .paused
                     } label: {
-                        playPauseIcon("pause.fill")
+                        playPauseIcon("pause.fill", theme.colors.primary)
                     }
                     Text(voiceMessageTime_(playbackTime))
                 case .paused:
@@ -96,7 +96,7 @@ struct ComposeVoiceView: View {
                         audioPlayer?.play()
                         playbackState = .playing
                     } label: {
-                        playPauseIcon("play.fill")
+                        playPauseIcon("play.fill", theme.colors.primary)
                     }
                     Text(voiceMessageTime_(playbackTime))
                 }
@@ -131,7 +131,7 @@ struct ComposeVoiceView: View {
         }
     }
 
-    private func playPauseIcon(_ image: String, _ color: Color = .accentColor) -> some View {
+    private func playPauseIcon(_ image: String, _ color: Color) -> some View {
         Image(systemName: image)
             .resizable()
             .aspectRatio(contentMode: .fit)
@@ -162,6 +162,7 @@ struct ComposeVoiceView: View {
     }
 
     private struct ProgressBar: View {
+        @EnvironmentObject var theme: AppTheme
         var length: TimeInterval
         @Binding var progress: TimeInterval?
 
@@ -169,7 +170,7 @@ struct ComposeVoiceView: View {
             GeometryReader { geometry in
                 ZStack {
                     Rectangle()
-                        .fill(Color.accentColor)
+                        .fill(theme.colors.primary)
                         .frame(width: min(CGFloat((progress ?? TimeInterval(0)) / length) * geometry.size.width, geometry.size.width), height: 4)
                         .animation(.linear, value: progress)
                 }

apps/ios/Shared/Views/Chat/ComposeMessage/ContextInvitingContactMemberView.swift

@@ -9,7 +9,7 @@
 import SwiftUI
 
 struct ContextInvitingContactMemberView: View {
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
 
     var body: some View {
         HStack {
@@ -20,7 +20,7 @@ struct ContextInvitingContactMemberView: View {
         .padding(12)
         .frame(minHeight: 50)
         .frame(maxWidth: .infinity, alignment: .leading)
-        .background(colorScheme == .light ? sentColorLight : sentColorDark)
+        .background(theme.appColors.sentMessage)
         .padding(.top, 8)
     }
 }

apps/ios/Shared/Views/Chat/ComposeMessage/ContextItemView.swift

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct ContextItemView: View {
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     let contextItem: ChatItem
     let contextIcon: String
@@ -44,7 +44,7 @@ struct ContextItemView: View {
         .padding(12)
         .frame(minHeight: 50)
         .frame(maxWidth: .infinity)
-        .background(chatItemFrameColor(contextItem, colorScheme))
+        .background(chatItemFrameColor(contextItem, theme))
         .padding(.top, 8)
     }
 

apps/ios/Shared/Views/Chat/ComposeMessage/NativeTextEditor.swift

@@ -28,6 +28,7 @@ struct NativeTextEditor: UIViewRepresentable {
     
     func makeUIView(context: Context) -> UITextView {
         let field = CustomUITextField(height: _height)
+        field.backgroundColor = .clear
         field.text = text
         field.textAlignment = alignment(text)
         field.autocapitalizationType = .sentences

apps/ios/Shared/Views/Chat/ComposeMessage/SendMessageView.swift

@@ -13,6 +13,7 @@ private let liveMsgInterval: UInt64 = 3000_000000
 
 struct SendMessageView: View {
     @Binding var composeState: ComposeState
+    @EnvironmentObject var theme: AppTheme
     var sendMessage: (Int?) -> Void
     var sendLiveMessage: (() async -> Void)? = nil
     var updateLiveMessage: (() async -> Void)? = nil
@@ -247,6 +248,7 @@ struct SendMessageView: View {
     }
 
     private struct RecordVoiceMessageButton: View {
+        @EnvironmentObject var theme: AppTheme
         var startVoiceMessageRecording: (() -> Void)?
         var finishVoiceMessageRecording: (() -> Void)?
         @Binding var holdingVMR: Bool
@@ -256,7 +258,7 @@ struct SendMessageView: View {
         var body: some View {
             Button(action: {}) {
                 Image(systemName: "mic.fill")
-                    .foregroundColor(.accentColor)
+                    .foregroundColor(theme.colors.primary)
             }
             .disabled(disabled)
             .frame(width: 29, height: 29)
@@ -323,7 +325,7 @@ struct SendMessageView: View {
             Image(systemName: "multiply")
                 .resizable()
                 .scaledToFit()
-                .foregroundColor(.accentColor)
+                .foregroundColor(theme.colors.primary)
                 .frame(width: 15, height: 15)
         }
         .frame(width: 29, height: 29)
@@ -340,7 +342,7 @@ struct SendMessageView: View {
             Image(systemName: "bolt.fill")
                 .resizable()
                 .scaledToFit()
-                .foregroundColor(.accentColor)
+                .foregroundColor(theme.colors.primary)
                 .frame(width: 20, height: 20)
         }
         .frame(width: 29, height: 29)
@@ -383,7 +385,7 @@ struct SendMessageView: View {
             }
             Task {
                 _ = try? await Task.sleep(nanoseconds: liveMsgInterval)
-                while composeState.liveMessage != nil {
+                while await composeState.liveMessage != nil {
                     await update()
                     _ = try? await Task.sleep(nanoseconds: liveMsgInterval)
                 }
@@ -394,7 +396,7 @@ struct SendMessageView: View {
     private func finishVoiceMessageRecordingButton() -> some View {
         Button(action: { finishVoiceMessageRecording?() }) {
             Image(systemName: "stop.fill")
-                .foregroundColor(.accentColor)
+                .foregroundColor(theme.colors.primary)
         }
         .disabled(composeState.inProgress)
         .frame(width: 29, height: 29)

apps/ios/Shared/Views/Chat/Group/AddGroupMembersView.swift

@@ -21,6 +21,7 @@ struct AddGroupMembersView: View {
 
 struct AddGroupMembersViewCommon: View {
     @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
     var chat: Chat
     @State var groupInfo: GroupInfo
     var creatingGroup: Bool = false
@@ -125,6 +126,7 @@ struct AddGroupMembersViewCommon: View {
         .onChange(of: selectedContacts) { _ in
             searchFocussed = false
         }
+        .modifier(ThemedBackground())
     }
 
     private func inviteMembersButton() -> some View {
@@ -176,7 +178,7 @@ struct AddGroupMembersViewCommon: View {
         } else {
             if checked {
                 icon = "checkmark.circle.fill"
-                iconColor = .accentColor
+                iconColor = theme.colors.primary
             } else {
                 icon = "circle"
                 iconColor = Color(uiColor: .tertiaryLabel)

apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift

@@ -135,6 +135,7 @@ struct GroupChatInfoView: View {
                     }
                 }
             }
+            .modifier(ThemedBackground())
             .navigationBarHidden(true)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
@@ -210,6 +211,7 @@ struct GroupChatInfoView: View {
     private struct MemberRowView: View {
         var groupInfo: GroupInfo
         @ObservedObject var groupMember: GMember
+        @EnvironmentObject var theme: AppTheme
         var user: Bool = false
         @Binding var alert: GroupChatInfoViewAlert?
 
@@ -282,7 +284,7 @@ struct GroupChatInfoView: View {
                     Button {
                         alert = .unblockMemberAlert(mem: member)
                     } label: {
-                        Label("Unblock member", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
+                        Label("Unblock member", systemImage: "hand.raised.slash").foregroundColor(theme.colors.primary)
                     }
                 }
             }
@@ -294,7 +296,7 @@ struct GroupChatInfoView: View {
                     Button {
                         alert = .unblockForAllAlert(mem: member)
                     } label: {
-                        Label("Unblock for all", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
+                        Label("Unblock for all", systemImage: "hand.raised.slash").foregroundColor(theme.colors.primary)
                     }
                 } else {
                     Button {
@@ -333,6 +335,7 @@ struct GroupChatInfoView: View {
                 creatingGroup: false
             )
             .navigationBarTitle("Group link")
+            .modifier(ThemedBackground())
             .navigationBarTitleDisplayMode(.large)
         } label: {
             if groupLink == nil {
@@ -350,6 +353,7 @@ struct GroupChatInfoView: View {
                 groupProfile: groupInfo.groupProfile
             )
             .navigationBarTitle("Group profile")
+            .modifier(ThemedBackground())
             .navigationBarTitleDisplayMode(.large)
         } label: {
             Label("Edit group profile", systemImage: "pencil")
@@ -364,6 +368,7 @@ struct GroupChatInfoView: View {
                 welcomeText: groupInfo.groupProfile.description ?? ""
             )
             .navigationTitle("Welcome message")
+            .modifier(ThemedBackground())
             .navigationBarTitleDisplayMode(.large)
         } label: {
             groupInfo.groupProfile.description == nil
@@ -518,6 +523,7 @@ func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bo
             creatingGroup: creatingGroup
         )
         .navigationBarTitle("Group preferences")
+        .modifier(ThemedBackground())
         .navigationBarTitleDisplayMode(.large)
     } label: {
         if creatingGroup {

apps/ios/Shared/Views/Chat/Group/GroupLinkView.swift

@@ -133,6 +133,7 @@ struct GroupLinkView: View {
                 shouldCreate = false
             }
         }
+        .modifier(ThemedBackground())
     }
 
     private func createGroupLink() {

apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift

@@ -247,6 +247,7 @@ struct GroupMemberInfoView: View {
                 ProgressView().scaleEffect(2)
             }
         }
+        .modifier(ThemedBackground())
     }
 
     func connectViaAddressButton(_ contactLink: String) -> some View {
@@ -374,6 +375,7 @@ struct GroupMemberInfoView: View {
             )
             .navigationBarTitleDisplayMode(.inline)
             .navigationTitle("Security code")
+            .modifier(ThemedBackground())
         } label: {
             Label(
                 member.verified ? "View security code" : "Verify security code",

apps/ios/Shared/Views/Chat/VerifyCodeView.swift

@@ -66,6 +66,7 @@ struct VerifyCodeView: View {
                                 ScanCodeView(connectionVerified: $connectionVerified, verify: verify)
                                     .navigationBarTitleDisplayMode(.large)
                                     .navigationTitle("Scan code")
+                                    .modifier(ThemedBackground())
                             } label: {
                                 Label("Scan code", systemImage: "qrcode")
                             }

apps/ios/Shared/Views/ChatList/ChatListNavLink.swift

@@ -26,6 +26,7 @@ private let rowHeights: [DynamicTypeSize: CGFloat] = [
 
 struct ChatListNavLink: View {
     @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @Environment(\.dynamicTypeSize) private var dynamicTypeSize
     @ObservedObject var chat: Chat
     @State private var showContactRequestDialog = false
@@ -224,7 +225,7 @@ struct ChatListNavLink: View {
         } label: {
             Label("Join", systemImage: chat.chatInfo.incognito ? "theatermasks" : "ipad.and.arrow.forward")
         }
-        .tint(chat.chatInfo.incognito ? .indigo : .accentColor)
+        .tint(chat.chatInfo.incognito ? .indigo : theme.colors.primary)
     }
 
     @ViewBuilder private func markReadButton() -> some View {
@@ -234,14 +235,14 @@ struct ChatListNavLink: View {
             } label: {
                 Label("Read", systemImage: "checkmark")
             }
-            .tint(Color.accentColor)
+            .tint(theme.colors.primary)
         } else {
             Button {
                 Task { await markChatUnread(chat) }
             } label: {
                 Label("Unread", systemImage: "circlebadge.fill")
             }
-            .tint(Color.accentColor)
+            .tint(theme.colors.primary)
         }
 
     }
@@ -306,7 +307,7 @@ struct ChatListNavLink: View {
             Button {
                 Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) }
             } label: { Label("Accept", systemImage: "checkmark") }
-                .tint(.accentColor)
+                .tint(theme.colors.primary)
             Button {
                 Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) }
             } label: {
@@ -346,7 +347,7 @@ struct ChatListNavLink: View {
             } label: {
                 Label("Name", systemImage: "pencil")
             }
-            .tint(.accentColor)
+            .tint(theme.colors.primary)
         }
         .frame(height: rowHeights[dynamicTypeSize])
         .appSheet(isPresented: $showContactConnectionInfo) {
@@ -354,6 +355,7 @@ struct ChatListNavLink: View {
                 if case let .contactConnection(contactConnection) = chat.chatInfo {
                     ContactConnectionInfo(contactConnection: contactConnection)
                         .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
+                        .modifier(ThemedBackground())
                 }
             }
         }

apps/ios/Shared/Views/ChatList/ChatListView.swift

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct ChatListView: View {
     @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @Binding var showSettings: Bool
     @State private var searchMode = false
     @FocusState private var searchFocussed
@@ -86,6 +87,7 @@ struct ChatListView: View {
             ))
         }
         .listStyle(.plain)
+        .background(theme.colors.background)
         .navigationBarTitleDisplayMode(.inline)
         .navigationBarHidden(searchMode)
         .toolbar {
@@ -136,7 +138,7 @@ struct ChatListView: View {
             showUnreadAndFavorites = !showUnreadAndFavorites
         } label: {
             Image(systemName: "line.3.horizontal.decrease.circle" + (showUnreadAndFavorites ? ".fill" : ""))
-                .foregroundColor(.accentColor)
+                .foregroundColor(theme.colors.primary)
         }
     }
 
@@ -154,12 +156,14 @@ struct ChatListView: View {
                             searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink
                         )
                         .listRowSeparator(.hidden)
+                        .listRowBackground(Color.clear)
                         .frame(maxWidth: .infinity)
                     }
                     ForEach(cs, id: \.viewId) { chat in
                         ChatListNavLink(chat: chat)
                             .padding(.trailing, -16)
                             .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
+                            .listRowBackground(Color.clear)
                     }
                     .offset(x: -8)
                 }
@@ -179,7 +183,7 @@ struct ChatListView: View {
     private func unreadBadge(_ text: Text? = Text(" "), size: CGFloat = 18) -> some View {
         Circle()
             .frame(width: size, height: size)
-            .foregroundColor(.accentColor)
+            .foregroundColor(theme.colors.primary)
     }
 
     private func onboardingButtons() -> some View {
@@ -190,7 +194,7 @@ struct ChatListView: View {
                 p.addLine(to: CGPoint(x: 0, y: 10))
                 p.addLine(to: CGPoint(x: 8, y: 0))
             }
-            .fill(Color.accentColor)
+            .fill(theme.colors.primary)
             .frame(width: 20, height: 10)
             .padding(.trailing, 12)
 
@@ -213,7 +217,7 @@ struct ChatListView: View {
                 .padding(.vertical, 10)
                 .padding(.horizontal, 20)
         }
-        .background(Color.accentColor)
+        .background(theme.colors.primary)
         .foregroundColor(.white)
         .clipShape(RoundedRectangle(cornerRadius: 16))
     }
@@ -276,6 +280,7 @@ struct ChatListView: View {
 
 struct ChatListSearchBar: View {
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @Binding var searchMode: Bool
     @FocusState.Binding var searchFocussed: Bool
     @Binding var searchText: String
@@ -330,7 +335,7 @@ struct ChatListSearchBar: View {
 
                 if searchFocussed {
                     Text("Cancel")
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                         .onTapGesture {
                             searchText = ""
                             searchFocussed = false

apps/ios/Shared/Views/ChatList/ChatPreviewView.swift

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct ChatPreviewView: View {
     @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     @Binding var progressByTimeout: Bool
     @State var deleting: Bool = false
@@ -94,7 +95,7 @@ struct ChatPreviewView: View {
         case let .group(groupInfo):
             let v = previewTitle(t)
             switch (groupInfo.membership.memberStatus) {
-            case .memInvited: v.foregroundColor(deleting ? .secondary : chat.chatInfo.incognito ? .indigo : .accentColor)
+            case .memInvited: v.foregroundColor(deleting ? .secondary : chat.chatInfo.incognito ? .indigo : theme.colors.primary)
             case .memAccepted: v.foregroundColor(.secondary)
             default: if deleting  { v.foregroundColor(.secondary) } else { v }
             }
@@ -133,7 +134,7 @@ struct ChatPreviewView: View {
                     .foregroundColor(.white)
                     .padding(.horizontal, 4)
                     .frame(minWidth: 18, minHeight: 18)
-                    .background(chat.chatInfo.ntfsEnabled || chat.chatInfo.chatType == .local ? Color.accentColor : Color.secondary)
+                    .background(chat.chatInfo.ntfsEnabled || chat.chatInfo.chatType == .local ? theme.colors.primary : theme.colors.secondary)
                     .cornerRadius(10)
             } else if !chat.chatInfo.ntfsEnabled && chat.chatInfo.chatType != .local {
                 Image(systemName: "speaker.slash.fill")
@@ -151,7 +152,7 @@ struct ChatPreviewView: View {
 
     private func messageDraft(_ draft: ComposeState) -> Text {
         let msg = draft.message
-        return image("rectangle.and.pencil.and.ellipsis", color: .accentColor)
+        return image("rectangle.and.pencil.and.ellipsis", color: theme.colors.primary)
                 + attachment()
                 + messageText(msg, parseSimpleXMarkdown(msg), nil, preview: true, showSecrets: false)
 
@@ -206,7 +207,7 @@ struct ChatPreviewView: View {
             case let .direct(contact):
                 if contact.activeConn == nil && contact.profile.contactLink != nil {
                     chatPreviewInfoText("Tap to Connect")
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                 } else if !contact.ready && contact.activeConn != nil {
                     if contact.nextSendGrpInv {
                         chatPreviewInfoText("send direct message")

apps/ios/Shared/Views/ChatList/ContactConnectionInfo.swift

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct ContactConnectionInfo: View {
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
     @State var contactConnection: PendingContactConnection
     @State private var alert: CCInfoAlert?
@@ -82,6 +83,7 @@ struct ContactConnectionInfo: View {
                     }
                 }
             }
+            .modifier(ThemedBackground())
             if #available(iOS 16, *) {
                 v
             } else {
@@ -149,7 +151,7 @@ struct ContactConnectionInfo: View {
                 HStack(spacing: 6) {
                     Text("Incognito")
                     Image(systemName: "info.circle")
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                         .font(.system(size: 14))
                 }
                 .onTapGesture {
@@ -178,6 +180,7 @@ private func oneTimeLinkLearnMoreButton() -> some View {
     NavigationLink {
         AddContactLearnMore(showTitle: false)
             .navigationTitle("One-time invitation link")
+            .modifier(ThemedBackground())
             .navigationBarTitleDisplayMode(.large)
     } label: {
         settingsRow("info.circle") {

apps/ios/Shared/Views/ChatList/ContactRequestView.swift

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct ContactRequestView: View {
     @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
     var contactRequest: UserContactRequest
     @ObservedObject var chat: Chat
 
@@ -23,7 +24,7 @@ struct ContactRequestView: View {
                     Text(contactRequest.chatViewName)
                         .font(.title3)
                         .fontWeight(.bold)
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                         .padding(.leading, 8)
                         .frame(alignment: .topLeading)
                     Spacer()

apps/ios/Shared/Views/ChatList/UserPicker.swift

@@ -6,13 +6,11 @@
 import SwiftUI
 import SimpleXChat
 
-private let fillColorDark = Color(uiColor: UIColor(red: 0.11, green: 0.11, blue: 0.11, alpha: 255))
-private let fillColorLight = Color(uiColor: UIColor(red: 0.99, green: 0.99, blue: 0.99, alpha: 255))
-
 struct UserPicker: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     @Environment(\.scenePhase) var scenePhase
+    @EnvironmentObject var theme: AppTheme
     @Binding var showSettings: Bool
     @Binding var showConnectDesktop: Bool
     @Binding var userPickerVisible: Bool
@@ -21,9 +19,6 @@ struct UserPicker: View {
     private let menuButtonHeight: CGFloat = 68
     @State var chatViewNameWidth: CGFloat = 0
 
-    var fillColor: Color {
-        colorScheme == .dark ? fillColorDark : fillColorLight
-    }
 
     var body: some View {
         VStack {
@@ -82,7 +77,7 @@ struct UserPicker: View {
         .clipShape(RoundedRectangle(cornerRadius: 16))
         .background(
             Rectangle()
-                .fill(fillColor)
+                .fill(theme.colors.surface)
                 .cornerRadius(16)
                 .shadow(color: .black.opacity(0.12), radius: 24, x: 0, y: 0)
         )
@@ -137,7 +132,7 @@ struct UserPicker: View {
                 if user.activeUser {
                     Image(systemName: "checkmark")
                 } else if u.unreadCount > 0 {
-                    unreadCounter(u.unreadCount, color: user.showNtfs ? .accentColor : .secondary)
+                    unreadCounter(u.unreadCount, color: user.showNtfs ? theme.colors.primary : theme.colors.secondary)
                 } else if !user.showNtfs {
                     Image(systemName: "speaker.slash")
                 }
@@ -145,7 +140,7 @@ struct UserPicker: View {
             .padding(.trailing)
             .padding([.leading, .vertical], 12)
         })
-        .buttonStyle(PressedButtonStyle(defaultColor: fillColor, pressedColor: Color(uiColor: .secondarySystemFill)))
+        .buttonStyle(PressedButtonStyle(defaultColor: theme.colors.surface, pressedColor: Color(uiColor: .secondarySystemFill)))
     }
 
     private func menuButton(_ title: LocalizedStringKey, icon: String, action: @escaping () -> Void) -> some View {
@@ -162,7 +157,7 @@ struct UserPicker: View {
             .padding(.vertical, 22)
             .frame(height: menuButtonHeight)
         }
-        .buttonStyle(PressedButtonStyle(defaultColor: fillColor, pressedColor: Color(uiColor: .secondarySystemFill)))
+        .buttonStyle(PressedButtonStyle(defaultColor: theme.colors.surface, pressedColor: Color(uiColor: .secondarySystemFill)))
     }
 }
 

apps/ios/Shared/Views/Database/DatabaseView.swift

@@ -118,6 +118,7 @@ struct DatabaseView: View {
                     NavigationLink {
                         DatabaseEncryptionView(useKeychain: $useKeychain, migration: false)
                             .navigationTitle("Database passphrase")
+                            .modifier(ThemedBackground())
                     } label: {
                         Text("Database passphrase")
                     }
@@ -144,6 +145,7 @@ struct DatabaseView: View {
                         NavigationLink {
                             ChatArchiveView(archiveName: archiveName)
                                 .navigationTitle(title)
+                                .modifier(ThemedBackground())
                         } label: {
                             Text(title)
                         }
@@ -355,6 +357,7 @@ struct DatabaseView: View {
             Task {
                 do {
                     try await apiDeleteStorage()
+                    try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
                     do {
                         let config = ArchiveConfig(archivePath: archivePath.path)
                         let archiveErrors = try await apiImportArchive(config: config)

apps/ios/Shared/Views/Database/MigrateToAppGroupView.swift

@@ -189,6 +189,7 @@ struct MigrateToAppGroupView: View {
         Task {
             do {
                 try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
+                try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
                 try await apiExportArchive(config: config)
                 await MainActor.run { setV3DBMigration(.exported) }
             } catch let error {
@@ -231,6 +232,7 @@ func exportChatArchive(_ storagePath: URL? = nil) async throws -> URL {
     if !ChatModel.shared.chatDbChanged {
         try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
     }
+    try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
     try await apiExportArchive(config: config)
     if storagePath == nil {
         deleteOldArchive()

apps/ios/Shared/Views/Helpers/ChatInfoImage.swift

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct ChatInfoImage: View {
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     var size: CGFloat
     var color = Color(uiColor: .tertiarySystemGroupedBackground)
@@ -24,8 +24,7 @@ struct ChatInfoImage: View {
         case .contactRequest: iconName = "person.crop.circle.fill"
         default: iconName = "circle.fill"
         }
-        let notesColor = colorScheme == .light ? notesChatColorLight : notesChatColorDark
-        let iconColor = if case .local = chat.chatInfo { notesColor } else { color }
+        let iconColor = if case .local = chat.chatInfo { theme.appColors.primaryVariant2 } else { color }
         return ProfileImage(
             imageStr: chat.chatInfo.image,
             iconName: iconName,

apps/ios/Shared/Views/Helpers/ChatWallpaper.swift

@@ -0,0 +1,91 @@
+//
+//  ChatWallpaper.swift
+//  SimpleX (iOS)
+//
+//  Created by Avently on 14.06.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+import SwiftUI
+import SimpleXChat
+
+struct ChatViewBackground: ViewModifier {
+    @EnvironmentObject var theme: AppTheme
+    var image: Image
+    var imageType: WallpaperType
+    var background: Color
+    var tint: Color
+
+    func body(content: Content) -> some View {
+        content.background(
+            Canvas { context, size in
+                var image = context.resolve(image)
+                image.shading = .color(tint)
+                let rect = CGRectMake(0, 0, size.width, size.height)
+                func repeatDraw(_ imageScale: CGFloat) {
+                    let scale = imageScale
+                    for h in 0 ... Int(size.height / image.size.height / scale) {
+                        for w in 0 ... Int(size.width / image.size.width / scale) {
+                            let rect = CGRectMake(CGFloat(w) * image.size.width * scale, CGFloat(h) * image.size.height * scale, image.size.width * scale, image.size.height * scale)
+                            context.draw(image, in: rect, style: FillStyle())
+                        }
+                    }
+                }
+                context.fill(Path(rect), with: .color(background))
+                switch imageType {
+                case let WallpaperType.Preset(filename, scale): repeatDraw(CGFloat((scale ?? 1) * (PresetWallpaper.from(filename)?.scale ?? 1)))
+                case let WallpaperType.Image(_, scale, scaleType):
+                    let scaleType = scaleType ?? WallpaperScaleType.fill
+                    switch scaleType {
+                    case WallpaperScaleType.repeat: repeatDraw(CGFloat(scale ?? 1))
+                    case WallpaperScaleType.fill: fallthrough
+                    case WallpaperScaleType.fit:
+                        //                        let scale = scaleType.contentScale.computeScaleFactor(Size(image.width.toFloat(), image.height.toFloat()), Size(size.width, size.height))
+                        //                        let scaledWidth = (image.width * scale.scaleX).roundToInt()
+                        //                        let scaledHeight = (image.height * scale.scaleY).roundToInt()
+                        //                        drawImage(image, dstOffset = IntOffset(x = ((size.width - scaledWidth) / 2).roundToInt(), y = ((size.height - scaledHeight) / 2).roundToInt()), dstSize = IntSize(scaledWidth, scaledHeight), filterQuality = quality)
+                        //                        if (scaleType == WallpaperScaleType.FIT) {
+                        //                            if (scaledWidth < size.width) {
+                        //                                // has black lines at left and right sides
+                        //                                var x = (size.width - scaledWidth) / 2
+                        //                                while (x > 0) {
+                        //                                    drawImage(image, dstOffset = IntOffset(x = (x - scaledWidth).roundToInt(), y = ((size.height - scaledHeight) / 2).roundToInt()), dstSize = IntSize(scaledWidth, scaledHeight), filterQuality = quality)
+                        //                                    x -= scaledWidth
+                        //                                }
+                        //                                x = size.width - (size.width - scaledWidth) / 2
+                        //                                while (x < size.width) {
+                        //                                    drawImage(image, dstOffset = IntOffset(x = x.roundToInt(), y = ((size.height - scaledHeight) / 2).roundToInt()), dstSize = IntSize(scaledWidth, scaledHeight), filterQuality = quality)
+                        //                                    x += scaledWidth
+                        //                                }
+                        //                            } else {
+                        //                                // has black lines at top and bottom sides
+                        //                                var y = (size.height - scaledHeight) / 2
+                        //                                while (y > 0) {
+                        //                                    drawImage(image, dstOffset = IntOffset(x = ((size.width - scaledWidth) / 2).roundToInt(), y = (y - scaledHeight).roundToInt()), dstSize = IntSize(scaledWidth, scaledHeight), filterQuality = quality)
+                        //                                    y -= scaledHeight
+                        //                                }
+                        //                                y = size.height - (size.height - scaledHeight) / 2
+                        //                                while (y < size.height) {
+                        //                                    drawImage(image, dstOffset = IntOffset(x = ((size.width - scaledWidth) / 2).roundToInt(), y = y.roundToInt()), dstSize = IntSize(scaledWidth, scaledHeight), filterQuality = quality)
+                        //                                    y += scaledHeight
+                        //                                }
+                        //                            }
+                        //                        }
+                        context.fill(Path(rect), with: .color(tint))
+                    }
+                case WallpaperType.Empty: ()
+                }
+            }
+        )
+    }
+}
+
+extension PresetWallpaper {
+    public func toType(_ base: DefaultTheme, _ scale: Float? = nil) -> WallpaperType {
+        WallpaperType.Preset(
+            filename,
+            scale ?? themeOverridesDefault.get().first { $0.wallpaper != nil && $0.wallpaper!.preset == filename && $0.base == base }?.wallpaper?.scale ?? 1
+        )
+    }
+}

apps/ios/Shared/Views/Helpers/ContextMenu.swift

@@ -11,7 +11,7 @@ import UIKit
 import SwiftUI
 
 extension View {
-    func uiKitContextMenu(hasImageOrVideo: Bool, maxWidth: CGFloat, itemWidth: Binding<CGFloat>, menu: Binding<UIMenu>, allowMenu: Binding<Bool>) -> some View {
+    func uiKitContextMenu(hasImageOrVideo: Bool, maxWidth: CGFloat, itemWidth: Binding<CGFloat>, menu: Binding<UIMenu>, allowMenu: Binding<Bool>, backgroundColor: Color) -> some View {
         Group {
             if allowMenu.wrappedValue {
                 if hasImageOrVideo {
@@ -19,10 +19,10 @@ extension View {
                         self.environmentObject(ChatModel.shared)
                         .overlay(DetermineWidthImageVideoItem())
                         .onPreferenceChange(DetermineWidthImageVideoItem.Key.self) { itemWidth.wrappedValue = $0 == 0 ? maxWidth : $0 }
-                    , maxWidth: maxWidth, itemWidth: itemWidth, menu: menu)
+                                    , maxWidth: maxWidth, itemWidth: itemWidth, menu: menu, backgroundColor: backgroundColor)
                     .frame(maxWidth: itemWidth.wrappedValue)
                 } else {
-                    InteractionView(content: self.environmentObject(ChatModel.shared), maxWidth: maxWidth, itemWidth: itemWidth, menu: menu)
+                    InteractionView(content: self.environmentObject(ChatModel.shared), maxWidth: maxWidth, itemWidth: itemWidth, menu: menu, backgroundColor: backgroundColor)
                         .fixedSize(horizontal: true, vertical: false)
                 }
             } else {
@@ -42,11 +42,14 @@ struct InteractionView<Content: View>: UIViewRepresentable {
     var maxWidth: CGFloat
     var itemWidth: Binding<CGFloat>
     @Binding var menu: UIMenu
+    var backgroundColor: Color
 
     func makeUIView(context: Context) -> UIView {
         let view = HostingViewHolder()
         view.backgroundColor = .clear
         let hostView = UIHostingController(rootView: content)
+//        hostView.view.backgroundColor = UIColor(backgroundColor)
+        hostView.view.backgroundColor = .clear
         view.contentSize = hostView.view.intrinsicContentSize
         hostView.view.translatesAutoresizingMaskIntoConstraints = false
         let constraints = [
@@ -72,6 +75,7 @@ struct InteractionView<Content: View>: UIViewRepresentable {
         if was != (uiView as! HostingViewHolder).contentSize {
             uiView.invalidateIntrinsicContentSize()
         }
+        //uiView.backgroundColor = UIColor(backgroundColor)
     }
 
     func makeCoordinator() -> Coordinator {

apps/ios/Shared/Views/Helpers/ProfileImage.swift

@@ -16,6 +16,7 @@ struct ProfileImage: View {
     var iconName: String = "person.crop.circle.fill"
     var size: CGFloat
     var color = Color(uiColor: .tertiarySystemGroupedBackground)
+    var backgroundColor: Color? = nil
     @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var radius = defaultProfileImageCorner
 
     var body: some View {
@@ -28,6 +29,7 @@ struct ProfileImage: View {
                 .resizable()
                 .foregroundColor(color)
                 .frame(width: size, height: size)
+                .background(backgroundColor != nil ? backgroundColor! : .clear)
         }
     }
 }

apps/ios/Shared/Views/Helpers/ViewModifiers.swift

@@ -0,0 +1,19 @@
+//
+//  ViewModifiers.swift
+//  SimpleX (iOS)
+//
+//  Created by Avently on 12.06.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+extension View {
+    @ViewBuilder func `if`<Content: View>(_ condition: @autoclosure () -> Bool, transform: (Self) -> Content) -> some View {
+        if condition() {
+            transform(self)
+        } else {
+            self
+        }
+    }
+}

apps/ios/Shared/Views/LocalAuth/PasscodeEntry.swift

@@ -140,7 +140,7 @@ struct PasscodeEntry: View {
             ZStack {
                 Circle()
                     .frame(width: h, height: h)
-                    .foregroundColor(Color(uiColor: .systemBackground))
+                    .foregroundColor(AppTheme.shared.colors.background)
                 label()
             }
         }

apps/ios/Shared/Views/LocalAuth/PasscodeView.swift

@@ -29,7 +29,7 @@ struct PasscodeView: View {
         }
         .padding(.horizontal, 40)
         .frame(maxWidth: .infinity, maxHeight: .infinity)
-        .background(Color(uiColor: .systemBackground))
+        .background(AppTheme.shared.colors.background)
     }
 
     private func verticalPasscodeView(_ g: GeometryProxy) -> some View {

apps/ios/Shared/Views/Migration/MigrateFromDevice.swift

@@ -53,6 +53,7 @@ private enum MigrateFromDeviceViewAlert: Identifiable {
 
 struct MigrateFromDevice: View {
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
     @Binding var showSettings: Bool
     @Binding var showProgressOnSettings: Bool
@@ -215,7 +216,7 @@ struct MigrateFromDevice: View {
             Section {
                 Button(action: { migrationState = .archiving }) {
                     settingsRow("tray.and.arrow.up") {
-                        Text("Archive and upload").foregroundColor(.accentColor)
+                        Text("Archive and upload").foregroundColor(theme.colors.primary)
                     }
                 }
             } header: {
@@ -249,7 +250,7 @@ struct MigrateFromDevice: View {
                 }
             }
             let ratio = Float(uploadedBytes) / Float(totalBytes)
-            MigrateFromDevice.largeProgressView(ratio, "\(Int(ratio * 100))%", "\(ByteCountFormatter.string(fromByteCount: uploadedBytes, countStyle: .binary)) uploaded")
+            MigrateFromDevice.largeProgressView(ratio, "\(Int(ratio * 100))%", "\(ByteCountFormatter.string(fromByteCount: uploadedBytes, countStyle: .binary)) uploaded", theme.colors.primary)
         }
         .onAppear {
             startUploading(totalBytes, archivePath)
@@ -263,7 +264,7 @@ struct MigrateFromDevice: View {
                     migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: totalBytes, fileId: 0, archivePath: archivePath, ctrl: nil)
                 }) {
                     settingsRow("tray.and.arrow.up") {
-                        Text("Repeat upload").foregroundColor(.accentColor)
+                        Text("Repeat upload").foregroundColor(theme.colors.primary)
                     }
                 }
             } header: {
@@ -299,7 +300,7 @@ struct MigrateFromDevice: View {
                 }
                 Button(action: { finishMigration(fileId, ctrl) }) {
                     settingsRow("checkmark") {
-                        Text("Finalize migration").foregroundColor(.accentColor)
+                        Text("Finalize migration").foregroundColor(theme.colors.primary)
                     }
                 }
             } footer: {
@@ -340,7 +341,7 @@ struct MigrateFromDevice: View {
                     }
                     Button(action: { alert = .deleteChat() }) {
                         settingsRow("trash.fill") {
-                            Text("Delete database from this device").foregroundColor(.accentColor)
+                            Text("Delete database from this device").foregroundColor(theme.colors.primary)
                         }
                     }
                 } header: {
@@ -379,7 +380,7 @@ struct MigrateFromDevice: View {
             .truncationMode(.middle)
     }
 
-    static func largeProgressView(_ value: Float, _ title: String, _ description: LocalizedStringKey) -> some View {
+    static func largeProgressView(_ value: Float, _ title: String, _ description: LocalizedStringKey, _ primaryColor: Color) -> some View {
         ZStack {
             VStack {
                 Text(description)
@@ -389,7 +390,7 @@ struct MigrateFromDevice: View {
                 Text(title)
                     .font(.system(size: 54))
                     .bold()
-                    .foregroundColor(.accentColor)
+                    .foregroundColor(primaryColor)
 
                 Text(description)
                     .font(.title3)
@@ -398,7 +399,7 @@ struct MigrateFromDevice: View {
             Circle()
                 .trim(from: 0, to: CGFloat(value))
                 .stroke(
-                    Color.accentColor,
+                    primaryColor,
                     style: StrokeStyle(lineWidth: 27)
                 )
                 .rotationEffect(.degrees(180))

apps/ios/Shared/Views/Migration/MigrateToDevice.swift

@@ -91,6 +91,7 @@ private enum MigrateToDeviceViewAlert: Identifiable {
 
 struct MigrateToDevice: View {
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
     @Binding var migrationState: MigrationToState?
@@ -243,7 +244,7 @@ struct MigrateToDevice: View {
                 }
             }
             let ratio = Float(downloadedBytes) / Float(max(totalBytes, 1))
-            MigrateFromDevice.largeProgressView(ratio, "\(Int(ratio * 100))%", "\(ByteCountFormatter.string(fromByteCount: downloadedBytes, countStyle: .binary)) downloaded")
+            MigrateFromDevice.largeProgressView(ratio, "\(Int(ratio * 100))%", "\(ByteCountFormatter.string(fromByteCount: downloadedBytes, countStyle: .binary)) downloaded", theme.colors.primary)
         }
     }
 
@@ -255,7 +256,7 @@ struct MigrateToDevice: View {
                     migrationState = .linkDownloading(link: link)
                 }) {
                     settingsRow("tray.and.arrow.down") {
-                        Text("Repeat download").foregroundColor(.accentColor)
+                        Text("Repeat download").foregroundColor(theme.colors.primary)
                     }
                 }
             } header: {
@@ -293,7 +294,7 @@ struct MigrateToDevice: View {
                     migrationState = .archiveImport(archivePath: archivePath)
                 }) {
                     settingsRow("square.and.arrow.down") {
-                        Text("Repeat import").foregroundColor(.accentColor)
+                        Text("Repeat import").foregroundColor(theme.colors.primary)
                     }
                 }
             } header: {
@@ -334,7 +335,7 @@ struct MigrateToDevice: View {
                         migrationState = .migration(passphrase: passphrase, confirmation: confirmation, useKeychain: useKeychain)
                     }) {
                         settingsRow("square.and.arrow.down") {
-                            Text(button).foregroundColor(.accentColor)
+                            Text(button).foregroundColor(theme.colors.primary)
                         }
                     }
                 } else {
@@ -364,6 +365,7 @@ struct MigrateToDevice: View {
     }
 
     struct OnionView: View {
+        @EnvironmentObject var theme: AppTheme
         @State var appSettings: AppSettings
         @State private var onionHosts: OnionHosts = .no
         var finishMigration: (AppSettings) -> Void
@@ -381,7 +383,7 @@ struct MigrateToDevice: View {
                         finishMigration(appSettings)
                     }) {
                         settingsRow("checkmark") {
-                            Text("Apply").foregroundColor(.accentColor)
+                            Text("Apply").foregroundColor(theme.colors.primary)
                         }
                     }
                 } header: {
@@ -475,6 +477,7 @@ struct MigrateToDevice: View {
                     chatInitControllerRemovingDatabases()
                 }
                 try await apiDeleteStorage()
+                try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
                 do {
                     let config = ArchiveConfig(archivePath: archivePath)
                     let archiveErrors = try await apiImportArchive(config: config)

apps/ios/Shared/Views/NewChat/AddContactLearnMore.swift

@@ -30,6 +30,7 @@ struct AddContactLearnMore: View {
             }
             .listRowBackground(Color.clear)
         }
+        .modifier(ThemedBackground())
     }
 }
 

apps/ios/Shared/Views/NewChat/AddGroupView.swift

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct AddGroupView: View {
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
     @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
     @State private var chat: Chat?
@@ -95,7 +96,7 @@ struct AddGroupView: View {
             Section {
                 groupNameTextField()
                 Button(action: createGroup) {
-                    settingsRow("checkmark", color: .accentColor) { Text("Create group") }
+                    settingsRow("checkmark", color: theme.colors.primary) { Text("Create group") }
                 }
                 .disabled(!canCreateProfile())
                 IncognitoToggle(incognitoEnabled: $incognitoDefault)
@@ -144,6 +145,7 @@ struct AddGroupView: View {
                 profile.image = nil
             }
         }
+        .modifier(ThemedBackground())
     }
 
     func groupNameTextField() -> some View {

apps/ios/Shared/Views/NewChat/NewChatView.swift

@@ -11,9 +11,14 @@ import SimpleXChat
 import CodeScanner
 import AVFoundation
 
-struct SomeAlert: Identifiable {
-    var alert: Alert
-    var id: String
+enum SomeAlert: Identifiable {
+    case someAlert(alert: Alert, id: String)
+
+    var id: String {
+        switch self {
+        case let .someAlert(_, id): return id
+        }
+    }
 }
 
 private enum NewChatViewAlert: Identifiable {
@@ -89,7 +94,7 @@ struct NewChatView: View {
             .background(
                 // Rectangle is needed for swipe gesture to work on mostly empty views (creatingLinkProgressView and retryButton)
                 Rectangle()
-                    .fill(Color(uiColor: .systemGroupedBackground))
+                    .fill(AppTheme.shared.colors.background)
             )
             .animation(.easeInOut(duration: 0.3333), value: selection)
             .gesture(DragGesture(minimumDistance: 20.0, coordinateSpace: .local)
@@ -108,7 +113,7 @@ struct NewChatView: View {
                 }
             )
         }
-        .background(Color(.systemGroupedBackground))
+        .modifier(ThemedBackground())
         .onChange(of: invitationUsed) { used in
             if used && !(m.showingInvitation?.connChatUsed ?? true) {
                 m.markShowingInvitationUsed()
@@ -137,8 +142,8 @@ struct NewChatView: View {
             switch(a) {
             case let .planAndConnectAlert(alert):
                 return planAndConnectAlert(alert, dismiss: true, cleanup: { pastedLink = "" })
-            case let .newChatSomeAlert(a):
-                return a.alert
+            case let .newChatSomeAlert(.someAlert(alert, _)):
+                return alert
             }
         }
     }
@@ -176,7 +181,7 @@ struct NewChatView: View {
                     await MainActor.run {
                         creatingConnReq = false
                         if let apiAlert = apiAlert {
-                            alert = .newChatSomeAlert(alert: SomeAlert(alert: apiAlert, id: "createInvitation error"))
+                            alert = .newChatSomeAlert(alert: .someAlert(alert: apiAlert, id: "createInvitation error"))
                         }
                     }
                 }
@@ -310,7 +315,7 @@ private struct ConnectView: View {
                         // showQRCodeScanner = false
                         connect(pastedLink)
                     } else {
-                        alert = .newChatSomeAlert(alert: SomeAlert(
+                        alert = .newChatSomeAlert(alert: .someAlert(
                             alert: mkAlert(title: "Invalid link", message: "The text you pasted is not a SimpleX link."),
                             id: "pasteLinkView: code is not a SimpleX link"
                         ))
@@ -333,14 +338,14 @@ private struct ConnectView: View {
             if strIsSimplexLink(r.string) {
                 connect(link)
             } else {
-                alert = .newChatSomeAlert(alert: SomeAlert(
+                alert = .newChatSomeAlert(alert: .someAlert(
                     alert: mkAlert(title: "Invalid QR code", message: "The code you scanned is not a SimpleX link QR code."),
                     id: "processQRCode: code is not a SimpleX link"
                 ))
             }
         case let .failure(e):
             logger.error("processQRCode QR code error: \(e.localizedDescription)")
-            alert = .newChatSomeAlert(alert: SomeAlert(
+            alert = .newChatSomeAlert(alert: .someAlert(
                 alert: mkAlert(title: "Invalid QR code", message: "Error scanning code: \(e.localizedDescription)"),
                 id: "processQRCode: failure"
             ))
@@ -483,6 +488,7 @@ func strHasSingleSimplexLink(_ str: String) -> FormattedText? {
 }
 
 struct IncognitoToggle: View {
+    @EnvironmentObject var theme: AppTheme
     @Binding var incognitoEnabled: Bool
     @State private var showIncognitoSheet = false
 
@@ -496,7 +502,7 @@ struct IncognitoToggle: View {
                 HStack(spacing: 6) {
                     Text("Incognito")
                     Image(systemName: "info.circle")
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                         .font(.system(size: 14))
                 }
                 .onTapGesture {

apps/ios/Shared/Views/Onboarding/CreateProfile.swift

@@ -66,6 +66,7 @@ struct CreateProfile: View {
             }
         }
         .navigationTitle("Create your profile")
+        .modifier(ThemedBackground())
         .alert(item: $alert) { a in userProfileAlert(a, $displayName) }
         .onAppear() {
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
@@ -78,6 +79,7 @@ struct CreateProfile: View {
 
 struct CreateFirstProfile: View {
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss
     @State private var displayName: String = ""
     @FocusState private var focusDisplayName
@@ -89,9 +91,9 @@ struct CreateFirstProfile: View {
                     .font(.largeTitle)
                     .bold()
                 Text("Your profile, contacts and delivered messages are stored on your device.")
-                    .foregroundColor(.secondary)
+                    .foregroundColor(theme.colors.secondary)
                 Text("The profile is only shared with your contacts.")
-                    .foregroundColor(.secondary)
+                    .foregroundColor(theme.colors.secondary)
                     .padding(.bottom)
             }
             .padding(.bottom)

apps/ios/Shared/Views/Onboarding/HowItWorks.swift

@@ -44,6 +44,7 @@ struct HowItWorks: View {
         .lineLimit(10)
         .padding()
         .frame(maxHeight: .infinity, alignment: .top)
+        .modifier(ThemedBackground())
     }
 }
 

apps/ios/Shared/Views/Onboarding/SetNotificationsMode.swift

@@ -78,6 +78,7 @@ struct SetNotificationsMode: View {
 }
 
 struct NtfModeSelector: View {
+    @EnvironmentObject var theme: AppTheme
     var mode: NotificationsMode
     @Binding var selection: NotificationsMode
     @State private var tapped = false
@@ -87,7 +88,7 @@ struct NtfModeSelector: View {
             VStack(alignment: .leading, spacing: 4) {
                 Text(mode.label)
                     .font(.headline)
-                    .foregroundColor(selection == mode ? .accentColor : .secondary)
+                    .foregroundColor(selection == mode ? theme.colors.primary : theme.colors.secondary)
                 Text(ntfModeDescription(mode))
                     .lineLimit(10)
                     .font(.subheadline)
@@ -95,11 +96,11 @@ struct NtfModeSelector: View {
             .padding(12)
         }
         .frame(maxWidth: .infinity, alignment: .leading)
-        .background(Color(uiColor: tapped ? .secondarySystemFill : .systemBackground))
+        .background(tapped ? Color(uiColor: .secondarySystemFill) : theme.colors.background)
         .clipShape(RoundedRectangle(cornerRadius: 18))
         .overlay(
             RoundedRectangle(cornerRadius: 18)
-                .stroke(selection == mode ? Color.accentColor : Color(uiColor: .secondarySystemFill), lineWidth: 2)
+                .stroke(selection == mode ? theme.colors.primary : Color(uiColor: .secondarySystemFill), lineWidth: 2)
         )
         ._onButtonGesture { down in
             tapped = down

apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift

@@ -79,7 +79,7 @@ struct SimpleXInfo: View {
                         MigrateToDevice(migrationState: $m.migrationState)
                     }
                     .navigationTitle("Migrate here")
-                    .background(colorScheme == .light ? Color(uiColor: .tertiarySystemGroupedBackground) : .clear)
+                    .modifier(ThemedBackground())
                 }
             }
             .sheet(isPresented: $showHowItWorks) {

apps/ios/Shared/Views/RemoteAccess/ConnectDesktopView.swift

@@ -178,6 +178,7 @@ struct ConnectDesktopView: View {
             }
         }
         .navigationTitle("Connect to desktop")
+        .modifier(ThemedBackground())
     }
 
     private func connectingDesktopView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo?) -> some View {
@@ -202,6 +203,7 @@ struct ConnectDesktopView: View {
 
             ProgressView().scaleEffect(2)
         }
+        .modifier(ThemedBackground())
     }
 
     private func searchingDesktopView() -> some View {
@@ -219,6 +221,7 @@ struct ConnectDesktopView: View {
             }
         }
         .navigationTitle("Connecting to desktop")
+        .modifier(ThemedBackground())
     }
 
     @ViewBuilder private func foundDesktopView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo, _ compatible: Bool) -> some View {
@@ -246,6 +249,7 @@ struct ConnectDesktopView: View {
             }
         }
         .navigationTitle("Found desktop")
+        .modifier(ThemedBackground())
 
         if compatible && connectRemoteViaMulticastAuto {
             v.onAppear { confirmKnownDesktop(rc) }
@@ -275,6 +279,7 @@ struct ConnectDesktopView: View {
             }
         }
         .navigationTitle("Verify connection")
+        .modifier(ThemedBackground())
     }
 
     private func ctrlDeviceNameText(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo?) -> Text {
@@ -315,6 +320,7 @@ struct ConnectDesktopView: View {
             }
         }
         .navigationTitle("Connected to desktop")
+        .modifier(ThemedBackground())
     }
 
     private func sessionCodeText(_ code: String) -> some View {
@@ -333,7 +339,7 @@ struct ConnectDesktopView: View {
             }
         }
     }
-    
+
     private func scanDesctopAddressView() -> some View {
         Section("Scan QR code from desktop") {
             ScannerInView(showQRCodeScanner: $showQRCodeScanner,  processQRCode: processDesktopQRCode, scanMode: .oncePerCode)
@@ -389,6 +395,7 @@ struct ConnectDesktopView: View {
             }
         }
         .navigationTitle("Linked desktops")
+        .modifier(ThemedBackground())
     }
 
     private func remoteCtrlView(_ rc: RemoteCtrlInfo) -> some View {

apps/ios/Shared/Views/TerminalView.swift

@@ -106,6 +106,7 @@ struct TerminalView: View {
         }
         .navigationViewStyle(.stack)
         .navigationTitle("Chat console")
+        .modifier(ThemedBackground())
     }
 
     func scrollToBottom(_ proxy: ScrollViewProxy, animation: Animation = .default) {
@@ -130,6 +131,7 @@ struct TerminalView: View {
             }
         }
         .onDisappear { terminalItem = nil }
+        .modifier(ThemedBackground())
     }
     
     func consoleSendMessage() {

apps/ios/Shared/Views/UserSettings/AppSettings.swift

@@ -44,6 +44,11 @@ extension AppSettings {
         if let val = androidCallOnLockScreen { def.setValue(val.rawValue, forKey: ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN) }
         if let val = iosCallKitEnabled { callKitEnabledGroupDefault.set(val) }
         if let val = iosCallKitCallsInRecents { def.setValue(val, forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS) }
+        if let val = uiProfileImageCornerRadius { def.setValue(val, forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) }
+        if let val = uiColorScheme { def.setValue(val, forKey: DEFAULT_CURRENT_THEME) }
+        if let val = uiDarkColorScheme { def.setValue(val, forKey: DEFAULT_SYSTEM_DARK_THEME) }
+        if let val = uiCurrentThemeIds { def.setValue(val, forKey: DEFAULT_CURRENT_THEME_IDS) }
+        if let val = uiThemes { def.setValue(val.skipDuplicates(), forKey: DEFAULT_THEME_OVERRIDES) }
     }
 
     public static var current: AppSettings {
@@ -69,6 +74,11 @@ extension AppSettings {
         c.androidCallOnLockScreen = AppSettingsLockScreenCalls(rawValue: def.string(forKey: ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN)!)
         c.iosCallKitEnabled = callKitEnabledGroupDefault.get()
         c.iosCallKitCallsInRecents = def.bool(forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS)
+        c.uiProfileImageCornerRadius = def.float(forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS)
+        c.uiColorScheme = currentThemeDefault.get()
+        c.uiDarkColorScheme = systemDarkThemeDefault.get()
+        c.uiCurrentThemeIds = currentThemeIdsDefault.get()
+        c.uiThemes = themeOverridesDefault.get()
         return c
     }
 }

apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift

@@ -7,12 +7,17 @@
 //
 
 import SwiftUI
+import SimpleXChat
 
 let defaultAccentColor = CGColor.init(red: 0, green: 0.533, blue: 1, alpha: 1)
 
-let interfaceStyles: [UIUserInterfaceStyle] = [.unspecified, .light, .dark]
+//let interfaceStyles: [UIUserInterfaceStyle] = [.unspecified, .light, .dark]
 
-let interfaceStyleNames: [LocalizedStringKey] = ["System", "Light", "Dark"]
+let colorModesLocalized: [LocalizedStringKey] = ["System", "Light", "Dark"]
+let colorModesNames: [DefaultThemeMode?] = [nil, DefaultThemeMode.light, DefaultThemeMode.dark]
+
+let darkThemesLocalized: [LocalizedStringKey] = ["Dark", "SimpleX", "Black"]
+let darkThemesNames: [String] = [DefaultTheme.DARK.themeName, DefaultTheme.SIMPLEX.themeName, DefaultTheme.BLACK.themeName]
 
 let appSettingsURL = URL(string: UIApplication.openSettingsURLString)!
 
@@ -22,7 +27,11 @@ struct AppearanceSettings: View {
     @EnvironmentObject var sceneDelegate: SceneDelegate
     @State private var iconLightTapped = false
     @State private var iconDarkTapped = false
-    @State private var userInterfaceStyle = getUserInterfaceStyleDefault()
+    //@State private var userInterfaceStyle = getUserInterfaceStyleDefault()
+    @State private var colorMode: DefaultThemeMode? = {
+        if currentThemeDefault.get() == DefaultTheme.SYSTEM_THEME_NAME { nil as DefaultThemeMode? } else { CurrentColors.base.mode }
+    }()
+    @State private var darkModeTheme: String = UserDefaults.standard.string(forKey: DEFAULT_SYSTEM_DARK_THEME) ?? DefaultTheme.SIMPLEX.themeName
     @State private var uiTintColor = getUIAccentColorDefault()
     @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var profileImageCornerRadius = defaultProfileImageCorner
 
@@ -65,9 +74,15 @@ struct AppearanceSettings: View {
                 }
 
                 Section {
-                    Picker("Theme", selection: $userInterfaceStyle) {
-                        ForEach(interfaceStyles, id: \.self) { style in
-                            Text(interfaceStyleNames[interfaceStyles.firstIndex(of: style) ?? 0])
+                    Picker("Color mode", selection: $colorMode) {
+                        ForEach(Array(colorModesNames.enumerated()), id: \.element) { index, mode in
+                            Text(colorModesLocalized[index])
+                        }
+                    }
+                    .frame(height: 36)
+                    Picker("Dark mode colors", selection: $darkModeTheme) {
+                        ForEach(Array(darkThemesNames.enumerated()), id: \.element) { index, darkTheme in
+                            Text(darkThemesLocalized[index])
                         }
                     }
                     .frame(height: 36)
@@ -82,9 +97,24 @@ struct AppearanceSettings: View {
                         Text("Reset colors").font(.callout)
                     }
                 }
-                .onChange(of: userInterfaceStyle) { _ in
-                    sceneDelegate.window?.overrideUserInterfaceStyle = userInterfaceStyle
-                    setUserInterfaceStyleDefault(userInterfaceStyle)
+                .onChange(of: colorMode) { mode in
+                    guard let mode else {
+                        ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
+                        return
+                    }
+                    if case DefaultThemeMode.light = mode {
+                        ThemeManager.applyTheme(DefaultTheme.LIGHT.themeName)
+                    } else if case DefaultThemeMode.dark = mode {
+                        ThemeManager.applyTheme(systemDarkThemeDefault.get())
+                    }
+                }
+                .onChange(of: darkModeTheme) { darkTheme in
+                    ThemeManager.changeDarkTheme(darkTheme)
+                    if currentThemeDefault.get() == DefaultTheme.SYSTEM_THEME_NAME {
+                        ThemeManager.applyTheme(currentThemeDefault.get())
+                    } else if currentThemeDefault.get() != DefaultTheme.LIGHT.themeName {
+                        ThemeManager.applyTheme(systemDarkThemeDefault.get())
+                    }
                 }
                 .onChange(of: uiTintColor) { _ in
                     sceneDelegate.window?.tintColor = UIColor(cgColor: uiTintColor)
@@ -136,24 +166,24 @@ func setUIAccentColorDefault(_ color: CGColor) {
     }
 }
 
-func getUserInterfaceStyleDefault() -> UIUserInterfaceStyle {
-    switch UserDefaults.standard.integer(forKey: DEFAULT_USER_INTERFACE_STYLE) {
-    case 1: return .light
-    case 2: return .dark
-    default: return .unspecified
-    }
-}
-
-func setUserInterfaceStyleDefault(_ style: UIUserInterfaceStyle) {
-    var v: Int
-    switch style {
-    case .unspecified: v = 0
-    case .light: v = 1
-    case .dark: v = 2
-    default: v = 0
-    }
-    UserDefaults.standard.set(v, forKey: DEFAULT_USER_INTERFACE_STYLE)
-}
+//func getUserInterfaceStyleDefault() -> UIUserInterfaceStyle {
+//    switch UserDefaults.standard.integer(forKey: DEFAULT_USER_INTERFACE_STYLE) {
+//    case 1: return .light
+//    case 2: return .dark
+//    default: return .unspecified
+//    }
+//}
+//
+//func setUserInterfaceStyleDefault(_ style: UIUserInterfaceStyle) {
+//    var v: Int
+//    switch style {
+//    case .unspecified: v = 0
+//    case .light: v = 1
+//    case .dark: v = 2
+//    default: v = 0
+//    }
+//    UserDefaults.standard.set(v, forKey: DEFAULT_USER_INTERFACE_STYLE)
+//}
 
 struct AppearanceSettings_Previews: PreviewProvider {
     static var previews: some View {

apps/ios/Shared/Views/UserSettings/CallSettings.swift

@@ -22,6 +22,7 @@ struct CallSettings: View {
                     NavigationLink {
                         RTCServers()
                             .navigationTitle("Your ICE servers")
+                            .modifier(ThemedBackground())
                     } label: {
                         Text("WebRTC ICE servers")
                     }

apps/ios/Shared/Views/UserSettings/HiddenProfileView.swift

@@ -70,6 +70,7 @@ struct HiddenProfileView: View {
                 message: Text(savePasswordError ?? "")
             )
         }
+        .modifier(ThemedBackground())
     }
 
     var passwordValid: Bool { hidePassword == hidePassword.trimmingCharacters(in: .whitespaces) }

apps/ios/Shared/Views/UserSettings/IncognitoHelp.swift

@@ -27,6 +27,7 @@ struct IncognitoHelp: View {
             }
             .listRowBackground(Color.clear)
         }
+        .modifier(ThemedBackground())
     }
 }
 

apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift

@@ -47,6 +47,7 @@ struct NetworkAndServers: View {
                     NavigationLink {
                         ProtocolServersView(serverProtocol: .smp)
                             .navigationTitle("Your SMP servers")
+                            .modifier(ThemedBackground())
                     } label: {
                         Text("SMP servers")
                     }
@@ -54,6 +55,7 @@ struct NetworkAndServers: View {
                     NavigationLink {
                         ProtocolServersView(serverProtocol: .xftp)
                             .navigationTitle("Your XFTP servers")
+                            .modifier(ThemedBackground())
                     } label: {
                         Text("XFTP servers")
                     }
@@ -73,6 +75,7 @@ struct NetworkAndServers: View {
                     NavigationLink {
                         AdvancedNetworkSettings()
                             .navigationTitle("Network settings")
+                            .modifier(ThemedBackground())
                     } label: {
                         Text("Advanced network settings")
                     }
@@ -110,6 +113,7 @@ struct NetworkAndServers: View {
                     NavigationLink {
                         RTCServers()
                             .navigationTitle("Your ICE servers")
+                            .modifier(ThemedBackground())
                     } label: {
                         Text("WebRTC ICE servers")
                     }

apps/ios/Shared/Views/UserSettings/NotificationsView.swift

@@ -33,6 +33,7 @@ struct NotificationsView: View {
                         }
                     }
                     .navigationTitle("Send notifications")
+                    .modifier(ThemedBackground())
                     .navigationBarTitleDisplayMode(.inline)
                     .alert(item: $showAlert) { alert in
                         if let token = m.deviceToken {
@@ -68,6 +69,7 @@ struct NotificationsView: View {
                         }
                     }
                     .navigationTitle("Show preview")
+                    .modifier(ThemedBackground())
                     .navigationBarTitleDisplayMode(.inline)
                 } label: {
                     HStack {
@@ -172,6 +174,7 @@ func ntfModeDescription(_ mode: NotificationsMode) -> LocalizedStringKey {
 }
 
 struct SelectionListView<Item: SelectableItem>: View {
+    @EnvironmentObject var theme: AppTheme
     var list: [Item]
     @Binding var selection: Item
     var onSelection: ((Item) -> Void)?
@@ -185,11 +188,11 @@ struct SelectionListView<Item: SelectableItem>: View {
                 if selection == item {
                     Image(systemName: "checkmark")
                         .resizable().scaledToFit().frame(width: 16)
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                 }
             }
             .contentShape(Rectangle())
-            .listRowBackground(Color(uiColor: tapped == item ? .secondarySystemFill : .systemBackground))
+            .listRowBackground(tapped == item ? Color(uiColor: .secondarySystemFill) : theme.colors.background)
             .onTapGesture {
                 if selection == item { return }
                 if let f = onSelection {

apps/ios/Shared/Views/UserSettings/PrivacySettings.swift

@@ -48,6 +48,7 @@ struct PrivacySettings: View {
                     NavigationLink {
                         SimplexLockView(prefPerformLA: $prefPerformLA, currentLAMode: $currentLAMode)
                             .navigationTitle("SimpleX Lock")
+                            .modifier(ThemedBackground())
                     } label: {
                         if prefPerformLA {
                             settingsRow("lock.fill", color: .green) {
@@ -332,6 +333,7 @@ struct SimplexLockView: View {
     @Binding var prefPerformLA: Bool
     @Binding var currentLAMode: LAMode
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     @AppStorage(DEFAULT_LA_NOTICE_SHOWN) private var prefLANoticeShown = false
     @State private var laMode: LAMode = privacyLocalAuthModeDefault.get()
     @AppStorage(DEFAULT_LA_LOCK_DELAY) private var laLockDelay = 30
@@ -416,7 +418,7 @@ struct SimplexLockView: View {
                             HStack(spacing: 6) {
                                 Text("Enable self-destruct")
                                 Image(systemName: "info.circle")
-                                    .foregroundColor(.accentColor)
+                                    .foregroundColor(theme.colors.primary)
                                     .font(.system(size: 14))
                             }
                             .onTapGesture {

apps/ios/Shared/Views/UserSettings/ProtocolServerView.swift

@@ -14,7 +14,6 @@ struct ProtocolServerView: View {
     let serverProtocol: ServerProtocol
     @Binding var server: ServerCfg
     @State var serverToEdit: ServerCfg
-    @State var serverEnabled: Bool
     @State private var showTestFailure = false
     @State private var testing = false
     @State private var testFailure: ProtocolTestFailure?
@@ -111,10 +110,7 @@ struct ProtocolServerView: View {
                 Spacer()
                 showTestStatus(server: serverToEdit)
             }
-            Toggle("Use for new connections", isOn: $serverEnabled)
-                .onChange(of: serverEnabled) { enabled in
-                    serverToEdit.enabled = enabled ? .enabled : .disabled
-                }
+            Toggle("Use for new connections", isOn: $serverToEdit.enabled)
         }
     }
 }
@@ -183,8 +179,7 @@ struct ProtocolServerView_Previews: PreviewProvider {
         ProtocolServerView(
             serverProtocol: .smp,
             server: Binding.constant(ServerCfg.sampleData.custom),
-            serverToEdit: ServerCfg.sampleData.custom,
-            serverEnabled: true
+            serverToEdit: ServerCfg.sampleData.custom
         )
     }
 }

apps/ios/Shared/Views/UserSettings/ProtocolServersView.swift

@@ -94,6 +94,7 @@ struct ProtocolServersView: View {
         }
         .sheet(isPresented: $showScanProtoServer) {
             ScanProtocolServer(servers: $servers)
+            .modifier(ThemedBackground())
         }
         .modifier(BackButton(disabled: Binding.constant(false)) {
             if saveDisabled {
@@ -159,7 +160,7 @@ struct ProtocolServersView: View {
     }
 
     private var allServersDisabled: Bool {
-        servers.allSatisfy { $0.enabled != .enabled }
+        servers.allSatisfy { !$0.enabled }
     }
 
     private func protocolServerView(_ server: Binding<ServerCfg>) -> some View {
@@ -168,10 +169,10 @@ struct ProtocolServersView: View {
             ProtocolServerView(
                 serverProtocol: serverProtocol,
                 server: server,
-                serverToEdit: srv,
-                serverEnabled: srv.enabled == .enabled
+                serverToEdit: srv
             )
             .navigationBarTitle(srv.preset ? "Preset server" : "Your server")
+            .modifier(ThemedBackground())
             .navigationBarTitleDisplayMode(.large)
         } label: {
             let address = parseServerAddress(srv.server)
@@ -182,7 +183,7 @@ struct ProtocolServersView: View {
                             invalidServer()
                         } else if !uniqueAddress(srv, address) {
                             Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                        } else if srv.enabled != .enabled {
+                        } else if !srv.enabled {
                             Image(systemName: "slash.circle").foregroundColor(.secondary)
                         } else {
                             showTestStatus(server: srv)
@@ -195,7 +196,7 @@ struct ProtocolServersView: View {
                 .padding(.trailing, 4)
 
                 let v = Text(address?.hostnames.first ?? srv.server).lineLimit(1)
-                if srv.enabled == .enabled {
+                if srv.enabled {
                     v
                 } else {
                     v.foregroundColor(.secondary)
@@ -236,7 +237,7 @@ struct ProtocolServersView: View {
     private func addAllPresets() {
         for srv in presetServers {
             if !hasPreset(srv) {
-                servers.append(ServerCfg(server: srv, preset: true, tested: nil, enabled: .enabled))
+                servers.append(ServerCfg(server: srv, preset: true, tested: nil, enabled: true))
             }
         }
     }
@@ -261,7 +262,7 @@ struct ProtocolServersView: View {
 
     private func resetTestStatus() {
         for i in 0..<servers.count {
-            if servers[i].enabled == .enabled {
+            if servers[i].enabled {
                 servers[i].tested = nil
             }
         }
@@ -270,7 +271,7 @@ struct ProtocolServersView: View {
     private func runServersTest() async -> [String: ProtocolTestFailure] {
         var fs: [String: ProtocolTestFailure] = [:]
         for i in 0..<servers.count {
-            if servers[i].enabled == .enabled {
+            if servers[i].enabled {
                 if let f = await testServerConnection(server: $servers[i]) {
                     fs[serverHostname(servers[i].server)] = f
                 }

apps/ios/Shared/Views/UserSettings/ScanProtocolServer.swift

@@ -40,7 +40,7 @@ struct ScanProtocolServer: View {
         switch resp {
         case let .success(r):
             if parseServerAddress(r.string) != nil {
-                servers.append(ServerCfg(server: r.string, preset: false, tested: nil, enabled: .enabled))
+                servers.append(ServerCfg(server: r.string, preset: false, tested: nil, enabled: true))
                 dismiss()
             } else {
                 showAddressError = true

apps/ios/Shared/Views/UserSettings/SetDeliveryReceiptsView.swift

@@ -89,7 +89,7 @@ struct SetDeliveryReceiptsView: View {
         .padding()
         .padding(.horizontal)
         .frame(maxWidth: .infinity, maxHeight: .infinity)
-        .background(Color(uiColor: .systemBackground))
+        .background(AppTheme.shared.colors.background)
     }
 }
 

apps/ios/Shared/Views/UserSettings/SettingsView.swift

@@ -44,7 +44,7 @@ let DEFAULT_ENCRYPTION_STARTED_AT = "encryptionStartedAt"
 let DEFAULT_ACCENT_COLOR_RED = "accentColorRed"
 let DEFAULT_ACCENT_COLOR_GREEN = "accentColorGreen"
 let DEFAULT_ACCENT_COLOR_BLUE = "accentColorBlue"
-let DEFAULT_USER_INTERFACE_STYLE = "userInterfaceStyle"
+//let DEFAULT_USER_INTERFACE_STYLE = "userInterfaceStyle"
 let DEFAULT_PROFILE_IMAGE_CORNER_RADIUS = "profileImageCornerRadius"
 let DEFAULT_CONNECT_VIA_LINK_TAB = "connectViaLinkTab"
 let DEFAULT_LIVE_MESSAGE_ALERT_SHOWN = "liveMessageAlertShown"
@@ -62,6 +62,11 @@ let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST = "connectRemoteViaMulticast"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "connectRemoteViaMulticastAuto"
 let DEFAULT_SHOW_SENT_VIA_RPOXY = "showSentViaProxy"
 
+let DEFAULT_CURRENT_THEME = "currentTheme"
+let DEFAULT_SYSTEM_DARK_THEME = "systemDarkTheme"
+let DEFAULT_CURRENT_THEME_IDS = "currentThemeIds"
+let DEFAULT_THEME_OVERRIDES = "themeOverrides"
+
 let ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN = "androidCallOnLockScreen"
 
 let appDefaults: [String: Any] = [
@@ -88,7 +93,7 @@ let appDefaults: [String: Any] = [
     DEFAULT_ACCENT_COLOR_RED: 0.000,
     DEFAULT_ACCENT_COLOR_GREEN: 0.533,
     DEFAULT_ACCENT_COLOR_BLUE: 1.000,
-    DEFAULT_USER_INTERFACE_STYLE: 0,
+    //DEFAULT_USER_INTERFACE_STYLE: 0,
     DEFAULT_PROFILE_IMAGE_CORNER_RADIUS: defaultProfileImageCorner,
     DEFAULT_CONNECT_VIA_LINK_TAB: ConnectViaLinkTab.scan.rawValue,
     DEFAULT_LIVE_MESSAGE_ALERT_SHOWN: false,
@@ -101,7 +106,12 @@ let appDefaults: [String: Any] = [
     DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: true,
     DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO: true,
     DEFAULT_SHOW_SENT_VIA_RPOXY: false,
-    ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN: AppSettingsLockScreenCalls.show.rawValue
+    ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN: AppSettingsLockScreenCalls.show.rawValue,
+
+    DEFAULT_THEME_OVERRIDES: "{}",
+    DEFAULT_CURRENT_THEME: DefaultTheme.SYSTEM_THEME_NAME,
+    DEFAULT_SYSTEM_DARK_THEME: DefaultTheme.SIMPLEX.themeName,
+    DEFAULT_CURRENT_THEME_IDS: "{}"
 ]
 
 // not used anymore
@@ -148,14 +158,66 @@ let onboardingStageDefault = EnumDefault<OnboardingStage>(defaults: UserDefaults
 
 let customDisappearingMessageTimeDefault = IntDefault(defaults: UserDefaults.standard, forKey: DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME)
 
+let currentThemeDefault = StringDefault(defaults: UserDefaults.standard, forKey: DEFAULT_CURRENT_THEME, withDefault: DefaultTheme.SYSTEM_THEME_NAME)
+let systemDarkThemeDefault = StringDefault(defaults: UserDefaults.standard, forKey: DEFAULT_SYSTEM_DARK_THEME, withDefault: DefaultTheme.SIMPLEX.themeName)
+let currentThemeIdsDefault = CodableDefault<[String: String]>(defaults: UserDefaults.standard, forKey: DEFAULT_CURRENT_THEME_IDS, withDefault: [:] )
+let themeOverridesDefault: CodableDefault<[ThemeOverrides]> = CodableDefault(defaults: UserDefaults.standard, forKey: DEFAULT_THEME_OVERRIDES, withDefault: [])
+
 func setGroupDefaults() {
     privacyAcceptImagesGroupDefault.set(UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_ACCEPT_IMAGES))
 }
 
+public class StringDefault {
+    var defaults: UserDefaults
+    var key: String
+    var defaultValue: String
+
+    public init(defaults: UserDefaults = UserDefaults.standard, forKey: String, withDefault: String) {
+        self.defaults = defaults
+        self.key = forKey
+        self.defaultValue = withDefault
+    }
+
+    public func get() -> String {
+        defaults.string(forKey: key) ?? defaultValue
+    }
+
+    public func set(_ value: String) {
+        defaults.set(value, forKey: key)
+        defaults.synchronize()
+    }
+}
+
+public class CodableDefault<T: Codable> {
+    var defaults: UserDefaults
+    var key: String
+    var defaultValue: T
+
+    public init(defaults: UserDefaults = UserDefaults.standard, forKey: String, withDefault: T) {
+        self.defaults = defaults
+        self.key = forKey
+        self.defaultValue = withDefault
+    }
+
+    public func get() -> T {
+        if let value = defaults.string(forKey: key) {
+            return decodeJSON(value) ?? defaultValue
+        }
+        return defaultValue
+    }
+
+    public func set(_ value: T) {
+        defaults.set(encodeJSON(value), forKey: key)
+        defaults.synchronize()
+    }
+}
+
+
 struct SettingsView: View {
     @Environment(\.colorScheme) var colorScheme
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var sceneDelegate: SceneDelegate
+    @EnvironmentObject var theme: AppTheme
     @Binding var showSettings: Bool
     @State private var showProgress: Bool = false
 
@@ -180,6 +242,7 @@ struct SettingsView: View {
                         NavigationLink {
                             UserProfile()
                                 .navigationTitle("Your current profile")
+                                .modifier(ThemedBackground())
                         } label: {
                             ProfilePreview(profileOf: user)
                                 .padding(.leading, -8)
@@ -197,6 +260,7 @@ struct SettingsView: View {
                         NavigationLink {
                             UserAddressView(shareViaProfile: user.addressShared)
                                 .navigationTitle("SimpleX address")
+                                .modifier(ThemedBackground())
                                 .navigationBarTitleDisplayMode(.large)
                         } label: {
                             settingsRow("qrcode") { Text("Your SimpleX address") }
@@ -205,6 +269,7 @@ struct SettingsView: View {
                         NavigationLink {
                             PreferencesView(profile: user.profile, preferences: user.fullPreferences, currentPreferences: user.fullPreferences)
                                 .navigationTitle("Your preferences")
+                                .modifier(ThemedBackground())
                         } label: {
                             settingsRow("switch.2") { Text("Chat preferences") }
                         }
@@ -219,6 +284,7 @@ struct SettingsView: View {
                     NavigationLink {
                         MigrateFromDevice(showSettings: $showSettings, showProgressOnSettings: $showProgress)
                             .navigationTitle("Migrate device")
+                            .modifier(ThemedBackground())
                             .navigationBarTitleDisplayMode(.large)
                     } label: {
                         settingsRow("tray.and.arrow.up") { Text("Migrate to another device") }
@@ -230,6 +296,7 @@ struct SettingsView: View {
                     NavigationLink {
                         NotificationsView()
                             .navigationTitle("Notifications")
+                            .modifier(ThemedBackground())
                     } label: {
                         HStack {
                             notificationsIcon()
@@ -241,6 +308,7 @@ struct SettingsView: View {
                     NavigationLink {
                         NetworkAndServers()
                             .navigationTitle("Network & servers")
+                            .modifier(ThemedBackground())
                     } label: {
                         settingsRow("externaldrive.connected.to.line.below") { Text("Network & servers") }
                     }
@@ -249,6 +317,7 @@ struct SettingsView: View {
                     NavigationLink {
                         CallSettings()
                             .navigationTitle("Your calls")
+                            .modifier(ThemedBackground())
                     } label: {
                         settingsRow("video") { Text("Audio & video calls") }
                     }
@@ -257,6 +326,7 @@ struct SettingsView: View {
                     NavigationLink {
                         PrivacySettings()
                             .navigationTitle("Your privacy")
+                            .modifier(ThemedBackground())
                     } label: {
                         settingsRow("lock") { Text("Privacy & security") }
                     }
@@ -266,6 +336,7 @@ struct SettingsView: View {
                         NavigationLink {
                             AppearanceSettings()
                                 .navigationTitle("Appearance")
+                                .modifier(ThemedBackground())
                         } label: {
                             settingsRow("sun.max") { Text("Appearance") }
                         }
@@ -280,6 +351,7 @@ struct SettingsView: View {
                         NavigationLink {
                             ChatHelp(showSettings: $showSettings)
                                 .navigationTitle("Welcome \(user.displayName)!")
+                                .modifier(ThemedBackground())
                                 .frame(maxHeight: .infinity, alignment: .top)
                         } label: {
                             settingsRow("questionmark") { Text("How to use it") }
@@ -287,6 +359,7 @@ struct SettingsView: View {
                     }
                     NavigationLink {
                         WhatsNewView(viaSettings: true)
+                            .modifier(ThemedBackground())
                             .navigationBarTitleDisplayMode(.inline)
                     } label: {
                         settingsRow("plus") { Text("What's new") }
@@ -294,6 +367,7 @@ struct SettingsView: View {
                     NavigationLink {
                         SimpleXInfo(onboarding: false)
                             .navigationBarTitle("", displayMode: .inline)
+                            .modifier(ThemedBackground())
                             .frame(maxHeight: .infinity, alignment: .top)
                     } label: {
                         settingsRow("info") { Text("About SimpleX Chat") }
@@ -333,18 +407,21 @@ struct SettingsView: View {
                     NavigationLink {
                         DeveloperView()
                             .navigationTitle("Developer tools")
+                            .modifier(ThemedBackground())
                     } label: {
                         settingsRow("chevron.left.forwardslash.chevron.right") { Text("Developer tools") }
                     }
                     NavigationLink {
                         VersionView()
                             .navigationBarTitle("App version")
+                            .modifier(ThemedBackground())
                     } label: {
                         Text("v\(appVersion ?? "?") (\(appBuild ?? "?"))")
                     }
                 }
             }
             .navigationTitle("Your settings")
+            .modifier(ThemedBackground())
         }
         .onDisappear {
             chatModel.showingTerminal = false
@@ -356,6 +433,7 @@ struct SettingsView: View {
         NavigationLink {
             DatabaseView(showSettings: $showSettings, chatItemTTL: chatModel.chatItemTTL)
                 .navigationTitle("Your chat database")
+                .modifier(ThemedBackground())
         } label: {
             let color: Color = chatModel.chatDbEncrypted == false ? .orange : .secondary
             settingsRow("internaldrive", color: color) {

apps/ios/Shared/Views/UserSettings/UserAddressView.swift

@@ -300,6 +300,7 @@ struct UserAddressView: View {
         NavigationLink {
             UserAddressLearnMore()
                 .navigationTitle("SimpleX address")
+                .modifier(ThemedBackground())
                 .navigationBarTitleDisplayMode(.large)
         } label: {
             settingsRow("info.circle") {

apps/ios/Shared/Views/UserSettings/UserProfilesView.swift

@@ -8,6 +8,7 @@ import SimpleXChat
 
 struct UserProfilesView: View {
     @EnvironmentObject private var m: ChatModel
+    @EnvironmentObject private var theme: AppTheme
     @Binding var showSettings: Bool
     @Environment(\.editMode) private var editMode
     @AppStorage(DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE) private var showHiddenProfilesNotice = true
@@ -111,6 +112,7 @@ struct UserProfilesView: View {
             }
         }
         .navigationTitle("Your chat profiles")
+        .modifier(ThemedBackground())
         .searchable(text: $searchTextOrPassword, placement: .navigationBarDrawer(displayMode: .always))
         .autocorrectionDisabled(true)
         .textInputAutocapitalization(.never)
@@ -237,6 +239,7 @@ struct UserProfilesView: View {
                 }
             }
         }
+        .modifier(ThemedBackground())
     }
 
     @ViewBuilder func actionHeader(_ title: LocalizedStringKey, _ user: User) -> some View {
@@ -356,7 +359,7 @@ struct UserProfilesView: View {
                         }
                     }
                 }
-                .tint(.accentColor)
+                .tint(theme.colors.primary)
             }
         }
         if #available(iOS 16, *) {

apps/ios/SimpleX NSE/NotificationService.swift

@@ -439,8 +439,7 @@ func doStartChat() -> DBMigrationResult? {
         logger.debug("NotificationService active user \(String(describing: user))")
         do {
             try setNetworkConfig(networkConfig)
-            try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
-            try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
+            try apiSetAppFilePaths(filesFolder: getAppFilesDirectory().path, tempFolder: getTempFilesDirectory().path, assetsFolder: getWallpaperDirectory().deletingLastPathComponent().path)
             try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
             // prevent suspension while starting chat
             suspendLock.wait()
@@ -660,14 +659,8 @@ func apiSuspendChat(timeoutMicroseconds: Int) -> Bool {
     return false
 }
 
-func apiSetTempFolder(tempFolder: String) throws {
-    let r = sendSimpleXCmd(.setTempFolder(tempFolder: tempFolder))
-    if case .cmdOk = r { return }
-    throw r
-}
-
-func apiSetFilesFolder(filesFolder: String) throws {
-    let r = sendSimpleXCmd(.setFilesFolder(filesFolder: filesFolder))
+func apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String) throws {
+    let r = sendSimpleXCmd(.apiSetAppFilePaths(filesFolder: filesFolder, tempFolder: tempFolder, assetsFolder: assetsFolder))
     if case .cmdOk = r { return }
     throw r
 }

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -24,6 +24,11 @@
 		5C029EAA283942EA004A9677 /* CallController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C029EA9283942EA004A9677 /* CallController.swift */; };
 		5C05DF532840AA1D00C683F9 /* CallSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C05DF522840AA1D00C683F9 /* CallSettings.swift */; };
 		5C063D2727A4564100AEC577 /* ChatPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C063D2627A4564100AEC577 /* ChatPreviewView.swift */; };
+		5C0EA13B2C0B176B00AD2E5E /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0EA1362C0B176B00AD2E5E /* libgmp.a */; };
+		5C0EA13C2C0B176B00AD2E5E /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0EA1372C0B176B00AD2E5E /* libgmpxx.a */; };
+		5C0EA13D2C0B176B00AD2E5E /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0EA1382C0B176B00AD2E5E /* libffi.a */; };
+		5C0EA13E2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0EA1392C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc-ghc9.6.3.a */; };
+		5C0EA13F2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0EA13A2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc.a */; };
 		5C10D88828EED12E00E58BF0 /* ContactConnectionInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C10D88728EED12E00E58BF0 /* ContactConnectionInfo.swift */; };
 		5C10D88A28F187F300E58BF0 /* FullScreenMediaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C10D88928F187F300E58BF0 /* FullScreenMediaView.swift */; };
 		5C116CDC27AABE0400E66D01 /* ContactRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C116CDB27AABE0400E66D01 /* ContactRequestView.swift */; };
@@ -181,8 +186,15 @@
 		64F1CC3B28B39D8600CD1FB1 /* IncognitoHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */; };
 		8C05382E2B39887E006436DC /* VideoUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C05382D2B39887E006436DC /* VideoUtils.swift */; };
 		8C69FE7D2B8C7D2700267E38 /* AppSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C69FE7C2B8C7D2700267E38 /* AppSettings.swift */; };
+		8C74C3E52C1B900600039E77 /* ThemeTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C7E3CE32C0DEAC400BFF63A /* ThemeTypes.swift */; };
+		8C74C3E72C1B901900039E77 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C852B072C1086D100BA61E8 /* Color.swift */; };
+		8C74C3E82C1B905B00039E77 /* ChatWallpaperTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C804B1D2C11F966007A63C8 /* ChatWallpaperTypes.swift */; };
+		8C74C3EA2C1B90AF00039E77 /* ThemeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C86EBE42C0DAE4F00E12243 /* ThemeManager.swift */; };
+		8C74C3EC2C1B92A900039E77 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C74C3EB2C1B92A900039E77 /* Theme.swift */; };
+		8C74C3EE2C1B942300039E77 /* ChatWallpaper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C74C3ED2C1B942300039E77 /* ChatWallpaper.swift */; };
 		8C7D949A2B88952700B7B9E1 /* MigrateToDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C7D94992B88952700B7B9E1 /* MigrateToDevice.swift */; };
 		8C7DF3202B7CDB0A00C886D0 /* MigrateFromDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C7DF31F2B7CDB0A00C886D0 /* MigrateFromDevice.swift */; };
+		8C7F8F0E2C19C0C100D16888 /* ViewModifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C7F8F0D2C19C0C100D16888 /* ViewModifiers.swift */; };
 		8C81482C2BD91CD4002CBEC3 /* AudioDevicePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C81482B2BD91CD4002CBEC3 /* AudioDevicePicker.swift */; };
 		8CC4ED902BD7B8530078AEE8 /* CallAudioDeviceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC4ED8F2BD7B8530078AEE8 /* CallAudioDeviceManager.swift */; };
 		8CC956EE2BC0041000412A11 /* NetworkObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC956ED2BC0041000412A11 /* NetworkObserver.swift */; };
@@ -192,11 +204,6 @@
 		D741547A29AF90B00022400A /* PushKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D741547929AF90B00022400A /* PushKit.framework */; };
 		D77B92DC2952372200A5A1CC /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = D77B92DB2952372200A5A1CC /* SwiftyGif */; };
 		D7F0E33929964E7E0068AF69 /* LZString in Frameworks */ = {isa = PBXBuildFile; productRef = D7F0E33829964E7E0068AF69 /* LZString */; };
-		E52FF8DA2C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E52FF8D52C34676600BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7-ghc9.6.3.a */; };
-		E52FF8DB2C34676700BF81EB /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E52FF8D62C34676600BF81EB /* libgmpxx.a */; };
-		E52FF8DC2C34676700BF81EB /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E52FF8D72C34676700BF81EB /* libffi.a */; };
-		E52FF8DD2C34676700BF81EB /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E52FF8D82C34676700BF81EB /* libgmp.a */; };
-		E52FF8DE2C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E52FF8D92C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -273,6 +280,11 @@
 		5C029EA9283942EA004A9677 /* CallController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallController.swift; sourceTree = "<group>"; };
 		5C05DF522840AA1D00C683F9 /* CallSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallSettings.swift; sourceTree = "<group>"; };
 		5C063D2627A4564100AEC577 /* ChatPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatPreviewView.swift; sourceTree = "<group>"; };
+		5C0EA1362C0B176B00AD2E5E /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5C0EA1372C0B176B00AD2E5E /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5C0EA1382C0B176B00AD2E5E /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5C0EA1392C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc-ghc9.6.3.a"; sourceTree = "<group>"; };
+		5C0EA13A2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc.a"; sourceTree = "<group>"; };
 		5C10D88728EED12E00E58BF0 /* ContactConnectionInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactConnectionInfo.swift; sourceTree = "<group>"; };
 		5C10D88928F187F300E58BF0 /* FullScreenMediaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullScreenMediaView.swift; sourceTree = "<group>"; };
 		5C116CDB27AABE0400E66D01 /* ContactRequestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactRequestView.swift; sourceTree = "<group>"; };
@@ -478,20 +490,22 @@
 		64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncognitoHelp.swift; sourceTree = "<group>"; };
 		8C05382D2B39887E006436DC /* VideoUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoUtils.swift; sourceTree = "<group>"; };
 		8C69FE7C2B8C7D2700267E38 /* AppSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettings.swift; sourceTree = "<group>"; };
+		8C74C3EB2C1B92A900039E77 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
+		8C74C3ED2C1B942300039E77 /* ChatWallpaper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatWallpaper.swift; sourceTree = "<group>"; };
 		8C7D94992B88952700B7B9E1 /* MigrateToDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrateToDevice.swift; sourceTree = "<group>"; };
 		8C7DF31F2B7CDB0A00C886D0 /* MigrateFromDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrateFromDevice.swift; sourceTree = "<group>"; };
+		8C7E3CE32C0DEAC400BFF63A /* ThemeTypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeTypes.swift; sourceTree = "<group>"; };
+		8C7F8F0D2C19C0C100D16888 /* ViewModifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModifiers.swift; sourceTree = "<group>"; };
+		8C804B1D2C11F966007A63C8 /* ChatWallpaperTypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatWallpaperTypes.swift; sourceTree = "<group>"; };
 		8C81482B2BD91CD4002CBEC3 /* AudioDevicePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioDevicePicker.swift; sourceTree = "<group>"; };
+		8C852B072C1086D100BA61E8 /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
+		8C86EBE42C0DAE4F00E12243 /* ThemeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeManager.swift; sourceTree = "<group>"; };
 		8CC4ED8F2BD7B8530078AEE8 /* CallAudioDeviceManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallAudioDeviceManager.swift; sourceTree = "<group>"; };
 		8CC956ED2BC0041000412A11 /* NetworkObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkObserver.swift; sourceTree = "<group>"; };
 		D72A9087294BD7A70047C86D /* NativeTextEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeTextEditor.swift; sourceTree = "<group>"; };
 		D741547729AF89AF0022400A /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; };
 		D741547929AF90B00022400A /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/PushKit.framework; sourceTree = DEVELOPER_DIR; };
 		D7AA2C3429A936B400737B40 /* MediaEncryption.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = MediaEncryption.playground; path = Shared/MediaEncryption.playground; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
-		E52FF8D52C34676600BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7-ghc9.6.3.a"; sourceTree = "<group>"; };
-		E52FF8D62C34676600BF81EB /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		E52FF8D72C34676700BF81EB /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		E52FF8D82C34676700BF81EB /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		E52FF8D92C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -529,13 +543,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E52FF8DE2C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7.a in Frameworks */,
-				E52FF8DB2C34676700BF81EB /* libgmpxx.a in Frameworks */,
+				5C0EA13C2C0B176B00AD2E5E /* libgmpxx.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
+				5C0EA13B2C0B176B00AD2E5E /* libgmp.a in Frameworks */,
+				5C0EA13D2C0B176B00AD2E5E /* libffi.a in Frameworks */,
+				5C0EA13F2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				E52FF8DC2C34676700BF81EB /* libffi.a in Frameworks */,
-				E52FF8DD2C34676700BF81EB /* libgmp.a in Frameworks */,
-				E52FF8DA2C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7-ghc9.6.3.a in Frameworks */,
+				5C0EA13E2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc-ghc9.6.3.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -601,11 +615,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				E52FF8D72C34676700BF81EB /* libffi.a */,
-				E52FF8D82C34676700BF81EB /* libgmp.a */,
-				E52FF8D62C34676600BF81EB /* libgmpxx.a */,
-				E52FF8D52C34676600BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7-ghc9.6.3.a */,
-				E52FF8D92C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7.a */,
+				5C0EA1382C0B176B00AD2E5E /* libffi.a */,
+				5C0EA1362C0B176B00AD2E5E /* libgmp.a */,
+				5C0EA1372C0B176B00AD2E5E /* libgmpxx.a */,
+				5C0EA1392C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc-ghc9.6.3.a */,
+				5C0EA13A2C0B176B00AD2E5E /* libHSsimplex-chat-5.8.0.5-Idqi6HXqzzs2zrnyZtMyhc.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -660,6 +674,8 @@
 				64C3B0202A0D359700E19930 /* CustomTimePicker.swift */,
 				5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */,
 				8C05382D2B39887E006436DC /* VideoUtils.swift */,
+				8C7F8F0D2C19C0C100D16888 /* ViewModifiers.swift */,
+				8C74C3ED2C1B942300039E77 /* ChatWallpaper.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -684,6 +700,7 @@
 		5CA059C2279559F40002BEB4 /* Shared */ = {
 			isa = PBXGroup;
 			children = (
+				8C74C3E92C1B909200039E77 /* Theme */,
 				5CA059C3279559F40002BEB4 /* SimpleXApp.swift */,
 				5C36027227F47AD5009F19D9 /* AppDelegate.swift */,
 				5CA059C4279559F40002BEB4 /* ContentView.swift */,
@@ -820,6 +837,7 @@
 		5CE2BA692845308900EC33A6 /* SimpleXChat */ = {
 			isa = PBXGroup;
 			children = (
+				8C86EBE32C0DAE3700E12243 /* Theme */,
 				5CDCAD5228186F9500503DA2 /* AppGroup.swift */,
 				5CDCAD7228188CFF00503DA2 /* ChatTypes.swift */,
 				5CDCAD7428188D2900503DA2 /* APITypes.swift */,
@@ -913,6 +931,15 @@
 			path = Group;
 			sourceTree = "<group>";
 		};
+		8C74C3E92C1B909200039E77 /* Theme */ = {
+			isa = PBXGroup;
+			children = (
+				8C86EBE42C0DAE4F00E12243 /* ThemeManager.swift */,
+				8C74C3EB2C1B92A900039E77 /* Theme.swift */,
+			);
+			path = Theme;
+			sourceTree = "<group>";
+		};
 		8C7D94982B8894D300B7B9E1 /* Migration */ = {
 			isa = PBXGroup;
 			children = (
@@ -922,6 +949,16 @@
 			path = Migration;
 			sourceTree = "<group>";
 		};
+		8C86EBE32C0DAE3700E12243 /* Theme */ = {
+			isa = PBXGroup;
+			children = (
+				8C7E3CE32C0DEAC400BFF63A /* ThemeTypes.swift */,
+				8C852B072C1086D100BA61E8 /* Color.swift */,
+				8C804B1D2C11F966007A63C8 /* ChatWallpaperTypes.swift */,
+			);
+			path = Theme;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -1152,6 +1189,7 @@
 				5C93293129239BED0090FFF9 /* ProtocolServerView.swift in Sources */,
 				5C9CC7AD28C55D7800BEF955 /* DatabaseEncryptionView.swift in Sources */,
 				5CBD285A295711D700EC2CF4 /* ImageUtils.swift in Sources */,
+				8C74C3EC2C1B92A900039E77 /* Theme.swift in Sources */,
 				6419EC562AB8BC8B004A607A /* ContextInvitingContactMemberView.swift in Sources */,
 				5CE4407927ADB701007B033A /* EmojiItemView.swift in Sources */,
 				8C7D949A2B88952700B7B9E1 /* MigrateToDevice.swift in Sources */,
@@ -1184,6 +1222,7 @@
 				5CB0BA90282713D900B3292C /* SimpleXInfo.swift in Sources */,
 				5C063D2727A4564100AEC577 /* ChatPreviewView.swift in Sources */,
 				5CC868F329EB540C0017BBFD /* CIRcvDecryptionError.swift in Sources */,
+				8C7F8F0E2C19C0C100D16888 /* ViewModifiers.swift in Sources */,
 				5C35CFCB27B2E91D00FB6C6D /* NtfManager.swift in Sources */,
 				5C9D13A3282187BB00AB8B43 /* WebRTC.swift in Sources */,
 				5C9A5BDB2871E05400A5B906 /* SetNotificationsMode.swift in Sources */,
@@ -1208,6 +1247,7 @@
 				5CB346E72868D76D001FD2EF /* NotificationsView.swift in Sources */,
 				647F090E288EA27B00644C40 /* GroupMemberInfoView.swift in Sources */,
 				646BB38E283FDB6D001CE359 /* LocalAuthenticationUtils.swift in Sources */,
+				8C74C3EA2C1B90AF00039E77 /* ThemeManager.swift in Sources */,
 				5C7505A227B65FDB00BE3227 /* CIMetaView.swift in Sources */,
 				5CEBD7462A5C0A8F00665FE2 /* KeyboardPadding.swift in Sources */,
 				5C35CFC827B2782E00FB6C6D /* BGManager.swift in Sources */,
@@ -1225,6 +1265,7 @@
 				6454036F2822A9750090DDFF /* ComposeFileView.swift in Sources */,
 				5C5DB70E289ABDD200730FFF /* AppearanceSettings.swift in Sources */,
 				5C5F2B6D27EBC3FE006A9D5F /* ImagePicker.swift in Sources */,
+				8C74C3EE2C1B942300039E77 /* ChatWallpaper.swift in Sources */,
 				5C3CCFCC2AE6BD3100C3F0C3 /* ConnectDesktopView.swift in Sources */,
 				5C9C2DA92899DA6F00CC63B1 /* NetworkAndServers.swift in Sources */,
 				5C6BA667289BD954009B8ECC /* DismissSheets.swift in Sources */,
@@ -1309,6 +1350,7 @@
 				5C00168128C4FE760094D739 /* KeyChain.swift in Sources */,
 				5CE2BA97284537A800EC33A6 /* dummy.m in Sources */,
 				5CE2BA922845340900EC33A6 /* FileUtils.swift in Sources */,
+				8C74C3E72C1B901900039E77 /* Color.swift in Sources */,
 				5CD67B902B0E858A00C510B1 /* hs_init.c in Sources */,
 				5CE2BA91284533A300EC33A6 /* Notifications.swift in Sources */,
 				5CE2BA79284530CC00EC33A6 /* SimpleXChat.docc in Sources */,
@@ -1317,7 +1359,9 @@
 				5CE2BA8F284533A300EC33A6 /* APITypes.swift in Sources */,
 				5C9D811A2AA8727A001D49FD /* CryptoFile.swift in Sources */,
 				5CE2BA8C284533A300EC33A6 /* AppGroup.swift in Sources */,
+				8C74C3E52C1B900600039E77 /* ThemeTypes.swift in Sources */,
 				5CE2BA8D284533A300EC33A6 /* CallTypes.swift in Sources */,
+				8C74C3E82C1B905B00039E77 /* ChatWallpaperTypes.swift in Sources */,
 				5CE2BA8E284533A300EC33A6 /* API.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1552,7 +1596,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 226;
+				CURRENT_PROJECT_VERSION = 224;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1577,7 +1621,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 5.8.2;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1601,7 +1645,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 226;
+				CURRENT_PROJECT_VERSION = 224;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1626,7 +1670,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.8.2;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1687,7 +1731,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 226;
+				CURRENT_PROJECT_VERSION = 224;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -1702,7 +1746,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.8.2;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1724,7 +1768,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 226;
+				CURRENT_PROJECT_VERSION = 224;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -1739,7 +1783,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.8.2;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1761,7 +1805,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 226;
+				CURRENT_PROJECT_VERSION = 224;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1787,7 +1831,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.8.2;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1812,7 +1856,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 226;
+				CURRENT_PROJECT_VERSION = 224;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1838,7 +1882,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.8.2;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;

apps/ios/SimpleXChat/APITypes.swift

@@ -29,8 +29,7 @@ public enum ChatCommand {
     case apiStopChat
     case apiActivateChat(restoreChat: Bool)
     case apiSuspendChat(timeoutMicroseconds: Int)
-    case setTempFolder(tempFolder: String)
-    case setFilesFolder(filesFolder: String)
+    case apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String)
     case apiSetEncryptLocalFiles(enable: Bool)
     case apiExportArchive(config: ArchiveConfig)
     case apiImportArchive(config: ArchiveConfig)
@@ -106,6 +105,8 @@ public enum ChatCommand {
     case apiSetContactPrefs(contactId: Int64, preferences: Preferences)
     case apiSetContactAlias(contactId: Int64, localAlias: String)
     case apiSetConnectionAlias(connId: Int64, localAlias: String)
+    case apiSetUserUIThemes(userId: Int64, themes: ThemeModeOverrides?)
+    case apiSetChatUIThemes(chatId: String, themes: ThemeModeOverrides?)
     case apiCreateMyAddress(userId: Int64)
     case apiDeleteMyAddress(userId: Int64)
     case apiShowMyAddress(userId: Int64)
@@ -169,8 +170,7 @@ public enum ChatCommand {
             case .apiStopChat: return "/_stop"
             case let .apiActivateChat(restore): return "/_app activate restore=\(onOff(restore))"
             case let .apiSuspendChat(timeoutMicroseconds): return "/_app suspend \(timeoutMicroseconds)"
-            case let .setTempFolder(tempFolder): return "/_temp_folder \(tempFolder)"
-            case let .setFilesFolder(filesFolder): return "/_files_folder \(filesFolder)"
+            case let .apiSetAppFilePaths(filesFolder, tempFolder, assetsFolder): return "/set file paths \(encodeJSON(AppFilePaths(appFilesFolder: filesFolder, appTempFolder: tempFolder, appAssetsFolder: assetsFolder)))"
             case let .apiSetEncryptLocalFiles(enable): return "/_files_encrypt \(onOff(enable))"
             case let .apiExportArchive(cfg): return "/_db export \(encodeJSON(cfg))"
             case let .apiImportArchive(cfg): return "/_db import \(encodeJSON(cfg))"
@@ -268,6 +268,8 @@ public enum ChatCommand {
             case let .apiSetContactPrefs(contactId, preferences): return "/_set prefs @\(contactId) \(encodeJSON(preferences))"
             case let .apiSetContactAlias(contactId, localAlias): return "/_set alias @\(contactId) \(localAlias.trimmingCharacters(in: .whitespaces))"
             case let .apiSetConnectionAlias(connId, localAlias): return "/_set alias :\(connId) \(localAlias.trimmingCharacters(in: .whitespaces))"
+            case let .apiSetUserUIThemes(userId, themes): return "/_set theme user \(userId) \(themes != nil ? encodeJSON(themes) : "")"
+            case let .apiSetChatUIThemes(chatId, themes): return "/_set theme \(chatId) \(themes != nil ? encodeJSON(themes) : "")"
             case let .apiCreateMyAddress(userId): return "/_address \(userId)"
             case let .apiDeleteMyAddress(userId): return "/_delete_address \(userId)"
             case let .apiShowMyAddress(userId): return "/_show_address \(userId)"
@@ -325,8 +327,7 @@ public enum ChatCommand {
             case .apiStopChat: return "apiStopChat"
             case .apiActivateChat: return "apiActivateChat"
             case .apiSuspendChat: return "apiSuspendChat"
-            case .setTempFolder: return "setTempFolder"
-            case .setFilesFolder: return "setFilesFolder"
+            case .apiSetAppFilePaths: return "apiSetAppFilePaths"
             case .apiSetEncryptLocalFiles: return "apiSetEncryptLocalFiles"
             case .apiExportArchive: return "apiExportArchive"
             case .apiImportArchive: return "apiImportArchive"
@@ -402,6 +403,8 @@ public enum ChatCommand {
             case .apiSetContactPrefs: return "apiSetContactPrefs"
             case .apiSetContactAlias: return "apiSetContactAlias"
             case .apiSetConnectionAlias: return "apiSetConnectionAlias"
+            case .apiSetUserUIThemes: return "apiSetUserUIThemes"
+            case .apiSetChatUIThemes: return "apiSetChatUIThemes"
             case .apiCreateMyAddress: return "apiCreateMyAddress"
             case .apiDeleteMyAddress: return "apiDeleteMyAddress"
             case .apiShowMyAddress: return "apiShowMyAddress"
@@ -1109,13 +1112,13 @@ public struct ServerCfg: Identifiable, Equatable, Codable {
     public var server: String
     public var preset: Bool
     public var tested: Bool?
-    public var enabled: ServerEnabled
+    public var enabled: Bool
     var createdAt = Date()
 //    public var sendEnabled: Bool // can we potentially want to prevent sending on the servers we use to receive?
 // Even if we don't see the use case, it's probably better to allow it in the model
 // In any case, "trusted/known" servers are out of scope of this change
 
-    public init(server: String, preset: Bool, tested: Bool?, enabled: ServerEnabled) {
+    public init(server: String, preset: Bool, tested: Bool?, enabled: Bool) {
         self.server = server
         self.preset = preset
         self.tested = tested
@@ -1128,7 +1131,7 @@ public struct ServerCfg: Identifiable, Equatable, Codable {
 
     public var id: String { "\(server) \(createdAt)" }
 
-    public static var empty = ServerCfg(server: "", preset: false, tested: nil, enabled: .enabled)
+    public static var empty = ServerCfg(server: "", preset: false, tested: nil, enabled: true)
 
     public var isEmpty: Bool {
         server.trimmingCharacters(in: .whitespaces) == ""
@@ -1145,19 +1148,19 @@ public struct ServerCfg: Identifiable, Equatable, Codable {
             server: "smp://abcd@smp8.simplex.im",
             preset: true,
             tested: true,
-            enabled: .enabled
+            enabled: true
         ),
         custom: ServerCfg(
             server: "smp://abcd@smp9.simplex.im",
             preset: false,
             tested: false,
-            enabled: .disabled
+            enabled: false
         ),
         untested: ServerCfg(
             server: "smp://abcd@smp10.simplex.im",
             preset: false,
             tested: nil,
-            enabled: .enabled
+            enabled: true
         )
     )
 
@@ -1169,12 +1172,6 @@ public struct ServerCfg: Identifiable, Equatable, Codable {
     }
 }
 
-public enum ServerEnabled: String, Codable {
-    case disabled
-    case enabled
-    case known
-}
-
 public enum ProtocolTestStep: String, Decodable, Equatable {
     case connect
     case disconnect
@@ -2077,6 +2074,11 @@ public struct AppSettings: Codable, Equatable {
     public var androidCallOnLockScreen: AppSettingsLockScreenCalls? = nil
     public var iosCallKitEnabled: Bool? = nil
     public var iosCallKitCallsInRecents: Bool? = nil
+    public var uiProfileImageCornerRadius: Float? = nil
+    public var uiColorScheme: String? = nil
+    public var uiDarkColorScheme: String? = nil
+    public var uiCurrentThemeIds: [String: String]? = nil
+    public var uiThemes: [ThemeOverrides]? = nil
 
     public func prepareForExport() -> AppSettings {
         var empty = AppSettings()
@@ -2101,6 +2103,11 @@ public struct AppSettings: Codable, Equatable {
         if androidCallOnLockScreen != def.androidCallOnLockScreen { empty.androidCallOnLockScreen = androidCallOnLockScreen }
         if iosCallKitEnabled != def.iosCallKitEnabled { empty.iosCallKitEnabled = iosCallKitEnabled }
         if iosCallKitCallsInRecents != def.iosCallKitCallsInRecents { empty.iosCallKitCallsInRecents = iosCallKitCallsInRecents }
+        if uiProfileImageCornerRadius != def.uiProfileImageCornerRadius { empty.uiProfileImageCornerRadius = uiProfileImageCornerRadius }
+        if uiColorScheme != def.uiColorScheme { empty.uiColorScheme = uiColorScheme }
+        if uiDarkColorScheme != def.uiDarkColorScheme { empty.uiDarkColorScheme = uiDarkColorScheme }
+        if uiCurrentThemeIds != def.uiCurrentThemeIds { empty.uiCurrentThemeIds = uiCurrentThemeIds }
+        if uiThemes != def.uiThemes { empty.uiThemes = uiThemes }
         return empty
     }
 
@@ -2125,7 +2132,12 @@ public struct AppSettings: Codable, Equatable {
             confirmDBUpgrades: false,
             androidCallOnLockScreen: AppSettingsLockScreenCalls.show,
             iosCallKitEnabled: true,
-            iosCallKitCallsInRecents: false
+            iosCallKitCallsInRecents: false,
+            uiProfileImageCornerRadius: 22.5,
+            uiColorScheme: DefaultTheme.SYSTEM_THEME_NAME,
+            uiDarkColorScheme: DefaultTheme.SIMPLEX.themeName,
+            uiCurrentThemeIds: nil as [String: String]?,
+            uiThemes: nil as [ThemeOverrides]?
         )
     }
 }
@@ -2230,3 +2242,9 @@ public enum MsgType: String, Codable {
     case message
     case quota
 }
+
+public struct AppFilePaths: Encodable {
+    public let appFilesFolder: String
+    public let appTempFolder: String
+    public let appAssetsFolder: String
+}

apps/ios/SimpleXChat/ChatTypes.swift

@@ -26,6 +26,7 @@ public struct User: Identifiable, Decodable, UserLike, NamedChat {
     public var sendRcptsContacts: Bool
     public var sendRcptsSmallGroups: Bool
     public var viewPwdHash: UserPwdHash?
+    public var uiThemes: ThemeModeOverrides?
 
     public var id: Int64 { userId }
 
@@ -1504,6 +1505,7 @@ public struct Contact: Identifiable, Decodable, NamedChat {
     var chatTs: Date?
     var contactGroupMemberId: Int64?
     var contactGrpInvSent: Bool
+    public var uiThemes: ThemeModeOverrides?
 
     public var id: ChatId { get { "@\(contactId)" } }
     public var apiId: Int64 { get { contactId } }
@@ -1843,6 +1845,7 @@ public struct GroupInfo: Identifiable, Decodable, NamedChat {
     var createdAt: Date
     var updatedAt: Date
     var chatTs: Date?
+    public var uiThemes: ThemeModeOverrides?
 
     public var id: ChatId { get { "#\(groupId)" } }
     public var apiId: Int64 { get { groupId } }
@@ -2653,8 +2656,8 @@ public struct CIMeta: Decodable {
         return false
     }
 
-    public func statusIcon(_ metaColor: Color = .secondary) -> (String, Color)? {
-        itemStatus.statusIcon(metaColor)
+    public func statusIcon(_ metaColor: Color = .secondary, _ primaryColor: Color = .accentColor) -> (String, Color)? {
+        itemStatus.statusIcon(metaColor, primaryColor)
     }
 
     public static func getSample(_ id: Int64, _ ts: Date, _ text: String, _ status: CIStatus = .sndNew, itemDeleted: CIDeleted? = nil, itemEdited: Bool = false, itemLive: Bool = false, deletable: Bool = true, editable: Bool = true) -> CIMeta {
@@ -2742,7 +2745,7 @@ public enum CIStatus: Decodable {
         }
     }
 
-    public func statusIcon(_ metaColor: Color = .secondary) -> (String, Color)? {
+    public func statusIcon(_ metaColor: Color = .secondary, _ primaryColor: Color = .accentColor) -> (String, Color)? {
         switch self {
         case .sndNew: return nil
         case .sndSent: return ("checkmark", metaColor)
@@ -2754,7 +2757,7 @@ public enum CIStatus: Decodable {
         case .sndErrorAuth: return ("multiply", .red)
         case .sndError: return ("multiply", .red)
         case .sndWarning: return ("exclamationmark.triangle.fill", .orange)
-        case .rcvNew: return ("circlebadge.fill", Color.accentColor)
+        case .rcvNew: return ("circlebadge.fill", primaryColor)
         case .rcvRead: return nil
         case .invalid: return ("questionmark", metaColor)
         }
@@ -3438,15 +3441,6 @@ public enum MsgContent: Equatable {
         }
     }
 
-    public var isMediaOrFileAttachment: Bool {
-        switch self {
-        case .image: true
-        case .video: true
-        case .file: true
-        default: false
-        }
-    }
-
     var cmdString: String {
         "json \(encodeJSON(self))"
     }