diff --git a/client/src/components/tables/cells/PopnJudgementCell.tsx b/client/src/components/tables/cells/PopnJudgementCell.tsx
index 89755b4ed..a64d61b02 100644
--- a/client/src/components/tables/cells/PopnJudgementCell.tsx
+++ b/client/src/components/tables/cells/PopnJudgementCell.tsx
@@ -16,8 +16,8 @@ export default function PopnJudgementCell({
 	return (
 		<td>
 			<strong>
-				<span style={{ color: COLOUR_SET.vibrantYellow }}>{judgements.great}</span>-
-				<span style={{ color: COLOUR_SET.red }}>{judgements.good}</span>
+				<span style={{ color: COLOUR_SET.gold }}>{judgements.great}</span>-
+				<span style={{ color: COLOUR_SET.red }}>{judgements.good}</span>-
 				<span style={{ color: COLOUR_SET.blue }}>{judgements.bad}</span>
 			</strong>
 		</td>
diff --git a/client/src/components/tables/cells/PopnLampCell.tsx b/client/src/components/tables/cells/PopnLampCell.tsx
new file mode 100644
index 000000000..2530222b7
--- /dev/null
+++ b/client/src/components/tables/cells/PopnLampCell.tsx
@@ -0,0 +1,26 @@
+import Muted from "components/util/Muted";
+import React from "react";
+import { GetGamePTConfig, PBScoreDocument, ScoreDocument } from "tachi-common";
+import { ChangeOpacity } from "util/color-opacity";
+
+export default function PopnLampCell({
+	score,
+}: {
+	score: ScoreDocument<"popn:9B"> | PBScoreDocument<"popn:9B">;
+}) {
+	const gptConfig = GetGamePTConfig(score.game, score.playtype);
+
+	return (
+		<td
+			style={{
+				backgroundColor: ChangeOpacity(gptConfig.lampColours[score.scoreData.lamp], 0.2),
+			}}
+		>
+			<strong>{score.scoreData.lamp}</strong>
+			<br />
+			<Muted>
+				TEMPORARY SCT STUFF: {score.scoreData.hitMeta.specificClearType ?? "Unknown"}
+			</Muted>
+		</td>
+	);
+}
diff --git a/client/src/components/tables/cells/TitleCell.tsx b/client/src/components/tables/cells/TitleCell.tsx
index 250b9485b..c8b8e5275 100644
--- a/client/src/components/tables/cells/TitleCell.tsx
+++ b/client/src/components/tables/cells/TitleCell.tsx
@@ -21,7 +21,8 @@ export default function TitleCell({
 		<td style={{ textAlign: "left", minWidth: "140px", maxWidth: "300px" }}>
 			{game === "popn" && (
 				<>
-					{(song as SongDocument<"popn">).data.genre === song.title ? (
+					{(song as SongDocument<"popn">).data.genre === song.title ||
+					(song as SongDocument<"popn">).data.genre === null ? (
 						<Muted>Unknown Genre</Muted>
 					) : (
 						(song as SongDocument<"popn">).data.genre
diff --git a/client/src/components/tables/cells/WACCAJudgementCell.tsx b/client/src/components/tables/cells/WACCAJudgementCell.tsx
index dd2366133..0c35c8a2d 100644
--- a/client/src/components/tables/cells/WACCAJudgementCell.tsx
+++ b/client/src/components/tables/cells/WACCAJudgementCell.tsx
@@ -35,7 +35,7 @@ export default function WaccaJudgementCell({
 		<td>
 			<strong>
 				<span style={{ color: COLOUR_SET.vibrantYellow }}>{judgements.great}</span>-
-				<span style={{ color: COLOUR_SET.blue }}>{judgements.good}</span>
+				<span style={{ color: COLOUR_SET.blue }}>{judgements.good}</span>-
 				<span style={{ color: COLOUR_SET.red }}>{judgements.miss}</span>
 			</strong>
 		</td>
diff --git a/client/src/components/tables/game-core-cells/PopnCoreCells.tsx b/client/src/components/tables/game-core-cells/PopnCoreCells.tsx
index a7bd77c13..9ee2fccbd 100644
--- a/client/src/components/tables/game-core-cells/PopnCoreCells.tsx
+++ b/client/src/components/tables/game-core-cells/PopnCoreCells.tsx
@@ -4,6 +4,7 @@ import { IsNullish } from "util/misc";
 import LampCell from "../cells/LampCell";
 import MillionsScoreCell from "../cells/MillionsScoreCell";
 import PopnJudgementCell from "../cells/PopnJudgementCell";
+import PopnLampCell from "../cells/PopnLampCell";
 import WaccaJudgementCell from "../cells/WACCAJudgementCell";
 
 export default function PopnCoreCells({
@@ -15,7 +16,7 @@ export default function PopnCoreCells({
 		<>
 			<MillionsScoreCell score={sc} />
 			<PopnJudgementCell score={sc} />
-			<LampCell score={sc} />
+			<PopnLampCell score={sc} />
 			<td>
 				{!IsNullish(sc.calculatedData.classPoints)
 					? sc.calculatedData.classPoints!.toFixed(3)