diff --git a/src/main.js b/src/main.js
index d4d84520..dc83ad00 100644
--- a/src/main.js
+++ b/src/main.js
@@ -100,7 +100,7 @@ class FrankerFaceZ extends Module {
 FrankerFaceZ.Logger = Logger;
 
 const VER = FrankerFaceZ.version_info = {
-	major: 4, minor: 0, revision: 0, extra: '-rc13.5',
+	major: 4, minor: 0, revision: 0, extra: '-rc13.6',
 	commit: __git_commit__,
 	build: __webpack_hash__,
 	toString: () =>
diff --git a/src/modules/main_menu/index.js b/src/modules/main_menu/index.js
index ff194e1b..23ce2acd 100644
--- a/src/modules/main_menu/index.js
+++ b/src/modules/main_menu/index.js
@@ -10,6 +10,8 @@ import {has, deep_copy} from 'utilities/object';
 
 import Dialog from 'utilities/dialog';
 
+import Mixin from './setting-mixin';
+
 import {parse_path} from 'src/settings';
 
 function format_term(term) {
@@ -30,6 +32,8 @@ export default class MainMenu extends Module {
 
 		this.load_requires = ['vue'];
 
+		this.Mixin = Mixin;
+
 		//this.should_enable = true;
 
 		this._settings_tree = null;
diff --git a/src/sites/twitch-twilight/modules/chat/settings_menu.jsx b/src/sites/twitch-twilight/modules/chat/settings_menu.jsx
index b59476f8..a8af8ec1 100644
--- a/src/sites/twitch-twilight/modules/chat/settings_menu.jsx
+++ b/src/sites/twitch-twilight/modules/chat/settings_menu.jsx
@@ -19,7 +19,7 @@ export default class SettingsMenu extends Module {
 
 		this.SettingsMenu = this.fine.define(
 			'chat-settings',
-			n => n.renderUniversalOptions && n.dismissRaidsTooltip,
+			n => n.renderUniversalOptions && n.onBadgesChanged,
 			Twilight.CHAT_ROUTES
 		);
 	}
diff --git a/src/sites/twitch-twilight/modules/directory/game.gql b/src/sites/twitch-twilight/modules/directory/game.gql
index 2d638123..392acc1e 100644
--- a/src/sites/twitch-twilight/modules/directory/game.gql
+++ b/src/sites/twitch-twilight/modules/directory/game.gql
@@ -1,7 +1,3 @@
-query {
-	__type
-}
-
 fragment directoryPageGameStreamWithTagsEdge on StreamEdge {
 	node {
 		createdAt
diff --git a/src/sites/twitch-twilight/modules/directory/game.jsx b/src/sites/twitch-twilight/modules/directory/game.jsx
index 4d062232..7751fbdc 100644
--- a/src/sites/twitch-twilight/modules/directory/game.jsx
+++ b/src/sites/twitch-twilight/modules/directory/game.jsx
@@ -28,7 +28,15 @@ export default class Game extends SiteModule {
 		);
 
 		this.apollo.registerModifier('DirectoryPage_Game', GAME_QUERY);
-		this.apollo.registerModifier('DirectoryPage_Game', res => this.modifyStreams(res), false);
+		this.apollo.registerModifier('DirectoryPage_Game', res => {
+			setTimeout(() =>
+				this.apollo.ensureQuery(
+					'DirectoryPage_Game',
+					'data.game.streams.edges.0.node.createdAt'
+				), 500);
+
+			this.modifyStreams(res);
+		}, false);
 	}
 
 	modifyStreams(res) { // eslint-disable-line class-methods-use-this
@@ -36,7 +44,7 @@ export default class Game extends SiteModule {
 		if ( ! edges || ! edges.length )
 			return res;
 
-		res.data.game.streams.edges = this.parent.processNodes(edges);
+		res.data.game.streams.edges = this.parent.processNodes(edges, true);
 		return res;
 	}
 
@@ -53,6 +61,12 @@ export default class Game extends SiteModule {
 
 	updateGameHeader(inst) {
 		this.updateButtons(inst);
+
+		this.apollo.ensureQuery(
+			'DirectoryPage_Game',
+			'data.game.streams.edges.0.node.createdAt'
+		);
+
 	}
 
 
diff --git a/src/sites/twitch-twilight/modules/directory/index.jsx b/src/sites/twitch-twilight/modules/directory/index.jsx
index 37f9ea89..0b87fa80 100644
--- a/src/sites/twitch-twilight/modules/directory/index.jsx
+++ b/src/sites/twitch-twilight/modules/directory/index.jsx
@@ -236,7 +236,7 @@ export default class Directory extends SiteModule {
 			return;
 
 		const props = inst.props,
-			game = props.gameTitle || props.playerMetadataGame;
+			game = props.gameTitle || props.playerMetadataGame || (props.trackingProps && props.trackingProps.categoryName);
 
 		container.classList.toggle('ffz-hide-thumbnail', this.settings.provider.get('directory.game.hidden-thumbnails', []).includes(game));