diff --git a/Riot/Modules/MatrixKit/Categories/NSBundle+MatrixKit.m b/Riot/Modules/MatrixKit/Categories/NSBundle+MatrixKit.m
index 599252032..de4ca8c23 100644
--- a/Riot/Modules/MatrixKit/Categories/NSBundle+MatrixKit.m
+++ b/Riot/Modules/MatrixKit/Categories/NSBundle+MatrixKit.m
@@ -16,14 +16,14 @@
 
 #import "NSBundle+MatrixKit.h"
 #import "NSBundle+MXKLanguage.h"
-#import "MXKViewController.h"
+#import "MXKAppSettings.h"
 
 @implementation NSBundle (MatrixKit)
 
 + (NSBundle*)mxk_assetsBundle
 {
     // Get the bundle within MatrixKit
-    NSBundle *bundle = [NSBundle mxk_bundleForClass:[MXKViewController class]];
+    NSBundle *bundle = [NSBundle mxk_bundleForClass:[MXKAppSettings class]];
     NSURL *assetsBundleURL = [bundle URLForResource:@"MatrixKitAssets" withExtension:@"bundle"];
 
     return [NSBundle bundleWithURL:assetsBundleURL];
diff --git a/RiotNSE/target.yml b/RiotNSE/target.yml
index 2fb7d9764..bbf8a6ab3 100644
--- a/RiotNSE/target.yml
+++ b/RiotNSE/target.yml
@@ -63,8 +63,10 @@ targets:
     - path: ../Riot/PropertyWrappers/UserDefaultsBackedPropertyWrapper.swift
     - path: ../Riot/Modules/MatrixKit
       excludes:
-        - "**/MXKAuthenticationRecaptchaWebView.*"
-        - "**/MXKAuthenticationViewController.*"
+        - "Controllers/**"
+        - "Models/*List/**"
+        - "Views/**"
+        
     - path: ../Riot/Modules/Analytics
     - path: ../Riot/Managers/UserSessions
     - path: ../Riot/Managers/AppInfo/
diff --git a/RiotShareExtension/target.yml b/RiotShareExtension/target.yml
index b7412db37..bf2a032f5 100644
--- a/RiotShareExtension/target.yml
+++ b/RiotShareExtension/target.yml
@@ -71,8 +71,8 @@ targets:
       buildPhase: resources
     - path: ../Riot/Modules/MatrixKit
       excludes:
-        - "**/MXKAuthenticationRecaptchaWebView.*"
         - "**/MXKAuthenticationViewController.*"
+        - "Views/Authentication/**"
     - path: ../Riot/Modules/Analytics
     - path: ../Riot/Managers/UserSessions
       excludes:
diff --git a/SiriIntents/target.yml b/SiriIntents/target.yml
index 2cb4c9fbb..ccce66a4a 100644
--- a/SiriIntents/target.yml
+++ b/SiriIntents/target.yml
@@ -52,8 +52,9 @@ targets:
     - path: ../Riot/Managers/Locale/LocaleProvider.swift
     - path: ../Riot/Modules/MatrixKit
       excludes:
-        - "**/MXKAuthenticationRecaptchaWebView.*"
-        - "**/MXKAuthenticationViewController.*"
+        - "Controllers/**"
+        - "Models/*List/**"
+        - "Views/**"
     - path: ../Riot/Modules/Analytics
     - path: ../Riot/Managers/UserSessions
     - path: ../Riot/Managers/AppInfo/