diff --git a/Riot/Managers/Theme/Themes/DarkTheme.swift b/Riot/Managers/Theme/Themes/DarkTheme.swift
index 31209c878..df631e905 100644
--- a/Riot/Managers/Theme/Themes/DarkTheme.swift
+++ b/Riot/Managers/Theme/Themes/DarkTheme.swift
@@ -138,14 +138,10 @@ class DarkTheme: NSObject, Theme {
         button.tintColor = self.tintColor
         button.setTitleColor(self.tintColor, for: .normal)
     }
-}
-
-//  MARK: - Theme v2
-
-extension DarkTheme: ThemeV2 {
     
-    var colors: Colors {
+    ///  MARK: - Theme v2
+    
+    lazy var colors: Colors = {
         return DarkColors()
-    }
-    
+    }()
 }
diff --git a/Riot/Managers/Theme/Themes/DefaultTheme.swift b/Riot/Managers/Theme/Themes/DefaultTheme.swift
index 0a64eb653..3014209a7 100644
--- a/Riot/Managers/Theme/Themes/DefaultTheme.swift
+++ b/Riot/Managers/Theme/Themes/DefaultTheme.swift
@@ -145,14 +145,10 @@ class DefaultTheme: NSObject, Theme {
         button.tintColor = self.tintColor
         button.setTitleColor(self.tintColor, for: .normal)
     }
-}
-
-//  MARK: - Theme v2
-
-extension DefaultTheme: ThemeV2 {
     
-    var colors: Colors {
+    ///  MARK: - Theme v2
+    
+    lazy var colors: Colors = {
         return LightColors()
-    }
-    
+    }()
 }