diff --git a/Btchap/Config/BuildSettings.swift b/Btchap/Config/BuildSettings.swift
index 05618de6f9..e8496f5398 100644
--- a/Btchap/Config/BuildSettings.swift
+++ b/Btchap/Config/BuildSettings.swift
@@ -216,10 +216,10 @@ final class BuildSettings: NSObject {
     
     // MARK: - Main Tabs
     
-    static let homeScreenShowFavouritesTab: Bool = true
-    static let homeScreenShowPeopleTab: Bool = true
+    static let homeScreenShowFavouritesTab: Bool = false
+    static let homeScreenShowPeopleTab: Bool = false
     static let homeScreenShowRoomsTab: Bool = true
-    static let homeScreenShowCommunitiesTab: Bool = true
+    static let homeScreenShowCommunitiesTab: Bool = false
 
     // MARK: - General Settings Screen
     
diff --git a/Btchap/target.yml b/Btchap/target.yml
index 21ece4c6ca..ed6ea949d8 100644
--- a/Btchap/target.yml
+++ b/Btchap/target.yml
@@ -74,6 +74,8 @@ targets:
         - "Config/BuildSettings.swift"
         - "Generated/InfoPlist.swift"
         - "Generated/TchapDefaults.swift"
+        - "Modules/Application"
+        - "Modules/Common/ActivityIndicator"
         - "Modules/Room/EmojiPicker/Data/EmojiMart/EmojiJSONStore.swift"
         - "Modules/Room/Views/Title/RoomTitleView.*"
         - "Modules/Room/RoomCoordinator.swift"
@@ -86,6 +88,7 @@ targets:
         - "Modules/Room/Views/InputToolbar/RoomInputToolbarView.*"
         - "Modules/Room/Views/Preview"
         - "Modules/Room/Views/Title/RoomTitleView.*"
+        - "Modules/Rooms"
         - "SupportingFiles/Info.plist"
         - "TchapTools"
         - "Routers"
@@ -93,8 +96,10 @@ targets:
         - "Managers/UniversalLink"
         - "**/*.strings" # Exclude all strings files
         - "**/*.cer"
+    - path: ../Tchap/Modules/Application/VersionUpdate
     - path: ../Tchap/Generated/Images_Riot.swift
     - path: ../Tchap/Modules/Room/Views/BubbleCells/Antivirus
+    - path: ../Tchap/Modules/Rooms/Views
 
     # Add separately localizable files
     - path: ../Tchap/Assets/Localizations/fr.lproj/Tchap.strings
@@ -118,6 +123,7 @@ targets:
     - path: ../Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
     - path: ../Riot/Managers/KeyValueStorage
     - path: ../Riot/Managers/Locale
+    - path: ../Riot/Managers/Logging
     - path: ../Riot/Managers/Room/RoomIdComponents.swift
     - path: ../Riot/Managers/RoomMessageLinkParser/RoomMessageURLParser.swift
     - path: ../Riot/Managers/PasswordStrength
@@ -137,7 +143,7 @@ targets:
     - path: ../Riot/Model/Room/RoomPreviewData.m
     - path: ../Riot/Model/WellKnown
     - path: ../Riot/Modules/Analytics
-    - path: ../Riot/Modules/Application/ScreenNavigation
+    - path: ../Riot/Modules/Application
     - path: ../Riot/Modules/Authentication/SSO
     - path: ../Riot/Modules/Authentication/Views
     - path: ../Riot/Modules/BadgeLabel
@@ -150,6 +156,7 @@ targets:
     - path: ../Riot/Modules/Call/Views/IncomingCallView.h
     - path: ../Riot/Modules/Call/Views/IncomingCallView.m
     - path: ../Riot/Modules/Camera
+    - path: ../Riot/Modules/Common/ActivityIndicator
     - path: ../Riot/Modules/Common/Avatar
     - path: ../Riot/Modules/Common/Buttons
     - path: ../Riot/Modules/Common/Cells
@@ -157,16 +164,14 @@ targets:
     - path: ../Riot/Modules/Common/Models
     - path: ../Riot/Modules/Common/NavigationController/RiotNavigationController.h
     - path: ../Riot/Modules/Common/NavigationController/RiotNavigationController.m
+    - path: ../Riot/Modules/Common/Recents/DataSources
     - path: ../Riot/Modules/Common/Recents/Model/RecentCellData.h
     - path: ../Riot/Modules/Common/Recents/Model/RecentCellData.m
     - path: ../Riot/Modules/Common/Recents/RecentsViewController.h
     - path: ../Riot/Modules/Common/Recents/RecentsViewController.m
     - path: ../Riot/Modules/Common/Recents/Model
+    - path: ../Riot/Modules/Common/Recents/Service
     - path: ../Riot/Modules/Common/Recents/Views
-      excludes:
-        - "RecentTableViewCell.h"
-        - "RecentTableViewCell.m"
-        - "RecentTableViewCell.xib"
     - path: ../Riot/Modules/Common/SectionHeaders
     - path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h
     - path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
@@ -189,8 +194,10 @@ targets:
     - path: ../Riot/Modules/Integrations
     - path: ../Riot/Modules/KeyBackup
     - path: ../Riot/Modules/KeyVerification
+    - path: ../Riot/Modules/LaunchLoading
     - path: ../Riot/Modules/MatrixKit
     - path: ../Riot/Modules/MediaPicker
+    - path: ../Riot/Modules/PublicRoomList
     - path: ../Riot/Modules/QRCode
     - path: ../Riot/Modules/Reauthentication
     - path: ../Riot/Modules/Room
@@ -208,11 +215,15 @@ targets:
         - "Views/Title/Thread"
     - path: ../Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.h
     - path: ../Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.m
+    - path: ../Riot/Modules/Rooms
     - path: ../Riot/Modules/Secrets
     - path: ../Riot/Modules/SecureBackup
     - path: ../Riot/Modules/ServiceTerms
+    - path: ../Riot/Modules/SideMenu
     - path: ../Riot/Modules/SlidingModal
-    - path: ../Riot/Modules/TabBar/MainTitleView.swift
+    - path: ../Riot/Modules/SplitView
+    - path: ../Riot/Modules/TabBar
+    - path: ../Riot/Modules/User/Avatar
     - path: ../Riot/Modules/UserDevices/UsersDevicesViewController.h
     - path: ../Riot/Modules/UserDevices/UsersDevicesViewController.m
     - path: ../Riot/Modules/UserDevices/Views/DeviceTableViewCell.h
@@ -224,6 +235,8 @@ targets:
 
     # Riot SwiftUI
     - path: ../RiotSwiftUI/Modules/Common/Avatar/Model/AvatarProtocol.swift
+    - path: ../RiotSwiftUI/Modules/Common/Logging
+    - path: ../RiotSwiftUI/Modules/Common/Theme
     - path: ../RiotSwiftUI/Modules/Room/NotificationSettings/Model
 
     # Share extension
diff --git a/Riot/Assets/Base.lproj/Main.storyboard b/Riot/Assets/Base.lproj/Main.storyboard
index 885be7db74..9b8e12ccc3 100644
--- a/Riot/Assets/Base.lproj/Main.storyboard
+++ b/Riot/Assets/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -343,7 +343,7 @@
         <!--Placeholder Detail View Controller-->
         <scene sceneID="2wP-Cu-Wca">
             <objects>
-                <viewController storyboardIdentifier="EmptyDetailsViewControllerStoryboardId" id="Cpr-Tz-Az0" customClass="PlaceholderDetailViewController" customModule="Riot" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="EmptyDetailsViewControllerStoryboardId" id="Cpr-Tz-Az0" customClass="PlaceholderDetailViewController" customModule="Btchap" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="yS4-RU-AsN"/>
                         <viewControllerLayoutGuide type="bottom" id="VKG-pW-vMU"/>
@@ -352,7 +352,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch_screen_logo" translatesAutoresizingMaskIntoConstraints="NO" id="6LG-qc-7jf">
+                            <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch_screen_logo" translatesAutoresizingMaskIntoConstraints="NO" id="6LG-qc-7jf">
                                 <rect key="frame" x="127.5" y="273.5" width="120" height="120"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="6LG-qc-7jf" secondAttribute="height" multiplier="1:1" id="4Qy-7P-CuE"/>
@@ -478,7 +478,7 @@
         <!--Thread-->
         <scene sceneID="Opl-gU-pwm">
             <objects>
-                <viewController storyboardIdentifier="ThreadViewControllerStoryboardId" title="Room" hidesBottomBarWhenPushed="YES" id="R2h-H9-hdJ" userLabel="Thread" customClass="ThreadViewController" customModule="Riot" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="ThreadViewControllerStoryboardId" title="Room" hidesBottomBarWhenPushed="YES" id="R2h-H9-hdJ" userLabel="Thread" customClass="ThreadViewController" customModule="Btchap" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationItem key="navigationItem" id="TFF-nx-BSb">
                         <nil key="title"/>
                         <view key="titleView" contentMode="scaleToFill" id="e4J-vI-jzo" userLabel="Room title view container">
diff --git a/Riot/Assets/Images.xcassets/SideMenu/side_menu_notif_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/SideMenu/side_menu_notif_icon.imageset/Contents.json
new file mode 100644
index 0000000000..609c747aae
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/SideMenu/side_menu_notif_icon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "side_menu_notif_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "side_menu_notif_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "side_menu_notif_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/SideMenu/side_menu_notif_icon.imageset/side_menu_notif_icon.png b/Riot/Assets/Images.xcassets/SideMenu/side_menu_notif_icon.imageset/side_menu_notif_icon.png
new file mode 100644
index 0000000000..107f1974f4
Binary files /dev/null and b/Riot/Assets/Images.xcassets/SideMenu/side_menu_notif_icon.imageset/side_menu_notif_icon.png differ
diff --git a/Riot/Assets/Images.xcassets/SideMenu/side_menu_notif_icon.imageset/side_menu_notif_icon@2x.png b/Riot/Assets/Images.xcassets/SideMenu/side_menu_notif_icon.imageset/side_menu_notif_icon@2x.png
new file mode 100644
index 0000000000..4774e3f50a
Binary files /dev/null and b/Riot/Assets/Images.xcassets/SideMenu/side_menu_notif_icon.imageset/side_menu_notif_icon@2x.png differ
diff --git a/Riot/Assets/Images.xcassets/SideMenu/side_menu_notif_icon.imageset/side_menu_notif_icon@3x.png b/Riot/Assets/Images.xcassets/SideMenu/side_menu_notif_icon.imageset/side_menu_notif_icon@3x.png
new file mode 100644
index 0000000000..4370b7d2ed
Binary files /dev/null and b/Riot/Assets/Images.xcassets/SideMenu/side_menu_notif_icon.imageset/side_menu_notif_icon@3x.png differ
diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms.png b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms.png
index 1b5e4bdd92..33f559cff5 100644
Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms.png and b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms.png differ
diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@2x.png b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@2x.png
index 69b448cd96..ee5b295968 100644
Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@2x.png and b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@2x.png differ
diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@3x.png b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@3x.png
index 55bba3ba05..8ab0e50214 100644
Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@3x.png and b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@3x.png differ
diff --git a/Riot/Model/Room/RoomPreviewData.h b/Riot/Model/Room/RoomPreviewData.h
index 7016fbc14e..ac43e491d8 100644
--- a/Riot/Model/Room/RoomPreviewData.h
+++ b/Riot/Model/Room/RoomPreviewData.h
@@ -73,6 +73,14 @@
  */
 @property (nonatomic, readonly) RoomDataSource *roomDataSource;
 
+/**
+ Contructors.
+ 
+ @param roomId the id of the room.
+ @param mxSession the session to open the room preview with.
+ */
+- (instancetype)initWithRoomId:(NSString*)roomId andSession:(MXSession*)mxSession;
+
 /**
  Contructors.
  
diff --git a/Riot/Model/Room/RoomPreviewData.m b/Riot/Model/Room/RoomPreviewData.m
index f2b1bdb82e..c858f3f5fa 100644
--- a/Riot/Model/Room/RoomPreviewData.m
+++ b/Riot/Model/Room/RoomPreviewData.m
@@ -21,6 +21,18 @@
 
 @implementation RoomPreviewData
 
+- (instancetype)initWithRoomId:(NSString *)roomId andSession:(MXSession *)mxSession
+{
+    self = [super init];
+    if (self)
+    {
+        _roomId = roomId;
+        _mxSession = mxSession;
+        _numJoinedMembers = -1;
+    }
+    return self;
+}
+
 - (instancetype)initWithRoomId:(NSString *)roomId roomAlias:(NSString*)roomAlias andSession:(MXSession *)mxSession
 {
     self = [super init];
diff --git a/Riot/Modules/Application/AppCoordinator.swift b/Riot/Modules/Application/AppCoordinator.swift
index 8f1b61d580..5c06d9a67b 100755
--- a/Riot/Modules/Application/AppCoordinator.swift
+++ b/Riot/Modules/Application/AppCoordinator.swift
@@ -45,6 +45,11 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
     fileprivate let legacyAppDelegate: LegacyAppDelegate = AppDelegate.theDelegate()
     // swiftlint:enable weak_delegate
     
+    private let appVersionCheckerStore: AppVersionCheckerStoreType
+    private let appVersionChecker: AppVersionChecker
+    private var pendingCheckAppVersionOperation: MXHTTPOperation?
+    private weak var appVersionUpdateCoordinator: AppVersionUpdateCoordinatorType?
+    
     private lazy var appNavigator: AppNavigatorProtocol = {
         return AppNavigator(appCoordinator: self)
     }()
@@ -72,6 +77,11 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
         self.customSchemeURLParser = CustomSchemeURLParser()
         self.userSessionsService = UserSessionsService.shared
         
+        let clientConfigurationService = ClientConfigurationService()
+        let appVersionCheckerStore = AppVersionCheckerStore()
+        self.appVersionChecker = AppVersionChecker(clientConfigurationService: clientConfigurationService, appVersionCheckerStore: appVersionCheckerStore)
+        self.appVersionCheckerStore = appVersionCheckerStore
+        
         super.init()
         
         setupFlexDebuggerOnWindow(window)
@@ -108,6 +118,23 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
             return false
         }
     }
+    
+    func checkMinAppVersionRequirements() {
+        guard self.pendingCheckAppVersionOperation == nil else {
+            return
+        }
+        
+        self.pendingCheckAppVersionOperation = self.appVersionChecker.checkCurrentAppVersion { (versionResult) in
+            switch versionResult {
+            case .upToDate, .unknown:
+                break
+            case .shouldUpdate(versionInfo: let versionInfo):
+                MXLog.debug("[AppCoordinator] App should be upated with \(versionInfo)")
+                self.presentApplicationUpdate(with: versionInfo)
+            }
+            self.pendingCheckAppVersionOperation = nil
+        }
+    }
         
     // MARK: - Private methods
     private func setupLogger() {
@@ -230,11 +257,42 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
         // Reload split view with selected space id
         self.splitViewCoordinator?.start(with: spaceId)
     }
+    
+    private func presentApplicationUpdate(with versionInfo: ClientVersionInfo) {
+        guard self.appVersionUpdateCoordinator == nil else {
+            MXLog.debug("[AppCoordinor] AppVersionUpdateCoordinator already presented")
+            return
+        }
+        
+        // Update should be display once and has already been dislayed, do not display again
+        if versionInfo.displayOnlyOnce && self.appVersionChecker.isClientVersionInfoAlreadyDisplayed(versionInfo) {
+            MXLog.debug("[AppCoordinor] AppVersionUpdateCoordinator already presented for versionInfo: \(versionInfo)")
+            return
+        } else if versionInfo.allowOpeningApp && self.appVersionChecker.isClientVersionInfoAlreadyDisplayedToday(versionInfo) {
+            MXLog.debug("[AppCoordinor] AppVersionUpdateCoordinator already presented today for versionInfo: \(versionInfo)")
+            return
+        }
+        
+        let appVersionUpdateCoordinator = AppVersionUpdateCoordinator(rootRouter: self.rootRouter, versionInfo: versionInfo)
+        appVersionUpdateCoordinator.delegate = self
+        appVersionUpdateCoordinator.start()
+        self.add(childCoordinator: appVersionUpdateCoordinator)
+        self.appVersionUpdateCoordinator = appVersionUpdateCoordinator
+        
+        self.appVersionCheckerStore.saveLastDisplayedClientVersionInfo(versionInfo)
+        self.appVersionCheckerStore.saveLastDisplayedClientVersionDate(Calendar.current.startOfDay(for: Date()))
+    }
+}
+
+// MARK: - AppVersionUpdateCoordinatorDelegate
+extension AppCoordinator: AppVersionUpdateCoordinatorDelegate {
+    func appVersionUpdateCoordinatorDidCancel(_ coordinator: AppVersionUpdateCoordinatorType) {
+        self.remove(childCoordinator: coordinator)
+    }
 }
 
 // MARK: - LegacyAppDelegateDelegate
 extension AppCoordinator: LegacyAppDelegateDelegate {
-            
     func legacyAppDelegate(_ legacyAppDelegate: LegacyAppDelegate!, wantsToPopToHomeViewControllerAnimated animated: Bool, completion: (() -> Void)!) {
         
         MXLog.debug("[AppCoordinator] wantsToPopToHomeViewControllerAnimated")
diff --git a/Riot/Modules/Application/AppCoordinatorType.swift b/Riot/Modules/Application/AppCoordinatorType.swift
index 5532df9213..7d9c563f6e 100644
--- a/Riot/Modules/Application/AppCoordinatorType.swift
+++ b/Riot/Modules/Application/AppCoordinatorType.swift
@@ -20,4 +20,7 @@ import Foundation
 protocol AppCoordinatorType: Coordinator {
     
     func open(url: URL, options: [UIApplication.OpenURLOptionsKey: Any]) -> Bool
+    
+    /// Check if the user should be notified of an application update.
+    func checkMinAppVersionRequirements()
 }
diff --git a/Riot/Modules/Application/AppDelegate.swift b/Riot/Modules/Application/AppDelegate.swift
index 5ab09997ba..9700e8bd65 100644
--- a/Riot/Modules/Application/AppDelegate.swift
+++ b/Riot/Modules/Application/AppDelegate.swift
@@ -77,6 +77,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     
     func applicationDidBecomeActive(_ application: UIApplication) {
         self.legacyAppDelegate.applicationDidBecomeActive(application)
+        
+        self.appCoordinator.checkMinAppVersionRequirements()
     }
     
     func applicationWillResignActive(_ application: UIApplication) {        
@@ -106,6 +108,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     // MARK: User Activity Continuation
     
     func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+//        return self.appCoordinator.handleUserActivity(userActivity, application: application)
         return self.legacyAppDelegate.application(application, continue: userActivity, restorationHandler: restorationHandler)
     }
     
diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
index 628a765082..0a166940f8 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -28,9 +28,9 @@
 
 #import "RoomViewController.h"
 
-#import "DirectoryViewController.h"
+//#import "DirectoryViewController.h"
 #import "SettingsViewController.h"
-#import "ContactDetailsViewController.h"
+//#import "ContactDetailsViewController.h"
 
 #import "BugReportViewController.h"
 #import "RoomKeyRequestViewController.h"
@@ -85,7 +85,7 @@
 
 NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUniversalLinkDidChangeNotification";
 
-@interface LegacyAppDelegate () <GDPRConsentViewControllerDelegate, KeyVerificationCoordinatorBridgePresenterDelegate, PushNotificationServiceDelegate, SetPinCoordinatorBridgePresenterDelegate, CallPresenterDelegate, SpaceDetailPresenterDelegate>
+@interface LegacyAppDelegate () <GDPRConsentViewControllerDelegate, KeyVerificationCoordinatorBridgePresenterDelegate, PushNotificationServiceDelegate/*, SetPinCoordinatorBridgePresenterDelegate, CallPresenterDelegate, SpaceDetailPresenterDelegate*/>
 {
     /**
      Reachability observer
@@ -200,13 +200,14 @@ @interface LegacyAppDelegate () <GDPRConsentViewControllerDelegate, KeyVerificat
 @property (weak, nonatomic) UIAlertController *incomingKeyVerificationRequestAlertController;
 
 @property (nonatomic, strong) SlidingModalPresenter *slidingModalPresenter;
-@property (nonatomic, strong) SetPinCoordinatorBridgePresenter *setPinCoordinatorBridgePresenter;
-@property (nonatomic, strong) SpaceDetailPresenter *spaceDetailPresenter;
+//@property (nonatomic, strong) SetPinCoordinatorBridgePresenter *setPinCoordinatorBridgePresenter;
+// Tchap: Disable Spaces
+//@property (nonatomic, strong) SpaceDetailPresenter *spaceDetailPresenter;
 
 /**
  Used to manage on boarding steps, like create DM with riot bot
  */
-@property (strong, nonatomic) OnBoardingManager *onBoardingManager;
+//@property (strong, nonatomic) OnBoardingManager *onBoardingManager;
 
 @property (nonatomic, weak) id userDidSignInOnNewDeviceObserver;
 @property (weak, nonatomic) UIAlertController *userNewSignInAlertController;
@@ -218,12 +219,13 @@ @interface LegacyAppDelegate () <GDPRConsentViewControllerDelegate, KeyVerificat
  */
 @property (nonatomic, strong) PushNotificationService *pushNotificationService;
 @property (nonatomic, strong) PushNotificationStore *pushNotificationStore;
-@property (nonatomic, strong) LocalAuthenticationService *localAuthenticationService;
+//@property (nonatomic, strong) LocalAuthenticationService *localAuthenticationService;
 @property (nonatomic, strong, readwrite) CallPresenter *callPresenter;
 
-@property (nonatomic, strong) MajorUpdateManager *majorUpdateManager;
+//@property (nonatomic, strong) MajorUpdateManager *majorUpdateManager;
 
-@property (nonatomic, strong) SpaceFeatureUnavailablePresenter *spaceFeatureUnavailablePresenter;
+// Tchap: Disable Spaces
+//@property (nonatomic, strong) SpaceFeatureUnavailablePresenter *spaceFeatureUnavailablePresenter;
 
 @property (nonatomic, strong) AppInfo *appInfo;
 
@@ -455,16 +457,18 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     
     [analytics startIfEnabled];
 
-    self.localAuthenticationService = [[LocalAuthenticationService alloc] initWithPinCodePreferences:[PinCodePreferences shared]];
+//    self.localAuthenticationService = [[LocalAuthenticationService alloc] initWithPinCodePreferences:[PinCodePreferences shared]];
     
-    self.callPresenter = [[CallPresenter alloc] init];
-    self.callPresenter.delegate = self;
+    // Tchap: Disable Calls
+//    self.callPresenter = [[CallPresenter alloc] init];
+//    self.callPresenter.delegate = self;
 
     self.pushNotificationStore = [PushNotificationStore new];
     self.pushNotificationService = [[PushNotificationService alloc] initWithPushNotificationStore:self.pushNotificationStore];
     self.pushNotificationService.delegate = self;
         
-    self.spaceFeatureUnavailablePresenter = [SpaceFeatureUnavailablePresenter new];
+    // Tchap: Disable Spaces
+//    self.spaceFeatureUnavailablePresenter = [SpaceFeatureUnavailablePresenter new];
     
     // Add matrix observers, and initialize matrix sessions if the app is not launched in background.
     [self initMatrixSessions];
@@ -476,7 +480,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [JitsiService.shared application:application didFinishLaunchingWithOptions:launchOptions];
 #endif
     
-    self.majorUpdateManager = [MajorUpdateManager new];
+//    self.majorUpdateManager = [MajorUpdateManager new];
 
     MXLogDebug(@"[AppDelegate] didFinishLaunchingWithOptions: Done in %.0fms", [[NSDate date] timeIntervalSinceDate:startDate] * 1000);
 
@@ -533,18 +537,19 @@ - (void)applicationWillResignActive:(UIApplication *)application
         wrongBackupVersionAlert = nil;
     }
     
-    if ([self.localAuthenticationService isProtectionSet] && ![BiometricsAuthenticationPresenter isPresenting])
-    {
-        if (self.setPinCoordinatorBridgePresenter)
-        {
-            //  it's already on screen, convert the viewMode
-            self.setPinCoordinatorBridgePresenter.viewMode = SetPinCoordinatorViewModeInactive;
-            return;
-        }
-        self.setPinCoordinatorBridgePresenter = [[SetPinCoordinatorBridgePresenter alloc] initWithSession:mxSessionArray.firstObject viewMode:SetPinCoordinatorViewModeInactive];
-        self.setPinCoordinatorBridgePresenter.delegate = self;
-        [self.setPinCoordinatorBridgePresenter presentIn:self.window];
-    }
+    // Tchap: Disable Biometrics & Pin Code
+//    if ([self.localAuthenticationService isProtectionSet] && ![BiometricsAuthenticationPresenter isPresenting])
+//    {
+//        if (self.setPinCoordinatorBridgePresenter)
+//        {
+//            //  it's already on screen, convert the viewMode
+//            self.setPinCoordinatorBridgePresenter.viewMode = SetPinCoordinatorViewModeInactive;
+//            return;
+//        }
+//        self.setPinCoordinatorBridgePresenter = [[SetPinCoordinatorBridgePresenter alloc] initWithSession:mxSessionArray.firstObject viewMode:SetPinCoordinatorViewModeInactive];
+//        self.setPinCoordinatorBridgePresenter.delegate = self;
+//        [self.setPinCoordinatorBridgePresenter presentIn:self.window];
+//    }
 }
 
 - (void)applicationDidEnterBackground:(UIApplication *)application
