diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ac21a66..00573e19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Rojo Changelog
 
+## Prism 0.1 (Development)
+
+* Made `prism` the primary executable while retaining a thin `rojo` compatibility executable and the `librojo` library/crate identity.
+* Added deterministic current-directory project discovery for `prism serve`.
+* Changed managed local installation to `PrismManagedPlugin.rbxm` and added read-only local plugin diagnostics with `prism plugin list`.
+* Completed Prism branding across the Studio plugin while preserving Rojo-compatible project, protocol, widget, action, setting, and layout identifiers.
+* Redesigned the existing Studio panel with a responsive dark glass theme, Prism assets, and a low-motion ambient color background.
+* Removed the exec feasibility spike after moving its unique cleanup regression into the production exec tests.
+
+The entries below are the retained upstream Rojo changelog and attribution.
+
 <!-- DIRECTIONS
 Thanks for contributing to Rojo! Please add your change to the "Unreleased" section below.
 
diff --git a/plugin/src/App/Components/BorderedContainer.lua b/plugin/src/App/Components/BorderedContainer.lua
index 42fec65c..77044a02 100644
--- a/plugin/src/App/Components/BorderedContainer.lua
+++ b/plugin/src/App/Components/BorderedContainer.lua
@@ -6,6 +6,7 @@ local Roact = require(Packages.Roact)
 
 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
+local bindingUtil = require(Plugin.App.bindingUtil)
 
 local SlicedImage = require(script.Parent.SlicedImage)
 
