diff --git a/Riot/Managers/Theme/Themes/DarkTheme.swift b/Riot/Managers/Theme/Themes/DarkTheme.swift
index 8ce68186b..0053ccd6e 100644
--- a/Riot/Managers/Theme/Themes/DarkTheme.swift
+++ b/Riot/Managers/Theme/Themes/DarkTheme.swift
@@ -19,45 +19,45 @@ import UIKit
 
 /// Color constants for the dark theme
 @objcMembers
-final class DarkTheme: NSObject, Theme {
+class DarkTheme: NSObject, Theme {
 
-    let backgroundColor: UIColor = UIColor(rgb: 0x212224)
+    var backgroundColor: UIColor = UIColor(rgb: 0x212224)
 
-    let baseColor: UIColor = UIColor(rgb: 0x292E37)
-    let baseTextPrimaryColor: UIColor = UIColor(rgb: 0xFFFFFF)
-    let baseTextSecondaryColor: UIColor = UIColor(rgb: 0xFFFFFF)
+    var baseColor: UIColor = UIColor(rgb: 0x292E37)
+    var baseTextPrimaryColor: UIColor = UIColor(rgb: 0xFFFFFF)
+    var baseTextSecondaryColor: UIColor = UIColor(rgb: 0xFFFFFF)
 
-    let searchBackgroundColor: UIColor = UIColor(rgb: 0x3E434B)
-    let searchTextColor: UIColor = UIColor(rgb: 0xACB3C2)
+    var searchBackgroundColor: UIColor = UIColor(rgb: 0x3E434B)
+    var searchTextColor: UIColor = UIColor(rgb: 0xACB3C2)
 
-    let headerBackgroundColor: UIColor = UIColor(rgb: 0x303540)
-    let headerBorderColor: UIColor  = UIColor(rgb: 0x2E2F31)
-    let headerTextPrimaryColor: UIColor = UIColor(rgb: 0x96A1B7)
-    let headerTextSecondaryColor: UIColor = UIColor(rgb: 0xC8C8CD)
+    var headerBackgroundColor: UIColor = UIColor(rgb: 0x303540)
+    var headerBorderColor: UIColor  = UIColor(rgb: 0x2E2F31)
+    var headerTextPrimaryColor: UIColor = UIColor(rgb: 0x96A1B7)
+    var headerTextSecondaryColor: UIColor = UIColor(rgb: 0xC8C8CD)
 
-    let textPrimaryColor: UIColor = UIColor(rgb: 0xFFFFFF)
-    let textSecondaryColor: UIColor = UIColor(rgb: 0xD8D8D8)
+    var textPrimaryColor: UIColor = UIColor(rgb: 0xFFFFFF)
+    var textSecondaryColor: UIColor = UIColor(rgb: 0xD8D8D8)
 
-    let tintColor: UIColor = UIColor(rgb: 0x7AC9A1)
-    let unreadRoomIndentColor: UIColor = UIColor(rgb: 0x2E3648)
+    var tintColor: UIColor = UIColor(rgb: 0x7AC9A1)
+    var unreadRoomIndentColor: UIColor = UIColor(rgb: 0x2E3648)
     
-    let notificationSecondaryColor: UIColor = UIColor(rgb: 0x7AC9A1)
-    let notificationPrimaryColor: UIColor = UIColor(rgb: 0xF56679)
+    var notificationSecondaryColor: UIColor = UIColor(rgb: 0x7AC9A1)
+    var notificationPrimaryColor: UIColor = UIColor(rgb: 0xF56679)
 
-    let avatarColors: [UIColor] = [
+    var avatarColors: [UIColor] = [
         UIColor(rgb: 0x7AC9A1),
         UIColor(rgb: 0x1E7DDC),
         UIColor(rgb: 0x76DDD7)]
 
-    let statusBarStyle: UIStatusBarStyle = .lightContent
-    let scrollBarStyle: UIScrollViewIndicatorStyle = .white
-    let keyboardAppearance: UIKeyboardAppearance = .dark
+    var statusBarStyle: UIStatusBarStyle = .lightContent
+    var scrollBarStyle: UIScrollViewIndicatorStyle = .white
+    var keyboardAppearance: UIKeyboardAppearance = .dark
 
-    let placeholderTextColor: UIColor = UIColor(white: 1.0, alpha: 0.3)
-    let selectedBackgroundColor: UIColor? = UIColor.black
-    let overlayBackgroundColor: UIColor = UIColor(white: 0.7, alpha: 0.5)
-    let matrixSearchBackgroundImageTintColor: UIColor = UIColor(rgb: 0x7E7E7E)
-    let separatorColor: UIColor = UIColor(rgb: 0x2E2F31)
+    var placeholderTextColor: UIColor = UIColor(white: 1.0, alpha: 0.3)
+    var selectedBackgroundColor: UIColor? = UIColor.black
+    var overlayBackgroundColor: UIColor = UIColor(white: 0.7, alpha: 0.5)
+    var matrixSearchBackgroundImageTintColor: UIColor = UIColor(rgb: 0x7E7E7E)
+    var separatorColor: UIColor = UIColor(rgb: 0x2E2F31)
 
     func applyStyle(onNavigationBar navigationBar: UINavigationBar) {
         navigationBar.tintColor = self.baseTextPrimaryColor;
diff --git a/Riot/Managers/Theme/Themes/DefaultTheme.swift b/Riot/Managers/Theme/Themes/DefaultTheme.swift
index 920fa8019..f7a9dba66 100644
--- a/Riot/Managers/Theme/Themes/DefaultTheme.swift
+++ b/Riot/Managers/Theme/Themes/DefaultTheme.swift
@@ -19,45 +19,45 @@ import UIKit
 
 /// Color constants for the default theme
 @objcMembers
-final class DefaultTheme: NSObject, Theme {
+class DefaultTheme: NSObject, Theme {
 
-    let backgroundColor: UIColor = UIColor(rgb: 0xFFFFFF)
+    var backgroundColor: UIColor = UIColor(rgb: 0xFFFFFF)
 
-    let baseColor: UIColor = UIColor(rgb: 0x2E3648)
-    let baseTextPrimaryColor: UIColor = UIColor(rgb: 0xFFFFFF)
-    let baseTextSecondaryColor: UIColor = UIColor(rgb: 0xFFFFFF)
+    var baseColor: UIColor = UIColor(rgb: 0x2E3648)
+    var baseTextPrimaryColor: UIColor = UIColor(rgb: 0xFFFFFF)
+    var baseTextSecondaryColor: UIColor = UIColor(rgb: 0xFFFFFF)
 
-    let searchBackgroundColor: UIColor = UIColor(rgb: 0xFFFFFF)
-    let searchTextColor: UIColor = UIColor(rgb: 0xACB3C2)
+    var searchBackgroundColor: UIColor = UIColor(rgb: 0xFFFFFF)
+    var searchTextColor: UIColor = UIColor(rgb: 0xACB3C2)
 
-    let headerBackgroundColor: UIColor = UIColor(rgb: 0xF1F5F8)
-    let headerBorderColor: UIColor  = UIColor(rgb: 0xEAEEF2)
-    let headerTextPrimaryColor: UIColor = UIColor(rgb: 0x72708B)
-    let headerTextSecondaryColor: UIColor = UIColor(rgb: 0xC8C8CD)
+    var headerBackgroundColor: UIColor = UIColor(rgb: 0xF1F5F8)
+    var headerBorderColor: UIColor  = UIColor(rgb: 0xEAEEF2)
+    var headerTextPrimaryColor: UIColor = UIColor(rgb: 0x72708B)
+    var headerTextSecondaryColor: UIColor = UIColor(rgb: 0xC8C8CD)
 
-    let textPrimaryColor: UIColor = UIColor(rgb: 0x383838)
-    let textSecondaryColor: UIColor = UIColor(rgb: 0x9E9E9E)
+    var textPrimaryColor: UIColor = UIColor(rgb: 0x383838)
+    var textSecondaryColor: UIColor = UIColor(rgb: 0x9E9E9E)
 
-    let tintColor: UIColor = UIColor(rgb: 0x7AC9A1)
-    let unreadRoomIndentColor: UIColor = UIColor(rgb: 0x2E3648)
+    var tintColor: UIColor = UIColor(rgb: 0x7AC9A1)
+    var unreadRoomIndentColor: UIColor = UIColor(rgb: 0x2E3648)
     
-    let notificationSecondaryColor: UIColor = UIColor(rgb: 0x7AC9A1)
-    let notificationPrimaryColor: UIColor = UIColor(rgb: 0xF56679)
+    var notificationSecondaryColor: UIColor = UIColor(rgb: 0x7AC9A1)
+    var notificationPrimaryColor: UIColor = UIColor(rgb: 0xF56679)
 
-    let avatarColors: [UIColor] = [
+    var avatarColors: [UIColor] = [
         UIColor(rgb: 0x7AC9A1),
         UIColor(rgb: 0x1E7DDC),
         UIColor(rgb: 0x76DDD7)]
 
-    let statusBarStyle: UIStatusBarStyle = .lightContent
-    let scrollBarStyle: UIScrollViewIndicatorStyle = .default
-    let keyboardAppearance: UIKeyboardAppearance = .light
+    var statusBarStyle: UIStatusBarStyle = .lightContent
+    var scrollBarStyle: UIScrollViewIndicatorStyle = .default
+    var keyboardAppearance: UIKeyboardAppearance = .light
 
-    let placeholderTextColor: UIColor = UIColor(white: 0.7, alpha: 1.0) // Use default 70% gray color
-    let selectedBackgroundColor: UIColor? = nil  // Use the default selection color
-    let overlayBackgroundColor: UIColor = UIColor(white: 0.7, alpha: 0.5)
-    let matrixSearchBackgroundImageTintColor: UIColor = UIColor(rgb: 0xE7E7E7)
-    let separatorColor: UIColor = UIColor(rgb: 0xEAEEF2)
+    var placeholderTextColor: UIColor = UIColor(white: 0.7, alpha: 1.0) // Use default 70% gray color
+    var selectedBackgroundColor: UIColor? = nil  // Use the default selection color
+    var overlayBackgroundColor: UIColor = UIColor(white: 0.7, alpha: 0.5)
+    var matrixSearchBackgroundImageTintColor: UIColor = UIColor(rgb: 0xE7E7E7)
+    var separatorColor: UIColor = UIColor(rgb: 0xEAEEF2)
 
     func applyStyle(onNavigationBar navigationBar: UINavigationBar) {
         navigationBar.tintColor = self.baseTextPrimaryColor;