@@ -631,27 +636,28 @@ - (void)applicationDidBecomeActive:(UIApplication *)application
 - (void)configurePinCodeScreenFor:(UIApplication *)application
                  createIfRequired:(BOOL)createIfRequired
 {
-    if ([self.localAuthenticationService shouldShowPinCode])
-    {
-        if (self.setPinCoordinatorBridgePresenter)
-        {
-            //  it's already on screen, convert the viewMode
-            self.setPinCoordinatorBridgePresenter.viewMode = SetPinCoordinatorViewModeUnlock;
-            return;
-        }
-        if (createIfRequired)
-        {
-            self.setPinCoordinatorBridgePresenter = [[SetPinCoordinatorBridgePresenter alloc] initWithSession:mxSessionArray.firstObject viewMode:SetPinCoordinatorViewModeUnlock];
-            self.setPinCoordinatorBridgePresenter.delegate = self;
-            [self.setPinCoordinatorBridgePresenter presentIn:self.window];
-        }
-    }
-    else
-    {
-        [self.setPinCoordinatorBridgePresenter dismiss];
-        self.setPinCoordinatorBridgePresenter = nil;
-        [self afterAppUnlockedByPin:application];
-    }
+    // Tchap: Disable Biometrics & Pin Code
+//    if ([self.localAuthenticationService shouldShowPinCode])
+//    {
+//        if (self.setPinCoordinatorBridgePresenter)
+//        {
+//            //  it's already on screen, convert the viewMode
+//            self.setPinCoordinatorBridgePresenter.viewMode = SetPinCoordinatorViewModeUnlock;
+//            return;
+//        }
+//        if (createIfRequired)
+//        {
+//            self.setPinCoordinatorBridgePresenter = [[SetPinCoordinatorBridgePresenter alloc] initWithSession:mxSessionArray.firstObject viewMode:SetPinCoordinatorViewModeUnlock];
+//            self.setPinCoordinatorBridgePresenter.delegate = self;
+//            [self.setPinCoordinatorBridgePresenter presentIn:self.window];
+//        }
+//    }
+//    else
+//    {
+//        [self.setPinCoordinatorBridgePresenter dismiss];
+//        self.setPinCoordinatorBridgePresenter = nil;
+//        [self afterAppUnlockedByPin:application];
+//    }
 }
 
 - (void)afterAppUnlockedByPin:(UIApplication *)application
@@ -1363,15 +1369,15 @@ - (BOOL)handleUniversalLinkWithParameters:(UniversalLinkParameters*)universalLin
                 {
                     room = [account.mxSession roomWithRoomId:roomId];
                 }
-                
-                if (room.summary.roomType == MXRoomTypeSpace)
-                {
-                    SpaceNavigationParameters *spaceNavigationParameters = [[SpaceNavigationParameters alloc] initWithRoomId:room.roomId mxSession:account.mxSession presentationParameters:presentationParameters];
-                    
-                    [self showSpaceWithParameters:spaceNavigationParameters];
-                }
-                else
-                {
+                // Tchap: Disable Spaces
+//                if (room.summary.roomType == MXRoomTypeSpace)
+//                {
+//                    SpaceNavigationParameters *spaceNavigationParameters = [[SpaceNavigationParameters alloc] initWithRoomId:room.roomId mxSession:account.mxSession presentationParameters:presentationParameters];
+//
+//                    [self showSpaceWithParameters:spaceNavigationParameters];
+//                }
+//                else
+//                {
                     // Open the room page
                     if (eventId)
                     {
@@ -1433,7 +1439,7 @@ - (BOOL)handleUniversalLinkWithParameters:(UniversalLinkParameters*)universalLin
                         
                         [self showRoomWithParameters:parameters];
                     }
-                }
+//                }
                 
                 continueUserActivity = YES;
             }
@@ -1542,18 +1548,19 @@ - (BOOL)handleUniversalLinkWithParameters:(UniversalLinkParameters*)universalLin
                             RoomPreviewNavigationParameters *roomPreviewNavigationParameters = [[RoomPreviewNavigationParameters alloc] initWithPreviewData:roomPreviewData presentationParameters:presentationParameters];
                             
                             [account.mxSession.matrixRestClient roomSummaryWith:roomIdOrAlias via:roomPreviewData.viaServers success:^(MXPublicRoom *room) {
-                                if ([room.roomTypeString isEqualToString:MXRoomTypeStringSpace])
-                                {
-                                    [homeViewController stopActivityIndicator];
-                                    
-                                    SpacePreviewNavigationParameters *spacePreviewNavigationParameters = [[SpacePreviewNavigationParameters alloc] initWithPublicRoom:room mxSession:account.mxSession presentationParameters:presentationParameters];
-                                    
-                                    [self showSpacePreviewWithParameters:spacePreviewNavigationParameters];  
-                                }
-                                else
-                                {
+                                // Tchap: Disable Spaces
+//                                if ([room.roomTypeString isEqualToString:MXRoomTypeStringSpace])
+//                                {
+//                                    [homeViewController stopActivityIndicator];
+//
+//                                    SpacePreviewNavigationParameters *spacePreviewNavigationParameters = [[SpacePreviewNavigationParameters alloc] initWithPublicRoom:room mxSession:account.mxSession presentationParameters:presentationParameters];
+//
+//                                    [self showSpacePreviewWithParameters:spacePreviewNavigationParameters];
+//                                }
+//                                else
+//                                {
                                     [self peekInRoomWithNavigationParameters:roomPreviewNavigationParameters pathParams:pathParams];
-                                }
+//                                }
                             } failure:^(NSError *error) {
                                 [self peekInRoomWithNavigationParameters:roomPreviewNavigationParameters pathParams:pathParams];
                             }];
@@ -1841,7 +1848,7 @@ - (BOOL)handleServerProvisioningLink:(NSURL*)link
         else
         {
             [_masterTabBarController showOnboardingFlow];
-            [_masterTabBarController.onboardingCoordinatorBridgePresenter updateHomeserver:homeserver andIdentityServer:identityServer];
+//            [_masterTabBarController.onboardingCoordinatorBridgePresenter updateHomeserver:homeserver andIdentityServer:identityServer];
         }
 
         return YES;
@@ -1929,7 +1936,8 @@ - (void)initMatrixSessions
         else if (mxSession.state == MXSessionStateStoreDataReady)
         {
             //  start the call service
-            [self.callPresenter start];
+            // Tchap: Disable Calls
+//            [self.callPresenter start];
             
             // Look for the account related to this session.
             NSArray *mxAccounts = [MXKAccountManager sharedManager].activeAccounts;
@@ -2122,7 +2130,8 @@ - (void)addMatrixSession:(MXSession *)mxSession
         [[WidgetManager sharedManager] addMatrixSession:mxSession];
         
         // register the session to the call service
-        [_callPresenter addMatrixSession:mxSession];
+        // Tchap: Disable Calls
+//        [_callPresenter addMatrixSession:mxSession];
         
         [mxSessionArray addObject:mxSession];
         
@@ -2138,7 +2147,8 @@ - (void)removeMatrixSession:(MXSession*)mxSession
     [[MXKContactManager sharedManager] removeMatrixSession:mxSession];
     
     // remove session from the call service
-    [_callPresenter removeMatrixSession:mxSession];
+    // Tchap: Disable Calls
+//    [_callPresenter removeMatrixSession:mxSession];
 
     // Update the widgets manager
     [[WidgetManager sharedManager] removeMatrixSession:mxSession]; 
@@ -2157,7 +2167,8 @@ - (void)removeMatrixSession:(MXSession*)mxSession
     if (!mxSessionArray.count)
     {
         //  if no session left, stop the call service
-        [self.callPresenter stop];
+        // Tchap: Disable Calls
+//        [self.callPresenter stop];
     }
     
     [self.delegate legacyAppDelegate:self didRemoveMatrixSession:mxSession];
@@ -2302,7 +2313,8 @@ - (void)logoutSendingRequestServer:(BOOL)sendLogoutServerRequest
     [CrossSigningBannerPreferences.shared reset];
     
     // Reset user pin code
-    [PinCodePreferences.shared reset];
+    // Tchap: Disable Biometrics & Pin Code
+//    [PinCodePreferences.shared reset];
     
     //  Reset push notification store
     [self.pushNotificationStore reset];
@@ -2432,11 +2444,12 @@ - (void)handleAppState
         void (^finishAppLaunch)(void) = ^{
             [self hideLaunchAnimation];
             
-            if (self.setPinCoordinatorBridgePresenter)
-            {
-                MXLogDebug(@"[AppDelegate] handleAppState: PIN code is presented. Do not go further");
-                return;
-            }
+            // Tchap: Disable Biometrics & Pin Code
+//            if (self.setPinCoordinatorBridgePresenter)
+//            {
+//                MXLogDebug(@"[AppDelegate] handleAppState: PIN code is presented. Do not go further");
+//                return;
+//            }
             
             MXLogDebug(@"[AppDelegate] handleAppState: Check cross-signing");
             [self checkCrossSigningForSession:mainSession];
@@ -2477,41 +2490,43 @@ - (void)handleAppState
 
 - (void)showLaunchAnimation
 {
-    UIWindow *window = [[UIApplication sharedApplication] keyWindow];
-    
-    if (!launchAnimationContainerView && window)
-    {
-        MXLogDebug(@"[AppDelegate] showLaunchAnimation");
-        
-        LaunchLoadingView *launchLoadingView = [LaunchLoadingView instantiate];
-        launchLoadingView.frame = window.bounds;
-        [launchLoadingView updateWithTheme:ThemeService.shared.theme];
-        launchLoadingView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-        
-        [window addSubview:launchLoadingView];
-        
-        launchAnimationContainerView = launchLoadingView;
-        
-        [MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:MXTaskProfileNameStartupLaunchScreen];
-    }
+    // Tchap: Don't show Element Launch animation.
+//    UIWindow *window = [[UIApplication sharedApplication] keyWindow];
+//
+//    if (!launchAnimationContainerView && window)
+//    {
+//        MXLogDebug(@"[AppDelegate] showLaunchAnimation");
+//
+//        LaunchLoadingView *launchLoadingView = [LaunchLoadingView instantiate];
+//        launchLoadingView.frame = window.bounds;
+//        [launchLoadingView updateWithTheme:ThemeService.shared.theme];
+//        launchLoadingView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+//
+//        [window addSubview:launchLoadingView];
+//
+//        launchAnimationContainerView = launchLoadingView;
+//
+//        [MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:MXTaskProfileNameStartupLaunchScreen];
+//    }
 }
 
 - (void)hideLaunchAnimation
 {
-    if (launchAnimationContainerView)
-    {
-        id<MXProfiler> profiler = MXSDKOptions.sharedInstance.profiler;
-        MXTaskProfile *launchTaskProfile = [profiler taskProfileWithName:MXTaskProfileNameStartupLaunchScreen];
-        if (launchTaskProfile)
-        {
-            [profiler stopMeasuringTaskWithProfile:launchTaskProfile];
-            
-            MXLogDebug(@"[AppDelegate] hideLaunchAnimation: LaunchAnimation was shown for %.3fms", launchTaskProfile.duration * 1000);
-        }
-        
-        [self->launchAnimationContainerView removeFromSuperview];
-        self->launchAnimationContainerView = nil;
-    }
+    // Tchap: Don't show Element Launch animation.
+//    if (launchAnimationContainerView)
+//    {
+//        id<MXProfiler> profiler = MXSDKOptions.sharedInstance.profiler;
+//        MXTaskProfile *launchTaskProfile = [profiler taskProfileWithName:MXTaskProfileNameStartupLaunchScreen];
+//        if (launchTaskProfile)
+//        {
+//            [profiler stopMeasuringTaskWithProfile:launchTaskProfile];
+//
+//            MXLogDebug(@"[AppDelegate] hideLaunchAnimation: LaunchAnimation was shown for %.3fms", launchTaskProfile.duration * 1000);
+//        }
+//
+//        [self->launchAnimationContainerView removeFromSuperview];
+//        self->launchAnimationContainerView = nil;
+//    }
 }
 
 - (void)configureCallManagerIfRequiredForSession:(MXSession *)mxSession
@@ -2940,7 +2955,8 @@ - (void)showRoomWithParameters:(RoomNavigationParameters*)parameters completion:
         if (room.summary.roomType == MXRoomTypeSpace)
         {
             
-            [self.spaceFeatureUnavailablePresenter presentUnavailableFeatureFrom:self.presentedViewController animated:YES];
+            // Tchap: Disable Spaces
+//            [self.spaceFeatureUnavailablePresenter presentUnavailableFeatureFrom:self.presentedViewController animated:YES];
             
             if (completion)
             {
@@ -3026,78 +3042,80 @@ - (void)showRoomPreview:(RoomPreviewData*)roomPreviewData
 
 - (void)showSpacePreviewWithParameters:(SpacePreviewNavigationParameters*)parameters
 {
-    UIViewController *presentingViewController;
-    UIView *sourceView;
-    
-    if (parameters.presentationParameters.presentingViewController)
-    {
-        presentingViewController = parameters.presentationParameters.presentingViewController;
-        sourceView = parameters.presentationParameters.sourceView;
-    }
-    else
-    {
-        presentingViewController = self.masterNavigationController;
-    }
-    
-    self.spaceDetailPresenter = [SpaceDetailPresenter new];
-    self.spaceDetailPresenter.delegate = self;
-    
-    void(^showSpace)(void) = ^{
-        [self.spaceDetailPresenter presentForSpaceWithPublicRoom:parameters.publicRoom
-                                                            from:presentingViewController
-                                                      sourceView:sourceView
-                                                         session:parameters.mxSession 
-                                                        animated:YES];
-    };
-    
-    if (parameters.presentationParameters.restoreInitialDisplay)
-    {
-        [self restoreInitialDisplay:^{
-            showSpace();
-        }];
-    }
-    else
-    {
-        showSpace();
-    }
+    // Tchap: Disable Spaces
+//    UIViewController *presentingViewController;
+//    UIView *sourceView;
+//
+//    if (parameters.presentationParameters.presentingViewController)
+//    {
+//        presentingViewController = parameters.presentationParameters.presentingViewController;
+//        sourceView = parameters.presentationParameters.sourceView;
+//    }
+//    else
+//    {
+//        presentingViewController = self.masterNavigationController;
+//    }
+//
+//    self.spaceDetailPresenter = [SpaceDetailPresenter new];
+//    self.spaceDetailPresenter.delegate = self;
+//
+//    void(^showSpace)(void) = ^{
+//        [self.spaceDetailPresenter presentForSpaceWithPublicRoom:parameters.publicRoom
+//                                                            from:presentingViewController
+//                                                      sourceView:sourceView
+//                                                         session:parameters.mxSession
+//                                                        animated:YES];
+//    };
+//
+//    if (parameters.presentationParameters.restoreInitialDisplay)
+//    {
+//        [self restoreInitialDisplay:^{
+//            showSpace();
+//        }];
+//    }
+//    else
+//    {
+//        showSpace();
+//    }
 }
 
 - (void)showSpaceWithParameters:(SpaceNavigationParameters*)parameters
 {
-    UIViewController *presentingViewController;
-    UIView *sourceView;
-    
-    if (parameters.presentationParameters.presentingViewController)
-    {
-        presentingViewController = parameters.presentationParameters.presentingViewController;
-        sourceView = parameters.presentationParameters.sourceView;
-    }
-    else
-    {
-        presentingViewController = self.masterNavigationController;
-    }
-
-    self.spaceDetailPresenter = [SpaceDetailPresenter new];
-    self.spaceDetailPresenter.delegate = self;
-    
-    void(^showSpace)(void) = ^{
-        [self.spaceDetailPresenter presentForSpaceWithId:parameters.roomId
-                                                    from:presentingViewController
-                                              sourceView:sourceView
-                                                 session:parameters.mxSession
-                                                animated:YES];
-    };
-    
-    if (parameters.presentationParameters.restoreInitialDisplay)
-    {
-        [self restoreInitialDisplay:^{
-            showSpace();
-        }];
-    }
-    else
-    {
-        showSpace();
-    }
+    // Tchap: Disable Spaces
+//    UIViewController *presentingViewController;
+//    UIView *sourceView;
+//
+//    if (parameters.presentationParameters.presentingViewController)
+//    {
+//        presentingViewController = parameters.presentationParameters.presentingViewController;
+//        sourceView = parameters.presentationParameters.sourceView;
+//    }
+//    else
+//    {
+//        presentingViewController = self.masterNavigationController;
+//    }
+//
+//    self.spaceDetailPresenter = [SpaceDetailPresenter new];
+//    self.spaceDetailPresenter.delegate = self;
+//
+//    void(^showSpace)(void) = ^{
+//        [self.spaceDetailPresenter presentForSpaceWithId:parameters.roomId
+//                                                    from:presentingViewController
+//                                              sourceView:sourceView
+//                                                 session:parameters.mxSession
+//                                                animated:YES];
+//    };
+//
+//    if (parameters.presentationParameters.restoreInitialDisplay)
+//    {
+//        [self restoreInitialDisplay:^{
+//            showSpace();
+//        }];
+//    }
+//    else
+//    {
+//        showSpace();
+//    }
 }
 
 - (void)setVisibleRoomId:(NSString *)roomId
@@ -4380,20 +4398,20 @@ - (void)gdprConsentViewControllerDidConsentToGDPRWithSuccess:(GDPRConsentViewCon
     if (botCreationEnabled)
     {
         // And create the room with riot bot in //
-        self.onBoardingManager = [[OnBoardingManager alloc] initWithSession:session];
+//        self.onBoardingManager = [[OnBoardingManager alloc] initWithSession:session];
         
         MXWeakify(self);
         void (^createRiotBotDMcompletion)(void) = ^() {
             MXStrongifyAndReturnIfNil(self);
 
-            self.onBoardingManager = nil;
+//            self.onBoardingManager = nil;
         };
         
-        [self.onBoardingManager createRiotBotDirectMessageIfNeededWithSuccess:^{
-            createRiotBotDMcompletion();
-        } failure:^(NSError * _Nonnull error) {
-            createRiotBotDMcompletion();
-        }];
+//        [self.onBoardingManager createRiotBotDirectMessageIfNeededWithSuccess:^{
+//            createRiotBotDMcompletion();
+//        } failure:^(NSError * _Nonnull error) {
+//            createRiotBotDMcompletion();
+//        }];
     }
 }
 
@@ -4440,80 +4458,83 @@ - (void)checkAppVersion
 
 - (void)checkMajorUpdate
 {
-    if (self.majorUpdateManager.shouldShowMajorUpdate)
-    {
-        // When you do not understand why the UI does not work as expected...
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [self showMajorUpdate];
-        });
-    }
+    // Tchap: Disable Major Update
+//    if (self.majorUpdateManager.shouldShowMajorUpdate)
+//    {
+//        // When you do not understand why the UI does not work as expected...
+//        dispatch_async(dispatch_get_main_queue(), ^{
+//            [self showMajorUpdate];
+//        });
+//    }
 }
 
 - (void)showMajorUpdate
 {
-    if (!self.slidingModalPresenter)
-    {
-        self.slidingModalPresenter = [SlidingModalPresenter new];
-    }
-    
-    [self.slidingModalPresenter dismissWithAnimated:NO completion:nil];
-    
-    MajorUpdateViewController *majorUpdateViewController = [MajorUpdateViewController instantiate];
-    
-    MXWeakify(self);
-    
-    majorUpdateViewController.didTapLearnMoreButton = ^{
-        
-        MXStrongifyAndReturnIfNil(self);
-        
-        [[UIApplication sharedApplication] vc_open:self.majorUpdateManager.learnMoreURL completionHandler:^(BOOL success) {
-            if (!success)
-            {
-                [self showAlertWithTitle:[MatrixKitL10n error] message:[VectorL10n roomMessageUnableOpenLinkErrorMessage]];
-            }
-        }];
-        
-        [self.slidingModalPresenter dismissWithAnimated:YES completion:^{
-        }];
-    };
-    
-    majorUpdateViewController.didTapDoneButton = ^{
-        
-        MXStrongifyAndReturnIfNil(self);
-        
-        [self.slidingModalPresenter dismissWithAnimated:YES completion:^{
-        }];
-    };
-    
-    [self.slidingModalPresenter present:majorUpdateViewController
-                                   from:self.presentedViewController
-                               animated:YES
-                             completion:nil];
+    // Tchap: Disable Major Update
+//    if (!self.slidingModalPresenter)
+//    {
+//        self.slidingModalPresenter = [SlidingModalPresenter new];
+//    }
+//
+//    [self.slidingModalPresenter dismissWithAnimated:NO completion:nil];
+//
+//    MajorUpdateViewController *majorUpdateViewController = [MajorUpdateViewController instantiate];
+//
+//    MXWeakify(self);
+//
+//    majorUpdateViewController.didTapLearnMoreButton = ^{
+//
+//        MXStrongifyAndReturnIfNil(self);
+//
+//        [[UIApplication sharedApplication] vc_open:self.majorUpdateManager.learnMoreURL completionHandler:^(BOOL success) {
+//            if (!success)
+//            {
+//                [self showAlertWithTitle:[MatrixKitL10n error] message:[VectorL10n roomMessageUnableOpenLinkErrorMessage]];
+//            }
+//        }];
+//
+//        [self.slidingModalPresenter dismissWithAnimated:YES completion:^{
+//        }];
+//    };
+//
+//    majorUpdateViewController.didTapDoneButton = ^{
+//
+//        MXStrongifyAndReturnIfNil(self);
+//
+//        [self.slidingModalPresenter dismissWithAnimated:YES completion:^{
+//        }];
+//    };
+//
+//    [self.slidingModalPresenter present:majorUpdateViewController
+//                                   from:self.presentedViewController
+//                               animated:YES
+//                             completion:nil];
 }
 
 #pragma mark - SetPinCoordinatorBridgePresenterDelegate
 
-- (void)setPinCoordinatorBridgePresenterDelegateDidComplete:(SetPinCoordinatorBridgePresenter *)coordinatorBridgePresenter
-{
-    [coordinatorBridgePresenter dismiss];
-    self.setPinCoordinatorBridgePresenter = nil;
-    [self afterAppUnlockedByPin:[UIApplication sharedApplication]];
-}
-
-- (void)setPinCoordinatorBridgePresenterDelegateDidCompleteWithReset:(SetPinCoordinatorBridgePresenter *)coordinatorBridgePresenter dueToTooManyErrors:(BOOL)dueToTooManyErrors
-{
-    if (dueToTooManyErrors)
-    {
-        [self showAlertWithTitle:nil message:[VectorL10n pinProtectionKickUserAlertMessage]];
-        [self logoutWithConfirmation:NO completion:nil];
-    }
-    else
-    {
-        [coordinatorBridgePresenter dismiss];
-        self.setPinCoordinatorBridgePresenter = nil;
-        [self logoutWithConfirmation:NO completion:nil];
-    }
-}
+// Tchap: Disable Biometrics & Pin Code
+//- (void)setPinCoordinatorBridgePresenterDelegateDidComplete:(SetPinCoordinatorBridgePresenter *)coordinatorBridgePresenter
+//{
+//    [coordinatorBridgePresenter dismiss];
+//    self.setPinCoordinatorBridgePresenter = nil;
+//    [self afterAppUnlockedByPin:[UIApplication sharedApplication]];
+//}
+//
+//- (void)setPinCoordinatorBridgePresenterDelegateDidCompleteWithReset:(SetPinCoordinatorBridgePresenter *)coordinatorBridgePresenter dueToTooManyErrors:(BOOL)dueToTooManyErrors
+//{
+//    if (dueToTooManyErrors)
+//    {
+//        [self showAlertWithTitle:nil message:[VectorL10n pinProtectionKickUserAlertMessage]];
+//        [self logoutWithConfirmation:NO completion:nil];
+//    }
+//    else
+//    {
+//        [coordinatorBridgePresenter dismiss];
+//        self.setPinCoordinatorBridgePresenter = nil;
+//        [self logoutWithConfirmation:NO completion:nil];
+//    }
+//}
 
 #pragma mark - CallPresenterDelegate
 
@@ -4597,7 +4618,8 @@ - (BOOL)continueSSOLoginWithToken:(NSString*)loginToken txnId:(NSString*)txnId
         return NO;
     }
     
-    return [bridgePresenter continueSSOLoginWithToken:loginToken transactionID:txnId];
+    // Tchap:
+    return NO;//[bridgePresenter continueSSOLoginWithToken:loginToken transactionID:txnId];
 }
 
 #pragma mark - Private
