diff --git a/.claude/skills/react-doctor/SKILL.md b/.claude/skills/react-doctor/SKILL.md
deleted file mode 100644
index 6b507be..0000000
--- a/.claude/skills/react-doctor/SKILL.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: react-doctor
-description: Use when finishing a feature, fixing a bug, before committing React code, or when the user wants to improve code quality or clean up a codebase. Checks for score regression. Covers lint, accessibility, bundle size, architecture diagnostics.
-version: "1.0.0"
----
-
-# React Doctor
-
-Scans React codebases for security, performance, correctness, and architecture issues. Outputs a 0–100 health score.
-
-## After making React code changes:
-
-Run `npx react-doctor@latest --verbose --diff` and check the score did not regress.
-
-If the score dropped, fix the regressions before committing.
-
-## For general cleanup or code improvement:
-
-Run `npx react-doctor@latest --verbose` (without `--diff`) to scan the full codebase. Fix issues by severity — errors first, then warnings.
-
-## Command
-
-```bash
-npx react-doctor@latest --verbose --diff
-```
-
-| Flag        | Purpose                                       |
-| ----------- | --------------------------------------------- |
-| `.`         | Scan current directory                        |
-| `--verbose` | Show affected files and line numbers per rule |
-| `--diff`    | Only scan changed files vs base branch        |
-| `--score`   | Output only the numeric score                 |
diff --git a/src/features/game/core/GameSwitcher.tsx b/src/features/game/core/GameSwitcher.tsx
index 374225e..2bcc82e 100644
--- a/src/features/game/core/GameSwitcher.tsx
+++ b/src/features/game/core/GameSwitcher.tsx
@@ -176,7 +176,7 @@ function GameSwitcher() {
 			onChange={(isOpen) => {
 				if (!isOpen) handleClose();
 			}}
-			zIndex={1002}
+			zIndex="var(--mantine-z-index-popover)"
 			trapFocus
 		>
 			<Popover.Target>
diff --git a/src/features/screenshot/core/ScreenshotPreview.tsx b/src/features/screenshot/core/ScreenshotPreview.tsx
index 88e8cea..c291a16 100644
--- a/src/features/screenshot/core/ScreenshotPreview.tsx
+++ b/src/features/screenshot/core/ScreenshotPreview.tsx
@@ -34,7 +34,7 @@ function ScreenshotPreview({
 			size="md"
 			withCloseButton
 			bg="light-dark(var(--mantine-color-popover-4),var(--mantine-color-popover-8))"
-			zIndex={1001}
+			zIndex="var(--mantine-z-index-modal)"
 		>
 			<Box ta="center">
 				<Title order={4} mb="sm" c="primary.5" px="lg">
diff --git a/src/features/wizard/Wizard.tsx b/src/features/wizard/Wizard.tsx
index c23832a..7eb01e7 100644
--- a/src/features/wizard/Wizard.tsx
+++ b/src/features/wizard/Wizard.tsx
@@ -154,7 +154,7 @@ const Wizard = ({
 						right: 0,
 						bottom: 0,
 						backgroundColor: "rgba(0, 0, 0, 0.4)",
-						zIndex: 1002,
+						zIndex: "var(--mantine-z-index-overlay)",
 						pointerEvents: "none",
 					}}
 				/>
diff --git a/src/features/wizard/WizardContent.tsx b/src/features/wizard/WizardContent.tsx
index 0254733..17d7c08 100644
--- a/src/features/wizard/WizardContent.tsx
+++ b/src/features/wizard/WizardContent.tsx
@@ -59,7 +59,7 @@ const WizardContent = ({
 			style={{
 				position: "fixed",
 				...getPositionStyles(),
-				zIndex: 1003,
+				zIndex: "calc(var(--mantine-z-index-overlay) + 1)",
 				maxWidth: "600px",
 				width: "calc(100% - 32px)",
 			}}
diff --git a/src/features/wizard/WizardOverlay.module.css b/src/features/wizard/WizardOverlay.module.css
index 808dd7d..43e1d94 100644
--- a/src/features/wizard/WizardOverlay.module.css
+++ b/src/features/wizard/WizardOverlay.module.css
@@ -7,7 +7,7 @@
     0 0 12px 2px rgba(255, 212, 59, 0.6),
     inset 0 0 12px 2px rgba(255, 212, 59, 0.3);
   pointer-events: none;
-  z-index: 1002;
+  z-index: var(--mantine-z-index-overlay);
   transition: all 0.3s ease-in-out;
   animation: wizard-pulse 2s ease-in-out infinite;
 }