diff --git a/config/formats.ts b/config/formats.ts
index 434d0fbd25..c9a7ecb9e7 100644
--- a/config/formats.ts
+++ b/config/formats.ts
@@ -1252,14 +1252,18 @@ export const Formats: (FormatsData | {section: string, column?: number})[] = [
 			'Arena Trap', 'Moody', 'Shadow Tag', 'Baton Pass',
 		],
 		restricted: [
-			'Baneful Bunker', 'Block', 'Copycat', 'Detect', 'Destiny Bond', 'Ingrain', 'King\'s Shield', 'Mean Look', 'move:Metronome', 'Obstruct', 'Octolock', 'Nature Power',
-			'Parting Shot', 'Psycho Shift', 'Protect', 'Roar', 'Skill Swap', 'Sleep Talk', 'Spiky Shield', 'Substitute', 'Teleport', 'Whirlwind', 'Wish', 'Yawn',
+			'Baneful Bunker', 'Block', 'Copycat', 'Detect', 'Destiny Bond', 'Disable', 'Encore', 'Ingrain', 'King\'s Shield',
+			'Mean Look', 'move:Metronome', 'Obstruct', 'Octolock', 'Nature Power', 'Parting Shot', 'Psycho Shift', 'Protect',
+			'Roar', 'Skill Swap', 'Sleep Talk', 'Spiky Shield', 'Substitute', 'Teleport', 'Whirlwind', 'Wish', 'Yawn',
 		],
 		onValidateTeam(team, format, teamHas) {
 			const problems = [];
 			for (const trademark in teamHas.trademarks) {
 				if (teamHas.trademarks[trademark] > 1) {
 					problems.push(`You are limited to 1 of each Trademark.`, `(You have ${teamHas.trademarks[trademark]} Pok\u00e9mon with ${trademark} as a Trademark.)`);
+					if (trademark === 'Trick' || trademark === 'Switcheroo') {
+						problems.push(`(Trick and Switcheroo are complex banned as trademarks.)`);
+					}
 				}
 			}
 			return problems;
@@ -1285,7 +1289,13 @@ export const Formats: (FormatsData | {section: string, column?: number})[] = [
 			problems = problems.concat(validator.validateSet(set, teamHas) || []);
 			set.ability = ability.id;
 			if (!teamHas.trademarks) teamHas.trademarks = {};
-			teamHas.trademarks[ability.name] = (teamHas.trademarks[ability.name] || 0) + 1;
+			if (!teamHas.trademarks[ability.name]) teamHas.trademarks[ability.name] = 0;
+			teamHas.trademarks[ability.name] += 1;
+			if ('Switcheroo' in teamHas.trademarks) {
+				teamHas.trademarks['Trick'] = teamHas.trademarks['Switcheroo'];
+			} else if ('Trick' in teamHas.trademarks) {
+				teamHas.trademarks['Switcheroo'] = teamHas.trademarks['Trick'];
+			}
 			return problems.length ? problems : null;
 		},
 		pokemon: {