@@ -4614,46 +4636,47 @@ - (void)clearCache
 
 -(void)openSpaceWithId:(NSString *)spaceId
 {
-    MXSession *session = mxSessionArray.firstObject;
-    if ([session.spaceService getSpaceWithId:spaceId]) {
-        [self restoreInitialDisplay:^{
-            [self.delegate legacyAppDelegate:self didNavigateToSpaceWithId:spaceId];
-        }];
-    }
-    else
-    {
-        MXWeakify(self);
-        __block __weak id observer = [[NSNotificationCenter defaultCenter] addObserverForName:MXSpaceService.didBuildSpaceGraph object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
-            MXStrongifyAndReturnIfNil(self);
-            
-            [[NSNotificationCenter defaultCenter] removeObserver:observer];
-            
-            if ([session.spaceService getSpaceWithId:spaceId]) {
-                [self restoreInitialDisplay:^{
-                    [self.delegate legacyAppDelegate:self didNavigateToSpaceWithId:spaceId];
-                }];
-            }
-        }];
-    }
+    // Tchap: Disable Spaces
+//    MXSession *session = mxSessionArray.firstObject;
+//    if ([session.spaceService getSpaceWithId:spaceId]) {
+//        [self restoreInitialDisplay:^{
+//            [self.delegate legacyAppDelegate:self didNavigateToSpaceWithId:spaceId];
+//        }];
+//    }
+//    else
+//    {
+//        MXWeakify(self);
+//        __block __weak id observer = [[NSNotificationCenter defaultCenter] addObserverForName:MXSpaceService.didBuildSpaceGraph object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
+//            MXStrongifyAndReturnIfNil(self);
+//
+//            [[NSNotificationCenter defaultCenter] removeObserver:observer];
+//
+//            if ([session.spaceService getSpaceWithId:spaceId]) {
+//                [self restoreInitialDisplay:^{
+//                    [self.delegate legacyAppDelegate:self didNavigateToSpaceWithId:spaceId];
+//                }];
+//            }
+//        }];
+//    }
 }
 
 #pragma mark - SpaceDetailPresenterDelegate
-
-- (void)spaceDetailPresenterDidComplete:(SpaceDetailPresenter *)presenter
-{
-    self.spaceDetailPresenter = nil;
-}
-
-- (void)spaceDetailPresenter:(SpaceDetailPresenter *)presenter didOpenSpaceWithId:(NSString *)spaceId
-{
-    self.spaceDetailPresenter = nil;
-    [self openSpaceWithId:spaceId];
-}
-
-- (void)spaceDetailPresenter:(SpaceDetailPresenter *)presenter didJoinSpaceWithId:(NSString *)spaceId
-{
-    self.spaceDetailPresenter = nil;
-    [self openSpaceWithId:spaceId];
-}
+// Tchap: Disable Spaces
+//- (void)spaceDetailPresenterDidComplete:(SpaceDetailPresenter *)presenter
+//{
+//    self.spaceDetailPresenter = nil;
+//}
+//
+//- (void)spaceDetailPresenter:(SpaceDetailPresenter *)presenter didOpenSpaceWithId:(NSString *)spaceId
+//{
+//    self.spaceDetailPresenter = nil;
+//    [self openSpaceWithId:spaceId];
+//}
+//
+//- (void)spaceDetailPresenter:(SpaceDetailPresenter *)presenter didJoinSpaceWithId:(NSString *)spaceId
+//{
+//    self.spaceDetailPresenter = nil;
+//    [self openSpaceWithId:spaceId];
+//}
 
 @end
diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
index ea12e491c8..faaa6554b0 100644
--- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
+++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
@@ -1008,7 +1008,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     
     if (summary)
     {
-        return [[MXKRecentCellData alloc] initWithRoomSummary:summary andRecentListDataSource:self];
+        return [[MXKRecentCellData alloc] initWithRoomSummary:summary dataSource:self];
     }
     return nil;
 }
diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m
index f0412b1aa2..54c2a68bad 100644
--- a/Riot/Modules/Common/Recents/RecentsViewController.m
+++ b/Riot/Modules/Common/Recents/RecentsViewController.m
@@ -441,6 +441,82 @@ - (void)cancelEditionModeAndForceTableViewRefreshIfNeeded
     [self cancelEditionMode:isRefreshPending];
 }
 
+- (void)joinRoom:(MXRoom*)room completion:(void(^)(BOOL succeed))completion
+{
+    [room join:^{
+        // `recentsTableView` will be reloaded `roomChangeMembershipStateDataSourceDidChangeRoomMembershipState` function
+        
+        if (completion)
+        {
+            completion(YES);
+        }
+        
+    } failure:^(NSError * _Nonnull error) {
+        MXLogDebug(@"[RecentsViewController] Failed to join an invited room (%@)", room.roomId);
+        [self presentRoomJoinFailedAlertForError:error completion:^{
+            if (completion)
+            {
+                completion(NO);
+            }
+        }];
+    }];
+}
+
+- (void)leaveRoom:(MXRoom*)room completion:(void(^)(BOOL succeed))completion
+{
+    // Decline the invitation
+    [room leave:^{
+        
+        // `recentsTableView` will be reloaded `roomChangeMembershipStateDataSourceDidChangeRoomMembershipState` function
+        
+        if (completion)
+        {
+            completion(YES);
+        }
+    } failure:^(NSError * _Nonnull error) {
+        MXLogDebug(@"[RecentsViewController] Failed to reject an invited room (%@)", room.roomId);
+        [[AppDelegate theDelegate] showErrorAsAlert:error];
+        
+        if (completion)
+        {
+            completion(NO);
+        }
+    }];
+}
+
+- (void)presentRoomJoinFailedAlertForError:(NSError*)error completion:(void(^)(void))completion
+{
+    MXWeakify(self);
+    NSString *msg = [error.userInfo valueForKey:NSLocalizedDescriptionKey];
+    if ([msg isEqualToString:@"No known servers"])
+    {
+        // minging kludge until https://matrix.org/jira/browse/SYN-678 is fixed
+        // 'Error when trying to join an empty room should be more explicit'
+        msg = [MatrixKitL10n roomErrorJoinFailedEmptyRoom];
+    }
+    
+    [self->currentAlert dismissViewControllerAnimated:NO completion:nil];
+    
+    UIAlertController *errorAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n roomErrorJoinFailedTitle]
+                                                                        message:msg
+                                                                 preferredStyle:UIAlertControllerStyleAlert];
+    
+    [errorAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                   style:UIAlertActionStyleDefault
+                                                 handler:^(UIAlertAction * action) {
+        MXStrongifyAndReturnIfNil(self);
+        self->currentAlert = nil;
+        
+        if (completion)
+        {
+            completion();
+        }
+    }]];
+    
+    [self presentViewController:errorAlert animated:YES completion:nil];
+    currentAlert = errorAlert;
+}
+
 #pragma mark - Sticky Headers
 
 - (void)setEnableStickyHeaders:(BOOL)enableStickyHeaders
@@ -818,7 +894,7 @@ - (void)showSpaceInviteNotAvailable
     id<MXKRecentCellDataStoring> cellDataStoring = (id<MXKRecentCellDataStoring> )cellData;
     
     if ([cellDataStoring.roomSummary isKindOfClass:[MXRoomSummary class]] &&
-         ((MXRoomSummary *)cellDataStoring.roomSummary).room.summary.membership == MXMembershipInvite)    {
+         ((MXRoomSummary *)cellDataStoring.roomSummary).membership == MXMembershipInvite)    {
         return RoomsInviteCell.class;
     }
     else if ([cellDataStoring.roomSummary isKindOfClass:[MXRoomSummary class]] &&
@@ -866,39 +942,41 @@ - (void)dataSource:(MXKDataSource *)dataSource didRecognizeAction:(NSString *)ac
 //        // Display the room preview
 //        [self showRoomWithRoomId:invitedRoom.roomId inMatrixSession:invitedRoom.mxSession];
 //    }
-//    else if ([actionIdentifier isEqualToString:kInviteRecentTableViewCellAcceptButtonPressed])
-//    {
-//        // Retrieve the invited room
-//        MXRoom *invitedRoom = userInfo[kInviteRecentTableViewCellRoomKey];
-//
-//        if (invitedRoom.summary.roomType == MXRoomTypeSpace)
-//        {
-//            // Indicates that spaces are not supported
-//            [self showSpaceInviteNotAvailable];
-//            return;
-//        }
-//
-//        // Accept invitation
-//        [self joinRoom:invitedRoom completion:nil];
-//    }
-//    else if ([actionIdentifier isEqualToString:kInviteRecentTableViewCellDeclineButtonPressed])
-//    {
-//        // Retrieve the invited room
-//        MXRoom *invitedRoom = userInfo[kInviteRecentTableViewCellRoomKey];
-//
-//        [self cancelEditionMode:isRefreshPending];
-//
-//        // Decline the invitation
-//        [self leaveRoom:invitedRoom completion:nil];
-//    }
 //    else
-//    {
+    // Tchap: Use Tchap keys here.
+    if ([actionIdentifier isEqualToString:RoomsInviteCell.actionJoinInvite])
+    {
+        // Retrieve the invited room
+        MXRoom *invitedRoom = userInfo[RoomsInviteCell.keyRoom];
+
+        if (invitedRoom.summary.roomType == MXRoomTypeSpace)
+        {
+            // Indicates that spaces are not supported
+            [self showSpaceInviteNotAvailable];
+            return;
+        }
+
+        // Accept invitation
+        [self joinRoom:invitedRoom completion:nil];
+    }
+    else if ([actionIdentifier isEqualToString:RoomsInviteCell.actionDeclineInvite])
+    {
+        // Retrieve the invited room
+        MXRoom *invitedRoom = userInfo[RoomsInviteCell.keyRoom];
+
+        [self cancelEditionMode:isRefreshPending];
+
+        // Decline the invitation
+        [self leaveRoom:invitedRoom completion:nil];
+    }
+    else
+    {
         // Keep default implementation for other actions if any
         if ([super respondsToSelector:@selector(cell:didRecognizeAction:userInfo:)])
         {
             [super dataSource:dataSource didRecognizeAction:actionIdentifier inCell:cell userInfo:userInfo];
         }
-//    }
+    }
 }
 
 - (void)dataSource:(MXKDataSource *)dataSource didCellChange:(id)changes
@@ -1423,6 +1501,7 @@ - (void)scrollToTheTopTheNextRoomWithMissedNotificationsInSection:(NSInteger)sec
 
 - (void)recentListViewController:(MXKRecentListViewController *)recentListViewController didSelectRoom:(NSString *)roomId inMatrixSession:(MXSession *)matrixSession
 {
+    [self showRoomWithRoomId:roomId inMatrixSession:matrixSession];
 }
 
 #pragma mark - CreateRoomCoordinatorBridgePresenterDelegate
