From b68066aee453977ad485ff43b2061c44dcce795a Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Wed, 22 Sep 2021 17:08:03 +0200
Subject: [PATCH 01/13] Update Settings and Home to use ThemeService instead of
 Style

---
 Riot/Managers/Theme/Themes/DefaultTheme.swift | 35 +++-----
 Tchap/Modules/Common/Style/Appearance.swift   | 12 +--
 Tchap/Modules/Home/HomeViewController.swift   | 21 +++--
 .../CountryPickerViewController.h             |  3 +-
 .../CountryPickerViewController.m             | 43 +++++----
 .../Modules/Settings/SettingsViewController.m | 89 +++++++++----------
 6 files changed, 91 insertions(+), 112 deletions(-)

diff --git a/Riot/Managers/Theme/Themes/DefaultTheme.swift b/Riot/Managers/Theme/Themes/DefaultTheme.swift
index f38dfcf758..9d6f52423a 100644
--- a/Riot/Managers/Theme/Themes/DefaultTheme.swift
+++ b/Riot/Managers/Theme/Themes/DefaultTheme.swift
@@ -95,7 +95,7 @@ class DefaultTheme: NSObject, Theme {
     
     // Note: We are not using UINavigationBarAppearance on iOS 13+ atm because of UINavigationBar directly include UISearchBar on their titleView that cause crop issues with UINavigationController pop.
     func applyStyle(onNavigationBar navigationBar: UINavigationBar) {
-        navigationBar.tintColor = self.baseTextPrimaryColor
+        navigationBar.tintColor = self.tintColor
         navigationBar.titleTextAttributes = [
             NSAttributedString.Key.foregroundColor: self.baseTextPrimaryColor
         ]
@@ -108,30 +108,21 @@ class DefaultTheme: NSObject, Theme {
     }
 
     func applyStyle(onSearchBar searchBar: UISearchBar) {
-        searchBar.barStyle = .default
-        searchBar.tintColor = self.searchPlaceholderColor
-        searchBar.barTintColor = self.headerBackgroundColor
+        searchBar.searchBarStyle = .default
+        searchBar.barTintColor = self.baseColor
+        searchBar.isTranslucent = false
+        searchBar.backgroundImage = UIImage() // Remove top and bottom shadow
+        searchBar.tintColor = self.tintColor
         
-        if let searchBarTextField = searchBar.vc_searchTextField {
-            searchBarTextField.textColor = searchBar.tintColor
+        if #available(iOS 13.0, *) {
+            searchBar.searchTextField.backgroundColor = self.searchBackgroundColor
+            searchBar.searchTextField.textColor = self.searchPlaceholderColor
+        } else {
+            if let searchBarTextField = searchBar.vc_searchTextField {
+                searchBarTextField.textColor = self.searchPlaceholderColor
+            }
         }
     }
-//    func applyStyle(onSearchBar searchBar: UISearchBar) {
-//        searchBar.searchBarStyle = .default
-//        searchBar.barTintColor = self.baseColor
-//        searchBar.isTranslucent = false
-//        searchBar.backgroundImage = UIImage() // Remove top and bottom shadow
-//        searchBar.tintColor = self.tintColor
-//        
-//        if #available(iOS 13.0, *) {
-//            searchBar.searchTextField.backgroundColor = self.searchBackgroundColor
-//            searchBar.searchTextField.textColor = self.searchPlaceholderColor
-//        } else {
-//            if let searchBarTextField = searchBar.vc_searchTextField {
-//                searchBarTextField.textColor = self.searchPlaceholderColor
-//            }
-//        }
-//    }
     
     func applyStyle(onTextField texField: UITextField) {
         texField.textColor = self.textPrimaryColor
diff --git a/Tchap/Modules/Common/Style/Appearance.swift b/Tchap/Modules/Common/Style/Appearance.swift
index 96d84db391..e4f3d490fc 100644
--- a/Tchap/Modules/Common/Style/Appearance.swift
+++ b/Tchap/Modules/Common/Style/Appearance.swift
@@ -26,11 +26,11 @@ struct Appearance {
     
     // UISearchBar textColor could not be set directly
     static func setupSearchBarAppearance() {
-        UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self, UINavigationBar.self]).defaultTextAttributes = [NSAttributedString.Key.foregroundColor: Variant1Style.shared.barActionColor]
-        
-        // Since iOS 11 UISearchController is set as navigationItem and displayed under UINavigationBar in UINavigationController
-        if #available(iOS 11.0, *) {
-            UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self, UINavigationController.self]).defaultTextAttributes = [NSAttributedString.Key.foregroundColor: Variant1Style.shared.barActionColor]
-        }
+//        UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self, UINavigationBar.self]).defaultTextAttributes = [NSAttributedString.Key.foregroundColor: Variant1Style.shared.barActionColor]
+//
+//        // Since iOS 11 UISearchController is set as navigationItem and displayed under UINavigationBar in UINavigationController
+//        if #available(iOS 11.0, *) {
+//            UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self, UINavigationController.self]).defaultTextAttributes = [NSAttributedString.Key.foregroundColor: Variant1Style.shared.barActionColor]
+//        }
     }
 }