@@ -13,16 +14,34 @@ local e = Roact.createElement
 
 local function BorderedContainer(props)
 	return Theme.with(function(theme)
+		local backgroundTransparency = props.transparency:map(function(value)
+			return bindingUtil.blendAlpha({ 0.1, value })
+		end)
+		local borderTransparency = props.transparency:map(function(value)
+			return bindingUtil.blendAlpha({ 0.18, value })
+		end)
+		local shadowTransparency = props.transparency:map(function(value)
+			return bindingUtil.blendAlpha({ 0.72, value })
+		end)
+
 		return e(SlicedImage, {
 			slice = Assets.Slices.RoundedBackground,
-			color = theme.BorderedContainer.BackgroundColor,
-			transparency = props.transparency,
+			color = props.backgroundColor or theme.BorderedContainer.BackgroundColor,
+			transparency = backgroundTransparency,
 
 			size = props.size,
 			position = props.position,
 			anchorPoint = props.anchorPoint,
 			layoutOrder = props.layoutOrder,
 		}, {
+			Shadow = e(SlicedImage, {
+				slice = Assets.Slices.RoundedBackground,
+				color = Color3.new(0, 0, 0),
+				transparency = shadowTransparency,
+				position = UDim2.fromOffset(0, 2),
+				size = UDim2.fromScale(1, 1),
+				zIndex = -2,
+			}),
 			Content = e("Frame", {
 				Size = UDim2.new(1, -2, 1, -2),
 				Position = UDim2.new(0, 1, 0, 1),
@@ -32,8 +51,8 @@ local function BorderedContainer(props)
 
 			Border = e(SlicedImage, {
 				slice = Assets.Slices.RoundedBorder,
-				color = theme.BorderedContainer.BorderColor,
-				transparency = props.transparency,
+				color = props.borderColor or theme.BorderedContainer.BorderColor,
+				transparency = borderTransparency,
 
 				size = UDim2.new(1, 0, 1, 0),
 			}),
diff --git a/plugin/src/App/Components/Header.lua b/plugin/src/App/Components/Header.lua
index d7ccb1f8..505dafc3 100644
--- a/plugin/src/App/Components/Header.lua
+++ b/plugin/src/App/Components/Header.lua
@@ -6,101 +6,80 @@ local Roact = require(Packages.Roact)
 
 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
+local Branding = require(Plugin.Branding)
 local Config = require(Plugin.Config)
 local Version = require(Plugin.Version)
 
-local Tooltip = require(Plugin.App.Components.Tooltip)
-local SlicedImage = require(script.Parent.SlicedImage)
-
 local e = Roact.createElement
 
-local function VersionIndicator(props)
-	local updateMessage = Version.getUpdateMessage()
-
-	return Theme.with(function(theme)
-		return e("Frame", {
-			LayoutOrder = props.layoutOrder,
-			Size = UDim2.new(0, 0, 0, 25),
-			BackgroundTransparency = 1,
-			AutomaticSize = Enum.AutomaticSize.X,
-		}, {
-			Border = if updateMessage
-				then e(SlicedImage, {
-					slice = Assets.Slices.RoundedBorder,
-					color = theme.Button.Bordered.Enabled.BorderColor,
-					transparency = props.transparency,
-					size = UDim2.fromScale(1, 1),
-					zIndex = 0,
-				}, {
-					Indicator = e("ImageLabel", {
-						Size = UDim2.new(0, 10, 0, 10),
-						ScaleType = Enum.ScaleType.Fit,
-						Image = Assets.Images.Circles[16],
-						ImageColor3 = theme.Header.LogoColor,
-						ImageTransparency = props.transparency,
-						BackgroundTransparency = 1,
-						Position = UDim2.new(1, 0, 0, 0),
-						AnchorPoint = Vector2.new(0.5, 0.5),
-					}),
-				})
-				else nil,
-
-			Tip = if updateMessage
-				then e(Tooltip.Trigger, {
-					text = updateMessage,
-					delay = 0.1,
-				})
-				else nil,
-
-			VersionText = e("TextLabel", {
-				Text = Version.display(Config.version),
-				FontFace = theme.Font.Thin,
-				TextSize = theme.TextSize.Body,
-				TextColor3 = theme.Header.VersionColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = props.transparency,
-				BackgroundTransparency = 1,
-
-				Size = UDim2.new(0, 0, 1, 0),
-				AutomaticSize = Enum.AutomaticSize.X,
-			}, {
-				Padding = e("UIPadding", {
-					PaddingLeft = UDim.new(0, 6),
-					PaddingRight = UDim.new(0, 6),
-				}),
-			}),
-		})
-	end)
-end
-
 local function Header(props)
 	return Theme.with(function(theme)
+		if props.full then
+			return e("Frame", {
+				Size = UDim2.new(1, 0, 0, 52),
+				LayoutOrder = props.layoutOrder,
+				BackgroundTransparency = 1,
+			}, {
+				Wordmark = e("ImageLabel", {
+					Image = Assets.Images.FullLogo,
+					ImageColor3 = Color3.new(1, 1, 1),
+					ImageTransparency = props.transparency,
+					BackgroundTransparency = 1,
+					ScaleType = Enum.ScaleType.Fit,
+					Size = UDim2.new(1, -56, 0, 31),
+					Position = UDim2.new(0.5, 0, 0, 0),
+					AnchorPoint = Vector2.new(0.5, 0),
+				}),
+				Tagline = e("TextLabel", {
+					Text = Branding.Tagline,
+					FontFace = theme.Font.Thin,
+					TextSize = theme.TextSize.Small,
+					TextColor3 = theme.Tokens.SecondaryText,
+					TextTransparency = props.transparency,
+					BackgroundTransparency = 1,
+					TextTruncate = Enum.TextTruncate.AtEnd,
+					Size = UDim2.new(1, 0, 0, 16),
+					Position = UDim2.new(0, 0, 1, -16),
+				}),
+			})
+		end
+
 		return e("Frame", {
 			Size = UDim2.new(1, 0, 0, 32),
 			LayoutOrder = props.layoutOrder,
 			BackgroundTransparency = 1,
 		}, {
 			Logo = e("ImageLabel", {
-				Image = Assets.Images.Logo,
-				ImageColor3 = theme.Header.LogoColor,
+				Image = props.icon or Assets.Images.Logo,
+				ImageColor3 = Color3.new(1, 1, 1),
 				ImageTransparency = props.transparency,
-
 				Size = UDim2.fromOffset(27, 27),
-
-				LayoutOrder = 1,
+				Position = UDim2.new(0, 0, 0.5, 0),
+				AnchorPoint = Vector2.new(0, 0.5),
 				BackgroundTransparency = 1,
 			}),
-
-			VersionIndicator = e(VersionIndicator, {
-				transparency = props.transparency,
-				layoutOrder = 2,
+			Name = e("TextLabel", {
+				Text = Branding.Name,
+				FontFace = theme.Font.Bold,
+				TextSize = theme.TextSize.Medium,
+				TextColor3 = theme.Tokens.PrimaryText,
+				TextTransparency = props.transparency,
+				TextXAlignment = Enum.TextXAlignment.Left,
+				BackgroundTransparency = 1,
+				Position = UDim2.new(0, 36, 0, 0),
+				Size = UDim2.new(0, 62, 1, 0),
 			}),
-
-			Layout = e("UIListLayout", {
-				VerticalAlignment = Enum.VerticalAlignment.Center,
-				FillDirection = Enum.FillDirection.Horizontal,
-				SortOrder = Enum.SortOrder.LayoutOrder,
-				Padding = UDim.new(0, 15),
+			Version = e("TextLabel", {
+				Text = Version.display(Config.version),
+				FontFace = theme.Font.Thin,
+				TextSize = theme.TextSize.Small,
+				TextColor3 = theme.Header.VersionColor,
+				TextTransparency = props.transparency,
+				TextXAlignment = Enum.TextXAlignment.Right,
+				TextTruncate = Enum.TextTruncate.AtEnd,
+				BackgroundTransparency = 1,
+				Position = UDim2.new(1, -74, 0, 0),
+				Size = UDim2.new(0, 74, 1, 0),
 			}),
 		})
 	end)
diff --git a/plugin/src/App/Components/PrismBackground.lua b/plugin/src/App/Components/PrismBackground.lua
new file mode 100644
index 00000000..6061ee68
--- /dev/null
+++ b/plugin/src/App/Components/PrismBackground.lua
@@ -0,0 +1,209 @@
+local RunService = game:GetService("RunService")
+
+local Rojo = script:FindFirstAncestor("Rojo")
+local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages
+
+local Roact = require(Packages.Roact)
+
+local Assets = require(Plugin.Assets)
+local Theme = require(Plugin.App.Theme)
+
+local e = Roact.createElement
+local TAU = math.pi * 2
+local REDUCED_MOTION = false
+
+-- Independent periods and phases keep the forms from falling into a visible loop.
+local BLOBS = table.freeze({
+	{
+		colorA = Color3.fromHex("6B5CFF"),
+		colorB = Color3.fromHex("D75CFF"),
+		x = 0.08,
+		y = 0.20,
+		driftX = 0.20,
+		driftY = 0.16,
+		size = 260,
+		period = 31,
+		phase = 0.2,
+	},
+	{
+		colorA = Color3.fromHex("42D9FF"),
+		colorB = Color3.fromHex("4385FF"),
+		x = 0.72,
+		y = 0.12,
+		driftX = 0.18,
+		driftY = 0.20,
+		size = 230,
+		period = 37,
+		phase = 1.7,
+	},
+	{
+		colorA = Color3.fromHex("48E6AA"),
+		colorB = Color3.fromHex("43CBE8"),
+		x = 0.30,
+		y = 0.78,
+		driftX = 0.22,
+		driftY = 0.12,
+		size = 280,
+		period = 29,
+		phase = 3.1,
+	},
+	{
+		colorA = Color3.fromHex("F0B653"),
+		colorB = Color3.fromHex("EF648F"),
+		x = 0.90,
+		y = 0.72,
+		driftX = 0.17,
+		driftY = 0.18,
+		size = 245,
+		period = 23,
+		phase = 4.4,
+	},
+	{
+		colorA = Color3.fromHex("E85CB9"),
+		colorB = Color3.fromHex("765CFF"),
+		x = 0.52,
+		y = 0.46,
+		driftX = 0.14,
+		driftY = 0.18,
+		size = 210,
+		period = 19,
+		phase = 5.6,
+	},
+})
+
+local function getTransform(blob, elapsed)
+	local progress = elapsed / blob.period * TAU + blob.phase
+	local x = blob.x + math.sin(progress) * blob.driftX
+	local y = blob.y + math.cos(progress * 0.83) * blob.driftY
+	local scale = 1 + math.sin(progress * 0.61 + blob.phase) * 0.06
+
+	return UDim2.fromScale(x, y), UDim2.fromOffset(blob.size * scale, blob.size * scale)
+end
+
+local PrismBackground = Roact.Component:extend("PrismBackground")
+
+PrismBackground.defaultProps = {
+	active = true,
+	reducedMotion = REDUCED_MOTION,
+}
+
+function PrismBackground:init()
+	self.elapsed = 0
+	self.blobRefs = {}
+	for index in BLOBS do
+		self.blobRefs[index] = Roact.createRef()
+	end
+end
+
+function PrismBackground:updateBlobs(deltaTime)
+	self.elapsed += deltaTime
+
+	for index, blob in BLOBS do
+		local object = self.blobRefs[index]:getValue()
+		if object then
+			object.Position, object.Size = getTransform(blob, self.elapsed)
+		end
+	end
+end
+
+function PrismBackground:startAnimation()
+	if self.stepper or not self.props.active or self.props.reducedMotion then
+		return
+	end
+
+	local stepSignal = self.props.stepSignal or RunService.RenderStepped
+	self.stepper = stepSignal:Connect(function(deltaTime)
+		self:updateBlobs(deltaTime)
+	end)
+end
+
+function PrismBackground:stopAnimation()
+	if self.stepper then
+		self.stepper:Disconnect()
+		self.stepper = nil
+	end
+end
+
+function PrismBackground:didMount()
+	self:startAnimation()
+end
+
+function PrismBackground:didUpdate(previousProps)
+	if
+		self.props.active ~= previousProps.active
+		or self.props.reducedMotion ~= previousProps.reducedMotion
+		or self.props.stepSignal ~= previousProps.stepSignal
+	then
+		self:stopAnimation()
+		self:startAnimation()
+	end
+end
+
+function PrismBackground:willUnmount()
+	self:stopAnimation()
+end
+
+function PrismBackground:render()
+	return Theme.with(function(theme)
+		local blobs = {}
+		for index, blob in BLOBS do
+			local position, size = getTransform(blob, 0)
+			blobs[`Blob{index}`] = e("ImageLabel", {
+				[Roact.Ref] = self.blobRefs[index],
+				Image = Assets.Images.Circles[500],
+				ImageColor3 = Color3.new(1, 1, 1),
+				ImageTransparency = 0.73,
+				BackgroundTransparency = 1,
+				Position = position,
+				Size = size,
+				AnchorPoint = Vector2.new(0.5, 0.5),
+				ZIndex = 0,
+			}, {
+				Color = e("UIGradient", {
+					Color = ColorSequence.new(blob.colorA, blob.colorB),
+					Rotation = (index * 47) % 360,
+					Transparency = NumberSequence.new({
+						NumberSequenceKeypoint.new(0, 0.22),
+						NumberSequenceKeypoint.new(0.5, 0),
+						NumberSequenceKeypoint.new(1, 0.35),
+					}),
+				}),
+				SoftCore = e("ImageLabel", {
+					Image = Assets.Images.Circles[500],
+					ImageColor3 = blob.colorB,
+					ImageTransparency = 0.82,
+					BackgroundTransparency = 1,
+					Position = UDim2.fromScale(0.5, 0.5),
+					Size = UDim2.fromScale(0.68, 0.68),
+					AnchorPoint = Vector2.new(0.5, 0.5),
+					ZIndex = 0,
+				}),
+			})
+		end
+
+		return e("Frame", {
+			Size = UDim2.fromScale(1, 1),
+			BackgroundColor3 = theme.Tokens.PanelBackground,
+			BorderSizePixel = 0,
+			ClipsDescendants = true,
+			ZIndex = 0,
+		}, {
+			Blobs = Roact.createFragment(blobs),
+			ReadabilityOverlay = e("Frame", {
+				Size = UDim2.fromScale(1, 1),
+				BackgroundColor3 = theme.Tokens.PanelBackground,
+				BackgroundTransparency = 1 - theme.Tokens.OverlayDarkness,
+				BorderSizePixel = 0,
+				ZIndex = 1,
+			}),
+		})
+	end)
+end
+
+PrismBackground._test = table.freeze({
+	blobs = BLOBS,
+	getTransform = getTransform,
+})
+
+return PrismBackground
diff --git a/plugin/src/App/Components/PrismBackground.spec.lua b/plugin/src/App/Components/PrismBackground.spec.lua
new file mode 100644
index 00000000..2223cb76
--- /dev/null
+++ b/plugin/src/App/Components/PrismBackground.spec.lua
@@ -0,0 +1,104 @@
+return function()
+	local Rojo = script:FindFirstAncestor("Rojo")
+	local Roact = require(Rojo.Packages.Roact)
+
+	local Theme = require(Rojo.Plugin.App.Theme)
+	local PrismBackground = require(script.Parent.PrismBackground)
+
+	local e = Roact.createElement
+
+	local function createStepSignal()
+		local state = {
+			connections = 0,
+			disconnections = 0,
+			callback = nil,
+		}
+		local signal = {}
+
+		function signal:Connect(callback)
+			state.connections += 1
+			state.callback = callback
+			local connected = true
+			return {
+				Disconnect = function()
+					if connected then
+						connected = false
+						state.disconnections += 1
+					end
+				end,
+			}
+		end
+
+		return signal, state
+	end
+
+	local function createTree(stepSignal, props)
+		return e(Theme.StudioProvider, nil, {
+			Background = e(PrismBackground, {
+				active = props.active,
+				reducedMotion = props.reducedMotion,
+				stepSignal = stepSignal,
+			}),
+		})
+	end
+
+	describe("PrismBackground", function()
+		it("uses five independently timed ambient blobs", function()
+			expect(#PrismBackground._test.blobs).to.equal(5)
+			for _, blob in PrismBackground._test.blobs do
+				expect(blob.period >= 15).to.equal(true)
+				expect(blob.period <= 40).to.equal(true)
+			end
+
+			local startPosition = PrismBackground._test.getTransform(PrismBackground._test.blobs[1], 0)
+			local laterPosition = PrismBackground._test.getTransform(PrismBackground._test.blobs[1], 4)
+			expect(laterPosition == startPosition).to.equal(false)
+		end)
+
+		it("connects once while active and disconnects when hidden", function()
+			local signal, state = createStepSignal()
+			local target = Instance.new("ScreenGui")
+			local handle = Roact.mount(
+				createTree(signal, {
+					active = true,
+					reducedMotion = false,
+				}),
+				target
+			)
+
+			expect(state.connections).to.equal(1)
+			expect(state.callback).to.be.ok()
+			state.callback(1 / 60)
+
+			Roact.update(
+				handle,
+				createTree(signal, {
+					active = false,
+					reducedMotion = false,
+				})
+			)
+			expect(state.disconnections).to.equal(1)
+
+			Roact.unmount(handle)
+			expect(state.disconnections).to.equal(1)
+			target:Destroy()
+		end)
+
+		it("uses a static fallback when reduced motion is requested", function()
+			local signal, state = createStepSignal()
+			local target = Instance.new("ScreenGui")
+			local handle = Roact.mount(
+				createTree(signal, {
+					active = true,
+					reducedMotion = true,
+				}),
+				target
+			)
+
+			expect(state.connections).to.equal(0)
+			Roact.unmount(handle)
+			expect(state.disconnections).to.equal(0)
+			target:Destroy()
+		end)
+	end)
+end
diff --git a/plugin/src/App/Components/Spinner.lua b/plugin/src/App/Components/Spinner.lua
index f09ea776..acc1f40f 100644
--- a/plugin/src/App/Components/Spinner.lua
+++ b/plugin/src/App/Components/Spinner.lua
@@ -9,7 +9,7 @@ local Roact = require(Packages.Roact)
 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
 
-local ROTATIONS_PER_SECOND = 1.75
+local ROTATIONS_PER_SECOND = 0.75
 
 local e = Roact.createElement
 
diff --git a/plugin/src/App/Components/TextButton.lua b/plugin/src/App/Components/TextButton.lua
index f4243c1b..d9c84696 100644
--- a/plugin/src/App/Components/TextButton.lua
+++ b/plugin/src/App/Components/TextButton.lua
@@ -22,6 +22,10 @@ local e = Roact.createElement
 
 local TextButton = Roact.Component:extend("TextButton")
 
+TextButton.defaultProps = {
+	enabled = true,
+}
+
 function TextButton:init()
 	self.motor = Flipper.GroupMotor.new({
 		hover = 0,
@@ -56,8 +60,15 @@ function TextButton:render()
 
 			LayoutOrder = self.props.layoutOrder,
 			BackgroundTransparency = 1,
+			AutoButtonColor = false,
+			Active = self.props.enabled,
+			Selectable = self.props.enabled,
 
-			[Roact.Event.Activated] = self.props.onClick,
+			[Roact.Event.Activated] = function()
+				if self.props.enabled and self.props.onClick then
+					self.props.onClick()
+				end
+			end,
 
 			[Roact.Event.MouseEnter] = function()
 				self.motor:setGoal({
@@ -72,7 +83,7 @@ function TextButton:render()
 			end,
 		}, {
 			TouchRipple = e(TouchRipple, {
-				color = buttonTheme.ActionFillColor,
+				color = buttonTheme.PressedColor,
 				transparency = self.props.transparency:map(function(value)
 					return bindingUtil.blendAlpha({ buttonTheme.ActionFillTransparency, value })
 				end),
@@ -95,7 +106,7 @@ function TextButton:render()
 				BackgroundTransparency = 1,
 			}),
 
-			Border = style == "Bordered" and e(SlicedImage, {
+			Border = buttonTheme.HasBorder and e(SlicedImage, {
 				slice = Assets.Slices.RoundedBorder,
 				color = bindingUtil.mapLerp(
 					bindingEnabled,
@@ -130,7 +141,7 @@ function TextButton:render()
 				zIndex = -1,
 			}),
 
-			Background = style == "Solid" and e(SlicedImage, {
+			Background = buttonTheme.HasBackground and e(SlicedImage, {
 				slice = Assets.Slices.RoundedBackground,
 				color = bindingUtil.mapLerp(
 					bindingEnabled,
diff --git a/plugin/src/App/Components/TextInput.lua b/plugin/src/App/Components/TextInput.lua
index 1187296b..45982857 100644
--- a/plugin/src/App/Components/TextInput.lua
+++ b/plugin/src/App/Components/TextInput.lua
@@ -20,12 +20,19 @@ local e = Roact.createElement
 
 local TextInput = Roact.Component:extend("TextInput")
 
+TextInput.defaultProps = {
+	enabled = true,
+}
+
 function TextInput:init()
 	self.motor = Flipper.GroupMotor.new({
 		hover = 0,
 		enabled = self.props.enabled and 1 or 0,
 	})
 	self.binding = bindingUtil.fromMotor(self.motor)
+	self:setState({
+		focused = false,
+	})
 end
 
 function TextInput:didUpdate(lastProps)
@@ -45,11 +52,13 @@ function TextInput:render()
 
 		return e(SlicedImage, {
 			slice = Assets.Slices.RoundedBorder,
-			color = bindingUtil.mapLerp(
-				bindingEnabled,
-				textInputTheme.Enabled.BorderColor,
-				textInputTheme.Disabled.BorderColor
-			),
+			color = if self.state.focused
+				then textInputTheme.FocusBorderColor
+				else bindingUtil.mapLerp(
+					bindingEnabled,
+					textInputTheme.Enabled.BorderColor,
+					textInputTheme.Disabled.BorderColor
+				),
 			transparency = self.props.transparency,
 
 			size = self.props.size or UDim2.new(1, 0, 1, 0),
@@ -57,6 +66,13 @@ function TextInput:render()
 			layoutOrder = self.props.layoutOrder,
 			anchorPoint = self.props.anchorPoint,
 		}, {
+			Background = e(SlicedImage, {
+				slice = Assets.Slices.RoundedBackground,
+				color = theme.Tokens.InputBackground,
+				transparency = self.props.transparency,
+				size = UDim2.fromScale(1, 1),
+				zIndex = -2,
+			}),
 			HoverOverlay = e(SlicedImage, {
 				slice = Assets.Slices.RoundedBackground,
 				color = textInputTheme.ActionFillColor,
@@ -94,6 +110,13 @@ function TextInput:render()
 				TextSize = theme.TextSize.Large,
 				TextEditable = self.props.enabled,
 				ClearTextOnFocus = self.props.clearTextOnFocus,
+				Selectable = self.props.enabled,
+
+				[Roact.Event.Focused] = function()
+					self:setState({
+						focused = true,
+					})
+				end,
 
 				[Roact.Event.MouseEnter] = function()
 					self.motor:setGoal({
@@ -108,7 +131,12 @@ function TextInput:render()
 				end,
 
 				[Roact.Event.FocusLost] = function(rbx)
-					self.props.onEntered(rbx.Text)
+					self:setState({
+						focused = false,
+					})
+					if self.props.onEntered then
+						self.props.onEntered(rbx.Text)
+					end
 				end,
 			}),
 			Children = Roact.createFragment(self.props[Roact.Children]),
diff --git a/plugin/src/App/Page.lua b/plugin/src/App/Page.lua
index 42bc68b2..b65eab98 100644
--- a/plugin/src/App/Page.lua
+++ b/plugin/src/App/Page.lua
@@ -50,6 +50,7 @@ function Page:render()
 		end),
 		Size = UDim2.new(1, 0, 1, 0),
 		BackgroundTransparency = 1,
+		ZIndex = self.props.zIndex or 2,
 	}, {
 		Component = e(
 			self.props.component,
diff --git a/plugin/src/App/StatusPages/Confirming.lua b/plugin/src/App/StatusPages/Confirming.lua
index 8b4538bd..71a02485 100644
--- a/plugin/src/App/StatusPages/Confirming.lua
+++ b/plugin/src/App/StatusPages/Confirming.lua
@@ -6,6 +6,7 @@ local Roact = require(Packages.Roact)
 
 local Settings = require(Plugin.Settings)
 local Theme = require(Plugin.App.Theme)
+local Assets = require(Plugin.Assets)
 local TextButton = require(Plugin.App.Components.TextButton)
 local StudioPluginGui = require(Plugin.App.Components.Studio.StudioPluginGui)
 local Tooltip = require(Plugin.App.Components.Tooltip)
@@ -34,19 +35,36 @@ end
 function ConfirmingPage:render()
 	return Theme.with(function(theme)
 		local pageContent = Roact.createFragment({
-			Title = e("TextLabel", {
-				Text = string.format(
-					"Sync changes for project '%s':",
-					self.props.confirmData.serverInfo.projectName or "UNKNOWN"
-				),
-				FontFace = theme.Font.Thin,
-				LineHeight = 1.2,
-				TextSize = theme.TextSize.Body,
-				TextColor3 = theme.TextColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = self.props.transparency,
-				Size = UDim2.new(1, 0, 0, theme.TextSize.Large + 2),
+			TitleRow = e("Frame", {
+				Size = UDim2.new(1, 0, 0, 28),
 				BackgroundTransparency = 1,
+				LayoutOrder = 1,
+			}, {
+				Logo = e("ImageLabel", {
+					Image = Assets.Images.PluginButtonWarning,
+					ImageColor3 = Color3.new(1, 1, 1),
+					ImageTransparency = self.props.transparency,
+					BackgroundTransparency = 1,
+					Size = UDim2.fromOffset(24, 24),
+					Position = UDim2.new(0, 0, 0.5, 0),
+					AnchorPoint = Vector2.new(0, 0.5),
+				}),
+				Title = e("TextLabel", {
+					Text = string.format(
+						"Review Prism sync changes for '%s'",
+						self.props.confirmData.serverInfo.projectName or "UNKNOWN"
+					),
+					FontFace = theme.Font.Main,
+					LineHeight = 1.2,
+					TextSize = theme.TextSize.Body,
+					TextColor3 = theme.Tokens.PrimaryText,
+					TextXAlignment = Enum.TextXAlignment.Left,
+					TextTransparency = self.props.transparency,
+					TextTruncate = Enum.TextTruncate.AtEnd,
+					Position = UDim2.fromOffset(32, 0),
+					Size = UDim2.new(1, -32, 1, 0),
+					BackgroundTransparency = 1,
+				}),
 			}),
 
 			PatchVisualizer = e(PatchVisualizer, {
@@ -136,81 +154,85 @@ function ConfirmingPage:render()
 				Padding = UDim.new(0, 10),
 			}),
 
-			StringDiff = e(StudioPluginGui, {
-				id = "Rojo_ConfirmingStringDiff",
-				title = "String diff",
-				active = self.state.showingStringDiff,
-				isEphemeral = true,
+			StringDiff = if self.state.showingStringDiff
+				then e(StudioPluginGui, {
+					id = "Rojo_ConfirmingStringDiff",
+					title = "String diff",
+					active = self.state.showingStringDiff,
+					isEphemeral = true,
 
-				initDockState = Enum.InitialDockState.Float,
-				overridePreviousState = true,
-				floatingSize = Vector2.new(500, 350),
-				minimumSize = Vector2.new(400, 250),
+					initDockState = Enum.InitialDockState.Float,
+					overridePreviousState = true,
+					floatingSize = Vector2.new(500, 350),
+					minimumSize = Vector2.new(400, 250),
 
-				zIndexBehavior = Enum.ZIndexBehavior.Sibling,
+					zIndexBehavior = Enum.ZIndexBehavior.Sibling,
 
-				onClose = function()
-					self:setState({
-						showingStringDiff = false,
-					})
-				end,
-			}, {
-				TooltipsProvider = e(Tooltip.Provider, nil, {
-					Tooltips = e(Tooltip.Container, nil),
-					Content = e("Frame", {
-						Size = UDim2.fromScale(1, 1),
-						BackgroundTransparency = 1,
-					}, {
-						e(StringDiffVisualizer, {
-							size = UDim2.new(1, -10, 1, -10),
-							position = UDim2.new(0, 5, 0, 5),
-							anchorPoint = Vector2.new(0, 0),
-							transparency = self.props.transparency,
+					onClose = function()
+						self:setState({
+							showingStringDiff = false,
+						})
+					end,
+				}, {
+					TooltipsProvider = e(Tooltip.Provider, nil, {
+						Tooltips = e(Tooltip.Container, nil),
+						Content = e("Frame", {
+							Size = UDim2.fromScale(1, 1),
+							BackgroundTransparency = 1,
+						}, {
+							e(StringDiffVisualizer, {
+								size = UDim2.new(1, -10, 1, -10),
+								position = UDim2.new(0, 5, 0, 5),
+								anchorPoint = Vector2.new(0, 0),
+								transparency = self.props.transparency,
 
-							currentString = self.state.currentString,
-							incomingString = self.state.incomingString,
+								currentString = self.state.currentString,
+								incomingString = self.state.incomingString,
+							}),
 						}),
 					}),
-				}),
-			}),
+				})
+				else nil,
 
-			TableDiff = e(StudioPluginGui, {
-				id = "Rojo_ConfirmingTableDiff",
-				title = "Table diff",
-				active = self.state.showingTableDiff,
-				isEphemeral = true,
+			TableDiff = if self.state.showingTableDiff
+				then e(StudioPluginGui, {
+					id = "Rojo_ConfirmingTableDiff",
+					title = "Table diff",
+					active = self.state.showingTableDiff,
+					isEphemeral = true,
 
-				initDockState = Enum.InitialDockState.Float,
-				overridePreviousState = true,
-				floatingSize = Vector2.new(500, 350),
-				minimumSize = Vector2.new(400, 250),
+					initDockState = Enum.InitialDockState.Float,
+					overridePreviousState = true,
+					floatingSize = Vector2.new(500, 350),
+					minimumSize = Vector2.new(400, 250),
 
-				zIndexBehavior = Enum.ZIndexBehavior.Sibling,
+					zIndexBehavior = Enum.ZIndexBehavior.Sibling,
 
-				onClose = function()
-					self:setState({
-						showingTableDiff = false,
-					})
-				end,
-			}, {
-				TooltipsProvider = e(Tooltip.Provider, nil, {
-					Tooltips = e(Tooltip.Container, nil),
-					Content = e("Frame", {
-						Size = UDim2.fromScale(1, 1),
-						BackgroundTransparency = 1,
-					}, {
-						e(TableDiffVisualizer, {
-							size = UDim2.new(1, -10, 1, -10),
-							position = UDim2.new(0, 5, 0, 5),
-							anchorPoint = Vector2.new(0, 0),
-							transparency = self.props.transparency,
+					onClose = function()
+						self:setState({
+							showingTableDiff = false,
+						})
+					end,
+				}, {
+					TooltipsProvider = e(Tooltip.Provider, nil, {
+						Tooltips = e(Tooltip.Container, nil),
+						Content = e("Frame", {
+							Size = UDim2.fromScale(1, 1),
+							BackgroundTransparency = 1,
+						}, {
+							e(TableDiffVisualizer, {
+								size = UDim2.new(1, -10, 1, -10),
+								position = UDim2.new(0, 5, 0, 5),
+								anchorPoint = Vector2.new(0, 0),
+								transparency = self.props.transparency,
 
-							oldTable = self.state.oldTable,
-							newTable = self.state.newTable,
+								oldTable = self.state.oldTable,
+								newTable = self.state.newTable,
+							}),
 						}),
 					}),
-				}),
-			}),
+				})
+				else nil,
 		})
 
 		if self.props.createPopup then
diff --git a/plugin/src/App/StatusPages/Connected.lua b/plugin/src/App/StatusPages/Connected.lua
index 8fc9108b..f30bdca2 100644
--- a/plugin/src/App/StatusPages/Connected.lua
+++ b/plugin/src/App/StatusPages/Connected.lua
@@ -208,52 +208,62 @@ local function ConnectionDetails(props)
 	return Theme.with(function(theme)
 		return e(BorderedContainer, {
 			transparency = props.transparency,
-			size = UDim2.new(1, 0, 0, 70),
+			size = UDim2.new(1, 0, 0, 76),
 			layoutOrder = props.layoutOrder,
 		}, {
-			TextContainer = e("Frame", {
-				Size = UDim2.new(1, 0, 1, 0),
+			Status = e("Frame", {
+				Size = UDim2.fromOffset(88, 22),
+				Position = UDim2.new(1, -12, 0, 7),
+				AnchorPoint = Vector2.new(1, 0),
 				BackgroundTransparency = 1,
 			}, {
-				ProjectName = e("TextLabel", {
-					Text = props.projectName,
-					FontFace = theme.Font.Bold,
-					TextSize = theme.TextSize.Large,
-					TextColor3 = theme.ConnectionDetails.ProjectNameColor,
+				Dot = e("Frame", {
+					Size = UDim2.fromOffset(7, 7),
+					Position = UDim2.new(0, 0, 0.5, 0),
+					AnchorPoint = Vector2.new(0, 0.5),
+					BackgroundColor3 = theme.Tokens.Success,
+					BackgroundTransparency = props.transparency,
+					BorderSizePixel = 0,
+				}, {
+					Corner = e("UICorner", {
+						CornerRadius = UDim.new(1, 0),
+					}),
+				}),
+				Text = e("TextLabel", {
+					Text = "Connected",
+					FontFace = theme.Font.Main,
+					TextSize = theme.TextSize.Small,
+					TextColor3 = theme.Tokens.Success,
 					TextTransparency = props.transparency,
 					TextXAlignment = Enum.TextXAlignment.Left,
-
-					Size = UDim2.new(1, 0, 0, theme.TextSize.Large),
-
-					LayoutOrder = 1,
 					BackgroundTransparency = 1,
-				}),
-
-				Address = e("TextLabel", {
-					Text = props.address,
-					FontFace = theme.Font.Code,
-					TextSize = theme.TextSize.Medium,
-					TextColor3 = theme.ConnectionDetails.AddressColor,
-					TextTransparency = props.transparency,
-					TextXAlignment = Enum.TextXAlignment.Left,
-
-					Size = UDim2.new(1, 0, 0, theme.TextSize.Medium),
-
-					LayoutOrder = 2,
-					BackgroundTransparency = 1,
-				}),
-
-				Layout = e("UIListLayout", {
-					VerticalAlignment = Enum.VerticalAlignment.Center,
-					FillDirection = Enum.FillDirection.Vertical,
-					SortOrder = Enum.SortOrder.LayoutOrder,
-					Padding = UDim.new(0, 6),
+					Position = UDim2.fromOffset(14, 0),
+					Size = UDim2.new(1, -14, 1, 0),
 				}),
 			}),
-
-			Padding = e("UIPadding", {
-				PaddingLeft = UDim.new(0, 17),
-				PaddingRight = UDim.new(0, 15),
+			ProjectName = e("TextLabel", {
+				Text = props.projectName,
+				FontFace = theme.Font.Bold,
+				TextSize = theme.TextSize.Large,
+				TextColor3 = theme.ConnectionDetails.ProjectNameColor,
+				TextTransparency = props.transparency,
+				TextXAlignment = Enum.TextXAlignment.Left,
+				TextTruncate = Enum.TextTruncate.AtEnd,
+				Position = UDim2.fromOffset(15, 7),
+				Size = UDim2.new(1, -118, 0, theme.TextSize.Large + 3),
+				BackgroundTransparency = 1,
+			}),
+			Address = e("TextLabel", {
+				Text = props.address,
+				FontFace = theme.Font.Code,
+				TextSize = theme.TextSize.Medium,
+				TextColor3 = theme.ConnectionDetails.AddressColor,
+				TextTransparency = props.transparency,
+				TextXAlignment = Enum.TextXAlignment.Left,
+				TextTruncate = Enum.TextTruncate.AtEnd,
+				Position = UDim2.fromOffset(15, 39),
+				Size = UDim2.new(1, -30, 0, theme.TextSize.Medium + 3),
+				BackgroundTransparency = 1,
 			}),
 		})
 	end)
@@ -462,7 +472,7 @@ function ConnectedPage:render()
 
 				Disconnect = e(TextButton, {
 					text = "Disconnect",
-					style = "Solid",
+					style = "Danger",
 					transparency = self.props.transparency,
 					layoutOrder = 2,
 					onClick = self.props.onDisconnect,
@@ -480,136 +490,142 @@ function ConnectedPage:render()
 				}),
 			}),
 
-			ChangesViewer = e(StudioPluginGui, {
-				id = "Rojo_ChangesViewer",
-				title = "View changes",
-				active = self.state.renderChanges,
-				isEphemeral = true,
+			ChangesViewer = if self.state.renderChanges
+				then e(StudioPluginGui, {
+					id = "Rojo_ChangesViewer",
+					title = "View changes",
+					active = self.state.renderChanges,
+					isEphemeral = true,
 
-				initDockState = Enum.InitialDockState.Float,
-				overridePreviousState = true,
-				floatingSize = Vector2.new(400, 500),
-				minimumSize = Vector2.new(300, 300),
+					initDockState = Enum.InitialDockState.Float,
+					overridePreviousState = true,
+					floatingSize = Vector2.new(400, 500),
+					minimumSize = Vector2.new(300, 300),
 
-				zIndexBehavior = Enum.ZIndexBehavior.Sibling,
+					zIndexBehavior = Enum.ZIndexBehavior.Sibling,
 
-				onClose = function()
-					self:setState({
-						renderChanges = false,
-					})
-				end,
-			}, {
-				TooltipsProvider = e(Tooltip.Provider, nil, {
-					Tooltips = e(Tooltip.Container, nil),
-					Content = e("Frame", {
-						Size = UDim2.fromScale(1, 1),
-						BackgroundTransparency = 1,
-					}, {
-						Changes = e(ChangesViewer, {
-							transparency = self.props.transparency,
-							rendered = self.state.renderChanges,
-							patchData = self.props.patchData,
-							patchTree = self.props.patchTree,
-							serveSession = self.props.serveSession,
-							showStringDiff = function(currentString: string, incomingString: string)
-								self:setState({
-									showingStringDiff = true,
-									currentString = currentString,
-									incomingString = incomingString,
-								})
-							end,
-							showTableDiff = function(oldTable: { [any]: any? }, newTable: { [any]: any? })
-								self:setState({
-									showingTableDiff = true,
-									oldTable = oldTable,
-									newTable = newTable,
-								})
-							end,
-							onBack = function()
-								self:setState({
-									renderChanges = false,
-								})
-							end,
+					onClose = function()
+						self:setState({
+							renderChanges = false,
+						})
+					end,
+				}, {
+					TooltipsProvider = e(Tooltip.Provider, nil, {
+						Tooltips = e(Tooltip.Container, nil),
+						Content = e("Frame", {
+							Size = UDim2.fromScale(1, 1),
+							BackgroundTransparency = 1,
+						}, {
+							Changes = e(ChangesViewer, {
+								transparency = self.props.transparency,
+								rendered = self.state.renderChanges,
+								patchData = self.props.patchData,
+								patchTree = self.props.patchTree,
+								serveSession = self.props.serveSession,
+								showStringDiff = function(currentString: string, incomingString: string)
+									self:setState({
+										showingStringDiff = true,
+										currentString = currentString,
+										incomingString = incomingString,
+									})
+								end,
+								showTableDiff = function(oldTable: { [any]: any? }, newTable: { [any]: any? })
+									self:setState({
+										showingTableDiff = true,
+										oldTable = oldTable,
+										newTable = newTable,
+									})
+								end,
+								onBack = function()
+									self:setState({
+										renderChanges = false,
+									})
+								end,
+							}),
 						}),
 					}),
-				}),
-			}),
+				})
+				else nil,
 
-			StringDiff = e(StudioPluginGui, {
-				id = "Rojo_ConnectedStringDiff",
-				title = "String diff",
-				active = self.state.showingStringDiff,
-				isEphemeral = true,
+			StringDiff = if self.state.showingStringDiff
+				then e(StudioPluginGui, {
+					id = "Rojo_ConnectedStringDiff",
+					title = "String diff",
+					active = self.state.showingStringDiff,
+					isEphemeral = true,
 
-				initDockState = Enum.InitialDockState.Float,
-				overridePreviousState = false,
-				floatingSize = Vector2.new(500, 350),
-				minimumSize = Vector2.new(400, 250),
+					initDockState = Enum.InitialDockState.Float,
+					overridePreviousState = false,
+					floatingSize = Vector2.new(500, 350),
+					minimumSize = Vector2.new(400, 250),
 
-				zIndexBehavior = Enum.ZIndexBehavior.Sibling,
+					zIndexBehavior = Enum.ZIndexBehavior.Sibling,
 
-				onClose = function()
-					self:setState({
-						showingStringDiff = false,
-					})
-				end,
-			}, {
-				TooltipsProvider = e(Tooltip.Provider, nil, {
-					Tooltips = e(Tooltip.Container, nil),
-					Content = e("Frame", {
-						Size = UDim2.fromScale(1, 1),
-						BackgroundTransparency = 1,
-					}, {
-						e(StringDiffVisualizer, {
-							size = UDim2.new(1, -10, 1, -10),
-							position = UDim2.new(0, 5, 0, 5),
-							anchorPoint = Vector2.new(0, 0),
-							transparency = self.props.transparency,
+					onClose = function()
+						self:setState({
+							showingStringDiff = false,
+						})
+					end,
+				}, {
+					TooltipsProvider = e(Tooltip.Provider, nil, {
+						Tooltips = e(Tooltip.Container, nil),
+						Content = e("Frame", {
+							Size = UDim2.fromScale(1, 1),
+							BackgroundTransparency = 1,
+						}, {
+							e(StringDiffVisualizer, {
+								size = UDim2.new(1, -10, 1, -10),
+								position = UDim2.new(0, 5, 0, 5),
+								anchorPoint = Vector2.new(0, 0),
+								transparency = self.props.transparency,
 
-							currentString = self.state.currentString,
-							incomingString = self.state.incomingString,
+								currentString = self.state.currentString,
+								incomingString = self.state.incomingString,
+							}),
 						}),
 					}),
-				}),
-			}),
+				})
+				else nil,
 
-			TableDiff = e(StudioPluginGui, {
-				id = "Rojo_ConnectedTableDiff",
-				title = "Table diff",
-				active = self.state.showingTableDiff,
-				isEphemeral = true,
+			TableDiff = if self.state.showingTableDiff
+				then e(StudioPluginGui, {
+					id = "Rojo_ConnectedTableDiff",
+					title = "Table diff",
+					active = self.state.showingTableDiff,
+					isEphemeral = true,
 
-				initDockState = Enum.InitialDockState.Float,
-				overridePreviousState = false,
-				floatingSize = Vector2.new(500, 350),
-				minimumSize = Vector2.new(400, 250),
+					initDockState = Enum.InitialDockState.Float,
+					overridePreviousState = false,
+					floatingSize = Vector2.new(500, 350),
+					minimumSize = Vector2.new(400, 250),
 
-				zIndexBehavior = Enum.ZIndexBehavior.Sibling,
+					zIndexBehavior = Enum.ZIndexBehavior.Sibling,
 
-				onClose = function()
-					self:setState({
-						showingTableDiff = false,
-					})
-				end,
-			}, {
-				TooltipsProvider = e(Tooltip.Provider, nil, {
-					Tooltips = e(Tooltip.Container, nil),
-					Content = e("Frame", {
-						Size = UDim2.fromScale(1, 1),
-						BackgroundTransparency = 1,
-					}, {
-						e(TableDiffVisualizer, {
-							size = UDim2.new(1, -10, 1, -10),
-							position = UDim2.new(0, 5, 0, 5),
-							anchorPoint = Vector2.new(0, 0),
-							transparency = self.props.transparency,
+					onClose = function()
+						self:setState({
+							showingTableDiff = false,
+						})
+					end,
+				}, {
+					TooltipsProvider = e(Tooltip.Provider, nil, {
+						Tooltips = e(Tooltip.Container, nil),
+						Content = e("Frame", {
+							Size = UDim2.fromScale(1, 1),
+							BackgroundTransparency = 1,
+						}, {
+							e(TableDiffVisualizer, {
+								size = UDim2.new(1, -10, 1, -10),
+								position = UDim2.new(0, 5, 0, 5),
+								anchorPoint = Vector2.new(0, 0),
+								transparency = self.props.transparency,
 
-							oldTable = self.state.oldTable,
-							newTable = self.state.newTable,
+								oldTable = self.state.oldTable,
+								newTable = self.state.newTable,
+							}),
 						}),
 					}),
-				}),
-			}),
+				})
+				else nil,
 		})
 	end)
 end
diff --git a/plugin/src/App/StatusPages/Connecting.lua b/plugin/src/App/StatusPages/Connecting.lua
index c3059a36..4d8e87b3 100644
--- a/plugin/src/App/StatusPages/Connecting.lua
+++ b/plugin/src/App/StatusPages/Connecting.lua
@@ -5,7 +5,9 @@ local Packages = Rojo.Packages
 local Roact = require(Packages.Roact)
 
 local Theme = require(Plugin.App.Theme)
+local Assets = require(Plugin.Assets)
 
+local BorderedContainer = require(Plugin.App.Components.BorderedContainer)
 local Spinner = require(Plugin.App.Components.Spinner)
 
 local e = Roact.createElement
@@ -14,32 +16,54 @@ local ConnectingPage = Roact.Component:extend("ConnectingPage")
 
 function ConnectingPage:render()
 	return Theme.with(function(theme)
-		return e("Frame", {
-			Size = UDim2.new(1, 0, 1, 0),
-			BackgroundTransparency = 1,
+		return e(BorderedContainer, {
+			size = UDim2.new(1, -32, 0, 118),
+			position = UDim2.fromScale(0.5, 0.5),
+			anchorPoint = Vector2.new(0.5, 0.5),
+			transparency = self.props.transparency,
+			backgroundColor = theme.Tokens.ElevatedCardBackground,
 		}, {
+			Logo = e("ImageLabel", {
+				Image = Assets.Images.Logo,
+				ImageColor3 = Color3.new(1, 1, 1),
+				ImageTransparency = self.props.transparency,
+				BackgroundTransparency = 1,
+				Size = UDim2.fromOffset(30, 30),
+				Position = UDim2.new(0.5, -20, 0, 12),
+				AnchorPoint = Vector2.new(0.5, 0),
+			}),
 			Spinner = e(Spinner, {
-				position = UDim2.new(0.5, 0, 0.5, 0),
-				anchorPoint = Vector2.new(0.5, 0.5),
+				position = UDim2.new(0.5, 22, 0, 15),
+				anchorPoint = Vector2.new(0.5, 0),
 				transparency = self.props.transparency,
 			}),
-			Text = if type(self.props.text) == "string" and #self.props.text > 0
-				then e("TextLabel", {
-					Text = self.props.text,
-					Position = UDim2.new(0.5, 0, 0.5, 30),
-					Size = UDim2.new(1, -40, 0.5, -40),
-					AnchorPoint = Vector2.new(0.5, 0),
-					TextXAlignment = Enum.TextXAlignment.Center,
-					TextYAlignment = Enum.TextYAlignment.Top,
-					RichText = true,
-					FontFace = theme.Font.Thin,
-					TextSize = theme.TextSize.Medium,
-					TextColor3 = theme.SubTextColor,
-					TextTruncate = Enum.TextTruncate.AtEnd,
-					TextTransparency = self.props.transparency,
-					BackgroundTransparency = 1,
-				})
-				else nil,
+			Title = e("TextLabel", {
+				Text = "Connecting to Prism server...",
+				Position = UDim2.new(0, 12, 0, 52),
+				Size = UDim2.new(1, -24, 0, 22),
+				TextXAlignment = Enum.TextXAlignment.Center,
+				FontFace = theme.Font.Main,
+				TextSize = theme.TextSize.Medium,
+				TextColor3 = theme.Tokens.PrimaryText,
+				TextTransparency = self.props.transparency,
+				BackgroundTransparency = 1,
+			}),
+			Detail = e("TextLabel", {
+				Text = if type(self.props.text) == "string" and #self.props.text > 0
+					then self.props.text
+					else "Waiting for a response",
+				Position = UDim2.new(0, 12, 0, 78),
+				Size = UDim2.new(1, -24, 0, 23),
+				TextXAlignment = Enum.TextXAlignment.Center,
+				TextYAlignment = Enum.TextYAlignment.Top,
+				RichText = true,
+				FontFace = theme.Font.Thin,
+				TextSize = theme.TextSize.Small,
+				TextColor3 = theme.Tokens.SecondaryText,
+				TextTruncate = Enum.TextTruncate.AtEnd,
+				TextTransparency = self.props.transparency,
+				BackgroundTransparency = 1,
+			}),
 		})
 	end)
 end
diff --git a/plugin/src/App/StatusPages/Error.lua b/plugin/src/App/StatusPages/Error.lua
index c6c6914c..34c14816 100644
--- a/plugin/src/App/StatusPages/Error.lua
+++ b/plugin/src/App/StatusPages/Error.lua
@@ -5,6 +5,7 @@ local Packages = Rojo.Packages
 local Roact = require(Packages.Roact)
 
 local Theme = require(Plugin.App.Theme)
+local Assets = require(Plugin.Assets)
 local getTextBoundsAsync = require(Plugin.App.getTextBoundsAsync)
 
 local TextButton = require(Plugin.App.Components.TextButton)
@@ -39,6 +40,7 @@ function Error:render()
 				return UDim2.new(1, 0, 0, math.min(outerSize.Y, maximumSize.Y))
 			end),
 			transparency = self.props.transparency,
+			borderColor = theme.Tokens.Danger,
 			layoutOrder = self.props.layoutOrder,
 		}, {
 			ScrollingFrame = e(ScrollingFrame, {
@@ -111,6 +113,7 @@ function ErrorPage:render()
 		end,
 	}, {
 		Header = e(Header, {
+			icon = Assets.Images.PluginButtonWarning,
 			transparency = self.props.transparency,
 			layoutOrder = 1,
 		}),
diff --git a/plugin/src/App/StatusPages/NotConnected.lua b/plugin/src/App/StatusPages/NotConnected.lua
index 2d0ae466..7fcece58 100644
--- a/plugin/src/App/StatusPages/NotConnected.lua
+++ b/plugin/src/App/StatusPages/NotConnected.lua
@@ -4,7 +4,9 @@ local Packages = Rojo.Packages
 
 local Roact = require(Packages.Roact)
 
+local Branding = require(Plugin.Branding)
 local Config = require(Plugin.Config)
+local Version = require(Plugin.Version)
 
 local Theme = require(Plugin.App.Theme)
 local BorderedContainer = require(Plugin.App.Components.BorderedContainer)
@@ -12,74 +14,127 @@ local TextButton = require(Plugin.App.Components.TextButton)
 local Header = require(Plugin.App.Components.Header)
 local Tooltip = require(Plugin.App.Components.Tooltip)
 
-local PORT_WIDTH = 74
+local PORT_WIDTH = 76
 local DIVIDER_WIDTH = 1
 local HOST_OFFSET = 12
 
 local e = Roact.createElement
 
-local function AddressEntry(props)
+local AddressEntry = Roact.Component:extend("AddressEntry")
+
+function AddressEntry:init()
+	self:setState({
+		focused = false,
+	})
+end
+
+function AddressEntry:render()
 	return Theme.with(function(theme)
+		local function focus()
+			self:setState({
+				focused = true,
+			})
+		end
+
+		local function blur()
+			self:setState({
+				focused = false,
+			})
+		end
+
 		return e(BorderedContainer, {
-			transparency = props.transparency,
-			size = UDim2.new(1, 0, 0, 36),
-			layoutOrder = props.layoutOrder,
+			transparency = self.props.transparency,
+			borderColor = if self.state.focused
+				then theme.AddressEntry.FocusBorderColor
+				else theme.BorderedContainer.BorderColor,
+			size = UDim2.new(1, 0, 0, 64),
+			layoutOrder = self.props.layoutOrder,
 		}, {
+			Status = e("Frame", {
+				Size = UDim2.new(1, -22, 0, 22),
+				Position = UDim2.fromOffset(11, 3),
+				BackgroundTransparency = 1,
+			}, {
+				Dot = e("Frame", {
+					Size = UDim2.fromOffset(7, 7),
+					Position = UDim2.new(0, 0, 0.5, 0),
+					AnchorPoint = Vector2.new(0, 0.5),
+					BackgroundColor3 = theme.Tokens.Warning,
+					BackgroundTransparency = self.props.transparency,
+					BorderSizePixel = 0,
+				}, {
+					Corner = e("UICorner", {
+						CornerRadius = UDim.new(1, 0),
+					}),
+				}),
+				Text = e("TextLabel", {
+					Text = "Disconnected",
+					FontFace = theme.Font.Main,
+					TextSize = theme.TextSize.Small,
+					TextColor3 = theme.Tokens.SecondaryText,
+					TextTransparency = self.props.transparency,
+					TextXAlignment = Enum.TextXAlignment.Left,
+					BackgroundTransparency = 1,
+					Position = UDim2.fromOffset(14, 0),
+					Size = UDim2.new(1, -14, 1, 0),
+				}),
+			}),
+
 			Host = e("TextBox", {
-				Text = props.host or "",
+				Text = self.props.host or "",
 				FontFace = theme.Font.Code,
-				TextSize = theme.TextSize.Large,
+				TextSize = theme.TextSize.Medium,
 				TextColor3 = theme.AddressEntry.TextColor,
 				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = props.transparency,
+				TextTransparency = self.props.transparency,
 				PlaceholderText = Config.defaultHost,
 				PlaceholderColor3 = theme.AddressEntry.PlaceholderColor,
 				ClearTextOnFocus = false,
-
-				Size = UDim2.new(1, -(HOST_OFFSET + DIVIDER_WIDTH + PORT_WIDTH), 1, 0),
-				Position = UDim2.new(0, HOST_OFFSET, 0, 0),
-
+				Selectable = true,
+				Size = UDim2.new(1, -(HOST_OFFSET + DIVIDER_WIDTH + PORT_WIDTH), 0, 37),
+				Position = UDim2.new(0, HOST_OFFSET, 0, 25),
 				ClipsDescendants = true,
 				BackgroundTransparency = 1,
-
+				[Roact.Event.Focused] = focus,
+				[Roact.Event.FocusLost] = blur,
 				[Roact.Change.Text] = function(object)
-					if props.onHostChange ~= nil then
-						props.onHostChange(object.Text)
+					if self.props.onHostChange ~= nil then
+						self.props.onHostChange(object.Text)
 					end
 				end,
 			}),
 
 			Port = e("TextBox", {
-				Text = props.port or "",
+				Text = self.props.port or "",
 				FontFace = theme.Font.Code,
-				TextSize = theme.TextSize.Large,
+				TextSize = theme.TextSize.Medium,
 				TextColor3 = theme.AddressEntry.TextColor,
-				TextTransparency = props.transparency,
+				TextTransparency = self.props.transparency,
 				PlaceholderText = Config.defaultPort,
 				PlaceholderColor3 = theme.AddressEntry.PlaceholderColor,
 				ClearTextOnFocus = false,
-
-				Size = UDim2.new(0, PORT_WIDTH, 1, 0),
-				Position = UDim2.new(1, 0, 0, 0),
+				Selectable = true,
+				Size = UDim2.new(0, PORT_WIDTH, 0, 37),
+				Position = UDim2.new(1, 0, 0, 25),
 				AnchorPoint = Vector2.new(1, 0),
-
 				ClipsDescendants = true,
 				BackgroundTransparency = 1,
-
+				[Roact.Event.Focused] = focus,
+				[Roact.Event.FocusLost] = blur,
 				[Roact.Change.Text] = function(object)
-					local text = object.Text
-					text = text:gsub("%D", "")
+					local text = object.Text:gsub("%D", "")
 					object.Text = text
 
-					if props.onPortChange ~= nil then
-						props.onPortChange(text)
+					if self.props.onPortChange ~= nil then
+						self.props.onPortChange(text)
 					end
 				end,
 			}, {
 				Divider = e("Frame", {
 					BackgroundColor3 = theme.BorderedContainer.BorderColor,
-					BackgroundTransparency = props.transparency,
-					Size = UDim2.new(0, DIVIDER_WIDTH, 1, 0),
+					BackgroundTransparency = self.props.transparency,
+					Size = UDim2.new(0, DIVIDER_WIDTH, 1, -8),
+					Position = UDim2.new(0, 0, 0, 4),
 					AnchorPoint = Vector2.new(1, 0),
 					BorderSizePixel = 0,
 				}),
@@ -91,72 +146,89 @@ end
 local NotConnectedPage = Roact.Component:extend("NotConnectedPage")
 
 function NotConnectedPage:render()
-	return Roact.createFragment({
-		Header = e(Header, {
-			transparency = self.props.transparency,
-			layoutOrder = 1,
-		}),
-
-		AddressEntry = e(AddressEntry, {
-			host = self.props.host,
-			port = self.props.port,
-			onHostChange = self.props.onHostChange,
-			onPortChange = self.props.onPortChange,
-			transparency = self.props.transparency,
-			layoutOrder = 2,
-		}),
-
-		Buttons = e("Frame", {
-			Size = UDim2.new(1, 0, 0, 34),
-			LayoutOrder = 3,
+	return Theme.with(function(theme)
+		return e("Frame", {
+			Size = UDim2.fromScale(1, 1),
 			BackgroundTransparency = 1,
-			ZIndex = 2,
 		}, {
-			Settings = e(TextButton, {
-				text = "Settings",
-				style = "Bordered",
+			Header = e(Header, {
+				full = true,
 				transparency = self.props.transparency,
 				layoutOrder = 1,
-				onClick = self.props.onNavigateSettings,
+			}),
+
+			AddressEntry = e(AddressEntry, {
+				host = self.props.host,
+				port = self.props.port,
+				onHostChange = self.props.onHostChange,
+				onPortChange = self.props.onPortChange,
+				transparency = self.props.transparency,
+				layoutOrder = 2,
+			}),
+
+			Buttons = e("Frame", {
+				Size = UDim2.new(1, 0, 0, 34),
+				LayoutOrder = 3,
+				BackgroundTransparency = 1,
+				ZIndex = 2,
 			}, {
-				Tip = e(Tooltip.Trigger, {
-					text = "View and modify plugin settings",
+				Settings = e(TextButton, {
+					text = "Settings",
+					style = "Bordered",
+					transparency = self.props.transparency,
+					layoutOrder = 1,
+					onClick = self.props.onNavigateSettings,
+				}, {
+					Tip = e(Tooltip.Trigger, {
+						text = "View and modify plugin settings",
+					}),
+				}),
+
+				Connect = e(TextButton, {
+					text = "Connect",
+					style = "Solid",
+					transparency = self.props.transparency,
+					layoutOrder = 2,
+					onClick = self.props.onConnect,
+				}, {
+					Tip = e(Tooltip.Trigger, {
+						text = "Connect to a Prism sync server",
+					}),
+				}),
+
+				Layout = e("UIListLayout", {
+					HorizontalAlignment = Enum.HorizontalAlignment.Right,
+					FillDirection = Enum.FillDirection.Horizontal,
+					SortOrder = Enum.SortOrder.LayoutOrder,
+					Padding = UDim.new(0, 10),
 				}),
 			}),
 
-			Connect = e(TextButton, {
-				text = "Connect",
-				style = "Solid",
-				transparency = self.props.transparency,
-				layoutOrder = 2,
-				onClick = self.props.onConnect,
-			}, {
-				Tip = e(Tooltip.Trigger, {
-					text = "Connect to a Prism sync server",
-				}),
+			Version = e("TextLabel", {
+				Text = `{Branding.Name} {Version.display(Config.version)}`,
+				FontFace = theme.Font.Thin,
+				TextSize = theme.TextSize.Small,
+				TextColor3 = theme.Tokens.MutedText,
+				TextTransparency = self.props.transparency,
+				BackgroundTransparency = 1,
+				Size = UDim2.new(1, 0, 0, 14),
+				LayoutOrder = 4,
 			}),
 
 			Layout = e("UIListLayout", {
-				HorizontalAlignment = Enum.HorizontalAlignment.Right,
-				FillDirection = Enum.FillDirection.Horizontal,
+				HorizontalAlignment = Enum.HorizontalAlignment.Center,
+				VerticalAlignment = Enum.VerticalAlignment.Center,
+				FillDirection = Enum.FillDirection.Vertical,
 				SortOrder = Enum.SortOrder.LayoutOrder,
-				Padding = UDim.new(0, 10),
+				Padding = UDim.new(0, 8),
 			}),
-		}),
 
-		Layout = e("UIListLayout", {
-			HorizontalAlignment = Enum.HorizontalAlignment.Center,
-			VerticalAlignment = Enum.VerticalAlignment.Center,
-			FillDirection = Enum.FillDirection.Vertical,
-			SortOrder = Enum.SortOrder.LayoutOrder,
-			Padding = UDim.new(0, 10),
-		}),
-
-		Padding = e("UIPadding", {
-			PaddingLeft = UDim.new(0, 20),
-			PaddingRight = UDim.new(0, 20),
-		}),
-	})
+			Padding = e("UIPadding", {
+				PaddingLeft = UDim.new(0, 16),
+				PaddingRight = UDim.new(0, 16),
+			}),
+		})
+	end)
 end
 
 return NotConnectedPage
diff --git a/plugin/src/App/StatusPages/Settings/init.lua b/plugin/src/App/StatusPages/Settings/init.lua
index 4abc5514..5c7be807 100644
--- a/plugin/src/App/StatusPages/Settings/init.lua
+++ b/plugin/src/App/StatusPages/Settings/init.lua
@@ -56,7 +56,7 @@ local function Navbar(props)
 			}),
 
 			Text = e("TextLabel", {
-				Text = "Settings",
+				Text = "Prism Settings",
 				FontFace = theme.Font.Thin,
 				TextSize = theme.TextSize.Large,
 				TextColor3 = navbarTheme.TextColor,
@@ -66,6 +66,16 @@ local function Navbar(props)
 
 				BackgroundTransparency = 1,
 			}),
+
+			Logo = e("ImageLabel", {
+				Image = Assets.Images.Logo,
+				ImageColor3 = theme.Header.LogoColor,
+				ImageTransparency = props.transparency,
+				BackgroundTransparency = 1,
+				Size = UDim2.fromOffset(24, 24),
+				Position = UDim2.new(1, -4, 0.5, 0),
+				AnchorPoint = Vector2.new(1, 0.5),
+			}),
 		})
 	end)
 end
diff --git a/plugin/src/App/StatusPages/StatusPages.spec.lua b/plugin/src/App/StatusPages/StatusPages.spec.lua
new file mode 100644
index 00000000..5467d347
--- /dev/null
+++ b/plugin/src/App/StatusPages/StatusPages.spec.lua
@@ -0,0 +1,211 @@
+return function()
+	local Rojo = script:FindFirstAncestor("Rojo")
+	local Plugin = Rojo.Plugin
+	local Roact = require(Rojo.Packages.Roact)
+
+	local Assets = require(Plugin.Assets)
+	local PatchSet = require(Plugin.PatchSet)
+	local PatchTree = require(Plugin.PatchTree)
+	local Theme = require(Plugin.App.Theme)
+	local Tooltip = require(Plugin.App.Components.Tooltip)
+
+	local Connected = require(script.Parent.Connected)
+	local Confirming = require(script.Parent.Confirming)
+	local Connecting = require(script.Parent.Connecting)
+	local Error = require(script.Parent.Error)
+	local NotConnected = require(script.Parent.NotConnected)
+	local SettingsPage = require(script.Parent.Settings)
+
+	local e = Roact.createElement
+	local transparency = select(1, Roact.createBinding(0))
+
+	local function findText(root, text)
+		for _, object in root:GetDescendants() do
+			if
+				(object:IsA("TextLabel") or object:IsA("TextButton") or object:IsA("TextBox"))
+				and object.Text == text
+			then
+				return object
+			end
+		end
+		return nil
+	end
+
+	local function expectNoVisibleRojo(root)
+		for _, object in root:GetDescendants() do
+			if object:IsA("TextLabel") or object:IsA("TextButton") or object:IsA("TextBox") then
+				expect(string.find(string.lower(object.Text), "rojo", 1, true)).to.equal(nil)
+			end
+		end
+	end
+
+	local function mountPage(component, props, size)
+		local target = Instance.new("Frame")
+		target.Size = UDim2.fromOffset(size.X, size.Y)
+		local handle = Roact.mount(
+			e(Theme.StudioProvider, nil, {
+				Tooltips = e(Tooltip.Provider, nil, {
+					Container = e(Tooltip.Container, nil),
+					Page = e(component, props),
+				}),
+			}),
+			target
+		)
+		task.wait()
+		return target, handle
+	end
+
+	local function unmountPage(target, handle)
+		Roact.unmount(handle)
+		target:Destroy()
+	end
+
+	describe("Prism status pages", function()
+		it("keeps the disconnected workflow functional in a narrow panel", function()
+			local hostChanged = function() end
+			local portChanged = function() end
+			local target, handle = mountPage(NotConnected, {
+				host = "127.0.0.1",
+				port = "34872",
+				onHostChange = hostChanged,
+				onPortChange = portChanged,
+				onConnect = function() end,
+				onNavigateSettings = function() end,
+				transparency = transparency,
+			}, Vector2.new(300, 210))
+
+			local wordmark = target:FindFirstChild("Wordmark", true)
+			expect(wordmark).to.be.ok()
+			expect(wordmark.Image).to.equal(Assets.Images.FullLogo)
+			expect(findText(target, "Studio automation for Roblox")).to.be.ok()
+			expect(findText(target, "Disconnected")).to.be.ok()
+			expect(findText(target, "127.0.0.1")).to.be.ok()
+			expect(findText(target, "34872")).to.be.ok()
+			expect(findText(target, "Connect")).to.be.ok()
+			expect(findText(target, "Settings")).to.be.ok()
+			expectNoVisibleRojo(target)
+
+			expect(wordmark.Size.X.Scale).to.equal(1)
+			expect(wordmark.Size.X.Offset).to.equal(-56)
+			unmountPage(target, handle)
+		end)
+
+		it("passes the existing connect and settings actions through unchanged", function()
+			local connectCalls = 0
+			local settingsCalls = 0
+			local consumer = NotConnected.render({
+				props = {
+					onConnect = function()
+						connectCalls += 1
+					end,
+					onNavigateSettings = function()
+						settingsCalls += 1
+					end,
+					transparency = transparency,
+				},
+			})
+			local root = consumer.props.render({
+				Font = {
+					Thin = Font.fromEnum(Enum.Font.SourceSans),
+				},
+				TextSize = {
+					Small = 13,
+				},
+				Tokens = Theme.Tokens,
+			})
+			local children = root.props[Roact.Children]
+			local buttons = children.Buttons.props[Roact.Children]
+
+			buttons.Connect.props.onClick()
+			buttons.Settings.props.onClick()
+			expect(connectCalls).to.equal(1)
+			expect(settingsCalls).to.equal(1)
+		end)
+
+		it("shows a compact connected summary without empty dead space", function()
+			local target, handle = mountPage(Connected, {
+				projectName = "PrismProject",
+				address = "localhost:34872",
+				patchData = {
+					patch = PatchSet.newEmpty(),
+					unapplied = PatchSet.newEmpty(),
+					timestamp = DateTime.now().UnixTimestamp,
+				},
+				patchTree = nil,
+				serveSession = nil,
+				onDisconnect = function() end,
+				onNavigateSettings = function() end,
+				transparency = transparency,
+			}, Vector2.new(300, 210))
+
+			expect(findText(target, "Prism")).to.be.ok()
+			expect(findText(target, "Connected")).to.be.ok()
+			expect(findText(target, "PrismProject")).to.be.ok()
+			expect(findText(target, "localhost:34872")).to.be.ok()
+			expect(findText(target, "Disconnect")).to.be.ok()
+			expect(findText(target, "Settings")).to.be.ok()
+			expectNoVisibleRojo(target)
+			unmountPage(target, handle)
+		end)
+
+		it("brands the connecting and confirming layouts", function()
+			local connectingTarget, connectingHandle = mountPage(Connecting, {
+				text = "Waiting for server",
+				transparency = transparency,
+			}, Vector2.new(300, 210))
+			expect(findText(connectingTarget, "Connecting to Prism server...")).to.be.ok()
+			expect(connectingTarget:FindFirstChild("Logo", true).Image).to.equal(Assets.Images.Logo)
+			expectNoVisibleRojo(connectingTarget)
+			unmountPage(connectingTarget, connectingHandle)
+
+			local patchTree = PatchTree.build(PatchSet.newEmpty(), {
+				fromIds = {},
+				fromInstances = {},
+			}, { "Property", "Current", "Incoming" })
+			local confirmingTarget, confirmingHandle = mountPage(Confirming, {
+				confirmData = {
+					serverInfo = {
+						projectName = "PrismProject",
+					},
+				},
+				patchTree = patchTree,
+				createPopup = false,
+				onAbort = function() end,
+				onAccept = function() end,
+				onReject = function() end,
+				transparency = transparency,
+			}, Vector2.new(500, 350))
+			expect(findText(confirmingTarget, "Review Prism sync changes for 'PrismProject'")).to.be.ok()
+			expect(confirmingTarget:FindFirstChild("Logo", true).Image).to.equal(Assets.Images.PluginButtonWarning)
+			expect(findText(confirmingTarget, "Accept")).to.be.ok()
+			expect(findText(confirmingTarget, "Abort")).to.be.ok()
+			unmountPage(confirmingTarget, confirmingHandle)
+		end)
+
+		it("uses the Prism warning asset for visible errors", function()
+			local target, handle = mountPage(Error, {
+				errorMessage = "Connection refused",
+				onClose = function() end,
+				transparency = transparency,
+			}, Vector2.new(300, 210))
+
+			expect(findText(target, "Connection refused")).to.be.ok()
+			expect(target:FindFirstChild("Logo", true).Image).to.equal(Assets.Images.PluginButtonWarning)
+			expect(findText(target, "Okay")).to.be.ok()
+			expectNoVisibleRojo(target)
+			unmountPage(target, handle)
+		end)
+
+		it("opens the existing settings surface with Prism branding", function()
+			local target, handle = mountPage(SettingsPage, {
+				syncActive = false,
+				onBack = function() end,
+				transparency = transparency,
+			}, Vector2.new(300, 300))
+
+			expect(findText(target, "Prism Settings")).to.be.ok()
+			expect(target:FindFirstChild("Logo", true).Image).to.equal(Assets.Images.Logo)
+			unmountPage(target, handle)
+		end)
+	end)
+end
diff --git a/plugin/src/App/Theme.lua b/plugin/src/App/Theme.lua
index 09e3bd57..3165d74c 100644
--- a/plugin/src/App/Theme.lua
+++ b/plugin/src/App/Theme.lua
@@ -1,10 +1,10 @@
 --[[
-	Theming system provided through Roact's context.
-	Uses Studio colors when possible.
+	Prism's theme is provided through Roact context. The fixed dark palette keeps
+	the plugin recognizable and readable in either Studio theme while retaining
+	the existing Theme API used by the upstream-compatible UI components.
 ]]
 
--- Studio does not exist outside Roblox Studio, so we'll lazily initialize it
--- when possible.
+-- Studio does not exist outside Roblox Studio, so we'll lazily initialize it.
 local _Studio
 local function getStudio()
 	if _Studio == nil then
@@ -23,19 +23,33 @@ local Roact = require(Packages.Roact)
 
 local strict = require(script.Parent.Parent.strict)
 
-local BRAND_COLOR = Color3.fromHex("E13835")
+local Tokens = table.freeze({
+	PanelBackground = Color3.fromHex("080D18"),
+	CardBackground = Color3.fromHex("101827"),
+	ElevatedCardBackground = Color3.fromHex("172238"),
+	Border = Color3.fromHex("33415C"),
+	PrimaryText = Color3.fromHex("F3F7FF"),
+	SecondaryText = Color3.fromHex("C4CDDF"),
+	MutedText = Color3.fromHex("8793AA"),
+	PrimaryAccent = Color3.fromHex("62DDF2"),
+	Success = Color3.fromHex("54D9AA"),
+	Warning = Color3.fromHex("F1B85B"),
+	Danger = Color3.fromHex("FF7185"),
+	ButtonHover = Color3.fromHex("FFFFFF"),
+	ButtonPressed = Color3.fromHex("D8E5FF"),
+	InputBackground = Color3.fromHex("0C1423"),
+	InputBorder = Color3.fromHex("40506D"),
+	OverlayDarkness = 0.68,
+	CornerRadius = 8,
+})
 
 local Context = Roact.createContext({})
 
 local StudioProvider = Roact.Component:extend("StudioProvider")
 
--- Pull the current theme from Roblox Studio and update state with it.
 function StudioProvider:updateTheme()
-	local studioTheme = getStudio().Theme
-
-	local isDark = studioTheme.Name == "Dark"
-
-	local theme = strict(studioTheme.Name .. "Theme", {
+	local theme = strict("PrismTheme", {
+		Tokens = Tokens,
 		Font = {
 			Main = Font.new("rbxasset://fonts/families/Montserrat.json", Enum.FontWeight.Medium, Enum.FontStyle.Normal),
 			Bold = Font.new("rbxasset://fonts/families/Montserrat.json", Enum.FontWeight.Bold, Enum.FontStyle.Normal),
@@ -57,169 +71,150 @@ function StudioProvider:updateTheme()
 			Large = 18,
 			Code = 16,
 		},
-		BrandColor = BRAND_COLOR,
-		BackgroundColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.MainBackground),
-		TextColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.MainText),
-		SubTextColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.SubText),
+		BrandColor = Tokens.PrimaryAccent,
+		BackgroundColor = Tokens.PanelBackground,
+		TextColor = Tokens.PrimaryText,
+		SubTextColor = Tokens.SecondaryText,
 		Button = {
 			Solid = {
-				-- Solid uses brand theming, not Studio theming.
-				ActionFillColor = Color3.fromHex("FFFFFF"),
-				ActionFillTransparency = 0.8,
+				HasBackground = true,
+				HasBorder = false,
+				PressedColor = Tokens.ButtonPressed,
+				ActionFillColor = Tokens.ButtonHover,
+				ActionFillTransparency = 0.86,
 				Enabled = {
-					TextColor = Color3.fromHex("FFFFFF"),
-					BackgroundColor = BRAND_COLOR,
+					TextColor = Tokens.PanelBackground,
+					BackgroundColor = Tokens.PrimaryAccent,
 				},
 				Disabled = {
-					TextColor = Color3.fromHex("FFFFFF"),
-					BackgroundColor = BRAND_COLOR,
+					TextColor = Tokens.MutedText,
+					BackgroundColor = Tokens.Border,
 				},
 			},
 			Bordered = {
-				ActionFillColor = studioTheme:GetColor(
-					Enum.StudioStyleGuideColor.ButtonText,
-					Enum.StudioStyleGuideModifier.Selected
-				),
-				ActionFillTransparency = 0.9,
+				HasBackground = false,
+				HasBorder = true,
+				PressedColor = Tokens.ButtonPressed,
+				ActionFillColor = Tokens.ButtonHover,
+				ActionFillTransparency = 0.91,
 				Enabled = {
-					TextColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.ButtonText),
-					BorderColor = studioTheme:GetColor(
-						Enum.StudioStyleGuideColor.CheckedFieldBorder,
-						Enum.StudioStyleGuideModifier.Disabled
-					),
+					TextColor = Tokens.SecondaryText,
+					BorderColor = Tokens.Border,
 				},
 				Disabled = {
-					TextColor = studioTheme:GetColor(
-						Enum.StudioStyleGuideColor.ButtonText,
-						Enum.StudioStyleGuideModifier.Disabled
-					),
-					BorderColor = studioTheme:GetColor(
-						Enum.StudioStyleGuideColor.CheckedFieldBorder,
-						Enum.StudioStyleGuideModifier.Disabled
-					),
+					TextColor = Tokens.MutedText,
+					BorderColor = Tokens.InputBorder,
+				},
+			},
+			Danger = {
+				HasBackground = false,
+				HasBorder = true,
+				PressedColor = Tokens.Danger,
+				ActionFillColor = Tokens.Danger,
+				ActionFillTransparency = 0.91,
+				Enabled = {
+					TextColor = Tokens.Danger,
+					BorderColor = Tokens.Danger,
+				},
+				Disabled = {
+					TextColor = Tokens.MutedText,
+					BorderColor = Tokens.Border,
 				},
 			},
 		},
 		Checkbox = {
 			Active = {
-				-- Active checkboxes use brand theming, not Studio theming.
-				IconColor = Color3.fromHex("FFFFFF"),
-				BackgroundColor = BRAND_COLOR,
+				IconColor = Tokens.PanelBackground,
+				BackgroundColor = Tokens.PrimaryAccent,
 			},
 			Inactive = {
-				IconColor = studioTheme:GetColor(
-					Enum.StudioStyleGuideColor.CheckedFieldIndicator,
-					Enum.StudioStyleGuideModifier.Disabled
-				),
-				BorderColor = studioTheme:GetColor(
-					Enum.StudioStyleGuideColor.CheckedFieldBorder,
-					Enum.StudioStyleGuideModifier.Disabled
-				),
+				IconColor = Tokens.MutedText,
+				BorderColor = Tokens.InputBorder,
 			},
 		},
 		Dropdown = {
-			TextColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.ButtonText),
-			BorderColor = studioTheme:GetColor(
-				Enum.StudioStyleGuideColor.CheckedFieldBorder,
-				Enum.StudioStyleGuideModifier.Disabled
-			),
-			BackgroundColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.MainBackground),
-			IconColor = studioTheme:GetColor(
-				Enum.StudioStyleGuideColor.CheckedFieldIndicator,
-				Enum.StudioStyleGuideModifier.Disabled
-			),
+			TextColor = Tokens.PrimaryText,
+			BorderColor = Tokens.InputBorder,
+			BackgroundColor = Tokens.ElevatedCardBackground,
+			IconColor = Tokens.SecondaryText,
 		},
 		TextInput = {
 			Enabled = {
-				TextColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
-				PlaceholderColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.SubText),
-				BorderColor = studioTheme:GetColor(
-					Enum.StudioStyleGuideColor.CheckedFieldBorder,
-					Enum.StudioStyleGuideModifier.Disabled
-				),
+				TextColor = Tokens.PrimaryText,
+				PlaceholderColor = Tokens.MutedText,
+				BorderColor = Tokens.InputBorder,
 			},
 			Disabled = {
-				TextColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.MainText),
-				PlaceholderColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.SubText),
-				BorderColor = studioTheme:GetColor(
-					Enum.StudioStyleGuideColor.CheckedFieldBorder,
-					Enum.StudioStyleGuideModifier.Disabled
-				),
+				TextColor = Tokens.MutedText,
+				PlaceholderColor = Tokens.MutedText,
+				BorderColor = Tokens.Border,
 			},
-			ActionFillColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
-			ActionFillTransparency = 0.9,
+			ActionFillColor = Tokens.ButtonHover,
+			ActionFillTransparency = 0.94,
+			FocusBorderColor = Tokens.PrimaryAccent,
 		},
 		AddressEntry = {
-			TextColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
-			PlaceholderColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.SubText),
+			TextColor = Tokens.PrimaryText,
+			PlaceholderColor = Tokens.MutedText,
+			LabelColor = Tokens.MutedText,
+			FocusBorderColor = Tokens.PrimaryAccent,
 		},
 		BorderedContainer = {
-			BorderColor = studioTheme:GetColor(
-				Enum.StudioStyleGuideColor.CheckedFieldBorder,
-				Enum.StudioStyleGuideModifier.Disabled
-			),
-			BackgroundColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.InputFieldBackground),
+			BorderColor = Tokens.Border,
+			BorderedColor = Tokens.ElevatedCardBackground,
+			BackgroundColor = Tokens.CardBackground,
 		},
 		Spinner = {
-			ForegroundColor = BRAND_COLOR,
-			BackgroundColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.InputFieldBackground),
+			ForegroundColor = Tokens.PrimaryAccent,
+			BackgroundColor = Tokens.Border,
 		},
 		Diff = {
-			-- Very bright different colors in case some places were not updated to use
-			-- the new background diff colors.
-			Add = Color3.fromRGB(255, 0, 255),
-			Remove = Color3.fromRGB(255, 0, 255),
-			Edit = Color3.fromRGB(255, 0, 255),
-
-			Row = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
-			Warning = studioTheme:GetColor(Enum.StudioStyleGuideColor.WarningText),
-
+			Add = Tokens.Success,
+			Remove = Tokens.Danger,
+			Edit = Color3.fromHex("7F9DFF"),
+			Row = Tokens.PrimaryText,
+			Warning = Tokens.Warning,
 			Background = {
-				-- Studio doesn't have good colors since their diffs use backgrounds, not text
-				Add = if isDark then Color3.fromRGB(143, 227, 154) else Color3.fromRGB(41, 164, 45),
-				Remove = if isDark then Color3.fromRGB(242, 125, 125) else Color3.fromRGB(150, 29, 29),
-				Edit = if isDark then Color3.fromRGB(120, 154, 248) else Color3.fromRGB(0, 70, 160),
-				Remain = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
+				Add = Color3.fromHex("8DE4B9"),
+				Remove = Color3.fromHex("FF9AA8"),
+				Edit = Color3.fromHex("9EB3FF"),
+				Remain = Tokens.PrimaryText,
 			},
-
 			Text = {
-				Add = if isDark then Color3.new(0, 0, 0) else Color3.new(1, 1, 1),
-				Remove = if isDark then Color3.new(0, 0, 0) else Color3.new(1, 1, 1),
-				Edit = if isDark then Color3.new(0, 0, 0) else Color3.new(1, 1, 1),
-				Remain = studioTheme:GetColor(Enum.StudioStyleGuideColor.MainText),
+				Add = Tokens.PanelBackground,
+				Remove = Tokens.PanelBackground,
+				Edit = Tokens.PanelBackground,
+				Remain = Tokens.PrimaryText,
 			},
 		},
 		ConnectionDetails = {
-			ProjectNameColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
-			AddressColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
-			DisconnectColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
+			ProjectNameColor = Tokens.PrimaryText,
+			AddressColor = Tokens.SecondaryText,
+			DisconnectColor = Tokens.Danger,
 		},
 		Settings = {
-			DividerColor = studioTheme:GetColor(
-				Enum.StudioStyleGuideColor.CheckedFieldBorder,
-				Enum.StudioStyleGuideModifier.Disabled
-			),
+			DividerColor = Tokens.Border,
 			Navbar = {
-				BackButtonColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
-				TextColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
+				BackButtonColor = Tokens.SecondaryText,
+				TextColor = Tokens.PrimaryText,
 			},
 			Setting = {
-				NameColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
-				DescriptionColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.MainText),
-				UnstableColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.WarningText),
-				DebugColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.InfoText),
+				NameColor = Tokens.PrimaryText,
+				DescriptionColor = Tokens.SecondaryText,
+				UnstableColor = Tokens.Warning,
+				DebugColor = Tokens.PrimaryAccent,
 			},
 		},
 		Header = {
-			LogoColor = BRAND_COLOR,
-			VersionColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.MainText),
+			LogoColor = Color3.new(1, 1, 1),
+			VersionColor = Tokens.MutedText,
 		},
 		Notification = {
-			InfoColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
-			CloseColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
+			InfoColor = Tokens.PrimaryText,
+			CloseColor = Tokens.SecondaryText,
 		},
-		ErrorColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
-		ScrollBarColor = studioTheme:GetColor(Enum.StudioStyleGuideColor.BrightText),
+		ErrorColor = Tokens.PrimaryText,
+		ScrollBarColor = Tokens.SecondaryText,
 	})
 
 	self:setState({
@@ -230,7 +225,6 @@ end
 function StudioProvider:init()
 	self:updateTheme()
 
-	-- Preload the Fonts so that getTextBoundsAsync won't yield
 	local fontAssetIds = {}
 	for _, font in self.state.theme.Font do
 		table.insert(fontAssetIds, font.Family)
@@ -261,6 +255,7 @@ local function with(callback)
 end
 
 return {
+	Tokens = Tokens,
 	StudioProvider = StudioProvider,
 	Consumer = Context.Consumer,
 	with = with,
diff --git a/plugin/src/App/Theme.spec.lua b/plugin/src/App/Theme.spec.lua
new file mode 100644
index 00000000..8a90a4c0
--- /dev/null
+++ b/plugin/src/App/Theme.spec.lua
@@ -0,0 +1,26 @@
+return function()
+	local Theme = require(script.Parent.Theme)
+
+	describe("Prism theme", function()
+		it("defines the centralized glass UI tokens", function()
+			local tokens = Theme.Tokens
+			expect(tokens.PanelBackground).to.be.ok()
+			expect(tokens.CardBackground).to.be.ok()
+			expect(tokens.ElevatedCardBackground).to.be.ok()
+			expect(tokens.Border).to.be.ok()
+			expect(tokens.PrimaryText).to.be.ok()
+			expect(tokens.SecondaryText).to.be.ok()
+			expect(tokens.MutedText).to.be.ok()
+			expect(tokens.PrimaryAccent).to.be.ok()
+			expect(tokens.Success).to.be.ok()
+			expect(tokens.Warning).to.be.ok()
+			expect(tokens.Danger).to.be.ok()
+			expect(tokens.ButtonHover).to.be.ok()
+			expect(tokens.ButtonPressed).to.be.ok()
+			expect(tokens.InputBackground).to.be.ok()
+			expect(tokens.InputBorder).to.be.ok()
+			expect(tokens.OverlayDarkness >= 0.5).to.equal(true)
+			expect(tokens.OverlayDarkness <= 0.8).to.equal(true)
+		end)
+	end)
+end
diff --git a/plugin/src/App/init.lua b/plugin/src/App/init.lua
index 40873df0..d4bc89b8 100644
--- a/plugin/src/App/init.lua
+++ b/plugin/src/App/init.lua
@@ -12,6 +12,7 @@ local Log = require(Packages.Log)
 local Promise = require(Packages.Promise)
 
 local Assets = require(Plugin.Assets)
+local Branding = require(Plugin.Branding)
 local Version = require(Plugin.Version)
 local Config = require(Plugin.Config)
 local Settings = require(Plugin.Settings)
@@ -28,6 +29,7 @@ local timeUtil = require(Plugin.timeUtil)
 local Theme = require(script.Theme)
 
 local Page = require(script.Page)
+local PrismBackground = require(script.Components.PrismBackground)
 local Notifications = require(script.Components.Notifications)
 local Tooltip = require(script.Components.Tooltip)
 local StudioPluginAction = require(script.Components.Studio.StudioPluginAction)
@@ -460,7 +462,7 @@ function App:checkSyncReminder()
 
 				local timeSinceSync = timeUtil.elapsedToText(os.time() - priorSyncInfo.timestamp)
 				self:sendSyncReminder(
-					`You synced project '{priorSyncInfo.projectName}' to this place {timeSinceSync}.\nDid you mean to run 'rojo serve' and then connect?`,
+					`You synced project '{priorSyncInfo.projectName}' to this place {timeSinceSync}.\nDid you mean to run 'prism serve' and then connect?`,
 					{ "Connect", "Forget", "Dismiss" }
 				)
 			end
@@ -854,8 +856,8 @@ end
 
 function App:render()
 	-- Keep the legacy widget ID so existing Studio dock state is preserved.
-	local pluginId = "Rojo " .. Version.display(Config.version)
-	local pluginName = "Prism " .. Version.display(Config.version)
+	local pluginId = Branding.Compatibility.DockWidgetIdPrefix .. Version.display(Config.version)
+	local pluginName = Branding.DockWidgetTitlePrefix .. Version.display(Config.version)
 
 	local function createPageElement(appStatus, additionalProps)
 		additionalProps = additionalProps or {}
@@ -863,6 +865,7 @@ function App:render()
 		local props = Dictionary.merge(additionalProps, {
 			component = StatusPages[appStatus],
 			active = self.state.appStatus == appStatus,
+			zIndex = 2,
 		})
 
 		return e(Page, props)
@@ -898,6 +901,10 @@ function App:render()
 						})
 					end,
 				}, {
+					PrismBackground = e(PrismBackground, {
+						active = self.state.guiEnabled,
+					}),
+
 					Tooltips = e(Tooltip.Container, nil),
 
 					NotConnectedPage = createPageElement(AppStatus.NotConnected, {
@@ -980,7 +987,7 @@ function App:render()
 					}),
 				}),
 
-				RojoNotifications = e("ScreenGui", {
+				PrismNotifications = e("ScreenGui", {
 					ZIndexBehavior = Enum.ZIndexBehavior.Sibling,
 					ResetOnSpawn = false,
 					DisplayOrder = 100,
@@ -997,7 +1004,7 @@ function App:render()
 
 			-- Keep action IDs stable so existing Studio shortcuts continue to work.
 			toggleAction = e(StudioPluginAction, {
-				name = "RojoConnection",
+				name = Branding.Compatibility.ToggleActionId,
 				title = "Prism: Connect/Disconnect",
 				description = "Toggles the server for a Prism sync session",
 				icon = Assets.Images.PluginButton,
@@ -1014,7 +1021,7 @@ function App:render()
 			}),
 
 			connectAction = e(StudioPluginAction, {
-				name = "RojoConnect",
+				name = Branding.Compatibility.ConnectActionId,
 				title = "Prism: Connect",
 				description = "Connects the server for a Prism sync session",
 				icon = Assets.Images.PluginButton,
@@ -1027,7 +1034,7 @@ function App:render()
 			}),
 
 			disconnectAction = e(StudioPluginAction, {
-				name = "RojoDisconnect",
+				name = Branding.Compatibility.DisconnectActionId,
 				title = "Prism: Disconnect",
 				description = "Disconnects the server for a Prism sync session",
 				icon = Assets.Images.PluginButton,
@@ -1040,10 +1047,12 @@ function App:render()
 			}),
 
 			toolbar = e(StudioToolbar, {
-				name = pluginName,
+				name = Branding.Name,
 			}, {
 				button = e(StudioToggleButton, {
-					name = "Rojo", -- Legacy toolbar button ID.
+					-- The first value is the retained shortcut ID; text is the visible label.
+					name = Branding.Compatibility.ToolbarButtonId,
+					text = Branding.Name,
 					tooltip = "Show or hide the Prism panel",
 					icon = self.state.toolbarIcon,
 					active = self.state.guiEnabled,
diff --git a/plugin/src/Assets.lua b/plugin/src/Assets.lua
index 01891b72..22632676 100644
--- a/plugin/src/Assets.lua
+++ b/plugin/src/Assets.lua
@@ -1,4 +1,5 @@
 local strict = require(script.Parent.strict)
+local Branding = require(script.Parent.Branding)
 
 local Assets = {
 	Sprites = {},
@@ -16,16 +17,17 @@ local Assets = {
 		},
 	},
 	Images = {
-		Logo = "rbxassetid://84145747248222",
-		PluginButton = "rbxassetid://84145747248222",
-		PluginButtonConnected = "rbxassetid://9529783993",
-		PluginButtonWarning = "rbxassetid://9529784530",
+		Logo = Branding.IconAssetId,
+		FullLogo = Branding.FullLogoAssetId,
+		PluginButton = Branding.IconAssetId,
+		PluginButtonConnected = Branding.IconAssetId,
+		PluginButtonWarning = Branding.WarningAssetId,
 		Icons = {
 			Close = "rbxassetid://6012985953",
 			Back = "rbxassetid://6017213752",
 			Reset = "rbxassetid://10142422327",
 			Expand = "rbxassetid://12045401097",
-			Warning = "rbxassetid://16571019891",
+			Warning = Branding.WarningAssetId,
 			Debug = "rbxassetid://16588411361",
 			Checkmark = "rbxassetid://16571012729",
 			Exclamation = "rbxassetid://16571172190",
diff --git a/plugin/src/Branding.lua b/plugin/src/Branding.lua
new file mode 100644
index 00000000..f9b3e62e
--- /dev/null
+++ b/plugin/src/Branding.lua
@@ -0,0 +1,19 @@
+local Branding = {
+	Name = "Prism",
+	Tagline = "Studio automation for Roblox",
+	FullLogoAssetId = "rbxassetid://78583834238790",
+	IconAssetId = "rbxassetid://84145747248222",
+	WarningAssetId = "rbxassetid://130567248372259",
+	-- Retain the original field for consumers that already use it as the compact icon.
+	AssetId = "rbxassetid://84145747248222",
+	DockWidgetTitlePrefix = "Prism ",
+	Compatibility = {
+		DockWidgetIdPrefix = "Rojo ",
+		ToolbarButtonId = "Rojo",
+		ToggleActionId = "RojoConnection",
+		ConnectActionId = "RojoConnect",
+		DisconnectActionId = "RojoDisconnect",
+	},
+}
+
+return table.freeze(Branding)
diff --git a/plugin/src/Branding.spec.lua b/plugin/src/Branding.spec.lua
new file mode 100644
index 00000000..1507d985
--- /dev/null
+++ b/plugin/src/Branding.spec.lua
@@ -0,0 +1,30 @@
+return function()
+	local Branding = require(script.Parent.Branding)
+
+	describe("Prism branding", function()
+		it("uses the uploaded Prism identity", function()
+			expect(Branding.Name).to.equal("Prism")
+			expect(Branding.Tagline).to.equal("Studio automation for Roblox")
+			expect(Branding.FullLogoAssetId).to.equal("rbxassetid://78583834238790")
+			expect(Branding.IconAssetId).to.equal("rbxassetid://84145747248222")
+			expect(Branding.WarningAssetId).to.equal("rbxassetid://130567248372259")
+			expect(Branding.AssetId).to.equal("rbxassetid://84145747248222")
+			expect(Branding.DockWidgetTitlePrefix).to.equal("Prism ")
+		end)
+
+		it("maps normal and degraded toolbar states to Prism assets", function()
+			local Assets = require(script.Parent.Assets)
+			expect(Assets.Images.PluginButton).to.equal(Branding.IconAssetId)
+			expect(Assets.Images.PluginButtonConnected).to.equal(Branding.IconAssetId)
+			expect(Assets.Images.PluginButtonWarning).to.equal(Branding.WarningAssetId)
+		end)
+
+		it("retains Studio compatibility identifiers", function()
+			expect(Branding.Compatibility.DockWidgetIdPrefix).to.equal("Rojo ")
+			expect(Branding.Compatibility.ToolbarButtonId).to.equal("Rojo")
+			expect(Branding.Compatibility.ToggleActionId).to.equal("RojoConnection")
+			expect(Branding.Compatibility.ConnectActionId).to.equal("RojoConnect")
+			expect(Branding.Compatibility.DisconnectActionId).to.equal("RojoDisconnect")
+		end)
+	end)
+end
diff --git a/plugin/src/Exec.spec.lua b/plugin/src/Exec.spec.lua
index c4d70029..52654cc0 100644
--- a/plugin/src/Exec.spec.lua
+++ b/plugin/src/Exec.spec.lua
@@ -360,6 +360,21 @@ return function()
 			expect(state.finishCount).to.equal(1)
 		end)
 
+		it("cleans up after temporary module configuration fails", function()
+			local dependencies, state = makeRunDependencies()
+			dependencies.configureTemporaryModule = function()
+				error("Source assignment was rejected")
+			end
+
+			local payload = runWith(dependencies)
+
+			expect(payload.outcome).to.equal("runtimeFailure")
+			expect(payload.error:find("Source assignment was rejected", 1, true)).to.be.ok()
+			expect(state.invocationCount).to.equal(0)
+			expect(state.finishCount).to.equal(0)
+			expect(state.cleanupCount).to.equal(1)
+		end)
+
 		it("returns a timeout payload and cancels the worker", function()
 			local dependencies, state = makeRunDependencies()
 			local releaseWorker = Instance.new("BindableEvent")
diff --git a/plugin/src/ExecSpike.lua b/plugin/src/ExecSpike.lua
deleted file mode 100644
index 35708fe4..00000000
--- a/plugin/src/ExecSpike.lua
+++ /dev/null
@@ -1,333 +0,0 @@
-local ChangeHistoryService = game:GetService("ChangeHistoryService")
-local HttpService = game:GetService("HttpService")
-local RunService = game:GetService("RunService")
-
-export type ExecSpikeResult = {
-	ok: boolean,
-	phase: "success" | "compile" | "runtime" | "rejected" | "internal",
-	result: (string | number | boolean)?,
-	error: string?,
-	traceback: string?,
-	cleanupError: string?,
-}
-
-local ExecSpike = {}
-
-local temporaryNameCounter = 0
-
-local function sanitizeScriptName(scriptName: string): string
-	local sanitized = scriptName:gsub("[^%w%._%-]", "_"):gsub("_+", "_")
-	sanitized = sanitized:sub(1, 48)
-
-	if sanitized == "" or sanitized:find("%w") == nil then
-		return "script"
-	end
-
-	return sanitized
-end
-
-local function makeTemporaryName(scriptName: string, uniqueToken: string): string
-	temporaryNameCounter += 1
-
-	return string.format(
-		"__RojoExecSpike_%s_%d_%s",
-		sanitizeScriptName(scriptName),
-		temporaryNameCounter,
-		sanitizeScriptName(uniqueToken)
-	)
-end
-
-local function buildWrapper(source: string): string
-	-- Shadow the plugin global as defense in depth. The trusted source receives
-	-- only the deliberately minimal rojoExec table below.
-	return "return function(rojoExec)\n"
-		.. "\tlocal plugin = nil\n"
-		.. "\t-- submitted source begins here\n"
-		.. source
-		.. "\nend\n"
-end
-
-local function validateResult(value: any): (boolean, string?)
-	local valueType = type(value)
-	if valueType == "nil" or valueType == "string" or valueType == "number" or valueType == "boolean" then
-		return true
-	end
-
-	return false,
-		string.format(
-			"Unsupported exec result type '%s'; this spike accepts only nil, string, number, or boolean",
-			valueType
-		)
-end
-
-local function formatErrorValue(errorValue: any): string
-	local ok, message = pcall(tostring, errorValue)
-	if ok then
-		return message
-	end
-
-	return "<error value could not be formatted>"
-end
-
-local function formatTraceback(errorValue: any, tracebackFunction: (string, number) -> any): string
-	local tracebackOk, traceback = pcall(tracebackFunction, formatErrorValue(errorValue), 2)
-	if tracebackOk then
-		return tostring(traceback)
-	end
-
-	return "<traceback could not be formatted>"
-end
-
-local function captureError(errorValue: any, tracebackFunction: (string, number) -> any)
-	return {
-		error = formatErrorValue(errorValue),
-		traceback = formatTraceback(errorValue, tracebackFunction),
-	}
-end
-
-local function makeProtectedOnce(callback)
-	local called = false
-
-	return function(...)
-		if called then
-			return true
-		end
-
-		called = true
-		return pcall(callback, ...)
-	end
-end
-
-local function failure(phase, errorMessage, traceback): ExecSpikeResult
-	return {
-		ok = false,
-		phase = phase,
-		error = tostring(errorMessage),
-		traceback = traceback,
-	}
-end
-
-local function runWithDependencies(source: any, scriptName: any, dependencies): ExecSpikeResult
-	if type(source) ~= "string" then
-		return failure("rejected", "Exec source must be a string")
-	end
-
-	if scriptName ~= nil and type(scriptName) ~= "string" then
-		return failure("rejected", "Exec script name must be a string when provided")
-	end
-
-	local displayName = sanitizeScriptName(scriptName or "script.lua")
-	local temporaryModule = nil
-	local recording = nil
-	local finalResult: ExecSpikeResult? = nil
-
-	local finishRecordingOnce = makeProtectedOnce(function()
-		dependencies.finishRecording(recording)
-	end)
-	local cleanupOnce = makeProtectedOnce(function()
-		dependencies.cleanupTemporaryModule(temporaryModule)
-	end)
-
-	local controllerOk, controllerFailure = xpcall(function()
-		if not dependencies.isEdit() then
-			finalResult = failure("rejected", "Rojo exec spike is available only in Studio edit mode")
-			return
-		end
-
-		local wrapper = buildWrapper(source)
-		local temporaryName = makeTemporaryName(displayName, dependencies.generateUniqueToken())
-
-		-- Keep the instance in controller scope before any protected Source or
-		-- parenting operation so every later failure can destroy it.
-		temporaryModule = dependencies.createTemporaryModule()
-		dependencies.configureTemporaryModule(temporaryModule, temporaryName, wrapper)
-
-		-- Re-check at the actual compile boundary in case Studio changed modes
-		-- while the temporary module was being prepared.
-		if not dependencies.isEdit() then
-			finalResult = failure("rejected", "Studio left edit mode before the exec wrapper could be compiled")
-			return
-		end
-
-		local loadOk, loadedValue = pcall(dependencies.requireTemporaryModule, temporaryModule)
-		if not loadOk then
-			finalResult = failure("compile", loadedValue)
-			return
-		end
-
-		if type(loadedValue) ~= "function" then
-			finalResult = failure(
-				"compile",
-				string.format("Exec wrapper returned '%s' instead of a callable function", type(loadedValue))
-			)
-			return
-		end
-
-		recording = dependencies.tryBeginRecording("Rojo Exec Spike: " .. displayName)
-		if recording == nil then
-			finalResult = failure("internal", "Could not begin the Rojo exec spike undo recording")
-			return
-		end
-
-		-- The recording is open now, making this the final check immediately
-		-- before invoking user code. A rejection still finishes the recording.
-		if not dependencies.isEdit() then
-			finalResult = failure("rejected", "Studio left edit mode before the exec function could be invoked")
-			return
-		end
-
-		local runtimeOk, runtimePayload = xpcall(function()
-			local rojoExec = table.freeze({})
-			return {
-				value = loadedValue(rojoExec),
-			}
-		end, function(errorValue)
-			return captureError(errorValue, dependencies.traceback)
-		end)
-
-		-- Commit even after a runtime failure so any partial mutations remain a
-		-- single undoable action owned by this controller.
-		local finishOk, finishError = finishRecordingOnce()
-		if not finishOk then
-			local captured = captureError(finishError, dependencies.traceback)
-			finalResult = failure(
-				"internal",
-				"Failed to finish the Rojo exec spike undo recording: " .. captured.error,
-				captured.traceback
-			)
-			return
-		end
-
-		if not runtimeOk then
-			finalResult = failure("runtime", runtimePayload.error, runtimePayload.traceback)
-			return
-		end
-
-		local resultOk, resultError = validateResult(runtimePayload.value)
-		if not resultOk then
-			finalResult = failure("runtime", resultError)
-			return
-		end
-
-		finalResult = {
-			ok = true,
-			phase = "success",
-			result = runtimePayload.value,
-		}
-	end, function(errorValue)
-		return captureError(errorValue, dependencies.traceback)
-	end)
-
-	if not controllerOk then
-		finalResult = failure("internal", controllerFailure.error, controllerFailure.traceback)
-	end
-
-	if recording ~= nil then
-		local finishOk, finishError = finishRecordingOnce()
-		if not finishOk then
-			local captured = captureError(finishError, dependencies.traceback)
-			finalResult = failure(
-				"internal",
-				"Failed to finish the Rojo exec spike undo recording: " .. captured.error,
-				captured.traceback
-			)
-		end
-	end
-
-	if temporaryModule ~= nil then
-		local cleanupOk, cleanupError = cleanupOnce()
-		if not cleanupOk then
-			local cleanupMessage = tostring(cleanupError)
-			if finalResult == nil or finalResult.ok then
-				finalResult = failure("internal", "Execution completed, but temporary ModuleScript cleanup failed")
-			end
-			finalResult.cleanupError = cleanupMessage
-		end
-	end
-
-	if finalResult == nil then
-		return failure("internal", "Rojo exec spike ended without a result")
-	end
-
-	return finalResult
-end
-
-local defaultDependencies = {
-	isEdit = function()
-		return RunService:IsEdit()
-	end,
-	generateUniqueToken = function()
-		return HttpService:GenerateGUID(false)
-	end,
-	createTemporaryModule = function()
-		return Instance.new("ModuleScript")
-	end,
-	configureTemporaryModule = function(temporaryModule, name, wrapper)
-		temporaryModule.Name = name
-		temporaryModule.Archivable = false
-		temporaryModule.Source = wrapper
-
-		-- A child of this ModuleScript stays in the plugin-owned hierarchy and
-		-- never enters Workspace or another user project container.
-		temporaryModule.Parent = script
-	end,
-	requireTemporaryModule = function(temporaryModule)
-		return require(temporaryModule)
-	end,
-	tryBeginRecording = function(label)
-		return ChangeHistoryService:TryBeginRecording(label)
-	end,
-	finishRecording = function(recording)
-		ChangeHistoryService:FinishRecording(recording, Enum.FinishRecordingOperation.Commit)
-	end,
-	cleanupTemporaryModule = function(temporaryModule)
-		temporaryModule:Destroy()
-	end,
-	traceback = debug.traceback,
-}
-
-function ExecSpike.run(source: string, scriptName: string?): ExecSpikeResult
-	return runWithDependencies(source, scriptName, defaultDependencies)
-end
-
--- These are intentionally fixed scalar-result cases for manual Studio
--- verification. They are not run by the automated suite because mocks cannot
--- answer whether plugin security permits dynamic Source assignment and require.
-ExecSpike.ManualSources = {
-	readOnly = [[return #workspace:GetChildren()]],
-	createPart = [[local part = Instance.new("Part")
-part.Name = "RojoExecSpike"
-part.Parent = workspace
-return part.Name]],
-	attachmentAndAttribute = [[local part = Instance.new("Part")
-part.Name = "RojoExecSpike"
-part.Parent = workspace
-
-local attachment = Instance.new("Attachment")
-attachment.Parent = part
-
-part:SetAttribute("CreatedByExecSpike", true)
-
-return part:GetAttribute("CreatedByExecSpike")]],
-	compileFailure = [[local =]],
-	runtimeFailure = [[local part = Instance.new("Part")
-part.Name = "RojoExecPartial"
-part.Parent = workspace
-error("intentional runtime failure")]],
-	yielding = [[task.wait(0.25)
-return "yielded"]],
-}
-
--- Exposed only so TestEZ can verify the controller's pure structure. Calling
--- these helpers does not establish Studio execution feasibility.
-ExecSpike._test = {
-	sanitizeScriptName = sanitizeScriptName,
-	makeTemporaryName = makeTemporaryName,
-	buildWrapper = buildWrapper,
-	validateResult = validateResult,
-	formatTraceback = formatTraceback,
-	makeProtectedOnce = makeProtectedOnce,
-	runWithDependencies = runWithDependencies,
-}
-
-return ExecSpike
diff --git a/plugin/src/ExecSpike.spec.lua b/plugin/src/ExecSpike.spec.lua
deleted file mode 100644
index a8ba7890..00000000
--- a/plugin/src/ExecSpike.spec.lua
+++ /dev/null
@@ -1,237 +0,0 @@
-return function()
-	local ExecSpike = require(script.Parent.ExecSpike)
-	local helpers = ExecSpike._test
-
-	local function countPlainOccurrences(haystack, needle)
-		local count = 0
-		local position = 1
-
-		while true do
-			local first, last = string.find(haystack, needle, position, true)
-			if first == nil then
-				return count
-			end
-
-			count += 1
-			position = last + 1
-		end
-	end
-
-	local function makeDependencies()
-		local state = {
-			cleanupCount = 0,
-			configureCount = 0,
-			editCheckCount = 0,
-			finishCount = 0,
-			invocationCount = 0,
-			result = nil,
-		}
-		local dependencies = {
-			isEdit = function()
-				state.editCheckCount += 1
-				return true
-			end,
-			generateUniqueToken = function()
-				return "test-token"
-			end,
-			createTemporaryModule = function()
-				return {}
-			end,
-			configureTemporaryModule = function(temporaryModule, name, wrapper)
-				state.configureCount += 1
-				temporaryModule.name = name
-				temporaryModule.wrapper = wrapper
-			end,
-			requireTemporaryModule = function()
-				return function()
-					state.invocationCount += 1
-					return state.result
-				end
-			end,
-			tryBeginRecording = function()
-				return "recording"
-			end,
-			finishRecording = function()
-				state.finishCount += 1
-			end,
-			cleanupTemporaryModule = function()
-				state.cleanupCount += 1
-			end,
-			traceback = function(message)
-				return "traceback: " .. message
-			end,
-		}
-
-		return dependencies, state
-	end
-
-	describe("ExecSpike wrapper", function()
-		it("contains submitted source exactly once", function()
-			local source = "local uniqueMarker = 123\nreturn uniqueMarker"
-			local wrapper = helpers.buildWrapper(source)
-
-			expect(countPlainOccurrences(wrapper, source)).to.equal(1)
-		end)
-
-		it("places top-level return inside the returned function", function()
-			local wrapper = helpers.buildWrapper("return 17")
-
-			expect(wrapper:find("return function(rojoExec)", 1, true)).to.equal(1)
-			expect(wrapper:find("\nreturn 17\nend\n", 1, true)).to.be.ok()
-		end)
-	end)
-
-	describe("ExecSpike names", function()
-		it("sanitizes unsafe and control characters", function()
-			local sanitized = helpers.sanitizeScriptName("bad/name\\with\0controls\n:and spaces")
-
-			expect(sanitized:find("[^%w%._%-]")).to.equal(nil)
-			expect(#sanitized > 0).to.equal(true)
-		end)
-
-		it("creates a unique name for every call", function()
-			local first = helpers.makeTemporaryName("test.lua", "same-token")
-			local second = helpers.makeTemporaryName("test.lua", "same-token")
-
-			expect(first).never.to.equal(second)
-			expect(first:find("[^%w%._%-]")).to.equal(nil)
-			expect(second:find("[^%w%._%-]")).to.equal(nil)
-		end)
-	end)
-
-	describe("ExecSpike result validation", function()
-		it("accepts nil", function()
-			local ok = helpers.validateResult(nil)
-
-			expect(ok).to.equal(true)
-		end)
-
-		it("accepts strings", function()
-			local ok = helpers.validateResult("result")
-
-			expect(ok).to.equal(true)
-		end)
-
-		it("accepts numbers", function()
-			local ok = helpers.validateResult(42)
-
-			expect(ok).to.equal(true)
-		end)
-
-		it("accepts booleans", function()
-			local ok = helpers.validateResult(false)
-
-			expect(ok).to.equal(true)
-		end)
-
-		it("rejects unsupported values", function()
-			local ok, errorMessage = helpers.validateResult({})
-
-			expect(ok).to.equal(false)
-			expect(errorMessage:find("table", 1, true)).to.be.ok()
-		end)
-	end)
-
-	describe("ExecSpike controller", function()
-		it("includes a traceback for runtime failures", function()
-			local dependencies = makeDependencies()
-			dependencies.requireTemporaryModule = function()
-				return function()
-					error("intentional runtime failure")
-				end
-			end
-
-			local result = helpers.runWithDependencies("return true", "runtime.lua", dependencies)
-
-			expect(result.ok).to.equal(false)
-			expect(result.phase).to.equal("runtime")
-			expect(result.error:find("intentional runtime failure", 1, true)).to.be.ok()
-			expect(result.traceback:find("traceback:", 1, true)).to.be.ok()
-		end)
-
-		it("runs cleanup exactly once", function()
-			local cleanupCount = 0
-			local cleanupOnce = helpers.makeProtectedOnce(function()
-				cleanupCount += 1
-			end)
-
-			cleanupOnce()
-			cleanupOnce()
-
-			expect(cleanupCount).to.equal(1)
-		end)
-
-		it("finishes a recording exactly once", function()
-			local dependencies, state = makeDependencies()
-
-			local result = helpers.runWithDependencies("return nil", "success.lua", dependencies)
-
-			expect(result.ok).to.equal(true)
-			expect(state.finishCount).to.equal(1)
-			expect(state.cleanupCount).to.equal(1)
-		end)
-
-		it("does not invoke user code when recording cannot start", function()
-			local dependencies, state = makeDependencies()
-			dependencies.tryBeginRecording = function()
-				return nil
-			end
-
-			local result = helpers.runWithDependencies("return true", "blocked.lua", dependencies)
-
-			expect(result.ok).to.equal(false)
-			expect(result.phase).to.equal("internal")
-			expect(state.invocationCount).to.equal(0)
-			expect(state.finishCount).to.equal(0)
-			expect(state.cleanupCount).to.equal(1)
-		end)
-
-		it("rejects a mode change immediately before invocation", function()
-			local dependencies, state = makeDependencies()
-			dependencies.isEdit = function()
-				state.editCheckCount += 1
-				return state.editCheckCount < 3
-			end
-
-			local result = helpers.runWithDependencies("return true", "mode-change.lua", dependencies)
-
-			expect(result.ok).to.equal(false)
-			expect(result.phase).to.equal("rejected")
-			expect(state.invocationCount).to.equal(0)
-			expect(state.finishCount).to.equal(1)
-			expect(state.cleanupCount).to.equal(1)
-		end)
-
-		it("classifies require failures as compile failures and cleans up", function()
-			local dependencies, state = makeDependencies()
-			dependencies.requireTemporaryModule = function()
-				error("expected compile failure")
-			end
-
-			local result = helpers.runWithDependencies("local =", "compile.lua", dependencies)
-
-			expect(result.ok).to.equal(false)
-			expect(result.phase).to.equal("compile")
-			expect(result.error:find("expected compile failure", 1, true)).to.be.ok()
-			expect(state.invocationCount).to.equal(0)
-			expect(state.finishCount).to.equal(0)
-			expect(state.cleanupCount).to.equal(1)
-		end)
-
-		it("cleans up after an unexpected module configuration failure", function()
-			local dependencies, state = makeDependencies()
-			dependencies.configureTemporaryModule = function()
-				error("Source assignment was rejected")
-			end
-
-			local result = helpers.runWithDependencies("return true", "configure.lua", dependencies)
-
-			expect(result.ok).to.equal(false)
-			expect(result.phase).to.equal("internal")
-			expect(result.error:find("Source assignment was rejected", 1, true)).to.be.ok()
-			expect(state.invocationCount).to.equal(0)
-			expect(state.finishCount).to.equal(0)
-			expect(state.cleanupCount).to.equal(1)
-		end)
-	end)
-end
diff --git a/plugin/src/ExecSpikePlugin.server.lua b/plugin/src/ExecSpikePlugin.server.lua
deleted file mode 100644
index 70eb394f..00000000
--- a/plugin/src/ExecSpikePlugin.server.lua
+++ /dev/null
@@ -1,88 +0,0 @@
--- Temporary development-only entry point for manually verifying ExecSpike in
--- a real installed plugin context. This is intentionally isolated from App and
--- ServeSession and should be removed with the feasibility spike.
-if not plugin then
-	return
-end
-
-local ExecSpike = require(script.Parent.ExecSpike)
-
-local manualCases = {
-	{ name = "readOnly", label = "Inspect" },
-	{ name = "createPart", label = "Part" },
-	{ name = "attachmentAndAttribute", label = "Attachment" },
-	{ name = "compileFailure", label = "Compile Fail" },
-	{ name = "runtimeFailure", label = "Runtime Fail" },
-	{ name = "yielding", label = "Yield" },
-}
-
-local toolbar = plugin:CreateToolbar("Rojo Exec Spike")
-local buttons = {}
-
-local function findRemainingTemporaryModules()
-	local remaining = {}
-	local function collect(container)
-		for _, descendant in container:GetDescendants() do
-			if descendant:IsA("ModuleScript") and descendant.Name:find("^__RojoExecSpike_") then
-				table.insert(remaining, descendant:GetFullName())
-			end
-		end
-	end
-
-	collect(game)
-	collect(script.Parent.ExecSpike)
-
-	return remaining
-end
-
-local function report(caseName, result)
-	print(
-		string.format(
-			"[Rojo Exec Spike] %s: ok=%s phase=%s result=%s",
-			caseName,
-			tostring(result.ok),
-			tostring(result.phase),
-			tostring(result.result)
-		)
-	)
-
-	if result.error ~= nil then
-		warn("[Rojo Exec Spike] error: " .. result.error)
-	end
-	if result.traceback ~= nil then
-		warn("[Rojo Exec Spike] traceback:\n" .. result.traceback)
-	end
-	if result.cleanupError ~= nil then
-		warn("[Rojo Exec Spike] cleanup error: " .. result.cleanupError)
-	end
-
-	local remaining = findRemainingTemporaryModules()
-	if #remaining == 0 then
-		print("[Rojo Exec Spike] cleanup check: no temporary ModuleScripts remain")
-	else
-		warn("[Rojo Exec Spike] cleanup check failed: " .. table.concat(remaining, ", "))
-	end
-end
-
-for _, manualCase in manualCases do
-	local caseName = manualCase.name
-	local button = toolbar:CreateButton(
-		"RojoExecSpike_" .. caseName,
-		"Run the " .. manualCase.label .. " rojo exec feasibility case",
-		"",
-		manualCase.label
-	)
-	button.ClickableWhenViewportHidden = true
-	button.Click:Connect(function()
-		local result = ExecSpike.run(ExecSpike.ManualSources[caseName], caseName .. ".lua")
-		report(caseName, result)
-	end)
-	table.insert(buttons, button)
-end
-
-plugin.Unloading:Connect(function()
-	for _, button in buttons do
-		button:Destroy()
-	end
-	toolbar:Destroy()
-end)