diff --git a/src/app/(stats)/player/[ign]/_client.tsx b/src/app/(stats)/player/[ign]/_client.tsx
index 2ecef9b..9a4f0a0 100644
--- a/src/app/(stats)/player/[ign]/_client.tsx
+++ b/src/app/(stats)/player/[ign]/_client.tsx
@@ -1,9 +1,52 @@
 "use client"
 
+import { Accordion } from "@/components/ui/accordion"
 import { usePathname } from "next/navigation"
 
+import { Player } from "@/lib/schema/player"
+import ArcadeStats from "./_stats/arcade/arcade"
+import BedwarsStats from "./_stats/bedwars/bedwars"
+import BlitzStats from "./_stats/blitz/blitz"
+import BuildBattleStats from "./_stats/build-battle/build-battle"
+import CopsAndCrimsStats from "./_stats/copsandcrims/copsandcrims"
+import DuelsStats from "./_stats/duels/duels"
+import MegaWallsStats from "./_stats/megawalls/megawalls"
+import MurderMysteryStats from "./_stats/murder-mystery/murder-mystery"
+import PitStats from "./_stats/pit/pit"
+import SkyWarsStats from "./_stats/skywars/skywars"
+import TNTGamesStats from "./_stats/tnt-games/tnt-games"
+import UHCStats from "./_stats/uhc/uhc"
+import WoolGamesStats from "./_stats/woolgames/woolgames"
+
 export function PlayerPageLoadText() {
     const path = usePathname()
 
     return <p>{`Loading stats for ${path.split("/").at(-1)}`}</p>
 }
+
+export default function PlayerStats(
+    { stats, achievements }: { stats: NonNullable<Player["player"]["stats"]>, achievements: Player["player"]["achievements"] }
+) {
+    return (
+        <div className="w-full md:w-3/4">
+            <Accordion type="multiple" className="space-y-4">
+                <BedwarsStats stats={stats.Bedwars} />
+                <SkyWarsStats
+                    stats={stats.SkyWars}
+                    achievements_skywars_opal_obsession={achievements?.["skywars_opal_obsession"] ?? 0}
+                />
+                <DuelsStats stats={stats.Duels} />
+                <MurderMysteryStats stats={stats.MurderMystery} />
+                <BuildBattleStats stats={stats.BuildBattle} />
+                <UHCStats stats={stats.UHC} />
+                <PitStats stats={stats.Pit} />
+                <TNTGamesStats stats={stats.TNTGames} />
+                <MegaWallsStats stats={stats.MegaWalls} />
+                <CopsAndCrimsStats stats={stats.CopsAndCrims} />
+                <WoolGamesStats stats={stats.WoolGames} />
+                <BlitzStats stats={stats.Blitz} />
+                <ArcadeStats stats={stats.Arcade} />
+            </Accordion>
+        </div>
+    )
+}
diff --git a/src/app/(stats)/player/[ign]/page.tsx b/src/app/(stats)/player/[ign]/page.tsx
index 0b3b6b1..c192519 100644
--- a/src/app/(stats)/player/[ign]/page.tsx
+++ b/src/app/(stats)/player/[ign]/page.tsx
@@ -1,5 +1,4 @@
 import DisplayName from "@/components/player/displayname"
-import { Accordion } from "@/components/ui/accordion"
 import { Card, CardContent } from "@/components/ui/card"
 import { env } from "@/lib/env/server"
 import { getGuild } from "@/lib/hypixel/api/guild"
@@ -10,21 +9,8 @@ import { getExactLevel } from "@/lib/hypixel/general/level"
 import { Loader2Icon, ShieldAlert } from "lucide-react"
 import { Metadata } from "next"
 import { Suspense } from "react"
-import { PlayerPageLoadText } from "./_client"
+import PlayerStats, { PlayerPageLoadText } from "./_client"
 import Sidebar from "./_components/Sidebar"
-import ArcadeStats from "./_stats/arcade/arcade"
-import BedwarsStats from "./_stats/bedwars/bedwars"
-import BlitzStats from "./_stats/blitz/blitz"
-import BuildBattleStats from "./_stats/build-battle/build-battle"
-import CopsAndCrimsStats from "./_stats/copsandcrims/copsandcrims"
-import DuelsStats from "./_stats/duels/duels"
-import MegaWallsStats from "./_stats/megawalls/megawalls"
-import MurderMysteryStats from "./_stats/murder-mystery/murder-mystery"
-import PitStats from "./_stats/pit/pit"
-import SkyWarsStats from "./_stats/skywars/skywars"
-import TNTGamesStats from "./_stats/tnt-games/tnt-games"
-import UHCStats from "./_stats/uhc/uhc"
-import WoolGamesStats from "./_stats/woolgames/woolgames"
 
 export async function generateMetadata({ params }: { params: Promise<{ ign: string }> }): Promise<Metadata> {
     const { ign } = await params
@@ -115,28 +101,7 @@ async function SuspendedPage({ params }: Pick<PageProps<"/player/[ign]">, "param
                     session={session}
                 />
                 {player.stats !== undefined ?
-                    (
-                        <div className="w-full md:w-3/4">
-                            <Accordion type="multiple" className="space-y-4">
-                                <BedwarsStats stats={player.stats.Bedwars} />
-                                <SkyWarsStats
-                                    stats={player.stats.SkyWars}
-                                    achievements_skywars_opal_obsession={player.achievements?.["skywars_opal_obsession"] ?? 0}
-                                />
-                                <DuelsStats stats={player.stats.Duels} />
-                                <MurderMysteryStats stats={player.stats.MurderMystery} />
-                                <BuildBattleStats stats={player.stats.BuildBattle} />
-                                <UHCStats stats={player.stats.UHC} />
-                                <PitStats stats={player.stats.Pit} />
-                                <TNTGamesStats stats={player.stats.TNTGames} />
-                                <MegaWallsStats stats={player.stats.MegaWalls} />
-                                <CopsAndCrimsStats stats={player.stats.CopsAndCrims} />
-                                <WoolGamesStats stats={player.stats.WoolGames} />
-                                <BlitzStats stats={player.stats.Blitz} />
-                                <ArcadeStats stats={player.stats.Arcade} />
-                            </Accordion>
-                        </div>
-                    ) :
+                    <PlayerStats stats={player.stats} achievements={player.achievements} /> :
                     (
                         <div className="w-3/4">
                             <Card>
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index b2e3b11..220f6dc 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -2,7 +2,7 @@ import "./globals.css"
 
 import { GeistSans as geist } from "geist/font/sans"
 
-import ThemeProvider from "@/components/ThemeProvider"
+import ThemeProvider from "@/components/theme-provider"
 import { Toaster } from "@/components/ui/sonner"
 import type { Metadata } from "next"
 
@@ -18,7 +18,7 @@ export default function RootLayout({ children }: LayoutProps<"/">) {
         <html lang="en" suppressHydrationWarning className={geist.className}>
             <head>
                 {/* eslint-disable-next-line @next/next/no-sync-scripts */}
-                {process.env.NODE_ENV === "development" && <script src="https://unpkg.com/react-scan/dist/auto.global.js" />}
+                {/* {process.env.NODE_ENV === "development" && <script src="https://unpkg.com/react-scan/dist/auto.global.js" />} */}
             </head>
             <body className="antialiased">
                 <ThemeProvider>
diff --git a/src/components/ThemeProvider.tsx b/src/components/theme-provider.tsx
similarity index 100%
rename from src/components/ThemeProvider.tsx
rename to src/components/theme-provider.tsx