diff --git a/Tchap/Modules/Home/HomeViewController.swift b/Tchap/Modules/Home/HomeViewController.swift
index b1a2a1dbfa..c7482398f8 100644
--- a/Tchap/Modules/Home/HomeViewController.swift
+++ b/Tchap/Modules/Home/HomeViewController.swift
@@ -34,7 +34,6 @@ final class HomeViewController: UIViewController {
     // MARK: Private
     
     private var globalSearchBar: GlobalSearchBar!
-    private var currentStyle: Style!
     private var segmentedViewController: SegmentedViewController?
     private var segmentViewControllers: [UIViewController] = []
     private var segmentViewControllersTitles: [String] = []
@@ -48,12 +47,13 @@ final class HomeViewController: UIViewController {
     
     // MARK: - Setup
     
-    class func instantiate(with viewControllers: [UIViewController], viewControllersTitles: [String], globalSearchBar: GlobalSearchBar, style: Style = Variant1Style.shared) -> HomeViewController {
+    class func instantiate(with viewControllers: [UIViewController],
+                           viewControllersTitles: [String],
+                           globalSearchBar: GlobalSearchBar) -> HomeViewController {
         let viewController = StoryboardScene.HomeViewController.initialScene.instantiate()
         viewController.segmentViewControllers = viewControllers
         viewController.segmentViewControllersTitles = viewControllersTitles
         viewController.globalSearchBar = globalSearchBar
-        viewController.currentStyle = style
         return viewController
     }
     
@@ -62,6 +62,7 @@ final class HomeViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        self.setupTheme()
         self.setupGlobalSearchBar()
         self.setupSegmentedViewController()
         self.setupPlusButton()
@@ -74,7 +75,7 @@ final class HomeViewController: UIViewController {
     }
         
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     func setExternalUseMode(_ isExternal: Bool) {
@@ -144,15 +145,13 @@ final class HomeViewController: UIViewController {
     }
 }
 
-// MARK: - Stylable
-extension HomeViewController: Stylable {
-    func update(style: Style) {
-        self.currentStyle = style
-        
-        self.view.backgroundColor = style.backgroundColor
+// MARK: - Theme
+private extension HomeViewController {
+    func setupTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
     }
 }
diff --git a/Tchap/Modules/Settings/PhoneCountry/CountryPickerViewController.h b/Tchap/Modules/Settings/PhoneCountry/CountryPickerViewController.h
index 3a166a24a6..e2b0e1928a 100644
--- a/Tchap/Modules/Settings/PhoneCountry/CountryPickerViewController.h
+++ b/Tchap/Modules/Settings/PhoneCountry/CountryPickerViewController.h
@@ -23,9 +23,8 @@
 /**
  Creates and returns a new `CountryPickerViewController` object.
  
- @param style Used to setup view style parameters.
  @return An initialized `CountryPickerViewController` object if successful, `nil` otherwise.
  */
-+ (nonnull instancetype)instantiateWithStyle:(nonnull id<Style>)style;
++ (nonnull instancetype)instantiate;
 
 @end
diff --git a/Tchap/Modules/Settings/PhoneCountry/CountryPickerViewController.m b/Tchap/Modules/Settings/PhoneCountry/CountryPickerViewController.m
index 1a4e08be7c..1e15097993 100644
--- a/Tchap/Modules/Settings/PhoneCountry/CountryPickerViewController.m
+++ b/Tchap/Modules/Settings/PhoneCountry/CountryPickerViewController.m
@@ -21,7 +21,7 @@
 #import "ThemeService.h"
 #import "GeneratedInterface-Swift.h"
 
-@interface CountryPickerViewController () <Stylable>
+@interface CountryPickerViewController ()
 {
     /**
      The fake top view displayed in case of vertical bounce.
@@ -31,17 +31,14 @@ @interface CountryPickerViewController () <Stylable>
 
 // Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
 @property (nonatomic, weak) id kThemeServiceDidChangeThemeNotificationObserver;
-@property (strong, nonatomic) id<Style> currentStyle;
 
 @end
 
 @implementation CountryPickerViewController
 
-+ (instancetype)instantiateWithStyle:(id<Style>)style
++ (instancetype)instantiate
 {
-    CountryPickerViewController *countryPickerViewController = [CountryPickerViewController countryPickerViewController];
-    countryPickerViewController.currentStyle = style;
-    return countryPickerViewController;
+    return [CountryPickerViewController countryPickerViewController];
 }
 
 - (void)finalizeInit
@@ -78,42 +75,43 @@ - (void)viewDidLoad
 
 - (void)userInterfaceThemeDidChange
 {
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-    
     UINavigationBar *navigationBar = self.navigationController.navigationBar;
     if (navigationBar)
     {
-        [style applyStyleOnNavigationBar:navigationBar];
+        [ThemeService.shared.theme applyStyleOnNavigationBar:navigationBar];
     }
     
     if (self.searchController.searchBar)
     {
-        [style applyStyleOnSearchBar:self.searchController.searchBar];
+        [ThemeService.shared.theme applyStyleOnSearchBar:self.searchController.searchBar];
     }
     
-    //TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    //TODO Design the activity indicator for Tchap
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
     
     // Use the primary bg color for the table view in plain style.
-    self.tableView.backgroundColor = style.backgroundColor;
-    topview.backgroundColor = style.backgroundColor;
+    self.tableView.backgroundColor = ThemeService.shared.theme.backgroundColor;
+    topview.backgroundColor = ThemeService.shared.theme.backgroundColor;
     
     if (self.tableView.dataSource)
     {
         [self.tableView reloadData];
     }
 
+    self.navigationController.navigationBar.translucent = true;
+    self.navigationController.navigationBar.backgroundColor = ThemeService.shared.theme.baseColor;
+
     [self setNeedsStatusBarAppearanceUpdate];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 
@@ -124,7 +122,6 @@ - (void)viewWillAppear:(BOOL)animated
     // Screen tracking
     [[Analytics sharedInstance] trackScreen:@"CountryPicker"];
     
-    
     [self userInterfaceThemeDidChange];
 }
 
@@ -141,15 +138,15 @@ - (void)dealloc
 
 - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
 {
-    cell.textLabel.textColor = self.currentStyle.primaryTextColor;
-    cell.detailTextLabel.textColor = self.currentStyle.secondaryTextColor;
-    cell.backgroundColor = self.currentStyle.backgroundColor;
+    cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
+    cell.detailTextLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
+    cell.backgroundColor = ThemeService.shared.theme.backgroundColor;
     
     // Update the selected background view
-    if (self.currentStyle.secondaryBackgroundColor)
+    if (ThemeService.shared.theme.selectedBackgroundColor)
     {
         cell.selectedBackgroundView = [[UIView alloc] init];
-        cell.selectedBackgroundView.backgroundColor = self.currentStyle.secondaryBackgroundColor;
+        cell.selectedBackgroundView.backgroundColor = ThemeService.shared.theme.selectedBackgroundColor;
     }
     else
     {
diff --git a/Tchap/Modules/Settings/SettingsViewController.m b/Tchap/Modules/Settings/SettingsViewController.m
index af1d799848..06c5b3ba67 100644
--- a/Tchap/Modules/Settings/SettingsViewController.m
+++ b/Tchap/Modules/Settings/SettingsViewController.m
@@ -124,7 +124,6 @@ @interface SettingsViewController () <UITextFieldDelegate,
 MXKDeviceViewDelegate,
 UIDocumentInteractionControllerDelegate,
 MXKCountryPickerViewControllerDelegate,
-Stylable,
 ChangePasswordCoordinatorBridgePresenterDelegate,
 MXKDocumentPickerPresenterDelegate>
 {
@@ -187,7 +186,6 @@ @interface SettingsViewController () <UITextFieldDelegate,
 @property (nonatomic, strong) SingleImagePickerPresenter *imagePickerPresenter;
 
 @property (weak, nonatomic) DeactivateAccountViewController *deactivateAccountViewController;
-@property (strong, nonatomic) id<Style> currentStyle;
 
 #ifdef SUPPORT_KEYS_BACKUP
 @property (nonatomic, strong) ChangePasswordAlertPresenter *changePasswordAlertPresenter;
@@ -211,7 +209,6 @@ + (instancetype)instantiate
 {
     UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]];
     SettingsViewController *settingsViewController = [storyboard instantiateViewControllerWithIdentifier:@"SettingsViewController"];
-    settingsViewController.currentStyle = Variant1Style.shared;
     return settingsViewController;
 }
 
@@ -322,36 +319,32 @@ - (void)viewDidLoad
 
 - (void)userInterfaceThemeDidChange
 {
-    [self updateWithStyle:self.currentStyle];
-    
+    [self updateTheme];
+        
     if (self.tableView.dataSource)
     {
         [self refreshSettings];
     }
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    UINavigationBar *navigationBar = self.navigationController.navigationBar;
-    
-    if (navigationBar)
-    {
-        [style applyStyleOnNavigationBar:navigationBar];
-    }
+    [ThemeService.shared.theme applyStyleOnNavigationBar:self.navigationController.navigationBar];
     
-    // @TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    // @TODO Design the activity indicator for Tchap
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
     
     // Check the table view style to select its bg color.
-    self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? style.backgroundColor : style.secondaryBackgroundColor);
+    self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.tableView.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     [self setNeedsStatusBarAppearanceUpdate];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 - (void)didReceiveMemoryWarning
@@ -536,30 +529,30 @@ - (NSAttributedString*)cryptographyInformation
     // Crypto information
     NSMutableAttributedString *cryptoInformationString = [[NSMutableAttributedString alloc]
                                                           initWithString:NSLocalizedStringFromTable(@"settings_crypto_device_name", @"Vector", nil)
-                                                          attributes:@{NSForegroundColorAttributeName : self.currentStyle.primaryTextColor,
+                                                          attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                        NSFontAttributeName: [UIFont systemFontOfSize:17]}];
     [cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
                                                      initWithString:account.device.displayName ? account.device.displayName : @""
-                                                     attributes:@{NSForegroundColorAttributeName : self.currentStyle.primaryTextColor,
+                                                     attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                   NSFontAttributeName: [UIFont systemFontOfSize:17]}]];
     
     [cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
                                                      initWithString:NSLocalizedStringFromTable(@"settings_crypto_device_id", @"Vector", nil)
-                                                     attributes:@{NSForegroundColorAttributeName : self.currentStyle.primaryTextColor,
+                                                     attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                   NSFontAttributeName: [UIFont systemFontOfSize:17]}]];
     [cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
                                                      initWithString:account.device.deviceId ? account.device.deviceId : @""
-                                                     attributes:@{NSForegroundColorAttributeName : self.currentStyle.primaryTextColor,
+                                                     attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                   NSFontAttributeName: [UIFont systemFontOfSize:17]}]];
     
     [cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
                                                      initWithString:NSLocalizedStringFromTable(@"settings_crypto_device_key", @"Vector", nil)
-                                                     attributes:@{NSForegroundColorAttributeName : self.currentStyle.primaryTextColor,
+                                                     attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                   NSFontAttributeName: [UIFont systemFontOfSize:17]}]];
     NSString *fingerprint = account.mxSession.crypto.deviceEd25519Key;
     [cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
                                                      initWithString:fingerprint ? fingerprint : @""
-                                                     attributes:@{NSForegroundColorAttributeName : self.currentStyle.primaryTextColor,
+                                                     attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                   NSFontAttributeName: [UIFont boldSystemFontOfSize:17]}]];
     
     return cryptoInformationString;
@@ -813,12 +806,12 @@ - (MXKTableViewCellWithLabelAndTextField*)getLabelAndTextFieldCell:(UITableView*
     cell.mxkTextFieldLeadingConstraint.constant = 16;
     cell.mxkTextFieldTrailingConstraint.constant = 15;
     
-    cell.mxkLabel.textColor = self.currentStyle.primaryTextColor;
+    cell.mxkLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
     
     cell.mxkTextField.userInteractionEnabled = YES;
     cell.mxkTextField.borderStyle = UITextBorderStyleNone;
     cell.mxkTextField.textAlignment = NSTextAlignmentRight;
-    cell.mxkTextField.textColor = self.currentStyle.secondaryTextColor;
+    cell.mxkTextField.textColor = ThemeService.shared.theme.textSecondaryColor;
     cell.mxkTextField.font = [UIFont systemFontOfSize:16];
     cell.mxkTextField.placeholder = nil;
     
@@ -840,9 +833,9 @@ - (MXKTableViewCellWithLabelAndSwitch*)getLabelAndSwitchCell:(UITableView*)table
     cell.mxkLabelLeadingConstraint.constant = cell.separatorInset.left;
     cell.mxkSwitchTrailingConstraint.constant = 15;
     
-    cell.mxkLabel.textColor = self.currentStyle.primaryTextColor;
+    cell.mxkLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
     
-    cell.mxkSwitch.onTintColor = self.currentStyle.buttonBorderedBackgroundColor;
+    cell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
     [cell.mxkSwitch removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
     
     // Force layout before reusing a cell (fix switch displayed outside the screen)
@@ -867,7 +860,7 @@ - (MXKTableViewCell*)getDefaultTableViewCell:(UITableView*)tableView
     }
     cell.textLabel.accessibilityIdentifier = nil;
     cell.textLabel.font = [UIFont systemFontOfSize:17];
-    cell.textLabel.textColor = self.currentStyle.primaryTextColor;
+    cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
     
     return cell;
 }
@@ -876,7 +869,7 @@ - (MXKTableViewCellWithTextView*)textViewCellForTableView:(UITableView*)tableVie
 {
     MXKTableViewCellWithTextView *textViewCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithTextView defaultReuseIdentifier] forIndexPath:indexPath];
     
-    textViewCell.mxkTextView.textColor = self.currentStyle.primaryTextColor;
+    textViewCell.mxkTextView.textColor = ThemeService.shared.theme.textPrimaryColor;
     textViewCell.mxkTextView.font = [UIFont systemFontOfSize:17];
     textViewCell.mxkTextView.backgroundColor = [UIColor clearColor];
     textViewCell.mxkTextViewLeadingConstraint.constant = tableView.separatorInset.left;
@@ -893,7 +886,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
     // set the cell to a default value to avoid application crashes
     UITableViewCell *cell = [[UITableViewCell alloc] init];
-    cell.backgroundColor = self.currentStyle.warnTextColor;
+    cell.backgroundColor = ThemeService.shared.theme.warningColor;
     
     // check if there is a valid session
     MXKAccount* account = [MXKAccountManager sharedManager].activeAccounts.firstObject;
@@ -921,7 +914,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         
         [signOutCell.mxkButton setTitle:title forState:UIControlStateNormal];
         [signOutCell.mxkButton setTitle:title forState:UIControlStateHighlighted];
-        [signOutCell.mxkButton setTintColor:self.currentStyle.buttonPlainTitleColor];
+        [signOutCell.mxkButton setTintColor:ThemeService.shared.theme.tintColor];
         signOutCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
         
         [signOutCell.mxkButton  removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -953,7 +946,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             
             profileCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_profile_picture", @"Vector", nil);
             profileCell.accessibilityIdentifier=@"SettingsVCProfilPictureStaticText";
-            profileCell.mxkLabel.textColor = self.currentStyle.primaryTextColor;
+            profileCell.mxkLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
             
             // if the user defines a new avatar
             if (newAvatarImage)
@@ -1052,7 +1045,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         else if (row == userSettingsNightModeSepIndex)
         {
             UITableViewCell *sepCell = [[UITableViewCell alloc] init];
-            sepCell.backgroundColor = self.currentStyle.secondaryBackgroundColor;
+            sepCell.backgroundColor = ThemeService.shared.theme.selectedBackgroundColor;
             
             cell = sepCell;
         }
@@ -1073,11 +1066,11 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             NSString *title = NSLocalizedStringFromTable(@"settings_hide_from_users_directory_title", @"Tchap", nil);
             NSString *summary = NSLocalizedStringFromTable(@"settings_hide_from_users_directory_summary", @"Tchap", nil);
             NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] initWithString: title
-                                                                                               attributes:@{NSForegroundColorAttributeName : self.currentStyle.primaryTextColor,
+                                                                                               attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                                                             NSFontAttributeName: [UIFont systemFontOfSize:17.0]}];
             [attributedText appendAttributedString:[[NSAttributedString alloc] initWithString:@"\n\n" attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:4]}]];
             [attributedText appendAttributedString:[[NSMutableAttributedString alloc] initWithString: summary
-                                                                                          attributes:@{NSForegroundColorAttributeName : self.currentStyle.secondaryTextColor,
+                                                                                          attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textSecondaryColor,
                                                                                                        NSFontAttributeName: [UIFont systemFontOfSize:14.0]}]];
             
             labelAndSwitchCell.mxkLabel.attributedText = attributedText;
@@ -1165,7 +1158,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             NSLocale *local = [[NSLocale alloc] initWithLocaleIdentifier:[[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0]];
             NSString *countryName = [local displayNameForKey:NSLocaleCountryCode value:countryCode];
             
-            cell.textLabel.textColor = self.currentStyle.primaryTextColor;
+            cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
             
             cell.textLabel.text = NSLocalizedStringFromTable(@"settings_contacts_phonebook_country", @"Vector", nil);
             cell.detailTextLabel.text = countryName;
@@ -1183,11 +1176,11 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             NSString *title = NSLocalizedStringFromTable(@"settings_show_join_leave_messages_title", @"Tchap", nil);
             NSString *summary = NSLocalizedStringFromTable(@"settings_show_join_leave_messages_summary", @"Tchap", nil);
             NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] initWithString: title
-                                                                                               attributes:@{NSForegroundColorAttributeName : self.currentStyle.primaryTextColor,
+                                                                                               attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                                                             NSFontAttributeName: [UIFont systemFontOfSize:17.0]}];
             [attributedText appendAttributedString:[[NSAttributedString alloc] initWithString:@"\n\n" attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:4]}]];
             [attributedText appendAttributedString:[[NSMutableAttributedString alloc] initWithString: summary
-                                                                                          attributes:@{NSForegroundColorAttributeName : self.currentStyle.secondaryTextColor,
+                                                                                          attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textSecondaryColor,
                                                                                                        NSFontAttributeName: [UIFont systemFontOfSize:14.0]}]];
             
             labelAndSwitchCell.mxkLabel.attributedText = attributedText;
@@ -1282,7 +1275,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             NSString *btnTitle = NSLocalizedStringFromTable(@"settings_mark_all_as_read", @"Vector", nil);
             [markAllBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
             [markAllBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
-            [markAllBtnCell.mxkButton setTintColor:self.currentStyle.buttonPlainTitleColor];
+            [markAllBtnCell.mxkButton setTintColor:ThemeService.shared.theme.tintColor];
             markAllBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
             
             [markAllBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -1307,7 +1300,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             NSString *btnTitle = NSLocalizedStringFromTable(@"settings_clear_cache", @"Vector", nil);
             [clearCacheBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
             [clearCacheBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
-            [clearCacheBtnCell.mxkButton setTintColor:self.currentStyle.buttonPlainTitleColor];
+            [clearCacheBtnCell.mxkButton setTintColor:ThemeService.shared.theme.tintColor];
             clearCacheBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
             
             [clearCacheBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -1332,7 +1325,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             NSString *btnTitle = NSLocalizedStringFromTable(@"settings_report_bug", @"Vector", nil);
             [reportBugBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
             [reportBugBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
-            [reportBugBtnCell.mxkButton setTintColor:self.currentStyle.buttonPlainTitleColor];
+            [reportBugBtnCell.mxkButton setTintColor:ThemeService.shared.theme.tintColor];
             reportBugBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
 
             [reportBugBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -1387,7 +1380,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             NSString *btnTitle = NSLocalizedStringFromTable(@"settings_crypto_export", @"Vector", nil);
             [exportKeysBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
             [exportKeysBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
-            [exportKeysBtnCell.mxkButton setTintColor:self.currentStyle.buttonPlainTitleColor];
+            [exportKeysBtnCell.mxkButton setTintColor:ThemeService.shared.theme.tintColor];
             exportKeysBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
 
             [exportKeysBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -1412,7 +1405,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             NSString *btnTitle = NSLocalizedStringFromTable(@"settings_crypto_import", @"Tchap", nil);
             [importKeysBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
             [importKeysBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
-            [importKeysBtnCell.mxkButton setTintColor:self.currentStyle.buttonPlainTitleColor];
+            [importKeysBtnCell.mxkButton setTintColor:ThemeService.shared.theme.tintColor];
             importKeysBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
 
             [importKeysBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -1445,7 +1438,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         NSString *btnTitle = NSLocalizedStringFromTable(@"settings_deactivate_my_account", @"Vector", nil);
         [deactivateAccountBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
         [deactivateAccountBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
-        [deactivateAccountBtnCell.mxkButton setTintColor:self.currentStyle.warnTextColor];
+        [deactivateAccountBtnCell.mxkButton setTintColor:ThemeService.shared.theme.warningColor];
         deactivateAccountBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
         
         [deactivateAccountBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -1530,7 +1523,7 @@ - (void)tableView:(UITableView *)tableView willDisplayHeaderView:(UIView *)view
     {
         // Customize label style
         UITableViewHeaderFooterView *tableViewHeaderFooterView = (UITableViewHeaderFooterView*)view;
-        tableViewHeaderFooterView.textLabel.textColor = self.currentStyle.primaryTextColor;
+        tableViewHeaderFooterView.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
         tableViewHeaderFooterView.textLabel.font = [UIFont systemFontOfSize:15];
     }
 }
@@ -1549,15 +1542,15 @@ - (void)tableView:(UITableView*)tableView commitEditingStyle:(UITableViewCellEdi
 
 - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
 {
-    cell.backgroundColor = self.currentStyle.backgroundColor;
+    cell.backgroundColor = ThemeService.shared.theme.backgroundColor;
     
     if (cell.selectionStyle != UITableViewCellSelectionStyleNone)
     {        
         // Update the selected background view
-        if (self.currentStyle.secondaryBackgroundColor)
+        if (ThemeService.shared.theme.selectedBackgroundColor)
         {
             cell.selectedBackgroundView = [[UIView alloc] init];
-            cell.selectedBackgroundView.backgroundColor = self.currentStyle.secondaryBackgroundColor;
+            cell.selectedBackgroundView.backgroundColor = ThemeService.shared.theme.selectedBackgroundColor;
         }
         else
         {
@@ -1720,7 +1713,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         {
             if (row == localContactsPhoneBookCountryIndex)
             {
-                CountryPickerViewController *countryPicker = [CountryPickerViewController instantiateWithStyle:self.currentStyle];
+                CountryPickerViewController *countryPicker = [CountryPickerViewController instantiate];
                 countryPicker.view.tag = SETTINGS_SECTION_CONTACTS_INDEX;
                 countryPicker.delegate = self;
                 countryPicker.showCountryCallingCode = YES;

From 40428d8bcd7b40b86f5522ed48df8d5364f6119c Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Thu, 23 Sep 2021 10:10:42 +0200
Subject: [PATCH 02/13] Update Authentication, Forgot Password and Registration
 to use ThemeService instead of Style

---
 .../AuthenticationViewController.swift        | 26 +++++++---------
 ...asswordCurrentPasswordViewController.swift |  2 +-
 ...ngePasswordNewPasswordViewController.swift |  2 +-
 Tchap/Modules/Common/Forms/FormCheckBox.swift |  8 ++---
 .../Modules/Common/Forms/FormTextField.swift  | 12 ++++----
 .../ForgotPasswordFormViewController.swift    |  4 +--
 .../RegistrationEmailSentViewController.swift | 30 ++++++++-----------
 .../Form/RegistrationFormViewController.swift | 26 +++++++---------
 .../RoomCreationViewController.swift          |  2 +-
 9 files changed, 50 insertions(+), 62 deletions(-)

diff --git a/Tchap/Modules/Authentication/AuthenticationViewController.swift b/Tchap/Modules/Authentication/AuthenticationViewController.swift
index c7a62f5d27..5bcdc00f8b 100644
--- a/Tchap/Modules/Authentication/AuthenticationViewController.swift
+++ b/Tchap/Modules/Authentication/AuthenticationViewController.swift
@@ -37,7 +37,6 @@ final class AuthenticationViewController: UIViewController {
     private var viewModel: AuthenticationViewModelType!
     private var errorPresenter: ErrorPresenter?
     private var keyboardAvoider: KeyboardAvoider?
-    private var currentStyle: Style!
     
     // MARK: Public
     
@@ -45,9 +44,8 @@ final class AuthenticationViewController: UIViewController {
     
     // MARK: - Setup
     
-    class func instantiate(viewModel: AuthenticationViewModelType, style: Style = Variant2Style.shared) -> AuthenticationViewController {
+    class func instantiate(viewModel: AuthenticationViewModelType) -> AuthenticationViewController {
         let viewController = StoryboardScene.AuthenticationViewController.initialScene.instantiate()
-        viewController.currentStyle = style
         viewController.viewModel = viewModel
         return viewController
     }
@@ -80,7 +78,7 @@ final class AuthenticationViewController: UIViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Public
@@ -113,7 +111,7 @@ final class AuthenticationViewController: UIViewController {
     }
     
     private func userThemeDidChange() {
-        self.update(style: self.currentStyle)
+        self.updateTheme()
     }
     
     // MARK: - Actions
@@ -136,21 +134,19 @@ final class AuthenticationViewController: UIViewController {
     }
 }
 
-// MARK: - Stylable
-extension AuthenticationViewController: Stylable {
-    func update(style: Style) {
-        self.currentStyle = style
+// MARK: - Theme
+private extension AuthenticationViewController {
+    func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
-        self.view.backgroundColor = style.backgroundColor
-        
-        style.applyStyle(onButton: self.forgotPasswordButton)
+        ThemeService.shared().theme.applyStyle(onButton: self.forgotPasswordButton)
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
-        self.loginFormTextField.update(style: style)
-        self.passwordFormTextField.update(style: style)
+        self.loginFormTextField.updateTheme()
+        self.passwordFormTextField.updateTheme()
     }
 }
 
diff --git a/Tchap/Modules/ChangePassword/CurrentPassword/ChangePasswordCurrentPasswordViewController.swift b/Tchap/Modules/ChangePassword/CurrentPassword/ChangePasswordCurrentPasswordViewController.swift
index 14adea0795..a9b87ca1fb 100644
--- a/Tchap/Modules/ChangePassword/CurrentPassword/ChangePasswordCurrentPasswordViewController.swift
+++ b/Tchap/Modules/ChangePassword/CurrentPassword/ChangePasswordCurrentPasswordViewController.swift
@@ -93,7 +93,7 @@ final class ChangePasswordCurrentPasswordViewController: UIViewController {
         }
                 
         self.instructionsLabel.textColor = style.secondaryTextColor
-        self.passwordFormTextField.update(style: style)
+        self.passwordFormTextField.updateTheme()
         
         style.applyStyle(onButton: self.validateButton)
     }
diff --git a/Tchap/Modules/ChangePassword/NewPassword/ChangePasswordNewPasswordViewController.swift b/Tchap/Modules/ChangePassword/NewPassword/ChangePasswordNewPasswordViewController.swift
index 1e37ad9312..dc5012f8d8 100644
--- a/Tchap/Modules/ChangePassword/NewPassword/ChangePasswordNewPasswordViewController.swift
+++ b/Tchap/Modules/ChangePassword/NewPassword/ChangePasswordNewPasswordViewController.swift
@@ -99,7 +99,7 @@ final class ChangePasswordNewPasswordViewController: UIViewController {
         
         self.instructionsLabel.textColor = style.secondaryTextColor
         for formTextield in self.formTextFields {
-            formTextield.update(style: style)
+            formTextield.updateTheme()
         }
         
         self.validateButton.backgroundColor = style.backgroundColor
diff --git a/Tchap/Modules/Common/Forms/FormCheckBox.swift b/Tchap/Modules/Common/Forms/FormCheckBox.swift
index 60a32f9da4..0fbba13460 100644
--- a/Tchap/Modules/Common/Forms/FormCheckBox.swift
+++ b/Tchap/Modules/Common/Forms/FormCheckBox.swift
@@ -113,9 +113,9 @@ final class FormCheckBox: UIView, NibOwnerLoadable {
     }
 }
 
-// MARK: - Stylable
-extension FormCheckBox: Stylable {
-    func update(style: Style) {
-        self.label.textColor = style.buttonPlainTitleColor
+// MARK: - Theme
+extension FormCheckBox {
+    func updateTheme() {
+        self.label.textColor = ThemeService.shared().theme.textSecondaryColor
     }
 }
diff --git a/Tchap/Modules/Common/Forms/FormTextField.swift b/Tchap/Modules/Common/Forms/FormTextField.swift
index c42c10fe4c..1f602f4678 100644
--- a/Tchap/Modules/Common/Forms/FormTextField.swift
+++ b/Tchap/Modules/Common/Forms/FormTextField.swift
@@ -168,12 +168,12 @@ final class FormTextField: UIView, NibOwnerLoadable {
     }
 }
 
-// MARK: - Stylable
-extension FormTextField: Stylable {
-    func update(style: Style) {
-        style.applyStyle(onTextField: self.textField)
-        self.separatorView.backgroundColor = style.separatorColor
-        self.additionalInfoLabel.textColor = style.secondaryTextColor
+// MARK: - Theme
+extension FormTextField {
+    func updateTheme() {
+        ThemeService.shared().theme.applyStyle(onTextField: self.textField)
+        self.separatorView.backgroundColor = ThemeService.shared().theme.lineBreakColor
+        self.additionalInfoLabel.textColor = ThemeService.shared().theme.textSecondaryColor
     }
 }
 
diff --git a/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift b/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift
index 000e3a3537..ac4484f50e 100644
--- a/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift
+++ b/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift
@@ -163,8 +163,8 @@ extension ForgotPasswordFormViewController: Stylable {
             style.applyStyle(onNavigationBar: navigationBar)
         }
         
-        for formTextield in self.formTextFields {
-            formTextield.update(style: style)
+        for formTextField in self.formTextFields {
+            formTextField.updateTheme()
         }
         
         style.applyStyle(onButton: self.sendEmailButton)
diff --git a/Tchap/Modules/Registration/EmailSent/RegistrationEmailSentViewController.swift b/Tchap/Modules/Registration/EmailSent/RegistrationEmailSentViewController.swift
index aa1256bc4f..3006fadc27 100644
--- a/Tchap/Modules/Registration/EmailSent/RegistrationEmailSentViewController.swift
+++ b/Tchap/Modules/Registration/EmailSent/RegistrationEmailSentViewController.swift
@@ -36,7 +36,6 @@ final class RegistrationEmailSentViewController: UIViewController {
     // MARK: Private
     
     private var userEmail: String!
-    private var currentStyle: Style!
     
     // MARK: Public
     
@@ -44,9 +43,8 @@ final class RegistrationEmailSentViewController: UIViewController {
     
     // MARK: - Setup
     
-    class func instantiate(userEmail: String, style: Style = Variant2Style.shared) -> RegistrationEmailSentViewController {
+    class func instantiate(userEmail: String) -> RegistrationEmailSentViewController {
         let viewController = StoryboardScene.RegistrationEmailSentViewController.initialScene.instantiate()
-        viewController.currentStyle = style
         viewController.userEmail = userEmail
         return viewController
     }
@@ -73,7 +71,7 @@ final class RegistrationEmailSentViewController: UIViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Private
@@ -87,7 +85,7 @@ final class RegistrationEmailSentViewController: UIViewController {
     }
     
     private func userThemeDidChange() {
-        self.update(style: self.currentStyle)
+        self.updateTheme()
     }
     
     // MARK: - Actions
@@ -101,22 +99,20 @@ final class RegistrationEmailSentViewController: UIViewController {
     }
 }
 
-// MARK: - Stylable
-extension RegistrationEmailSentViewController: Stylable {
-    func update(style: Style) {
-        self.currentStyle = style
-        
-        self.view.backgroundColor = style.backgroundColor
+// MARK: - Theme
+private extension RegistrationEmailSentViewController {
+    func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
-        self.emailSentInfoLabel.textColor = style.primarySubTextColor
-        self.userEmailLabel.textColor = style.secondaryTextColor
-        self.userInstructionsLabel.textColor = style.primarySubTextColor
+        self.emailSentInfoLabel.textColor = ThemeService.shared().theme.textTertiaryColor
+        self.userEmailLabel.textColor = ThemeService.shared().theme.textSecondaryColor
+        self.userInstructionsLabel.textColor = ThemeService.shared().theme.textTertiaryColor
         
-        style.applyStyle(onButton: self.goToLoginButton)
-        style.applyStyle(onButton: self.emailNotReceivedButton)
+        ThemeService.shared().theme.applyStyle(onButton: self.goToLoginButton)
+        ThemeService.shared().theme.applyStyle(onButton: self.emailNotReceivedButton)
     }
 }
diff --git a/Tchap/Modules/Registration/Form/RegistrationFormViewController.swift b/Tchap/Modules/Registration/Form/RegistrationFormViewController.swift
index fa18d928bd..cbe9fafbf2 100644
--- a/Tchap/Modules/Registration/Form/RegistrationFormViewController.swift
+++ b/Tchap/Modules/Registration/Form/RegistrationFormViewController.swift
@@ -40,7 +40,6 @@ final class RegistrationFormViewController: UIViewController {
     private var viewModel: RegistrationFormViewModelType!
     private var errorPresenter: ErrorPresenter?
     private var keyboardAvoider: KeyboardAvoider?
-    private var currentStyle: Style!
     
     // MARK: Public
     
@@ -48,9 +47,8 @@ final class RegistrationFormViewController: UIViewController {
     
     // MARK: - Setup
     
-    class func instantiate(viewModel: RegistrationFormViewModelType, style: Style = Variant2Style.shared) -> RegistrationFormViewController {
+    class func instantiate(viewModel: RegistrationFormViewModelType) -> RegistrationFormViewController {
         let viewController = StoryboardScene.RegistrationFormViewController.initialScene.instantiate()
-        viewController.currentStyle = style
         viewController.viewModel = viewModel
         return viewController
     }
@@ -83,7 +81,7 @@ final class RegistrationFormViewController: UIViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Public
@@ -133,7 +131,7 @@ final class RegistrationFormViewController: UIViewController {
     }
     
     private func userThemeDidChange() {
-        self.update(style: self.currentStyle)
+        self.updateTheme()
     }
     
     private func hideConfirmPasswordTextField(_ hide: Bool) {
@@ -159,22 +157,20 @@ final class RegistrationFormViewController: UIViewController {
     }
 }
 
-// MARK: - Stylable
-extension RegistrationFormViewController: Stylable {
-    func update(style: Style) {
-        self.currentStyle = style
-        
-        self.view.backgroundColor = style.backgroundColor
+// MARK: - Theme
+private extension RegistrationFormViewController {
+    func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
-        for formTextield in self.formTextFields {
-            formTextield.update(style: style)
+        for formTextField in self.formTextFields {
+            formTextField.updateTheme()
         }
         
-        self.termsFormCheckBox.update(style: style)
+        self.termsFormCheckBox.updateTheme()
     }
 }
 
diff --git a/Tchap/Modules/RoomCreation/RoomCreationViewController.swift b/Tchap/Modules/RoomCreation/RoomCreationViewController.swift
index c9257d123e..e1178b6d36 100644
--- a/Tchap/Modules/RoomCreation/RoomCreationViewController.swift
+++ b/Tchap/Modules/RoomCreation/RoomCreationViewController.swift
@@ -340,7 +340,7 @@ extension RoomCreationViewController: Stylable {
             style.applyStyle(onNavigationBar: navigationBar)
         }
         
-        self.roomNameFormTextField.update(style: style)
+        self.roomNameFormTextField.updateTheme()
         self.publicVisibilityInfoLabel.textColor = style.boxTextColor
         self.publicRoomFederationTitleLabel.textColor = style.boxTextColor
 

From 51d8afc07b7604fb59a7e8ef78b54ab2f12e9832 Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Thu, 23 Sep 2021 11:43:06 +0200
Subject: [PATCH 03/13] Update Room classes to use ThemeService instead of
 Style

---
 Riot/Managers/Theme/Theme.swift               |  5 ++
 Riot/Managers/Theme/Themes/DarkTheme.swift    |  4 ++
 Riot/Managers/Theme/Themes/DefaultTheme.swift |  4 ++
 .../RetentionPeriodPickerContentView.swift    | 16 ++---
 .../FavouriteMessagesViewController.swift     |  2 +-
 .../PublicRoomsViewController.swift           | 22 +++----
 .../PublicRooms/Views/PublicRoomsCell.swift   | 28 ++++-----
 .../Attachements/AttachmentsViewController.m  | 21 +++----
 .../Room/Files/RoomFilesViewController.m      | 24 +++-----
 .../Detail/RoomMemberDetailsViewController.m  | 28 ++++-----
 .../Members/RoomParticipantsViewController.m  | 32 +++++-----
 .../RoomAccessByLinkViewController.swift      | 34 +++++------
 Tchap/Modules/Room/RoomViewController.m       | 35 +++++------
 .../Settings/RoomSettingsViewController.m     | 61 ++++++++-----------
 .../Views/RetentionPeriodPickerCell.swift     | 11 ++--
 ...ntAntivirusScanStatusCellContentView.swift | 21 +++----
 .../DisabledRoomInputToolbarView.m            | 18 ++----
 .../Views/InputToolbar/RoomInputToolbarView.m | 18 +++---
 .../Modules/Room/Views/Preview/PreviewView.m  | 30 ++++-----
 .../Room/Views/Title/RoomTitleView.swift      | 25 +++-----
 .../RoomCreation/RoomCreationAvatarView.swift | 20 +++---
 .../RoomCreationCoordinator.swift             |  2 +-
 .../RoomCreationViewController.swift          | 32 +++++-----
 Tchap/Modules/Rooms/Views/RoomsCell.swift     | 27 ++++----
 .../Rooms/Views/RoomsDiscussionCell.swift     |  6 +-
 .../Modules/Rooms/Views/RoomsInviteCell.swift | 16 ++---
 Tchap/Modules/Rooms/Views/RoomsRoomCell.swift |  6 +-
 .../Rooms/Views/RoomsTchapInfoCell.swift      |  4 +-
 .../Views/ShareRoomsDiscussionCell.swift      |  8 +--
 .../Listing/Views/ShareRoomsRoomCell.swift    |  6 +-
 30 files changed, 248 insertions(+), 318 deletions(-)

diff --git a/Riot/Managers/Theme/Theme.swift b/Riot/Managers/Theme/Theme.swift
index a5a75ad771..08e1c1e96a 100644
--- a/Riot/Managers/Theme/Theme.swift
+++ b/Riot/Managers/Theme/Theme.swift
@@ -126,4 +126,9 @@ import UIKit
     ///
     /// - Parameter button: The button to customise.
     func applyStyle(onButton button: UIButton)
+    
+    /// Apply the theme on a switch.
+    ///
+    /// - Parameter switch: The switch to customise.
+    func applyStyle(onSwitch uiSwitch: UISwitch)
 }
diff --git a/Riot/Managers/Theme/Themes/DarkTheme.swift b/Riot/Managers/Theme/Themes/DarkTheme.swift
index 7ce49c2144..5c4d10497b 100644
--- a/Riot/Managers/Theme/Themes/DarkTheme.swift
+++ b/Riot/Managers/Theme/Themes/DarkTheme.swift
@@ -141,6 +141,10 @@ class DarkTheme: NSObject, Theme {
         button.setTitleColor(self.tintColor, for: .normal)
     }
     
+    func applyStyle(onSwitch uiSwitch: UISwitch) {
+        uiSwitch.onTintColor = self.headerBackgroundColor
+    }
+    
     ///  MARK: - Theme v2
     
     lazy var colors: Colors = {
diff --git a/Riot/Managers/Theme/Themes/DefaultTheme.swift b/Riot/Managers/Theme/Themes/DefaultTheme.swift
index 9d6f52423a..c334742e75 100644
--- a/Riot/Managers/Theme/Themes/DefaultTheme.swift
+++ b/Riot/Managers/Theme/Themes/DefaultTheme.swift
@@ -134,4 +134,8 @@ class DefaultTheme: NSObject, Theme {
         button.tintColor = self.tintColor
         button.setTitleColor(self.tintColor, for: .normal)
     }
+    
+    func applyStyle(onSwitch uiSwitch: UISwitch) {
+        uiSwitch.onTintColor = self.headerBackgroundColor
+    }
 }
diff --git a/Tchap/Modules/Common/RetentionPeriodPicker/RetentionPeriodPickerContentView.swift b/Tchap/Modules/Common/RetentionPeriodPicker/RetentionPeriodPickerContentView.swift
index 0a7d451a47..c1b5284d40 100644
--- a/Tchap/Modules/Common/RetentionPeriodPicker/RetentionPeriodPickerContentView.swift
+++ b/Tchap/Modules/Common/RetentionPeriodPicker/RetentionPeriodPickerContentView.swift
@@ -21,7 +21,7 @@ protocol RetentionPeriodPickerContentViewDelegate: AnyObject {
     func retentionPeriodPickerContentView(_ view: RetentionPeriodPickerContentView, didSelect periodInDays: uint)
 }
 
-final class RetentionPeriodPickerContentView: UIView, NibOwnerLoadable, Stylable, UIPickerViewDataSource, UIPickerViewDelegate {
+final class RetentionPeriodPickerContentView: UIView, NibOwnerLoadable, UIPickerViewDataSource, UIPickerViewDelegate {
     
     // MARK: - Properties
     
@@ -29,15 +29,13 @@ final class RetentionPeriodPickerContentView: UIView, NibOwnerLoadable, Stylable
     
     private var retentionPeriodValuesNb: Int!
     
-    private var style: Style!
-    
     weak var delegate: RetentionPeriodPickerContentViewDelegate?
     
     // MARK: - Setup
     
     private func commonInit() {
         retentionPeriodValuesNb = 6
-        self.update(style: Variant2Style.shared)
+        self.updateTheme()
     }
     
     convenience init() {
@@ -131,12 +129,10 @@ final class RetentionPeriodPickerContentView: UIView, NibOwnerLoadable, Stylable
         self.pickerView.selectRow(row + self.retentionPeriodValuesNb, inComponent: 0, animated: animated)
     }
     
-    // MARK: - Stylable
+    // MARK: - Theme
     
-    func update(style: Style) {
-        self.style = style
-        
-        self.pickerView.backgroundColor = self.style.backgroundColor
-        self.pickerView.tintColor = self.style.primaryTextColor
+    func updateTheme() {
+        self.pickerView.backgroundColor = ThemeService.shared().theme.backgroundColor
+        self.pickerView.tintColor = ThemeService.shared().theme.textPrimaryColor
     }
 }
diff --git a/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift b/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift
index c3a31944cf..2b5b1af570 100644
--- a/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift
+++ b/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift
@@ -195,7 +195,7 @@ final class FavouriteMessagesViewController: UIViewController {
     
     private func setupTitleView() {
         // Build title view
-        self.titleView = RoomTitleView.instantiate(style: self.currentStyle)
+        self.titleView = RoomTitleView.instantiate()
         self.updateTitleInfo()
         self.navigationItem.titleView = titleView
     }
diff --git a/Tchap/Modules/PublicRooms/PublicRoomsViewController.swift b/Tchap/Modules/PublicRooms/PublicRoomsViewController.swift
index 8296d00f07..8f75947a5a 100644
--- a/Tchap/Modules/PublicRooms/PublicRoomsViewController.swift
+++ b/Tchap/Modules/PublicRooms/PublicRoomsViewController.swift
@@ -31,7 +31,6 @@ final class PublicRoomsViewController: UITableViewController {
     private var publicRoomsDataSource: PublicRoomsDataSource!
     
     private var searchController: UISearchController?
-    private var currentStyle: Style!
     
     // MARK: Public
     
@@ -39,9 +38,8 @@ final class PublicRoomsViewController: UITableViewController {
     
     // MARK: - Setup
     
-    class func instantiate(dataSource: PublicRoomsDataSource, style: Style = Variant1Style.shared) -> PublicRoomsViewController {
+    class func instantiate(dataSource: PublicRoomsDataSource) -> PublicRoomsViewController {
         let viewController = StoryboardScene.PublicRoomsViewController.initialScene.instantiate()
-        viewController.currentStyle = style
         viewController.publicRoomsDataSource = dataSource
         return viewController
     }
@@ -86,7 +84,7 @@ final class PublicRoomsViewController: UITableViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Private
@@ -123,7 +121,7 @@ final class PublicRoomsViewController: UITableViewController {
     }
     
     private func userThemeDidChange() {
-        self.update(style: self.currentStyle)
+        self.updateTheme()
     }
 }
 
@@ -138,19 +136,17 @@ extension PublicRoomsViewController {
     }
 }
 
-// MARK: - Stylable
-extension PublicRoomsViewController: Stylable {
-    func update(style: Style) {
-        self.currentStyle = style
-        
-        self.view.backgroundColor = style.backgroundColor
+// MARK: - Theme
+private extension PublicRoomsViewController {
+    func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
         if let searchBar = self.searchController?.searchBar {
-            style.applyStyle(onSearchBar: searchBar)
+            ThemeService.shared().theme.applyStyle(onSearchBar: searchBar)
         }
     }
 }
diff --git a/Tchap/Modules/PublicRooms/Views/PublicRoomsCell.swift b/Tchap/Modules/PublicRooms/Views/PublicRoomsCell.swift
index 8f1bedb577..8cc554245e 100644
--- a/Tchap/Modules/PublicRooms/Views/PublicRoomsCell.swift
+++ b/Tchap/Modules/PublicRooms/Views/PublicRoomsCell.swift
@@ -17,7 +17,7 @@
 import UIKit
 import Reusable
 
-@objcMembers class PublicRoomsCell: UITableViewCell, Stylable, NibReusable {
+@objcMembers class PublicRoomsCell: UITableViewCell, NibReusable {
     
     private enum Constants {
         static let hexagonImageBorderWidth: CGFloat = 1.0
@@ -29,13 +29,11 @@ import Reusable
     @IBOutlet private(set) weak var memberCount: UILabel!
     @IBOutlet private(set) weak var domainLabel: UILabel!
     
-    private(set) var style: Style!
-    
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
         
-        self.update(style: Variant2Style.shared)
+        self.updateTheme()
         
         self.avatarView.enableInMemoryCache = true
     }
@@ -91,16 +89,6 @@ import Reusable
         self.memberCount.text = membersLabel
     }
     
-    func update(style: Style) {
-        self.style = style
-        self.roomDisplayName.textColor = style.primaryTextColor
-        self.roomTopic.textColor = style.secondaryTextColor
-        self.memberCount.textColor = style.secondaryTextColor
-        self.domainLabel.textColor = style.primarySubTextColor
-        
-        self.avatarView?.defaultBackgroundColor = UIColor.clear
-    }
-    
     private static func homeServerDisplayName(from publicRoomId: String) -> String? {
         guard let matrixIDComponents = RoomIDComponents(matrixID: publicRoomId) else {
             return nil
@@ -109,3 +97,15 @@ import Reusable
         return HomeServerComponents(hostname: matrixIDComponents.homeServer).displayName
     }
 }
+
+// MARK: - Theme
+private extension PublicRoomsCell {
+    func updateTheme() {
+        self.roomDisplayName.textColor = ThemeService.shared().theme.textPrimaryColor
+        self.roomTopic.textColor = ThemeService.shared().theme.textSecondaryColor
+        self.memberCount.textColor = ThemeService.shared().theme.textSecondaryColor
+        self.domainLabel.textColor = ThemeService.shared().theme.textTertiaryColor
+        
+        self.avatarView?.defaultBackgroundColor = UIColor.clear
+    }
+}
diff --git a/Tchap/Modules/Room/Attachements/AttachmentsViewController.m b/Tchap/Modules/Room/Attachements/AttachmentsViewController.m
index b562c44272..84b84799a0 100644
--- a/Tchap/Modules/Room/Attachements/AttachmentsViewController.m
+++ b/Tchap/Modules/Room/Attachements/AttachmentsViewController.m
@@ -19,14 +19,12 @@
 
 #import "GeneratedInterface-Swift.h"
 
-@interface AttachmentsViewController () <Stylable>
+@interface AttachmentsViewController ()
 {
     // Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
     id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
-@property (nonatomic, strong) id<Style> currentStyle;
-
 @end
 
 @implementation AttachmentsViewController
@@ -40,8 +38,6 @@ - (void)finalizeInit
     // Setup `MXKViewControllerHandling` properties.
     self.enableBarTintColorStatusChange = NO;
     self.rageShakeManager = [RageShakeManager sharedManager];
-    
-    self.currentStyle = Variant1Style.shared;
 }
 
 - (void)viewDidLoad
@@ -64,29 +60,28 @@ - (void)viewDidLoad
 
 - (void)userInterfaceThemeDidChange
 {
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
     if (self.navigationBar)
     {
-        [style applyStyleOnNavigationBar:self.navigationBar];
+        [ThemeService.shared.theme applyStyleOnNavigationBar:self.navigationBar];
     }
-    self.backButton.tintColor = style.barActionColor;
+    self.backButton.tintColor = ThemeService.shared.theme.tintColor;
     
     self.view.backgroundColor = [UIColor blackColor];
     
-    // @TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    // @TODO Design the activity indicator for Tchap
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
 
     [self setNeedsStatusBarAppearanceUpdate];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 - (void)viewWillAppear:(BOOL)animated
diff --git a/Tchap/Modules/Room/Files/RoomFilesViewController.m b/Tchap/Modules/Room/Files/RoomFilesViewController.m
index f114cea05b..cf00f6af56 100644
--- a/Tchap/Modules/Room/Files/RoomFilesViewController.m
+++ b/Tchap/Modules/Room/Files/RoomFilesViewController.m
@@ -24,7 +24,7 @@
 
 #import "AttachmentsViewController.h"
 
-@interface RoomFilesViewController () <Stylable>
+@interface RoomFilesViewController ()
 {
     /**
      Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
@@ -32,8 +32,6 @@ @interface RoomFilesViewController () <Stylable>
     id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
-@property (nonatomic, strong) id<Style> currentStyle;
-
 @end
 
 @implementation RoomFilesViewController
@@ -42,9 +40,7 @@ @implementation RoomFilesViewController
 
 + (instancetype)instantiate
 {
-    RoomFilesViewController *roomFilesViewController = [RoomFilesViewController roomViewController];
-    roomFilesViewController.currentStyle = Variant2Style.shared;
-    return roomFilesViewController;
+    return [RoomFilesViewController roomViewController];
 }
 
 - (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil bundle:(nullable NSBundle *)nibBundleOrNil
@@ -124,24 +120,22 @@ - (void)viewDidAppear:(BOOL)animated
 
 - (void)userInterfaceThemeDidChange
 {
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-    
     UINavigationBar *navigationBar = self.navigationController.navigationBar;
     
     if (navigationBar)
     {
-        [style applyStyleOnNavigationBar:navigationBar];
+        [ThemeService.shared.theme applyStyleOnNavigationBar:navigationBar];
     }
     
-    //TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    //TODO Design the activity indicator for Tchap
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
     
-    self.bubblesTableView.backgroundColor = style.backgroundColor;
+    self.bubblesTableView.backgroundColor = ThemeService.shared.theme.backgroundColor;
     self.view.backgroundColor = self.bubblesTableView.backgroundColor;
     
     if (self.bubblesTableView.dataSource)
@@ -154,7 +148,7 @@ - (void)updateWithStyle:(id<Style>)style
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Tchap/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Tchap/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
index 3db7baf51b..9ed5119b75 100644
--- a/Tchap/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
+++ b/Tchap/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
@@ -31,7 +31,7 @@
 #define TABLEVIEW_SECTION_HEADER_HEIGHT   28
 #define TABLEVIEW_SECTION_HEADER_HEIGHT_WHEN_HIDDEN 0.01f
 
-@interface RoomMemberDetailsViewController () <Stylable> // , DeviceVerificationCoordinatorBridgePresenterDelegate>
+@interface RoomMemberDetailsViewController () // <DeviceVerificationCoordinatorBridgePresenterDelegate>
 {
     RoomTitleView* memberTitleView;
     
@@ -70,8 +70,6 @@ @interface RoomMemberDetailsViewController () <Stylable> // , DeviceVerification
     RoomFilesViewController *filesViewController;
 }
 
-@property (nonatomic, strong) id<Style> currentStyle;
-
 @end
 
 @implementation RoomMemberDetailsViewController
@@ -88,8 +86,6 @@ + (instancetype)instantiate
 {
     RoomMemberDetailsViewController *roomMemberDetailsViewController = [[[self class] alloc] initWithNibName:NSStringFromClass(self.class)
                                           bundle:[NSBundle bundleForClass:self.class]];
-    
-    roomMemberDetailsViewController.currentStyle = Variant2Style.shared;
     return roomMemberDetailsViewController;
 }
 
@@ -113,7 +109,7 @@ - (void)finalizeInit
 - (void)setupTitleView {
     
     if (!memberTitleView) {
-        RoomTitleView *titleView = [RoomTitleView instantiateWithStyle:Variant2Style.shared];
+        RoomTitleView *titleView = [RoomTitleView instantiate];
         self.navigationItem.titleView = titleView;
         memberTitleView = titleView;
     }
@@ -155,27 +151,25 @@ - (void)viewDidLoad
 
 - (void)userInterfaceThemeDidChange
 {
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-    
     UINavigationBar *navigationBar = self.navigationController.navigationBar;
     
     if (navigationBar)
     {
-        [style applyStyleOnNavigationBar:navigationBar];
+        [ThemeService.shared.theme applyStyleOnNavigationBar:navigationBar];
     }
     
-    //TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    //TODO Design the activity indicator for Tchap
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
     
-    self.memberHeaderView.backgroundColor = style.backgroundColor;
-    self.roomMemberStatusLabel.textColor = style.primaryTextColor;
+    self.memberHeaderView.backgroundColor = ThemeService.shared.theme.backgroundColor;
+    self.roomMemberStatusLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
     
-    self.tableView.backgroundColor = style.secondaryBackgroundColor;
+    self.tableView.backgroundColor = ThemeService.shared.theme.selectedBackgroundColor;
     self.view.backgroundColor = self.tableView.backgroundColor;
     
     if (self.tableView.dataSource)
@@ -186,7 +180,7 @@ - (void)updateWithStyle:(id<Style>)style
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 - (BOOL)prefersStatusBarHidden
diff --git a/Tchap/Modules/Room/Members/RoomParticipantsViewController.m b/Tchap/Modules/Room/Members/RoomParticipantsViewController.m
index 0f739c5e4f..41fbfa8a53 100644
--- a/Tchap/Modules/Room/Members/RoomParticipantsViewController.m
+++ b/Tchap/Modules/Room/Members/RoomParticipantsViewController.m
@@ -26,7 +26,7 @@
 
 #import "RageShakeManager.h"
 
-@interface RoomParticipantsViewController () <Stylable>
+@interface RoomParticipantsViewController ()
 {
     // Search result
     NSString *currentSearchText;
@@ -70,7 +70,6 @@ @interface RoomParticipantsViewController () <Stylable>
     id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
-@property (nonatomic, strong) id<Style> currentStyle;
 @property (nonatomic, nullable, strong) UserService *userService;
 
 @end
@@ -89,7 +88,6 @@ + (instancetype)instantiate
 {
     RoomParticipantsViewController *roomParticipantsViewController = [[[self class] alloc] initWithNibName:NSStringFromClass([RoomParticipantsViewController class])
                                           bundle:[NSBundle bundleForClass:[RoomParticipantsViewController class]]];
-    roomParticipantsViewController.currentStyle = Variant2Style.shared;
     return roomParticipantsViewController;
 }
 
@@ -164,33 +162,31 @@ - (void)viewDidLoad
 
 - (void)userInterfaceThemeDidChange
 {
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-    
     UINavigationBar *navigationBar = self.navigationController.navigationBar;
     if (navigationBar)
     {
-        [style applyStyleOnNavigationBar:navigationBar];
+        [ThemeService.shared.theme applyStyleOnNavigationBar:navigationBar];
     }
     
     [self refreshSearchBarItemsColor:_searchBarView];
     _searchBarHeaderBorder.backgroundColor = ThemeService.shared.theme.headerBorderColor;
     
-    //TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    //TODO Design the activity indicator for Tchap
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
     
     // Update the gradient view above the screen
     CGFloat white = 1.0;
-    [style.backgroundColor getWhite:&white alpha:nil];
+    [ThemeService.shared.theme.backgroundColor getWhite:&white alpha:nil];
     CGColorRef opaqueWhiteColor = [UIColor colorWithWhite:white alpha:1.0].CGColor;
     CGColorRef transparentWhiteColor = [UIColor colorWithWhite:white alpha:0].CGColor;
     tableViewMaskLayer.colors = @[(__bridge id) transparentWhiteColor, (__bridge id) transparentWhiteColor, (__bridge id) opaqueWhiteColor];
     
-    self.tableView.backgroundColor = style.backgroundColor;
+    self.tableView.backgroundColor = ThemeService.shared.theme.backgroundColor;
     self.view.backgroundColor = self.tableView.backgroundColor;
     
     if (self.tableView.dataSource)
@@ -203,7 +199,7 @@ - (void)updateWithStyle:(id<Style>)style
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 // This method is called when the viewcontroller is added or removed from a container view controller.
@@ -1763,18 +1759,18 @@ - (void)inviteOneByOneSelectedIdentifiers:(NSMutableArray*)selectedIdentifiers
 - (void)refreshSearchBarItemsColor:(UISearchBar *)searchBar
 {
     // bar tint color
-    searchBar.barTintColor = searchBar.tintColor = self.currentStyle.barSubTitleColor;
+    searchBar.barTintColor = searchBar.tintColor = ThemeService.shared.theme.headerTextSecondaryColor;
     
     // FIXME: this all seems incredibly fragile and tied to gutwrenching the current UISearchBar internals.
     
     // text color
     UITextField *searchBarTextField = searchBar.vc_searchTextField;
-    searchBarTextField.textColor = self.currentStyle.barSubTitleColor;
+    searchBarTextField.textColor = ThemeService.shared.theme.headerTextSecondaryColor;
     
     // Magnifying glass icon.
     UIImageView *leftImageView = (UIImageView *)searchBarTextField.leftView;
     leftImageView.image = [leftImageView.image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-    leftImageView.tintColor = self.currentStyle.buttonBorderedBackgroundColor;
+    leftImageView.tintColor = ThemeService.shared.theme.tintColor;
     
     // remove the gray background color
     UIView *effectBackgroundTop =  [searchBarTextField valueForKey:@"_effectBackgroundTop"];
@@ -1785,8 +1781,8 @@ - (void)refreshSearchBarItemsColor:(UISearchBar *)searchBar
     // place holder
     searchBarTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:searchBarTextField.placeholder
                                                                                attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle),
-                                                                                            NSUnderlineColorAttributeName: self.currentStyle.barSubTitleColor,
-                                                                                            NSForegroundColorAttributeName: self.currentStyle.barSubTitleColor}];
+                                                                                            NSUnderlineColorAttributeName: ThemeService.shared.theme.headerTextSecondaryColor,
+                                                                                            NSForegroundColorAttributeName: ThemeService.shared.theme.headerTextSecondaryColor}];
 }
 
 - (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
diff --git a/Tchap/Modules/Room/RoomAccessByLink/RoomAccessByLinkViewController.swift b/Tchap/Modules/Room/RoomAccessByLink/RoomAccessByLinkViewController.swift
index fea58f1278..3ea9a63abd 100644
--- a/Tchap/Modules/Room/RoomAccessByLink/RoomAccessByLinkViewController.swift
+++ b/Tchap/Modules/Room/RoomAccessByLink/RoomAccessByLinkViewController.swift
@@ -37,15 +37,13 @@ final class RoomAccessByLinkViewController: UIViewController {
     // MARK: Private
     
     private var viewModel: RoomAccessByLinkViewModelType!
-    private var currentStyle: Style!
     private var errorPresenter: MXKErrorPresentation!
     private var activityPresenter: ActivityIndicatorPresenter!
     
     // MARK: - Setup
     
-    class func instantiate(viewModel: RoomAccessByLinkViewModelType, style: Style = Variant2Style.shared) -> RoomAccessByLinkViewController {
+    class func instantiate(viewModel: RoomAccessByLinkViewModelType) -> RoomAccessByLinkViewController {
         let viewController = StoryboardScene.RoomAccessByLinkViewController.initialScene.instantiate()
-        viewController.currentStyle = style
         viewController.viewModel = viewModel
         return viewController
     }
@@ -69,7 +67,7 @@ final class RoomAccessByLinkViewController: UIViewController {
         self.viewModel.viewDelegate = self
         
         // Build title view
-        let titleView = RoomTitleView.instantiate(style: self.currentStyle)
+        let titleView = RoomTitleView.instantiate()
         titleView.fill(roomTitleViewModel: self.viewModel.titleViewModel)
         self.navigationItem.titleView = titleView
         
@@ -92,7 +90,7 @@ final class RoomAccessByLinkViewController: UIViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     override func viewDidLayoutSubviews() {
@@ -104,7 +102,7 @@ final class RoomAccessByLinkViewController: UIViewController {
     // MARK: - Private
     
     private func userThemeDidChange() {
-        self.update(style: self.currentStyle)
+        self.updateTheme()
     }
     
     private func setupViews() {
@@ -227,24 +225,22 @@ final class RoomAccessByLinkViewController: UIViewController {
     }
 }
 
-// MARK: - Stylable
-extension RoomAccessByLinkViewController: Stylable {
-    func update(style: Style) {
-        self.currentStyle = style
-        
-        self.view.backgroundColor = style.backgroundColor
+// MARK: - Theme
+private extension RoomAccessByLinkViewController {
+    func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
-        self.roomAccessByLinkStatusLabel.textColor = style.primarySubTextColor
-        self.roomLinkInfoLabel.textColor = style.secondaryTextColor
-        self.roomLinkLabel.textColor = style.boxTextColor
-        self.roomLinkBackgroundView.backgroundColor = style.boxBackgroundColor
+        self.roomAccessByLinkStatusLabel.textColor = ThemeService.shared().theme.textTertiaryColor
+        self.roomLinkInfoLabel.textColor = ThemeService.shared().theme.textSecondaryColor
+        self.roomLinkLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
+        self.roomLinkBackgroundView.backgroundColor = ThemeService.shared().theme.headerBackgroundColor
         
-        style.applyStyle(onButton: self.shareLinkButton)
-        style.applyStyle(onSwitch: self.roomAccessByLinkSwitch)
+        ThemeService.shared().theme.applyStyle(onButton: self.shareLinkButton)
+        ThemeService.shared().theme.applyStyle(onSwitch: self.roomAccessByLinkSwitch)
     }
 }
 
diff --git a/Tchap/Modules/Room/RoomViewController.m b/Tchap/Modules/Room/RoomViewController.m
index d147f799e5..8845d32b68 100644
--- a/Tchap/Modules/Room/RoomViewController.m
+++ b/Tchap/Modules/Room/RoomViewController.m
@@ -123,7 +123,7 @@
 
 NSString *const RoomErrorDomain = @"RoomErrorDomain";
 
-@interface RoomViewController () <UIGestureRecognizerDelegate, Stylable, UIScrollViewAccessibilityDelegate, RoomTitleViewDelegate, MXServerNoticesDelegate, RoomContextualMenuViewControllerDelegate, ReactionsMenuViewModelCoordinatorDelegate, EditHistoryCoordinatorBridgePresenterDelegate, MXKDocumentPickerPresenterDelegate, EmojiPickerCoordinatorBridgePresenterDelegate, ReactionHistoryCoordinatorBridgePresenterDelegate, CameraPresenterDelegate, MediaPickerCoordinatorBridgePresenterDelegate, RoomDataSourceDelegate>
+@interface RoomViewController () <UIGestureRecognizerDelegate, UIScrollViewAccessibilityDelegate, RoomTitleViewDelegate, MXServerNoticesDelegate, RoomContextualMenuViewControllerDelegate, ReactionsMenuViewModelCoordinatorDelegate, EditHistoryCoordinatorBridgePresenterDelegate, MXKDocumentPickerPresenterDelegate, EmojiPickerCoordinatorBridgePresenterDelegate, ReactionHistoryCoordinatorBridgePresenterDelegate, CameraPresenterDelegate, MediaPickerCoordinatorBridgePresenterDelegate, RoomDataSourceDelegate>
 {
     // The preview header
     PreviewView *previewHeader;
@@ -201,7 +201,6 @@ @interface RoomViewController () <UIGestureRecognizerDelegate, Stylable, UIScrol
 @property (weak, nonatomic) IBOutlet UIView *jumpToLastUnreadBannerSeparatorView;
 
 @property (nonatomic, weak) RoomTitleView *roomTitleView;
-@property (nonatomic, strong) id<Style> currentStyle;
 
 // Direct chat target user when create a discussion without associated room
 @property (nonatomic, nullable, strong) User *discussionTargetUser;
@@ -248,7 +247,6 @@ + (nonnull instancetype)instantiate
 {
     RoomViewController *roomViewController = [[[self class] alloc] initWithNibName:NSStringFromClass(self.class)
                                                                             bundle:[NSBundle bundleForClass:self.class]];
-    roomViewController.currentStyle = Variant2Style.shared;
     return roomViewController;
 }
 
@@ -314,7 +312,7 @@ - (void)finalizeInit
 - (void)setupRoomTitleView {
     
     if (!self.roomTitleView) {
-        RoomTitleView *roomTitleView = [RoomTitleView instantiateWithStyle:Variant2Style.shared];
+        RoomTitleView *roomTitleView = [RoomTitleView instantiate];
         roomTitleView.delegate = self;
         self.navigationItem.titleView = roomTitleView;
         self.roomTitleView = roomTitleView;
@@ -432,43 +430,40 @@ - (void)viewDidLoad
 
 - (void)userInterfaceThemeDidChange
 {
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-    
     UINavigationBar *navigationBar = self.navigationController.navigationBar;
-    
     if (navigationBar)
     {
-        [style applyStyleOnNavigationBar:navigationBar];
+        [ThemeService.shared.theme applyStyleOnNavigationBar:navigationBar];
     }
     
-    // @TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    // @TODO Design the activity indicator for Tchap
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
 
     //[self.inputToolbarView customizeViewRendering];
     
     // Prepare jump to last unread banner
-    self.jumpToLastUnreadBannerContainer.backgroundColor = style.secondaryBackgroundColor;
-    self.jumpToLastUnreadLabel.attributedText = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"room_jump_to_first_unread", @"Vector", nil) attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle), NSUnderlineColorAttributeName:style.secondaryTextColor, NSForegroundColorAttributeName:style.secondaryTextColor}];
+    self.jumpToLastUnreadBannerContainer.backgroundColor = ThemeService.shared.theme.selectedBackgroundColor;
+    self.jumpToLastUnreadLabel.attributedText = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"room_jump_to_first_unread", @"Vector", nil) attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle), NSUnderlineColorAttributeName:ThemeService.shared.theme.textSecondaryColor, NSForegroundColorAttributeName:ThemeService.shared.theme.textSecondaryColor}];
     
-    self.jumpToLastUnreadBannerSeparatorView.backgroundColor = style.secondaryBackgroundColor;
+    self.jumpToLastUnreadBannerSeparatorView.backgroundColor = ThemeService.shared.theme.selectedBackgroundColor;
     
-    self.previewHeaderContainer.backgroundColor = style.backgroundColor;
+    self.previewHeaderContainer.backgroundColor = ThemeService.shared.theme.backgroundColor;
     if (previewHeader)
     {
         [previewHeader customizeViewRendering];
     }
     
-    missedDiscussionsBadgeLabel.textColor = style.primaryTextColor;
+    missedDiscussionsBadgeLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
     missedDiscussionsBadgeLabel.font = [UIFont boldSystemFontOfSize:14];
     missedDiscussionsBadgeLabel.backgroundColor = [UIColor clearColor];
     
     // Check the table view style to select its bg color.
-    self.bubblesTableView.backgroundColor = style.backgroundColor;
+    self.bubblesTableView.backgroundColor = ThemeService.shared.theme.backgroundColor;
     self.view.backgroundColor = self.bubblesTableView.backgroundColor;
     
     if (self.bubblesTableView.dataSource)
@@ -481,7 +476,7 @@ - (void)updateWithStyle:(id<Style>)style
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 - (void)didReceiveMemoryWarning
@@ -3500,7 +3495,7 @@ - (IBAction)onButtonPressed:(id)sender
 
 - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    cell.backgroundColor = self.currentStyle.backgroundColor;
+    cell.backgroundColor = ThemeService.shared.theme.backgroundColor;
     
     // Update the selected background view
     if (ThemeService.shared.theme.selectedBackgroundColor)
diff --git a/Tchap/Modules/Room/Settings/RoomSettingsViewController.m b/Tchap/Modules/Room/Settings/RoomSettingsViewController.m
index a1493bbb33..47d7ae1468 100644
--- a/Tchap/Modules/Room/Settings/RoomSettingsViewController.m
+++ b/Tchap/Modules/Room/Settings/RoomSettingsViewController.m
@@ -60,7 +60,7 @@
 NSString *const kRoomSettingsBannedUserCellViewIdentifier = @"kRoomSettingsBannedUserCellViewIdentifier";
 NSString *const kRoomSettingsRetentionCellViewIdentifier = @"kRoomSettingsRetentionCellViewIdentifier";
 
-@interface RoomSettingsViewController () <Stylable, SingleImagePickerPresenterDelegate, RetentionPeriodPickerCellDelegate>
+@interface RoomSettingsViewController () <SingleImagePickerPresenterDelegate, RetentionPeriodPickerCellDelegate>
 {
     // The updated user data
     NSMutableDictionary<NSString*, id> *updatedItemsDict;
@@ -113,8 +113,6 @@ @interface RoomSettingsViewController () <Stylable, SingleImagePickerPresenterDe
 // Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
 @property (nonatomic, weak) id kThemeServiceDidChangeThemeNotificationObserver;
 
-@property (nonatomic, strong) id<Style> currentStyle;
-
 @property (nonatomic, strong) SingleImagePickerPresenter *imagePickerPresenter;
 
 @end
@@ -124,7 +122,6 @@ @implementation RoomSettingsViewController
 + (instancetype)instantiate
 {
     RoomSettingsViewController *roomSettingsViewController = [RoomSettingsViewController roomSettingsViewController];
-    roomSettingsViewController.currentStyle = Variant2Style.shared;
     return roomSettingsViewController;
 }
 
@@ -215,24 +212,22 @@ - (void)viewDidLoad
 
 - (void)userInterfaceThemeDidChange
 {
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-    
     UINavigationBar *navigationBar = self.navigationController.navigationBar;
     
     if (navigationBar)
     {
-        [style applyStyleOnNavigationBar:navigationBar];
+        [ThemeService.shared.theme applyStyleOnNavigationBar:navigationBar];
     }
     
-    //TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    //TODO Design the activity indicator for Tchap
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
     
-    self.tableView.backgroundColor = style.secondaryBackgroundColor;
+    self.tableView.backgroundColor = ThemeService.shared.theme.selectedBackgroundColor;
     self.view.backgroundColor = self.tableView.backgroundColor;
     
     if (self.tableView.dataSource)
@@ -245,7 +240,7 @@ - (void)updateWithStyle:(id<Style>)style
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -1101,7 +1096,7 @@ - (void)tableView:(UITableView *)tableView willDisplayHeaderView:(UIView *)view
     {
         // Customize label style
         UITableViewHeaderFooterView *tableViewHeaderFooterView = (UITableViewHeaderFooterView*)view;
-        tableViewHeaderFooterView.textLabel.textColor = self.currentStyle.primaryTextColor;
+        tableViewHeaderFooterView.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
         tableViewHeaderFooterView.textLabel.font = [UIFont systemFontOfSize:15];
     }
 }
@@ -1184,7 +1179,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                 cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:kRoomSettingsRetentionCellViewIdentifier];
             }
             
-            cell.textLabel.textColor = self.currentStyle.primaryTextColor;
+            cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
             cell.textLabel.text = NSLocalizedStringFromTable(@"room_settings_retention_title", @"Tchap", nil);
             
             uint displayedRetentionPeriod = [mxRoom.summary tc_roomRetentionPeriodInDays];
@@ -1195,7 +1190,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             
             cell.detailTextLabel.text = [RoomService getDisplayLabelForRetentionPeriodInDays:displayedRetentionPeriod];
             
-            cell.detailTextLabel.textColor = isRetentionEdited ? self.currentStyle.warnTextColor : self.currentStyle.secondaryTextColor;
+            cell.detailTextLabel.textColor = isRetentionEdited ? ThemeService.shared.theme.warningColor : ThemeService.shared.theme.textSecondaryColor;
             
             cell.accessoryView = nil;
             cell.accessoryType = UITableViewCellAccessoryNone;
@@ -1236,7 +1231,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             roomPhotoCell.mxkImageView.defaultBackgroundColor = [UIColor clearColor];
             
             roomPhotoCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_photo", @"Vector", nil);
-            roomPhotoCell.mxkLabel.textColor = self.currentStyle.primaryTextColor;
+            roomPhotoCell.mxkLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
             
             if ([updatedItemsDict objectForKey:kRoomSettingsAvatarKey])
             {
@@ -1271,16 +1266,16 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                 topicTextView.text = mxRoomState.topic;
             }
             
-            topicTextView.tintColor = self.currentStyle.secondaryTextColor;
+            topicTextView.tintColor = ThemeService.shared.theme.textSecondaryColor;
             topicTextView.font = [UIFont systemFontOfSize:15];
             topicTextView.bounces = NO;
             topicTextView.delegate = self;
             
             // disable the edition if the user cannot update it
             topicTextView.editable = (oneSelfPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomTopic]);
-            topicTextView.textColor = self.currentStyle.secondaryTextColor;
+            topicTextView.textColor = ThemeService.shared.theme.textSecondaryColor;
             
-            topicTextView.keyboardAppearance = self.currentStyle.keyboardAppearance;
+            topicTextView.keyboardAppearance = ThemeService.shared.theme.keyboardAppearance;
             
             cell = roomTopicCell;
         }
@@ -1293,14 +1288,14 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             roomNameCell.mxkTextFieldTrailingConstraint.constant = 15;
             
             roomNameCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_room_name", @"Vector", nil);
-            roomNameCell.mxkLabel.textColor = self.currentStyle.primaryTextColor;
+            roomNameCell.mxkLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
             
             roomNameCell.accessoryType = UITableViewCellAccessoryNone;
             roomNameCell.accessoryView = nil;
             
             nameTextField = roomNameCell.mxkTextField;
             
-            nameTextField.tintColor = self.currentStyle.secondaryTextColor;
+            nameTextField.tintColor = ThemeService.shared.theme.textSecondaryColor;
             nameTextField.font = [UIFont systemFontOfSize:17];
             nameTextField.borderStyle = UITextBorderStyleNone;
             nameTextField.textAlignment = NSTextAlignmentRight;
@@ -1317,7 +1312,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             
             // disable the edition if the user cannot update it
             nameTextField.userInteractionEnabled = (oneSelfPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomName]);
-            nameTextField.textColor = self.currentStyle.secondaryTextColor;
+            nameTextField.textColor = ThemeService.shared.theme.textSecondaryColor;
             
             // Add a "textFieldDidChange" notification method to the text field control.
             [nameTextField addTarget:self action:@selector(onTextFieldUpdate:) forControlEvents:UIControlEventEditingChanged];
@@ -1332,7 +1327,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             
             [leaveCell.mxkButton setTitle:title forState:UIControlStateNormal];
             [leaveCell.mxkButton setTitle:title forState:UIControlStateHighlighted];
-            [leaveCell.mxkButton setTintColor:self.currentStyle.buttonPlainTitleColor];
+            [leaveCell.mxkButton setTintColor:ThemeService.shared.theme.tintColor];
             leaveCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
             
             [leaveCell.mxkButton  removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -1381,11 +1376,11 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                     summary = NSLocalizedStringFromTable(@"room_settings_room_access_unrestricted", @"Tchap", nil);
                 }
                 NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] initWithString: title
-                                                                                                   attributes:@{NSForegroundColorAttributeName : self.currentStyle.primaryTextColor,
+                                                                                                   attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                                                                 NSFontAttributeName: [UIFont systemFontOfSize:17.0]}];
                 [attributedText appendAttributedString:[[NSAttributedString alloc] initWithString:@"\n\n" attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:4]}]];
                 [attributedText appendAttributedString:[[NSMutableAttributedString alloc] initWithString: summary
-                                                                                              attributes:@{NSForegroundColorAttributeName : self.currentStyle.secondaryTextColor,
+                                                                                              attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textSecondaryColor,
                                                                                                            NSFontAttributeName: [UIFont systemFontOfSize:14.0]}]];
                 
                 roomAccessInfo.textLabel.numberOfLines = 0;
@@ -1405,11 +1400,11 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             NSString *title = NSLocalizedStringFromTable(@"room_settings_room_access_by_link_title", @"Tchap", nil);
             NSString *summary = isRoomAccessByLinkEnabled ? NSLocalizedStringFromTable(@"room_settings_room_access_by_link_enabled", @"Tchap", nil) : NSLocalizedStringFromTable(@"room_settings_room_access_by_link_disabled", @"Tchap", nil);
             NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] initWithString: title
-                                                                                               attributes:@{NSForegroundColorAttributeName : self.currentStyle.primaryTextColor,
+                                                                                               attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                                                             NSFontAttributeName: [UIFont systemFontOfSize:17.0]}];
             [attributedText appendAttributedString:[[NSAttributedString alloc] initWithString:@"\n\n" attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:4]}]];
             [attributedText appendAttributedString:[[NSMutableAttributedString alloc] initWithString: summary
-                                                                                          attributes:@{NSForegroundColorAttributeName : self.currentStyle.secondaryTextColor,
+                                                                                          attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textSecondaryColor,
                                                                                                        NSFontAttributeName: [UIFont systemFontOfSize:14.0]}]];
             
             roomAccessByLink.textLabel.numberOfLines = 0;
@@ -1437,7 +1432,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         UITableViewCell *addressCell = [tableView dequeueReusableCellWithIdentifier:kRoomSettingsBannedUserCellViewIdentifier forIndexPath:indexPath];
         
         addressCell.textLabel.font = [UIFont systemFontOfSize:16];
-        addressCell.textLabel.textColor = self.currentStyle.primaryTextColor;
+        addressCell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
         addressCell.textLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
         addressCell.accessoryView = nil;
         addressCell.accessoryType = UITableViewCellAccessoryNone;
@@ -1471,7 +1466,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         NSLog(@"[RoomSettingsViewController] cellForRowAtIndexPath: invalid indexPath");
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:nil];
     }
-    cell.contentView.backgroundColor = self.currentStyle.backgroundColor;
+    cell.contentView.backgroundColor = ThemeService.shared.theme.backgroundColor;
     
     return cell;
 }
@@ -1493,9 +1488,9 @@ - (MXKTableViewCellWithLabelAndSwitch*)getLabelAndSwitchCell:(UITableView*)table
     cell.mxkLabelLeadingConstraint.constant = cell.separatorInset.left;
     cell.mxkSwitchTrailingConstraint.constant = 15;
     
-    cell.mxkLabel.textColor = self.currentStyle.primaryTextColor;
+    cell.mxkLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
     
-    cell.mxkSwitch.onTintColor = self.currentStyle.buttonBorderedBackgroundColor;
+    cell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
     [cell.mxkSwitch removeTarget:self action:nil forControlEvents:UIControlEventValueChanged];
     
     // Force layout before reusing a cell (fix switch displayed outside the screen)
@@ -1917,5 +1912,3 @@ - (void)retentionPeriodPickerCell:(RetentionPeriodPickerCell *)cell didSelect:(u
 }
 
 @end
-
-
diff --git a/Tchap/Modules/Room/Settings/Views/RetentionPeriodPickerCell.swift b/Tchap/Modules/Room/Settings/Views/RetentionPeriodPickerCell.swift
index 8c1bfe81c2..c3fc5aef5e 100644
--- a/Tchap/Modules/Room/Settings/Views/RetentionPeriodPickerCell.swift
+++ b/Tchap/Modules/Room/Settings/Views/RetentionPeriodPickerCell.swift
@@ -20,18 +20,16 @@ import UIKit
     func retentionPeriodPickerCell(_ cell: RetentionPeriodPickerCell, didSelect periodInDays: uint)
 }
 
-@objcMembers class RetentionPeriodPickerCell: UITableViewCell, Stylable, RetentionPeriodPickerContentViewDelegate {
+@objcMembers class RetentionPeriodPickerCell: UITableViewCell, RetentionPeriodPickerContentViewDelegate {
     
     @IBOutlet private weak var retentionPeriodPickerContentView: RetentionPeriodPickerContentView!
     
-    private(set) var style: Style!
-    
     weak var delegate: RetentionPeriodPickerCellDelegate?
     
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
-        self.update(style: Variant2Style.shared)
+        self.updateTheme()
         
         self.retentionPeriodPickerContentView.delegate = self
     }
@@ -44,9 +42,8 @@ import UIKit
         return String(describing: self)
     }
     
-    func update(style: Style) {
-        self.style = style
-        self.retentionPeriodPickerContentView.update(style: style)
+    func updateTheme() {
+        self.retentionPeriodPickerContentView.updateTheme()
     }
     
     func updatePickerWith(retentionPeriodInDays: uint, animated: Bool) {
diff --git a/Tchap/Modules/Room/Views/BubbleCells/Antivirus/StatusContentView/RoomAttachmentAntivirusScanStatusCellContentView.swift b/Tchap/Modules/Room/Views/BubbleCells/Antivirus/StatusContentView/RoomAttachmentAntivirusScanStatusCellContentView.swift
index f4f9bd8810..5b6dbd4b6d 100644
--- a/Tchap/Modules/Room/Views/BubbleCells/Antivirus/StatusContentView/RoomAttachmentAntivirusScanStatusCellContentView.swift
+++ b/Tchap/Modules/Room/Views/BubbleCells/Antivirus/StatusContentView/RoomAttachmentAntivirusScanStatusCellContentView.swift
@@ -17,7 +17,7 @@
 import UIKit
 import Reusable
 
-@objc final class RoomAttachmentAntivirusScanStatusCellContentView: UIView, NibOwnerLoadable, Stylable {
+@objc final class RoomAttachmentAntivirusScanStatusCellContentView: UIView, NibOwnerLoadable {
     
     // MARK: - Properties
     
@@ -25,12 +25,10 @@ import Reusable
     @IBOutlet private weak var titleLabel: UILabel!
     @IBOutlet private weak var fileInfoLabel: UILabel!
     
-    private var style: Style!
-    
     // MARK: - Setup
     
     private func commonInit() {
-        self.update(style: Variant1Style.shared)
+        self.updateTheme()
     }
     
     convenience init() {
@@ -56,13 +54,12 @@ import Reusable
         self.titleLabel.text = viewModel.title
         self.fileInfoLabel.text = viewModel.fileInfo
     }
-    
-    // MARK: - Stylable
-    
-    func update(style: Style) {
-        self.style = style
-        
-        self.titleLabel.textColor = self.style.primaryTextColor
-        self.fileInfoLabel.textColor = self.style.primaryTextColor
+}
+
+// MARK: - Theme
+private extension RoomAttachmentAntivirusScanStatusCellContentView {
+    func updateTheme() {
+        self.titleLabel.textColor = ThemeService.shared().theme.textPrimaryColor
+        self.fileInfoLabel.textColor = ThemeService.shared().theme.textPrimaryColor
     }
 }
diff --git a/Tchap/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m b/Tchap/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
index 8f3f4401ab..65f0e73ff4 100644
--- a/Tchap/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
+++ b/Tchap/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
@@ -20,10 +20,6 @@
 
 #import "GeneratedInterface-Swift.h"
 
-@interface DisabledRoomInputToolbarView() <Stylable>
-@property (nonatomic, strong) id<Style> currentStyle;
-@end
-
 @implementation DisabledRoomInputToolbarView
 
 + (UINib *)nib
@@ -46,7 +42,7 @@ + (instancetype)roomInputToolbarView
     }
     
 
-    [inputToolbarView updateWithStyle:Variant2Style.shared];
+    [inputToolbarView updateTheme];
     return inputToolbarView;
 }
 
@@ -55,21 +51,19 @@ + (instancetype)roomInputToolbarView
 -(void)customizeViewRendering
 {
     [super customizeViewRendering];
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-    
     // Remove default toolbar background color
     self.backgroundColor = [UIColor clearColor];
     
-    self.separatorView.backgroundColor = style.separatorColor;
+    self.separatorView.backgroundColor = ThemeService.shared.theme.selectedBackgroundColor;
     
     self.disabledReasonTextView.font = [UIFont systemFontOfSize:15];
-    self.disabledReasonTextView.textColor = style.primaryTextColor;
-    self.disabledReasonTextView.tintColor = style.secondaryTextColor;
+    self.disabledReasonTextView.textColor = ThemeService.shared.theme.textPrimaryColor;
+    self.disabledReasonTextView.tintColor = ThemeService.shared.theme.textSecondaryColor;
     self.disabledReasonTextView.editable = NO;
     self.disabledReasonTextView.scrollEnabled = NO;
 }
diff --git a/Tchap/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Tchap/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index fe2adc2676..b9f743da87 100644
--- a/Tchap/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Tchap/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -27,14 +27,12 @@
 
 #import "GeneratedInterface-Swift.h"
 
-@interface RoomInputToolbarView() <Stylable>
+@interface RoomInputToolbarView()
 {
     // The intermediate action sheet
     UIAlertController *actionSheet;
 }
 
-@property (nonatomic, strong) id<Style> currentStyle;
-
 @end
 
 @implementation RoomInputToolbarView
@@ -58,7 +56,7 @@ + (instancetype)roomInputToolbarView
         inputToolbarView = [[self alloc] init];
     }
     
-    [inputToolbarView updateWithStyle:Variant2Style.shared];
+    [inputToolbarView updateTheme];
     return inputToolbarView;
 }
 
@@ -85,17 +83,15 @@ - (void)awakeFromNib
 -(void)customizeViewRendering
 {
     [super customizeViewRendering];
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-    
     // Remove default toolbar background color
     self.backgroundColor = [UIColor clearColor];
     
-    self.separatorView.backgroundColor = style.separatorColor;
+    self.separatorView.backgroundColor = ThemeService.shared.theme.selectedBackgroundColor;
     
     // Custom the growingTextView display
     growingTextView.layer.cornerRadius = 0;
@@ -103,8 +99,8 @@ - (void)updateWithStyle:(id<Style>)style
     growingTextView.backgroundColor = [UIColor clearColor];
     
     growingTextView.font = [UIFont systemFontOfSize:15];
-    growingTextView.textColor = style.primaryTextColor;
-    growingTextView.tintColor = style.secondaryTextColor;
+    growingTextView.textColor = ThemeService.shared.theme.textPrimaryColor;
+    growingTextView.tintColor = ThemeService.shared.theme.textSecondaryColor;
     
     growingTextView.internalTextView.keyboardAppearance = ThemeService.shared.theme.keyboardAppearance;
     if (growingTextView.isFirstResponder)
diff --git a/Tchap/Modules/Room/Views/Preview/PreviewView.m b/Tchap/Modules/Room/Views/Preview/PreviewView.m
index 9aade16360..965cfcc87e 100644
--- a/Tchap/Modules/Room/Views/Preview/PreviewView.m
+++ b/Tchap/Modules/Room/Views/Preview/PreviewView.m
@@ -20,12 +20,6 @@
 
 #import "GeneratedInterface-Swift.h"
 
-@interface PreviewView() <Stylable>
-
-@property (nonatomic, strong) id<Style> currentStyle;
-
-@end
-
 @implementation PreviewView
 
 + (UINib *)nib
@@ -37,7 +31,7 @@ + (UINib *)nib
 + (instancetype)instantiate
 {
     PreviewView *previewView = [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
-    [previewView updateWithStyle:Variant2Style.shared];
+    [previewView updateTheme];
     return previewView;
 }
 
@@ -67,24 +61,22 @@ -(void)customizeViewRendering
     [self.rightButton.layer setCornerRadius:5];
     self.rightButton.clipsToBounds = YES;
     
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-    
-    self.backgroundColor = style.backgroundColor;
+    self.backgroundColor = ThemeService.shared.theme.backgroundColor;
     
-    self.previewLabel.textColor = style.primaryTextColor;
-    self.subNoticeLabel.textColor = style.secondaryTextColor;
-    self.bottomBorderView.backgroundColor = style.secondaryBackgroundColor;
+    self.previewLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
+    self.subNoticeLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
+    self.bottomBorderView.backgroundColor = ThemeService.shared.theme.headerBorderColor;
     
-    self.leftButton.backgroundColor = style.buttonBorderedBackgroundColor;
-    self.leftButton.titleLabel.textColor = style.buttonBorderedTitleColor;
+    self.leftButton.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
+    self.leftButton.titleLabel.textColor = ThemeService.shared.theme.headerTextPrimaryColor;
     
-    self.rightButton.backgroundColor = style.buttonBorderedBackgroundColor;
-    self.rightButton.titleLabel.textColor = style.buttonBorderedTitleColor;
+    self.rightButton.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
+    self.rightButton.titleLabel.textColor = ThemeService.shared.theme.headerTextPrimaryColor;
 }
 
 - (void)refreshDisplay
diff --git a/Tchap/Modules/Room/Views/Title/RoomTitleView.swift b/Tchap/Modules/Room/Views/Title/RoomTitleView.swift
index a51aba5295..899522dbf1 100644
--- a/Tchap/Modules/Room/Views/Title/RoomTitleView.swift
+++ b/Tchap/Modules/Room/Views/Title/RoomTitleView.swift
@@ -21,7 +21,7 @@ import Reusable
     func roomTitleViewDidTapped(_ roomTitleView: RoomTitleView)
 }
 
-@objc final class RoomTitleView: UIView, NibLoadable, Stylable {
+@objc final class RoomTitleView: UIView, NibLoadable {
     
     // MARK: - Constants
     
@@ -49,8 +49,6 @@ import Reusable
     @IBOutlet private weak var imageView: MXKImageView!
     @IBOutlet private weak var roomImageMarker: UIImageView!
     
-    private var style: Style!
-    
     private var imageBorderColor: UIColor = UIColor.clear
     private var imageBorderWidth: CGFloat = Constants.hexagonImageBorderWidth
     
@@ -62,10 +60,8 @@ import Reusable
     
     // MARK: Setup
     
-    @objc class func instantiate(style: Style = Variant2Style.shared) -> RoomTitleView {
-        let roomTitleView = RoomTitleView.loadFromNib()
-        roomTitleView.update(style: style)
-        return roomTitleView
+    @objc class func instantiate() -> RoomTitleView {
+        return RoomTitleView.loadFromNib()
     }
     
     // MARK: Life cycle
@@ -165,14 +161,13 @@ import Reusable
         }
     }
     
-    @objc func update(style: Style) {
-        self.style = style
-        self.titleLabel.textColor = style.barTitleColor
-        self.subTitleLabel.textColor = style.barSubTitleColor
-        self.subTitleMembersSeparatorLabel.textColor = style.secondaryTextColor
-        self.subTitleMembersLabel.textColor = style.secondaryTextColor
-        self.subTitleRetentionSeparatorLabel.textColor = style.secondaryTextColor
-        self.subTitleRetentionLabel.textColor = style.secondaryTextColor
+    @objc func updateTheme() {
+        self.titleLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
+        self.subTitleLabel.textColor = ThemeService.shared().theme.headerTextSecondaryColor
+        self.subTitleMembersSeparatorLabel.textColor = ThemeService.shared().theme.textSecondaryColor
+        self.subTitleMembersLabel.textColor = ThemeService.shared().theme.textSecondaryColor
+        self.subTitleRetentionSeparatorLabel.textColor = ThemeService.shared().theme.textSecondaryColor
+        self.subTitleRetentionLabel.textColor = ThemeService.shared().theme.textSecondaryColor
         
         self.imageView?.defaultBackgroundColor = UIColor.clear
     }
diff --git a/Tchap/Modules/RoomCreation/RoomCreationAvatarView.swift b/Tchap/Modules/RoomCreation/RoomCreationAvatarView.swift
index 10a810a6e3..d6a3784dc9 100644
--- a/Tchap/Modules/RoomCreation/RoomCreationAvatarView.swift
+++ b/Tchap/Modules/RoomCreation/RoomCreationAvatarView.swift
@@ -21,7 +21,7 @@ protocol RoomCreationAvatarViewDelegate: AnyObject {
     func roomCreationAvatarViewDidTapAddPhotoButton(_ roomCreationAvatarView: RoomCreationAvatarView)
 }
 
-final class RoomCreationAvatarView: UIView, NibLoadable, Stylable {
+final class RoomCreationAvatarView: UIView, NibLoadable {
     
     // MARK: - Constants
     
@@ -35,7 +35,6 @@ final class RoomCreationAvatarView: UIView, NibLoadable, Stylable {
     @IBOutlet private weak var addButton: UIButton!
     @IBOutlet private weak var imageView: UIImageView!
     
-    private var style: Style!
     private var hexagonBorderColor: UIColor = UIColor.clear
     private var hexagonBorderWidth: CGFloat = Constants.hexagonBorderWidthDefault
     
@@ -53,7 +52,7 @@ final class RoomCreationAvatarView: UIView, NibLoadable, Stylable {
 
         self.updateAddButtonTextVisibility()
 
-        self.update(style: Variant1Style.shared)
+        self.updateTheme()
     }
     
     override func layoutSubviews() {
@@ -99,13 +98,12 @@ final class RoomCreationAvatarView: UIView, NibLoadable, Stylable {
     @IBAction private func addButtonAction(_ sender: Any) {
         self.delegate?.roomCreationAvatarViewDidTapAddPhotoButton(self)
     }
-    
-    // MARK: - Stylable
-    
-    func update(style: Style) {
-        self.style = style
-        
-        self.backgroundView.backgroundColor = style.secondaryBackgroundColor
-        self.addButton.setTitleColor(style.primarySubTextColor, for: .normal)
+}
+
+// MARK: - Theme
+private extension RoomCreationAvatarView {
+    func updateTheme() {
+        self.backgroundView.backgroundColor = ThemeService.shared().theme.selectedBackgroundColor
+        self.addButton.setTitleColor(ThemeService.shared().theme.textTertiaryColor, for: .normal)
     }
 }
diff --git a/Tchap/Modules/RoomCreation/RoomCreationCoordinator.swift b/Tchap/Modules/RoomCreation/RoomCreationCoordinator.swift
index 64e8d423b7..a3d64a77d5 100644
--- a/Tchap/Modules/RoomCreation/RoomCreationCoordinator.swift
+++ b/Tchap/Modules/RoomCreation/RoomCreationCoordinator.swift
@@ -62,7 +62,7 @@ final class RoomCreationCoordinator: NSObject, RoomCreationCoordinatorType {
         let homeServerDomain = RoomCreationCoordinator.getHomeServerDomain(from: session)
         
         let roomCreationViewModel = RoomCreationViewModel(homeServerDomain: homeServerDomain)
-        let roomCreationViewController = RoomCreationViewController.instantiate(viewModel: roomCreationViewModel, style: Variant1Style.shared)
+        let roomCreationViewController = RoomCreationViewController.instantiate(viewModel: roomCreationViewModel)
         roomCreationViewController.vc_removeBackTitle()
         self.roomCreationViewController = roomCreationViewController
         
diff --git a/Tchap/Modules/RoomCreation/RoomCreationViewController.swift b/Tchap/Modules/RoomCreation/RoomCreationViewController.swift
index e1178b6d36..d8274f1516 100644
--- a/Tchap/Modules/RoomCreation/RoomCreationViewController.swift
+++ b/Tchap/Modules/RoomCreation/RoomCreationViewController.swift
@@ -76,7 +76,6 @@ final class RoomCreationViewController: UIViewController {
     
     private let agentServerDomain: String = "Agent"
     
-    private var currentStyle: Style!
     private var viewModel: RoomCreationViewModelType!
     private var keyboardAvoider: KeyboardAvoider?
     
@@ -89,9 +88,8 @@ final class RoomCreationViewController: UIViewController {
     
     // MARK: - Setup
     
-    class func instantiate(viewModel: RoomCreationViewModelType, style: Style = Variant1Style.shared) -> RoomCreationViewController {
+    class func instantiate(viewModel: RoomCreationViewModelType) -> RoomCreationViewController {
         let viewController = StoryboardScene.RoomCreationViewController.initialScene.instantiate()
-        viewController.currentStyle = style
         viewController.viewModel = viewModel
         return viewController
     }
@@ -111,7 +109,7 @@ final class RoomCreationViewController: UIViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        self.update(style: self.currentStyle)
+        self.updateTheme()
         self.keyboardAvoider?.startAvoiding()
     }
     
@@ -127,7 +125,7 @@ final class RoomCreationViewController: UIViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Public
@@ -329,20 +327,18 @@ final class RoomCreationViewController: UIViewController {
 
 }
 
-// MARK: - Stylable
-extension RoomCreationViewController: Stylable {
-    func update(style: Style) {
-        self.currentStyle = style
-        
-        self.view.backgroundColor = style.backgroundColor
+// MARK: - Theme
+private extension RoomCreationViewController {
+    func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
         self.roomNameFormTextField.updateTheme()
-        self.publicVisibilityInfoLabel.textColor = style.boxTextColor
-        self.publicRoomFederationTitleLabel.textColor = style.boxTextColor
+        self.publicVisibilityInfoLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
+        self.publicRoomFederationTitleLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
 
         let padLockimage = Asset.SharedImages.e2eVerified.image.withRenderingMode(.alwaysTemplate)
         
@@ -350,18 +346,18 @@ extension RoomCreationViewController: Stylable {
         self.privateRoomTitleLabel.textColor = kColorCoral
         self.privateRoomImage.image = padLockimage
         self.privateRoomImage.tintColor = kColorCoral
-        self.privateRoomInfoLabel.textColor = style.boxTextColor
+        self.privateRoomInfoLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
         
         self.externRoomView.backgroundColor = kColorPaleGrey
         self.externRoomTitleLabel.textColor = kColorPumpkinOrange
         self.externRoomImage.image = padLockimage
         self.externRoomImage.tintColor = kColorPumpkinOrange
-        self.externRoomInfoLabel.textColor = style.boxTextColor
+        self.externRoomInfoLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
         
         self.forumRoomView.backgroundColor = kColorPaleGrey
         self.forumRoomTitleLabel.textColor = kColorJadeGreen
-        self.forumRoomInfoLabel.textColor = style.boxTextColor
-        self.roomTypeTitleLabel.textColor = style.boxTextColor
+        self.forumRoomInfoLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
+        self.roomTypeTitleLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
         
         self.disablePublicRoomFederationSwitch.onTintColor = kColorJadeGreen
     }
diff --git a/Tchap/Modules/Rooms/Views/RoomsCell.swift b/Tchap/Modules/Rooms/Views/RoomsCell.swift
index 1a0dad1825..0dcdbee83f 100644
--- a/Tchap/Modules/Rooms/Views/RoomsCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsCell.swift
@@ -16,7 +16,7 @@
 
 import UIKit
 
-@objcMembers class RoomsCell: UITableViewCell, MXKCellRendering, Stylable {
+@objcMembers class RoomsCell: UITableViewCell, MXKCellRendering {
 
     @IBOutlet private weak var pinView: UIView!
     @IBOutlet private(set) weak var avatarView: MXKImageView!
@@ -30,8 +30,6 @@ import UIKit
     @IBOutlet private(set) weak var lastEventDescription: UILabel!
     @IBOutlet private(set) weak var lastEventDate: UILabel!
     
-    private(set) var style: Style!
-    
     /**
      The current cell data displayed by the table view cell
      */
@@ -43,7 +41,7 @@ import UIKit
         super.awakeFromNib()
         // Initialization code
         
-        self.update(style: Variant2Style.shared)
+        self.updateTheme()
         
         self.avatarView.enableInMemoryCache = true
     }
@@ -101,7 +99,7 @@ import UIKit
             self.titleLabel.font = UIFont.systemFont(ofSize: 15, weight: .bold)
             if let lastEventDesc = self.lastEventDescription {
                 lastEventDesc.font = UIFont.systemFont(ofSize: 12, weight: .medium)
-                lastEventDesc.textColor = style.primaryTextColor
+                lastEventDesc.textColor = ThemeService.shared().theme.textPrimaryColor
                 lastEventDesc.text = roomCellData.lastEventTextMessage
             }
             
@@ -116,7 +114,7 @@ import UIKit
             self.titleLabel.font = UIFont.systemFont(ofSize: 15, weight: .medium)
             if let lastEventDesc = self.lastEventDescription {
                 lastEventDesc.font = UIFont.systemFont(ofSize: 12, weight: .regular)
-                lastEventDesc.textColor = style.secondaryTextColor
+                lastEventDesc.textColor = ThemeService.shared().theme.textSecondaryColor
                 lastEventDesc.text = roomCellData.lastEventTextMessage
             }
         }
@@ -138,7 +136,7 @@ import UIKit
         if let pinView = self.pinView {
             // Check whether the room is pinned
             if roomCellData.roomSummary?.room?.accountData?.tags?[kMXRoomTagFavourite] != nil {
-                pinView.backgroundColor = self.style.buttonBorderedBackgroundColor
+                pinView.backgroundColor = ThemeService.shared().theme.headerBackgroundColor
             } else {
                 pinView.backgroundColor = UIColor.clear
             }
@@ -150,14 +148,13 @@ import UIKit
         // The RoomsCell instances support the self-sizing mode, return a default value
         return 80
     }
-    
-    func update(style: Style) {
-        self.style = style
-        self.titleLabel.textColor = style.primaryTextColor
-        self.lastEventDescription?.textColor = style.secondaryTextColor
-        self.lastEventDate?.textColor = style.secondaryTextColor
-        self.missedNotifAndUnreadBadgeBgView?.backgroundColor = style.buttonBorderedBackgroundColor
-        self.missedNotifAndUnreadBadgeLabel?.textColor = style.buttonBorderedTitleColor
+
+    func updateTheme() {
+        self.titleLabel.textColor = ThemeService.shared().theme.textPrimaryColor
+        self.lastEventDescription?.textColor = ThemeService.shared().theme.textSecondaryColor
+        self.lastEventDate?.textColor = ThemeService.shared().theme.textSecondaryColor
+        self.missedNotifAndUnreadBadgeBgView?.backgroundColor = ThemeService.shared().theme.headerBackgroundColor
+        self.missedNotifAndUnreadBadgeLabel?.textColor = ThemeService.shared().theme.headerTextPrimaryColor
         
         self.avatarView?.defaultBackgroundColor = UIColor.clear
         
diff --git a/Tchap/Modules/Rooms/Views/RoomsDiscussionCell.swift b/Tchap/Modules/Rooms/Views/RoomsDiscussionCell.swift
index 451e7fd3df..bea33320ec 100644
--- a/Tchap/Modules/Rooms/Views/RoomsDiscussionCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsDiscussionCell.swift
@@ -36,8 +36,8 @@ import UIKit
         }
     }
     
-    override func update(style: Style) {
-        super.update(style: style)
-        self.domainLabel.textColor = style.primarySubTextColor
+    override func updateTheme() {
+        super.updateTheme()
+        self.domainLabel.textColor = ThemeService.shared().theme.textTertiaryColor
     }
 }
diff --git a/Tchap/Modules/Rooms/Views/RoomsInviteCell.swift b/Tchap/Modules/Rooms/Views/RoomsInviteCell.swift
index 0410ecb897..f6275a13a5 100644
--- a/Tchap/Modules/Rooms/Views/RoomsInviteCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsInviteCell.swift
@@ -50,7 +50,7 @@ import UIKit
         if isDirectChat {
             self.avatarView.tc_makeCircle()
         } else {
-            self.avatarView.tc_makeHexagon(borderWidth: Constants.hexagonImageBorderWidth, borderColor: self.style.secondaryTextColor)
+            self.avatarView.tc_makeHexagon(borderWidth: Constants.hexagonImageBorderWidth, borderColor: ThemeService.shared().theme.textSecondaryColor)
         }
     }
     
@@ -74,13 +74,13 @@ import UIKit
         }
     }
     
