diff --git a/Riot/Constants/Colors/DarkTheme.swift b/Riot/Constants/Colors/DarkTheme.swift
index 08164c08f..747418af6 100644
--- a/Riot/Constants/Colors/DarkTheme.swift
+++ b/Riot/Constants/Colors/DarkTheme.swift
@@ -51,6 +51,7 @@ final class DarkTheme: NSObject, Theme {
         UIColor(rgb: 0x1E7DDC),
         UIColor(rgb: 0x76DDD7)]
 
+    let statusBarStyle: UIStatusBarStyle = .lightContent
 
     func applyStyle(onNavigationBar navigationBar: UINavigationBar) {
         navigationBar.tintColor = self.baseTextPrimaryColor;
diff --git a/Riot/Constants/Colors/DefaultTheme.swift b/Riot/Constants/Colors/DefaultTheme.swift
index e916917f0..f8e97cc9b 100644
--- a/Riot/Constants/Colors/DefaultTheme.swift
+++ b/Riot/Constants/Colors/DefaultTheme.swift
@@ -51,6 +51,8 @@ final class DefaultTheme: NSObject, Theme {
         UIColor(rgb: 0x1E7DDC),
         UIColor(rgb: 0x76DDD7)]
 
+    let statusBarStyle: UIStatusBarStyle = .lightContent
+
     func applyStyle(onNavigationBar navigationBar: UINavigationBar) {
         navigationBar.tintColor = self.baseTextPrimaryColor;
         navigationBar.titleTextAttributes = [
diff --git a/Riot/Constants/Colors/Theme.swift b/Riot/Constants/Colors/Theme.swift
index cfb6e8c7e..866e8d13e 100644
--- a/Riot/Constants/Colors/Theme.swift
+++ b/Riot/Constants/Colors/Theme.swift
@@ -46,6 +46,8 @@ import UIKit
 
     var avatarColors: [UIColor] { get }
 
+    var statusBarStyle: UIStatusBarStyle { get }
+
     /// Apply the theme on a navigation bar
     ///
     /// - Parameter navigationBar: the navigation bar to customise.
diff --git a/Riot/Constants/RiotDesignValues.h b/Riot/Constants/RiotDesignValues.h
index b242f8662..f7e25c681 100644
--- a/Riot/Constants/RiotDesignValues.h
+++ b/Riot/Constants/RiotDesignValues.h
@@ -59,16 +59,6 @@ extern UIColor *kRiotColorOrange;
 extern NSInteger const kRiotRoomModeratorLevel;
 extern NSInteger const kRiotRoomAdminLevel;
 
-#pragma mark - Riot bar style
-extern UIStatusBarStyle  kRiotDesignStatusBarStyle;
-extern UIColor          *kRiotDesignNavigationBarTintColor;
-extern UIColor          *kRiotDesignNavigationBarBarTintColor;
-extern NSDictionary     *kRiotDesignNavigationBarTitleTextAttributes;
-
-extern UIBarStyle    kRiotDesignSearchBarStyle;
-extern UIColor      *kRiotDesignSearchBarTintColor;
-extern UIColor      *kRiotDesignSearchBarBarTintColor;
-
 extern UIKeyboardAppearance kRiotKeyboard;
 
 /**
diff --git a/Riot/Constants/RiotDesignValues.m b/Riot/Constants/RiotDesignValues.m
index e75f913b3..285f4872f 100644
--- a/Riot/Constants/RiotDesignValues.m
+++ b/Riot/Constants/RiotDesignValues.m
@@ -52,15 +52,6 @@ UIColor *kRiotColorDarkKeyboard;    // TO REMOVE
 NSInteger const kRiotRoomModeratorLevel = 50;
 NSInteger const kRiotRoomAdminLevel = 100;
 
-UIStatusBarStyle  kRiotDesignStatusBarStyle = UIStatusBarStyleDefault;
-UIColor          *kRiotDesignNavigationBarTintColor;
-UIColor          *kRiotDesignNavigationBarBarTintColor;
-NSDictionary     *kRiotDesignNavigationBarTitleTextAttributes;
-
-UIBarStyle kRiotDesignSearchBarStyle = UIBarStyleDefault;
-UIColor *kRiotDesignSearchBarTintColor = nil;
-UIColor *kRiotDesignSearchBarBarTintColor = nil;
-
 UIKeyboardAppearance kRiotKeyboard;
 UIScrollViewIndicatorStyle kRiotScrollBarStyle;
 
@@ -136,9 +127,6 @@ UIScrollViewIndicatorStyle kRiotScrollBarStyle;
         // Set dark theme colors
         kRiotPlaceholderTextColor = [UIColor colorWithWhite:1.0 alpha:0.3];
         kRiotSelectedBgColor = [UIColor blackColor];
-        
-        kRiotDesignStatusBarStyle = UIStatusBarStyleLightContent;
-        kRiotDesignSearchBarStyle = UIBarStyleBlack;
 
         kRiotOverlayColor = [UIColor colorWithWhite:0.3 alpha:0.5];
         kRiotKeyboardColor = kRiotColorDarkKeyboard;
@@ -151,9 +139,6 @@ UIScrollViewIndicatorStyle kRiotScrollBarStyle;
         // Set black theme colors
         kRiotPlaceholderTextColor = [UIColor colorWithWhite:1.0 alpha:0.3];
         kRiotSelectedBgColor = [UIColor blackColor];
-        
-        kRiotDesignStatusBarStyle = UIStatusBarStyleLightContent;
-        kRiotDesignSearchBarStyle = UIBarStyleBlack;
 
         kRiotOverlayColor = [UIColor colorWithWhite:0.3 alpha:0.5];
         kRiotKeyboardColor = kRiotColorDarkKeyboard;
@@ -166,10 +151,6 @@ UIScrollViewIndicatorStyle kRiotScrollBarStyle;
         // Set light theme colors by default.
         kRiotPlaceholderTextColor = nil; // Use default 70% gray color.
         kRiotSelectedBgColor = nil; // Use the default selection color.
-        
-        kRiotDesignStatusBarStyle = UIStatusBarStyleLightContent;
-        
-        kRiotDesignSearchBarStyle = UIBarStyleDefault;
 
         kRiotOverlayColor = [UIColor colorWithWhite:0.7 alpha:0.5];
         kRiotKeyboardColor = kRiotColorLightKeyboard;
@@ -186,15 +167,6 @@ UIScrollViewIndicatorStyle kRiotScrollBarStyle;
     kRiotPrimaryTextColor = theme.textPrimaryColor;
     kRiotSecondaryTextColor = theme.textSecondaryColor;
 
-    kRiotDesignNavigationBarBarTintColor = theme.baseColor;
-    kRiotDesignNavigationBarTintColor = theme.baseTextPrimaryColor;
-    kRiotDesignNavigationBarTitleTextAttributes = @{
-                                                    NSForegroundColorAttributeName: theme.baseTextPrimaryColor
-                                                    };
-
-    kRiotDesignSearchBarBarTintColor = theme.headerBackgroundColor;
-    kRiotDesignSearchBarTintColor = theme.searchTextColor;
-
     kRiotTopicTextColor = theme.baseTextSecondaryColor;
     kRiotAuxiliaryColor = theme.headerTextSecondaryColor;
 
diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m
index a2edaad4a..4ad6865ae 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.m
+++ b/Riot/Modules/Authentication/AuthenticationViewController.m
@@ -185,7 +185,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)viewWillAppear:(BOOL)animated
diff --git a/Riot/Modules/BugReport/BugReportViewController.m b/Riot/Modules/BugReport/BugReportViewController.m
index 5f5a84af0..87bc824bf 100644
--- a/Riot/Modules/BugReport/BugReportViewController.m
+++ b/Riot/Modules/BugReport/BugReportViewController.m
@@ -167,7 +167,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m
index aa341b452..ea1d651bb 100644
--- a/Riot/Modules/Common/Recents/RecentsViewController.m
+++ b/Riot/Modules/Common/Recents/RecentsViewController.m
@@ -180,7 +180,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
index 780742130..5baff1cc9 100644
--- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
+++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
@@ -187,7 +187,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)viewWillAppear:(BOOL)animated
diff --git a/Riot/Modules/Common/WebViewController/WebViewViewController.m b/Riot/Modules/Common/WebViewController/WebViewViewController.m
index fd8184b00..2bf189a44 100644
--- a/Riot/Modules/Common/WebViewController/WebViewViewController.m
+++ b/Riot/Modules/Common/WebViewController/WebViewViewController.m
@@ -61,7 +61,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/Communities/GroupsViewController.m b/Riot/Modules/Communities/GroupsViewController.m
index 4ba5406f3..6529b08cd 100644
--- a/Riot/Modules/Communities/GroupsViewController.m
+++ b/Riot/Modules/Communities/GroupsViewController.m
@@ -137,7 +137,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/Communities/Home/GroupHomeViewController.m b/Riot/Modules/Communities/Home/GroupHomeViewController.m
index c30cb8846..4f1f511a6 100644
--- a/Riot/Modules/Communities/Home/GroupHomeViewController.m
+++ b/Riot/Modules/Communities/Home/GroupHomeViewController.m
@@ -170,7 +170,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (BOOL)prefersStatusBarHidden
diff --git a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
index bedfda86f..31c0fe5fd 100644
--- a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
+++ b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
@@ -172,7 +172,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 // This method is called when the viewcontroller is added or removed from a container view controller.
diff --git a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
index 214678672..68f2578de 100644
--- a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
+++ b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
@@ -146,7 +146,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 // This method is called when the viewcontroller is added or removed from a container view controller.
diff --git a/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m b/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
index 45f24d431..c56b83804 100644
--- a/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
+++ b/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
@@ -21,6 +21,7 @@
 #import "GroupRoomsViewController.h"
 
 #import "AppDelegate.h"
+#import "Riot-Swift.h"
 
 @interface GroupDetailsViewController ()
 {
@@ -121,7 +122,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (BOOL)prefersStatusBarHidden
diff --git a/Riot/Modules/Contacts/ContactsTableViewController.m b/Riot/Modules/Contacts/ContactsTableViewController.m
index 697b30250..babeafeac 100644
--- a/Riot/Modules/Contacts/ContactsTableViewController.m
+++ b/Riot/Modules/Contacts/ContactsTableViewController.m
@@ -120,7 +120,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)didReceiveMemoryWarning
diff --git a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
index c6cda14e9..3bd61c627 100644
--- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
+++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
@@ -251,7 +251,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (BOOL)prefersStatusBarHidden
diff --git a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
index 02ca050b1..ef84b2644 100644
--- a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
@@ -89,7 +89,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
index c8da434ca..db81962cf 100644
--- a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
@@ -96,7 +96,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
index d59633588..870913b56 100644
--- a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
+++ b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
@@ -87,7 +87,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
index 750f92532..585a3906c 100644
--- a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
+++ b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
@@ -121,7 +121,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (BOOL)prefersStatusBarHidden
diff --git a/Riot/Modules/MediaPicker/MediaPickerViewController.m b/Riot/Modules/MediaPicker/MediaPickerViewController.m
index 1df3e6c79..eab761580 100644
--- a/Riot/Modules/MediaPicker/MediaPickerViewController.m
+++ b/Riot/Modules/MediaPicker/MediaPickerViewController.m
@@ -195,7 +195,7 @@ static void *RecordingContext = &RecordingContext;
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (BOOL)prefersStatusBarHidden
diff --git a/Riot/Modules/Room/Files/RoomFilesViewController.m b/Riot/Modules/Room/Files/RoomFilesViewController.m
index f51d94fcf..7f45ba55d 100644
--- a/Riot/Modules/Room/Files/RoomFilesViewController.m
+++ b/Riot/Modules/Room/Files/RoomFilesViewController.m
@@ -126,7 +126,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
index 1ab01ec6a..66e946d59 100644
--- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
+++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
@@ -223,7 +223,7 @@
 
     self.activityIndicator.backgroundColor = kRiotOverlayColor;
     
-    self.memberHeaderView.backgroundColor = kRiotDesignNavigationBarBarTintColor;
+    self.memberHeaderView.backgroundColor = RiotDesignValues.theme.baseColor;
     self.roomMemberNameLabel.textColor = kRiotPrimaryTextColor;
     self.roomMemberStatusLabel.textColor = RiotDesignValues.theme.tintColor;
     
@@ -239,7 +239,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (BOOL)prefersStatusBarHidden
diff --git a/Riot/Modules/Room/Members/RoomParticipantsViewController.m b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
index c13d4ab6b..2ab8a29d9 100644
--- a/Riot/Modules/Room/Members/RoomParticipantsViewController.m
+++ b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
@@ -184,7 +184,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 // This method is called when the viewcontroller is added or removed from a container view controller.
diff --git a/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m b/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m
index 7686bd5cc..1ec666e22 100644
--- a/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m
+++ b/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m
@@ -118,7 +118,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 89715d07a..8caf471e7 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -447,7 +447,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)didReceiveMemoryWarning
diff --git a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
index 8929a9a18..31949524b 100644
--- a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
+++ b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
@@ -90,7 +90,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
index 47cbcd431..636824993 100644
--- a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
+++ b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
@@ -91,7 +91,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/Room/Settings/RoomSettingsViewController.m b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
index 9df65078e..68ea4914d 100644
--- a/Riot/Modules/Room/Settings/RoomSettingsViewController.m
+++ b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
@@ -282,7 +282,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)viewWillAppear:(BOOL)animated
diff --git a/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m b/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
index bf751f1b6..499c08380 100644
--- a/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
+++ b/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
@@ -64,7 +64,7 @@
     [super customizeViewRendering];
 
     // Use same color as navigation bar
-    self.mainHeaderBackground.backgroundColor = kRiotDesignNavigationBarBarTintColor;
+    self.mainHeaderBackground.backgroundColor = RiotDesignValues.theme.baseColor;
 
     
     self.roomTopic.textColor = kRiotTopicTextColor;
diff --git a/Riot/Modules/Room/Views/Title/RoomTitleView.m b/Riot/Modules/Room/Views/Title/RoomTitleView.m
index 40456474e..fbd068589 100644
--- a/Riot/Modules/Room/Views/Title/RoomTitleView.m
+++ b/Riot/Modules/Room/Views/Title/RoomTitleView.m
@@ -138,8 +138,8 @@
     [super customizeViewRendering];
 
     // Use same color as navigation bar
-    self.backgroundColor = kRiotDesignNavigationBarBarTintColor;
-    self.displayNameTextField.textColor = (self.mxRoom.summary.displayname.length ? kRiotDesignNavigationBarTintColor : kRiotSecondaryTextColor);
+    self.backgroundColor = RiotDesignValues.theme.baseColor;
+    self.displayNameTextField.textColor = (self.mxRoom.summary.displayname.length ? RiotDesignValues.theme.baseTextPrimaryColor : kRiotSecondaryTextColor);
 }
 
 - (void)setRoomPreviewData:(RoomPreviewData *)roomPreviewData
@@ -168,7 +168,7 @@
         }
         else
         {
-            self.displayNameTextField.textColor = kRiotDesignNavigationBarTintColor;
+            self.displayNameTextField.textColor = RiotDesignValues.theme.baseTextPrimaryColor;
         }
     }
 }
diff --git a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
index 36a0fdbaf..af2e847d3 100644
--- a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
+++ b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
@@ -136,7 +136,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)viewWillAppear:(BOOL)animated
diff --git a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
index a7db11c09..8617b6c02 100644
--- a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
+++ b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
@@ -109,7 +109,7 @@ static CGFloat const kTextFontSize = 15.0;
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 #pragma mark - Private
diff --git a/Riot/Modules/Settings/Language/LanguagePickerViewController.m b/Riot/Modules/Settings/Language/LanguagePickerViewController.m
index 2e904998f..e92d41ee6 100644
--- a/Riot/Modules/Settings/Language/LanguagePickerViewController.m
+++ b/Riot/Modules/Settings/Language/LanguagePickerViewController.m
@@ -87,7 +87,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m b/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
index add706c81..078b41224 100644
--- a/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
+++ b/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
@@ -91,7 +91,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)viewWillAppear:(BOOL)animated
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index 7a58501b8..2177a21fa 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -350,7 +350,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)(void);
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)didReceiveMemoryWarning
diff --git a/Riot/Modules/StartChat/StartChatViewController.m b/Riot/Modules/StartChat/StartChatViewController.m
index 15864e485..63be60b60 100644
--- a/Riot/Modules/StartChat/StartChatViewController.m
+++ b/Riot/Modules/StartChat/StartChatViewController.m
@@ -163,7 +163,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy
diff --git a/Riot/Modules/TabBar/MasterTabBarController.m b/Riot/Modules/TabBar/MasterTabBarController.m
index 5156c9213..bb81aeaf9 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.m
+++ b/Riot/Modules/TabBar/MasterTabBarController.m
@@ -126,7 +126,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)viewWillAppear:(BOOL)animated
diff --git a/Riot/Modules/UserDevices/UsersDevicesViewController.m b/Riot/Modules/UserDevices/UsersDevicesViewController.m
index 1c8b575cb..7e01d9c44 100644
--- a/Riot/Modules/UserDevices/UsersDevicesViewController.m
+++ b/Riot/Modules/UserDevices/UsersDevicesViewController.m
@@ -98,7 +98,7 @@
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return kRiotDesignStatusBarStyle;
+    return RiotDesignValues.theme.statusBarStyle;
 }
 
 - (void)destroy