diff --git a/Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift b/Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift
index c9eb942099..10fb12b7c2 100644
--- a/Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift
+++ b/Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift
@@ -35,24 +35,24 @@ public class RecentsListService: NSObject, RecentsListServiceProtocol {
     private var invitedRoomListDataFetcher: MXRoomListDataFetcher?
     private var favoritedRoomListDataFetcher: MXRoomListDataFetcher?
     private var directRoomListDataFetcher: MXRoomListDataFetcher? {
-        switch mode {
-        case .home:
-            return directRoomListDataFetcherForHome
-        case .people:
+//        switch mode {
+//        case .home:
+//            return directRoomListDataFetcherForHome
+//        case .people:
             return directRoomListDataFetcherForPeople
-        default:
-            return nil
-        }
+//        default:
+//            return nil
+//        }
     }
     private var conversationRoomListDataFetcher: MXRoomListDataFetcher? {
-        switch mode {
-        case .home:
+//        switch mode {
+//        case .home:
             return conversationRoomListDataFetcherForHome
-        case .rooms:
-            return conversationRoomListDataFetcherForRooms
-        default:
-            return nil
-        }
+//        case .rooms:
+//            return conversationRoomListDataFetcherForRooms
+//        default:
+//            return nil
+//        }
     }
     private var lowPriorityRoomListDataFetcher: MXRoomListDataFetcher?
     private var serverNoticeRoomListDataFetcher: MXRoomListDataFetcher?
@@ -69,7 +69,8 @@ public class RecentsListService: NSObject, RecentsListServiceProtocol {
         .home: [.invited, .favorited, .directHome, .conversationHome, .lowPriority, .serverNotice, .suggested],
         .favourites: [.favorited],
         .people: [.directPeople],
-        .rooms: [.conversationRooms, .suggested]
+        .rooms: [.conversationRooms, .suggested,
+            .invited, .favorited, .directHome, .directPeople, .conversationHome, .serverNotice]
     ]
     
     private var allFetchers: [MXRoomListDataFetcher] {
@@ -362,14 +363,16 @@ public class RecentsListService: NSObject, RecentsListServiceProtocol {
     }
     
     private var shouldShowDirect: Bool {
-        switch mode {
-        case .home:
-            return fetcherTypesForMode[mode]?.contains(.directHome) ?? false
-        case .people:
-            return fetcherTypesForMode[mode]?.contains(.directPeople) ?? false
-        default:
-            return false
-        }
+        return true
+        // Tchap: Always show direct.
+//        switch mode {
+//        case .home:
+//            return fetcherTypesForMode[mode]?.contains(.directHome) ?? false
+//        case .people:
+//            return fetcherTypesForMode[mode]?.contains(.directPeople) ?? false
+//        default:
+//            return false
+//        }
     }
     
     private var shouldShowConversation: Bool {
@@ -522,7 +525,8 @@ public class RecentsListService: NSObject, RecentsListServiceProtocol {
                 notDataTypes.insert([.invited, .favorited, .lowPriority])
                 fetcher.fetchOptions.filterOptions.notDataTypes = notDataTypes
             case .people:
-                notDataTypes.insert([.lowPriority])
+                // Tchap: Show lowPriority too, but not invitations and favorited (in this section).
+                notDataTypes.insert([.invited, .favorited/*.lowPriority*/])
                 fetcher.fetchOptions.filterOptions.notDataTypes = notDataTypes
             default:
                 break
diff --git a/Tchap/Modules/SplitView/SplitViewCoordinatorType.swift b/Riot/Modules/Rooms/RoomsViewController.h
similarity index 51%
rename from Tchap/Modules/SplitView/SplitViewCoordinatorType.swift
rename to Riot/Modules/Rooms/RoomsViewController.h
index 19bdf0f3f4..9a1ae8758a 100644
--- a/Tchap/Modules/SplitView/SplitViewCoordinatorType.swift
+++ b/Riot/Modules/Rooms/RoomsViewController.h
@@ -1,12 +1,12 @@
 /*
- Copyright 2018 New Vector Ltd
- 
+ Copyright 2017 Vector Creations 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.
@@ -14,8 +14,22 @@
  limitations under the License.
  */
 
-import Foundation
+#import "RecentsViewController.h"
+@protocol RoomsViewControllerDelegate;
+
+/**
+ The `RoomsViewController` screen is the view controller displayed when `Rooms` tab is selected.
+ */
+@interface RoomsViewController : RecentsViewController
+
+@property (nonatomic, weak) id<RoomsViewControllerDelegate> roomsViewDelegate;
+
++ (instancetype)instantiate;
+
+/**
+ Scroll the next room with missed notifications to the top.
+ */
+- (void)scrollToNextRoomWithMissedNotifications;
+
 
-/// `SplitViewCoordinatorType` is a protocol describing a Coordinator that handle split view navigation flow.
-protocol SplitViewCoordinatorType: Coordinator, Presentable {    
-}
+@end
diff --git a/Riot/Modules/Rooms/RoomsViewController.m b/Riot/Modules/Rooms/RoomsViewController.m
index b4c1d81986..d118278a31 100644
--- a/Riot/Modules/Rooms/RoomsViewController.m
+++ b/Riot/Modules/Rooms/RoomsViewController.m
@@ -26,6 +26,7 @@ @interface RoomsViewController ()
 }
 
 @property (nonatomic, strong) MXThrottler *tableViewPaginationThrottler;
+@property (nonatomic, weak) UIAlertController *currentAlertController;
 
 @end
 
@@ -58,7 +59,7 @@ - (void)viewDidLoad
     self.recentsTableView.tag = RecentsDataSourceModeRooms;
     
     // Add the (+) button programmatically
-    plusButtonImageView = [self vc_addFABWithImage:AssetImages.roomsFloatingAction.image
+    plusButtonImageView = [self vc_addFABWithImage:AssetImages_tchap.createRoom.image
                                             target:self
                                             action:@selector(onPlusButtonPressed)];
 }
@@ -99,7 +100,10 @@ - (void)refreshCurrentSelectedCell:(BOOL)forceVisible
 
 - (void)onPlusButtonPressed
 {
-    [self showRoomDirectory];
+    // Tchap: Redirect to an AlertController.
+    [self.currentAlertController dismissViewControllerAnimated:NO completion:nil];
+
+    self.currentAlertController = [self showPlusMenuFrom:self->plusButtonImageView];
 }
 
 #pragma mark - UITableView delegate
diff --git a/Riot/Modules/Rooms/RoomsViewController.swift b/Riot/Modules/Rooms/RoomsViewController.swift
new file mode 100644
index 0000000000..3c339544dc
--- /dev/null
+++ b/Riot/Modules/Rooms/RoomsViewController.swift
@@ -0,0 +1,51 @@
+// 
+// Copyright 2022 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
+
+@objc protocol RoomsViewControllerDelegate: NSObjectProtocol {
+    func roomsViewControllerDidTapStartChatButton(_ roomsViewController: RoomsViewController)
+    func roomsViewControllerDidTapCreateRoomButton(_ roomsViewController: RoomsViewController)
+    func roomsViewControllerDidTapPublicRoomsAccessButton(_ roomsViewController: RoomsViewController)
+}
+
+extension RoomsViewController {
+    @objc func showPlusMenu(from button: UIView) -> UIAlertController {
+        let currentAlert = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
+        
+        currentAlert.addAction(UIAlertAction(title: TchapL10n.conversationsStartChatAction, style: .default, handler: { _ in
+            self.roomsViewDelegate?.roomsViewControllerDidTapStartChatButton(self)
+        }))
+        
+        currentAlert.addAction(UIAlertAction(title: TchapL10n.conversationsCreateRoomAction, style: .default, handler: { _ in
+            self.roomsViewDelegate?.roomsViewControllerDidTapCreateRoomButton(self)
+        }))
+        
+        currentAlert.addAction(UIAlertAction(title: TchapL10n.conversationsAccessToPublicRoomsAction, style: .default, handler: { _ in
+            self.roomsViewDelegate?.roomsViewControllerDidTapPublicRoomsAccessButton(self)
+        }))
+        
+        currentAlert.addAction(UIAlertAction(title: Bundle.mxk_localizedString(forKey: "cancel"), style: .cancel, handler: nil))
+        
+        currentAlert.popoverPresentationController?.sourceView = button
+        currentAlert.popoverPresentationController?.sourceRect = button.bounds
+        
+        self.present(currentAlert, animated: true)
+        
+        return currentAlert
+    }
+}
diff --git a/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryViewController.swift b/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryViewController.swift
index 847ce6a402..1f2ca21f66 100644
--- a/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryViewController.swift
+++ b/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryViewController.swift
@@ -347,13 +347,13 @@ extension ShowDirectoryViewController: UITableViewDelegate {
 
 // MARK: - UISearchBarDelegate
 
-extension ShowDirectoryViewController: UISearchBarDelegate {
-    
-    func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
-        viewModel.process(viewAction: .search(searchText))
-    }
-    
-}
+//extension ShowDirectoryViewController: UISearchBarDelegate {
+//    
+//    func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
+//        viewModel.process(viewAction: .search(searchText))
+//    }
+//    
+//}
 
 // MARK: -
 
diff --git a/Riot/Modules/SideMenu/SideMenuCoordinator.swift b/Riot/Modules/SideMenu/SideMenuCoordinator.swift
index 797e208180..66a6ab5410 100644
--- a/Riot/Modules/SideMenu/SideMenuCoordinator.swift
+++ b/Riot/Modules/SideMenu/SideMenuCoordinator.swift
@@ -51,7 +51,7 @@ final class SideMenuCoordinator: NSObject, SideMenuCoordinatorType {
     private let parameters: SideMenuCoordinatorParameters
     private var sideMenuViewModel: SideMenuViewModelType
     
-    private weak var spaceListCoordinator: SpaceListCoordinatorType?
+//    private weak var spaceListCoordinator: SpaceListCoordinatorType?
     
     private lazy var sideMenuNavigationViewController: SideMenuNavigationController = {
         return self.createSideMenuNavigationController(with: self.sideMenuViewController)
@@ -59,11 +59,11 @@ final class SideMenuCoordinator: NSObject, SideMenuCoordinatorType {
     
     private let sideMenuViewController: SideMenuViewController
     
-    let spaceMenuPresenter = SpaceMenuPresenter()
-    let spaceDetailPresenter = SpaceDetailPresenter()
+//    let spaceMenuPresenter = SpaceMenuPresenter()
+//    let spaceDetailPresenter = SpaceDetailPresenter()
     
-    private var exploreRoomCoordinator: ExploreRoomCoordinator?
-    private var membersCoordinator: SpaceMembersCoordinator?
+//    private var exploreRoomCoordinator: ExploreRoomCoordinator?
+//    private var membersCoordinator: SpaceMembersCoordinator?
 
     // MARK: Public
 
@@ -110,7 +110,7 @@ final class SideMenuCoordinator: NSObject, SideMenuCoordinatorType {
     }
     
     func select(spaceWithId spaceId: String) {
-        self.spaceListCoordinator?.select(spaceWithId: spaceId)
+//        self.spaceListCoordinator?.select(spaceWithId: spaceId)
     }
     
     // MARK: - Private
@@ -146,38 +146,39 @@ final class SideMenuCoordinator: NSObject, SideMenuCoordinatorType {
     }
     
     private func addSpaceListIfNeeded() {
-        guard self.spaceListCoordinator == nil else {
-            return
-        }
-        
-        guard let mainMatrixSession = self.parameters.userSessionsService.mainUserSession?.matrixSession else {
-            return
-        }
-        
-        self.addSpaceList(with: mainMatrixSession)
+//        guard self.spaceListCoordinator == nil else {
+//            return
+//        }
+//
+//        guard let mainMatrixSession = self.parameters.userSessionsService.mainUserSession?.matrixSession else {
+//            return
+//        }
+//
+//        self.addSpaceList(with: mainMatrixSession)
     }
 
     private func addSpaceList(with matrixSession: MXSession) {
-        let parameters = SpaceListCoordinatorParameters(userSessionsService: self.parameters.userSessionsService)
-        
-        let spaceListCoordinator = SpaceListCoordinator(parameters: parameters)
-        spaceListCoordinator.delegate = self
-        spaceListCoordinator.start()
-        
-        let spaceListPresentable = spaceListCoordinator.toPresentable()
-            
-        // sideMenuViewController.spaceListContainerView can be nil, load controller view to avoid this case
-        self.sideMenuViewController.loadViewIfNeeded()
-        
-        self.sideMenuViewController.vc_addChildViewController(viewController: spaceListPresentable, onView: self.sideMenuViewController.spaceListContainerView)
-        
-        self.add(childCoordinator: spaceListCoordinator)
-        
-        self.spaceListCoordinator = spaceListCoordinator
+//        let parameters = SpaceListCoordinatorParameters(userSessionsService: self.parameters.userSessionsService)
+//
+//        let spaceListCoordinator = SpaceListCoordinator(parameters: parameters)
+//        spaceListCoordinator.delegate = self
+//        spaceListCoordinator.start()
+//
+//        let spaceListPresentable = spaceListCoordinator.toPresentable()
+//
+//        // sideMenuViewController.spaceListContainerView can be nil, load controller view to avoid this case
+//        self.sideMenuViewController.loadViewIfNeeded()
+//
+//        self.sideMenuViewController.vc_addChildViewController(viewController: spaceListPresentable, onView: self.sideMenuViewController.spaceListContainerView)
+//
+//        self.add(childCoordinator: spaceListCoordinator)
+//
+//        self.spaceListCoordinator = spaceListCoordinator
     }
     
     private func createSettingsViewController() -> SettingsViewController {
         let viewController: SettingsViewController = SettingsViewController.instantiate()
+        viewController.delegate = self
         viewController.loadViewIfNeeded()
         return viewController
     }
@@ -200,61 +201,61 @@ final class SideMenuCoordinator: NSObject, SideMenuCoordinatorType {
     }
     
     private func showHelp() {
-        guard let helpURL = URL(string: BuildSettings.applicationHelpUrlString) else {
-            return
-        }
-        
-        let safariViewController = SFSafariViewController(url: helpURL)
-        
-        // Show in fullscreen to animate presentation along side menu dismiss
-        safariViewController.modalPresentationStyle = .fullScreen
-        self.sideMenuNavigationViewController.present(safariViewController, animated: true, completion: nil)
+//        guard let helpURL = URL(string: BuildSettings.applicationHelpUrlString) else {
+//            return
+//        }
+//        
+//        let safariViewController = SFSafariViewController(url: helpURL)
+//        
+//        // Show in fullscreen to animate presentation along side menu dismiss
+//        safariViewController.modalPresentationStyle = .fullScreen
+//        self.sideMenuNavigationViewController.present(safariViewController, animated: true, completion: nil)
     }
     
     private func showExploreRooms(spaceId: String, session: MXSession) {
-        let exploreRoomCoordinator = ExploreRoomCoordinator(session: session, spaceId: spaceId)
-        exploreRoomCoordinator.delegate = self
-        let presentable = exploreRoomCoordinator.toPresentable()
-        presentable.presentationController?.delegate = self
-        self.sideMenuViewController.present(presentable, animated: true, completion: nil)
-        exploreRoomCoordinator.start()
-        
-        self.exploreRoomCoordinator = exploreRoomCoordinator
+//        let exploreRoomCoordinator = ExploreRoomCoordinator(session: session, spaceId: spaceId)
+//        exploreRoomCoordinator.delegate = self
+//        let presentable = exploreRoomCoordinator.toPresentable()
+//        presentable.presentationController?.delegate = self
+//        self.sideMenuViewController.present(presentable, animated: true, completion: nil)
+//        exploreRoomCoordinator.start()
+//
+//        self.exploreRoomCoordinator = exploreRoomCoordinator
     }
     
     private func showMembers(spaceId: String, session: MXSession) {
-        let parameters = SpaceMembersCoordinatorParameters(userSessionsService: self.parameters.userSessionsService, session: session, spaceId: spaceId)
-        let spaceMembersCoordinator = SpaceMembersCoordinator(parameters: parameters)
-        spaceMembersCoordinator.delegate = self
-        let presentable = spaceMembersCoordinator.toPresentable()
-        presentable.presentationController?.delegate = self
-        self.sideMenuViewController.present(presentable, animated: true, completion: nil)
-        spaceMembersCoordinator.start()
-        
-        self.membersCoordinator = spaceMembersCoordinator
+//        let parameters = SpaceMembersCoordinatorParameters(userSessionsService: self.parameters.userSessionsService, session: session, spaceId: spaceId)
+//        let spaceMembersCoordinator = SpaceMembersCoordinator(parameters: parameters)
+//        spaceMembersCoordinator.delegate = self
+//        let presentable = spaceMembersCoordinator.toPresentable()
+//        presentable.presentationController?.delegate = self
+//        self.sideMenuViewController.present(presentable, animated: true, completion: nil)
+//        spaceMembersCoordinator.start()
+//
+//        self.membersCoordinator = spaceMembersCoordinator
     }
 
     private func showInviteFriends(from sourceView: UIView?) {
-        let myUserId = self.parameters.userSessionsService.mainUserSession?.userId ?? ""
-        
-        let inviteFriendsPresenter = InviteFriendsPresenter()
-        inviteFriendsPresenter.present(for: myUserId, from: self.sideMenuViewController, sourceView: sourceView, animated: true)
+//        let myUserId = self.parameters.userSessionsService.mainUserSession?.userId ?? ""
+//
+//        let inviteFriendsPresenter = InviteFriendsPresenter()
+//        inviteFriendsPresenter.present(for: myUserId, from: self.sideMenuViewController, sourceView: sourceView, animated: true)
     }
     
     private func showMenu(forSpaceWithId spaceId: String, from sourceView: UIView?) {
-        guard let session = self.parameters.userSessionsService.mainUserSession?.matrixSession else {
-            return
-        }
-        self.spaceMenuPresenter.delegate = self
-        self.spaceMenuPresenter.present(forSpaceWithId: spaceId, from: self.sideMenuViewController, sourceView: sourceView, session: session, animated: true)
+//        guard let session = self.parameters.userSessionsService.mainUserSession?.matrixSession else {
+//            return
+//        }
+//        self.spaceMenuPresenter.delegate = self
+//        self.spaceMenuPresenter.present(forSpaceWithId: spaceId, from: self.sideMenuViewController, sourceView: sourceView, session: session, animated: true)
     }
     
     private func showSpaceDetail(forSpaceWithId spaceId: String, from sourceView: UIView?) {
-        guard let session = self.parameters.userSessionsService.mainUserSession?.matrixSession else {
-            return
-        }
-        self.spaceDetailPresenter.delegate = self
-        self.spaceDetailPresenter.present(forSpaceWithId: spaceId, from: self.sideMenuViewController, sourceView: sourceView, session: session, animated: true)
+//        guard let session = self.parameters.userSessionsService.mainUserSession?.matrixSession else {
+//            return
+//        }
+//        self.spaceDetailPresenter.delegate = self
+//        self.spaceDetailPresenter.present(forSpaceWithId: spaceId, from: self.sideMenuViewController, sourceView: sourceView, session: session, animated: true)
     }
     
     // MARK: UserSessions management
@@ -309,82 +310,91 @@ extension SideMenuCoordinator: SideMenuNavigationControllerDelegate {
 }
 
 // MARK: - SideMenuNavigationControllerDelegate
-extension SideMenuCoordinator: SpaceListCoordinatorDelegate {
-    func spaceListCoordinatorDidSelectHomeSpace(_ coordinator: SpaceListCoordinatorType) {                
-        self.parameters.appNavigator.sideMenu.dismiss(animated: true) {
-            
-        }
-        self.parameters.appNavigator.navigate(to: .homeSpace)
-    }
-    
-    func spaceListCoordinator(_ coordinator: SpaceListCoordinatorType, didSelectSpaceWithId spaceId: String) {
-        self.parameters.appNavigator.sideMenu.dismiss(animated: true) {
-            
-        }
-        self.parameters.appNavigator.navigate(to: .space(spaceId))
-    }
-    
-    func spaceListCoordinator(_ coordinator: SpaceListCoordinatorType, didSelectInviteWithId spaceId: String, from sourceView: UIView?) {
-        self.showSpaceDetail(forSpaceWithId: spaceId, from: sourceView)
-    }
-    
-    func spaceListCoordinator(_ coordinator: SpaceListCoordinatorType, didPressMoreForSpaceWithId spaceId: String, from sourceView: UIView) {
-        self.showMenu(forSpaceWithId: spaceId, from: sourceView)
-    }
-}
+//extension SideMenuCoordinator: SpaceListCoordinatorDelegate {
+//    func spaceListCoordinatorDidSelectHomeSpace(_ coordinator: SpaceListCoordinatorType) {
+//        self.parameters.appNavigator.sideMenu.dismiss(animated: true) {
+//
+//        }
+//        self.parameters.appNavigator.navigate(to: .homeSpace)
+//    }
+//
+//    func spaceListCoordinator(_ coordinator: SpaceListCoordinatorType, didSelectSpaceWithId spaceId: String) {
+//        self.parameters.appNavigator.sideMenu.dismiss(animated: true) {
+//
+//        }
+//        self.parameters.appNavigator.navigate(to: .space(spaceId))
+//    }
+//
+//    func spaceListCoordinator(_ coordinator: SpaceListCoordinatorType, didSelectInviteWithId spaceId: String, from sourceView: UIView?) {
+//        self.showSpaceDetail(forSpaceWithId: spaceId, from: sourceView)
+//    }
+//
+//    func spaceListCoordinator(_ coordinator: SpaceListCoordinatorType, didPressMoreForSpaceWithId spaceId: String, from sourceView: UIView) {
+//        self.showMenu(forSpaceWithId: spaceId, from: sourceView)
+//    }
+//}
 
 // MARK: - SpaceMenuPresenterDelegate
-extension SideMenuCoordinator: SpaceMenuPresenterDelegate {
-    func spaceMenuPresenter(_ presenter: SpaceMenuPresenter, didCompleteWith action: SpaceMenuPresenter.Actions, forSpaceWithId spaceId: String, with session: MXSession) {
-        presenter.dismiss(animated: false) {
-            switch action {
-            case .exploreRooms:
-                self.showExploreRooms(spaceId: spaceId, session: session)
-            case .exploreMembers:
-                self.showMembers(spaceId: spaceId, session: session)
-            }
-        }
-    }
-}
+//extension SideMenuCoordinator: SpaceMenuPresenterDelegate {
+//    func spaceMenuPresenter(_ presenter: SpaceMenuPresenter, didCompleteWith action: SpaceMenuPresenter.Actions, forSpaceWithId spaceId: String, with session: MXSession) {
+//        presenter.dismiss(animated: false) {
+//            switch action {
+//            case .exploreRooms:
+//                self.showExploreRooms(spaceId: spaceId, session: session)
+//            case .exploreMembers:
+//                self.showMembers(spaceId: spaceId, session: session)
+//            }
+//        }
+//    }
+//}
 
-extension SideMenuCoordinator: SpaceDetailPresenterDelegate {
-    func spaceDetailPresenter(_ presenter: SpaceDetailPresenter, didJoinSpaceWithId spaceId: String) {
-        self.spaceListCoordinator?.select(spaceWithId: spaceId)
-    }
-    
-    func spaceDetailPresenter(_ presenter: SpaceDetailPresenter, didOpenSpaceWithId spaceId: String) {
-        // this use case cannot happen here as the space list open directly joined spaces on tap
-        self.spaceListCoordinator?.revertItemSelection()
-    }
-    
-    func spaceDetailPresenterDidComplete(_ presenter: SpaceDetailPresenter) {
-        self.spaceListCoordinator?.revertItemSelection()
-    }
-}
+//extension SideMenuCoordinator: SpaceDetailPresenterDelegate {
+//    func spaceDetailPresenter(_ presenter: SpaceDetailPresenter, didJoinSpaceWithId spaceId: String) {
+//        self.spaceListCoordinator?.select(spaceWithId: spaceId)
+//    }
+//
+//    func spaceDetailPresenter(_ presenter: SpaceDetailPresenter, didOpenSpaceWithId spaceId: String) {
+//        // this use case cannot happen here as the space list open directly joined spaces on tap
+//        self.spaceListCoordinator?.revertItemSelection()
+//    }
+//
+//    func spaceDetailPresenterDidComplete(_ presenter: SpaceDetailPresenter) {
+//        self.spaceListCoordinator?.revertItemSelection()
+//    }
+//}
 
 // MARK: - ExploreRoomCoordinatorDelegate
-extension SideMenuCoordinator: ExploreRoomCoordinatorDelegate {
-    func exploreRoomCoordinatorDidComplete(_ coordinator: ExploreRoomCoordinatorType) {
-        self.exploreRoomCoordinator?.toPresentable().dismiss(animated: true) {
-            self.exploreRoomCoordinator = nil
-        }
-    }
-}
+//extension SideMenuCoordinator: ExploreRoomCoordinatorDelegate {
+//    func exploreRoomCoordinatorDidComplete(_ coordinator: ExploreRoomCoordinatorType) {
+//        self.exploreRoomCoordinator?.toPresentable().dismiss(animated: true) {
+//            self.exploreRoomCoordinator = nil
+//        }
+//    }
+//}
 
 // MARK: - SpaceMembersCoordinatorDelegate
-extension SideMenuCoordinator: SpaceMembersCoordinatorDelegate {
-    func spaceMembersCoordinatorDidCancel(_ coordinator: SpaceMembersCoordinatorType) {
-        self.membersCoordinator?.toPresentable().dismiss(animated: true) {
-            self.membersCoordinator = nil
-        }
-    }
-}
+//extension SideMenuCoordinator: SpaceMembersCoordinatorDelegate {
+//    func spaceMembersCoordinatorDidCancel(_ coordinator: SpaceMembersCoordinatorType) {
+//        self.membersCoordinator?.toPresentable().dismiss(animated: true) {
+//            self.membersCoordinator = nil
+//        }
+//    }
+//}
 
 // MARK: - UIAdaptivePresentationControllerDelegate
 extension SideMenuCoordinator: UIAdaptivePresentationControllerDelegate {
     
     func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
-        self.exploreRoomCoordinator = nil
-        self.membersCoordinator = nil
+//        self.exploreRoomCoordinator = nil
+//        self.membersCoordinator = nil
+    }
+}
+
+// MARK: - SettingsViewControllerDelegate
+extension SideMenuCoordinator: SettingsViewControllerDelegate {
+    func settingsViewController(_ settingsViewController: SettingsViewController!,
+                                reloadMatrixSessionsByClearingCache clearCache: Bool) {
+        settingsViewController.navigationController?.popToRootViewController(animated: true)
+        AppDelegate.theDelegate().reloadMatrixSessions(clearCache)
     }
 }
diff --git a/Riot/Modules/SideMenu/SideMenuViewModel.swift b/Riot/Modules/SideMenu/SideMenuViewModel.swift
index 0e24abcb14..820884bd5b 100644
--- a/Riot/Modules/SideMenu/SideMenuViewModel.swift
+++ b/Riot/Modules/SideMenu/SideMenuViewModel.swift
@@ -99,9 +99,9 @@ final class SideMenuViewModel: SideMenuViewModelType {
         
         var sideMenuItems: [SideMenuItem] = []
         
-        if BuildSettings.sideMenuShowInviteFriends {
-            sideMenuItems += [.inviteFriends]
-        }
+//        if BuildSettings.sideMenuShowInviteFriends {
+//            sideMenuItems += [.inviteFriends]
+//        }
         
         sideMenuItems += [
             .settings,
diff --git a/Riot/Modules/TabBar/MasterTabBarController.h b/Riot/Modules/TabBar/MasterTabBarController.h
index 6734a15284..69fa8df43c 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.h
+++ b/Riot/Modules/TabBar/MasterTabBarController.h
@@ -15,28 +15,28 @@
  limitations under the License.
  */
 
-#import "AuthenticationViewController.h"
+//#import "AuthenticationViewController.h"
 
 #import "RoomPreviewData.h"
-#import "HomeViewController.h"
-#import "FavouritesViewController.h"
-#import "PeopleViewController.h"
+//#import "HomeViewController.h"
+//#import "FavouritesViewController.h"
+//#import "PeopleViewController.h"
 #import "RoomsViewController.h"
-#import "GroupsViewController.h"
+//#import "GroupsViewController.h"
 
 #define TABBAR_HOME_INDEX         0
 #define TABBAR_FAVOURITES_INDEX   1
 #define TABBAR_PEOPLE_INDEX       2
-#define TABBAR_ROOMS_INDEX        3
+#define TABBAR_ROOMS_INDEX        0//3
 #define TABBAR_GROUPS_INDEX       4
 #define TABBAR_COUNT              5
 
 typedef NS_ENUM(NSUInteger, MasterTabBarIndex) {
-    MasterTabBarIndexHome = TABBAR_HOME_INDEX,
-    MasterTabBarIndexFavourites = TABBAR_FAVOURITES_INDEX,
-    MasterTabBarIndexPeople = TABBAR_PEOPLE_INDEX,
+//    MasterTabBarIndexHome = TABBAR_HOME_INDEX,
+//    MasterTabBarIndexFavourites = TABBAR_FAVOURITES_INDEX,
+//    MasterTabBarIndexPeople = TABBAR_PEOPLE_INDEX,
     MasterTabBarIndexRooms = TABBAR_ROOMS_INDEX,
-    MasterTabBarIndexGroups = TABBAR_GROUPS_INDEX
+//    MasterTabBarIndexGroups = TABBAR_GROUPS_INDEX
 };
 
 @protocol MasterTabBarControllerDelegate;
@@ -153,11 +153,11 @@ typedef NS_ENUM(NSUInteger, MasterTabBarIndex) {
 // Reference to the current onboarding flow. It is always nil unless the flow is being presented.
 @property (nonatomic, readonly) OnboardingCoordinatorBridgePresenter *onboardingCoordinatorBridgePresenter;
 
-@property (nonatomic, readonly) HomeViewController *homeViewController;
-@property (nonatomic, readonly) FavouritesViewController *favouritesViewController;
-@property (nonatomic, readonly) PeopleViewController *peopleViewController;
+//@property (nonatomic, readonly) HomeViewController *homeViewController;
+//@property (nonatomic, readonly) FavouritesViewController *favouritesViewController;
+//@property (nonatomic, readonly) PeopleViewController *peopleViewController;
 @property (nonatomic, readonly) RoomsViewController *roomsViewController;
-@property (nonatomic, readonly) GroupsViewController *groupsViewController;
+//@property (nonatomic, readonly) GroupsViewController *groupsViewController;
 
 
 // References on the currently selected room
@@ -195,5 +195,6 @@ typedef NS_ENUM(NSUInteger, MasterTabBarIndex) {
 - (void)masterTabBarController:(MasterTabBarController *)masterTabBarController didSelectContact:(MXKContact*)contact withPresentationParameters:(ScreenPresentationParameters*)presentationParameters;
 - (void)masterTabBarController:(MasterTabBarController *)masterTabBarController didSelectGroup:(MXGroup*)group inMatrixSession:(MXSession*)matrixSession presentationParameters:(ScreenPresentationParameters*)presentationParameters;
 - (void)masterTabBarController:(MasterTabBarController *)masterTabBarController shouldPresentAnalyticsPromptForMatrixSession:(MXSession*)matrixSession;
+- (void)masterTabBarControllerShouldShowAuthenticationFlow:(MasterTabBarController *)masterTabBarController;
 
 @end
diff --git a/Riot/Modules/TabBar/MasterTabBarController.m b/Riot/Modules/TabBar/MasterTabBarController.m
index a825dcb91c..e49c97545f 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.m
+++ b/Riot/Modules/TabBar/MasterTabBarController.m
@@ -18,14 +18,14 @@
 #import "MasterTabBarController.h"
 
 #import "RecentsDataSource.h"
-#import "GroupsDataSource.h"
+//#import "GroupsDataSource.h"
 
 
 #import "MXRoom+Riot.h"
 #import "MXSession+Riot.h"
 
 #import "SettingsViewController.h"
-#import "SecurityViewController.h"
+//#import "SecurityViewController.h"
 
 #import "GeneratedInterface-Swift.h"
 
@@ -47,7 +47,7 @@ @interface MasterTabBarController () <UITabBarControllerDelegate>
     id kThemeServiceDidChangeThemeNotificationObserver;
     
     // The groups data source
-    GroupsDataSource *groupsDataSource;
+//    GroupsDataSource *groupsDataSource;
     
     // Custom title view of the navigation bar
     MainTitleView *titleView;
@@ -84,31 +84,31 @@ @implementation MasterTabBarController
 
 #pragma mark - Properties override
 
-- (HomeViewController *)homeViewController
-{
-    UIViewController *wrapperVC = [self viewControllerForClass:HomeViewControllerWithBannerWrapperViewController.class];
-    return [(HomeViewControllerWithBannerWrapperViewController *)wrapperVC homeViewController];
-}
-
-- (FavouritesViewController *)favouritesViewController
-{
-    return (FavouritesViewController*)[self viewControllerForClass:FavouritesViewController.class];
-}
-
-- (PeopleViewController *)peopleViewController
-{
-    return (PeopleViewController*)[self viewControllerForClass:PeopleViewController.class];
-}
+//- (HomeViewController *)homeViewController
+//{
+//    UIViewController *wrapperVC = [self viewControllerForClass:HomeViewControllerWithBannerWrapperViewController.class];
+//    return [(HomeViewControllerWithBannerWrapperViewController *)wrapperVC homeViewController];
+//}
+//
+//- (FavouritesViewController *)favouritesViewController
+//{
+//    return (FavouritesViewController*)[self viewControllerForClass:FavouritesViewController.class];
+//}
+//
+//- (PeopleViewController *)peopleViewController
+//{
+//    return (PeopleViewController*)[self viewControllerForClass:PeopleViewController.class];
+//}
 
 - (RoomsViewController *)roomsViewController
 {
     return (RoomsViewController*)[self viewControllerForClass:RoomsViewController.class];
 }
 
-- (GroupsViewController *)groupsViewController
-{
-    return (GroupsViewController*)[self viewControllerForClass:GroupsViewController.class];
-}
+//- (GroupsViewController *)groupsViewController
+//{
+//    return (GroupsViewController*)[self viewControllerForClass:GroupsViewController.class];
+//}
 
 #pragma mark - Life cycle
 
@@ -245,7 +245,8 @@ - (void)viewDidAppear:(BOOL)animated
             [childViewControllers removeAllObjects];
         }
         
-        [[AppDelegate theDelegate] checkAppVersion];
+        // Tchap: Not the same mecanism
+//        [[AppDelegate theDelegate] checkAppVersion];
     }
 }
 
@@ -358,43 +359,43 @@ - (void)initializeDataSources
         recentsDataSource = [[RecentsDataSource alloc] initWithMatrixSession:mainSession
                                                           recentsListService:recentsListService];
         
-        [self.homeViewController displayList:recentsDataSource];
-        [self.favouritesViewController displayList:recentsDataSource];
-        [self.peopleViewController displayList:recentsDataSource];
+//        [self.homeViewController displayList:recentsDataSource];
+//        [self.favouritesViewController displayList:recentsDataSource];
+//        [self.peopleViewController displayList:recentsDataSource];
         [self.roomsViewController displayList:recentsDataSource];
         
         // Restore the right delegate of the shared recent data source.
-        id<MXKDataSourceDelegate> recentsDataSourceDelegate = self.homeViewController;
-        RecentsDataSourceMode recentsDataSourceMode = RecentsDataSourceModeHome;
-        
-        NSInteger tabItemTag = self.tabBar.items[self.selectedIndex].tag;
+        id<MXKDataSourceDelegate> recentsDataSourceDelegate = self.roomsViewController;//self.homeViewController;
+        RecentsDataSourceMode recentsDataSourceMode = RecentsDataSourceModeRooms;
         
-        switch (tabItemTag)
-        {
-            case TABBAR_HOME_INDEX:
-                break;
-            case TABBAR_FAVOURITES_INDEX:
-                recentsDataSourceDelegate = self.favouritesViewController;
-                recentsDataSourceMode = RecentsDataSourceModeFavourites;
-                break;
-            case TABBAR_PEOPLE_INDEX:
-                recentsDataSourceDelegate = self.peopleViewController;
-                recentsDataSourceMode = RecentsDataSourceModePeople;
-                break;
-            case TABBAR_ROOMS_INDEX:
-                recentsDataSourceDelegate = self.roomsViewController;
-                recentsDataSourceMode = RecentsDataSourceModeRooms;
-                break;
-                
-            default:
-                break;
-        }
+//        NSInteger tabItemTag = self.tabBar.items[self.selectedIndex].tag;
+//
+//        switch (tabItemTag)
+//        {
+//            case TABBAR_HOME_INDEX:
+//                break;
+//            case TABBAR_FAVOURITES_INDEX:
+//                recentsDataSourceDelegate = self.favouritesViewController;
+//                recentsDataSourceMode = RecentsDataSourceModeFavourites;
+//                break;
+//            case TABBAR_PEOPLE_INDEX:
+//                recentsDataSourceDelegate = self.peopleViewController;
+//                recentsDataSourceMode = RecentsDataSourceModePeople;
+//                break;
+//            case TABBAR_ROOMS_INDEX:
+//                recentsDataSourceDelegate = self.roomsViewController;
+//                recentsDataSourceMode = RecentsDataSourceModeRooms;
+//                break;
+//
+//            default:
+//                break;
+//        }
         [recentsDataSource setDelegate:recentsDataSourceDelegate andRecentsDataSourceMode:recentsDataSourceMode];
         
         // Init the recents data source
-        groupsDataSource = [[GroupsDataSource alloc] initWithMatrixSession:mainSession];
-        [groupsDataSource finalizeInitialization];
-        [self.groupsViewController displayList:groupsDataSource];
+//        groupsDataSource = [[GroupsDataSource alloc] initWithMatrixSession:mainSession];
+//        [groupsDataSource finalizeInitialization];
+//        [self.groupsViewController displayList:groupsDataSource];
         
         // Check whether there are others sessions
         NSArray<MXSession*>* mxSessions = self.mxSessions;
@@ -427,8 +428,8 @@ - (void)addMatrixSession:(MXSession *)mxSession
     }
     
     // Check whether the controller'€™s view is loaded into memory.
-    if (self.homeViewController)
-    {
+//    if (self.homeViewController)
+//    {
         // Check whether the data sources have been initialized.
         if (!recentsDataSource)
         {
@@ -448,7 +449,7 @@ - (void)addMatrixSession:(MXSession *)mxSession
             // Add the session to the existing data sources
             [recentsDataSource addMatrixSession:mxSession];
         }
-    }
+//    }
     
     if (!mxSessionArray)
     {
@@ -478,9 +479,9 @@ - (void)removeMatrixSession:(MXSession *)mxSession
         // Remove matrix sessions observer
         [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionStateDidChangeNotification object:nil];
         
-        [self.homeViewController displayList:nil];
-        [self.favouritesViewController displayList:nil];
-        [self.peopleViewController displayList:nil];
+//        [self.homeViewController displayList:nil];
+//        [self.favouritesViewController displayList:nil];
+//        [self.peopleViewController displayList:nil];
         [self.roomsViewController displayList:nil];
         
         [recentsDataSource destroy];
@@ -500,55 +501,55 @@ - (void)onMatrixSessionStateDidChange:(NSNotification *)notif
 // TODO: Manage the onboarding coordinator at the AppCoordinator level
 - (void)presentOnboardingFlow
 {
-    OnboardingCoordinatorBridgePresenterParameters *parameters = [[OnboardingCoordinatorBridgePresenterParameters alloc] init];
-    // Forward parameters if any
-    if (self.authViewControllerRegistrationParameters)
-    {
-        parameters.externalRegistrationParameters = self.authViewControllerRegistrationParameters;
-        self.authViewControllerRegistrationParameters = nil;
-    }
-    if (self.softLogoutCredentials)
-    {
-        parameters.softLogoutCredentials = self.softLogoutCredentials;
-        self.softLogoutCredentials = nil;
-    }
-    
-    MXWeakify(self);
-    OnboardingCoordinatorBridgePresenter *onboardingCoordinatorBridgePresenter = [[OnboardingCoordinatorBridgePresenter alloc] initWith:parameters];
-    onboardingCoordinatorBridgePresenter.completion = ^{
-        MXStrongifyAndReturnIfNil(self);
-        [self.onboardingCoordinatorBridgePresenter dismissWithAnimated:YES completion:nil];
-        self.onboardingCoordinatorBridgePresenter = nil;
-        
-        self.isOnboardingInProgress = NO;   // Must be set before calling didCompleteAuthentication
-        [self.masterTabBarDelegate masterTabBarControllerDidCompleteAuthentication:self];
-    };
-    
-    [onboardingCoordinatorBridgePresenter presentFrom:self animated:NO];
-    
-    self.onboardingCoordinatorBridgePresenter = onboardingCoordinatorBridgePresenter;
-    self.isOnboardingCoordinatorPreparing = NO;
-    
-    self.addAccountObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXKAccountManagerDidAddAccountNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
-        MXStrongifyAndReturnIfNil(self);
-
-        // What was this doing? This should probably happen elsewhere
-        // self.onboardingCoordinatorBridgePresenter = nil;
-        
-        [[NSNotificationCenter defaultCenter] removeObserver:self.addAccountObserver];
-        self.addAccountObserver = nil;
-    }];
-    
-    self.removeAccountObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXKAccountManagerDidRemoveAccountNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
-        MXStrongifyAndReturnIfNil(self);
-        // The user has cleared data for their soft logged out account
-
-        // What was this doing? This should probably happen elsewhere
-        // self.onboardingCoordinatorBridgePresenter = nil;
-        
-        [[NSNotificationCenter defaultCenter] removeObserver:self.removeAccountObserver];
-        self.removeAccountObserver = nil;
-    }];
+//    OnboardingCoordinatorBridgePresenterParameters *parameters = [[OnboardingCoordinatorBridgePresenterParameters alloc] init];
+//    // Forward parameters if any
+//    if (self.authViewControllerRegistrationParameters)
+//    {
+//        parameters.externalRegistrationParameters = self.authViewControllerRegistrationParameters;
+//        self.authViewControllerRegistrationParameters = nil;
+//    }
+//    if (self.softLogoutCredentials)
+//    {
+//        parameters.softLogoutCredentials = self.softLogoutCredentials;
+//        self.softLogoutCredentials = nil;
+//    }
+//    
+//    MXWeakify(self);
+//    OnboardingCoordinatorBridgePresenter *onboardingCoordinatorBridgePresenter = [[OnboardingCoordinatorBridgePresenter alloc] initWith:parameters];
+//    onboardingCoordinatorBridgePresenter.completion = ^{
+//        MXStrongifyAndReturnIfNil(self);
+//        [self.onboardingCoordinatorBridgePresenter dismissWithAnimated:YES completion:nil];
+//        self.onboardingCoordinatorBridgePresenter = nil;
+//        
+//        self.isOnboardingInProgress = NO;   // Must be set before calling didCompleteAuthentication
+//        [self.masterTabBarDelegate masterTabBarControllerDidCompleteAuthentication:self];
+//    };
+//    
+//    [onboardingCoordinatorBridgePresenter presentFrom:self animated:NO];
+//    
+//    self.onboardingCoordinatorBridgePresenter = onboardingCoordinatorBridgePresenter;
+//    self.isOnboardingCoordinatorPreparing = NO;
+//    
+//    self.addAccountObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXKAccountManagerDidAddAccountNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+//        MXStrongifyAndReturnIfNil(self);
+//
+//        // What was this doing? This should probably happen elsewhere
+//        // self.onboardingCoordinatorBridgePresenter = nil;
+//        
+//        [[NSNotificationCenter defaultCenter] removeObserver:self.addAccountObserver];
+//        self.addAccountObserver = nil;
+//    }];
+//    
+//    self.removeAccountObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXKAccountManagerDidRemoveAccountNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+//        MXStrongifyAndReturnIfNil(self);
+//        // The user has cleared data for their soft logged out account
+//
+//        // What was this doing? This should probably happen elsewhere
+//        // self.onboardingCoordinatorBridgePresenter = nil;
+//        
+//        [[NSNotificationCenter defaultCenter] removeObserver:self.removeAccountObserver];
+//        self.removeAccountObserver = nil;
+//    }];
 }
 
 - (void)showOnboardingFlow
@@ -565,7 +566,8 @@ - (void)showOnboardingFlow
         
         [[AppDelegate theDelegate] restoreInitialDisplay:^{
                         
-            [self presentOnboardingFlow];
+//            [self presentOnboardingFlow];
+            [self.masterTabBarDelegate masterTabBarControllerShouldShowAuthenticationFlow:self];
         }];
     }
 }