-    override func update(style: Style) {
-        super.update(style: style)
-        self.domainLabel.textColor = style.primarySubTextColor
-        self.leftButton.backgroundColor = style.buttonBorderedBackgroundColor
-        self.leftButton.setTitleColor(style.buttonBorderedTitleColor, for: .normal)
-        self.rightButton.backgroundColor = style.buttonBorderedBackgroundColor
-        self.rightButton.setTitleColor(style.buttonBorderedTitleColor, for: .normal)
+    override func updateTheme() {
+        super.updateTheme()
+        self.domainLabel.textColor = ThemeService.shared().theme.textTertiaryColor
+        self.leftButton.backgroundColor = ThemeService.shared().theme.headerBackgroundColor
+        self.leftButton.setTitleColor(ThemeService.shared().theme.headerTextPrimaryColor, for: .normal)
+        self.rightButton.backgroundColor = ThemeService.shared().theme.headerBackgroundColor
+        self.rightButton.setTitleColor(ThemeService.shared().theme.headerTextPrimaryColor, for: .normal)
     }
     
     @IBAction private func onLeftPressed(_ sender: Any) {
diff --git a/Tchap/Modules/Rooms/Views/RoomsRoomCell.swift b/Tchap/Modules/Rooms/Views/RoomsRoomCell.swift
index 1e004bbd17..cb0a663666 100644
--- a/Tchap/Modules/Rooms/Views/RoomsRoomCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsRoomCell.swift
@@ -81,9 +81,9 @@ class RoomsRoomCell: RoomsCell {
         self.updateAvatarView()
     }
     
-    override func update(style: Style) {
-        super.update(style: style)
-        self.lastEventSenderName.textColor = style.primaryTextColor
+    override func updateTheme() {
+        super.updateTheme()
+        self.lastEventSenderName.textColor = ThemeService.shared().theme.textPrimaryColor
     }
     
     private func updateAvatarView () {
diff --git a/Tchap/Modules/Rooms/Views/RoomsTchapInfoCell.swift b/Tchap/Modules/Rooms/Views/RoomsTchapInfoCell.swift
index 52386b8f5b..485bb57ff8 100644
--- a/Tchap/Modules/Rooms/Views/RoomsTchapInfoCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsTchapInfoCell.swift
@@ -41,8 +41,8 @@ import UIKit
         }
     }
     
-    override func update(style: Style) {
-        super.update(style: style)
+    override func updateTheme() {
+        super.updateTheme()
         self.domainLabel.textColor = kColorVerySoftBlue
     }
 }
diff --git a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift
index 55e8b737f2..ffea7ae163 100644
--- a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift
+++ b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift
@@ -36,11 +36,11 @@ import UIKit
         }
     }
     
