diff --git a/lua/wikis/commons/OpponentDisplay.lua b/lua/wikis/commons/OpponentDisplay.lua
index ac3277d7f37..85a82e8fafd 100644
--- a/lua/wikis/commons/OpponentDisplay.lua
+++ b/lua/wikis/commons/OpponentDisplay.lua
@@ -97,7 +97,6 @@ end
 ---@field showFlag boolean?
 ---@field showLink boolean?
 ---@field showPlayerTeam boolean?
----@field playerClass string?
 ---@field teamStyle teamStyle?
 ---@field dq boolean?
 ---@field note string|number|nil
diff --git a/lua/wikis/commons/Widget/Match/Bracket/Opponent.lua b/lua/wikis/commons/Widget/Match/Bracket/Opponent.lua
index 4b81eb8affa..d68b6e4ef4f 100644
--- a/lua/wikis/commons/Widget/Match/Bracket/Opponent.lua
+++ b/lua/wikis/commons/Widget/Match/Bracket/Opponent.lua
@@ -7,7 +7,8 @@
 
 local Lua = require('Module:Lua')
 
-local OpponentDisplay = Lua.import('Module:OpponentDisplay')
+local Opponent = Lua.import('Module:Opponent/Custom')
+local OpponentDisplay = Lua.import('Module:OpponentDisplay/Custom')
 
 local Component = Lua.import('Module:Widget/Component')
 
@@ -24,7 +25,7 @@ local function BracketOpponent(props)
 		opponent = opponent,
 		overflow = 'ellipsis',
 		showLink = false,
-		showTbd = props.showTbd,
+		showTbd = opponent.type == Opponent.literal or props.showTbd,
 		teamStyle = props.forceShortName and 'short' or 'dynamic',
 	}
 end
diff --git a/lua/wikis/commons/Widget/Match/Bracket/Opponent/Starcraft.lua b/lua/wikis/commons/Widget/Match/Bracket/Opponent/Starcraft.lua
deleted file mode 100644
index 45eb00fdba3..00000000000
--- a/lua/wikis/commons/Widget/Match/Bracket/Opponent/Starcraft.lua
+++ /dev/null
@@ -1,32 +0,0 @@
----
--- @Liquipedia
--- page=Module:Widget/Match/Bracket/Opponent/Starcraft
---
--- Please see https://github.com/Liquipedia/Lua-Modules to contribute
---
-
-local Lua = require('Module:Lua')
-
-local OpponentDisplay = Lua.import('Module:OpponentDisplay/Starcraft')
-
-local Component = Lua.import('Module:Widget/Component')
-
----@class StarcraftBracketOpponentProps: BracketOpponentProps
----@field opponent StarcraftStandardOpponent
-
----@param props StarcraftBracketOpponentProps
----@return Renderable
-local function StarcraftBracketOpponent(props)
-	local opponent = props.opponent
-
-	return OpponentDisplay.BlockOpponent{
-		opponent = opponent,
-		overflow = 'ellipsis',
-		playerClass = 'starcraft-bracket-block-player',
-		showLink = false,
-		showTbd = props.showTbd,
-		teamStyle = props.forceShortName and 'short' or 'dynamic',
-	}
-end
-
-return Component.component(StarcraftBracketOpponent)
diff --git a/lua/wikis/commons/Widget/Match/Bracket/OpponentEntry/Starcraft.lua b/lua/wikis/commons/Widget/Match/Bracket/OpponentEntry/Starcraft.lua
index cd71029c932..2b92e1d43c9 100644
--- a/lua/wikis/commons/Widget/Match/Bracket/OpponentEntry/Starcraft.lua
+++ b/lua/wikis/commons/Widget/Match/Bracket/OpponentEntry/Starcraft.lua
@@ -11,7 +11,6 @@ local Opponent = Lua.import('Module:Opponent/Starcraft')
 
 local Component = Lua.import('Module:Widget/Component')
 local BracketOpponentEntry = Lua.import('Module:Widget/Match/Bracket/OpponentEntry')
-local StarcraftBracketOpponent = Lua.import('Module:Widget/Match/Bracket/Opponent/Starcraft')
 
 ---@class StarcraftBracketOpponentEntryProps: BracketOpponentEntryProps
 ---@field opponent StarcraftStandardOpponent
@@ -20,7 +19,6 @@ local StarcraftBracketOpponent = Lua.import('Module:Widget/Match/Bracket/Opponen
 ---@return VNode
 local function StarcraftBracketOpponentEntry(props)
 	local opponent = props.opponent
-	props.BracketOpponent = StarcraftBracketOpponent
 	props.showFactionBackground = opponent.type == Opponent.solo
 			or opponent.type == Opponent.duo and opponent.isArchon
 	return BracketOpponentEntry(props)
diff --git a/lua/wikis/commons/Widget/PlayerDisplay/Block.lua b/lua/wikis/commons/Widget/PlayerDisplay/Block.lua
index 6230f1731a9..1067cc14b0a 100644
--- a/lua/wikis/commons/Widget/PlayerDisplay/Block.lua
+++ b/lua/wikis/commons/Widget/PlayerDisplay/Block.lua
@@ -18,7 +18,6 @@ local PlayerDisplayComponents = Lua.import('Module:Widget/PlayerDisplay/Componen
 local WidgetUtil = Lua.import('Module:Widget/Util')
 
 ---@class BlockPlayerDisplayProps: InlinePlayerDisplayProps
----@field playerClass string|string[]?
 ---@field overflow OverflowModes?
 ---@field showPlayerTeam boolean?
 ---@field note Renderable|Renderable[]?
@@ -28,12 +27,9 @@ local WidgetUtil = Lua.import('Module:Widget/Util')
 local function BlockPlayer(props)
 	local player = props.player
 	local factionDisplay = PlayerDisplayComponents.faction(props)
-	local playerClasses = type(props.playerClass) == 'string' and
-		{props.playerClass} or props.playerClass --[[ @as string[]? ]]
 	local useDefault = Logic.nilOr(Logic.readBoolOrNil(props.showTbd), true) or not Opponent.playerIsTbd(player)
 	local showPlayerTeam = props.showPlayerTeam
 	return BlockWrapper{
-		classes = playerClasses,
 		flip = props.flip,
 		showPlayerTeam = showPlayerTeam,
 		children = WidgetUtil.collect(
diff --git a/lua/wikis/commons/Widget/PlayerDisplay/Block/Character.lua b/lua/wikis/commons/Widget/PlayerDisplay/Block/Character.lua
index 1f127d56561..14d186111a5 100644
--- a/lua/wikis/commons/Widget/PlayerDisplay/Block/Character.lua
+++ b/lua/wikis/commons/Widget/PlayerDisplay/Block/Character.lua
@@ -45,12 +45,9 @@ end
 local function BlockCharacterPlayer(props)
 	local player = props.player
 	local charactersDisplay = getCharacters(player)
-	local playerClasses = type(props.playerClass) == 'string' and
-		{props.playerClass} or props.playerClass --[[ @as string[]? ]]
 	local useDefault = Logic.nilOr(Logic.readBoolOrNil(props.showTbd), true) or not Opponent.playerIsTbd(player)
 	local showPlayerTeam = props.showPlayerTeam
 	local block = BlockWrapper{
-		classes = playerClasses,
 		flip = props.flip,
 		showPlayerTeam = showPlayerTeam,
 		children = WidgetUtil.collect(