diff --git a/Riot/Modules/Communities/GroupsViewController.h b/Riot/Modules/Communities/GroupsViewController.h
index 46e71adb5..08ab81101 100644
--- a/Riot/Modules/Communities/GroupsViewController.h
+++ b/Riot/Modules/Communities/GroupsViewController.h
@@ -49,4 +49,7 @@
  */
 @property (nonatomic) BOOL enableSearchBar;
 
+
++ (instancetype)instantiate;
+
 @end
diff --git a/Riot/Modules/Communities/GroupsViewController.m b/Riot/Modules/Communities/GroupsViewController.m
index afeea1bd4..f357a783b 100644
--- a/Riot/Modules/Communities/GroupsViewController.m
+++ b/Riot/Modules/Communities/GroupsViewController.m
@@ -46,6 +46,13 @@
 
 @implementation GroupsViewController
 
++ (instancetype)instantiate
+{
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]];
+    GroupsViewController *viewController = [storyboard instantiateViewControllerWithIdentifier:@"GroupsViewController"];
+    return viewController;
+}
+
 - (void)finalizeInit
 {
     [super finalizeInit];
@@ -208,7 +215,7 @@
     }];
     
     [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_groups", @"Vector", nil);
-    [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.theme.tintColor;
+    [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.theme.tintColor;        
 }
 
 - (void)viewWillDisappear:(BOOL)animated
diff --git a/Riot/Modules/Favorites/FavouritesViewController.h b/Riot/Modules/Favorites/FavouritesViewController.h
index 3cc75364f..fc0e35bab 100644
--- a/Riot/Modules/Favorites/FavouritesViewController.h
+++ b/Riot/Modules/Favorites/FavouritesViewController.h
@@ -21,6 +21,8 @@
  */
 @interface FavouritesViewController : RecentsViewController
 
++ (instancetype)instantiate;
+
 /**
  Scroll the next room with missed notifications to the top.
  */
diff --git a/Riot/Modules/Favorites/FavouritesViewController.m b/Riot/Modules/Favorites/FavouritesViewController.m
index 608ed6d47..9e1c447f9 100644
--- a/Riot/Modules/Favorites/FavouritesViewController.m
+++ b/Riot/Modules/Favorites/FavouritesViewController.m
@@ -28,6 +28,13 @@
 
 @implementation FavouritesViewController
 
++ (instancetype)instantiate
+{
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]];
+    FavouritesViewController *viewController = [storyboard instantiateViewControllerWithIdentifier:@"FavouritesViewController"];
+    return viewController;
+}
+
 - (void)finalizeInit
 {
     [super finalizeInit];
diff --git a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.h b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.h
index c4ccca308..3a22f76e4 100644
--- a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.h
+++ b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.h
@@ -25,6 +25,8 @@
  */
 @interface UnifiedSearchViewController : SegmentedViewController <UIGestureRecognizerDelegate, ContactsTableViewControllerDelegate>
 
++ (instancetype)instantiate;
+
 /**
  Open the public rooms directory page.
  It uses the `publicRoomsDirectoryDataSource` managed by the recents view controller data source
diff --git a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
index 38da3703f..e79e9a055 100644
--- a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
@@ -57,6 +57,13 @@
 
 @implementation UnifiedSearchViewController
 
++ (instancetype)instantiate
+{
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]];
+    UnifiedSearchViewController *viewController = [storyboard instantiateViewControllerWithIdentifier:@"UnifiedSearchViewController"];
+    return viewController;
+}
+
 - (void)finalizeInit
 {
     [super finalizeInit];
diff --git a/Riot/Modules/Home/HomeViewController.h b/Riot/Modules/Home/HomeViewController.h
index a397c2598..aa38c289a 100644
--- a/Riot/Modules/Home/HomeViewController.h
+++ b/Riot/Modules/Home/HomeViewController.h
@@ -22,4 +22,6 @@
  */
 @interface HomeViewController : RecentsViewController <UITableViewDataSource, UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout>
 
++ (instancetype)instantiate;
+
 @end
diff --git a/Riot/Modules/Home/HomeViewController.m b/Riot/Modules/Home/HomeViewController.m
index 8a5633156..553f6e6ce 100644
--- a/Riot/Modules/Home/HomeViewController.m
+++ b/Riot/Modules/Home/HomeViewController.m
@@ -50,6 +50,13 @@
 
 @implementation HomeViewController
 
++ (instancetype)instantiate
+{
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]];
+    HomeViewController *viewController = [storyboard instantiateViewControllerWithIdentifier:@"HomeViewController"];
+    return viewController;
+}
+
 - (void)finalizeInit
 {
     [super finalizeInit];
diff --git a/Riot/Modules/People/PeopleViewController.h b/Riot/Modules/People/PeopleViewController.h
index 651df48e3..8cc3607a4 100644
--- a/Riot/Modules/People/PeopleViewController.h
+++ b/Riot/Modules/People/PeopleViewController.h
@@ -22,6 +22,8 @@
  */
 @interface PeopleViewController : RecentsViewController <UITableViewDataSource, MXKDataSourceDelegate>
 
++ (instancetype)instantiate;
+
 /**
  Scroll the next room with missed notifications to the top.
  */
diff --git a/Riot/Modules/People/PeopleViewController.m b/Riot/Modules/People/PeopleViewController.m
index b0df9ab81..5985ce346 100644
--- a/Riot/Modules/People/PeopleViewController.m
+++ b/Riot/Modules/People/PeopleViewController.m
@@ -43,6 +43,13 @@
 
 @implementation PeopleViewController
 
++ (instancetype)instantiate
+{
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]];
+    PeopleViewController *viewController = [storyboard instantiateViewControllerWithIdentifier:@"PeopleViewController"];
+    return viewController;
+}
+
 - (void)finalizeInit
 {
     [super finalizeInit];
diff --git a/Riot/Modules/Rooms/RoomsViewController.h b/Riot/Modules/Rooms/RoomsViewController.h
index cf5f40859..62d4b50fb 100644
--- a/Riot/Modules/Rooms/RoomsViewController.h
+++ b/Riot/Modules/Rooms/RoomsViewController.h
@@ -21,6 +21,8 @@
  */
 @interface RoomsViewController : RecentsViewController
 
++ (instancetype)instantiate;
+
 /**
  Scroll the next room with missed notifications to the top.
  */
diff --git a/Riot/Modules/Rooms/RoomsViewController.m b/Riot/Modules/Rooms/RoomsViewController.m
index fba45798f..a9dc73b5d 100644
--- a/Riot/Modules/Rooms/RoomsViewController.m
+++ b/Riot/Modules/Rooms/RoomsViewController.m
@@ -34,6 +34,13 @@
 
 @implementation RoomsViewController
 
++ (instancetype)instantiate
+{
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]];
+    RoomsViewController *viewController = [storyboard instantiateViewControllerWithIdentifier:@"RoomsViewController"];
+    return viewController;
+}
+
 - (void)finalizeInit
 {
     [super finalizeInit];