@@ -577,46 +579,46 @@ - (void)showOnboardingFlow
 
 - (void)showOnboardingFlowWithRegistrationParameters:(NSDictionary *)parameters
 {
-    if (self.onboardingCoordinatorBridgePresenter)
-    {
-        MXLogDebug(@"[MasterTabBarController] Universal link: Forward registration parameter to the existing AuthViewController");
-        [self.onboardingCoordinatorBridgePresenter updateWithExternalRegistrationParameters:parameters];
-    }
-    else
-    {
-        MXLogDebug(@"[MasterTabBarController] Universal link: Prompt to logout current sessions and open AuthViewController to complete the registration");
-        
-        // Keep a ref on the params
-        self.authViewControllerRegistrationParameters = parameters;
-        
-        // Prompt to logout. It will then display AuthViewController if the user is logged out.
-        [[AppDelegate theDelegate] logoutWithConfirmation:YES completion:^(BOOL isLoggedOut) {
-            if (!isLoggedOut)
-            {
-                // Reset temporary params
-                self.authViewControllerRegistrationParameters = nil;
-            }
-        }];
-    }
+//    if (self.onboardingCoordinatorBridgePresenter)
+//    {
+//        MXLogDebug(@"[MasterTabBarController] Universal link: Forward registration parameter to the existing AuthViewController");
+//        [self.onboardingCoordinatorBridgePresenter updateWithExternalRegistrationParameters:parameters];
+//    }
+//    else
+//    {
+//        MXLogDebug(@"[MasterTabBarController] Universal link: Prompt to logout current sessions and open AuthViewController to complete the registration");
+//        
+//        // Keep a ref on the params
+//        self.authViewControllerRegistrationParameters = parameters;
+//        
+//        // Prompt to logout. It will then display AuthViewController if the user is logged out.
+//        [[AppDelegate theDelegate] logoutWithConfirmation:YES completion:^(BOOL isLoggedOut) {
+//            if (!isLoggedOut)
+//            {
+//                // Reset temporary params
+//                self.authViewControllerRegistrationParameters = nil;
+//            }
+//        }];
+//    }
 }
 
 - (void)showSoftLogoutOnboardingFlowWithCredentials:(MXCredentials*)credentials;
 {
     MXLogDebug(@"[MasterTabBarController] showAuthenticationScreenAfterSoftLogout");
 
-    self.softLogoutCredentials = credentials;
-
-    // Check whether an authentication screen is not already shown or preparing
-    if (!self.onboardingCoordinatorBridgePresenter && !self.isOnboardingCoordinatorPreparing)
-    {
-        self.isOnboardingCoordinatorPreparing = YES;
-        self.isOnboardingInProgress = YES;
-
-        [[AppDelegate theDelegate] restoreInitialDisplay:^{
-
-            [self presentOnboardingFlow];
-        }];
-    }
+//    self.softLogoutCredentials = credentials;
+//
+//    // Check whether an authentication screen is not already shown or preparing
+//    if (!self.onboardingCoordinatorBridgePresenter && !self.isOnboardingCoordinatorPreparing)
+//    {
+//        self.isOnboardingCoordinatorPreparing = YES;
+//        self.isOnboardingInProgress = YES;
+//
+//        [[AppDelegate theDelegate] restoreInitialDisplay:^{
+//
+//            [self presentOnboardingFlow];
+//        }];
+//    }
 }
 
 - (void)selectRoomWithParameters:(RoomNavigationParameters*)paramaters completion:(void (^)(void))completion