-    override func update(style: Style) {
-        super.update(style: style)
-        self.domainLabel.textColor = style.primarySubTextColor
+    override func updateTheme() {
+        super.updateTheme()
+        self.domainLabel.textColor = ThemeService.shared().theme.textTertiaryColor
         
-        self.contentView.backgroundColor = style.backgroundColor
+        self.contentView.backgroundColor = ThemeService.shared().theme.backgroundColor
     }
     
     func renderedCellData() -> MXKCellData! {
diff --git a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift
index 81f059c3aa..0a1c3cd663 100644
--- a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift
+++ b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift
@@ -39,10 +39,10 @@ class ShareRoomsRoomCell: RoomsCell {
         self.updateAvatarView()
     }
     
-    override func update(style: Style) {
-        super.update(style: style)
+    override func updateTheme() {
+        super.updateTheme()
         
-        self.contentView.backgroundColor = style.backgroundColor
+        self.contentView.backgroundColor = ThemeService.shared().theme.backgroundColor
     }
     
     private func updateAvatarView () {

From e0c813bddaa9f7cfc9ea1e4ee00a9e52c7c3e887 Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Thu, 23 Sep 2021 13:58:40 +0200
Subject: [PATCH 04/13] Update Contact and Utility classes to use ThemeService
 instead of Style

---
 .../SegmentedViewController.m                 | 23 +++++------
 .../WebViewController/WebViewViewController.m | 26 +++++--------
 .../Modules/Contacts/ContactsViewController.m | 38 +++++++++----------
 .../ContactButton/ContactButtonView.swift     | 11 ++----
 .../Modules/Contacts/Views/ContactCell.swift  | 21 +++++-----
 .../Modules/Forward/ForwardCoordinator.swift  |  2 +-
 .../Forward/ForwardViewController.swift       | 32 +++++++---------
 .../Welcome/WelcomeViewController.swift       | 27 ++++++-------
 8 files changed, 74 insertions(+), 106 deletions(-)

diff --git a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
index e7fdf35776..9ba2bf3f5f 100644
--- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
+++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
@@ -22,7 +22,7 @@
 
 #import "GeneratedInterface-Swift.h"
 
-@interface SegmentedViewController () <Stylable>
+@interface SegmentedViewController ()
 {
     // Tell whether the segmented view is appeared (see viewWillAppear/viewWillDisappear).
     BOOL isViewAppeared;
@@ -50,8 +50,6 @@ @interface SegmentedViewController () <Stylable>
     id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
-@property (nonatomic, strong) id<Style> currentStyle;
-
 @end
 
 @implementation SegmentedViewController
@@ -68,7 +66,6 @@ + (instancetype)instantiate
 {
     SegmentedViewController *segmentedViewController = [[[self class] alloc] initWithNibName:NSStringFromClass([SegmentedViewController class])
                                           bundle:[NSBundle bundleForClass:[SegmentedViewController class]]];
-    segmentedViewController.currentStyle = Variant1Style.shared;
     return segmentedViewController;
 }
 
@@ -197,33 +194,31 @@ - (void)viewDidLoad
 
 - (void)userInterfaceThemeDidChange
 {
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-    
-    self.sectionHeaderTintColor = style.barActionColor;
+    self.sectionHeaderTintColor = ThemeService.shared.theme.tintColor;
     
     UINavigationBar *navigationBar = self.navigationController.navigationBar;
     
     if (navigationBar)
     {
-        [style applyStyleOnNavigationBar:navigationBar];
+        [ThemeService.shared.theme applyStyleOnNavigationBar:navigationBar];
     }
     
-    self.view.backgroundColor = style.backgroundColor;
+    self.view.backgroundColor = ThemeService.shared.theme.backgroundColor;
     
     // @TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
 
     [self setNeedsStatusBarAppearanceUpdate];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -294,7 +289,7 @@ - (void)createSegmentedViews
         label.font = [UIFont systemFontOfSize:17];
         label.textAlignment = NSTextAlignmentCenter;
         label.textColor = _sectionHeaderTintColor;
-        label.backgroundColor = self.currentStyle.barBackgroundColor;
+        label.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
         label.accessibilityIdentifier = [NSString stringWithFormat:@"SegmentedVCSectionLabel%tu", index];
         
         // the constraint defines the label frame
diff --git a/Riot/Modules/Common/WebViewController/WebViewViewController.m b/Riot/Modules/Common/WebViewController/WebViewViewController.m
index a9606a7583..c1ebc7bf1b 100644
--- a/Riot/Modules/Common/WebViewController/WebViewViewController.m
+++ b/Riot/Modules/Common/WebViewController/WebViewViewController.m
@@ -22,9 +22,7 @@
 
 #import "GeneratedInterface-Swift.h"
 
-@interface WebViewViewController () <Stylable>
-
-@property (nonatomic, strong) id<Style> currentStyle;
+@interface WebViewViewController ()
 
 // Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
 @property (nonatomic, weak) id kThemeServiceDidChangeThemeNotificationObserver;
@@ -36,10 +34,6 @@ @implementation WebViewViewController
 - (instancetype)init
 {
     self = [super init];
-    if (self)
-    {
-        self.currentStyle = Variant1Style.shared;
-    }
     return self;
 }
 
@@ -75,37 +69,35 @@ - (void)viewWillAppear:(BOOL)animated
 
 - (void)userInterfaceThemeDidChange
 {
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
 - (void)applyVariant2Style
 {
-    [self updateWithStyle:Variant2Style.shared];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-    
     UINavigationBar *navigationBar = self.navigationController.navigationBar;
     
     if (navigationBar)
     {
-        [style applyStyleOnNavigationBar:navigationBar];
+        [ThemeService.shared.theme applyStyleOnNavigationBar:navigationBar];
     }
     
     // @TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
     
-    self.view.backgroundColor = style.backgroundColor;
-    webView.backgroundColor = style.backgroundColor;
+    self.view.backgroundColor = ThemeService.shared.theme.backgroundColor;
+    webView.backgroundColor = ThemeService.shared.theme.backgroundColor;
 
     [self setNeedsStatusBarAppearanceUpdate];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 - (void)dealloc
diff --git a/Tchap/Modules/Contacts/ContactsViewController.m b/Tchap/Modules/Contacts/ContactsViewController.m
index 5a98a272dc..d9e15c3c57 100644
--- a/Tchap/Modules/Contacts/ContactsViewController.m
+++ b/Tchap/Modules/Contacts/ContactsViewController.m
@@ -25,10 +25,9 @@
 
 NSString *const ContactErrorDomain = @"ContactErrorDomain";
 
-@interface ContactsViewController () <MXKDataSourceDelegate, Stylable, UISearchResultsUpdating>
+@interface ContactsViewController () <MXKDataSourceDelegate, UISearchResultsUpdating>
 
 @property (strong, nonatomic) ContactsDataSource *contactsDataSource;
-@property (nonatomic, strong) id<Style> currentStyle;
 
 @property (nonatomic) BOOL showSearchBar;
 @property (nonatomic, strong) UISearchController *searchController;
@@ -49,17 +48,18 @@ @implementation ContactsViewController
 
 #pragma mark - Setup
 
-+ (instancetype)instantiateWithStyle:(id<Style>)style
++ (instancetype)instantiate
 {
-    return [self instantiateWithStyle:style showSearchBar:NO enableMultipleSelection:NO];
+    return [self instantiateWithShowSearchBar:NO enableMultipleSelection:NO];
 }
 
-+ (instancetype)instantiateWithStyle:(id<Style>)style showSearchBar:(BOOL)showSearchBar enableMultipleSelection:(BOOL)enableMultipleSelection
++ (instancetype)instantiateWithShowSearchBar:(BOOL)showSearchBar
+                     enableMultipleSelection:(BOOL)enableMultipleSelection
 {
     ContactsViewController *viewController = [[UIStoryboard storyboardWithName:NSStringFromClass([ContactsViewController class]) bundle:[NSBundle mainBundle]] instantiateInitialViewController];
     viewController.showSearchBar = showSearchBar;
     viewController.enableMultipleSelection = enableMultipleSelection;
-    [viewController updateWithStyle:style];
+    [viewController updateTheme];
     viewController.screenName = @"ContactsTable";
     return viewController;
 }
@@ -110,7 +110,7 @@ - (void)viewDidLoad
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -129,7 +129,7 @@ - (void)viewWillAppear:(BOOL)animated
         [MXKAppSettings standardAppSettings].syncLocalContacts = YES;
     }
     
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
 - (void)viewDidAppear:(BOOL)animated
@@ -360,30 +360,28 @@ - (void)selectEmail:(NSString *)email
     }
 }
 
-#pragma mark - Stylable
+#pragma mark - Theme
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-    
     UINavigationBar *navigationBar = self.navigationController.navigationBar;
     
     if (navigationBar)
     {
-        [style applyStyleOnNavigationBar:navigationBar];
+        [ThemeService.shared.theme applyStyleOnNavigationBar:navigationBar];
     }
     
-    self.tableView.backgroundColor = style.backgroundColor;
-    self.view.backgroundColor = style.backgroundColor;
+    self.tableView.backgroundColor = ThemeService.shared.theme.backgroundColor;
+    self.view.backgroundColor = ThemeService.shared.theme.backgroundColor;
     
-    //TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    //TODO Design the activity indicator for Tchap
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
     
     UISearchBar *searchBar = self.searchController.searchBar;
     
     if (searchBar)
     {
-        [style applyStyleOnSearchBar:searchBar];
+        [ThemeService.shared.theme applyStyleOnSearchBar:searchBar];
     }
     
     if (self.tableView.dataSource)
@@ -443,14 +441,14 @@ - (void)dataSource:(MXKDataSource *)dataSource didCellChange:(id)changes
 
 - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
 {
-    cell.backgroundColor = self.currentStyle.backgroundColor;
+    cell.backgroundColor = ThemeService.shared.theme.backgroundColor;
     
     if (!cell.selectedBackgroundView)
     {
         cell.selectedBackgroundView = [[UIView alloc] init];
     }
     
-    cell.selectedBackgroundView.backgroundColor = self.currentStyle.secondaryBackgroundColor;
+    cell.selectedBackgroundView.backgroundColor = ThemeService.shared.theme.selectedBackgroundColor;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
diff --git a/Tchap/Modules/Contacts/Views/ContactButton/ContactButtonView.swift b/Tchap/Modules/Contacts/Views/ContactButton/ContactButtonView.swift
index 576771bc7c..747343da39 100644
--- a/Tchap/Modules/Contacts/Views/ContactButton/ContactButtonView.swift
+++ b/Tchap/Modules/Contacts/Views/ContactButton/ContactButtonView.swift
@@ -16,19 +16,18 @@
 
 import UIKit
 
-@objcMembers class ContactButtonView: UITableViewCell, Stylable {
+@objcMembers class ContactButtonView: UITableViewCell {
     
     @IBOutlet private(set) weak var iconView: UIImageView!
     @IBOutlet private(set) weak var actionLabel: UILabel!
     
-    private(set) var style: Style!
     private(set) var viewModel: ContactButtonViewModelType!
     
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
         
-        self.update(style: Variant2Style.shared)
+        self.updateTheme()
     }
     
     class func nib() -> UINib {
@@ -39,10 +38,8 @@ import UIKit
         return String(describing: self)
     }
     
-    func update(style: Style) {
-        self.style = style
-        
-        self.actionLabel.textColor = style.buttonPlainTitleColor
+    func updateTheme() {
+        self.actionLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
         self.actionLabel.font = UIFont.systemFont(ofSize: 15, weight: .regular)
     }
     
diff --git a/Tchap/Modules/Contacts/Views/ContactCell.swift b/Tchap/Modules/Contacts/Views/ContactCell.swift
index 638a4c7c87..ca2b0f6b26 100644
--- a/Tchap/Modules/Contacts/Views/ContactCell.swift
+++ b/Tchap/Modules/Contacts/Views/ContactCell.swift
@@ -16,7 +16,7 @@
 
 import UIKit
 
-@objcMembers class ContactCell: UITableViewCell, MXKCellRendering, Stylable {
+@objcMembers class ContactCell: UITableViewCell, MXKCellRendering {
 
     @IBOutlet private(set) weak var thumbnailBadgeView: UIImageView!
     @IBOutlet private(set) weak var thumbnailView: MXKImageView!
@@ -25,8 +25,6 @@ import UIKit
     @IBOutlet private(set) weak var contactDomainLabel: UILabel!
     @IBOutlet private(set) weak var contactEmailLabel: UILabel!
     
-    private(set) var style: Style!
-    
     /// The current displayed contact.
     private var contact: MXKContact?
     private var isExpiredUser: Bool = false
@@ -39,7 +37,7 @@ import UIKit
         super.awakeFromNib()
         // Initialization code
         
-        self.update(style: Variant2Style.shared)
+        self.updateTheme()
         
         self.thumbnailView.enableInMemoryCache = true
     }
@@ -117,16 +115,15 @@ import UIKit
         self.contact = nil
     }
     
-    func update(style: Style) {
-        self.style = style
-        self.contactDisplayNameLabel.textColor = self.isExpiredUser ? style.secondaryTextColor : style.primaryTextColor
-        self.contactDomainLabel.textColor = self.isExpiredUser ? style.secondaryTextColor : style.primarySubTextColor
-        self.contactEmailLabel.textColor = style.secondaryTextColor
+    func updateTheme() {
+        self.contactDisplayNameLabel.textColor = self.isExpiredUser ? ThemeService.shared().theme.textSecondaryColor : ThemeService.shared().theme.textPrimaryColor
+        self.contactDomainLabel.textColor = self.isExpiredUser ? ThemeService.shared().theme.textSecondaryColor : ThemeService.shared().theme.textTertiaryColor
+        self.contactEmailLabel.textColor = ThemeService.shared().theme.textSecondaryColor
         
         // Clear the default background color of a MXKImageView instance
         self.thumbnailView?.defaultBackgroundColor = UIColor.clear
         
-        self.presenceView?.backgroundColor = style.presenceIndicatorOnlineColor
+        self.presenceView?.backgroundColor = ThemeService.shared().theme.headerBackgroundColor
     }
     
     private func refreshContactThumbnail() {
@@ -147,8 +144,8 @@ import UIKit
             self.contactDomainLabel.text = nil
         }
         
-        self.contactDisplayNameLabel.textColor = self.isExpiredUser ? style.secondaryTextColor : style.primaryTextColor
-        self.contactDomainLabel.textColor = self.isExpiredUser ? style.secondaryTextColor : style.primarySubTextColor
+        self.contactDisplayNameLabel.textColor = self.isExpiredUser ? ThemeService.shared().theme.textSecondaryColor : ThemeService.shared().theme.textPrimaryColor
+        self.contactDomainLabel.textColor = self.isExpiredUser ? ThemeService.shared().theme.textSecondaryColor : ThemeService.shared().theme.textTertiaryColor
     }
     
     private func refreshContactPresence() {
diff --git a/Tchap/Modules/Forward/ForwardCoordinator.swift b/Tchap/Modules/Forward/ForwardCoordinator.swift
index 3c3f4cee37..a084fc97db 100644
--- a/Tchap/Modules/Forward/ForwardCoordinator.swift
+++ b/Tchap/Modules/Forward/ForwardCoordinator.swift
@@ -37,7 +37,7 @@ final class ForwardCoordinator: NSObject, ForwardCoordinatorType {
         recentsViewController.displayList(ForwardDataSource(matrixSession: session))
         self.recentsViewController = recentsViewController
 
-        let viewController = ForwardViewController.instantiate(with: Variant2Style.shared)
+        let viewController = ForwardViewController.instantiate()
         self.forwardViewController = viewController
         
         self.errorPresenter = AlertErrorPresenter(viewControllerPresenter: viewController)
diff --git a/Tchap/Modules/Forward/ForwardViewController.swift b/Tchap/Modules/Forward/ForwardViewController.swift
index 57b1387d4e..050edd2db2 100644
--- a/Tchap/Modules/Forward/ForwardViewController.swift
+++ b/Tchap/Modules/Forward/ForwardViewController.swift
@@ -30,8 +30,6 @@ class ForwardViewController: MXKViewController {
     @IBOutlet weak var searchBar: UISearchBar?
     
     weak var delegate: ForwardViewControllerDelegate?
-
-    private var currentStyle: Style!
     
     weak var recentsViewController: UIViewController? {
         willSet {
@@ -50,10 +48,8 @@ class ForwardViewController: MXKViewController {
         }
     }
     
-    static func instantiate(with style: Style) -> ForwardViewController {
-        let viewController = StoryboardScene.ForwardViewController.initialScene.instantiate()
-        viewController.currentStyle = style
-        return viewController
+    static func instantiate() -> ForwardViewController {
+        return StoryboardScene.ForwardViewController.initialScene.instantiate()
     }
     
     // MARK: - Life cycle
@@ -73,11 +69,11 @@ class ForwardViewController: MXKViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        self.update(style: self.currentStyle)
+        self.updateTheme()
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Actions
@@ -116,24 +112,22 @@ extension ForwardViewController: UISearchBarDelegate {
     }
 }
 
-// MARK: - Stylable
+// MARK: - Theme
 
-extension ForwardViewController: Stylable {
-    func update(style: Style) {
-        self.currentStyle = style
-        
-        self.titleLabel?.textColor = style.barTitleColor
-        self.titleContentView?.backgroundColor = style.barBackgroundColor
-        self.cancelButton?.tintColor = self.currentStyle.barActionColor
+private extension ForwardViewController {
+    func updateTheme() {
+        self.titleLabel?.textColor = ThemeService.shared().theme.headerTextPrimaryColor
+        self.titleContentView?.backgroundColor = ThemeService.shared().theme.headerBackgroundColor
+        self.cancelButton?.tintColor = ThemeService.shared().theme.tintColor
         
-        self.view.backgroundColor = style.backgroundColor
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
         if let searchBar = self.searchBar {
-            style.applyStyle(onSearchBar: searchBar)
+            ThemeService.shared().theme.applyStyle(onSearchBar: searchBar)
         }
     }
 }
diff --git a/Tchap/Modules/Welcome/WelcomeViewController.swift b/Tchap/Modules/Welcome/WelcomeViewController.swift
index 68631fffa2..54cfef115b 100644
--- a/Tchap/Modules/Welcome/WelcomeViewController.swift
+++ b/Tchap/Modules/Welcome/WelcomeViewController.swift
@@ -32,17 +32,14 @@ final class WelcomeViewController: UIViewController {
     
     // MARK: Private
     
-    private var currentStyle: Style!
-    
     // MARK: Public
     
     weak var delegate: WelcomeViewControllerDelegate?
     
     // MARK: - Setup
     
-    class func instantiate(style: Style = Variant2Style.shared) -> WelcomeViewController {
+    class func instantiate() -> WelcomeViewController {
         let viewController = StoryboardScene.WelcomeViewController.initialScene.instantiate()
-        viewController.currentStyle = style
         return viewController
     }
     
@@ -71,7 +68,7 @@ final class WelcomeViewController: UIViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Private
@@ -87,7 +84,7 @@ final class WelcomeViewController: UIViewController {
     }
     
     private func userThemeDidChange() {
-        self.update(style: self.currentStyle)
+        self.updateTheme()
     }
     
     // MARK: - Actions
@@ -101,16 +98,14 @@ final class WelcomeViewController: UIViewController {
     }
 }
 
-// MARK: - Stylable
-extension WelcomeViewController: Stylable {
-    func update(style: Style) {
-        self.currentStyle = style
-        
-        self.view.backgroundColor = style.backgroundColor
-        self.titleLabel.textColor = style.primarySubTextColor
-        self.buttonsSeparatorView.backgroundColor = style.separatorColor
+// MARK: - Theme
+private extension WelcomeViewController {
+    func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
+        self.titleLabel.textColor = ThemeService.shared().theme.textTertiaryColor
+        self.buttonsSeparatorView.backgroundColor = ThemeService.shared().theme.selectedBackgroundColor
         
-        style.applyStyle(onButton: self.loginButton)
-        style.applyStyle(onButton: self.registerButton)
+        ThemeService.shared().theme.applyStyle(onButton: self.loginButton)
+        ThemeService.shared().theme.applyStyle(onButton: self.registerButton)
     }
 }

From 8a56de2448b324c315a0afa309eda0ef791f5190 Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Thu, 23 Sep 2021 14:05:33 +0200
Subject: [PATCH 05/13] Update missing Forgot Password controller to use
 ThemeService

---
 ...gotPasswordCheckedMailViewController.swift | 18 +++++++-------
 .../ForgotPasswordFormViewController.swift    | 18 +++++++-------
 ...gotPasswordVerifyEmailViewController.swift | 24 ++++++++-----------
 3 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/Tchap/Modules/ForgotPassword/CheckedEmail/ForgotPasswordCheckedMailViewController.swift b/Tchap/Modules/ForgotPassword/CheckedEmail/ForgotPasswordCheckedMailViewController.swift
index ca0598f2b6..3bb3ac56c1 100644
--- a/Tchap/Modules/ForgotPassword/CheckedEmail/ForgotPasswordCheckedMailViewController.swift
+++ b/Tchap/Modules/ForgotPassword/CheckedEmail/ForgotPasswordCheckedMailViewController.swift
@@ -76,7 +76,7 @@ final class ForgotPasswordCheckedEmailViewController: UIViewController {
     }
     
     private func userThemeDidChange() {
-        self.update(style: self.currentStyle)
+        self.updateTheme()
     }
     
     // MARK: - Actions
@@ -86,19 +86,17 @@ final class ForgotPasswordCheckedEmailViewController: UIViewController {
     }
 }
 
-// MARK: - Stylable
-extension ForgotPasswordCheckedEmailViewController: Stylable {
-    func update(style: Style) {
-        self.currentStyle = style
-        
-        self.view.backgroundColor = style.backgroundColor
+// MARK: - Theme
+private extension ForgotPasswordCheckedEmailViewController {
+    func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
-        self.instructionsLabel.textColor = style.secondaryTextColor
+        self.instructionsLabel.textColor = ThemeService.shared().theme.textSecondaryColor
         
-        style.applyStyle(onButton: self.doneButton)
+        ThemeService.shared().theme.applyStyle(onButton: self.doneButton)
     }
 }
diff --git a/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift b/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift
index ac4484f50e..662d778ac6 100644
--- a/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift
+++ b/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift
@@ -121,7 +121,7 @@ final class ForgotPasswordFormViewController: UIViewController {
     }
     
     private func userThemeDidChange() {
-        self.update(style: self.currentStyle)
+        self.updateTheme()
     }
     
     private func hideConfirmPasswordTextField(_ hide: Bool) {
@@ -151,23 +151,21 @@ final class ForgotPasswordFormViewController: UIViewController {
     }
 }
 
-// MARK: - Stylable
-extension ForgotPasswordFormViewController: Stylable {
-    func update(style: Style) {
-        self.currentStyle = style
-        
-        self.view.backgroundColor = style.backgroundColor
-        self.instructionsLabel.textColor = style.secondaryTextColor
+// MARK: - Theme
+private extension ForgotPasswordFormViewController {
+    func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
+        self.instructionsLabel.textColor = ThemeService.shared().theme.textSecondaryColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
         for formTextField in self.formTextFields {
             formTextField.updateTheme()
         }
         
-        style.applyStyle(onButton: self.sendEmailButton)
+        ThemeService.shared().theme.applyStyle(onButton: self.sendEmailButton)
     }
 }
 
diff --git a/Tchap/Modules/ForgotPassword/VerifyEmail/ForgotPasswordVerifyEmailViewController.swift b/Tchap/Modules/ForgotPassword/VerifyEmail/ForgotPasswordVerifyEmailViewController.swift
index 0ce72acb36..68d71723f1 100644
--- a/Tchap/Modules/ForgotPassword/VerifyEmail/ForgotPasswordVerifyEmailViewController.swift
+++ b/Tchap/Modules/ForgotPassword/VerifyEmail/ForgotPasswordVerifyEmailViewController.swift
@@ -32,7 +32,6 @@ final class ForgotPasswordVerifyEmailViewController: UIViewController {
     // MARK: Private
     
     private var userEmail: String!
-    private var currentStyle: Style!
     
     // MARK: Public
     
@@ -40,9 +39,8 @@ final class ForgotPasswordVerifyEmailViewController: UIViewController {
     
     // MARK: - Setup
     
-    class func instantiate(userEmail: String, style: Style = Variant2Style.shared) -> ForgotPasswordVerifyEmailViewController {
+    class func instantiate(userEmail: String) -> ForgotPasswordVerifyEmailViewController {
         let viewController = StoryboardScene.ForgotPasswordVerifyEmailViewController.initialScene.instantiate()
-        viewController.currentStyle = style
         viewController.userEmail = userEmail
         return viewController
     }
@@ -65,7 +63,7 @@ final class ForgotPasswordVerifyEmailViewController: UIViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Public
@@ -82,7 +80,7 @@ final class ForgotPasswordVerifyEmailViewController: UIViewController {
     }
     
     private func userThemeDidChange() {
-        self.update(style: self.currentStyle)
+        self.updateTheme()
     }
     
     // MARK: - Actions
@@ -92,19 +90,17 @@ final class ForgotPasswordVerifyEmailViewController: UIViewController {
     }
 }
 
-// MARK: - Stylable
-extension ForgotPasswordVerifyEmailViewController: Stylable {
-    func update(style: Style) {
-        self.currentStyle = style
-        
-        self.view.backgroundColor = style.backgroundColor
+// MARK: - Theme
+private extension ForgotPasswordVerifyEmailViewController {
+    func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
-        self.instructionsLabel.textColor = style.secondaryTextColor
+        self.instructionsLabel.textColor = ThemeService.shared().theme.textSecondaryColor
         
-        style.applyStyle(onButton: self.confirmationButton)
+        ThemeService.shared().theme.applyStyle(onButton: self.confirmationButton)
     }
 }

From f2e3dc6c04deb463f790aea5b01ae798497f1b04 Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Thu, 23 Sep 2021 14:21:42 +0200
Subject: [PATCH 06/13] Finish removing other Style occurrences in project

---
 .../SegmentedViewController.h                 |   4 +-
 .../AppVersionUpdateViewController.swift      |  18 ++-
 ...asswordCurrentPasswordViewController.swift |  20 ++--
 ...ngePasswordNewPasswordViewController.swift |  28 ++---
 Tchap/Modules/Common/Style/Stylable.swift     |  22 ----
 Tchap/Modules/Common/Style/Style.swift        |  75 ------------
 .../Modules/Common/Style/Variant1Style.swift  | 109 ------------------
 .../Modules/Common/Style/Variant2Style.swift  | 109 ------------------
 .../Contacts/ContactsCoordinator.swift        |   2 +-
 .../Modules/Contacts/ContactsViewController.h |   6 +-
 .../ContactsPickerCoordinator.swift           |   2 +-
 .../CreateNewDiscussionCoordinator.swift      |   2 +-
 .../FavouriteMessagesViewController.swift     |  18 ++-
 ...gotPasswordCheckedMailViewController.swift |  10 +-
 .../ForgotPasswordFormViewController.swift    |   6 +-
 .../Members/RoomParticipantsViewController.m  |   2 +-
 .../Modules/Room/RoomDetailsCoordinator.swift |   2 +-
 17 files changed, 48 insertions(+), 387 deletions(-)
 delete mode 100644 Tchap/Modules/Common/Style/Stylable.swift
 delete mode 100644 Tchap/Modules/Common/Style/Style.swift
 delete mode 100644 Tchap/Modules/Common/Style/Variant1Style.swift
 delete mode 100644 Tchap/Modules/Common/Style/Variant2Style.swift

diff --git a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h
index 1832117123..5d21caf483 100644
--- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h
+++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h
@@ -91,8 +91,8 @@ limitations under the License.
 - (void)userInterfaceThemeDidChange;
 
 /**
- Update the current style.
+ Update the current theme.
  */
-- (void)updateWithStyle:(id<Style>)style;
+- (void)updateTheme;
 
 @end
diff --git a/Tchap/Modules/Application/VersionUpdate/AppVersionUpdateViewController.swift b/Tchap/Modules/Application/VersionUpdate/AppVersionUpdateViewController.swift
index e2906439bb..5124d7c9c4 100644
--- a/Tchap/Modules/Application/VersionUpdate/AppVersionUpdateViewController.swift
+++ b/Tchap/Modules/Application/VersionUpdate/AppVersionUpdateViewController.swift
@@ -34,7 +34,6 @@ final class AppVersionUpdateViewController: UIViewController {
     // MARK: Private
     
     private var viewModel: AppVersionUpdateViewModelType!
-    private var style: Style!
     
     // MARK: Public
     
@@ -42,10 +41,9 @@ final class AppVersionUpdateViewController: UIViewController {
     
     // MARK: - Setup
     
-    class func instantiate(with viewModel: AppVersionUpdateViewModelType, style: Style = Variant2Style.shared) -> AppVersionUpdateViewController {
+    class func instantiate(with viewModel: AppVersionUpdateViewModelType) -> AppVersionUpdateViewController {
         let viewController = StoryboardScene.AppVersionUpdateViewController.initialScene.instantiate()
         viewController.viewModel = viewModel
-        viewController.style = style
         return viewController
     }
     
@@ -67,18 +65,16 @@ final class AppVersionUpdateViewController: UIViewController {
     
     // MARK: - Private
     
-    private func update(style: Style) {
-        self.style = style
+    private func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
-        self.view.backgroundColor = style.backgroundColor
-        
-        self.messageLabel.textColor = self.style.primarySubTextColor
-        style.applyStyle(onButton: self.cancelButton)
-        style.applyStyle(onButton: self.appStoreButton)
+        self.messageLabel.textColor = ThemeService.shared().theme.textTertiaryColor
+        ThemeService.shared().theme.applyStyle(onButton: self.cancelButton)
+        ThemeService.shared().theme.applyStyle(onButton: self.appStoreButton)
     }
     
     private func themeDidChange() {
-        self.update(style: self.style)
+        self.updateTheme()
     }
     
     private func setupViews() {
diff --git a/Tchap/Modules/ChangePassword/CurrentPassword/ChangePasswordCurrentPasswordViewController.swift b/Tchap/Modules/ChangePassword/CurrentPassword/ChangePasswordCurrentPasswordViewController.swift
index a9b87ca1fb..d07b54c765 100644
--- a/Tchap/Modules/ChangePassword/CurrentPassword/ChangePasswordCurrentPasswordViewController.swift
+++ b/Tchap/Modules/ChangePassword/CurrentPassword/ChangePasswordCurrentPasswordViewController.swift
@@ -31,17 +31,15 @@ final class ChangePasswordCurrentPasswordViewController: UIViewController {
     // MARK: Private
 
     private var viewModel: ChangePasswordCurrentPasswordViewModelType!
-    private var style: Style!
     private var keyboardAvoider: KeyboardAvoider?
     private var errorPresenter: ErrorPresenter!
     private var activityPresenter: ActivityIndicatorPresenter!
 
     // MARK: - Setup
     
-    class func instantiate(with viewModel: ChangePasswordCurrentPasswordViewModelType, style: Style = Variant2Style.shared) -> ChangePasswordCurrentPasswordViewController {
+    class func instantiate(with viewModel: ChangePasswordCurrentPasswordViewModelType) -> ChangePasswordCurrentPasswordViewController {
         let viewController = StoryboardScene.ChangePasswordCurrentPasswordViewController.initialScene.instantiate()
         viewController.viewModel = viewModel
-        viewController.style = style
         return viewController
     }
     
@@ -78,28 +76,26 @@ final class ChangePasswordCurrentPasswordViewController: UIViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.style.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Private
     
-    private func update(style: Style) {
-        self.style = style
-        
-        self.view.backgroundColor = style.backgroundColor
+    private func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
                 
-        self.instructionsLabel.textColor = style.secondaryTextColor
+        self.instructionsLabel.textColor = ThemeService.shared().theme.textSecondaryColor
         self.passwordFormTextField.updateTheme()
         
-        style.applyStyle(onButton: self.validateButton)
+        ThemeService.shared().theme.applyStyle(onButton: self.validateButton)
     }
     
     private func themeDidChange() {
-        self.update(style: self.style)
+        self.updateTheme()
     }
     
     private func setupViews() {
diff --git a/Tchap/Modules/ChangePassword/NewPassword/ChangePasswordNewPasswordViewController.swift b/Tchap/Modules/ChangePassword/NewPassword/ChangePasswordNewPasswordViewController.swift
index dc5012f8d8..a7c6f02a36 100644
--- a/Tchap/Modules/ChangePassword/NewPassword/ChangePasswordNewPasswordViewController.swift
+++ b/Tchap/Modules/ChangePassword/NewPassword/ChangePasswordNewPasswordViewController.swift
@@ -34,7 +34,6 @@ final class ChangePasswordNewPasswordViewController: UIViewController {
     // MARK: Private
 
     private var viewModel: ChangePasswordNewPasswordViewModelType!
-    private var style: Style!
     private var keyboardAvoider: KeyboardAvoider?
     private var errorPresenter: ErrorPresenter!
     private var activityPresenter: ActivityIndicatorPresenter!
@@ -42,10 +41,9 @@ final class ChangePasswordNewPasswordViewController: UIViewController {
 
     // MARK: - Setup
     
-    class func instantiate(with viewModel: ChangePasswordNewPasswordViewModelType, style: Style = Variant2Style.shared) -> ChangePasswordNewPasswordViewController {
+    class func instantiate(with viewModel: ChangePasswordNewPasswordViewModelType) -> ChangePasswordNewPasswordViewController {
         let viewController = StoryboardScene.ChangePasswordNewPasswordViewController.initialScene.instantiate()
         viewController.viewModel = viewModel
-        viewController.style = style
         return viewController
     }
     
@@ -81,33 +79,31 @@ final class ChangePasswordNewPasswordViewController: UIViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.style.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Private
     
-    private func update(style: Style) {
-        self.style = style
+    private func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
-        self.view.backgroundColor = style.backgroundColor
-        
-        self.usernameCoverageView.backgroundColor = style.backgroundColor
+        self.usernameCoverageView.backgroundColor = ThemeService.shared().theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
-        self.instructionsLabel.textColor = style.secondaryTextColor
-        for formTextield in self.formTextFields {
-            formTextield.updateTheme()
+        self.instructionsLabel.textColor = ThemeService.shared().theme.textSecondaryColor
+        for formTextField in self.formTextFields {
+            formTextField.updateTheme()
         }
         
-        self.validateButton.backgroundColor = style.backgroundColor
-        style.applyStyle(onButton: self.validateButton)
+        self.validateButton.backgroundColor = ThemeService.shared().theme.backgroundColor
+        ThemeService.shared().theme.applyStyle(onButton: self.validateButton)
     }
     
     private func themeDidChange() {
-        self.update(style: self.style)
+        self.updateTheme()
     }
     
     private func setupViews() {
diff --git a/Tchap/Modules/Common/Style/Stylable.swift b/Tchap/Modules/Common/Style/Stylable.swift
deleted file mode 100644
index d8bfaa5343..0000000000
--- a/Tchap/Modules/Common/Style/Stylable.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- Copyright 2018 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import Foundation
-
-/// Describe a component on which a Style could be applied
-@objc protocol Stylable {
-    func update(style: Style)
-}
diff --git a/Tchap/Modules/Common/Style/Style.swift b/Tchap/Modules/Common/Style/Style.swift
deleted file mode 100644
index 4e91fe7e28..0000000000
--- a/Tchap/Modules/Common/Style/Style.swift
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- Copyright 2018 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import UIKit
-
-/// Describe UI component style properties and commodity method to apply it
-@objc protocol Style {
-
-    // MARK: - Status bar
-    
-    var statusBarStyle: UIStatusBarStyle { get }
-    
-    // MARK: - Bar
-    
-    var barBackgroundColor: UIColor { get }
-    var barTitleColor: UIColor { get }
-    var barSubTitleColor: UIColor { get }
-    var barActionColor: UIColor { get }
-    
-    // MARK: - Button
-    
-    var buttonBorderedTitleColor: UIColor { get }
-    var buttonBorderedBackgroundColor: UIColor { get }
-    
-    var buttonPlainTitleColor: UIColor { get }
-    var buttonPlainBackgroundColor: UIColor { get }
-    
-    // MARK: - Body
-    
-    var backgroundColor: UIColor { get }
-    var secondaryBackgroundColor: UIColor { get }
-    var boxBackgroundColor: UIColor { get }
-    
-    var separatorColor: UIColor { get }
-    
-    var primaryTextColor: UIColor { get }
-    var primarySubTextColor: UIColor { get }
-    var secondaryTextColor: UIColor { get }
-    var warnTextColor: UIColor { get }
-    var boxTextColor: UIColor { get }
-    
-    var presenceIndicatorOnlineColor: UIColor { get }
-    
-    var overlayBackgroundColor: UIColor { get }
-    
-    var keyboardAppearance: UIKeyboardAppearance { get }
-    
-    // MARK: - Commodity methods
-    
-    func applyStyle(onNavigationBar: UINavigationBar)
-    func applyStyle(onButton button: UIButton, bordered: Bool)
-    func applyStyle(onTextField: UITextField)
-    func applyStyle(onSwitch: UISwitch)
-    func applyStyle(onSearchBar: UISearchBar)
-}
-
-// Style default implementation
-extension Style {
-    func applyStyle(onButton button: UIButton) {
-        self.applyStyle(onButton: button, bordered: false)
-    }
-}
diff --git a/Tchap/Modules/Common/Style/Variant1Style.swift b/Tchap/Modules/Common/Style/Variant1Style.swift
deleted file mode 100644
index dfa185c6a2..0000000000
--- a/Tchap/Modules/Common/Style/Variant1Style.swift
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- Copyright 2018 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import Foundation
-import UIKit
-
-/// UI component style variant 1
-@objcMembers
-final class Variant1Style: NSObject, Style {
-    
-    static let shared = Variant1Style()
-    
-    // MARK: - Status bar
-    
-    let statusBarStyle: UIStatusBarStyle = kVariant1StatusBarStyle
-    
-    // MARK: - Bar
-    
-    let barBackgroundColor: UIColor = kVariant1BarBgColor
-    let barTitleColor: UIColor = kVariant1BarTitleColor
-    let barSubTitleColor: UIColor = kVariant1BarSubTitleColor
-    let barActionColor: UIColor = kVariant1BarActionColor
-    
-    // MARK: - Button
-    
-    let buttonBorderedTitleColor: UIColor = kVariant1ButtonBorderedTitleColor
-    let buttonBorderedBackgroundColor: UIColor = kVariant1ButtonBorderedBgColor
-    let buttonPlainTitleColor: UIColor = kVariant1ButtonPlainTitleColor
-    let buttonPlainBackgroundColor: UIColor = kVariant1ButtonPlainBgColor
-    
-    // MARK: - Body
-    
-    let backgroundColor: UIColor = kVariant1PrimaryBgColor
-    let secondaryBackgroundColor: UIColor = kVariant1SecondaryBgColor
-    let boxBackgroundColor: UIColor = kVariant1BoxBgColor
-    
-    let separatorColor: UIColor = kVariant1SeparatorColor
-    
-    let primaryTextColor: UIColor = kVariant1PrimaryTextColor
-    let primarySubTextColor: UIColor = kVariant1PrimarySubTextColor
-    let secondaryTextColor: UIColor = kVariant1SecondaryTextColor
-    let warnTextColor: UIColor = kVariant1WarnTextColor
-    let boxTextColor: UIColor = kVariant1BoxTextColor
-    
-    let presenceIndicatorOnlineColor: UIColor = kVariant1PresenceIndicatorOnlineColor
-    
-    let overlayBackgroundColor: UIColor = kVariant1OverlayBackgroundColor
-    
-    let keyboardAppearance: UIKeyboardAppearance = .light
-    
-    // MARK: - Commodity methods
-    
-    func applyStyle(onNavigationBar navigationBar: UINavigationBar) {
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = self.barBackgroundColor
-        navigationBar.tintColor = self.barActionColor
-        navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: self.barTitleColor]
-    }
-    
-    func applyStyle(onButton button: UIButton, bordered: Bool = false) {
-        
-        let titleColor: UIColor
-        let backgroundColor: UIColor
-        
-        if bordered {
-            titleColor = self.buttonBorderedTitleColor
-            backgroundColor = self.buttonBorderedBackgroundColor
-        } else {
-            titleColor = self.buttonPlainTitleColor
-            backgroundColor = self.buttonPlainBackgroundColor
-        }
-        
-        button.setTitleColor(titleColor, for: .normal)
-        button.setTitleColor(.lightGray, for: .highlighted)
-        button.backgroundColor = backgroundColor
-    }
-    
-    func applyStyle(onTextField textField: UITextField) {
-        textField.textColor = self.primaryTextColor
-        textField.tintColor = self.primaryTextColor
-    }
-    
-    func applyStyle(onSwitch uiSwitch: UISwitch) {
-        uiSwitch.onTintColor = self.buttonBorderedBackgroundColor
-    }
-    
-    func applyStyle(onSearchBar searchBar: UISearchBar) {
-        searchBar.barStyle = .black
-        searchBar.tintColor = self.barActionColor
-        searchBar.barTintColor = self.barBackgroundColor
-        
-        if let searchBarTextField = searchBar.vc_searchTextField {
-            searchBarTextField.textColor = searchBar.tintColor
-        }
-    }
-}
diff --git a/Tchap/Modules/Common/Style/Variant2Style.swift b/Tchap/Modules/Common/Style/Variant2Style.swift
deleted file mode 100644
index 6a2f5269d7..0000000000
--- a/Tchap/Modules/Common/Style/Variant2Style.swift
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- Copyright 2018 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import Foundation
-import UIKit
-
-/// UI component style variant 2
-@objcMembers
-final class Variant2Style: NSObject, Style {
-    
-    static let shared = Variant2Style()
-    
-    // MARK: - Status bar
-    
-    let statusBarStyle: UIStatusBarStyle = kVariant2StatusBarStyle
-    
-    // MARK: - Bar
-    
-    let barBackgroundColor: UIColor = kVariant2BarBgColor
-    let barTitleColor: UIColor = kVariant2BarTitleColor
-    let barSubTitleColor: UIColor = kVariant2BarSubTitleColor
-    let barActionColor: UIColor = kVariant2BarActionColor
-    
-    // MARK: - Button
-    
-    let buttonBorderedTitleColor: UIColor = kVariant2ButtonBorderedTitleColor
-    let buttonBorderedBackgroundColor: UIColor = kVariant2ButtonBorderedBgColor
-    let buttonPlainTitleColor: UIColor = kVariant2ButtonPlainTitleColor
-    let buttonPlainBackgroundColor: UIColor = kVariant2ButtonPlainBgColor
-    
-    // MARK: - Body
-    
-    let backgroundColor: UIColor = kVariant2PrimaryBgColor
-    let secondaryBackgroundColor: UIColor = kVariant2SecondaryBgColor
-    let boxBackgroundColor: UIColor = kVariant2BoxBgColor
-    
-    let separatorColor: UIColor = kVariant2SeparatorColor
-    
-    let primaryTextColor: UIColor = kVariant2PrimaryTextColor
-    let primarySubTextColor: UIColor = kVariant2PrimarySubTextColor
-    let secondaryTextColor: UIColor = kVariant2SecondaryTextColor
-    let warnTextColor: UIColor = kVariant2WarnTextColor
-    let boxTextColor: UIColor = kVariant2BoxTextColor
-    
-    let presenceIndicatorOnlineColor: UIColor = kVariant2PresenceIndicatorOnlineColor
-    
-    let overlayBackgroundColor: UIColor = kVariant2OverlayBackgroundColor
-    
-    let keyboardAppearance: UIKeyboardAppearance = .light
-    
-    // MARK: - Commodity methods
-    
-    func applyStyle(onNavigationBar navigationBar: UINavigationBar) {
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = self.barBackgroundColor
-        navigationBar.tintColor = self.barActionColor
-        navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: self.barTitleColor]
-    }
-    
-    func applyStyle(onButton button: UIButton, bordered: Bool = false) {
-
-        let titleColor: UIColor
-        let backgroundColor: UIColor
-
-        if bordered {
-            titleColor = self.buttonBorderedTitleColor
-            backgroundColor = self.buttonBorderedBackgroundColor
-        } else {
-            titleColor = self.buttonPlainTitleColor
-            backgroundColor = self.buttonPlainBackgroundColor
-        }
-
-        button.setTitleColor(titleColor, for: .normal)
-        button.setTitleColor(.lightGray, for: .highlighted)
-        button.backgroundColor = backgroundColor
-    }
-
-    func applyStyle(onTextField textField: UITextField) {
-        textField.textColor = self.primaryTextColor
-        textField.tintColor = self.primaryTextColor
-    }
-    
-    func applyStyle(onSwitch uiSwitch: UISwitch) {
-        uiSwitch.onTintColor = self.buttonBorderedBackgroundColor
-    }
-    
-    func applyStyle(onSearchBar searchBar: UISearchBar) {
-        searchBar.barStyle = .black
-        searchBar.tintColor = self.barActionColor
-        searchBar.barTintColor = self.barBackgroundColor
-        
-        if let searchBarTextField = searchBar.vc_searchTextField {
-            searchBarTextField.textColor = searchBar.tintColor
-        }
-    }
-}
diff --git a/Tchap/Modules/Contacts/ContactsCoordinator.swift b/Tchap/Modules/Contacts/ContactsCoordinator.swift
index f5832392ef..351f7753b0 100644
--- a/Tchap/Modules/Contacts/ContactsCoordinator.swift
+++ b/Tchap/Modules/Contacts/ContactsCoordinator.swift
@@ -44,7 +44,7 @@ final class ContactsCoordinator: NSObject, ContactsCoordinatorType {
         self.router = router
         self.session = session
         
-        self.contactsViewController = ContactsViewController.instantiate(with: Variant1Style.shared)
+        self.contactsViewController = ContactsViewController.instantiate()
         
         self.contactsDataSource = ContactsDataSource(matrixSession: self.session)
         self.contactsDataSource.finalizeInitialization()
diff --git a/Tchap/Modules/Contacts/ContactsViewController.h b/Tchap/Modules/Contacts/ContactsViewController.h
index d987c1b81e..3e90411dd6 100644
--- a/Tchap/Modules/Contacts/ContactsViewController.h
+++ b/Tchap/Modules/Contacts/ContactsViewController.h
@@ -32,22 +32,20 @@
 /**
  Creates and returns a new `ContactsViewController` object.
   
- @param style Used to setup view style parameters.
  @return An initialized `ContactsViewController` object if successful, `nil` otherwise.
  */
-+ (nonnull instancetype)instantiateWithStyle:(nonnull id<Style>)style;
++ (nonnull instancetype)instantiate;
 
 /**
  Creates and returns a new `ContactsViewController` object.
  
  @discussion This is the designated initializer for programmatic instantiation.
 
- @param style Used to setup view style parameters.
  @param showSearchBar YES to indicate to show search bar.
  @param enableMultipleSelection True enable contact selection.
  @return An initialized `ContactsViewController` object if successful, `nil` otherwise.
  */
-+ (nonnull instancetype)instantiateWithStyle:(nonnull id<Style>)style showSearchBar:(BOOL)showSearchBar enableMultipleSelection:(BOOL)enableMultipleSelection;
++ (nonnull instancetype)instantiateWithShowSearchBar:(BOOL)showSearchBar enableMultipleSelection:(BOOL)enableMultipleSelection;
 
 /**
  Display the contacts described in the provided data source.
diff --git a/Tchap/Modules/ContactsPicker/ContactsPickerCoordinator.swift b/Tchap/Modules/ContactsPicker/ContactsPickerCoordinator.swift
index 7d2f99fe74..0d980f692a 100644
--- a/Tchap/Modules/ContactsPicker/ContactsPickerCoordinator.swift
+++ b/Tchap/Modules/ContactsPicker/ContactsPickerCoordinator.swift
@@ -44,7 +44,7 @@ final class ContactsPickerCoordinator: NSObject, ContactsPickerCoordinatorType {
     init(session: MXSession, contactsFilter: ContactsDataSourceTchapFilter) {
         self.session = session
         
-        let contactsViewController = ContactsViewController.instantiate(with: Variant1Style.shared, showSearchBar: true, enableMultipleSelection: true)
+        let contactsViewController = ContactsViewController.instantiate(withShowSearchBar: true, enableMultipleSelection: true)
         contactsViewController.title = TchapL10n.contactsPickerTitle
         self.contactsViewController = contactsViewController
         
diff --git a/Tchap/Modules/CreateNewDiscussion/CreateNewDiscussionCoordinator.swift b/Tchap/Modules/CreateNewDiscussion/CreateNewDiscussionCoordinator.swift
index 6074ab75f7..f20dbdfb6e 100644
--- a/Tchap/Modules/CreateNewDiscussion/CreateNewDiscussionCoordinator.swift
+++ b/Tchap/Modules/CreateNewDiscussion/CreateNewDiscussionCoordinator.swift
@@ -44,7 +44,7 @@ final class CreateNewDiscussionCoordinator: NSObject, CreateNewDiscussionCoordin
         self.router = NavigationRouter(navigationController: TCNavigationController())
         self.session = session
         
-        let contactsViewController = ContactsViewController.instantiate(with: Variant1Style.shared, showSearchBar: true, enableMultipleSelection: false)
+        let contactsViewController = ContactsViewController.instantiate(withShowSearchBar: true, enableMultipleSelection: false)
         contactsViewController.title = TchapL10n.createNewDiscussionTitle
         self.contactsViewController = contactsViewController
         
diff --git a/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift b/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift
index 2b5b1af570..fd2f4559be 100644
--- a/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift
+++ b/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift
@@ -38,7 +38,6 @@ final class FavouriteMessagesViewController: UIViewController {
     // MARK: Private
 
     private var viewModel: FavouriteMessagesViewModelType!
-    private var currentStyle: Style!
     private var keyboardAvoider: KeyboardAvoider?
     private var errorPresenter: MXKErrorPresentation!
     private var activityPresenter: ActivityIndicatorPresenter!
@@ -57,10 +56,9 @@ final class FavouriteMessagesViewController: UIViewController {
 
     // MARK: - Setup
     
-    class func instantiate(with viewModel: FavouriteMessagesViewModelType, style: Style = Variant1Style.shared) -> FavouriteMessagesViewController {
+    class func instantiate(with viewModel: FavouriteMessagesViewModelType) -> FavouriteMessagesViewController {
         let viewController = StoryboardScene.FavouriteMessagesViewController.initialScene.instantiate()
         viewController.viewModel = viewModel
-        viewController.currentStyle = style
         return viewController
     }
     
@@ -109,24 +107,22 @@ final class FavouriteMessagesViewController: UIViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Private
     
-    private func update(style: Style) {
-        self.currentStyle = style
-        
-        self.tableView.backgroundColor = style.backgroundColor
-        self.view.backgroundColor = style.backgroundColor
+    private func updateTheme() {
+        self.tableView.backgroundColor = ThemeService.shared().theme.backgroundColor
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
-            style.applyStyle(onNavigationBar: navigationBar)
+            ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
     }
 
     private func userThemeDidChange() {
-        self.update(style: self.currentStyle)
+        self.updateTheme()
     }
     
     private func setupTableView() {
diff --git a/Tchap/Modules/ForgotPassword/CheckedEmail/ForgotPasswordCheckedMailViewController.swift b/Tchap/Modules/ForgotPassword/CheckedEmail/ForgotPasswordCheckedMailViewController.swift
index 3bb3ac56c1..0b4ce97883 100644
--- a/Tchap/Modules/ForgotPassword/CheckedEmail/ForgotPasswordCheckedMailViewController.swift
+++ b/Tchap/Modules/ForgotPassword/CheckedEmail/ForgotPasswordCheckedMailViewController.swift
@@ -31,18 +31,14 @@ final class ForgotPasswordCheckedEmailViewController: UIViewController {
     
     // MARK: Private
     
-    private var currentStyle: Style!
-    
     // MARK: Public
     
     weak var delegate: ForgotPasswordCheckedEmailViewControllerDelegate?
     
     // MARK: - Setup
     
-    class func instantiate(style: Style = Variant2Style.shared) -> ForgotPasswordCheckedEmailViewController {
-        let viewController = StoryboardScene.ForgotPasswordCheckedEmailViewController.initialScene.instantiate()
-        viewController.currentStyle = style
-        return viewController
+    class func instantiate() -> ForgotPasswordCheckedEmailViewController {
+        return StoryboardScene.ForgotPasswordCheckedEmailViewController.initialScene.instantiate()
     }
     
     // MARK: - Life cycle
@@ -65,7 +61,7 @@ final class ForgotPasswordCheckedEmailViewController: UIViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Private
diff --git a/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift b/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift
index 662d778ac6..426c07173e 100644
--- a/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift
+++ b/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift
@@ -36,7 +36,6 @@ final class ForgotPasswordFormViewController: UIViewController {
     private var viewModel: ForgotPasswordFormViewModelType!
     private var errorPresenter: ErrorPresenter?
     private var keyboardAvoider: KeyboardAvoider?
-    private var currentStyle: Style!
     private var formTextFields: [FormTextField] = []
     
     // MARK: Public
@@ -45,10 +44,9 @@ final class ForgotPasswordFormViewController: UIViewController {
     
     // MARK: - Setup
     
-    class func instantiate(viewModel: ForgotPasswordFormViewModelType, style: Style = Variant2Style.shared) -> ForgotPasswordFormViewController {
+    class func instantiate(viewModel: ForgotPasswordFormViewModelType) -> ForgotPasswordFormViewController {
         let viewController = StoryboardScene.ForgotPasswordFormViewController.initialScene.instantiate()
         viewController.viewModel = viewModel
-        viewController.currentStyle = style
         return viewController
     }
     
@@ -80,7 +78,7 @@ final class ForgotPasswordFormViewController: UIViewController {
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        return self.currentStyle.statusBarStyle
+        return ThemeService.shared().theme.statusBarStyle
     }
     
     // MARK: - Public
diff --git a/Tchap/Modules/Room/Members/RoomParticipantsViewController.m b/Tchap/Modules/Room/Members/RoomParticipantsViewController.m
index 41fbfa8a53..53fd08f481 100644
--- a/Tchap/Modules/Room/Members/RoomParticipantsViewController.m
+++ b/Tchap/Modules/Room/Members/RoomParticipantsViewController.m
@@ -678,7 +678,7 @@ - (void)addAddParticipantButton
 - (void)onAddParticipantButtonPressed
 {
     // Push the contacts picker.
-    contactsPickerViewController = [ContactsViewController instantiateWithStyle:Variant2Style.shared showSearchBar:YES enableMultipleSelection:YES];
+    contactsPickerViewController = [ContactsViewController instantiateWithShowSearchBar:YES enableMultipleSelection:YES];
     contactsPickerViewController.title = NSLocalizedStringFromTable(@"contacts_picker_title", @"Tchap", nil);
     
     // Set delegate to handle action on member (start chat, mention)
diff --git a/Tchap/Modules/Room/RoomDetailsCoordinator.swift b/Tchap/Modules/Room/RoomDetailsCoordinator.swift
index ca97c95f5c..69d8997832 100644
--- a/Tchap/Modules/Room/RoomDetailsCoordinator.swift
+++ b/Tchap/Modules/Room/RoomDetailsCoordinator.swift
@@ -118,7 +118,7 @@ final class RoomDetailsCoordinator: NSObject, RoomDetailsCoordinatorType {
         
         self.segmentedViewController.initWithTitles(titles, viewControllers: viewControllers, defaultSelected: 0)
         self.segmentedViewController.addMatrixSession(self.session)
-        self.segmentedViewController.update(with: Variant2Style.shared)
+        self.segmentedViewController.updateTheme()
         
         let titleView = RoomTitleView.instantiate()
         self.segmentedViewController.navigationItem.titleView = titleView

From 5f65fd673ff7cdf6d0970d0a43358e20048f8bce Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Thu, 23 Sep 2021 15:41:19 +0200
Subject: [PATCH 07/13] Now use Themable protocol for reusable views and cells
 with Theme

---
 .../AuthenticationViewController.swift        |  4 +-
 ...asswordCurrentPasswordViewController.swift |  2 +-
 ...ngePasswordNewPasswordViewController.swift |  2 +-
 Tchap/Modules/Common/Forms/FormCheckBox.swift |  6 +-
 .../Modules/Common/Forms/FormTextField.swift  | 10 +--
 .../RetentionPeriodPickerContentView.swift    | 13 ++--
 .../ContactButton/ContactButtonView.swift     | 16 +++--
 .../Modules/Contacts/Views/ContactCell.swift  | 27 +++----
 .../ForgotPasswordFormViewController.swift    |  2 +-
 .../PublicRooms/Views/PublicRoomsCell.swift   | 14 ++--
 .../Form/RegistrationFormViewController.swift |  4 +-
 .../Views/RetentionPeriodPickerCell.swift     | 14 ++--
 ...ntAntivirusScanStatusCellContentView.swift | 10 +--
 .../DisabledRoomInputToolbarView.m            | 31 ++++----
 .../Views/InputToolbar/RoomInputToolbarView.m | 72 ++++++++++---------
 .../Modules/Room/Views/Preview/PreviewView.m  | 39 +++++-----
 .../Room/Views/Title/RoomTitleView.swift      | 30 ++++----
 .../RoomCreation/RoomCreationAvatarView.swift | 10 +--
 .../RoomCreationViewController.swift          |  2 +-
 Tchap/Modules/Rooms/Views/RoomsCell.swift     | 17 +++--
 .../Rooms/Views/RoomsDiscussionCell.swift     |  6 +-
 .../Modules/Rooms/Views/RoomsInviteCell.swift | 14 ++--
 Tchap/Modules/Rooms/Views/RoomsRoomCell.swift |  6 +-
 .../Rooms/Views/RoomsTchapInfoCell.swift      |  4 +-
 .../Views/ShareRoomsDiscussionCell.swift      |  8 +--
 .../Listing/Views/ShareRoomsRoomCell.swift    |  8 +--
 26 files changed, 200 insertions(+), 171 deletions(-)

diff --git a/Tchap/Modules/Authentication/AuthenticationViewController.swift b/Tchap/Modules/Authentication/AuthenticationViewController.swift
index 5bcdc00f8b..837b0c09bd 100644
--- a/Tchap/Modules/Authentication/AuthenticationViewController.swift
+++ b/Tchap/Modules/Authentication/AuthenticationViewController.swift
@@ -145,8 +145,8 @@ private extension AuthenticationViewController {
             ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
-        self.loginFormTextField.updateTheme()
-        self.passwordFormTextField.updateTheme()
+        self.loginFormTextField.update(theme: ThemeService.shared().theme)
+        self.passwordFormTextField.update(theme: ThemeService.shared().theme)
     }
 }
 
diff --git a/Tchap/Modules/ChangePassword/CurrentPassword/ChangePasswordCurrentPasswordViewController.swift b/Tchap/Modules/ChangePassword/CurrentPassword/ChangePasswordCurrentPasswordViewController.swift
index d07b54c765..4bdb8d3c07 100644
--- a/Tchap/Modules/ChangePassword/CurrentPassword/ChangePasswordCurrentPasswordViewController.swift
+++ b/Tchap/Modules/ChangePassword/CurrentPassword/ChangePasswordCurrentPasswordViewController.swift
@@ -89,7 +89,7 @@ final class ChangePasswordCurrentPasswordViewController: UIViewController {
         }
                 
         self.instructionsLabel.textColor = ThemeService.shared().theme.textSecondaryColor
-        self.passwordFormTextField.updateTheme()
+        self.passwordFormTextField.update(theme: ThemeService.shared().theme)
         
         ThemeService.shared().theme.applyStyle(onButton: self.validateButton)
     }
diff --git a/Tchap/Modules/ChangePassword/NewPassword/ChangePasswordNewPasswordViewController.swift b/Tchap/Modules/ChangePassword/NewPassword/ChangePasswordNewPasswordViewController.swift
index a7c6f02a36..b713d5e456 100644
--- a/Tchap/Modules/ChangePassword/NewPassword/ChangePasswordNewPasswordViewController.swift
+++ b/Tchap/Modules/ChangePassword/NewPassword/ChangePasswordNewPasswordViewController.swift
@@ -95,7 +95,7 @@ final class ChangePasswordNewPasswordViewController: UIViewController {
         
         self.instructionsLabel.textColor = ThemeService.shared().theme.textSecondaryColor
         for formTextField in self.formTextFields {
-            formTextField.updateTheme()
+            formTextField.update(theme: ThemeService.shared().theme)
         }
         
         self.validateButton.backgroundColor = ThemeService.shared().theme.backgroundColor
diff --git a/Tchap/Modules/Common/Forms/FormCheckBox.swift b/Tchap/Modules/Common/Forms/FormCheckBox.swift
index 0fbba13460..3ad2efa123 100644
--- a/Tchap/Modules/Common/Forms/FormCheckBox.swift
+++ b/Tchap/Modules/Common/Forms/FormCheckBox.swift
@@ -114,8 +114,8 @@ final class FormCheckBox: UIView, NibOwnerLoadable {
 }
 
 // MARK: - Theme
-extension FormCheckBox {
-    func updateTheme() {
-        self.label.textColor = ThemeService.shared().theme.textSecondaryColor
+extension FormCheckBox: Themable {
+    func update(theme: Theme) {
+        self.label.textColor = theme.textSecondaryColor
     }
 }
diff --git a/Tchap/Modules/Common/Forms/FormTextField.swift b/Tchap/Modules/Common/Forms/FormTextField.swift
index 1f602f4678..8d61589d33 100644
--- a/Tchap/Modules/Common/Forms/FormTextField.swift
+++ b/Tchap/Modules/Common/Forms/FormTextField.swift
@@ -169,11 +169,11 @@ final class FormTextField: UIView, NibOwnerLoadable {
 }
 
 // MARK: - Theme
-extension FormTextField {
-    func updateTheme() {
-        ThemeService.shared().theme.applyStyle(onTextField: self.textField)
-        self.separatorView.backgroundColor = ThemeService.shared().theme.lineBreakColor
-        self.additionalInfoLabel.textColor = ThemeService.shared().theme.textSecondaryColor
+extension FormTextField: Themable {
+    func update(theme: Theme) {
+        theme.applyStyle(onTextField: self.textField)
+        self.separatorView.backgroundColor = theme.lineBreakColor
+        self.additionalInfoLabel.textColor = theme.textSecondaryColor
     }
 }
 
diff --git a/Tchap/Modules/Common/RetentionPeriodPicker/RetentionPeriodPickerContentView.swift b/Tchap/Modules/Common/RetentionPeriodPicker/RetentionPeriodPickerContentView.swift
index c1b5284d40..9b74c00c00 100644
--- a/Tchap/Modules/Common/RetentionPeriodPicker/RetentionPeriodPickerContentView.swift
+++ b/Tchap/Modules/Common/RetentionPeriodPicker/RetentionPeriodPickerContentView.swift
@@ -35,7 +35,7 @@ final class RetentionPeriodPickerContentView: UIView, NibOwnerLoadable, UIPicker
     
     private func commonInit() {
         retentionPeriodValuesNb = 6
-        self.updateTheme()
+        self.update(theme: ThemeService.shared().theme)
     }
     
     convenience init() {
@@ -128,11 +128,12 @@ final class RetentionPeriodPickerContentView: UIView, NibOwnerLoadable, UIPicker
         }
         self.pickerView.selectRow(row + self.retentionPeriodValuesNb, inComponent: 0, animated: animated)
     }
+}
     
-    // MARK: - Theme
-    
-    func updateTheme() {
-        self.pickerView.backgroundColor = ThemeService.shared().theme.backgroundColor
-        self.pickerView.tintColor = ThemeService.shared().theme.textPrimaryColor
+// MARK: - Theme
+extension RetentionPeriodPickerContentView: Themable {
+    func update(theme: Theme) {
+        self.pickerView.backgroundColor = theme.backgroundColor
+        self.pickerView.tintColor = theme.textPrimaryColor
     }
 }
diff --git a/Tchap/Modules/Contacts/Views/ContactButton/ContactButtonView.swift b/Tchap/Modules/Contacts/Views/ContactButton/ContactButtonView.swift
index 747343da39..37b2e2c9c3 100644
--- a/Tchap/Modules/Contacts/Views/ContactButton/ContactButtonView.swift
+++ b/Tchap/Modules/Contacts/Views/ContactButton/ContactButtonView.swift
@@ -25,9 +25,8 @@ import UIKit
     
     override func awakeFromNib() {
         super.awakeFromNib()
-        // Initialization code
         
-        self.updateTheme()
+        self.update(theme: ThemeService.shared().theme)
     }
     
     class func nib() -> UINib {
@@ -38,11 +37,6 @@ import UIKit
         return String(describing: self)
     }
     
-    func updateTheme() {
-        self.actionLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
-        self.actionLabel.font = UIFont.systemFont(ofSize: 15, weight: .regular)
-    }
-    
     func render(model: ContactButtonViewModelType) {
         self.viewModel = model
         
@@ -50,3 +44,11 @@ import UIKit
         self.actionLabel.text = model.action
     }
 }
+
+// MARK: - Theme
+extension ContactButtonView: Themable {
+    func update(theme: Theme) {
+        self.actionLabel.textColor = theme.headerTextPrimaryColor
+        self.actionLabel.font = UIFont.systemFont(ofSize: 15, weight: .regular)
+    }
+}
diff --git a/Tchap/Modules/Contacts/Views/ContactCell.swift b/Tchap/Modules/Contacts/Views/ContactCell.swift
index ca2b0f6b26..d7b53e705f 100644
--- a/Tchap/Modules/Contacts/Views/ContactCell.swift
+++ b/Tchap/Modules/Contacts/Views/ContactCell.swift
@@ -37,7 +37,7 @@ import UIKit
         super.awakeFromNib()
         // Initialization code
         
-        self.updateTheme()
+        self.update(theme: ThemeService.shared().theme)
         
         self.thumbnailView.enableInMemoryCache = true
     }
@@ -115,17 +115,6 @@ import UIKit
         self.contact = nil
     }
     
-    func updateTheme() {
-        self.contactDisplayNameLabel.textColor = self.isExpiredUser ? ThemeService.shared().theme.textSecondaryColor : ThemeService.shared().theme.textPrimaryColor
-        self.contactDomainLabel.textColor = self.isExpiredUser ? ThemeService.shared().theme.textSecondaryColor : ThemeService.shared().theme.textTertiaryColor
-        self.contactEmailLabel.textColor = ThemeService.shared().theme.textSecondaryColor
-        
-        // Clear the default background color of a MXKImageView instance
-        self.thumbnailView?.defaultBackgroundColor = UIColor.clear
-        
-        self.presenceView?.backgroundColor = ThemeService.shared().theme.headerBackgroundColor
-    }
-    
     private func refreshContactThumbnail() {
         if let image = self.contact?.thumbnail(withPreferedSize: self.thumbnailView.frame.size) {
             self.thumbnailView.image = image
@@ -207,3 +196,17 @@ import UIKit
         refreshContactPresence()
     }
 }
+
+// MARK: - Theme
+extension ContactCell: Themable {
+    func update(theme: Theme) {
+        self.contactDisplayNameLabel.textColor = self.isExpiredUser ? theme.textSecondaryColor : theme.textPrimaryColor
+        self.contactDomainLabel.textColor = self.isExpiredUser ? theme.textSecondaryColor : theme.textTertiaryColor
+        self.contactEmailLabel.textColor = theme.textSecondaryColor
+        
+        // Clear the default background color of a MXKImageView instance
+        self.thumbnailView?.defaultBackgroundColor = UIColor.clear
+        
+        self.presenceView?.backgroundColor = theme.headerBackgroundColor
+    }
+}
diff --git a/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift b/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift
index 426c07173e..5743c9cc7c 100644
--- a/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift
+++ b/Tchap/Modules/ForgotPassword/Form/ForgotPasswordFormViewController.swift
@@ -160,7 +160,7 @@ private extension ForgotPasswordFormViewController {
         }
         
         for formTextField in self.formTextFields {
-            formTextField.updateTheme()
+            formTextField.update(theme: ThemeService.shared().theme)
         }
         
         ThemeService.shared().theme.applyStyle(onButton: self.sendEmailButton)
diff --git a/Tchap/Modules/PublicRooms/Views/PublicRoomsCell.swift b/Tchap/Modules/PublicRooms/Views/PublicRoomsCell.swift
index 8cc554245e..1bd938d119 100644
--- a/Tchap/Modules/PublicRooms/Views/PublicRoomsCell.swift
+++ b/Tchap/Modules/PublicRooms/Views/PublicRoomsCell.swift
@@ -33,7 +33,7 @@ import Reusable
         super.awakeFromNib()
         // Initialization code
         
-        self.updateTheme()
+        self.update(theme: ThemeService.shared().theme)
         
         self.avatarView.enableInMemoryCache = true
     }
@@ -99,12 +99,12 @@ import Reusable
 }
 
 // MARK: - Theme
-private extension PublicRoomsCell {
-    func updateTheme() {
-        self.roomDisplayName.textColor = ThemeService.shared().theme.textPrimaryColor
-        self.roomTopic.textColor = ThemeService.shared().theme.textSecondaryColor
-        self.memberCount.textColor = ThemeService.shared().theme.textSecondaryColor
-        self.domainLabel.textColor = ThemeService.shared().theme.textTertiaryColor
+extension PublicRoomsCell: Themable {
+    func update(theme: Theme) {
+        self.roomDisplayName.textColor = theme.textPrimaryColor
+        self.roomTopic.textColor = theme.textSecondaryColor
+        self.memberCount.textColor = theme.textSecondaryColor
+        self.domainLabel.textColor = theme.textTertiaryColor
         
         self.avatarView?.defaultBackgroundColor = UIColor.clear
     }
diff --git a/Tchap/Modules/Registration/Form/RegistrationFormViewController.swift b/Tchap/Modules/Registration/Form/RegistrationFormViewController.swift
index cbe9fafbf2..7bcbc741bb 100644
--- a/Tchap/Modules/Registration/Form/RegistrationFormViewController.swift
+++ b/Tchap/Modules/Registration/Form/RegistrationFormViewController.swift
@@ -167,10 +167,10 @@ private extension RegistrationFormViewController {
         }
         
         for formTextField in self.formTextFields {
-            formTextField.updateTheme()
+            formTextField.update(theme: ThemeService.shared().theme)
         }
         
-        self.termsFormCheckBox.updateTheme()
+        self.termsFormCheckBox.update(theme: ThemeService.shared().theme)
     }
 }
 
diff --git a/Tchap/Modules/Room/Settings/Views/RetentionPeriodPickerCell.swift b/Tchap/Modules/Room/Settings/Views/RetentionPeriodPickerCell.swift
index c3fc5aef5e..ab61e3b8e5 100644
--- a/Tchap/Modules/Room/Settings/Views/RetentionPeriodPickerCell.swift
+++ b/Tchap/Modules/Room/Settings/Views/RetentionPeriodPickerCell.swift
@@ -29,7 +29,7 @@ import UIKit
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
-        self.updateTheme()
+        self.update(theme: ThemeService.shared().theme)
         
         self.retentionPeriodPickerContentView.delegate = self
     }
@@ -42,10 +42,6 @@ import UIKit
         return String(describing: self)
     }
     
-    func updateTheme() {
-        self.retentionPeriodPickerContentView.updateTheme()
-    }
-    
     func updatePickerWith(retentionPeriodInDays: uint, animated: Bool) {
         self.retentionPeriodPickerContentView.updatePickerWith(retentionPeriodInDays: retentionPeriodInDays, animated: animated)
     }
@@ -54,3 +50,11 @@ import UIKit
         self.delegate?.retentionPeriodPickerCell(self, didSelect: periodInDays)
     }
 }
+
+// MARK: - Theme
+extension RetentionPeriodPickerCell: Themable {
+    func update(theme: Theme) {
+        self.retentionPeriodPickerContentView.update(theme: theme)
+    }
+}
+
diff --git a/Tchap/Modules/Room/Views/BubbleCells/Antivirus/StatusContentView/RoomAttachmentAntivirusScanStatusCellContentView.swift b/Tchap/Modules/Room/Views/BubbleCells/Antivirus/StatusContentView/RoomAttachmentAntivirusScanStatusCellContentView.swift
index 5b6dbd4b6d..e40273f66a 100644
--- a/Tchap/Modules/Room/Views/BubbleCells/Antivirus/StatusContentView/RoomAttachmentAntivirusScanStatusCellContentView.swift
+++ b/Tchap/Modules/Room/Views/BubbleCells/Antivirus/StatusContentView/RoomAttachmentAntivirusScanStatusCellContentView.swift
@@ -28,7 +28,7 @@ import Reusable
     // MARK: - Setup
     
     private func commonInit() {
-        self.updateTheme()
+        self.update(theme: ThemeService.shared().theme)
     }
     
     convenience init() {
@@ -57,9 +57,9 @@ import Reusable
 }
 
 // MARK: - Theme
-private extension RoomAttachmentAntivirusScanStatusCellContentView {
-    func updateTheme() {
-        self.titleLabel.textColor = ThemeService.shared().theme.textPrimaryColor
-        self.fileInfoLabel.textColor = ThemeService.shared().theme.textPrimaryColor
+extension RoomAttachmentAntivirusScanStatusCellContentView: Themable {
+    func update(theme: Theme) {
+        self.titleLabel.textColor = theme.textPrimaryColor
+        self.fileInfoLabel.textColor = theme.textPrimaryColor
     }
 }
diff --git a/Tchap/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m b/Tchap/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
index 65f0e73ff4..94ea9c182b 100644
--- a/Tchap/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
+++ b/Tchap/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
@@ -20,6 +20,9 @@
 
 #import "GeneratedInterface-Swift.h"
 
+@interface DisabledRoomInputToolbarView() <Themable>
+@end
+
 @implementation DisabledRoomInputToolbarView
 
 + (UINib *)nib
@@ -41,8 +44,7 @@ + (instancetype)roomInputToolbarView
         inputToolbarView = [[self alloc] init];
     }
     
-
-    [inputToolbarView updateTheme];
+    [inputToolbarView updateWithTheme:ThemeService.shared.theme];
     return inputToolbarView;
 }
 
@@ -51,28 +53,29 @@ + (instancetype)roomInputToolbarView
 -(void)customizeViewRendering
 {
     [super customizeViewRendering];
-    [self updateTheme];
+    [self updateWithTheme:ThemeService.shared.theme];
 }
 
-- (void)updateTheme
+#pragma mark -
+
+- (void)setDisabledReason:(NSString *)reason
 {
+    self.disabledReasonTextView.text = reason;
+}
+
+#pragma mark - Theme
+
+- (void)updateWithTheme:(id<Theme> _Nonnull)theme {
     // Remove default toolbar background color
     self.backgroundColor = [UIColor clearColor];
     
-    self.separatorView.backgroundColor = ThemeService.shared.theme.selectedBackgroundColor;
+    self.separatorView.backgroundColor = theme.selectedBackgroundColor;
     
     self.disabledReasonTextView.font = [UIFont systemFontOfSize:15];
-    self.disabledReasonTextView.textColor = ThemeService.shared.theme.textPrimaryColor;
-    self.disabledReasonTextView.tintColor = ThemeService.shared.theme.textSecondaryColor;
+    self.disabledReasonTextView.textColor = theme.textPrimaryColor;
+    self.disabledReasonTextView.tintColor = theme.textSecondaryColor;
     self.disabledReasonTextView.editable = NO;
     self.disabledReasonTextView.scrollEnabled = NO;
 }
 
-#pragma mark -
-
-- (void)setDisabledReason:(NSString *)reason
-{
-    self.disabledReasonTextView.text = reason;
-}
-
 @end
diff --git a/Tchap/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Tchap/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index b9f743da87..1fa3d84a89 100644
--- a/Tchap/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Tchap/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -27,7 +27,7 @@
 
 #import "GeneratedInterface-Swift.h"
 
-@interface RoomInputToolbarView()
+@interface RoomInputToolbarView() <Themable>
 {
     // The intermediate action sheet
     UIAlertController *actionSheet;
@@ -56,7 +56,7 @@ + (instancetype)roomInputToolbarView
         inputToolbarView = [[self alloc] init];
     }
     
-    [inputToolbarView updateTheme];
+    [inputToolbarView updateWithTheme:ThemeService.shared.theme];
     return inputToolbarView;
 }
 
@@ -83,39 +83,7 @@ - (void)awakeFromNib
 -(void)customizeViewRendering
 {
     [super customizeViewRendering];
-    [self updateTheme];
-}
-
-- (void)updateTheme
-{
-    // Remove default toolbar background color
-    self.backgroundColor = [UIColor clearColor];
-    
-    self.separatorView.backgroundColor = ThemeService.shared.theme.selectedBackgroundColor;
-    
-    // Custom the growingTextView display
-    growingTextView.layer.cornerRadius = 0;
-    growingTextView.layer.borderWidth = 0;
-    growingTextView.backgroundColor = [UIColor clearColor];
-    
-    growingTextView.font = [UIFont systemFontOfSize:15];
-    growingTextView.textColor = ThemeService.shared.theme.textPrimaryColor;
-    growingTextView.tintColor = ThemeService.shared.theme.textSecondaryColor;
-    
-    growingTextView.internalTextView.keyboardAppearance = ThemeService.shared.theme.keyboardAppearance;
-    if (growingTextView.isFirstResponder)
-    {
-        [growingTextView resignFirstResponder];
-        [growingTextView becomeFirstResponder];
-    }
-
-    self.attachMediaButton.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_upload", @"Vector", nil);
-    self.voiceCallButton.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_call", @"Vector", nil);
-    self.hangupCallButton.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_hangup", @"Vector", nil);
-    
-//    self.hangupCallButton.tintColor = ThemeService.shared.theme.noticeColor;
-//    self.voiceCallButton.tintColor = ThemeService.shared.theme.tintColor;
-//    self.attachMediaButton.tintColor = ThemeService.shared.theme.tintColor;
+    [self updateWithTheme:ThemeService.shared.theme];
 }
 
 #pragma mark -
@@ -466,4 +434,38 @@ - (void)paste:(id)sender
     [super paste:sender];
 }
 
+#pragma mark - Theme
+
+- (void)updateWithTheme:(id<Theme> _Nonnull)theme
+{
+    // Remove default toolbar background color
+    self.backgroundColor = [UIColor clearColor];
+    
+    self.separatorView.backgroundColor = theme.selectedBackgroundColor;
+    
+    // Custom the growingTextView display
+    growingTextView.layer.cornerRadius = 0;
+    growingTextView.layer.borderWidth = 0;
+    growingTextView.backgroundColor = [UIColor clearColor];
+    
+    growingTextView.font = [UIFont systemFontOfSize:15];
+    growingTextView.textColor = theme.textPrimaryColor;
+    growingTextView.tintColor = theme.textSecondaryColor;
+    
+    growingTextView.internalTextView.keyboardAppearance = theme.keyboardAppearance;
+    if (growingTextView.isFirstResponder)
+    {
+        [growingTextView resignFirstResponder];
+        [growingTextView becomeFirstResponder];
+    }
+
+    self.attachMediaButton.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_upload", @"Vector", nil);
+    self.voiceCallButton.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_call", @"Vector", nil);
+    self.hangupCallButton.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_hangup", @"Vector", nil);
+    
+//    self.hangupCallButton.tintColor = theme.noticeColor;
+//    self.voiceCallButton.tintColor = theme.tintColor;
+//    self.attachMediaButton.tintColor = theme.tintColor;
+}
+
 @end
diff --git a/Tchap/Modules/Room/Views/Preview/PreviewView.m b/Tchap/Modules/Room/Views/Preview/PreviewView.m
index 965cfcc87e..784036fce7 100644
--- a/Tchap/Modules/Room/Views/Preview/PreviewView.m
+++ b/Tchap/Modules/Room/Views/Preview/PreviewView.m
@@ -20,6 +20,9 @@
 
 #import "GeneratedInterface-Swift.h"
 
+@interface PreviewView() <Themable>
+@end
+
 @implementation PreviewView
 
 + (UINib *)nib
@@ -31,7 +34,7 @@ + (UINib *)nib
 + (instancetype)instantiate
 {
     PreviewView *previewView = [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
-    [previewView updateTheme];
+    [previewView updateWithTheme:ThemeService.shared.theme];
     return previewView;
 }
 
@@ -61,22 +64,7 @@ -(void)customizeViewRendering
     [self.rightButton.layer setCornerRadius:5];
     self.rightButton.clipsToBounds = YES;
     
-    [self updateTheme];
-}
-
-- (void)updateTheme
-{
-    self.backgroundColor = ThemeService.shared.theme.backgroundColor;
-    
-    self.previewLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
-    self.subNoticeLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
-    self.bottomBorderView.backgroundColor = ThemeService.shared.theme.headerBorderColor;
-    
-    self.leftButton.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
-    self.leftButton.titleLabel.textColor = ThemeService.shared.theme.headerTextPrimaryColor;
-    
-    self.rightButton.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
-    self.rightButton.titleLabel.textColor = ThemeService.shared.theme.headerTextPrimaryColor;
+    [self updateWithTheme:ThemeService.shared.theme];
 }
 
 - (void)refreshDisplay
@@ -108,4 +96,21 @@ - (void)setRoomName:(NSString *)roomName
     [self refreshDisplay];
 }
 
+#pragma mark - Theme
+
+- (void)updateWithTheme:(id<Theme> _Nonnull)theme
+{
+    self.backgroundColor = theme.backgroundColor;
+    
+    self.previewLabel.textColor = theme.textPrimaryColor;
+    self.subNoticeLabel.textColor = theme.textSecondaryColor;
+    self.bottomBorderView.backgroundColor = theme.headerBorderColor;
+    
+    self.leftButton.backgroundColor = theme.headerBackgroundColor;
+    self.leftButton.titleLabel.textColor = theme.headerTextPrimaryColor;
+    
+    self.rightButton.backgroundColor = theme.headerBackgroundColor;
+    self.rightButton.titleLabel.textColor = theme.headerTextPrimaryColor;
+}
+
 @end
diff --git a/Tchap/Modules/Room/Views/Title/RoomTitleView.swift b/Tchap/Modules/Room/Views/Title/RoomTitleView.swift
index 899522dbf1..9424bf5d2c 100644
--- a/Tchap/Modules/Room/Views/Title/RoomTitleView.swift
+++ b/Tchap/Modules/Room/Views/Title/RoomTitleView.swift
@@ -61,7 +61,10 @@ import Reusable
     // MARK: Setup
     
     @objc class func instantiate() -> RoomTitleView {
-        return RoomTitleView.loadFromNib()
+        let roomTitleView = RoomTitleView.loadFromNib()
+        roomTitleView.update(theme: ThemeService.shared().theme)
+        return roomTitleView
+
     }
     
     // MARK: Life cycle
@@ -161,17 +164,6 @@ import Reusable
         }
     }
     
-    @objc func updateTheme() {
-        self.titleLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
-        self.subTitleLabel.textColor = ThemeService.shared().theme.headerTextSecondaryColor
-        self.subTitleMembersSeparatorLabel.textColor = ThemeService.shared().theme.textSecondaryColor
-        self.subTitleMembersLabel.textColor = ThemeService.shared().theme.textSecondaryColor
-        self.subTitleRetentionSeparatorLabel.textColor = ThemeService.shared().theme.textSecondaryColor
-        self.subTitleRetentionLabel.textColor = ThemeService.shared().theme.textSecondaryColor
-        
-        self.imageView?.defaultBackgroundColor = UIColor.clear
-    }
-    
     // MARK: - Private
     
     private func setupTapGestureRecognizer() {
@@ -195,3 +187,17 @@ import Reusable
         self.delegate?.roomTitleViewDidTapped(self)
     }
 }
+
+// MARK: - Theme
+extension RoomTitleView: Themable {
+    @objc func update(theme: Theme) {
+        self.titleLabel.textColor = theme.headerTextPrimaryColor
+        self.subTitleLabel.textColor = theme.headerTextSecondaryColor
+        self.subTitleMembersSeparatorLabel.textColor = theme.textSecondaryColor
+        self.subTitleMembersLabel.textColor = theme.textSecondaryColor
+        self.subTitleRetentionSeparatorLabel.textColor = theme.textSecondaryColor
+        self.subTitleRetentionLabel.textColor = theme.textSecondaryColor
+
+        self.imageView?.defaultBackgroundColor = UIColor.clear
+    }
+}
diff --git a/Tchap/Modules/RoomCreation/RoomCreationAvatarView.swift b/Tchap/Modules/RoomCreation/RoomCreationAvatarView.swift
index d6a3784dc9..254cf9cea4 100644
--- a/Tchap/Modules/RoomCreation/RoomCreationAvatarView.swift
+++ b/Tchap/Modules/RoomCreation/RoomCreationAvatarView.swift
@@ -52,7 +52,7 @@ final class RoomCreationAvatarView: UIView, NibLoadable {
 
         self.updateAddButtonTextVisibility()
 
-        self.updateTheme()
+        self.update(theme: ThemeService.shared().theme)
     }
     
     override func layoutSubviews() {
@@ -101,9 +101,9 @@ final class RoomCreationAvatarView: UIView, NibLoadable {
 }
 
 // MARK: - Theme
-private extension RoomCreationAvatarView {
-    func updateTheme() {
-        self.backgroundView.backgroundColor = ThemeService.shared().theme.selectedBackgroundColor
-        self.addButton.setTitleColor(ThemeService.shared().theme.textTertiaryColor, for: .normal)
+extension RoomCreationAvatarView: Themable {
+    func update(theme: Theme) {
+        self.backgroundView.backgroundColor = theme.selectedBackgroundColor
+        self.addButton.setTitleColor(theme.textTertiaryColor, for: .normal)
     }
 }
diff --git a/Tchap/Modules/RoomCreation/RoomCreationViewController.swift b/Tchap/Modules/RoomCreation/RoomCreationViewController.swift
index d8274f1516..d3b5dcfdc8 100644
--- a/Tchap/Modules/RoomCreation/RoomCreationViewController.swift
+++ b/Tchap/Modules/RoomCreation/RoomCreationViewController.swift
@@ -336,7 +336,7 @@ private extension RoomCreationViewController {
             ThemeService.shared().theme.applyStyle(onNavigationBar: navigationBar)
         }
         
-        self.roomNameFormTextField.updateTheme()
+        self.roomNameFormTextField.update(theme: ThemeService.shared().theme)
         self.publicVisibilityInfoLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
         self.publicRoomFederationTitleLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
 
diff --git a/Tchap/Modules/Rooms/Views/RoomsCell.swift b/Tchap/Modules/Rooms/Views/RoomsCell.swift
index 0dcdbee83f..fa6179397a 100644
--- a/Tchap/Modules/Rooms/Views/RoomsCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsCell.swift
@@ -41,7 +41,7 @@ import UIKit
         super.awakeFromNib()
         // Initialization code
         
-        self.updateTheme()
+        self.update(theme: ThemeService.shared().theme)
         
         self.avatarView.enableInMemoryCache = true
     }
@@ -148,13 +148,16 @@ import UIKit
         // The RoomsCell instances support the self-sizing mode, return a default value
         return 80
     }
+}
 
-    func updateTheme() {
-        self.titleLabel.textColor = ThemeService.shared().theme.textPrimaryColor
-        self.lastEventDescription?.textColor = ThemeService.shared().theme.textSecondaryColor
-        self.lastEventDate?.textColor = ThemeService.shared().theme.textSecondaryColor
-        self.missedNotifAndUnreadBadgeBgView?.backgroundColor = ThemeService.shared().theme.headerBackgroundColor
-        self.missedNotifAndUnreadBadgeLabel?.textColor = ThemeService.shared().theme.headerTextPrimaryColor
+// MARK: - Theme
+extension RoomsCell: Themable {
+    func update(theme: Theme) {
+        self.titleLabel.textColor = theme.textPrimaryColor
+        self.lastEventDescription?.textColor = theme.textSecondaryColor
+        self.lastEventDate?.textColor = theme.textSecondaryColor
+        self.missedNotifAndUnreadBadgeBgView?.backgroundColor = theme.headerBackgroundColor
+        self.missedNotifAndUnreadBadgeLabel?.textColor = theme.headerTextPrimaryColor
         
         self.avatarView?.defaultBackgroundColor = UIColor.clear
         
diff --git a/Tchap/Modules/Rooms/Views/RoomsDiscussionCell.swift b/Tchap/Modules/Rooms/Views/RoomsDiscussionCell.swift
index bea33320ec..5839e67a97 100644
--- a/Tchap/Modules/Rooms/Views/RoomsDiscussionCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsDiscussionCell.swift
@@ -36,8 +36,8 @@ import UIKit
         }
     }
     
-    override func updateTheme() {
-        super.updateTheme()
-        self.domainLabel.textColor = ThemeService.shared().theme.textTertiaryColor
+    override func update(theme: Theme) {
+        super.update(theme: theme)
+        self.domainLabel.textColor = theme.textTertiaryColor
     }
 }
diff --git a/Tchap/Modules/Rooms/Views/RoomsInviteCell.swift b/Tchap/Modules/Rooms/Views/RoomsInviteCell.swift
index f6275a13a5..a8f54de6c9 100644
--- a/Tchap/Modules/Rooms/Views/RoomsInviteCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsInviteCell.swift
@@ -74,13 +74,13 @@ import UIKit
         }
     }
     
-    override func updateTheme() {
-        super.updateTheme()
-        self.domainLabel.textColor = ThemeService.shared().theme.textTertiaryColor
-        self.leftButton.backgroundColor = ThemeService.shared().theme.headerBackgroundColor
-        self.leftButton.setTitleColor(ThemeService.shared().theme.headerTextPrimaryColor, for: .normal)
-        self.rightButton.backgroundColor = ThemeService.shared().theme.headerBackgroundColor
-        self.rightButton.setTitleColor(ThemeService.shared().theme.headerTextPrimaryColor, for: .normal)
+    override func update(theme: Theme) {
+        super.update(theme: theme)
+        self.domainLabel.textColor = theme.textTertiaryColor
+        self.leftButton.backgroundColor = theme.headerBackgroundColor
+        self.leftButton.setTitleColor(theme.headerTextPrimaryColor, for: .normal)
+        self.rightButton.backgroundColor = theme.headerBackgroundColor
+        self.rightButton.setTitleColor(theme.headerTextPrimaryColor, for: .normal)
     }
     
     @IBAction private func onLeftPressed(_ sender: Any) {
diff --git a/Tchap/Modules/Rooms/Views/RoomsRoomCell.swift b/Tchap/Modules/Rooms/Views/RoomsRoomCell.swift
index cb0a663666..0eb4831b3b 100644
--- a/Tchap/Modules/Rooms/Views/RoomsRoomCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsRoomCell.swift
@@ -81,9 +81,9 @@ class RoomsRoomCell: RoomsCell {
         self.updateAvatarView()
     }
     
-    override func updateTheme() {
-        super.updateTheme()
-        self.lastEventSenderName.textColor = ThemeService.shared().theme.textPrimaryColor
+    override func update(theme: Theme) {
+        super.update(theme: theme)
+        self.lastEventSenderName.textColor = theme.textPrimaryColor
     }
     
     private func updateAvatarView () {
diff --git a/Tchap/Modules/Rooms/Views/RoomsTchapInfoCell.swift b/Tchap/Modules/Rooms/Views/RoomsTchapInfoCell.swift
index 485bb57ff8..c05abffa81 100644
--- a/Tchap/Modules/Rooms/Views/RoomsTchapInfoCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsTchapInfoCell.swift
@@ -41,8 +41,8 @@ import UIKit
         }
     }
     
-    override func updateTheme() {
-        super.updateTheme()
+    override func update(theme: Theme) {
+        super.update(theme: theme)
         self.domainLabel.textColor = kColorVerySoftBlue
     }
 }
diff --git a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift
index ffea7ae163..2968e4f645 100644
--- a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift
+++ b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift
@@ -36,11 +36,11 @@ import UIKit
         }
     }
     
-    override func updateTheme() {
-        super.updateTheme()
-        self.domainLabel.textColor = ThemeService.shared().theme.textTertiaryColor
+    override func update(theme: Theme) {
+        super.update(theme: theme)
         
-        self.contentView.backgroundColor = ThemeService.shared().theme.backgroundColor
+        self.domainLabel.textColor = theme.textTertiaryColor
+        self.contentView.backgroundColor = theme.backgroundColor
     }
     
     func renderedCellData() -> MXKCellData! {
diff --git a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift
index 0a1c3cd663..48a289566e 100644
--- a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift
+++ b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift
@@ -39,10 +39,10 @@ class ShareRoomsRoomCell: RoomsCell {
         self.updateAvatarView()
     }
     
-    override func updateTheme() {
-        super.updateTheme()
-        
-        self.contentView.backgroundColor = ThemeService.shared().theme.backgroundColor
+    override func update(theme: Theme) {
+        super.update(theme: theme)
+
+        self.contentView.backgroundColor = theme.backgroundColor
     }
     
     private func updateAvatarView () {

From d9f141c56fc37272401c2c3f6b05c4b12d00a0f4 Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Thu, 23 Sep 2021 16:18:23 +0200
Subject: [PATCH 08/13] Fix RoomTitleView vertical layout issue

---
 Tchap/Modules/Room/Views/Title/RoomTitleView.xib | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Tchap/Modules/Room/Views/Title/RoomTitleView.xib b/Tchap/Modules/Room/Views/Title/RoomTitleView.xib
index b4e6d6ab6a..8599226ee5 100644
--- a/Tchap/Modules/Room/Views/Title/RoomTitleView.xib
+++ b/Tchap/Modules/Room/Views/Title/RoomTitleView.xib
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="Hxs-lM-nwf" customClass="RoomTitleView" customModule="Tchap" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="Hxs-lM-nwf" customClass="RoomTitleView" customModule="Btchap" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="117"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -19,6 +19,9 @@
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Salon" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IZL-Jn-z4r">
                             <rect key="frame" x="0.0" y="0.0" width="281" height="19.5"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="19.5" id="2Bb-T2-eCU"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
@@ -126,10 +129,14 @@
                                 </view>
                             </subviews>
                             <constraints>
+                                <constraint firstAttribute="height" constant="16" id="K7o-Bv-Df6"/>
                                 <constraint firstItem="O2m-Hn-PIx" firstAttribute="width" secondItem="ybC-0p-nPM" secondAttribute="width" multiplier="0.684932" id="izJ-ov-i18"/>
                             </constraints>
                         </stackView>
                     </subviews>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="36.5" id="pWb-Xa-y4S"/>
+                    </constraints>
                 </stackView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PQX-3w-scV" customClass="MXKImageView">
                     <rect key="frame" x="333" y="64.5" width="32" height="32"/>

From 3ca005a2302c649ec86ba1ae46ea81a5c05c32ed Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Thu, 23 Sep 2021 16:32:07 +0200
Subject: [PATCH 09/13] Remove now useless Appearance setup

---
 Tchap/Modules/Application/AppDelegate.swift |  3 --
 Tchap/Modules/Common/Style/Appearance.swift | 36 ---------------------
 2 files changed, 39 deletions(-)
 delete mode 100644 Tchap/Modules/Common/Style/Appearance.swift

diff --git a/Tchap/Modules/Application/AppDelegate.swift b/Tchap/Modules/Application/AppDelegate.swift
index 8b2d58becb..410e6eb0a8 100644
--- a/Tchap/Modules/Application/AppDelegate.swift
+++ b/Tchap/Modules/Application/AppDelegate.swift
@@ -60,9 +60,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, PushNotificationServiceDe
         self.appCoordinator = AppCoordinator(router: self.rootRouter)
         self.appCoordinator.start()
         
-        // Setup default UIAppearance
-        Appearance.setup()
-        
         return true
     }
     
diff --git a/Tchap/Modules/Common/Style/Appearance.swift b/Tchap/Modules/Common/Style/Appearance.swift
deleted file mode 100644
index e4f3d490fc..0000000000
--- a/Tchap/Modules/Common/Style/Appearance.swift
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- Copyright 2018 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import Foundation
-
-/// Used set of default appearance of object conforming to UIAppearance protocol.
-/// Use appearance in last resort, only when UI component cannot be customized directly.
-struct Appearance {
-    
-    static func setup() {
-        self.setupSearchBarAppearance()
-    }
-    
-    // UISearchBar textColor could not be set directly
-    static func setupSearchBarAppearance() {
-//        UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self, UINavigationBar.self]).defaultTextAttributes = [NSAttributedString.Key.foregroundColor: Variant1Style.shared.barActionColor]
-//
-//        // Since iOS 11 UISearchController is set as navigationItem and displayed under UINavigationBar in UINavigationController
-//        if #available(iOS 11.0, *) {
-//            UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self, UINavigationController.self]).defaultTextAttributes = [NSAttributedString.Key.foregroundColor: Variant1Style.shared.barActionColor]
-//        }
-    }
-}

From d3d44b18828fb657cfbc08a1297134b9af9dc670 Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Thu, 23 Sep 2021 16:49:09 +0200
Subject: [PATCH 10/13] Fix xcodegen for extensions by removing unavailable
 Style folders in configuration files

---
 BtchapShareExtension/target.yml | 7 ++++---
 TchapShareExtension/target.yml  | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/BtchapShareExtension/target.yml b/BtchapShareExtension/target.yml
index b43ef01f4a..ce2b6ea0b7 100644
--- a/BtchapShareExtension/target.yml
+++ b/BtchapShareExtension/target.yml
@@ -60,23 +60,24 @@ targets:
     - path: ../Riot/Utils/UserNameColorGenerator.swift
 
     # Tchap
-    - path: ../Btchap/Config/BuildSettings.swift
     - path: ../Tchap/Config/CommonConfiguration.swift
     - path: ../Tchap/Config/Configurable.swift
     - path: ../Tchap/Constants
     - path: ../Tchap/Extensions
-    - path: ../Btchap/Generated/InfoPlist.swift
     - path: ../Tchap/Generated/Strings.swift
     - path: ../Tchap/Managers/HomeServer
     - path: ../Tchap/Managers/Room
     - path: ../Tchap/Managers/ThirdPartyIDPlatformInfoResolver
     - path: ../Tchap/Managers/User
     - path: ../Tchap/Managers/DisplayName
-    - path: ../Tchap/Modules/Common/Style
     - path: ../Tchap/Modules/Rooms/Views
     - path: ../Tchap/Model
     - path: ../Tchap/Utils
 
+    # Btchap
+    - path: ../Btchap/Config/BuildSettings.swift
+    - path: ../Btchap/Generated/InfoPlist.swift
+
     # Resources
     - path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.xib
       buildPhase: resources
diff --git a/TchapShareExtension/target.yml b/TchapShareExtension/target.yml
index 67f1c2c97f..2b4f5d7d3e 100644
--- a/TchapShareExtension/target.yml
+++ b/TchapShareExtension/target.yml
@@ -73,7 +73,6 @@ targets:
     - path: ../Tchap/Managers/ThirdPartyIDPlatformInfoResolver
     - path: ../Tchap/Managers/User
     - path: ../Tchap/Managers/DisplayName
-    - path: ../Tchap/Modules/Common/Style
     - path: ../Tchap/Modules/Rooms/Views
     - path: ../Tchap/Model
     - path: ../Tchap/Utils

From 74b5b8bfc9abc3b064be8527f9550787f67887d9 Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Tue, 28 Sep 2021 10:19:39 +0200
Subject: [PATCH 11/13] Fix country name settings color on dark mode

---
 Tchap/Modules/Settings/SettingsViewController.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Tchap/Modules/Settings/SettingsViewController.m b/Tchap/Modules/Settings/SettingsViewController.m
index 06c5b3ba67..23652fa080 100644
--- a/Tchap/Modules/Settings/SettingsViewController.m
+++ b/Tchap/Modules/Settings/SettingsViewController.m
@@ -1159,6 +1159,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             NSString *countryName = [local displayNameForKey:NSLocaleCountryCode value:countryCode];
             
             cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
+            cell.detailTextLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
             
             cell.textLabel.text = NSLocalizedStringFromTable(@"settings_contacts_phonebook_country", @"Vector", nil);
             cell.detailTextLabel.text = countryName;

From 33873473bf71c6df545e5a653875f4dab227ddc9 Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Tue, 28 Sep 2021 10:39:06 +0200
Subject: [PATCH 12/13] Force user interface style to use Light mode only

---
 Btchap/Generated/InfoPlist.swift  | 1 +
 Btchap/SupportingFiles/Info.plist | 2 ++
 Tchap/Generated/InfoPlist.swift   | 1 +
 Tchap/SupportingFiles/Info.plist  | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/Btchap/Generated/InfoPlist.swift b/Btchap/Generated/InfoPlist.swift
index 6e95d052e9..970618d5e2 100644
--- a/Btchap/Generated/InfoPlist.swift
+++ b/Btchap/Generated/InfoPlist.swift
@@ -38,6 +38,7 @@ internal enum InfoPlist {
   internal static let uiStatusBarTintParameters: [String: Any] = _document["UIStatusBarTintParameters"]
   internal static let uiSupportedInterfaceOrientations: [String] = _document["UISupportedInterfaceOrientations"]
   internal static let uiSupportedInterfaceOrientationsIpad: [String] = _document["UISupportedInterfaceOrientations~ipad"]
+  internal static let uiUserInterfaceStyle: String = _document["UIUserInterfaceStyle"]
   internal static let uiViewControllerBasedStatusBarAppearance: Bool = _document["UIViewControllerBasedStatusBarAppearance"]
   internal static let userDefaults: String = _document["UserDefaults"]
   internal static let applicationGroupIdentifier: String = _document["applicationGroupIdentifier"]
diff --git a/Btchap/SupportingFiles/Info.plist b/Btchap/SupportingFiles/Info.plist
index f7ef69678f..5f5d8b872d 100644
--- a/Btchap/SupportingFiles/Info.plist
+++ b/Btchap/SupportingFiles/Info.plist
@@ -79,6 +79,8 @@
 	<true/>
 	<key>UserDefaults</key>
 	<string>${PRODUCT_NAME}-Defaults</string>
+    <key>UIUserInterfaceStyle</key>
+    <string>Light</string>
 	<key>applicationGroupIdentifier</key>
 	<string>$(APPLICATION_GROUP_IDENTIFIER)</string>
 	<key>baseBundleIdentifier</key>
diff --git a/Tchap/Generated/InfoPlist.swift b/Tchap/Generated/InfoPlist.swift
index 6e95d052e9..970618d5e2 100644
--- a/Tchap/Generated/InfoPlist.swift
+++ b/Tchap/Generated/InfoPlist.swift
@@ -38,6 +38,7 @@ internal enum InfoPlist {
   internal static let uiStatusBarTintParameters: [String: Any] = _document["UIStatusBarTintParameters"]
   internal static let uiSupportedInterfaceOrientations: [String] = _document["UISupportedInterfaceOrientations"]
   internal static let uiSupportedInterfaceOrientationsIpad: [String] = _document["UISupportedInterfaceOrientations~ipad"]
+  internal static let uiUserInterfaceStyle: String = _document["UIUserInterfaceStyle"]
   internal static let uiViewControllerBasedStatusBarAppearance: Bool = _document["UIViewControllerBasedStatusBarAppearance"]
   internal static let userDefaults: String = _document["UserDefaults"]
   internal static let applicationGroupIdentifier: String = _document["applicationGroupIdentifier"]
diff --git a/Tchap/SupportingFiles/Info.plist b/Tchap/SupportingFiles/Info.plist
index dcee8676e9..7f6b5cef7c 100644
--- a/Tchap/SupportingFiles/Info.plist
+++ b/Tchap/SupportingFiles/Info.plist
@@ -79,6 +79,8 @@
 	<true/>
 	<key>UserDefaults</key>
 	<string>${PRODUCT_NAME}-Defaults</string>
+    <key>UIUserInterfaceStyle</key>
+    <string>Light</string>
 	<key>applicationGroupIdentifier</key>
 	<string>$(APPLICATION_GROUP_IDENTIFIER)</string>
 	<key>baseBundleIdentifier</key>

From aa148bc449e2a29c3830ecc7100ae13ed6ad89b4 Mon Sep 17 00:00:00 2001
From: Philippe Loriaux <philippel@element.io>
Date: Tue, 28 Sep 2021 14:13:16 +0200
Subject: [PATCH 13/13] Fix segmented color refresh when switching to dark mode

---
 .../SegmentedViewController/SegmentedViewController.m       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
index 9ba2bf3f5f..ffd0e7e5b1 100644
--- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
+++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
@@ -212,6 +212,12 @@ - (void)updateTheme
     
     // @TODO Design the activvity indicator for Tchap
     self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
+    
+    for (UIView* subview in self.selectionContainer.subviews) {
+        [subview removeFromSuperview];
+    }
+    
+    [self createSegmentedViews];
 
     [self setNeedsStatusBarAppearanceUpdate];
 }