@@ -775,12 +777,6 @@ - (void)updateSideMenuNotifcationIcon
         {
             displayNotification = notificationState.groupMissedDiscussionsCount > 0 || notificationState.groupMissedDiscussionsHighlightedCount > 0;
         }
-        return NO;
-    }];
-    
-    if (viewControllerIndex != NSNotFound)
-    {
-        foundViewController = self.viewControllers[viewControllerIndex];
     }
     
     [self.masterTabBarDelegate masterTabBarController:self needsSideMenuIconWithNotification:displayNotification];
@@ -998,7 +994,7 @@ - (void)presentVerifyCurrentSessionAlertWithSession:(MXSession*)session
     [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n keyVerificationSelfVerifyCurrentSessionAlertValidateAction]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
-                                                [[AppDelegate theDelegate] presentCompleteSecurityForSession:session];
+//                                                [[AppDelegate theDelegate] presentCompleteSecurityForSession:session];
                                             }]];
     
     [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n later]
@@ -1078,13 +1074,13 @@ - (void)presentReviewUnverifiedSessionsAlertWithSession:(MXSession*)session
 
 - (void)showSettingsSecurityScreenForSession:(MXSession*)session
 {
-    SettingsViewController *settingsViewController = [SettingsViewController instantiate];
-    [settingsViewController loadViewIfNeeded];
-    SecurityViewController *securityViewController = [SecurityViewController instantiateWithMatrixSession:session];
-    
-    [[AppDelegate theDelegate] restoreInitialDisplay:^{
-        self.navigationController.viewControllers = @[self, settingsViewController, securityViewController];
-    }];
+//    SettingsViewController *settingsViewController = [SettingsViewController instantiate];
+//    [settingsViewController loadViewIfNeeded];
+//    SecurityViewController *securityViewController = [SecurityViewController instantiateWithMatrixSession:session];
+//
+//    [[AppDelegate theDelegate] restoreInitialDisplay:^{
+//        self.navigationController.viewControllers = @[self, settingsViewController, securityViewController];
+//    }];
 }
 
 - (void)resetReviewSessionsFlags
@@ -1105,14 +1101,14 @@ - (void)tabBar:(UITabBar *)tabBar didSelectItem:(UITabBarItem *)item
         if (item.tag == TABBAR_ROOMS_INDEX)
         {
             [self.roomsViewController scrollToNextRoomWithMissedNotifications];
-        }
-        else if (item.tag == TABBAR_PEOPLE_INDEX)
-        {
-            [self.peopleViewController scrollToNextRoomWithMissedNotifications];
-        }
-        else if (item.tag == TABBAR_FAVOURITES_INDEX)
-        {
-            [self.favouritesViewController scrollToNextRoomWithMissedNotifications];
+//        }
+//        else if (item.tag == TABBAR_PEOPLE_INDEX)
+//        {
+//            [self.peopleViewController scrollToNextRoomWithMissedNotifications];
+//        }
+//        else if (item.tag == TABBAR_FAVOURITES_INDEX)
+//        {
+//            [self.favouritesViewController scrollToNextRoomWithMissedNotifications];
         }
     }
 }
diff --git a/Riot/Modules/TabBar/TabBarCoordinator.swift b/Riot/Modules/TabBar/TabBarCoordinator.swift
index 30ce90bc08..586d6873f3 100644
--- a/Riot/Modules/TabBar/TabBarCoordinator.swift
+++ b/Riot/Modules/TabBar/TabBarCoordinator.swift
@@ -43,7 +43,7 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
     
     private var currentSpaceId: String?
     
-    private weak var versionCheckCoordinator: VersionCheckCoordinator?
+//    private weak var versionCheckCoordinator: VersionCheckCoordinator?
     
     private var currentMatrixSession: MXSession? {
         return parameters.userSessionsService.mainUserSession?.matrixSession
@@ -106,6 +106,10 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
         }
         
         self.currentSpaceId = spaceId
+        
+        if MXKAccountManager.shared().accounts.isEmpty {
+            self.showWelcome()
+        }
     }
     
     func toPresentable() -> UIViewController {
@@ -135,7 +139,7 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
                 self.masterTabBarController.releaseSelectedItem()
                 
                 // Select home tab
-                self.masterTabBarController.selectTab(at: .home)
+                self.masterTabBarController.selectTab(at: .rooms)
                 
                 completion?()
             }
@@ -172,7 +176,7 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
         } else {
             // Tab bar controller is already visible
             // Select the Home tab
-            masterTabBarController.selectTab(at: .home)
+            masterTabBarController.selectTab(at: .rooms)
             completion?()
         }
     }
@@ -214,66 +218,67 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
         return tabBarController
     }
     
-    private func createVersionCheckCoordinator(withRootViewController rootViewController: UIViewController, bannerPresentrer: BannerPresentationProtocol) -> VersionCheckCoordinator {
-        let versionCheckCoordinator = VersionCheckCoordinator(rootViewController: rootViewController,
-                                                              bannerPresenter: bannerPresentrer,
-                                                              themeService: ThemeService.shared()) 
-        return versionCheckCoordinator
-    }
-    
-    private func createHomeViewController() -> HomeViewControllerWithBannerWrapperViewController {
-        let homeViewController: HomeViewController = HomeViewController.instantiate()
-        homeViewController.tabBarItem.tag = Int(TABBAR_HOME_INDEX)
-        homeViewController.tabBarItem.image = homeViewController.tabBarItem.image
-        homeViewController.accessibilityLabel = VectorL10n.titleHome
-        
-        if BuildSettings.appActivityIndicators {
-            homeViewController.activityPresenter = AppActivityIndicatorPresenter(appNavigator: parameters.appNavigator)
-        }
-        
-        let wrapperViewController = HomeViewControllerWithBannerWrapperViewController(viewController: homeViewController)        
-        return wrapperViewController
-    }
-    
-    private func createFavouritesViewController() -> FavouritesViewController {
-        let favouritesViewController: FavouritesViewController = FavouritesViewController.instantiate()
-        favouritesViewController.tabBarItem.tag = Int(TABBAR_FAVOURITES_INDEX)
-        favouritesViewController.accessibilityLabel = VectorL10n.titleFavourites
-        return favouritesViewController
-    }
-    
-    private func createPeopleViewController() -> PeopleViewController {
-        let peopleViewController: PeopleViewController = PeopleViewController.instantiate()
-        peopleViewController.tabBarItem.tag = Int(TABBAR_PEOPLE_INDEX)
-        peopleViewController.accessibilityLabel = VectorL10n.titlePeople
-        return peopleViewController
-    }
+//    private func createVersionCheckCoordinator(withRootViewController rootViewController: UIViewController, bannerPresentrer: BannerPresentationProtocol) -> VersionCheckCoordinator {
+//        let versionCheckCoordinator = VersionCheckCoordinator(rootViewController: rootViewController,
+//                                                              bannerPresenter: bannerPresentrer,
+//                                                              themeService: ThemeService.shared())
+//        return versionCheckCoordinator
+//    }
+    
+//    private func createHomeViewController() -> HomeViewControllerWithBannerWrapperViewController {
+//        let homeViewController: HomeViewController = HomeViewController.instantiate()
+//        homeViewController.tabBarItem.tag = Int(TABBAR_HOME_INDEX)
+//        homeViewController.tabBarItem.image = homeViewController.tabBarItem.image
+//        homeViewController.accessibilityLabel = VectorL10n.titleHome
+//
+//        if BuildSettings.appActivityIndicators {
+//            homeViewController.activityPresenter = AppActivityIndicatorPresenter(appNavigator: parameters.appNavigator)
+//        }
+//
+//        let wrapperViewController = HomeViewControllerWithBannerWrapperViewController(viewController: homeViewController)
+//        return wrapperViewController
+//    }
+    
+//    private func createFavouritesViewController() -> FavouritesViewController {
+//        let favouritesViewController: FavouritesViewController = FavouritesViewController.instantiate()
+//        favouritesViewController.tabBarItem.tag = Int(TABBAR_FAVOURITES_INDEX)
+//        favouritesViewController.accessibilityLabel = VectorL10n.titleFavourites
+//        return favouritesViewController
+//    }
+
+//    private func createPeopleViewController() -> PeopleViewController {
+//        let peopleViewController: PeopleViewController = PeopleViewController.instantiate()
+//        peopleViewController.tabBarItem.tag = Int(TABBAR_PEOPLE_INDEX)
+//        peopleViewController.accessibilityLabel = VectorL10n.titlePeople
+//        return peopleViewController
+//    }
     
     private func createRoomsViewController() -> RoomsViewController {
         let roomsViewController: RoomsViewController = RoomsViewController.instantiate()
+        roomsViewController.roomsViewDelegate = self
         roomsViewController.tabBarItem.tag = Int(TABBAR_ROOMS_INDEX)
         roomsViewController.accessibilityLabel = VectorL10n.titleRooms
         return roomsViewController
     }
     
-    private func createGroupsViewController() -> GroupsViewController {
-        let groupsViewController: GroupsViewController = GroupsViewController.instantiate()
-        groupsViewController.tabBarItem.tag = Int(TABBAR_GROUPS_INDEX)
-        groupsViewController.accessibilityLabel = VectorL10n.titleGroups
-        return groupsViewController
-    }
-    
-    private func createUnifiedSearchController() -> UnifiedSearchViewController {
-        
-        let viewController: UnifiedSearchViewController = UnifiedSearchViewController.instantiate()
-        viewController.loadViewIfNeeded()
-        
-        for userSession in self.parameters.userSessionsService.userSessions {
-            viewController.addMatrixSession(userSession.matrixSession)
-        }
-        
-        return viewController
-    }
+//    private func createGroupsViewController() -> GroupsViewController {
+//        let groupsViewController: GroupsViewController = GroupsViewController.instantiate()
+//        groupsViewController.tabBarItem.tag = Int(TABBAR_GROUPS_INDEX)
+//        groupsViewController.accessibilityLabel = VectorL10n.titleGroups
+//        return groupsViewController
+//    }
+//
+//    private func createUnifiedSearchController() -> UnifiedSearchViewController {
+//
+//        let viewController: UnifiedSearchViewController = UnifiedSearchViewController.instantiate()
+//        viewController.loadViewIfNeeded()
+//
+//        for userSession in self.parameters.userSessionsService.userSessions {
+//            viewController.addMatrixSession(userSession.matrixSession)
+//        }
+//
+//        return viewController
+//    }
     
     private func createSettingsViewController() -> SettingsViewController {
         let viewController: SettingsViewController = SettingsViewController.instantiate()
@@ -298,31 +303,31 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
     private func updateTabControllers(for tabBarController: MasterTabBarController, showCommunities: Bool) {
         var viewControllers: [UIViewController] = []
           
-        let homeViewController = self.createHomeViewController()
+//        let homeViewController = self.createHomeViewController()
         
-        viewControllers.append(homeViewController)
+//        viewControllers.append(homeViewController)
         
-        if let existingVersionCheckCoordinator = self.versionCheckCoordinator {
-            self.remove(childCoordinator: existingVersionCheckCoordinator)
-        }
+//        if let existingVersionCheckCoordinator = self.versionCheckCoordinator {
+//            self.remove(childCoordinator: existingVersionCheckCoordinator)
+//        }
         
-        if let masterTabBarController = self.masterTabBarController {
-            
-            let versionCheckCoordinator = self.createVersionCheckCoordinator(withRootViewController: masterTabBarController, bannerPresentrer: homeViewController)
-            versionCheckCoordinator.start()
-            self.add(childCoordinator: versionCheckCoordinator)
-            
-            self.versionCheckCoordinator = versionCheckCoordinator
-        }
+//        if let masterTabBarController = self.masterTabBarController {
+//
+//            let versionCheckCoordinator = self.createVersionCheckCoordinator(withRootViewController: masterTabBarController, bannerPresentrer: homeViewController)
+//            versionCheckCoordinator.start()
+//            self.add(childCoordinator: versionCheckCoordinator)
+//
+//            self.versionCheckCoordinator = versionCheckCoordinator
+//        }
         
         if RiotSettings.shared.homeScreenShowFavouritesTab {
-            let favouritesViewController = self.createFavouritesViewController()
-            viewControllers.append(favouritesViewController)
+//            let favouritesViewController = self.createFavouritesViewController()
+//            viewControllers.append(favouritesViewController)
         }
         
         if RiotSettings.shared.homeScreenShowPeopleTab {
-            let peopleViewController = self.createPeopleViewController()
-            viewControllers.append(peopleViewController)
+//            let peopleViewController = self.createPeopleViewController()
+//            viewControllers.append(peopleViewController)
         }
         
         if RiotSettings.shared.homeScreenShowRoomsTab {
@@ -331,8 +336,8 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
         }
         
         if RiotSettings.shared.homeScreenShowCommunitiesTab && !(self.currentMatrixSession?.groups().isEmpty ?? false) && showCommunities {
-            let groupsViewController = self.createGroupsViewController()
-            viewControllers.append(groupsViewController)
+//            let groupsViewController = self.createGroupsViewController()
+//            viewControllers.append(groupsViewController)
         }
         
         tabBarController.updateViewControllers(viewControllers)
@@ -357,34 +362,34 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
     
     // FIXME: Should be displayed per tab.
     private func showUnifiedSearch() {
-        let viewController = self.createUnifiedSearchController()
-        
-        self.navigationRouter.push(viewController, animated: true, popCompletion: nil)
+//        let viewController = self.createUnifiedSearchController()
+//
+//        self.navigationRouter.push(viewController, animated: true, popCompletion: nil)
     }
     
     // FIXME: Should be displayed from a tab.
     private func showContactDetails(with contact: MXKContact, presentationParameters: ScreenPresentationParameters) {
-        
-        let coordinatorParameters = ContactDetailsCoordinatorParameters(contact: contact)
-        let coordinator = ContactDetailsCoordinator(parameters: coordinatorParameters)
-        coordinator.start()
-        self.add(childCoordinator: coordinator)
-        
-        self.showSplitViewDetails(with: coordinator, stackedOnSplitViewDetail: presentationParameters.stackAboveVisibleViews) { [weak self] in
-            self?.remove(childCoordinator: coordinator)
-        }
+//
+//        let coordinatorParameters = ContactDetailsCoordinatorParameters(contact: contact)
+//        let coordinator = ContactDetailsCoordinator(parameters: coordinatorParameters)
+//        coordinator.start()
+//        self.add(childCoordinator: coordinator)
+//
+//        self.showSplitViewDetails(with: coordinator, stackedOnSplitViewDetail: presentationParameters.stackAboveVisibleViews) { [weak self] in
+//            self?.remove(childCoordinator: coordinator)
+//        }
     }
     
     // FIXME: Should be displayed from a tab.
     private func showGroupDetails(with group: MXGroup, for matrixSession: MXSession, presentationParameters: ScreenPresentationParameters) {
-        let coordinatorParameters = GroupDetailsCoordinatorParameters(session: matrixSession, group: group)
-        let coordinator = GroupDetailsCoordinator(parameters: coordinatorParameters)
-        coordinator.start()
-        self.add(childCoordinator: coordinator)
-        
-        self.showSplitViewDetails(with: coordinator, stackedOnSplitViewDetail: presentationParameters.stackAboveVisibleViews) { [weak self] in
-            self?.remove(childCoordinator: coordinator)
-        }
+//        let coordinatorParameters = GroupDetailsCoordinatorParameters(session: matrixSession, group: group)
+//        let coordinator = GroupDetailsCoordinator(parameters: coordinatorParameters)
+//        coordinator.start()
+//        self.add(childCoordinator: coordinator)
+//
+//        self.showSplitViewDetails(with: coordinator, stackedOnSplitViewDetail: presentationParameters.stackAboveVisibleViews) { [weak self] in
+//            self?.remove(childCoordinator: coordinator)
+//        }
     }
     
     private func showRoom(withId roomId: String, eventId: String? = nil) {
@@ -402,18 +407,18 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
             showRoomAndThread(with: roomNavigationParameters,
                               completion: completion)
         } else {
-            let threadId = roomNavigationParameters.threadParameters?.threadId
+//            let threadId = roomNavigationParameters.threadParameters?.threadId
             let displayConfig: RoomDisplayConfiguration
-            if threadId != nil {
-                displayConfig = .forThreads
-            } else {
+//            if threadId != nil {
+//                displayConfig = .forThreads
+//            } else {
                 displayConfig = .default
-            }
+//            }
             let roomCoordinatorParameters = RoomCoordinatorParameters(navigationRouterStore: NavigationRouterStore.shared,
                                                                       session: roomNavigationParameters.mxSession,
                                                                       roomId: roomNavigationParameters.roomId,
                                                                       eventId: roomNavigationParameters.eventId,
-                                                                      threadId: threadId,
+                                                                      threadId: nil, //threadId,
                                                                       displayConfiguration: displayConfig)
             
             self.showRoom(with: roomCoordinatorParameters,
@@ -452,6 +457,25 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
                       completion: completion)
     }
     
+    private func showRoomPreview(with publicRoom: MXPublicRoom) {
+        guard let session = self.currentMatrixSession else { return }
+        
+        let roomPreviewCoordinator = RoomPreviewCoordinator(session: session, publicRoom: publicRoom)
+        self.showRoomPreview(with: roomPreviewCoordinator)
+    }
+    
+    private func showRoomPreview(with coordinator: RoomPreviewCoordinator) {
+        let roomPreviewCoordinator = coordinator
+        roomPreviewCoordinator.start()
+        roomPreviewCoordinator.delegate = self
+        
+        self.add(childCoordinator: roomPreviewCoordinator)
+        
+        self.navigationRouter.push(roomPreviewCoordinator, animated: true) { [weak self] in
+            self?.remove(childCoordinator: roomPreviewCoordinator)
+        }
+    }
+    
     private func showRoom(with parameters: RoomCoordinatorParameters,
                           stackOnSplitViewDetail: Bool = false,
                           completion: (() -> Void)? = nil) {
@@ -512,7 +536,7 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
                                                                     roomId: roomNavigationParameters.roomId,
                                                                     eventId: roomNavigationParameters.eventId,
                                                                     threadId: roomNavigationParameters.threadParameters?.threadId,
-                                                                    displayConfiguration: .forThreads)
+                                                                    displayConfiguration: .default/*.forThreads*/)
 
         dispatchGroup.enter()
         let threadCoordinator = RoomCoordinator(parameters: threadCoordinatorParameters)
@@ -542,6 +566,33 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
         }
     }
     
+    private func showWelcome(animated: Bool = false) {
+        let welcomeCoordinator = WelcomeCoordinator()
+        welcomeCoordinator.delegate = self
+        welcomeCoordinator.start()
+        self.add(childCoordinator: welcomeCoordinator)
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5 , execute: { [weak self] in
+            self?.navigationRouter.present(welcomeCoordinator, animated: animated)
+        })
+    }
+    
+    private func userDidLogin() -> Bool {
+        let success: Bool
+        
+        if self.currentMatrixSession != nil {
+            // Dismiss WelcomeCoordinator
+            self.navigationRouter.dismissModule(animated: true, completion: nil)
+            success = true
+        } else {
+            MXLog.debug("[AppCoordinator] Did not find session for current user")
+            success = false
+            // TODO: Present an error on
+            // coordinator.toPresentable()
+        }
+        
+        return success
+    }
+    
     // MARK: Split view
     
     /// If the split view is collapsed (one column visible) it will push the Presentable on the primary navigation controller, otherwise it will show the Presentable as the secondary view of the split view.
@@ -577,20 +628,20 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
     
     @available(iOS 14.0, *)
     private func presentAnalyticsPrompt(with session: MXSession) {
-        let parameters = AnalyticsPromptCoordinatorParameters(session: session)
-        let coordinator = AnalyticsPromptCoordinator(parameters: parameters)
-        
-        coordinator.completion = { [weak self, weak coordinator] in
-            guard let self = self, let coordinator = coordinator else { return }
-            
-            self.navigationRouter.dismissModule(animated: true, completion: nil)
-            self.remove(childCoordinator: coordinator)
-        }
-        
-        add(childCoordinator: coordinator)
-        
-        navigationRouter.present(coordinator, animated: true)
-        coordinator.start()
+//        let parameters = AnalyticsPromptCoordinatorParameters(session: session)
+//        let coordinator = AnalyticsPromptCoordinator(parameters: parameters)
+//
+//        coordinator.completion = { [weak self, weak coordinator] in
+//            guard let self = self, let coordinator = coordinator else { return }
+//
+//            self.navigationRouter.dismissModule(animated: true, completion: nil)
+//            self.remove(childCoordinator: coordinator)
+//        }
+//
+//        add(childCoordinator: coordinator)
+//
+//        navigationRouter.present(coordinator, animated: true)
+//        coordinator.start()
     }
     
     // MARK: UserSessions management
@@ -612,9 +663,9 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
         
         self.addMatrixSessionToMasterTabBarController(userSession.matrixSession)
         
-        if let matrixSession = self.currentMatrixSession, matrixSession.groups().isEmpty {
-            self.masterTabBarController.removeTab(at: .groups)
-        }
+//        if let matrixSession = self.currentMatrixSession, matrixSession.groups().isEmpty {
+//            self.masterTabBarController.removeTab(at: .groups)
+//        }
     }
     
     @objc private func userSessionsServiceWillRemoveUserSession(_ notification: Notification) {
@@ -642,9 +693,9 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
     }
     
     @objc private func sessionDidSync(_ notification: Notification) {
-        if self.currentMatrixSession?.groups().isEmpty ?? true {
-            self.masterTabBarController.removeTab(at: .groups)
-        }
+//        if self.currentMatrixSession?.groups().isEmpty ?? true {
+//            self.masterTabBarController.removeTab(at: .groups)
+//        }
     }
 }
 
@@ -690,6 +741,10 @@ extension TabBarCoordinator: MasterTabBarControllerDelegate {
             presentAnalyticsPrompt(with: matrixSession)
         }
     }
+    
+    func masterTabBarControllerShouldShowAuthenticationFlow(_ masterTabBarController: MasterTabBarController!) {
+        self.showWelcome(animated: true)
+    }
 }
 
 // MARK: - RoomCoordinatorDelegate
@@ -737,3 +792,129 @@ extension TabBarCoordinator: UIGestureRecognizerDelegate {
         }
     }
 }
+
+// MARK: - WelcomeCoordinatorDelegate
+extension TabBarCoordinator: WelcomeCoordinatorDelegate {
+    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType) {
+        // Check that the new account actually exists before removing the current coordinator
+        if userDidLogin() {
+            self.remove(childCoordinator: coordinator)
+        }
+    }
+}
+
+// MARK: - RoomsViewControllerDelegate
+extension TabBarCoordinator: RoomsViewControllerDelegate {
+    func roomsViewControllerDidTapStartChatButton(_ roomsViewController: RoomsViewController) {
+        guard let session = self.currentMatrixSession else { return }
+        
+        let createNewDiscussionCoordinator = CreateNewDiscussionCoordinator(session: session)
+        createNewDiscussionCoordinator.delegate = self
+        createNewDiscussionCoordinator.start()
+        
+        self.navigationRouter.present(createNewDiscussionCoordinator, animated: true)
+        
+        self.add(childCoordinator: createNewDiscussionCoordinator)
+    }
+    
+    func roomsViewControllerDidTapCreateRoomButton(_ roomsViewController: RoomsViewController) {
+        guard let session = self.currentMatrixSession else { return }
+        
+        let roomCreationCoordinator = RoomCreationCoordinator(session: session)
+        roomCreationCoordinator.delegate = self
+        roomCreationCoordinator.start()
+        
+        self.navigationRouter.present(roomCreationCoordinator, animated: true)
+        
+        self.add(childCoordinator: roomCreationCoordinator)
+    }
+    
+    func roomsViewControllerDidTapPublicRoomsAccessButton(_ roomsViewController: RoomsViewController) {
+        guard let session = self.currentMatrixSession else { return }
+        
+        let publicRoomServers = BuildSettings.publicRoomsDirectoryServers
+        let publicRoomService = PublicRoomService(homeServersStringURL: publicRoomServers,
+                                                  session: session)
+        let dataSource = PublicRoomsDataSource(session: session,
+                                               publicRoomService: publicRoomService)
+        let publicRoomsViewController = PublicRoomsViewController.instantiate(dataSource: dataSource)
+        publicRoomsViewController.delegate = self
+        let router = NavigationRouter(navigationController: RiotNavigationController())
+        router.setRootModule(publicRoomsViewController.toPresentable())
+        self.navigationRouter.present(router, animated: true)
+    }
+}
+
+// MARK: - CreateNewDiscussionCoordinatorDelegate
+extension TabBarCoordinator: CreateNewDiscussionCoordinatorDelegate {
+    func createNewDiscussionCoordinator(_ coordinator: CreateNewDiscussionCoordinatorType,
+                                        didSelectUserID userID: String) {
+        self.navigationRouter.dismissModule(animated: true) { [weak self] in
+            self?.startDiscussion(with: userID)
+            self?.remove(childCoordinator: coordinator)
+        }
+    }
+    
+    func createNewDiscussionCoordinatorDidCancel(_ coordinator: CreateNewDiscussionCoordinatorType) {
+        self.navigationRouter.dismissModule(animated: true) { [weak self] in
+            self?.remove(childCoordinator: coordinator)
+        }
+    }
+    
+    // Prepare a new discussion with a user without associated room
+    private func startDiscussion(with userID: String) {
+        AppDelegate.theDelegate().startDirectChat(withUserId: userID, completion: nil)
+    }
+}
+
+// MARK: - PublicRoomsViewControllerDelegate
+extension TabBarCoordinator: PublicRoomsViewControllerDelegate {
+    func publicRoomsViewController(_ publicRoomsViewController: PublicRoomsViewController,
+                                   didSelect publicRoom: MXPublicRoom) {
+        publicRoomsViewController.navigationController?.dismiss(animated: true,
+                                                                completion: { [weak self] in
+            guard let roomID = publicRoom.roomId else {
+                return
+            }
+            
+            if let room: MXRoom = self?.currentMatrixSession?.room(withRoomId: roomID),
+               room.summary.membership == .join {
+                self?.showRoom(withId: roomID)
+            } else {
+                // Try to preview the unknown room.
+                self?.showRoomPreview(with: publicRoom)
+            }
+        })
+    }
+}
+
+// MARK: - RoomCreationCoordinatorDelegate
+extension TabBarCoordinator: RoomCreationCoordinatorDelegate {
+    func roomCreationCoordinatorDidCancel(_ coordinator: RoomCreationCoordinatorType) {
+        self.navigationRouter.dismissModule(animated: true) { [weak self] in
+            self?.remove(childCoordinator: coordinator)
+        }
+    }
+    
+    func roomCreationCoordinator(_ coordinator: RoomCreationCoordinatorType,
+                                 didCreateRoomWithID roomID: String) {
+        self.navigationRouter.dismissModule(animated: true) { [weak self] in
+            self?.remove(childCoordinator: coordinator)
+            self?.showRoom(withId: roomID)
+        }
+    }
+}
+
+// MARK: - RoomPreviewCoordinatorDelegate
+extension TabBarCoordinator: RoomPreviewCoordinatorDelegate {
+    func roomPreviewCoordinatorDidCancel(_ coordinator: RoomPreviewCoordinatorType) {
+        self.navigationRouter.popModule(animated: true)
+    }
+    
+    func roomPreviewCoordinator(_ coordinator: RoomPreviewCoordinatorType,
+                                didJoinRoomWithId roomID: String,
+                                onEventId eventId: String?) {
+        self.navigationRouter.popModule(animated: true)
+        self.showRoom(withId: roomID, eventId: eventId)
+    }
+}
diff --git a/RiotNSE/BuildSettings.swift b/RiotNSE/BuildSettings.swift
index 39730c3535..22f5ed1c03 100644
--- a/RiotNSE/BuildSettings.swift
+++ b/RiotNSE/BuildSettings.swift
@@ -245,10 +245,10 @@ final class BuildSettings: NSObject {
     
     // MARK: - Main Tabs
     
-    static let homeScreenShowFavouritesTab: Bool = true
-    static let homeScreenShowPeopleTab: Bool = true
+    static let homeScreenShowFavouritesTab: Bool = false
+    static let homeScreenShowPeopleTab: Bool = false
     static let homeScreenShowRoomsTab: Bool = true
-    static let homeScreenShowCommunitiesTab: Bool = true
+    static let homeScreenShowCommunitiesTab: Bool = false
 
     // MARK: - General Settings Screen
     
diff --git a/RiotShareExtension/BuildSettings.swift b/RiotShareExtension/BuildSettings.swift
index 39730c3535..22f5ed1c03 100644
--- a/RiotShareExtension/BuildSettings.swift
+++ b/RiotShareExtension/BuildSettings.swift
@@ -245,10 +245,10 @@ final class BuildSettings: NSObject {
     
     // MARK: - Main Tabs
     
-    static let homeScreenShowFavouritesTab: Bool = true
-    static let homeScreenShowPeopleTab: Bool = true
+    static let homeScreenShowFavouritesTab: Bool = false
+    static let homeScreenShowPeopleTab: Bool = false
     static let homeScreenShowRoomsTab: Bool = true
-    static let homeScreenShowCommunitiesTab: Bool = true
+    static let homeScreenShowCommunitiesTab: Bool = false
 
     // MARK: - General Settings Screen
     
diff --git a/Tchap/Config/BuildSettings.swift b/Tchap/Config/BuildSettings.swift
index 39730c3535..22f5ed1c03 100644
--- a/Tchap/Config/BuildSettings.swift
+++ b/Tchap/Config/BuildSettings.swift
@@ -245,10 +245,10 @@ final class BuildSettings: NSObject {
     
     // MARK: - Main Tabs
     
-    static let homeScreenShowFavouritesTab: Bool = true
-    static let homeScreenShowPeopleTab: Bool = true
+    static let homeScreenShowFavouritesTab: Bool = false
+    static let homeScreenShowPeopleTab: Bool = false
     static let homeScreenShowRoomsTab: Bool = true
-    static let homeScreenShowCommunitiesTab: Bool = true
+    static let homeScreenShowCommunitiesTab: Bool = false
 
     // MARK: - General Settings Screen
     
diff --git a/Tchap/Generated/Images_Riot.swift b/Tchap/Generated/Images_Riot.swift
index edf3c0c650..bb68df105d 100644
--- a/Tchap/Generated/Images_Riot.swift
+++ b/Tchap/Generated/Images_Riot.swift
@@ -215,6 +215,7 @@ internal class Asset: NSObject {
     internal static let sideMenuActionIconSettings = ImageAsset(name: "side_menu_action_icon_settings")
     internal static let sideMenuActionIconShare = ImageAsset(name: "side_menu_action_icon_share")
     internal static let sideMenuIcon = ImageAsset(name: "side_menu_icon")
+    internal static let sideMenuNotifIcon = ImageAsset(name: "side_menu_notif_icon")
     internal static let featureUnavaibleArtwork = ImageAsset(name: "feature_unavaible_artwork")
     internal static let featureUnavaibleArtworkDark = ImageAsset(name: "feature_unavaible_artwork_dark")
     internal static let spacePrivateIcon = ImageAsset(name: "space_private_icon")
diff --git a/Tchap/Generated/Storyboards_Riot.swift b/Tchap/Generated/Storyboards_Riot.swift
index dc8e3c436c..119c812347 100644
--- a/Tchap/Generated/Storyboards_Riot.swift
+++ b/Tchap/Generated/Storyboards_Riot.swift
@@ -162,6 +162,18 @@ internal extension StoryboardScene {
 
     internal static let initialScene = InitialSceneType<Tchap.ServiceTermsModalScreenViewController>(storyboard: ServiceTermsModalScreenViewController.self)
   }
+  enum ShowDirectoryViewController: StoryboardType {
+    internal static let storyboardName = "ShowDirectoryViewController"
+
+    internal static let initialScene = InitialSceneType<Tchap.ShowDirectoryViewController>(storyboard: ShowDirectoryViewController.self)
+
+    internal static let searchableDirectoryViewController = SceneType<Tchap.ShowDirectoryViewController>(storyboard: ShowDirectoryViewController.self, identifier: "SearchableDirectoryViewController")
+  }
+  enum SideMenuViewController: StoryboardType {
+    internal static let storyboardName = "SideMenuViewController"
+
+    internal static let initialScene = InitialSceneType<Tchap.SideMenuViewController>(storyboard: SideMenuViewController.self)
+  }
   enum UserVerificationSessionStatusViewController: StoryboardType {
     internal static let storyboardName = "UserVerificationSessionStatusViewController"
 
diff --git a/Tchap/Modules/Authentication/AuthenticationCoordinator.swift b/Tchap/Modules/Authentication/AuthenticationCoordinator.swift
index 52b67dafcd..fefa82cf02 100755
--- a/Tchap/Modules/Authentication/AuthenticationCoordinator.swift
+++ b/Tchap/Modules/Authentication/AuthenticationCoordinator.swift
@@ -65,11 +65,11 @@ final class AuthenticationCoordinator: AuthenticationCoordinatorType {
     // MARK: - Private methods
     
     private func registerLoginNotification() {
-        NotificationCenter.default.addObserver(self, selector: #selector(userDidLogin), name: NSNotification.Name.legacyAppDelegateDidLogin, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(userDidLogin), name: UserSessionsService.didAddUserSession, object: nil)
     }
     
     private func unregisterLoginNotification() {
-        NotificationCenter.default.removeObserver(self, name: NSNotification.Name.legacyAppDelegateDidLogin, object: nil)
+        NotificationCenter.default.removeObserver(self, name: UserSessionsService.didAddUserSession, object: nil)
     }
     
     @objc private func userDidLogin() {
diff --git a/Tchap/Modules/Home/HomeCoordinator.swift b/Tchap/Modules/Home/HomeCoordinator.swift
index 3beb52281b..a590d6ce34 100644
--- a/Tchap/Modules/Home/HomeCoordinator.swift
+++ b/Tchap/Modules/Home/HomeCoordinator.swift
@@ -34,7 +34,7 @@ final class HomeCoordinator: NSObject, HomeCoordinatorType {
     private let identityServer: String
     
     private weak var homeViewController: HomeViewController?
-    private weak var roomsCoordinator: RoomsCoordinatorType?
+//    private weak var roomsCoordinator: RoomsCoordinatorType?
     private weak var contactsCoordinator: ContactsCoordinatorType?
     
     private let activityIndicatorPresenter: ActivityIndicatorPresenterType
@@ -67,17 +67,17 @@ final class HomeCoordinator: NSObject, HomeCoordinatorType {
     // MARK: - Public methods
     
     func start() {
-        let roomsCoordinator = RoomsCoordinator(router: self.navigationRouter, session: self.session)
+//        let roomsCoordinator = RoomsCoordinator(router: self.navigationRouter, session: self.session)
         let contactsCoordinator = ContactsCoordinator(router: self.navigationRouter, session: self.session)
         
-        roomsCoordinator.delegate = self
+//        roomsCoordinator.delegate = self
         contactsCoordinator.delegate = self
         
-        self.add(childCoordinator: roomsCoordinator)
+//        self.add(childCoordinator: roomsCoordinator)
         self.add(childCoordinator: contactsCoordinator)
         
-        let viewControllers = [roomsCoordinator.toPresentable(), contactsCoordinator.toPresentable()]
-        let viewControllersTitles = [TchapL10n.conversationsTabTitle, TchapL10n.contactsTabTitle]
+        let viewControllers = [/*roomsCoordinator.toPresentable(),*/ contactsCoordinator.toPresentable()]
+        let viewControllersTitles = [/*TchapL10n.conversationsTabTitle, */ TchapL10n.contactsTabTitle]
         
         let globalSearchBar = GlobalSearchBar.instantiate()
         globalSearchBar.delegate = self
@@ -88,10 +88,10 @@ final class HomeCoordinator: NSObject, HomeCoordinatorType {
         
         self.navigationRouter.setRootModule(segmentedViewController)
         
-        roomsCoordinator.start()
+//        roomsCoordinator.start()
         contactsCoordinator.start()
         
-        self.roomsCoordinator = roomsCoordinator
+//        self.roomsCoordinator = roomsCoordinator
         self.contactsCoordinator = contactsCoordinator
         self.homeViewController = segmentedViewController
         self.errorPresenter = AlertErrorPresenter(viewControllerPresenter: segmentedViewController)
@@ -102,7 +102,7 @@ final class HomeCoordinator: NSObject, HomeCoordinatorType {
     }
     
     func showRoom(with roomID: String, onEventID eventID: String? = nil) {
-        AppDelegate.theDelegate().removeDeliveredNotifications(withRoomId: roomID, completion: nil)
+//        AppDelegate.theDelegate().removeDeliveredNotifications(withRoomId: roomID, completion: nil)
         
         self.navigationRouter.popToRootModule(animated: false)
         
@@ -179,7 +179,7 @@ final class HomeCoordinator: NSObject, HomeCoordinatorType {
     
     func scrollToRoom(with roomID: String, animated: Bool) {
         self.homeViewController?.setSelectedTabIndex(0)
-        self.roomsCoordinator?.scrollToRoom(with: roomID, animated: animated)
+//        self.roomsCoordinator?.scrollToRoom(with: roomID, animated: animated)
     }
     
     func overrideContactManagerUsersDiscovery(_ isOverridden: Bool) {
@@ -381,17 +381,17 @@ extension HomeCoordinator: SettingsCoordinatorDelegate {
 // MARK: - GlobalSearchBarDelegate
 extension HomeCoordinator: GlobalSearchBarDelegate {
     func globalSearchBar(_ globalSearchBar: GlobalSearchBar, textDidChange searchText: String?) {
-        self.roomsCoordinator?.updateSearchText(searchText)
+//        self.roomsCoordinator?.updateSearchText(searchText)
         self.contactsCoordinator?.updateSearchText(searchText)
     }
 }
 
 // MARK: - RoomsCoordinatorDelegate
-extension HomeCoordinator: RoomsCoordinatorDelegate {
-    func roomsCoordinator(_ coordinator: RoomsCoordinatorType, didSelectRoomID roomID: String) {
-        self.showRoom(with: roomID)
-    }
-}
+//extension HomeCoordinator: RoomsCoordinatorDelegate {
+//    func roomsCoordinator(_ coordinator: RoomsCoordinatorType, didSelectRoomID roomID: String) {
+//        self.showRoom(with: roomID)
+//    }
+//}
 
 // MARK: - ContactsCoordinatorDelegate
 extension HomeCoordinator: ContactsCoordinatorDelegate {
diff --git a/Tchap/Modules/Registration/RegistrationCoordinator.swift b/Tchap/Modules/Registration/RegistrationCoordinator.swift
index ff1c9e9a5a..4898a0e229 100644
--- a/Tchap/Modules/Registration/RegistrationCoordinator.swift
+++ b/Tchap/Modules/Registration/RegistrationCoordinator.swift
@@ -205,11 +205,11 @@ final class RegistrationCoordinator: RegistrationCoordinatorType {
     }
     
     private func registerLoginNotification() {
-        NotificationCenter.default.addObserver(self, selector: #selector(userDidLogin), name: NSNotification.Name.legacyAppDelegateDidLogin, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(userDidLogin), name: UserSessionsService.didAddUserSession, object: nil)
     }
     
     private func unregisterLoginNotification() {
-        NotificationCenter.default.removeObserver(self, name: NSNotification.Name.legacyAppDelegateDidLogin, object: nil)
+        NotificationCenter.default.removeObserver(self, name: UserSessionsService.didAddUserSession, object: nil)
     }
     
     @objc private func userDidLogin() {
diff --git a/Tchap/Modules/Rooms/Views/RoomsDiscussionCell.swift b/Tchap/Modules/Rooms/Views/RoomsDiscussionCell.swift
index 5839e67a97..8bf06f5fe4 100644
--- a/Tchap/Modules/Rooms/Views/RoomsDiscussionCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsDiscussionCell.swift
@@ -40,4 +40,11 @@ import UIKit
         super.update(theme: theme)
         self.domainLabel.textColor = theme.textTertiaryColor
     }
+    
+    // swiftlint:disable force_cast
+    func renderedCellData() -> MXKCellData! {
+        return (roomCellData as! MXKCellData)
+    }
+    // swiftlint:enable force_cast
+
 }
diff --git a/Tchap/Modules/Rooms/Views/RoomsInviteCell.swift b/Tchap/Modules/Rooms/Views/RoomsInviteCell.swift
index 82e71a3c17..8e7998fb96 100644
--- a/Tchap/Modules/Rooms/Views/RoomsInviteCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsInviteCell.swift
@@ -83,19 +83,28 @@ import UIKit
         self.rightButton.setTitleColor(theme.headerBackgroundColor, for: .normal)
     }
     
+    override class func height(for cellData: MXKCellData!, withMaximumWidth maxWidth: CGFloat) -> CGFloat {
+        // The RoomsInviteCell instances support the self-sizing mode, return a default value
+        return 105.0
+    }
+    
     @IBAction private func onLeftPressed(_ sender: Any) {
-        if let delegate = self.delegate,
-           let roomSummary = self.roomCellData?.roomSummary as? MXRoomSummary,
-           let room = roomSummary.room {
-            delegate.cell(self, didRecognizeAction: RoomsInviteCell.actionJoinInvite, userInfo: [RoomsInviteCell.keyRoom: room])
-        }
+        guard let roomId = self.roomCellData?.roomIdentifier,
+              let room = self.roomCellData?.mxSession.room(withRoomId: roomId) else {
+                  return
+              }
+        self.delegate?.cell(self,
+                            didRecognizeAction: RoomsInviteCell.actionJoinInvite,
+                            userInfo: [RoomsInviteCell.keyRoom: room])
     }
     
     @IBAction private func onRightPressed(_ sender: Any) {
-        if let delegate = self.delegate,
-           let roomSummary = self.roomCellData?.roomSummary as? MXRoomSummary,
-           let room = roomSummary.room {
-            delegate.cell(self, didRecognizeAction: RoomsInviteCell.actionDeclineInvite, userInfo: [RoomsInviteCell.keyRoom: room])
-        }
+        guard let roomId = self.roomCellData?.roomIdentifier,
+              let room = self.roomCellData?.mxSession.room(withRoomId: roomId) else {
+                  return
+              }
+        self.delegate?.cell(self,
+                            didRecognizeAction: RoomsInviteCell.actionDeclineInvite,
+                            userInfo: [RoomsInviteCell.keyRoom: room])
     }
 }
diff --git a/Tchap/Modules/Rooms/Views/RoomsInviteCell.xib b/Tchap/Modules/Rooms/Views/RoomsInviteCell.xib
index 97a558db06..21b6f53b92 100644
--- a/Tchap/Modules/Rooms/Views/RoomsInviteCell.xib
+++ b/Tchap/Modules/Rooms/Views/RoomsInviteCell.xib
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <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"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="158" id="KGk-i7-Jjw" customClass="RoomsInviteCell" customModule="Tchap" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="158" id="KGk-i7-Jjw" customClass="RoomsInviteCell" customModule="Btchap" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="600" height="105"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@@ -96,7 +96,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="17" translatesAutoresizingMaskIntoConstraints="NO" id="vay-Su-Xj1">
                                         <rect key="frame" x="0.0" y="10" width="527" height="40"/>
                                         <subviews>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ED4-kj-Ive" userLabel="Left Button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ED4-kj-Ive" userLabel="Left Button">
                                                 <rect key="frame" x="0.0" y="0.0" width="255" height="40"/>
                                                 <color key="backgroundColor" red="0.028153735480000001" green="0.82494870580000002" blue="0.051896891280000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <accessibility key="accessibilityConfiguration" identifier="LeftButton"/>
@@ -108,7 +108,7 @@
                                                     <action selector="onLeftPressed:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="oKr-Ky-KjG"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oXu-g8-56f" userLabel="Right Button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oXu-g8-56f" userLabel="Right Button">
                                                 <rect key="frame" x="272" y="0.0" width="255" height="40"/>
                                                 <color key="backgroundColor" red="0.028153735480000001" green="0.82494870580000002" blue="0.051896891280000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <accessibility key="accessibilityConfiguration" identifier="RightButton"/>
@@ -126,7 +126,7 @@
                                         </constraints>
                                     </stackView>
                                 </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstItem="vay-Su-Xj1" firstAttribute="top" secondItem="rK0-2B-8Fu" secondAttribute="top" constant="10" id="3wM-XN-mPQ"/>
                                     <constraint firstAttribute="bottom" secondItem="vay-Su-Xj1" secondAttribute="bottom" id="NmI-o3-Fnp"/>
diff --git a/Tchap/Modules/Rooms/Views/RoomsRoomCell.swift b/Tchap/Modules/Rooms/Views/RoomsRoomCell.swift
index 7584d0b115..26a68a9177 100644
--- a/Tchap/Modules/Rooms/Views/RoomsRoomCell.swift
+++ b/Tchap/Modules/Rooms/Views/RoomsRoomCell.swift
@@ -110,4 +110,10 @@ class RoomsRoomCell: RoomsCell {
         
         self.avatarView.tc_makeHexagon(borderWidth: avatarBorderWidth, borderColor: avatarBorderColor)
     }
+    
+    // swiftlint:disable force_cast
+    func renderedCellData() -> MXKCellData! {
+        return (roomCellData as! MXKCellData)
+    }
+    // swiftlint:enable force_cast
 }
diff --git a/Tchap/Modules/SplitView/SplitViewCoordinator.swift b/Tchap/Modules/SplitView/SplitViewCoordinator.swift
deleted file mode 100644
index 6dd487ed56..0000000000
--- a/Tchap/Modules/SplitView/SplitViewCoordinator.swift
+++ /dev/null
@@ -1,66 +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
-
-final class SplitViewCoordinator: SplitViewCoordinatorType {
-    
-    // MARK: - Properties
-    
-    // MARK: Private
-    
-    private let rootRouter: RootRouterType
-    private let session: MXSession
-    
-    private let splitViewController: UISplitViewController
-    
-    // MARK: Public
-    
-    var childCoordinators: [Coordinator] = []
-    
-    // MARK: - Setup
-    
-    init(router: RootRouterType, session: MXSession) {
-        self.rootRouter = router
-        self.session = session
-        self.splitViewController = UISplitViewController()
-    }
-    
-    // MARK: - Public methods
-    
-    func start() {
-        let homeCoordinator = HomeCoordinator(session: self.session)
-        
-        self.splitViewController.viewControllers = [homeCoordinator.toPresentable()]
-        self.splitViewController.preferredDisplayMode = .allVisible
-        
-        homeCoordinator.start()
-        
-        self.rootRouter.setRootModule(self.splitViewController)
-        
-        self.add(childCoordinator: homeCoordinator)
-    }        
-    
-    func toPresentable() -> UIViewController {
-        return self.splitViewController
-    }
-}
-
-// MARK: - UISplitViewControllerDelegate
-extension SplitViewCoordinator: UISplitViewControllerDelegate {
-    
-    // TODO: Implement UISplitViewControllerDelegate methods
-}
diff --git a/Tchap/Modules/Welcome/WelcomeCoordinator.swift b/Tchap/Modules/Welcome/WelcomeCoordinator.swift
index cefabba50b..0578e4fb46 100644
--- a/Tchap/Modules/Welcome/WelcomeCoordinator.swift
+++ b/Tchap/Modules/Welcome/WelcomeCoordinator.swift
@@ -26,7 +26,6 @@ final class WelcomeCoordinator: WelcomeCoordinatorType {
     
     // MARK: Private
     
-    private let rootRouter: RootRouterType
     private let navigationRouter: NavigationRouterType
     private let welcomeViewController: WelcomeViewController
     
@@ -38,9 +37,10 @@ final class WelcomeCoordinator: WelcomeCoordinatorType {
     
     // MARK: - Setup
     
-    init(router: RootRouterType) {
-        self.rootRouter = router
-        self.navigationRouter = NavigationRouter(navigationController: RiotNavigationController())
+    init() {
+        let navController = RiotNavigationController()
+        navController.modalPresentationStyle = .fullScreen
+        self.navigationRouter = NavigationRouter(navigationController: navController)
         
         let welcomeViewController = WelcomeViewController.instantiate()
         welcomeViewController.vc_removeBackTitle()
@@ -50,7 +50,6 @@ final class WelcomeCoordinator: WelcomeCoordinatorType {
     // MARK: - Public methods
     
     func start() {
-        self.rootRouter.setRootModule(self.navigationRouter)
         self.navigationRouter.setRootModule(self.welcomeViewController, hideNavigationBar: true, animated: false, popCompletion: nil)
         self.welcomeViewController.delegate = self
     }
diff --git a/Tchap/SupportingFiles/Tchap-Bridging-Header.h b/Tchap/SupportingFiles/Tchap-Bridging-Header.h
index ac52f9b779..105a66800b 100644
--- a/Tchap/SupportingFiles/Tchap-Bridging-Header.h
+++ b/Tchap/SupportingFiles/Tchap-Bridging-Header.h
@@ -15,7 +15,6 @@
 #import "RoomPreviewData.h"
 #import "ContactsViewController.h"
 #import "ContactsDataSource.h"
-#import "RoomsDataSource.h"
 #import "SettingsViewController.h"
 #import "RoomFilesViewController.h"
 #import "RoomSettingsViewController.h"
@@ -52,3 +51,10 @@
 #import "HTMLFormatter.h"
 #import "RoomSelectedStickerBubbleCell.h"
 #import "BuildInfo.h"
+#import "MasterTabBarController.h"
+#import "BugReportViewController.h"
+#import "RiotSplitViewController.h"
+#import "RoomTitleView.h"
+#import "MXKRoomBubbleTableViewCell.h"
+#import "RecentsDataSource.h"
+#import "DirectoryServerPickerViewController.h"
diff --git a/Tchap/target.yml b/Tchap/target.yml
index 9d69df620c..69671e5eab 100644
--- a/Tchap/target.yml
+++ b/Tchap/target.yml
@@ -67,6 +67,8 @@ targets:
     - path: .
       excludes:
         - "Tools"
+        - "Modules/Application"
+        - "Modules/Common/ActivityIndicator"
         - "Modules/Room/EmojiPicker/Data/EmojiMart/EmojiJSONStore.swift"
         - "Modules/Room/Views/Title/RoomTitleView.*"
         - "Modules/Room/RoomCoordinator.swift"
@@ -79,12 +81,15 @@ targets:
         - "Modules/Room/Views/InputToolbar/RoomInputToolbarView.*"
         - "Modules/Room/Views/Preview"
         - "Modules/Room/Views/Title/RoomTitleView.*"
+        - "Modules/Rooms"
         - "Managers/AppVersion/AppVersion.swift"
         - "Managers/UniversalLink"
         - "Routers"
         - "**/*.strings" # Exclude all strings files
+    - path: ../Tchap/Modules/Application/VersionUpdate
     - path: ../Tchap/Generated/Images_Riot.swift
     - path: ../Tchap/Modules/Room/Views/BubbleCells/Antivirus
+    - path: ../Tchap/Modules/Rooms/Views
 
     # Add separately localizable files
     - path: Assets/Localizations/fr.lproj/Tchap.strings
@@ -108,6 +113,7 @@ targets:
     - path: ../Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
     - path: ../Riot/Managers/KeyValueStorage
     - path: ../Riot/Managers/Locale
+    - path: ../Riot/Managers/Logging
     - path: ../Riot/Managers/Room/RoomIdComponents.swift
     - path: ../Riot/Managers/RoomMessageLinkParser/RoomMessageURLParser.swift
     - path: ../Riot/Managers/PasswordStrength
@@ -127,7 +133,7 @@ targets:
     - path: ../Riot/Model/Room/RoomPreviewData.m
     - path: ../Riot/Model/WellKnown
     - path: ../Riot/Modules/Analytics
-    - path: ../Riot/Modules/Application/ScreenNavigation
+    - path: ../Riot/Modules/Application
     - path: ../Riot/Modules/Authentication/SSO
     - path: ../Riot/Modules/Authentication/Views
     - path: ../Riot/Modules/BadgeLabel
@@ -140,6 +146,7 @@ targets:
     - path: ../Riot/Modules/Call/Views/IncomingCallView.h
     - path: ../Riot/Modules/Call/Views/IncomingCallView.m
     - path: ../Riot/Modules/Camera
+    - path: ../Riot/Modules/Common/ActivityIndicator
     - path: ../Riot/Modules/Common/Avatar
     - path: ../Riot/Modules/Common/Buttons
     - path: ../Riot/Modules/Common/Cells
@@ -147,16 +154,14 @@ targets:
     - path: ../Riot/Modules/Common/Models
     - path: ../Riot/Modules/Common/NavigationController/RiotNavigationController.h
     - path: ../Riot/Modules/Common/NavigationController/RiotNavigationController.m
+    - path: ../Riot/Modules/Common/Recents/DataSources
     - path: ../Riot/Modules/Common/Recents/Model/RecentCellData.h
     - path: ../Riot/Modules/Common/Recents/Model/RecentCellData.m
     - path: ../Riot/Modules/Common/Recents/RecentsViewController.h
     - path: ../Riot/Modules/Common/Recents/RecentsViewController.m
     - path: ../Riot/Modules/Common/Recents/Model
+    - path: ../Riot/Modules/Common/Recents/Service
     - path: ../Riot/Modules/Common/Recents/Views
-      excludes:
-        - "RecentTableViewCell.h"
-        - "RecentTableViewCell.m"
-        - "RecentTableViewCell.xib"
     - path: ../Riot/Modules/Common/SectionHeaders
     - path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h
     - path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
@@ -179,8 +184,10 @@ targets:
     - path: ../Riot/Modules/Integrations
     - path: ../Riot/Modules/KeyBackup
     - path: ../Riot/Modules/KeyVerification
+    - path: ../Riot/Modules/LaunchLoading
     - path: ../Riot/Modules/MatrixKit
     - path: ../Riot/Modules/MediaPicker
+    - path: ../Riot/Modules/PublicRoomList
     - path: ../Riot/Modules/QRCode
     - path: ../Riot/Modules/Reauthentication
     - path: ../Riot/Modules/Room
@@ -198,11 +205,15 @@ targets:
         - "Views/Title/Thread"
     - path: ../Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.h
     - path: ../Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.m
+    - path: ../Riot/Modules/Rooms
     - path: ../Riot/Modules/Secrets
     - path: ../Riot/Modules/SecureBackup
     - path: ../Riot/Modules/ServiceTerms
+    - path: ../Riot/Modules/SideMenu
     - path: ../Riot/Modules/SlidingModal
-    - path: ../Riot/Modules/TabBar/MainTitleView.swift
+    - path: ../Riot/Modules/SplitView
+    - path: ../Riot/Modules/TabBar
+    - path: ../Riot/Modules/User/Avatar
     - path: ../Riot/Modules/UserDevices/UsersDevicesViewController.h
     - path: ../Riot/Modules/UserDevices/UsersDevicesViewController.m
     - path: ../Riot/Modules/UserDevices/Views/DeviceTableViewCell.h
@@ -214,6 +225,8 @@ targets:
 
     # Riot SwiftUI
     - path: ../RiotSwiftUI/Modules/Common/Avatar/Model/AvatarProtocol.swift
+    - path: ../RiotSwiftUI/Modules/Common/Logging
+    - path: ../RiotSwiftUI/Modules/Common/Theme
     - path: ../RiotSwiftUI/Modules/Room/NotificationSettings/Model
 
     # Share extension
diff --git a/Tools/SwiftGen/swiftgen-config.yml b/Tools/SwiftGen/swiftgen-config.yml
index af7333ef14..29101f3e3f 100755
--- a/Tools/SwiftGen/swiftgen-config.yml
+++ b/Tools/SwiftGen/swiftgen-config.yml
@@ -15,9 +15,11 @@ ib:
       - Riot/Modules/QRCode
       - Riot/Modules/Reauthentication
       - Riot/Modules/Room
+      - Riot/Modules/Rooms
       - Riot/Modules/Secrets
       - Riot/Modules/SecureBackup
       - Riot/Modules/ServiceTerms
+      - Riot/Modules/SideMenu
       - Riot/Modules/SlidingModal
     outputs:
       - templatePath: Templates/IB/scenes-riot-swift4.stencil
diff --git a/changelog.d/448.change b/changelog.d/448.change
new file mode 100644
index 0000000000..7382d6be9c
--- /dev/null
+++ b/changelog.d/448.change
@@ -0,0 +1 @@
+Update the Tchap architecture with the Element one
diff --git a/changelog.d/460.change b/changelog.d/460.change
new file mode 100644
index 0000000000..2e8ada7959
--- /dev/null
+++ b/changelog.d/460.change
@@ -0,0 +1 @@
+Plug the rooms list to the new rooms fetchers