diff --git a/.gitmodules b/.gitmodules
index b44c2e5..b668ed9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "TableturfBattleClient/mobile-drag-drop"]
 	path = TableturfBattleClient/mobile-drag-drop
 	url = https://github.com/timruffles/mobile-drag-drop.git
+[submodule "TableturfBattleClient/js-untar"]
+	path = TableturfBattleClient/js-untar
+	url = https://github.com/InvokIT/js-untar
diff --git a/TableturfBattleClient/assets/CardBackground-0-0.webp b/TableturfBattleClient/assets/CardBackground-0-0.webp
new file mode 100644
index 0000000..5e1c00f
Binary files /dev/null and b/TableturfBattleClient/assets/CardBackground-0-0.webp differ
diff --git a/TableturfBattleClient/assets/CardBackground-0-1.webp b/TableturfBattleClient/assets/CardBackground-0-1.webp
new file mode 100644
index 0000000..5e1c00f
Binary files /dev/null and b/TableturfBattleClient/assets/CardBackground-0-1.webp differ
diff --git a/TableturfBattleClient/assets/CardBackground-1-0.webp b/TableturfBattleClient/assets/CardBackground-1-0.webp
new file mode 100644
index 0000000..9476382
Binary files /dev/null and b/TableturfBattleClient/assets/CardBackground-1-0.webp differ
diff --git a/TableturfBattleClient/assets/CardBackground-1-1.webp b/TableturfBattleClient/assets/CardBackground-1-1.webp
new file mode 100644
index 0000000..9b07bb6
Binary files /dev/null and b/TableturfBattleClient/assets/CardBackground-1-1.webp differ
diff --git a/TableturfBattleClient/assets/CardBackground-2-0.webp b/TableturfBattleClient/assets/CardBackground-2-0.webp
new file mode 100644
index 0000000..8c21c43
Binary files /dev/null and b/TableturfBattleClient/assets/CardBackground-2-0.webp differ
diff --git a/TableturfBattleClient/assets/CardBackground-2-1.webp b/TableturfBattleClient/assets/CardBackground-2-1.webp
new file mode 100644
index 0000000..7c3a7fd
Binary files /dev/null and b/TableturfBattleClient/assets/CardBackground-2-1.webp differ
diff --git a/TableturfBattleClient/index.html b/TableturfBattleClient/index.html
index 68770d2..8338099 100644
--- a/TableturfBattleClient/index.html
+++ b/TableturfBattleClient/index.html
@@ -16,6 +16,7 @@
 		<script src="config/config.js"></script>
 		<script src="qrcodejs/qrcode.js"></script>
 		<script src="mobile-drag-drop/release/index.min.js"></script>
+		<script src="js-untar/build/dist/untar.js"></script>
 		<script>
 			// Enable a polyfill for drag/drop support on mobile Firefox.
 			MobileDragDrop.polyfill({ dragImageTranslateOverride: MobileDragDrop.scrollBehaviourDragImageTranslateOverride });
@@ -429,6 +430,7 @@
 					<button type="button" id="deckListTestButton" disabled>Test</button>
 					<button type="button" id="deckExportButton" disabled>Export</button>
 					<button type="button" id="deckCopyButton" disabled>Copy</button>
+					<button type="button" id="deckSleevesButton" disabled>Sleeves</button>
 					<button type="button" id="deckEditButton" disabled>Edit</button>
 					<button type="button" id="deckRenameButton" disabled>Rename</button>
 					<button type="button" id="deckDeleteButton" class="danger" disabled>Delete</button>
@@ -437,6 +439,41 @@
 				<div id="deckCardListView">
 				</div>
 			</section>
+			<dialog id="deckSleevesDialog">
+				<form id="deckSleevesForm" method="dialog">
+					<section id="deckSleevesList">
+						<input type="radio" name="deckSleeves" id="deckSleeve0" value="0"/><label for="deckSleeve0"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve1" value="1"/><label for="deckSleeve1"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve2" value="2"/><label for="deckSleeve2"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve3" value="3"/><label for="deckSleeve3"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve4" value="4"/><label for="deckSleeve4"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve5" value="5"/><label for="deckSleeve5"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve6" value="6"/><label for="deckSleeve6"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve7" value="7"/><label for="deckSleeve7"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve8" value="8"/><label for="deckSleeve8"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve9" value="9"/><label for="deckSleeve9"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve10" value="10"/><label for="deckSleeve10"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve11" value="11"/><label for="deckSleeve11"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve12" value="12"/><label for="deckSleeve12"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve13" value="13"/><label for="deckSleeve13"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve14" value="14"/><label for="deckSleeve14"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve15" value="15"/><label for="deckSleeve15"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve16" value="16"/><label for="deckSleeve16"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve17" value="17"/><label for="deckSleeve17"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve18" value="18"/><label for="deckSleeve18"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve19" value="19"/><label for="deckSleeve19"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve20" value="20"/><label for="deckSleeve20"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve21" value="21"/><label for="deckSleeve21"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve22" value="22"/><label for="deckSleeve22"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve23" value="23"/><label for="deckSleeve23"></label>
+						<input type="radio" name="deckSleeves" id="deckSleeve24" value="24"/><label for="deckSleeve24"></label>
+					</section>
+					<section id="deckSleevesFormButtons">
+						<button type="submit" id="deckSleevesOkButton">Select</button>
+						<button type="submit" id="deckSleevesCancelButton">Cancel</button>
+					</section>
+				</form>
+			</dialog>
 			<dialog id="deckImportDialog">
 				<form id="deckImportForm" method="dialog">
 					<label for="deckImportTextButton">
diff --git a/TableturfBattleClient/js-untar b/TableturfBattleClient/js-untar
new file mode 160000
index 0000000..49e639c
--- /dev/null
+++ b/TableturfBattleClient/js-untar
@@ -0,0 +1 @@
+Subproject commit 49e639cf82e8d58dccb3458cbd08768afee8b41c
diff --git a/TableturfBattleClient/src/Board.ts b/TableturfBattleClient/src/Board.ts
index 7fba382..87d9e24 100644
--- a/TableturfBattleClient/src/Board.ts
+++ b/TableturfBattleClient/src/Board.ts
@@ -196,7 +196,7 @@ class Board {
 				if (space == Space.Wall || space == Space.OutOfBounds)
 					return 'It cannot be over a wall.';
 				if (space >= Space.SpecialInactive1)
-					return `It cannot be over${' <div class="playHintSpecial" aria-label="Special space">&nbsp;</div>'.repeat(Math.max(currentGame?.players?.length ?? 0, 2))}.`;
+					return `It cannot be over${' <div class="playHintSpecial" aria-label="Special space">&nbsp;</div>'.repeat(Math.max(currentGame?.game.players.length ?? 0, 2))}.`;
 				if (space != Space.Empty && !isSpecialAttack)
 					return 'It cannot be over inked spaces.';
 				if (!isAnchored) {
diff --git a/TableturfBattleClient/src/Card.ts b/TableturfBattleClient/src/Card.ts
index ba920d6..2401863 100644
--- a/TableturfBattleClient/src/Card.ts
+++ b/TableturfBattleClient/src/Card.ts
@@ -2,6 +2,13 @@ class Card {
 	number: number;
 	altNumber: number | null;
 	name: string;
+	line1: string | null;
+	line2: string | null;
+	artFileName: string | null;
+	imageUrl?: string;
+	textScale: number;
+	inkColour1: Colour;
+	inkColour2: Colour;
 	rarity: Rarity;
 	specialCost: number;
 	grid: readonly (readonly Space[])[];
@@ -12,10 +19,19 @@ class Card {
 	private maxX: number;
 	private maxY: number;
 
-	constructor(number: number, altNumber: number | null, name: string, rarity: Rarity, specialCost: number, grid: Space[][]) {
+	private static DEFAULT_INK_COLOUR_1: Colour = { r: 116, g: 96, b: 240 };
+	private static DEFAULT_INK_COLOUR_2: Colour = { r: 224, g: 242, b: 104 };
+
+	constructor(number: number, altNumber: number | null, name: string, line1: string | null, line2: string | null, artFileName: string | null, textScale: number, inkColour1: Colour, inkColour2: Colour, rarity: Rarity, specialCost: number, grid: Space[][]) {
 		this.number = number;
 		this.altNumber = altNumber;
 		this.name = name;
+		this.line1 = line1;
+		this.line2 = line2;
+		this.artFileName = artFileName;
+		this.textScale = textScale;
+		this.inkColour1 = inkColour1;
+		this.inkColour2 = inkColour2;
 		this.rarity = rarity;
 		this.specialCost = specialCost;
 		this.grid = grid;
@@ -40,7 +56,9 @@ class Card {
 	}
 
 	static fromJson(obj: any) {
-		return new Card(obj.number, obj.altNumber ?? null, obj.name, obj.rarity, obj.specialCost, obj.grid);
+		return cardDatabase.cards && cardDatabase.isValidCardNumber(obj.number)
+			? cardDatabase.get(obj.number)
+			: new Card(obj.number, obj.altNumber ?? null, obj.name, obj.line1 ?? null, obj.line2 ?? null, obj.artFileName ?? null, obj.textScale ?? 1, obj.inkColour1 ?? this.DEFAULT_INK_COLOUR_1, obj.inkColour2 ?? this.DEFAULT_INK_COLOUR_2, obj.rarity, obj.specialCost, obj.grid);
 	}
 
 	get isUpcoming() { return this.number < 0; }
diff --git a/TableturfBattleClient/src/CardButton.ts b/TableturfBattleClient/src/CardButton.ts
index e480ef9..b4058b6 100644
--- a/TableturfBattleClient/src/CardButton.ts
+++ b/TableturfBattleClient/src/CardButton.ts
@@ -8,7 +8,7 @@ class CardButton extends CheckButton {
 	constructor(card: Card) {
 		let button = document.createElement('button');
 		button.type = 'button';
-		button.classList.add('card');
+		button.classList.add('cardButton');
 		button.classList.add([ 'common', 'rare', 'fresh' ][card.rarity]);
 		if (card.number < 0) button.classList.add('upcoming');
 		button.dataset.cardNumber = card.number.toString();
@@ -35,6 +35,13 @@ class CardButton extends CheckButton {
 			}
 		}
 
+		if (card.imageUrl) {
+			const bgDiv = document.createElement('div');
+			bgDiv.setAttribute('class', 'cardArt');
+			bgDiv.style.backgroundImage = `url(${card.imageUrl})`;
+			button.appendChild(bgDiv);
+		}
+
 		let row = document.createElement('div');
 		row.className = 'cardHeader';
 		button.appendChild(row);
diff --git a/TableturfBattleClient/src/CardDatabase.ts b/TableturfBattleClient/src/CardDatabase.ts
index dc440fc..9767eaa 100644
--- a/TableturfBattleClient/src/CardDatabase.ts
+++ b/TableturfBattleClient/src/CardDatabase.ts
@@ -28,7 +28,7 @@ const cardDatabase = {
 			const cardListRequest = new XMLHttpRequest();
 			cardListRequest.open('GET', `${config.apiBaseUrl}/cards`);
 			cardListRequest.addEventListener('load', e => {
-				const cards = [ ];
+				const cards: Card[] = [ ];
 				if (cardListRequest.status == 200) {
 					const s = cardListRequest.responseText;
 					const response = JSON.parse(s) as object[];
@@ -40,7 +40,38 @@ const cardDatabase = {
 						else if (card.altNumber != null && card.altNumber < 0) cardDatabase._byAltNumber[-card.altNumber] = card;
 					}
 					cardDatabase.cards = cards;
-					resolve(cards);
+
+					if (window.location.protocol == 'file:') {
+						// If debugging locally, just read the files from the assets directory.
+						for (const card of cardDatabase.cards!) {
+							card.imageUrl = `assets/external/card/${card.artFileName}.webp`
+						}
+						resolve(cards);
+						return;
+					}
+					// Otherwise, download and extract card images from a .tar package.
+					const imagesRequest = new XMLHttpRequest();
+					imagesRequest.responseType = 'arraybuffer';
+					imagesRequest.open('GET', 'assets/external/card.tar');
+					imagesRequest.addEventListener('load', () => {
+						if (imagesRequest.status == 200 && imagesRequest.response) {
+							const buffer = imagesRequest.response as ArrayBuffer;
+							untar(buffer).then(files => {
+								for (const tarFile of files) {
+									const card = cardDatabase.cards!.find(c => tarFile.name == `${c.artFileName}.webp`);
+									if (!card) continue;
+									card.imageUrl = tarFile.getBlobUrl();
+								}
+								resolve(cards);
+							});
+						} else {
+							reject(new Error(`Error downloading card images: response was ${imagesRequest.status}`));
+						}
+					});
+					imagesRequest.addEventListener('error', () => {
+						reject(new Error('Error downloading card images: no further information.'))
+					});
+					imagesRequest.send();
 				} else {
 					reject(new Error(`Error downloading card database: response was ${cardListRequest.status}`));
 				}
diff --git a/TableturfBattleClient/src/CardDisplay.ts b/TableturfBattleClient/src/CardDisplay.ts
new file mode 100644
index 0000000..9cc8931
--- /dev/null
+++ b/TableturfBattleClient/src/CardDisplay.ts
@@ -0,0 +1,165 @@
+class CardDisplay {
+	readonly card: Card;
+	readonly element: SVGSVGElement;
+
+	constructor(card: Card, level: number) {
+		let svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+		svg.setAttribute('viewBox', '0 0 635 885');
+		svg.setAttribute('alt', card.name);
+		this.element = svg;
+
+		svg.classList.add('card');
+		svg.classList.add([ 'common', 'rare', 'fresh' ][card.rarity]);
+		if (card.number < 0) svg.classList.add('upcoming');
+		svg.dataset.cardNumber = card.number.toString();
+		svg.style.setProperty("--number", card.number.toString());
+
+		// Background
+		const image = document.createElementNS('http://www.w3.org/2000/svg', 'image');
+		image.setAttribute('href', `assets/CardBackground-${card.rarity}-${level > 0 ? '1' : '0'}.webp`);
+		image.setAttribute('width', '100%');
+		image.setAttribute('height', '100%');
+		svg.appendChild(image);
+
+		if (level == 0) {
+			svg.insertAdjacentHTML('beforeend', `<image href="assets/external/CardInk.webp" width="635" height="885" clip-path="url(#myClip)"/>`);
+		} else {
+			svg.insertAdjacentHTML('beforeend', `
+				<filter id="ink1-${card.number}" color-interpolation-filters="sRGB"><feColorMatrix type="matrix" values="${card.inkColour1.r / 255} 0 0 0 0 0 ${card.inkColour1.g / 255} 0 0 0 0 0 ${card.inkColour1.b / 255} 0 0 0 0 0 0.88 0"/></filter>
+				<image href="assets/external/CardInk-1.webp" width="635" height="885" clip-path="url(#myClip)" filter="url(#ink1-${card.number})"/>
+				<filter id="ink2-${card.number}" color-interpolation-filters="sRGB"><feColorMatrix type="matrix" values="${card.inkColour2.r / 255} 0 0 0 0 0 ${card.inkColour2.g / 255} 0 0 0 0 0 ${card.inkColour2.b / 255} 0 0 0 0 0 0.88 0"/></filter>
+				<image href="assets/external/CardInk-2.webp" width="635" height="885" clip-path="url(#myClip)" filter="url(#ink2-${card.number})"/>
+			`);
+		}
+
+		// Art
+		if (card.imageUrl) {
+			const image2 = document.createElementNS('http://www.w3.org/2000/svg', 'image');
+			image2.setAttribute('class', 'cardArt');
+			image2.setAttribute('href', card.imageUrl);
+			image2.setAttribute('width', '100%');
+			image2.setAttribute('height', '100%');
+			svg.appendChild(image2);
+		}
+
+		// Grid
+		const g = document.createElementNS('http://www.w3.org/2000/svg', 'g');
+		g.setAttribute('transform', 'translate(380 604) rotate(6.5) scale(0.283)');
+		svg.appendChild(g);
+
+		let size = 0;
+		for (var y = 0; y < 8; y++) {
+			for (var x = 0; x < 8; x++) {
+				if (card.grid[x][y] == Space.Empty) {
+					const rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+					rect.classList.add('empty');
+					rect.setAttribute('x', (100 * x + 3).toString());
+					rect.setAttribute('y', (100 * y + 3).toString());
+					rect.setAttribute('width', '94');
+					rect.setAttribute('height', '94');
+					g.appendChild(rect);
+				} else {
+					const rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+					const elements: Element[] = [ rect ];
+
+					size++;
+					rect.classList.add(card.grid[x][y] == Space.SpecialInactive1 ? 'special' : 'ink');
+
+					const image = document.createElementNS('http://www.w3.org/2000/svg', 'image');
+					image.setAttribute('href', card.grid[x][y] == Space.SpecialInactive1 ? 'assets/SpecialOverlay.png' : 'assets/InkOverlay.png');
+					elements.push(image);
+
+					for (const el of elements) {
+						el.setAttribute('x', (100 * x).toString());
+						el.setAttribute('y', (100 * y).toString());
+						el.setAttribute('width', '100');
+						el.setAttribute('height', '100');
+						g.appendChild(el);
+					}
+				}
+			}
+		}
+
+		// Name
+		const text1 = document.createElementNS('http://www.w3.org/2000/svg', 'text');
+		text1.setAttribute('class', 'cardDisplayName');
+		text1.setAttribute('x', '50%');
+		text1.setAttribute('y', '168');
+		text1.setAttribute('font-size', '76');
+		text1.setAttribute('font-weight', 'bold');
+		text1.setAttribute('stroke', 'black');
+		text1.setAttribute('stroke-width', '15');
+		text1.setAttribute('stroke-linejoin', 'round');
+		text1.setAttribute('paint-order', 'stroke');
+		text1.setAttribute('word-spacing', '-10');
+		text1.setAttribute('transform-origin', 'center');
+		text1.setAttribute('transform', `scale(${card.textScale} 1)`);
+		switch (card.rarity) {
+			case Rarity.Common:
+				text1.setAttribute('fill', '#6038FF');
+				break;
+			case Rarity.Rare:
+				svg.insertAdjacentHTML('beforeend', `
+					<linearGradient id='rareGradient' y1='25%' spreadMethod='reflect'>
+						<stop offset='0%' stop-color='#FEF9C6'/>
+						<stop offset='50%' stop-color='#DFAF17'/>
+						<stop offset='100%' stop-color='#FEF9C6'/>
+					</linearGradient>
+				`);
+				text1.setAttribute('fill', 'url("#rareGradient")');
+				break;
+			case Rarity.Fresh:
+				svg.insertAdjacentHTML('beforeend', `
+					<linearGradient id='freshGradient' y2='25%'>
+						<stop offset='0%' stop-color='#FF8EDD'/>
+						<stop offset='25%' stop-color='#FFEC9F'/>
+						<stop offset='50%' stop-color='#B84386'/>
+						<stop offset='75%' stop-color='#2BEFC8'/>
+						<stop offset='100%' stop-color='#FF8EDD'/>
+					</linearGradient>
+				`);
+				text1.setAttribute('fill', 'url("#freshGradient")');
+				break;
+		}
+		if (card.line1 && card.line2) {
+			const tspan1 = document.createElementNS('http://www.w3.org/2000/svg', 'tspan');
+			tspan1.setAttribute('y', '122');
+			tspan1.appendChild(document.createTextNode(card.line1));
+			text1.appendChild(tspan1);
+
+			const tspan2 = document.createElementNS('http://www.w3.org/2000/svg', 'tspan');
+			tspan2.setAttribute('x', '50%');
+			tspan2.setAttribute('y', '216');
+			tspan2.appendChild(document.createTextNode(card.line2));
+			text1.appendChild(tspan2);
+		} else
+			text1.innerHTML = card.name;
+
+		svg.appendChild(text1);
+
+		// Size
+		svg.insertAdjacentHTML('beforeend', `<image href='assets/external/Game Assets/CardCost_0${card.rarity}.png' width='80' height='80' transform='translate(12 798) rotate(-45) scale(1.33)'/>`);
+		svg.insertAdjacentHTML('beforeend', `<text fill='white' stroke='${card.rarity == Rarity.Common ? '#482BB4' : card.rarity == Rarity.Rare ? '#8B7E25' : '#481EF9'}' paint-order='stroke' stroke-width='5' font-size='48' y='816' x='87'>${size}</text>`);
+
+		// Special cost
+		const g2 = document.createElementNS('http://www.w3.org/2000/svg', 'g');
+		g2.setAttribute('class', 'specialCost');
+		g2.setAttribute('transform', 'translate(170 806) scale(0.32)');
+		svg.appendChild(g2);
+
+		for (let i = 0; i < card.specialCost; i++) {
+			let rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+			const image = document.createElementNS('http://www.w3.org/2000/svg', 'image');
+			image.setAttribute('href', 'assets/SpecialOverlay.png');
+			for (const el of [ rect, image ]) {
+				el.setAttribute('x', (110 * (i % 5)).toString());
+				el.setAttribute('y', (-125 * Math.floor(i / 5)).toString());
+				el.setAttribute('width', '95');
+				el.setAttribute('height', '95');
+				g2.appendChild(el);
+			}
+		}
+
+		this.card = card;
+	}
+}
diff --git a/TableturfBattleClient/src/Deck.ts b/TableturfBattleClient/src/Deck.ts
index 8fc14a8..c873c1b 100644
--- a/TableturfBattleClient/src/Deck.ts
+++ b/TableturfBattleClient/src/Deck.ts
@@ -1,11 +1,15 @@
-class Deck {
+class SavedDeck {
 	name: string;
+	sleeves: number;
 	cards: number[];
-	isReadOnly: boolean;
+	upgrades: number[];
+	isReadOnly?: boolean;
 
-	constructor(name: string, cards: number[], isReadOnly: boolean) {
+	constructor(name: string, sleeves: number, cards: number[], upgrades: number[], isReadOnly: boolean) {
 		this.name = name;
+		this.sleeves = sleeves;
 		this.cards = cards;
+		this.upgrades = upgrades;
 		this.isReadOnly = isReadOnly;
 	}
 
@@ -19,3 +23,17 @@ class Deck {
 		return true;
 	}
 }
+
+class Deck {
+	name: string;
+	sleeves: number;
+	cards: Card[];
+	upgrades: number[];
+
+	constructor(name: string, sleeves: number, cards: Card[], upgrades: number[]) {
+		this.name = name;
+		this.sleeves = sleeves;
+		this.cards = cards;
+		this.upgrades = upgrades;
+	}
+}
diff --git a/TableturfBattleClient/src/GameVariables.ts b/TableturfBattleClient/src/GameVariables.ts
index 5d0147e..6566e0f 100644
--- a/TableturfBattleClient/src/GameVariables.ts
+++ b/TableturfBattleClient/src/GameVariables.ts
@@ -1,19 +1,27 @@
-/** A UUID used to identify the client. */
-let clientToken = window.localStorage.getItem('clientToken') || '';
-/** The data of the current game, or null if not in a game. */
-let currentGame: {
-	id: string,
+interface Game {
 	state: GameState,
 	/** The list of players in the current game. */
 	players: Player[],
 	/** The maximum number of players in the game. */
 	maxPlayers: number,
+	/** The current one-based turn number, or 0 if redraw decisions are being made. */
+	turnNumber: number,
+	/** The total turn time limit in seconds. */
+	turnTimeLimit: number | null,
+	/** The time remaining in the current turn in seconds. */
+	turnTimeLeft: number | null,
+	/** The number of game wins needed to win the set, or null if no goal win count is set. */
+	goalWinCount: number | null,
+}
+
+/** A UUID used to identify the client. */
+let clientToken = window.localStorage.getItem('clientToken') || '';
+/** The data of the current game, or null if not in a game. */
+let currentGame: {
+	id: string,
+	game: Game,
 	/** The user's player data, or null if they are spectating. */
 	me: PlayerData | null,
-	turnNumber: number,
-	turnTimeLimit: number | null,
-	turnTimeLeft: number | null,
-	goalWinCount: number | null,
 	/** The WebSocket used for receiving game events, or null if not yet connected. */
 	webSocket: WebSocket | null
 } | null = null;
@@ -24,7 +32,7 @@ let currentReplay: {
 	games: {
 		stage: Stage,
 		playerData: {
-			deck: Card[],
+			deck: Deck,
 			initialDrawOrder: number[],
 			drawOrder: number[],
 			won: boolean
diff --git a/TableturfBattleClient/src/Pages/DeckListPage.ts b/TableturfBattleClient/src/Pages/DeckListPage.ts
index 35e1939..9c675a8 100644
--- a/TableturfBattleClient/src/Pages/DeckListPage.ts
+++ b/TableturfBattleClient/src/Pages/DeckListPage.ts
@@ -9,6 +9,7 @@ const deckCardListView = document.getElementById('deckCardListView')!;
 const addDeckControls = document.getElementById('addDeckControls')!;
 const newDeckButton = document.getElementById('newDeckButton') as HTMLButtonElement;
 const importDeckButton = document.getElementById('importDeckButton') as HTMLButtonElement;
+const deckSleevesButton = document.getElementById('deckSleevesButton') as HTMLButtonElement;
 const deckEditButton = document.getElementById('deckEditButton') as HTMLButtonElement;
 const deckListTestButton = document.getElementById('deckListTestButton') as HTMLButtonElement;
 const deckExportButton = document.getElementById('deckExportButton') as HTMLButtonElement;
@@ -22,6 +23,11 @@ const deckExportTextBox = document.getElementById('deckExportTextBox') as HTMLTe
 
 const deckExportAllButton = document.getElementById('deckExportAllButton') as HTMLButtonElement;
 
+const deckSleevesDialog = document.getElementById('deckSleevesDialog') as HTMLDialogElement;
+const deckSleevesForm = document.getElementById('deckSleevesForm') as HTMLFormElement;
+const deckSleevesButtons = deckSleevesForm.getElementsByTagName('input');
+const deckSleevesOkButton = document.getElementById('deckSleevesOkButton') as HTMLButtonElement;
+
 const deckImportDialog = document.getElementById('deckImportDialog') as HTMLDialogElement;
 const deckImportForm = document.getElementById('deckImportForm') as HTMLFormElement;
 const deckImportTextBox = document.getElementById('deckImportTextBox') as HTMLTextAreaElement;
@@ -39,7 +45,7 @@ const deckImportFileBox = document.getElementById('deckImportFileBox') as HTMLIn
 const deckImportErrorBox = document.getElementById('deckImportErrorBox')!;
 const deckImportOkButton = document.getElementById('deckImportOkButton') as HTMLButtonElement;
 
-const deckButtons = new CheckButtonGroup<Deck>(deckList);
+const deckButtons = new CheckButtonGroup<SavedDeck>(deckList);
 
 let deckListTouchMode = false;
 let draggingDeckButton: Element | null = null;
@@ -85,7 +91,7 @@ deckViewBackButton.addEventListener('click', e => {
 });
 
 function saveDecks() {
-	const json = JSON.stringify(decks.filter(d => !d.isReadOnly), [ 'name', 'cards' ]);
+	const json = JSON.stringify(decks.filter(d => !d.isReadOnly), [ 'name', 'cards', 'sleeves' ]);
 	localStorage.setItem('decks', json);
 }
 
@@ -93,13 +99,13 @@ function saveDecks() {
 	const decksString = localStorage.getItem('decks');
 	if (decksString) {
 		for (const deck of JSON.parse(decksString)) {
-			decks.push(new Deck(deck.name, deck.cards, false));
+			decks.push(new SavedDeck(deck.name, deck.sleeves ?? 0, deck.cards, deck.upgrades ?? new Array(15), false));
 		}
 	} else {
 		const lastDeckString = localStorage.getItem('lastDeck');
 		const lastDeck = lastDeckString?.split(/\+/)?.map(s => parseInt(s));
 		if (lastDeck && lastDeck.length == 15) {
-			decks.push(new Deck('Custom Deck', lastDeck, false));
+			decks.push(new SavedDeck('Custom Deck', 0, lastDeck, new Array(15), false));
 			saveDecks();
 		}
 		localStorage.removeItem('lastDeck');
@@ -110,9 +116,11 @@ function saveDecks() {
 	}
 }
 
-function createDeckButton(deck: Deck) {
+function createDeckButton(deck: SavedDeck) {
 	const buttonElement = document.createElement('button');
+	buttonElement.className = 'deckButton';
 	buttonElement.type = 'button';
+	buttonElement.dataset.sleeves = deck.sleeves.toString();
 	const button = new CheckButton(buttonElement);
 	deckButtons.add(button, deck);
 	buttonElement.addEventListener('click', () => {
@@ -199,14 +207,17 @@ function deckButton_drop(e: DragEvent) {
 	}
 }
 
-function importDecks(decksToImport: (Deck | number[])[]) {
-	let newSelectedDeck: Deck | null = null;
+function importDecks(decksToImport: (SavedDeck | number[])[]) {
+	let newSelectedDeck: SavedDeck | null = null;
 	for (const el of decksToImport) {
 		let deck;
 		if (el instanceof Array)
-			deck = new Deck(`Imported Deck ${decks.length + 1}`, el, false);
+			deck = new SavedDeck(`Imported Deck ${decks.length + 1}`, 0, el, new Array(15), false);
 		else {
 			deck = el;
+			deck.sleeves ??= 0;
+			deck.upgrades ??= new Array(15);
+			deck.isReadOnly = false;
 			if (!deck.name) deck.name = `Imported Deck ${decks.length + 1}`;
 		}
 		createDeckButton(deck);
@@ -223,7 +234,7 @@ function importDecks(decksToImport: (Deck | number[])[]) {
 }
 
 newDeckButton.addEventListener('click', () => {
-	selectedDeck = new Deck(`Deck ${decks.length + 1}`, [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], false);
+	selectedDeck = new SavedDeck(`Deck ${decks.length + 1}`, 0, new Array(15), new Array(15), false);
 	createDeckButton(selectedDeck);
 	decks.push(selectedDeck);
 	editDeck();
@@ -287,9 +298,29 @@ function parseDecksForImport(s: string) {
 	// TODO: add support for tblturf.ink
 }
 
+deckSleevesButton.addEventListener('click', () => {
+	if (selectedDeck == null) return;
+	deckSleevesButtons[selectedDeck.sleeves].checked = true;
+	deckSleevesDialog.showModal();
+});
+deckSleevesForm.addEventListener('submit', e => {
+	if (e.submitter == deckSleevesOkButton && selectedDeck != null) {
+		let i = 0;
+		for (const button of deckSleevesButtons) {
+			if (button.checked) {
+				selectedDeck.sleeves = i;
+				deckButtons.entries[decks.indexOf(selectedDeck)].button.buttonElement.dataset.sleeves = i.toString();
+				saveDecks();
+				return;
+			}
+			i++;
+		}
+	}
+});
+
 deckEditButton.addEventListener('click', editDeck);
 
-deckListTestButton.addEventListener('click', _ => {
+deckListTestButton.addEventListener('click', () => {
 	testStageButtons.deselect();
 	testStageSelectionDialog.showModal();
 });
@@ -315,9 +346,10 @@ function selectDeck() {
 	deckListTestButton.disabled = false;
 	deckExportButton.disabled = false;
 	deckCopyButton.disabled = false;
-	deckEditButton.disabled = selectedDeck.isReadOnly;
-	deckRenameButton.disabled = selectedDeck.isReadOnly;
-	deckDeleteButton.disabled = selectedDeck.isReadOnly;
+	deckSleevesButton.disabled = selectedDeck.isReadOnly ?? false;
+	deckEditButton.disabled = selectedDeck.isReadOnly ?? false;
+	deckRenameButton.disabled = selectedDeck.isReadOnly ?? false;
+	deckDeleteButton.disabled = selectedDeck.isReadOnly ?? false;
 	deckViewSize.innerText = size.toString();
 	deckListPage.classList.add('showingDeck');
 }
@@ -331,6 +363,7 @@ function deselectDeck() {
 	deckListTestButton.disabled = true;
 	deckExportButton.disabled = true;
 	deckCopyButton.disabled = true;
+	deckSleevesButton.disabled = true;
 	deckEditButton.disabled = true;
 	deckRenameButton.disabled = true;
 	deckDeleteButton.disabled = true;
@@ -362,7 +395,7 @@ deckRenameButton.addEventListener('click', () => {
 
 deckCopyButton.addEventListener('click', () => {
 	if (selectedDeck == null) return;
-	importDecks([ new Deck(`${selectedDeck.name} - Copy`, Array.from(selectedDeck.cards), false) ]);
+	importDecks([ new SavedDeck(`${selectedDeck.name} - Copy`, selectedDeck.sleeves, Array.from(selectedDeck.cards), Array.from(selectedDeck.upgrades), false) ]);
 });
 
 deckDeleteButton.addEventListener('click', () => {
diff --git a/TableturfBattleClient/src/Pages/GamePage.ts b/TableturfBattleClient/src/Pages/GamePage.ts
index 07c6fda..3528fb0 100644
--- a/TableturfBattleClient/src/Pages/GamePage.ts
+++ b/TableturfBattleClient/src/Pages/GamePage.ts
@@ -153,7 +153,7 @@ function initTest(stage: Stage) {
 	clear();
 	testMode = true;
 	gamePage.classList.add('deckTest');
-	currentGame = { id: 'test', state: GameState.Ongoing, maxPlayers: 2, players: [ ], webSocket: null, turnNumber: 1, turnTimeLimit: null, turnTimeLeft: null, goalWinCount: null, me: { playerIndex: 0, move: null, deck: null, hand: null, cardsUsed: [ ] } };
+	currentGame = { id: 'test', game: { state: GameState.Ongoing, maxPlayers: 2, players: [ ], turnNumber: 1, turnTimeLimit: null, turnTimeLeft: null, goalWinCount: null }, me: { playerIndex: 0, move: null, deck: null, hand: null, cardsUsed: [ ] }, webSocket: null };
 	board.resize(stage.copyGrid());
 	const startSpaces = stage.getStartSpaces(2);
 	board.startSpaces = startSpaces;
@@ -163,6 +163,8 @@ function initTest(stage: Stage) {
 
 	for (var o of playerBars)
 		o.element.hidden = true;
+	for (var el of playContainers)
+		el.hidden = true;
 	testPlacements.splice(0);
 	testUndoButton.enabled = false;
 	clearChildren(testPlacementList);
@@ -184,79 +186,60 @@ function initTest(stage: Stage) {
 }
 
 replayNextButton.buttonElement.addEventListener('click', _ => {
-	if (currentGame == null || currentReplay == null || currentGame.state == GameState.GameEnded || currentGame.state == GameState.SetEnded)
+	if (currentGame == null || currentReplay == null || currentGame.game.state == GameState.GameEnded || currentGame.game.state == GameState.SetEnded)
 		return;
 
 	if (replayAnimationAbortController) {
 		replayUpdateHand();
 		replayAnimationAbortController.abort();
 		replayAnimationAbortController = null;
-		turnNumberLabel.turnNumber = currentGame.turnNumber;
+		turnNumberLabel.turnNumber = currentGame.game.turnNumber;
 		board.refresh();
 		const scores = board.getScores();
-		for (let i = 0; i < currentGame.players.length; i++) {
+		for (let i = 0; i < currentGame.game.players.length; i++) {
 			updateStats(i, scores);
 		}
 	}
 
 	clearPlayContainers();
-	if (currentGame.turnNumber == 0) {
+	if (currentGame.game.turnNumber == 0) {
 		// Show redraw decisions.
 		replayPreviousButton.enabled = true;
-		currentGame.state = GameState.Ongoing;
-		currentGame.turnNumber++;
-		turnNumberLabel.turnNumber = currentGame.turnNumber;
+		currentGame.game.state = GameState.Ongoing;
+		currentGame.game.turnNumber++;
+		turnNumberLabel.turnNumber = currentGame.game.turnNumber;
 		replayUpdateHand();
-	} else if (currentGame.turnNumber > 12) {
-		currentGame.state = currentReplay.gameNumber + 1 >= currentReplay.games.length ? GameState.SetEnded : GameState.GameEnded;
+	} else if (currentGame.game.turnNumber > 12) {
+		currentGame.game.state = currentReplay.gameNumber + 1 >= currentReplay.games.length ? GameState.SetEnded : GameState.GameEnded;
 		gameButtonsContainer.hidden = true;
 		gamePage.classList.add('gameEnded');
 		showResult();
 	} else {
-		const moves = currentReplay.turns[currentGame.turnNumber - 1];
+		const moves = currentReplay.turns[currentGame.game.turnNumber - 1];
 		const result = board.makePlacements(moves);
 		currentReplay.placements.push(result);
 
-		let anySpecialAttacks = false;
-		// Show the cards that were played.
 		const entry = handButtons.entries.find(b => b.value.number == moves[currentReplay!.watchingPlayer].card.number);
 		if (entry) entry.button.checked = true;
-		for (let i = 0; i < currentGame.players.length; i++) {
-			const player = currentGame.players[i];
-
-			const move = moves[i];
-			const button = new CardButton(move.card);
-			button.buttonElement.disabled = true;
-			if ((move as PlayMove).isSpecialAttack) {
-				anySpecialAttacks = true;
-				player.specialPoints -= (move as PlayMove).card.specialCost;
-				button.buttonElement.classList.add('specialAttack');
-			} else if (move.isPass) {
-				player.passes++;
-				player.specialPoints++;
-				const el = document.createElement('div');
-				el.className = 'passLabel';
-				el.innerText = 'Pass';
-				button.buttonElement.appendChild(el);
-			}
-			playContainers[i].append(button.buttonElement);
-		}
 
 		for (const p of result.specialSpacesActivated) {
 			const space = board.grid[p.x][p.y];
-			const player2 = currentGame.players[space & 3];
+			const player2 = currentGame.game.players[space & 3];
 			player2.specialPoints++;
 			player2.totalSpecialPoints++;
 		}
-		currentGame.turnNumber++;
+		currentGame.game.turnNumber++;
+
+		for (let i = 0; i < currentGame.game.players.length; i++)
+			showReady(i);
 
 		replayAnimationAbortController = new AbortController();
 		(async () => {
-			await playInkAnimations({ game: { state: GameState.Ongoing, board: null, turnNumber: currentGame.turnNumber, players: currentGame.players }, moves, placements: result.placements, specialSpacesActivated: result.specialSpacesActivated }, anySpecialAttacks, replayAnimationAbortController.signal);
-			turnNumberLabel.turnNumber = currentGame.turnNumber;
+			await playInkAnimations({ game: { state: GameState.Ongoing, board: null, turnNumber: currentGame.game.turnNumber, players: currentGame.game.players }, moves, placements: result.placements, specialSpacesActivated: result.specialSpacesActivated }, replayAnimationAbortController.signal);
+			turnNumberLabel.turnNumber = currentGame.game.turnNumber;
 			clearPlayContainers();
-			if (currentGame.turnNumber > 12) {
-				currentGame.state = currentReplay.gameNumber + 1 >= currentReplay.games.length ? GameState.SetEnded : GameState.GameEnded;
+			if (currentGame.game.turnNumber > 12) {
+				currentGame.game.state = currentReplay.gameNumber + 1 >= currentReplay.games.length ? GameState.SetEnded : GameState.GameEnded;
 				gameButtonsContainer.hidden = true;
 				gamePage.classList.add('gameEnded');
 				showResult();
@@ -267,52 +250,52 @@ replayNextButton.buttonElement.addEventListener('click', _ => {
 });
 
 replayPreviousButton.buttonElement.addEventListener('click', _ => {
-	if (currentGame == null || currentReplay == null || currentGame.turnNumber == 0) return;
+	if (currentGame == null || currentReplay == null || currentGame.game.turnNumber == 0) return;
 
 	replayAnimationAbortController?.abort();
 	replayAnimationAbortController = null;
 
-	if (currentGame.state == GameState.GameEnded || currentGame.state == GameState.SetEnded) {
-		for (let i = 0; i < currentGame.players.length; i++) {
+	if (currentGame.game.state == GameState.GameEnded || currentGame.game.state == GameState.SetEnded) {
+		for (let i = 0; i < currentGame.game.players.length; i++) {
 			if (currentReplay.games[currentReplay.gameNumber].playerData[i].won)
-				currentGame.players[i].gamesWon--;
-			playerBars[i].winCounter.wins = currentGame.players[i].gamesWon;
+				currentGame.game.players[i].gamesWon--;
+			playerBars[i].winCounter.wins = currentGame.game.players[i].gamesWon;
 		}
 	}
 
-	if (currentGame.turnNumber > 1) {
+	if (currentGame.game.turnNumber > 1) {
 		const result = currentReplay.placements.pop();
 		if (!result) return;
 
 		clearPlayContainers();
-		for (let i = 0; i < currentGame.players.length; i++) {
+		for (let i = 0; i < currentGame.game.players.length; i++) {
 			const el = playerBars[i].resultElement;
 			el.innerText = '';
 		}
 
 		undoTurn(result);
 	}
-	currentGame.turnNumber--;
+	currentGame.game.turnNumber--;
 	replayNextButton.enabled = true;
 	gamePage.classList.remove('gameEnded');
 	handContainer.hidden = false;
 	gameButtonsContainer.hidden = false;
 
-	if (currentGame.turnNumber > 0) {
-		currentGame.state = GameState.Ongoing;
-		turnNumberLabel.turnNumber = currentGame.turnNumber;
+	if (currentGame.game.turnNumber > 0) {
+		currentGame.game.state = GameState.Ongoing;
+		turnNumberLabel.turnNumber = currentGame.game.turnNumber;
 		const scores = board.getScores();
-		for (let i = 0; i < currentGame.players.length; i++) {
-			const move = currentReplay.turns[currentGame.turnNumber - 1][i];
+		for (let i = 0; i < currentGame.game.players.length; i++) {
+			const move = currentReplay.turns[currentGame.game.turnNumber - 1][i];
 			if (move.isPass) {
-				currentGame.players[i].passes--;
-				currentGame.players[i].specialPoints--;
+				currentGame.game.players[i].passes--;
+				currentGame.game.players[i].specialPoints--;
 			} else if ((move as PlayMove).isSpecialAttack)
-				currentGame.players[i].specialPoints += (move as PlayMove).card.specialCost;
+				currentGame.game.players[i].specialPoints += (move as PlayMove).card.specialCost;
 			updateStats(i, scores);
 		}
 	} else {
-		currentGame.state = GameState.Redraw;
+		currentGame.game.state = GameState.Redraw;
 		replayPreviousButton.enabled = false;
 		turnNumberLabel.turnNumber = null;
 	}
@@ -324,7 +307,7 @@ replayPreviousButton.buttonElement.addEventListener('click', _ => {
 function undoTurn(turn: PlacementResults) {
 	for (const p of turn.specialSpacesActivated) {
 		const space = board.grid[p.x][p.y];
-		const player2 = currentGame!.players[space & 3];
+		const player2 = currentGame!.game.players[space & 3];
 		if (player2) {
 			player2.specialPoints--;
 			player2.totalSpecialPoints--;
@@ -352,23 +335,23 @@ function replaySwitchGame(gameNumber: number) {
 	replayAnimationAbortController?.abort();
 	replayAnimationAbortController = null;
 
-	for (let i = 0; i < currentGame.players.length; i++) {
-		currentGame.players[i].specialPoints = 0;
-		currentGame.players[i].totalSpecialPoints = 0;
-		currentGame.players[i].passes = 0;
-		currentGame.players[i].gamesWon = 0;
+	for (let i = 0; i < currentGame.game.players.length; i++) {
+		currentGame.game.players[i].specialPoints = 0;
+		currentGame.game.players[i].totalSpecialPoints = 0;
+		currentGame.game.players[i].passes = 0;
+		currentGame.game.players[i].gamesWon = 0;
 		for (let j = 0; j < gameNumber; j++) {
 			if (currentReplay.games[j].playerData[i].won)
-				currentGame.players[i].gamesWon++;
+				currentGame.game.players[i].gamesWon++;
 		}
-		playerBars[i].winCounter.wins = currentGame.players[i].gamesWon;
+		playerBars[i].winCounter.wins = currentGame.game.players[i].gamesWon;
 	}
 
 	currentReplay.gameNumber = gameNumber;
 	currentReplay.turns = currentReplay.games[gameNumber].turns;
 	currentReplay.placements.splice(0);
-	currentGame.state = GameState.Ongoing;
-	currentGame.turnNumber = 0;
+	currentGame.game.state = GameState.Ongoing;
+	currentGame.game.turnNumber = 0;
 	clearPlayContainers();
 	gamePage.classList.remove('gameEnded');
 	replayPreviousGameButton.enabled = gameNumber > 0;
@@ -381,8 +364,8 @@ function replaySwitchGame(gameNumber: number) {
 
 	const stage = currentReplay.games[gameNumber].stage;
 	board.resize(stage.copyGrid());
-	const startSpaces = stage.getStartSpaces(currentGame.players.length);
-	for (let i = 0; i < currentGame.players.length; i++) {
+	const startSpaces = stage.getStartSpaces(currentGame.game.players.length);
+	for (let i = 0; i < currentGame.game.players.length; i++) {
 		board.grid[startSpaces[i].x][startSpaces[i].y] = Space.SpecialInactive1 | i;
 		playerBars[i].points = 1;
 		playerBars[i].pointsDelta = null;
@@ -400,18 +383,18 @@ flipButton.addEventListener('click', () => {
 		replayAnimationAbortController.abort();
 		replayAnimationAbortController = null;
 		clearPlayContainers();
-		turnNumberLabel.turnNumber = currentGame.turnNumber;
+		turnNumberLabel.turnNumber = currentGame.game.turnNumber;
 		const scores = board.getScores();
-		for (let i = 0; i < currentGame.players.length; i++) {
+		for (let i = 0; i < currentGame.game.players.length; i++) {
 			updateStats(i, scores);
 		}
 	}
 	if (currentReplay) {
 		currentReplay.watchingPlayer++;
-		if (currentReplay.watchingPlayer >= currentGame.players.length)
+		if (currentReplay.watchingPlayer >= currentGame.game.players.length)
 		currentReplay.watchingPlayer = 0;
 		gamePage.dataset.myPlayerIndex = currentReplay.watchingPlayer.toString();
-		gamePage.dataset.uiBaseColourIsSpecialColour = currentGame.players[currentReplay.watchingPlayer].uiBaseColourIsSpecialColour?.toString();
+		gamePage.dataset.uiBaseColourIsSpecialColour = currentGame.game.players[currentReplay.watchingPlayer].uiBaseColourIsSpecialColour?.toString();
 		board.flip = currentReplay.watchingPlayer % 2 != 0;
 		clearShowDeck();
 		replayUpdateHand();
@@ -510,7 +493,7 @@ function loadPlayers(players: Player[]) {
 	const scores = board.getScores();
 	for (let i = 0; i < players.length; i++) {
 		const player = players[i];
-		currentGame!.players[i] = players[i];
+		currentGame!.game.players[i] = players[i];
 		playerBars[i].name = player.name;
 		playerBars[i].winCounter.wins = players[i].gamesWon;
 		updateStats(i, scores);
@@ -522,6 +505,7 @@ function loadPlayers(players: Player[]) {
 	}
 	for (let i = 0; i < playerBars.length; i++) {
 		playerBars[i].visible = i < players.length;
+		playContainers[i].hidden = i >= players.length;
 	}
 }
 
@@ -530,15 +514,15 @@ function updateStats(playerIndex: number, scores: number[]) {
 	playerBars[playerIndex].points = scores[playerIndex];
 	playerBars[playerIndex].pointsDelta = 0;
 	playerBars[playerIndex].pointsTo = 0;
-	playerBars[playerIndex].specialPoints = currentGame.players[playerIndex].specialPoints;
-	playerBars[playerIndex].statSpecialPointsElement.innerText = currentGame.players[playerIndex].totalSpecialPoints.toString();
-	playerBars[playerIndex].statPassesElement.innerText = currentGame.players[playerIndex].passes.toString();
+	playerBars[playerIndex].specialPoints = currentGame.game.players[playerIndex].specialPoints;
+	playerBars[playerIndex].statSpecialPointsElement.innerText = currentGame.game.players[playerIndex].totalSpecialPoints.toString();
+	playerBars[playerIndex].statPassesElement.innerText = currentGame.game.players[playerIndex].passes.toString();
 }
 
 /** Shows the waiting indication for the specified player. */
 function showWaiting(playerIndex: number) {
 	const el = document.createElement('div');
-	el.className = 'cardBack waiting';
+	el.className = 'waiting';
 	playContainers[playerIndex].appendChild(el);
 }
 
@@ -547,7 +531,7 @@ function showReady(playerIndex: number) {
 	clearChildren(playContainers[playerIndex]);
 	const el = document.createElement('div');
 	el.className = 'cardBack';
-	el.innerText = 'Ready';
+	el.dataset.sleeves = (currentGame?.game.players[playerIndex].sleeves ?? 0).toString();
 	playContainers[playerIndex].appendChild(el);
 }
 
@@ -566,7 +550,7 @@ function resetPlayControls() {
 	if (canPlay && currentGame?.me?.hand != null) {
 		for (let i = 0; i < 4; i++) {
 			canPlayCard[i] = board.canPlayCard(currentGame.me.playerIndex, currentGame.me.hand[i], false);
-			canPlayCardAsSpecialAttack[i] = currentGame.players[currentGame.me.playerIndex].specialPoints >= currentGame.me.hand[i].specialCost
+			canPlayCardAsSpecialAttack[i] = currentGame.game.players[currentGame.me.playerIndex].specialPoints >= currentGame.me.hand[i].specialCost
 				&& board.canPlayCard(currentGame.me.playerIndex, currentGame.me.hand[i], true);
 			handButtons.entries[i].button.enabled = canPlayCard[i];
 		}
@@ -602,7 +586,9 @@ async function playInkAnimations(data: {
 	moves: Move[],
 	placements: Placement[],
 	specialSpacesActivated: Point[]
-}, anySpecialAttacks: boolean, abortSignal?: AbortSignal) {
+}, abortSignal?: AbortSignal) {
+	if (!currentGame) return;
+
 	const inkPlaced = new Set<number>();
 	const placements = data.placements;
 	board.clearHighlight();
@@ -611,6 +597,46 @@ async function playInkAnimations(data: {
 	board.specialAttack = false;
 	canPlay = false;
 	timeLabel.faded = true;
+
+	// Show the cards that were played.
+	let anySpecialAttacks = false;
+	for (let i = 0; i < currentGame.game.players.length; i++) {
+		const player = currentGame.game.players[i];
+		const move = data.moves[i];
+		if ((move as PlayMove).isSpecialAttack)
+			anySpecialAttacks = true;
+
+		function addCardDisplay() {
+			clearChildren(playContainers[i]);
+			const display = new CardDisplay(move.card, 1);
+			playContainers[i].append(display.element);
+			if ((move as PlayMove).isSpecialAttack) {
+				if (currentReplay) player.specialPoints -= (move as PlayMove).card.specialCost;
+				const el = document.createElement('div');
+				el.className = 'specialAttackLabel';
+				el.innerText = 'Special Attack!';
+				playContainers[i].appendChild(el);
+				display.element.classList.add('specialAttack');
+			} else if (move.isPass) {
+				if (currentReplay) {
+					player.passes++;
+					player.specialPoints++;
+				}
+				const el = document.createElement('div');
+				el.className = 'passLabel';
+				el.innerText = 'Pass';
+				playContainers[i].appendChild(el);
+			}
+		}
+
+		const back = playContainers[i].firstElementChild as HTMLElement;
+		if (back) {
+			back.style.setProperty('animation', '0.1s ease-in forwards flipCardOut');
+			back.addEventListener('animationend', addCardDisplay);
+		} else
+			addCardDisplay();
+	}
+
 	await delay(anySpecialAttacks ? 3000 : 1000, abortSignal);
 	for (let i = 0; i < data.game.players.length; i++) {
 		if ((data.moves[i] as PlayMove).isSpecialAttack)
@@ -661,7 +687,7 @@ function showResult() {
 	turnNumberLabel.turnNumber = null;
 
 	let winners = [ 0 ]; let maxPoints = playerBars[0].points;
-	for (let i = 1; i < currentGame.players.length; i++) {
+	for (let i = 1; i < currentGame.game.players.length; i++) {
 		if (playerBars[i].points > maxPoints) {
 			winners.splice(0);
 			winners.push(i);
@@ -670,7 +696,7 @@ function showResult() {
 			winners.push(i);
 	}
 
-	for (let i = 0; i < currentGame.players.length; i++) {
+	for (let i = 0; i < currentGame.game.players.length; i++) {
 		const el = playerBars[i].resultElement;
 		if (winners.includes(i)) {
 			if (winners.length == 1) {
@@ -678,8 +704,10 @@ function showResult() {
 				el.classList.remove('lose');
 				el.classList.remove('draw');
 				el.innerText = 'Victory';
-				if (currentReplay) currentGame.players[i].gamesWon++;
-				playerBars[i].winCounter.wins++;
+				if (currentReplay) {
+					currentGame.game.players[i].gamesWon++;
+					playerBars[i].winCounter.wins++;
+				}
 			} else {
 				el.classList.remove('win');
 				el.classList.remove('lose');
@@ -704,9 +732,9 @@ function showResult() {
 		replayNextButton.buttonElement.hidden = true;
 		replayNextGameButton.buttonElement.hidden = true;
 		flipButton.hidden = true;
-		if (currentGame.state == GameState.SetEnded) {
+		if (currentGame.game.state == GameState.SetEnded) {
 			leaveButton.hidden = false;
-			nextGameButton.buttonElement.hidden = currentGame.goalWinCount != null;
+			nextGameButton.buttonElement.hidden = currentGame.game.goalWinCount != null;
 			shareReplayLinkButton.hidden = false;
 			canShareReplay = navigator.canShare && navigator.canShare({ url: window.location.href, title: 'Tableturf Battle Replay' });
 			shareReplayLinkButton.innerText = canShareReplay ? 'Share replay link' : 'Copy replay link';
@@ -714,7 +742,7 @@ function showResult() {
 			leaveButton.hidden = currentGame.me != null;
 			nextGameButton.buttonElement.hidden = currentGame.me == null;
 		}
-		nextGameButton.enabled = currentGame.me != null && !currentGame.players[currentGame.me.playerIndex].isReady;
+		nextGameButton.enabled = currentGame.me != null && !currentGame.game.players[currentGame.me.playerIndex].isReady;
 		nextGameButton.buttonElement.innerHTML = nextGameButton.enabled ? 'Next game' : '<div class="loadingSpinner"></div> Waiting for other player';
 	}
 }
@@ -726,9 +754,9 @@ function clearShowDeck() {
 	showDeckButtons.splice(0);
 }
 
-function populateShowDeck(deck: Card[]) {
+function populateShowDeck(deck: Deck) {
 	if (showDeckButtons.length == 0) {
-		for (const card of deck) {
+		for (const card of deck.cards) {
 			const button = new CardButton(card);
 			button.buttonElement.disabled = true;
 			showDeckButtons.push(button);
@@ -764,7 +792,7 @@ function updateHandAndDeck(playerData: PlayerData) {
 		handButtons.add(button, card);
 		button.buttonElement.addEventListener('click', e => {
 			if (!button.enabled) {
-				if (specialButton.checked && currentGame!.players[currentGame!.me!.playerIndex].specialPoints < card.specialCost)
+				if (specialButton.checked && currentGame!.game.players[currentGame!.me!.playerIndex].specialPoints < card.specialCost)
 					cardHint.showError('Not enough special points.');
 				else if (!(specialButton.checked ? canPlayCardAsSpecialAttack : canPlayCard)[i])
 					cardHint.showError('No place to play this card.');
@@ -832,13 +860,13 @@ function replayUpdateHand() {
 		b.buttonElement.parentElement!.className = '';
 
 	let indices;
-	if (currentGame.turnNumber == 0) {
+	if (currentGame.game.turnNumber == 0) {
 		indices = playerData.initialDrawOrder;
 	} else {
 		indices = playerData.drawOrder.slice(0, 4);
-		for (let i = 0; i < currentGame.turnNumber - 1; i++) {
+		for (let i = 0; i < currentGame.game.turnNumber - 1; i++) {
 			const move = currentReplay.turns[i][currentReplay.watchingPlayer];
-			let j = indices.findIndex(k => playerData.deck[k].number == move.card.number);
+			let j = indices.findIndex(k => playerData.deck.cards[k].number == move.card.number);
 			if (j < 0) j = indices.findIndex(k => k < 0 || k >= 15);
 			if (j >= 0) {
 				showDeckButtons[indices[j]].buttonElement.parentElement!.className = 'used';
@@ -856,7 +884,7 @@ function replayUpdateHand() {
 
 	for (let i = 0; i < 4; i++) {
 		if (indices[i] >= 15) continue;  // Accounts for an old bug in the server that corrupted the initialDrawOrder replay fields.
-		const card = playerData.deck[indices[i]];
+		const card = playerData.deck.cards[indices[i]];
 		const button = new CardButton(card);
 		button.buttonElement.disabled = true;
 		handButtons.add(button, card);
@@ -906,7 +934,7 @@ passButton.buttonElement.addEventListener('click', passButton_click);
 
 function specialButton_click(e: Event) {
 	if (!specialButton.enabled) {
-		if (currentGame!.me!.hand!.every(c => currentGame!.players[currentGame!.me!.playerIndex].specialPoints < c.specialCost))
+		if (currentGame!.me!.hand!.every(c => currentGame!.game.players[currentGame!.me!.playerIndex].specialPoints < c.specialCost))
 			cardHint.showError('Not enough special points.');
 		else if (!canPlayCardAsSpecialAttack.includes(true))
 			cardHint.showError('No place to play a special attack.');
@@ -1041,7 +1069,7 @@ board.onhighlightchange = dScores => {
 
 timeLabel.ontimeout = () => {
 	if (currentGame == null || !canPlay) return;
-	if (currentGame.turnNumber == 0) {
+	if (currentGame.game.turnNumber == 0) {
 		let req = new XMLHttpRequest();
 		req.open('POST', `${config.apiBaseUrl}/games/${currentGame!.id}/redraw`);
 		req.addEventListener('error', () => communicationError());
@@ -1263,15 +1291,15 @@ function updateRGB(playerIndex: number, colourIndex: number) {
 	setColour(playerIndex, colourIndex, rgb);
 }
 function setColour(playerIndex: number, colourIndex: number, colour: Colour) {
-	if (!currentGame || playerIndex >= currentGame.players.length) return;
+	if (!currentGame || playerIndex >= currentGame.game.players.length) return;
 	if (colourIndex == 0) {
-		currentGame.players[playerIndex].colour = colour;
+		currentGame.game.players[playerIndex].colour = colour;
 		document.body.style.setProperty(`--primary-colour-${playerIndex + 1}`, `rgb(${colour.r}, ${colour.g}, ${colour.b})`);
 	} else if (colourIndex == 1) {
-		currentGame.players[playerIndex].specialColour = colour;
+		currentGame.game.players[playerIndex].specialColour = colour;
 		document.body.style.setProperty(`--special-colour-${playerIndex + 1}`, `rgb(${colour.r}, ${colour.g}, ${colour.b})`);
 	} else {
-		currentGame.players[playerIndex].specialAccentColour = colour;
+		currentGame.game.players[playerIndex].specialAccentColour = colour;
 		document.body.style.setProperty(`--special-accent-colour-${playerIndex + 1}`, `rgb(${colour.r}, ${colour.g}, ${colour.b})`);
 	}
 }
diff --git a/TableturfBattleClient/src/Pages/LobbyPage.ts b/TableturfBattleClient/src/Pages/LobbyPage.ts
index 7105c6c..b45bf37 100644
--- a/TableturfBattleClient/src/Pages/LobbyPage.ts
+++ b/TableturfBattleClient/src/Pages/LobbyPage.ts
@@ -15,7 +15,7 @@ const lobbyStageSection = document.getElementById('lobbyStageSection')!;
 const lobbyStageSubmitButton = document.getElementById('submitStageButton') as HTMLButtonElement;
 const lobbyDeckSection = document.getElementById('lobbyDeckSection')!;
 const lobbyDeckList = document.getElementById('lobbyDeckList')!;
-const lobbyDeckButtons = new CheckButtonGroup<Deck>(lobbyDeckList);
+const lobbyDeckButtons = new CheckButtonGroup<SavedDeck>(lobbyDeckList);
 const lobbyDeckSubmitButton = document.getElementById('submitDeckButton') as HTMLButtonElement;
 
 const lobbyTimeLimitBox = document.getElementById('lobbyTimeLimitBox') as HTMLInputElement;
@@ -94,7 +94,7 @@ function lobbyResetSlots() {
 	playerListItems.splice(0);
 	lobbyWinCounters.splice(0);
 
-	for (let i = 0; i < currentGame.maxPlayers; i++) {
+	for (let i = 0; i < currentGame.game.maxPlayers; i++) {
 		var el = document.createElement('li');
 		el.className = 'empty';
 		el.innerText = 'Waiting...';
@@ -113,8 +113,8 @@ function clearReady() {
 	if (!currentGame) throw new Error('No current game');
 	stageSelectionFormSubmitButton.disabled = false;
 	stageSelectionFormLoadingSection.hidden = true;
-	for (var i = 0; i < currentGame.players.length; i++) {
-		currentGame.players[i].isReady = false;
+	for (var i = 0; i < currentGame.game.players.length; i++) {
+		currentGame.game.players[i].isReady = false;
 		playerListItems[i].className = 'filled';
 	}
 }
@@ -122,7 +122,7 @@ function clearReady() {
 function lobbyAddPlayer(playerIndex: number) {
 	if (!currentGame) throw new Error('No current game');
 	const listItem = playerListItems[playerIndex];
-	const player = currentGame.players[playerIndex];
+	const player = currentGame.game.players[playerIndex];
 	listItem.innerText = player.name;
 	listItem.className = player.isReady ? 'filled ready' : 'filled';
 
@@ -131,7 +131,7 @@ function lobbyAddPlayer(playerIndex: number) {
 	el.title = 'Battles won';
 	listItem.appendChild(el);
 	const winCounter = new WinCounter(el);
-	winCounter.wins = currentGame.players[playerIndex].gamesWon;
+	winCounter.wins = currentGame.game.players[playerIndex].gamesWon;
 	lobbyWinCounters.push(winCounter);
 }
 
@@ -151,7 +151,9 @@ function initDeckSelection() {
 
 			const buttonElement = document.createElement('button');
 			buttonElement.type = 'button';
+			buttonElement.className = 'deckButton';
 			buttonElement.innerText = deck.name;
+			buttonElement.dataset.sleeves = deck.sleeves.toString();
 			const button = new CheckButton(buttonElement);
 			lobbyDeckButtons.add(button, deck);
 
@@ -202,6 +204,7 @@ deckSelectionForm.addEventListener('submit', e => {
 	data.append('clientToken', clientToken);
 	data.append('deckName', selectedDeck.name);
 	data.append('deckCards', selectedDeck.cards.join('+'));
+	data.append('deckSleeves', selectedDeck.sleeves.toString());
 	req.send(data.toString());
 
 	localStorage.setItem('lastDeckName', selectedDeck.name);
diff --git a/TableturfBattleClient/src/Player.ts b/TableturfBattleClient/src/Player.ts
index 8d1f9fc..b7aa4dd 100644
--- a/TableturfBattleClient/src/Player.ts
+++ b/TableturfBattleClient/src/Player.ts
@@ -6,6 +6,7 @@ interface Player {
 	specialColour: Colour;
 	specialAccentColour: Colour;
 	uiBaseColourIsSpecialColour?: boolean;
+	sleeves: number;
 	totalSpecialPoints: number;
 	passes: number;
 	gamesWon: number;
diff --git a/TableturfBattleClient/src/PlayerBar.ts b/TableturfBattleClient/src/PlayerBar.ts
index 865e8fe..02a98f7 100644
--- a/TableturfBattleClient/src/PlayerBar.ts
+++ b/TableturfBattleClient/src/PlayerBar.ts
@@ -55,7 +55,7 @@ class PlayerBar {
 
 	get specialPoints() { return this.specialPointsContainer.getElementsByClassName('specialPoint').length; }
 	set specialPoints(value: number) {
-		const oldList = this.specialPointsContainer.getElementsByClassName('specialPoint');
+		const oldList = Array.from(this.specialPointsContainer.getElementsByClassName('specialPoint'));
 		if (value < oldList.length) {
 			for (let i = oldList.length - 1; i >= value; i--)
 				this.specialPointsContainer.removeChild(oldList[i]);
diff --git a/TableturfBattleClient/src/PlayerData.ts b/TableturfBattleClient/src/PlayerData.ts
index b5a1843..d7c535e 100644
--- a/TableturfBattleClient/src/PlayerData.ts
+++ b/TableturfBattleClient/src/PlayerData.ts
@@ -1,7 +1,7 @@
 interface PlayerData {
 	playerIndex: number;
 	hand: Card[] | null;
-	deck: Card[] | null;
+	deck: Deck | null;
 	cardsUsed: number[];
 	move: Move | null;
 }
diff --git a/TableturfBattleClient/src/ReplayLoader.ts b/TableturfBattleClient/src/ReplayLoader.ts
index a1bcfe2..a9af944 100644
--- a/TableturfBattleClient/src/ReplayLoader.ts
+++ b/TableturfBattleClient/src/ReplayLoader.ts
@@ -28,17 +28,18 @@ function loadReplay(base64: string) {
 					specialColour: { r: dataView.getUint8(pos + 3), g: dataView.getUint8(pos + 4), b: dataView.getUint8(pos + 5) },
 					specialAccentColour: { r: dataView.getUint8(pos + 6), g: dataView.getUint8(pos + 7), b: dataView.getUint8(pos + 8) },
 					uiBaseColourIsSpecialColour: false,
+					sleeves: 0,
 					totalSpecialPoints: 0,
 					passes: 0,
 					gamesWon: 0
 				};
 				players.push(player);
 
-				const deck = [ ];
+				const cards = [ ];
 				const initialDrawOrder = [ ];
 				const drawOrder = [ ];
 				for (let j = 0; j < 15; j++) {
-					deck.push(loadCardFromReplay(dataView, pos + 9 + j));
+					cards.push(loadCardFromReplay(dataView, pos + 9 + j));
 				}
 				for (let j = 0; j < 2; j++) {
 					initialDrawOrder.push(dataView.getUint8(pos + 24 + j) & 0xF);
@@ -51,7 +52,7 @@ function loadReplay(base64: string) {
 					else
 						drawOrder.push(dataView.getUint8(pos + 26 + j) >> 4 & 0xF);
 				}
-				playerData.push({ deck, initialDrawOrder, drawOrder, won: false });
+				playerData.push({ deck: new Deck("Deck", 0, cards, new Array(15)), initialDrawOrder, drawOrder, won: false });
 				pos += 35 + len;
 			}
 
@@ -95,6 +96,7 @@ function loadReplay(base64: string) {
 					specialColour: { r: dataView.getUint8(pos + 3), g: dataView.getUint8(pos + 4), b: dataView.getUint8(pos + 5) },
 					specialAccentColour: { r: dataView.getUint8(pos + 6), g: dataView.getUint8(pos + 7), b: dataView.getUint8(pos + 8) },
 					uiBaseColourIsSpecialColour: (n2 & 0x80) != 0,
+					sleeves: 0,
 					totalSpecialPoints: 0,
 					passes: 0,
 					gamesWon: 0
@@ -108,12 +110,12 @@ function loadReplay(base64: string) {
 				const playerData = [ ];
 				pos++;
 				for (let i = 0; i < numPlayers; i++) {
-					const deck = [ ];
+					const cards = [ ];
 					const initialDrawOrder = [ ];
 					const drawOrder = [ ];
 					let won = false;
 					for (let j = 0; j < 15; j++) {
-						deck.push(loadCardFromReplay(dataView, pos + j));
+						cards.push(loadCardFromReplay(dataView, pos + j));
 					}
 					for (let j = 0; j < 2; j++) {
 						initialDrawOrder.push(dataView.getUint8(pos + 15 + j) & 0xF);
@@ -126,7 +128,7 @@ function loadReplay(base64: string) {
 						else
 							drawOrder.push(dataView.getUint8(pos + 17 + j) >> 4 & 0xF);
 					}
-					playerData.push({ deck, initialDrawOrder, drawOrder, won });
+					playerData.push({ deck: new Deck("Deck", 0, cards, new Array(15)), initialDrawOrder, drawOrder, won });
 					pos += 25;
 				}
 				const turns = replayLoadTurns(dataView, numPlayers, pos);
@@ -141,14 +143,16 @@ function loadReplay(base64: string) {
 
 	currentGame = {
 		id: 'replay',
-		state: GameState.Redraw,
+		game: {
+			state: GameState.Redraw,
+			players: players,
+			maxPlayers: players.length,
+			turnNumber: 0,
+			turnTimeLimit: null,
+			turnTimeLeft: null,
+			goalWinCount: goalWinCount
+		},
 		me: null,
-		players: players,
-		maxPlayers: players.length,
-		turnNumber: 0,
-		turnTimeLimit: null,
-		turnTimeLeft: null,
-		goalWinCount: goalWinCount,
 		webSocket: null
 	};
 
diff --git a/TableturfBattleClient/src/app.ts b/TableturfBattleClient/src/app.ts
index cb20e3c..65af2d1 100644
--- a/TableturfBattleClient/src/app.ts
+++ b/TableturfBattleClient/src/app.ts
@@ -8,8 +8,8 @@ let initialised = false;
 let initialiseCallback: (() => void) | null = null;
 let canPushState = isSecureContext && location.protocol != 'file:';
 
-const decks: Deck[] = [ new Deck('Starter Deck', [ 6, 34, 159, 13, 45, 137, 22, 52, 141, 28, 55, 103, 40, 56, 92 ], true) ];
-let selectedDeck: Deck | null = null;
+const decks = [ new SavedDeck('Starter Deck', 0, [ 6, 34, 159, 13, 45, 137, 22, 52, 141, 28, 55, 103, 40, 56, 92 ], new Array(15), true) ];
+let selectedDeck: SavedDeck | null = null;
 let editingDeck = false;
 let deckModified = false;
 let shouldConfirmLeavingGame = false;
@@ -97,15 +97,15 @@ function clearUrlFromGame() {
 
 function onGameSettingsChange() {
 	if (currentGame == null) return;
-	if (lobbyTimeLimitBox.value != currentGame.turnTimeLimit?.toString() ?? '')
-		lobbyTimeLimitBox.value = currentGame.turnTimeLimit?.toString() ?? '';
+	if (lobbyTimeLimitBox.value != currentGame.game.turnTimeLimit?.toString() ?? '')
+		lobbyTimeLimitBox.value = currentGame.game.turnTimeLimit?.toString() ?? '';
 }
 
 function onGameStateChange(game: any, playerData: PlayerData | null) {
 	if (currentGame == null)
 		throw new Error('currentGame is null');
 	clearPlayContainers();
-	currentGame.state = game.state;
+	currentGame.game.state = game.state;
 
 	if (game.board) {
 		board.flip = playerData != null && playerData.playerIndex % 2 != 0;
@@ -119,7 +119,7 @@ function onGameStateChange(game: any, playerData: PlayerData | null) {
 	gamePage.dataset.myPlayerIndex = playerData ? playerData.playerIndex.toString() : '';
 	gamePage.dataset.uiBaseColourIsSpecialColour = playerData && game.players[playerData.playerIndex].uiBaseColourIsSpecialColour ? 'true' : 'false';
 
-	if (game.stage != GameState.WaitingForPlayers)
+	if (game.state != GameState.WaitingForPlayers)
 		lobbyLockSettings(true);
 
 	redrawModal.hidden = true;
@@ -159,25 +159,25 @@ function onGameStateChange(game: any, playerData: PlayerData | null) {
 			} else
 				initSpectator();
 
-			currentGame.turnNumber = game.turnNumber;
+			currentGame.game.turnNumber = game.turnNumber;
 			gameButtonsContainer.hidden = currentGame.me == null || game.state == GameState.GameEnded || game.state == GameState.SetEnded;
 
 			switch (game.state) {
 				case GameState.Redraw:
 					if (currentGame.me) setConfirmLeavingGame();
-					redrawModal.hidden = currentGame.me == null || currentGame.players[currentGame.me.playerIndex].isReady;
+					redrawModal.hidden = currentGame.me == null || currentGame.game.players[currentGame.me.playerIndex].isReady;
 					turnNumberLabel.turnNumber = null;
 					canPlay = false;
 					timeLabel.faded = redrawModal.hidden;
 					timeLabel.paused = false;
 					break;
 				case GameState.Ongoing:
-					for (let i = 0; i < currentGame.players.length; i++)
+					for (let i = 0; i < currentGame.game.players.length; i++)
 						showWaiting(i);
 					if (currentGame.me) setConfirmLeavingGame();
 					turnNumberLabel.turnNumber = game.turnNumber;
 					board.autoHighlight = true;
-					canPlay = currentGame.me != null && !currentGame.players[currentGame.me.playerIndex].isReady;
+					canPlay = currentGame.me != null && !currentGame.game.players[currentGame.me.playerIndex].isReady;
 					timeLabel.faded = !canPlay;
 					timeLabel.paused = false;
 					resetPlayControls();
@@ -214,7 +214,7 @@ errorDialog.addEventListener('close', e => {
 
 function playerDataReviver(key: string, value: any) {
 	return !value ? value
-		: key == 'hand' || key == 'deck'
+		: key == 'hand' || key == 'cards'
 		? (value as (Card | number)[]).map(v => typeof v == 'number' ? cardDatabase.get(v) : Card.fromJson(v))
 		: key == 'card'
 		? typeof value == 'number' ? cardDatabase.get(value) : Card.fromJson(value)
@@ -247,33 +247,35 @@ function setupWebSocket(gameID: string) {
 				} else {
 					currentGame = {
 						id: gameID,
-						state: payload.data.state,
+						game: {
+							state: payload.data.state,
+							players: payload.data.players,
+							maxPlayers: payload.data.maxPlayers,
+							turnNumber: payload.data.turnNumber,
+							turnTimeLimit: payload.data.turnTimeLimit,
+							turnTimeLeft: payload.data.turnTimeLeft,
+							goalWinCount: payload.data.goalWinCount,
+						},
 						me: payload.playerData,
-						players: payload.data.players,
-						maxPlayers: payload.data.maxPlayers,
-						turnNumber: payload.data.turnNumber,
-						turnTimeLimit: payload.data.turnTimeLimit,
-						turnTimeLeft: payload.data.turnTimeLeft,
-						goalWinCount: payload.data.goalWinCount,
 						webSocket: webSocket
 					};
 
 					lobbyResetSlots();
-					for (let i = 0; i < currentGame.players.length; i++)
+					for (let i = 0; i < currentGame.game.players.length; i++)
 						lobbyAddPlayer(i);
 					onGameSettingsChange();
 
 					for (let i = 0; i < playerBars.length; i++) {
-						playerBars[i].visible = i < currentGame.maxPlayers;
+						playerBars[i].visible = i < currentGame.game.maxPlayers;
 					}
 
 					for (const button of stageButtons.buttons)
-						(button as StageButton).setStartSpaces(currentGame.maxPlayers);
+						(button as StageButton).setStartSpaces(currentGame.game.maxPlayers);
 
 					onGameStateChange(payload.data, payload.playerData);
 
-					for (let i = 0; i < currentGame.players.length; i++) {
-						if (currentGame.players[i].isReady) showReady(i);
+					for (let i = 0; i < currentGame.game.players.length; i++) {
+						if (currentGame.game.players[i].isReady) showReady(i);
 					}
 
 					if (currentGame.me) {
@@ -294,8 +296,8 @@ function setupWebSocket(gameID: string) {
 					}
 
 					timeLabel.paused = false;
-					if (currentGame.turnTimeLeft) {
-						timeLabel.setTime(currentGame.turnTimeLeft);
+					if (currentGame.game.turnTimeLeft) {
+						timeLabel.setTime(currentGame.game.turnTimeLeft);
 						timeLabel.show();
 					} else
 						timeLabel.hide();
@@ -307,19 +309,19 @@ function setupWebSocket(gameID: string) {
 				}
 				switch (payload.event) {
 					case 'settingsChange':
-						currentGame.turnTimeLimit = payload.data.turnTimeLimit;
+						currentGame.game.turnTimeLimit = payload.data.turnTimeLimit;
 						onGameSettingsChange();
 						break;
 					case 'join':
-						if (payload.data.playerIndex == currentGame.players.length) {
-							currentGame.players.push(payload.data.player);
+						if (payload.data.playerIndex == currentGame.game.players.length) {
+							currentGame.game.players.push(payload.data.player);
 							lobbyAddPlayer(payload.data.playerIndex);
 						}
 						else
 							communicationError();
 						break;
 					case 'playerReady':
-						currentGame.players[payload.data.playerIndex].isReady = true;
+						currentGame.game.players[payload.data.playerIndex].isReady = true;
 						lobbySetReady(payload.data.playerIndex);
 
 						if (payload.data.playerIndex == currentGame.me?.playerIndex) {
@@ -343,46 +345,28 @@ function setupWebSocket(gameID: string) {
 						clearReady();
 						board.autoHighlight = false;
 						showPage('game');
-						currentGame.turnNumber = payload.data.game.turnNumber;
+						currentGame.game.turnNumber = payload.data.game.turnNumber;
 
-						let anySpecialAttacks = false;
-						// Show the cards that were played.
-						clearPlayContainers();
-						for (let i = 0; i < currentGame.players.length; i++) {
-							const player = currentGame.players[i];
+						for (let i = 0; i < currentGame.game.players.length; i++) {
+							const player = currentGame.game.players[i];
 							player.specialPoints = payload.data.game.players[i].specialPoints;
 							player.totalSpecialPoints = payload.data.game.players[i].totalSpecialPoints;
 							player.passes = payload.data.game.players[i].passes;
 							player.gamesWon = payload.data.game.players[i].gamesWon;
 							player.isReady = payload.data.game.players[i].isReady;
 							lobbyWinCounters[i].wins = player.gamesWon;
-
-							const move = payload.data.moves[i];
-							const button = new CardButton(move.card);
-							button.buttonElement.disabled = true;
-							if (move.isSpecialAttack) {
-								anySpecialAttacks = true;
-								button.buttonElement.classList.add('specialAttack');
-							} else if (move.isPass) {
-								const el = document.createElement('div');
-								el.className = move.isTimeout ? 'passLabel timeout' : 'passLabel';
-								el.innerText = 'Pass';
-								button.buttonElement.appendChild(el);
-							}
-							button.buttonElement.disabled = false;
-							playContainers[i].append(button.buttonElement);
 						}
 						timeLabel.paused = true;
 						if (payload.data.game.turnTimeLeft)
 							timeLabel.setTime(payload.data.game.turnTimeLeft);
 
 						(async () => {
-							await playInkAnimations(payload.data, anySpecialAttacks);
+							await playInkAnimations(payload.data);
 							if (payload.playerData) updateHandAndDeck(payload.playerData);
 							turnNumberLabel.turnNumber = payload.data.game.turnNumber;
 							clearPlayContainers();
 							if (payload.event == 'gameEnd') {
-								currentGame.state = payload.data.game.state;
+								currentGame.game.state = payload.data.game.state;
 								clearConfirmLeavingGame();
 								gameButtonsContainer.hidden = true;
 								passButton.enabled = false;
@@ -398,7 +382,7 @@ function setupWebSocket(gameID: string) {
 								timeLabel.paused = false;
 								if (payload.data.game.turnTimeLeft)
 									timeLabel.show();
-								for (let i = 0; i < currentGame.players.length; i++)
+								for (let i = 0; i < currentGame.game.players.length; i++)
 									showWaiting(i);
 							}
 						})();
@@ -553,7 +537,6 @@ function resetAnimation(el: HTMLElement) {
 	el.style.animation = '';
 }
 
-
 document.getElementById('noJSPage')!.innerText = 'Loading client...';
 
 if (config.discordUrl) {
diff --git a/TableturfBattleClient/src/js-untar.d.ts b/TableturfBattleClient/src/js-untar.d.ts
new file mode 100644
index 0000000..0f3c33b
--- /dev/null
+++ b/TableturfBattleClient/src/js-untar.d.ts
@@ -0,0 +1,36 @@
+declare class TarFile {
+	name: string;
+	mode: string;
+	uid: number;
+	gid: number;
+	size: number;
+	mtime: number;
+	checksum: number;
+	type: string;
+	linkname: string;
+	ustarFormat: string;
+
+	version?: string;
+	uname?: string;
+	gname?: string;
+	devmajor?: number;
+	devminor?: number;
+	namePrefix?: string;
+
+	buffer: ArrayBuffer;
+	blob: Blob;
+	getBlobUrl(): string;
+	readAsString(): string;
+	readAsJSON(): object;
+}
+
+declare class ProgressivePromise<TResult, TProgress> extends Promise<TResult> {
+	progress(cb: ((value: TProgress) => void)): ProgressivePromise<TResult, TProgress>;
+	then<TResult1 = TResult, TResult2 = never>(
+		onfulfilled?: ((value: TResult) => TResult1 | PromiseLike<TResult1>) | undefined | null,
+		onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null,
+		onProgress?: ((value: TProgress) => void) | undefined | null)
+		: ProgressivePromise<TResult1 | TResult2, TProgress>;
+}
+
+declare function untar(arrayBuffer: ArrayBuffer): ProgressivePromise<TarFile[], TarFile>;
diff --git a/TableturfBattleClient/tableturf.css b/TableturfBattleClient/tableturf.css
index 0f7a1ee..e041ee5 100644
--- a/TableturfBattleClient/tableturf.css
+++ b/TableturfBattleClient/tableturf.css
@@ -212,6 +212,73 @@ dialog::backdrop {
 	border: 1em solid white;
 }
 
+.deckList {
+	display: flex;
+	flex-flow: column;
+}
+
+.deckList button, #addDeckControls button {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font: inherit;
+	color: inherit;
+	border: inherit;
+	text-shadow: 0 0 4px black;
+}
+
+.deckButton, #addDeckControls {
+	width: 20rem;
+	height: 4rem;
+	margin: 0.5em;
+}
+.deckButton {
+	position: relative;
+	background: linear-gradient(#00000040, #00000040), url('assets/external/sleeves.webp') 0 11%/800%;
+	outline: 0.25em solid grey;
+	border-radius: 0.5em;
+	outline-offset: -0.2em;
+}
+
+.deckButton[data-sleeves="0"] { background-position: 0 11%; }
+.deckButton[data-sleeves="1"] { background-position: 14.3% 11%; }
+.deckButton[data-sleeves="2"] { background-position: 28.6% 11%; }
+.deckButton[data-sleeves="3"] { background-position: 42.9% 11%; }
+.deckButton[data-sleeves="4"] { background-position: 57.1% 11%; }
+.deckButton[data-sleeves="5"] { background-position: 71.4% 11%; }
+.deckButton[data-sleeves="6"] { background-position: 85.7% 11%; }
+.deckButton[data-sleeves="7"] { background-position: 100% 11%; }
+.deckButton[data-sleeves="8"] { background-position: 0 37%; }
+.deckButton[data-sleeves="9"] { background-position: 14.3% 37%; }
+.deckButton[data-sleeves="10"] { background-position: 28.6% 37%; }
+.deckButton[data-sleeves="11"] { background-position: 42.9% 37%; }
+.deckButton[data-sleeves="12"] { background-position: 57.1% 37%; }
+.deckButton[data-sleeves="13"] { background-position: 71.4% 37%; }
+.deckButton[data-sleeves="14"] { background-position: 85.7% 37%; }
+.deckButton[data-sleeves="15"] { background-position: 100% 37%; }
+.deckButton[data-sleeves="16"] { background-position: 0 63%; }
+.deckButton[data-sleeves="17"] { background-position: 14.3% 63%; }
+.deckButton[data-sleeves="18"] { background-position: 28.6% 63%; }
+.deckButton[data-sleeves="19"] { background-position: 42.9% 63%; }
+.deckButton[data-sleeves="20"] { background-position: 57.1% 63%; }
+.deckButton[data-sleeves="21"] { background-position: 71.4% 63%; }
+.deckButton[data-sleeves="22"] { background-position: 85.7% 63%; }
+.deckButton[data-sleeves="23"] { background-position: 100% 63%; }
+.deckButton[data-sleeves="24"] { background-position: 0 89%; }
+
+.deckButton:is(:active, .checked) {
+	outline-color: lightgrey;
+}
+.deckButton:hover {
+	outline-color: white;
+}
+.deckButton:focus-within {
+	outline-color: white;
+}
+.deckButton.disabled {
+	opacity: 0.5;
+}
+
 /* Stages */
 
 #stageList {
@@ -268,7 +335,7 @@ dialog::backdrop {
 
 /* Cards */
 
-.card, .cardBack {
+.cardButton, .cardBack {
 	box-sizing: border-box;
 	width: 10em;
 	height: 12em;
@@ -278,22 +345,51 @@ dialog::backdrop {
 
 .cardBack {
 	--colour: grey;
-	background: #000000C0;
+	background: url(assets/external/sleeves.webp) 0 0/800%;
 	display: flex;
 	justify-content: center;
 	align-items: center;
 	height: 14em;
+	animation: 0.25s ease-out forwards cardBackFadeIn;
 }
-.cardBack.waiting::before {
-	content: '';
-	width: 2em;
-	height: 2em;
-	background: url(assets/external/IconUp_00.webp) center/cover;
-	animation: 2s infinite linear loadingSpinner;
-	opacity: 0.333;
+.cardBack[data-sleeves="0"] { background-position: 0% 0%; }
+.cardBack[data-sleeves="1"] { background-position: 14.3% 0%; }
+.cardBack[data-sleeves="2"] { background-position: 28.6% 0%; }
+.cardBack[data-sleeves="3"] { background-position: 42.9% 0%; }
+.cardBack[data-sleeves="4"] { background-position: 57.1% 0%; }
+.cardBack[data-sleeves="5"] { background-position: 71.4% 0%; }
+.cardBack[data-sleeves="6"] { background-position: 85.7% 0%; }
+.cardBack[data-sleeves="7"] { background-position: 100% 0%; }
+.cardBack[data-sleeves="8"] { background-position: 0% 33.3% }
+.cardBack[data-sleeves="9"] { background-position: 14.3% 33.3% }
+.cardBack[data-sleeves="10"] { background-position: 28.6% 33.3% }
+.cardBack[data-sleeves="11"] { background-position: 42.9% 33.3% }
+.cardBack[data-sleeves="12"] { background-position: 57.1% 33.3% }
+.cardBack[data-sleeves="13"] { background-position: 71.4% 33.3% }
+.cardBack[data-sleeves="14"] { background-position: 85.7% 33.3% }
+.cardBack[data-sleeves="15"] { background-position: 100% 33.3% }
+.cardBack[data-sleeves="16"] { background-position: 0% 66.7% }
+.cardBack[data-sleeves="17"] { background-position: 14.3% 66.7% }
+.cardBack[data-sleeves="18"] { background-position: 28.6% 66.7% }
+.cardBack[data-sleeves="19"] { background-position: 42.9% 66.7% }
+.cardBack[data-sleeves="20"] { background-position: 57.1% 66.7% }
+.cardBack[data-sleeves="21"] { background-position: 71.4% 66.7% }
+.cardBack[data-sleeves="22"] { background-position: 85.7% 66.7% }
+.cardBack[data-sleeves="23"] { background-position: 100% 66.7% }
+.cardBack[data-sleeves="24"] { background-position: 0% 100%; }
+
+@keyframes cardBackFadeIn {
+	from {
+		opacity: 0;
+		transform: translateY(-4rem);
+	}
+	to {
+		opacity: 1;
+		transform: translateY(0);
+	}
 }
 
-.card {
+.cardButton {
 	position: relative;
 	color: currentColor;  /* Override disabled colour */
 	background: black;
@@ -302,15 +398,27 @@ dialog::backdrop {
 	font-weight: 599;
 	margin: 0.5em;
 }
-.card:not([hidden]) {
+.cardButton:not([hidden]) {
 	display: inline-block;
 }
 
-:is(#deckCardListView, #deckCardListEdit, .cardListGrid) .card.upcoming { background: midnightblue; }
+:is(#deckCardListView, #deckCardListEdit, .cardListGrid) .cardButton.upcoming { background: midnightblue; }
 
-.card.common { --colour: rgb(89, 49, 255); }
-.card.rare { --colour: rgb(231, 180, 39); }
-.card.fresh { --colour: white; }
+.cardButton.common { --colour: rgb(89, 49, 255); }
+.cardButton.rare { --colour: rgb(231, 180, 39); }
+.cardButton.fresh { --colour: white; }
+
+.cardButton .cardArt {
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	background-size: contain;
+	background-position: center;
+	background-repeat: no-repeat;
+	opacity: 0.333;
+}
 
 .cardHeader {
 	height: 2.5em;
@@ -325,7 +433,7 @@ dialog::backdrop {
 	display: none;
 }
 
-.cardListGrid .card:hover .cardNumber {
+.cardListGrid .cardButton:hover .cardNumber {
 	display: block;
 	position: absolute;
 	background: grey;
@@ -342,25 +450,25 @@ dialog::backdrop {
 	line-height: 1.25em;
 	flex-grow: 1;
 }
-.card:is([data-card-number="163"], [data-card-number="166"], [data-card-number="196"], [data-card-number="197"], [data-card-number="199"],
-	[data-card-number="202"], [data-card-number="-3"], [data-card-number="-5"], [data-card-number="-12"]) .cardName {
+.cardButton:is([data-card-number="163"], [data-card-number="166"], [data-card-number="196"], [data-card-number="197"], [data-card-number="199"],
+	[data-card-number="202"], [data-card-number="216"]) .cardName {
 	position: absolute;
 	left: -1em;
 	right: -1em;
 	transform: scaleX(0.8);
 }
 
-.card.common .cardName {
+.cardButton.common .cardName {
 	color: var(--colour);
 }
-.card.rare .cardName {
+.cardButton.rare .cardName {
 	background: var(--colour);
 	background: linear-gradient(90deg, rgb(255, 242, 129) 0%, rgb(255, 255, 224) 15%, rgb(231, 180, 39) 50%, rgb(255, 255, 224) 85%, rgb(255, 242, 129) 100%);
 	background-clip: text;
 	-webkit-background-clip: text;
 	color: transparent;
 }
-.card.fresh .cardName {
+.cardButton.fresh .cardName {
 	background: var(--colour);
 	background: linear-gradient(120deg, rgba(253, 217, 169, 1) 0%, rgba(200, 58, 141, 1) 50%, rgba(55, 233, 207, 1) 100%);
 	background-clip: text;
@@ -368,8 +476,7 @@ dialog::backdrop {
 	color: transparent;
 	flex-grow: 0;
 }
-
-.cardGrid {
+.cardButton .cardGrid {
 	position: relative;
 	margin: 0 auto;
 	border-spacing: 0;
@@ -380,6 +487,7 @@ dialog::backdrop {
 	outline: 1px solid #80808080;
 	outline-offset: -1px;
 }
+.cardGrid td { background: #00000080; }
 .cardGrid td.ink { background: url('assets/InkOverlay.png') center/cover, var(--player-primary-colour); outline: none; }
 .cardGrid td.special { background: url('assets/SpecialOverlay.png') center/cover, var(--player-special-colour); outline: none; }
 
@@ -423,7 +531,55 @@ dialog::backdrop {
 .playHintSpecial:nth-of-type(3) { background: url('assets/SpecialOverlay.png') center/cover, var(--special-colour-3); }
 .playHintSpecial:nth-of-type(4) { background: url('assets/SpecialOverlay.png') center/cover, var(--special-colour-4); }
 
-:is(.card, .stage, .stageRandom)::before {
+.card {
+	position: relative;
+	color: currentColor;  /* Override disabled colour */
+	font-family: 'Splatoon 1', 'Arial Black', sans-serif;
+	font-size: 2rem;
+	font-weight: 599;
+	aspect-ratio: 5/7;
+	border-radius: 1rem;
+}
+.playContainer .card {
+	animation: 0.1s ease-out forwards flipCardIn;
+}
+
+@keyframes flipCardOut {
+	from { transform: scaleX(1); }
+	to { transform: scaleX(0); }
+}
+@keyframes flipCardIn {
+	from { transform: scaleX(0); }
+	to { transform: scaleX(1); }
+}
+
+svg.card {
+	display: block;
+}
+
+svg.card text {
+	text-anchor: middle;
+}
+
+svg.card text.cardDisplayName {
+	transform: scaleX(var(--scale));
+}
+
+rect.empty {
+	fill: #00000080;
+	stroke: #60606080;
+	stroke-width: 6;
+}
+
+rect.ink {
+	fill: var(--player-primary-colour);
+}
+
+rect.special, g.specialCost rect {
+	fill: var(--player-special-colour);
+}
+
+:is(.cardButton, .stage, .stageRandom)::before {
 	/* If it exists */
 	position: absolute;
 	left: 0;
@@ -434,19 +590,19 @@ dialog::backdrop {
 	opacity: 0.25;
 	z-index: 0;
 }
-.card.checked, .card:is(:hover, :focus-within):not([disabled]) {
+.cardButton.checked, .cardButton:is(:hover, :focus-within):not([disabled]) {
 	transform: rotate(-2deg);
 }
-.card:is(:hover, :focus-within):not(.checked, .disabled, [disabled])::before {
+.cardButton:is(:hover, :focus-within):not(.checked, .disabled, [disabled])::before {
 	content: '';
 	background: grey;
 }
-.card.checked::before {
+.cardButton.checked::before {
 	content: '';
 	background: var(--colour);
 }
 
-.card.disabled {
+.cardButton.disabled {
 	opacity: 0.5;
 }
 
@@ -828,7 +984,25 @@ dialog::backdrop {
 	bottom: 0;
 }
 
-.playContainer { margin: 8em 0; }
+.playContainer:not([hidden]) {
+	position: relative;
+	margin: 8em 0;
+	width: 10em;
+	height: 14em;
+	border: 1px solid grey;
+	border-radius: 1em;
+	background: #00000080;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.playContainer .waiting {
+	width: 2em;
+	height: 2em;
+	background: url(assets/external/IconUp_00.webp) center/cover;
+	animation: 2s infinite linear loadingSpinner;
+	opacity: 0.333;
+}
 
 .playContainer[data-index="2"] { grid-column: play-column-2; grid-row: 2 / -1; align-self: end; }
 .playContainer[data-index="1"] { grid-column: play-column-2; grid-row: 1 / 4; align-self: start; }
@@ -840,7 +1014,7 @@ dialog::backdrop {
 #gamePage.boardFlipped .playContainer[data-index="1"] { grid-column: play-column-1; grid-row: 2 / -1; align-self: end; }
 #gamePage.boardFlipped .playContainer[data-index="2"] { grid-column: play-column-1; grid-row: 1 / 4; align-self: start; }
 
-.playContainer .card {
+.playContainer .cardButton {
 	margin: 0;
 }
 
@@ -1264,13 +1438,13 @@ dialog::backdrop {
 }
 
 
-.specialAttack, .specialAttack::after {
+.specialAttack, .specialAttackLabel {
 	box-shadow: 0px 0 8px 4px var(--player-colour);
 }
 
-.specialAttack::after {
-	content: 'Special Attack!';
+.specialAttackLabel {
 	position: absolute;
+	font-family: 'Splatoon 1', sans-serif;
 	left: -2em;
 	top: 4em;
 	right: -2em;
@@ -1333,33 +1507,10 @@ dialog::backdrop {
 	gap: 3em;
 }
 
-.deckList {
-	display: flex;
-	flex-flow: column;
-}
-
-.deckList button, #addDeckControls button {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	font: inherit;
-	color: inherit;
-	border: inherit;
-	text-shadow: 0 0 4px black;
-}
 button.dragging {
 	opacity: 0.5;
 }
-.deckList > button, #addDeckControls {
-	width: 20rem;
-	height: 3rem;
-	margin: 0.5em;
-}
-.deckList > button { background: var(--primary-colour-2); position: relative;}
-.deckList > button:hover { background: var(--special-colour-2); }
-.deckList > button:focus-within { outline: 2px solid var(--special-accent-colour-2); }
-.deckList > button:is(:active, .checked) { background: var(--special-accent-colour-2); }
-.deckList > button.disabled { background: grey; }
+
 #addDeckControls {
 	display: flex;
 	align-items: stretch;
@@ -1388,7 +1539,7 @@ button.dragging {
 .touchmode .deckList .handle {
 	width: 2em;
 }
-.card .handle {
+.cardButton .handle {
 	position: absolute;
 	left: 0;
 	right: 0;
@@ -1396,7 +1547,7 @@ button.dragging {
 	height: 3em;
 }
 
-.card.emptySlot {
+.cardButton.emptySlot {
 	--colour: dimgrey;
 	background: url('assets/plus-circle.svg') center/2em no-repeat, black;
 }
@@ -1501,6 +1652,60 @@ button.dragging {
 	text-align: start;
 }
 
+#deckSleevesList {
+	display: flex;
+	flex-flow: row wrap;
+	justify-content: center;
+	max-width: 80em;
+	gap: 1em;
+}
+
+#deckSleevesList input {
+	visibility: hidden;
+	position: absolute;
+}
+#deckSleevesList label {
+	display: inline-block;
+	width: 10em;
+	height: 14em;
+	border-radius: 0.75em;
+	background: url('assets/external/sleeves.webp') 0px 0px/800%;
+}
+#deckSleevesList input:hover+label {
+	outline: 0.25em solid grey;
+}
+#deckSleevesList input:focus+label {
+	outline: 0.25em solid grey;
+}
+#deckSleevesList input:checked+label {
+	outline: 0.25em solid yellow;
+}
+#deckSleevesList label:nth-of-type(1) { background-position: 0% 0%; }
+#deckSleevesList label:nth-of-type(2) { background-position: -100% 0%; }
+#deckSleevesList label:nth-of-type(3) { background-position: -200% 0%; }
+#deckSleevesList label:nth-of-type(4) { background-position: -300% 0%; }
+#deckSleevesList label:nth-of-type(5) { background-position: -400% 0%; }
+#deckSleevesList label:nth-of-type(6) { background-position: -500% 0%; }
+#deckSleevesList label:nth-of-type(7) { background-position: -600% 0%; }
+#deckSleevesList label:nth-of-type(8) { background-position: -700% 0%; }
+#deckSleevesList label:nth-of-type(9) { background-position: 0% -100%; }
+#deckSleevesList label:nth-of-type(10) { background-position: -100% -100%; }
+#deckSleevesList label:nth-of-type(11) { background-position: -200% -100%; }
+#deckSleevesList label:nth-of-type(12) { background-position: -300% -100%; }
+#deckSleevesList label:nth-of-type(13) { background-position: -400% -100%; }
+#deckSleevesList label:nth-of-type(14) { background-position: -500% -100%; }
+#deckSleevesList label:nth-of-type(15) { background-position: -600% -100%; }
+#deckSleevesList label:nth-of-type(16) { background-position: -700% -100%; }
+#deckSleevesList label:nth-of-type(17) { background-position: 0% -200%; }
+#deckSleevesList label:nth-of-type(18) { background-position: -100% -200%; }
+#deckSleevesList label:nth-of-type(19) { background-position: -200% -200%; }
+#deckSleevesList label:nth-of-type(20) { background-position: -300% -200%; }
+#deckSleevesList label:nth-of-type(21) { background-position: -400% -200%; }
+#deckSleevesList label:nth-of-type(22) { background-position: -500% -200%; }
+#deckSleevesList label:nth-of-type(23) { background-position: -600% -200%; }
+#deckSleevesList label:nth-of-type(24) { background-position: -700% -200%; }
+#deckSleevesList label:nth-of-type(25) { background-position: 0% -300%; }
+
 /* Help */
 
 #helpControls {
@@ -1549,22 +1754,22 @@ button.dragging {
 	#gamePage.boardFlipped .playerBar[data-index="3"] { grid-row: player-row-0; }
 
 	#gamePage:not(.boardFlipped):not([data-players="2"]) .playerBar:is([data-index="1"], [data-index="2"]) .wins,
-  #gamePage.boardFlipped:not([data-players="2"]) .playerBar:is([data-index="0"], [data-index="3"]) .wins {
-    float: initial;
+	#gamePage.boardFlipped:not([data-players="2"]) .playerBar:is([data-index="0"], [data-index="3"]) .wins {
+		float: initial;
 		justify-content: end;
-  }
+	}
 }
 
 @media (max-width: 40rem) {
-	.card {
+	.cardButton {
 		margin: 0;
 	}
 	.cardListGrid:not([hidden]) {
 		justify-items: stretch;
 	}
-.cardListGrid .card {
-	width: auto;
-	justify-self: stretch;
+	.cardListGrid .cardButton {
+		width: auto;
+		justify-self: stretch;
 	}
 
 	/* Lobby - Mobile layout */
@@ -1676,7 +1881,7 @@ button.dragging {
 		grid-column: 1 / -1;
 		grid-row: 2 / -1;
 	}
-	#showDeckList .card {
+	#showDeckList .cardButton {
 		width: 30vw;
 	}
 
@@ -1724,17 +1929,17 @@ button.dragging {
 		display: block;
 	}
 
-	:is(#deckListPage, #deckEditPage) section {
+	:is(#deckListPage, #deckEditPage) > section {
 		position: absolute;
 		left: 0;
 		right: 0;
 		top: 0;
 	}
 
-  #deckListPage:not(.showingDeck) #deckEditorDeckViewSection {
+	#deckListPage:not(.showingDeck) #deckEditorDeckViewSection {
 		display: none;
 	}
-  #deckListPage.showingDeck #deckEditorDeckListSection {
+	#deckListPage.showingDeck #deckEditorDeckListSection {
 		display: none;
 	}
 
@@ -1804,7 +2009,7 @@ button.dragging {
 		font-size: 55%;
 	}
 
-	#cardList .card {
+	#cardList .cardButton {
 		height: 13em;
 	}
 
@@ -1846,6 +2051,12 @@ button.dragging {
 	#testPlacementList div {
 		padding: 0 0.5em;
 	}
+
+	#deckSleevesList label {
+		width: 20%;
+		height: auto;
+		aspect-ratio: 5 / 7;
+	}
 }
 
 /* Loading spinner */
diff --git a/TableturfBattleServer/Card.cs b/TableturfBattleServer/Card.cs
index d57bb54..31c9296 100644
--- a/TableturfBattleServer/Card.cs
+++ b/TableturfBattleServer/Card.cs
@@ -2,32 +2,44 @@
 
 namespace TableturfBattleServer;
 public class Card {
-	[JsonProperty("number")]
 	public int Number { get; }
-	[JsonProperty("altNumber")]
-	public int? AltNumber { get; }
-	[JsonProperty("name")]
+	public int? AltNumber { get; init; }
 	public string Name { get; }
-	[JsonProperty("rarity")]
 	public Rarity Rarity { get; }
-	[JsonProperty("specialCost")]
 	public int SpecialCost { get; }
 	[JsonIgnore]
 	public int Size { get; }
 
-	[JsonProperty("grid")]
+	public string? Line1 { get; init; }
+	public string? Line2 { get; init; }
+	public string? ArtFileName { get; init; }
+	public float TextScale { get; init; }
+	public Colour? InkColour1 { get; init; }
+	public Colour? InkColour2 { get; init; }
+
+	[JsonProperty]
 	private readonly Space[,] grid;
 
-	internal Card(int number, string name, Rarity rarity, Space[,] grid) : this(number, null, name, rarity, null, grid) { }
-	internal Card(int number, int? altNumber, string name, Rarity rarity, Space[,] grid) : this(number, altNumber, name, rarity, null, grid) { }
-	internal Card(int number, string name, Rarity rarity, int? specialCost, Space[,] grid) : this(number, null, name, rarity, specialCost, grid) { }
-	internal Card(int number, int? altNumber, string name, Rarity rarity, int? specialCost, Space[,] grid) {
+	internal Card(int number, string name, Rarity rarity, float textScale, string? artFileName, Space[,] grid) : this(number, null, name, rarity, null, textScale, artFileName, grid) { }
+	internal Card(int number, int? altNumber, string name, Rarity rarity, float textScale, string? artFileName, Space[,] grid) : this(number, altNumber, name, rarity, null, textScale, artFileName, grid) { }
+	internal Card(int number, string name, Rarity rarity, int? specialCost, float textScale, string? artFileName, Space[,] grid) : this(number, null, name, rarity, specialCost, textScale, artFileName, grid) { }
+	internal Card(int number, int? altNumber, string name, Rarity rarity, int? specialCost, float textScale, string? artFileName, Space[,] grid) {
 		this.Number = number;
 		this.AltNumber = altNumber;
-		this.Name = name ?? throw new ArgumentNullException(nameof(name));
 		this.Rarity = rarity;
+		this.TextScale = textScale;
+		this.ArtFileName = artFileName;
 		this.grid = grid ?? throw new ArgumentNullException(nameof(grid));
 
+		var pos = (name ?? throw new ArgumentNullException(nameof(name))).IndexOf('\n');
+		if (pos < 0)
+			this.Name = name;
+		else {
+			this.Name = name[pos - 1] == '-' ? name.Remove(pos, 1) : name.Replace('\n', ' ');
+			this.Line1 = name[0..pos];
+			this.Line2 = name[(pos + 1)..];
+		}
+
 		var size = 0;
 		if (grid.GetUpperBound(0) != 7 || grid.GetUpperBound(1) != 7)
 			throw new ArgumentException("Grid must be 8 × 8.", nameof(grid));
diff --git a/TableturfBattleServer/CardDatabase.cs b/TableturfBattleServer/CardDatabase.cs
index f800fd8..6b6388d 100644
--- a/TableturfBattleServer/CardDatabase.cs
+++ b/TableturfBattleServer/CardDatabase.cs
@@ -8,7 +8,7 @@ public static class CardDatabase {
 	private const Space S = Space.SpecialInactive1;
 
 	private static readonly Card[] cards = new Card[] {
-		new(  1, "Hero Shot", Rarity.Fresh, new Space[,] {
+		new(  1, "Hero Shot", Rarity.Fresh, 1f, "HeroShooter", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, I, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -18,7 +18,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(  2, "Sploosh-o-matic", Rarity.Common, new Space[,] {
+		new(  2, "Sploosh-o-matic", Rarity.Common, 0.79f, "ShooterShort00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -28,7 +28,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(  3, "Splattershot Jr.", Rarity.Common, new Space[,] {
+		new(  3, "Splattershot Jr.", Rarity.Common, 0.79f, "ShooterFirst00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -38,7 +38,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(  4, "Splash-o-matic", Rarity.Common, new Space[,] {
+		new(  4, "Splash-o-matic", Rarity.Common, 0.85f, "ShooterPrecision00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -48,7 +48,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(  5, "Aerospray MG", Rarity.Common, new Space[,] {
+		new(  5, "Aerospray MG", Rarity.Common, 0.9f, "ShooterBlaze00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -58,7 +58,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(  6, "Splattershot", Rarity.Common, new Space[,] {
+		new(  6, "Splattershot", Rarity.Common, 0.99f, "ShooterNormal00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -68,7 +68,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(  7, ".52 Gal", Rarity.Common, new Space[,] {
+		new(  7, ".52 Gal", Rarity.Common, 1f, "ShooterGravity00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, I, 0, 0, 0 },
@@ -78,7 +78,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(  8, "N-ZAP '85", Rarity.Common, new Space[,] {
+		new(  8, "N-ZAP '85", Rarity.Common, 1f, "ShooterQuickMiddle00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -88,7 +88,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(  9, "Splattershot Pro", Rarity.Common, new Space[,] {
+		new(  9, "Splattershot\nPro", Rarity.Common, 0.99f, "ShooterExpert00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -98,7 +98,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 10, ".96 Gal", Rarity.Common, new Space[,] {
+		new( 10, ".96 Gal", Rarity.Common, 1f, "ShooterHeavy00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, I, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -108,7 +108,7 @@ public static class CardDatabase {
 			{ 0, 0, S, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 11, "Jet Squelcher", Rarity.Common, new Space[,] {
+		new( 11, "Jet Squelcher", Rarity.Common, 0.9f, "ShooterLong00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, 0, S, 0, I, 0, 0, 0 },
@@ -118,7 +118,7 @@ public static class CardDatabase {
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 12, "Luna Blaster", Rarity.Common, new Space[,] {
+		new( 12, "Luna Blaster", Rarity.Common, 1f, "BlasterShort00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -128,7 +128,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 13, "Blaster", Rarity.Common, new Space[,] {
+		new( 13, "Blaster", Rarity.Common, 1f, "BlasterMiddle00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -138,7 +138,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 14, "Range Blaster", Rarity.Common, new Space[,] {
+		new( 14, "Range Blaster", Rarity.Common, 0.9f, "BlasterLong00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -148,7 +148,7 @@ public static class CardDatabase {
 			{ 0, 0, S, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 15, "Clash Blaster", Rarity.Common, new Space[,] {
+		new( 15, "Clash Blaster", Rarity.Common, 0.95f, "BlasterLightShort00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -158,7 +158,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 16, "Rapid Blaster", Rarity.Common, new Space[,] {
+		new( 16, "Rapid Blaster", Rarity.Common, 0.95f, "BlasterLight00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -168,7 +168,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 17, "Rapid Blaster Pro", Rarity.Common, new Space[,] {
+		new( 17, "Rapid Blaster\nPro", Rarity.Common, 0.95f, "BlasterLightLong00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -178,7 +178,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 18, "L-3 Nozzlenose", Rarity.Common, new Space[,] {
+		new( 18, "L-3 Nozzlenose", Rarity.Common, 0.87f, "ShooterTripleQuick00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -188,7 +188,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 19, "H-3 Nozzlenose", Rarity.Common, new Space[,] {
+		new( 19, "H-3 Nozzlenose", Rarity.Common, 0.85f, "ShooterTripleMiddle00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -198,7 +198,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 20, "Squeezer", Rarity.Common, new Space[,] {
+		new( 20, "Squeezer", Rarity.Common, 1f, "ShooterFlash00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, I, 0, 0 },
@@ -208,7 +208,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 21, "Carbon Roller", Rarity.Common, new Space[,] {
+		new( 21, "Carbon Roller", Rarity.Common, 0.94f, "RollerCompact00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -218,7 +218,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 22, "Splat Roller", Rarity.Common, new Space[,] {
+		new( 22, "Splat Roller", Rarity.Common, 1f, "RollerNormal00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -228,7 +228,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 23, "Dynamo Roller", Rarity.Common, new Space[,] {
+		new( 23, "Dynamo Roller", Rarity.Common, 0.88f, "RollerHeavy00", new Space[,] {
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -238,7 +238,7 @@ public static class CardDatabase {
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 24, "Flingza Roller", Rarity.Common, new Space[,] {
+		new( 24, "Flingza Roller", Rarity.Common, 0.94f, "RollerHunter00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -248,7 +248,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 25, "Inkbrush", Rarity.Common, new Space[,] {
+		new( 25, "Inkbrush", Rarity.Common, 1f, "BrushMini00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
@@ -258,7 +258,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 26, "Octobrush", Rarity.Common, new Space[,] {
+		new( 26, "Octobrush", Rarity.Common, 1f, "BrushNormal00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, I, 0 },
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
@@ -268,7 +268,7 @@ public static class CardDatabase {
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 27, "Classic Squiffer", Rarity.Common, new Space[,] {
+		new( 27, "Classic Squiffer", Rarity.Common, 0.8f, "ChargerQuick00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, I, S, 0, 0, 0 },
@@ -278,7 +278,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 28, "Splat Charger", Rarity.Common, new Space[,] {
+		new( 28, "Splat Charger", Rarity.Common, 0.92f, "ChargerNormal00", new Space[,] {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, S, 0, 0, 0 },
@@ -288,7 +288,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 29, "Splatterscope", Rarity.Common, new Space[,] {
+		new( 29, "Splatterscope", Rarity.Common, 0.9f, "ChargerNormalScope00", new Space[,] {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -298,7 +298,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 30, "E-liter 4K", Rarity.Common, new Space[,] {
+		new( 30, "E-liter 4K", Rarity.Common, 1f, "ChargerLong00", new Space[,] {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -308,7 +308,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 31, "E-liter 4K Scope", Rarity.Common, new Space[,] {
+		new( 31, "E-liter 4K Scope", Rarity.Common, 0.8f, "ChargerLongScope00", new Space[,] {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -318,7 +318,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 32, "Bamboozler 14 Mk I", Rarity.Common, new Space[,] {
+		new( 32, "Bamboozler\n14 Mk I", Rarity.Common, 1f, "ChargerLight00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, S, 0, 0, 0 },
@@ -328,7 +328,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 33, "Goo Tuber", Rarity.Common, new Space[,] {
+		new( 33, "Goo Tuber", Rarity.Common, 1f, "ChargerKeeper00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -338,7 +338,7 @@ public static class CardDatabase {
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 34, "Slosher", Rarity.Common, new Space[,] {
+		new( 34, "Slosher", Rarity.Common, 1f, "SlosherStrong00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, I, 0, 0, 0 },
@@ -348,7 +348,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 35, "Tri-Slosher", Rarity.Common, new Space[,] {
+		new( 35, "Tri-Slosher", Rarity.Common, 1f, "SlosherDiffusion00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -358,7 +358,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 36, "Sloshing Machine", Rarity.Common, new Space[,] {
+		new( 36, "Sloshing\nMachine", Rarity.Common, 1f, "SlosherLauncher00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -368,7 +368,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 37, "Bloblobber", Rarity.Common, new Space[,] {
+		new( 37, "Bloblobber", Rarity.Common, 1f, "SlosherBathtub00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, S, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -378,7 +378,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 38, "Explosher", Rarity.Common, new Space[,] {
+		new( 38, "Explosher", Rarity.Common, 1f, "SlosherWashtub00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -388,7 +388,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 39, "Mini Splatling", Rarity.Common, new Space[,] {
+		new( 39, "Mini Splatling", Rarity.Common, 0.91f, "SpinnerQuick00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -398,7 +398,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 40, "Heavy Splatling", Rarity.Common, new Space[,] {
+		new( 40, "Heavy Splatling", Rarity.Common, 0.8f, "SpinnerStandard00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, I, I, 0, 0, 0, 0 },
 			{ 0, I, I, I, I, 0, 0, 0 },
@@ -408,7 +408,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 41, "Hydra Splatling", Rarity.Common, new Space[,] {
+		new( 41, "Hydra Splatling", Rarity.Common, 0.82f, "SpinnerHyper00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, 0, I, I, I, I, 0, 0 },
@@ -418,7 +418,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, S, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 42, "Ballpoint Splatling", Rarity.Common, new Space[,] {
+		new( 42, "Ballpoint\nSplatling", Rarity.Common, 1f, "SpinnerDownpour00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -428,7 +428,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 43, "Nautilus 47", Rarity.Common, new Space[,] {
+		new( 43, "Nautilus 47", Rarity.Common, 1f, "SpinnerSerein00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -438,7 +438,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 44, "Dapple Dualies", Rarity.Common, new Space[,] {
+		new( 44, "Dapple Dualies", Rarity.Common, 0.87f, "ManeuverShort00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -448,7 +448,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 45, "Splat Dualies", Rarity.Common, new Space[,] {
+		new( 45, "Splat Dualies", Rarity.Common, 0.97f, "ManeuverNormal00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -458,7 +458,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 46, "Glooga Dualies", Rarity.Common, new Space[,] {
+		new( 46, "Glooga Dualies", Rarity.Common, 0.86f, "ManeuverGallon00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -468,7 +468,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 47, "Dualie Squelchers", Rarity.Common, new Space[,] {
+		new( 47, "Dualie\nSquelchers", Rarity.Common, 1f, "ManeuverDual00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, S, I, 0, 0 },
 			{ 0, 0, I, I, 0, I, 0, 0 },
@@ -478,7 +478,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 48, "Dark Tetra Dualies", Rarity.Common, new Space[,] {
+		new( 48, "Dark Tetra\nDualies", Rarity.Common, 1f, "ManeuverStepper00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -488,7 +488,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 49, "Splat Brella", Rarity.Common, new Space[,] {
+		new( 49, "Splat Brella", Rarity.Common, 1f, "ShelterNormal00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -498,7 +498,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 50, "Tenta Brella", Rarity.Common, new Space[,] {
+		new( 50, "Tenta Brella", Rarity.Common, 1f, "ShelterWide00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
@@ -508,7 +508,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 51, "Undercover Brella", Rarity.Common, new Space[,] {
+		new( 51, "Undercover\nBrella", Rarity.Common, 1f, "ShelterCompact00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -518,7 +518,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 52, "Tri-Stringer", Rarity.Common, new Space[,] {
+		new( 52, "Tri-Stringer", Rarity.Common, 1f, "StringerNormal00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, I, I, I, I, 0, 0 },
 			{ 0, S, 0, I, 0, 0, 0, 0 },
@@ -528,7 +528,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 53, "REEF-LUX 450", Rarity.Common, new Space[,] {
+		new( 53, "REEF-LUX 450", Rarity.Common, 0.96f, "StringerShort00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, I, I, 0, 0 },
@@ -538,7 +538,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 54, "Splatana Stamper", Rarity.Common, new Space[,] {
+		new( 54, "Splatana\nStamper", Rarity.Common, 1f, "SaberNormal00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -548,7 +548,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 55, "Splatana Wiper", Rarity.Common, new Space[,] {
+		new( 55, "Splatana\nWiper", Rarity.Common, 1f, "SaberLight00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -558,7 +558,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 56, "Splat Bomb", Rarity.Common, new Space[,] {
+		new( 56, "Splat Bomb", Rarity.Common, 1f, "BombSplash", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -568,7 +568,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 57, "Suction Bomb", Rarity.Common, new Space[,] {
+		new( 57, "Suction Bomb", Rarity.Common, 0.94f, "BombSuction", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -578,7 +578,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 58, "Burst Bomb", Rarity.Common, new Space[,] {
+		new( 58, "Burst Bomb", Rarity.Common, 1f, "BombQuick", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -588,7 +588,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 59, "Sprinkler", Rarity.Common, new Space[,] {
+		new( 59, "Sprinkler", Rarity.Common, 1f, "Sprinkler", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -598,7 +598,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 60, "Splash Wall", Rarity.Common, new Space[,] {
+		new( 60, "Splash Wall", Rarity.Common, 1f, "Shield", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -608,7 +608,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 61, "Fizzy Bomb", Rarity.Common, new Space[,] {
+		new( 61, "Fizzy Bomb", Rarity.Common, 1f, "BombFizzy", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -618,7 +618,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 62, "Curling Bomb", Rarity.Common, new Space[,] {
+		new( 62, "Curling Bomb", Rarity.Common, 0.96f, "BombCurling", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
@@ -628,7 +628,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 63, "Autobomb", Rarity.Common, new Space[,] {
+		new( 63, "Autobomb", Rarity.Common, 1f, "BombRobot", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -638,7 +638,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 64, "Squid Beakon", Rarity.Common, new Space[,] {
+		new( 64, "Squid Beakon", Rarity.Common, 0.96f, "Beacon", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, I, 0, 0 },
@@ -648,7 +648,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 65, "Point Sensor", Rarity.Common, new Space[,] {
+		new( 65, "Point Sensor", Rarity.Common, 1f, "PointSensor", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, I, 0, 0, 0 },
@@ -658,7 +658,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 66, "Ink Mine", Rarity.Common, new Space[,] {
+		new( 66, "Ink Mine", Rarity.Common, 1f, "Trap", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -668,7 +668,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 67, "Toxic Mist", Rarity.Common, new Space[,] {
+		new( 67, "Toxic Mist", Rarity.Common, 1f, "PoisonMist", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -678,7 +678,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 68, "Angle Shooter", Rarity.Common, new Space[,] {
+		new( 68, "Angle Shooter", Rarity.Common, 0.9f, "LineMarker", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -688,7 +688,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 69, "Torpedo", Rarity.Common, new Space[,] {
+		new( 69, "Torpedo", Rarity.Common, 1f, "BombTako", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, S, 0, 0, 0 },
@@ -698,7 +698,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 70, "Trizooka", Rarity.Rare, 3, new Space[,] {
+		new( 70, "Trizooka", Rarity.Rare, 3, 1f, "SpUltraShot", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, I, 0, 0 },
@@ -708,7 +708,7 @@ public static class CardDatabase {
 			{ 0, I, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 71, "Big Bubbler", Rarity.Rare, 3, new Space[,] {
+		new( 71, "Big Bubbler", Rarity.Rare, 3, 1f, "SpGreatBarrier", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, I, 0, 0 },
@@ -718,7 +718,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 72, "Zipcaster", Rarity.Rare, 3, new Space[,] {
+		new( 72, "Zipcaster", Rarity.Rare, 3, 1f, "SpSuperHook", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, I, 0, 0 },
@@ -728,7 +728,7 @@ public static class CardDatabase {
 			{ 0, I, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 73, "Tenta Missiles", Rarity.Rare, 3, new Space[,] {
+		new( 73, "Tenta Missiles", Rarity.Rare, 3, 0.87f, "SpMultiMissile", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -738,7 +738,7 @@ public static class CardDatabase {
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 74, "Ink Storm", Rarity.Rare, 3, new Space[,] {
+		new( 74, "Ink Storm", Rarity.Rare, 3, 1f, "SpInkStorm", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -748,7 +748,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 75, "Booyah Bomb", Rarity.Rare, 3, new Space[,] {
+		new( 75, "Booyah Bomb", Rarity.Rare, 3, 0.98f, "SpNiceBall", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -758,7 +758,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 76, "Wave Breaker", Rarity.Rare, 3, new Space[,] {
+		new( 76, "Wave Breaker", Rarity.Rare, 3, 0.94f, "ShockSonar", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, I, 0, I, 0, 0 },
 			{ 0, 0, I, 0, I, 0, 0, 0 },
@@ -768,7 +768,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 77, "Ink Vac", Rarity.Rare, 3, new Space[,] {
+		new( 77, "Ink Vac", Rarity.Rare, 3, 1f, "Kyuinki", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -778,7 +778,7 @@ public static class CardDatabase {
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 78, "Killer Wail 5.1", Rarity.Rare, 3, new Space[,] {
+		new( 78, "Killer Wail 5.1", Rarity.Rare, 3, 0.94f, "SpMegaphoneLaser51", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -788,7 +788,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 79, "Inkjet", Rarity.Rare, 3, new Space[,] {
+		new( 79, "Inkjet", Rarity.Rare, 3, 1f, "Jetpack", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -798,7 +798,7 @@ public static class CardDatabase {
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 80, "Ultra Stamp", Rarity.Rare, 3, new Space[,] {
+		new( 80, "Ultra Stamp", Rarity.Rare, 3, 1f, "SpUltraStamp", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -808,7 +808,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 81, "Crab Tank", Rarity.Rare, 3, new Space[,] {
+		new( 81, "Crab Tank", Rarity.Rare, 3, 1f, "Kanitank", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, I, 0, 0 },
 			{ 0, I, 0, I, 0, I, 0, 0 },
@@ -818,7 +818,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 82, "Reefslider", Rarity.Rare, 3, new Space[,] {
+		new( 82, "Reefslider", Rarity.Rare, 3, 1f, "Chidori", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -828,7 +828,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 83, "Triple Inkstrike", Rarity.Rare, 3, new Space[,] {
+		new( 83, "Triple Inkstrike", Rarity.Rare, 3, 0.82f, "TripleTornado", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, I, 0, 0 },
 			{ 0, 0, 0, 0, I, I, 0, 0 },
@@ -838,7 +838,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 84, "Tacticooler", Rarity.Rare, 3, new Space[,] {
+		new( 84, "Tacticooler", Rarity.Rare, 3, 1f, "EnergyStand", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, I, I, 0, I, 0, 0, 0 },
@@ -848,7 +848,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new( 85, "Sheldon", Rarity.Rare, new Space[,] {
+		new( 85, "Sheldon", Rarity.Rare, 1f, "Bukichi", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, I, I, 0, S, 0, 0 },
@@ -857,8 +857,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 86, "Gnarly Eddy", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(125, 157, 60), InkColour2 = new(181, 115, 85) },
+		new( 86, "Gnarly Eddy", Rarity.Rare, 1f, "Omura", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, I, 0, I, 0, I, 0, 0 },
@@ -867,8 +867,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 87, "Jel La Fleur", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(205, 113, 74), InkColour2 = new(169, 113, 230) },
+		new( 87, "Jel La Fleur", Rarity.Rare, 1f, "Hanagasa", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, I, I, 0, I, 0, 0 },
@@ -877,8 +877,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 88, "Mr. Coco", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(129, 106, 219), InkColour2 = new(130, 154, 233) },
+		new( 88, "Mr. Coco", Rarity.Rare, 1f, "Yashiganisan", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, S, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -887,8 +887,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 89, "Harmony", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(124, 159, 234), InkColour2 = new(218, 101, 63) },
+		new( 89, "Harmony", Rarity.Rare, 1f, "Paruko", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, I, 0 },
 			{ 0, I, I, 0, I, I, 0, 0 },
@@ -897,8 +897,8 @@ public static class CardDatabase {
 			{ 0, 0, I, 0, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, I, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 90, "Murch", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(239, 160, 194), InkColour2 = new(107, 217, 175) },
+		new( 90, "Murch", Rarity.Rare, 1f, "Spiky", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, I, 0, 0, 0 },
 			{ 0, I, 0, I, 0, I, 0, 0 },
@@ -907,8 +907,8 @@ public static class CardDatabase {
 			{ 0, 0, I, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 91, "Mr. Grizz", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(131, 110, 211), InkColour2 = new(177, 121, 190) },
+		new( 91, "Mr. Grizz", Rarity.Rare, 1f, "Kumasan", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, I, 0, 0 },
 			{ 0, 0, S, 0, I, I, 0, 0 },
@@ -917,8 +917,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, I, I, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 92, "Marigold", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(98, 145, 107), InkColour2 = new(196, 106, 52) },
+		new( 92, "Marigold", Rarity.Rare, 1f, "Mother", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, I, 0, I, I, 0, 0 },
@@ -927,8 +927,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 93, "Smallfry", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(230, 139, 122), InkColour2 = new(190, 136, 200) },
+		new( 93, "Smallfry", Rarity.Fresh, 1f, "Kojake", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -937,8 +937,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 94, "Cuttlefish", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(98, 140, 146), InkColour2 = new(203, 99, 123) },
+		new( 94, "Cuttlefish", Rarity.Fresh, 1f, "Atarime", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, I, 0 },
 			{ 0, 0, I, 0, I, I, 0, 0 },
@@ -947,8 +947,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, I, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 95, "Captain", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(198, 126, 148), InkColour2 = new(113, 190, 218) },
+		new( 95, "Captain", Rarity.Fresh, 1f, "Shirei", new Space[,] {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, I, I, I, 0, 0, 0, 0 },
 			{ 0, I, I, S, I, 0, 0, 0 },
@@ -957,8 +957,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 96, "Callie", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(244, 231, 129), InkColour2 = new(249, 172, 127) },
+		new( 96, "Callie", Rarity.Fresh, 1f, "Aori", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, I, 0, 0, I, 0, 0 },
 			{ 0, I, I, I, 0, 0, I, 0 },
@@ -967,8 +967,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 97, "Marie", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(188, 89, 252), InkColour2 = new(246, 78, 171) },
+		new( 97, "Marie", Rarity.Fresh, 1f, "Hotaru", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, I, S, 0, 0, I, 0 },
@@ -977,8 +977,8 @@ public static class CardDatabase {
 			{ 0, I, I, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 98, "Shiver", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(222, 242, 122), InkColour2 = new(181, 214, 121) },
+		new( 98, "Shiver", Rarity.Fresh, 1f, "Fuka", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, S, I, 0, 0, 0 },
 			{ 0, 0, I, 0, I, I, I, 0 },
@@ -987,8 +987,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new( 99, "Frye", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(116, 112, 250), InkColour2 = new(146, 95, 251) },
+		new( 99, "Frye", Rarity.Fresh, 1f, "Utsuho", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ I, I, 0, I, I, I, 0, 0 },
@@ -997,8 +997,8 @@ public static class CardDatabase {
 			{ 0, 0, S, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(100, "Big Man", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(245, 229, 130), InkColour2 = new(246, 165, 119) },
+		new(100, "Big Man", Rarity.Fresh, 1f, "Mantaro", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, I, 0, 0 },
 			{ 0, I, 0, I, I, I, 0, 0 },
@@ -1007,8 +1007,8 @@ public static class CardDatabase {
 			{ 0, I, I, 0, 0, S, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(101, "Judd", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(220, 241, 141), InkColour2 = new(124, 231, 161) },
+		new(101, "Judd", Rarity.Fresh, 1f, "Judgekun", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, I, 0, 0 },
 			{ 0, 0, I, I, 0, I, 0, 0 },
@@ -1017,8 +1017,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(102, "Li'l Judd", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(228, 241, 130), InkColour2 = new(219, 185, 137) },
+		new(102, "Li'l Judd", Rarity.Fresh, 1f, "KoJudgekun", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -1027,8 +1027,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(103, "SquidForce", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(130, 103, 253), InkColour2 = new(168, 76, 253) },
+		new(103, "SquidForce", Rarity.Rare, 1f, "Batoroika", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -1037,8 +1037,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(104, "Zink", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(228, 117, 56), InkColour2 = new(230, 247, 75) },
+		new(104, "Zink", Rarity.Rare, 1f, "Ironic", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, I, 0, I, 0, I, 0, 0 },
@@ -1047,8 +1047,8 @@ public static class CardDatabase {
 			{ 0, I, I, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(105, "Krak-On", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(244, 124, 130), InkColour2 = new(122, 192, 195) },
+		new(105, "Krak-On", Rarity.Rare, 1f, "Kuraagesu", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -1057,8 +1057,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(106, "Rockenberg", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(97, 125, 234), InkColour2 = new(245, 149, 68) },
+		new(106, "Rockenberg", Rarity.Rare, 1f, "Rokkenberugu", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, I, 0, 0 },
@@ -1067,8 +1067,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(107, "Zekko", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(171, 98, 57), InkColour2 = new(229, 124, 59) },
+		new(107, "Zekko", Rarity.Rare, 1f, "Ezokko", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -1077,8 +1077,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(108, "Forge", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(98, 95, 224), InkColour2 = new(229, 123, 74) },
+		new(108, "Forge", Rarity.Rare, 1f, "Forima", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, S, I, 0, 0 },
@@ -1087,8 +1087,8 @@ public static class CardDatabase {
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(109, "Firefin", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(238, 189, 60), InkColour2 = new(103, 101, 58) },
+		new(109, "Firefin", Rarity.Rare, 1f, "Hokkorii", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
@@ -1097,8 +1097,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(110, "Skalop", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(183, 93, 73), InkColour2 = new(225, 113, 64) },
+		new(110, "Skalop", Rarity.Rare, 1f, "Hotakkusu", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, S, I, I, I, 0, 0 },
@@ -1107,8 +1107,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(111, "Splash Mob", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(128, 200, 165), InkColour2 = new(180, 102, 190) },
+		new(111, "Splash Mob", Rarity.Rare, 1f, "Jimon", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -1117,8 +1117,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(112, "Inkline", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(105, 143, 62), InkColour2 = new(180, 102, 190) },
+		new(112, "Inkline", Rarity.Rare, 1f, "Shigureni", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, I, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -1127,8 +1127,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(113, "Tentatek", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(214, 96, 188), InkColour2 = new(115, 130, 234) },
+		new(113, "Tentatek", Rarity.Rare, 1f, "Arome", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -1137,8 +1137,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(114, "Takoroka", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(222, 98, 119), InkColour2 = new(88, 187, 167) },
+		new(114, "Takoroka", Rarity.Rare, 1f, "Yako", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, I, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -1147,8 +1147,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(115, "Annaki", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(221, 123, 65), InkColour2 = new(154, 208, 48) },
+		new(115, "Annaki", Rarity.Rare, 1f, "Anaaki", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -1157,8 +1157,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(116, "Enperry", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(176, 92, 77), InkColour2 = new(110, 106, 105) },
+		new(116, "Enperry", Rarity.Rare, 1f, "Enperii", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, I, I, 0, 0 },
@@ -1167,8 +1167,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(117, "Toni Kensa", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(98, 98, 200), InkColour2 = new(204, 102, 56) },
+		new(117, "Toni Kensa", Rarity.Rare, 1f, "Tatakikensaki", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, I, 0, 0 },
@@ -1177,8 +1177,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(118, "Barazushi", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(246, 92, 57), InkColour2 = new(103, 101, 58) },
+		new(118, "Barazushi", Rarity.Rare, 1f, "Barazushi", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
@@ -1187,8 +1187,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, S, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(119, "Emberz", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(244, 243, 232), InkColour2 = new(113, 112, 76) },
+		new(119, "Emberz", Rarity.Rare, 1f, "Shichirin", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, I, 0, I, 0, 0 },
@@ -1197,8 +1197,8 @@ public static class CardDatabase {
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(120, "Octotrooper", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(97, 187, 234), InkColour2 = new(239, 106, 55) },
+		new(120, "Octotrooper", Rarity.Common, 1f, "TakoTrooper", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
@@ -1207,8 +1207,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(121, "Shielded Octotrooper", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(121, "Shielded\nOctotrooper", Rarity.Common, 1f, "TateTakoTrooper", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, I, 0, 0 },
@@ -1217,8 +1217,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(122, "Twintacle Octotrooper", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(122, "Twintacle\nOctotrooper", Rarity.Common, 1f, "BaiTakoTrooper", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, I, 0, 0, 0 },
@@ -1227,8 +1227,8 @@ public static class CardDatabase {
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(123, "Octohopper", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(123, "Octohopper", Rarity.Common, 1f, "TakoHopper", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -1237,8 +1237,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(124, "Octocopter", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(124, "Octocopter", Rarity.Common, 1f, "Takopter", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -1247,8 +1247,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(125, "Octobomber", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(125, "Octobomber", Rarity.Common, 1f, "BombTakopter", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, I, I, I, 0, 0 },
@@ -1257,8 +1257,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, S, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(126, "Octodisco", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(126, "Octodisco", Rarity.Common, 1f, "BarrierTakopter", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, S, I, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -1267,8 +1267,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(127, "Octopod", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(127, "Octopod", Rarity.Common, 1f, "TakoPod", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -1277,8 +1277,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(128, "Oversized Octopod", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(128, "Oversized\nOctopod", Rarity.Rare, 1f, "TakopodDEV", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, I, 0, 0 },
@@ -1287,8 +1287,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(129, "Tentakook", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(129, "Tentakook", Rarity.Common, 1f, "Sutakoraa", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, I, 0, 0 },
@@ -1297,8 +1297,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(130, "Octosniper", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(130, "Octosniper", Rarity.Rare, 1f, "TakoSniper", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
@@ -1307,8 +1307,8 @@ public static class CardDatabase {
 			{ 0, I, 0, S, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(131, "Octocommander", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(131, "Octocommander", Rarity.Rare, 0.79f, "TakoCommander", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
@@ -1317,8 +1317,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(132, "Octomissile", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(132, "Octomissile", Rarity.Common, 1f, "TakoMissile", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, S, 0, 0, 0 },
@@ -1327,8 +1327,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(133, "Octozeppelin", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(133, "Octozeppelin", Rarity.Rare, 0.98f, "TakopperinGo", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, S, I, 0, 0, 0 },
@@ -1337,8 +1337,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(134, "Squee-G", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(134, "Squee-G", Rarity.Common, 1f, "Incleaner", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, I, 0, 0 },
@@ -1347,8 +1347,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(135, "Octostamp", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(135, "Octostamp", Rarity.Common, 1f, "TakoStamp", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -1357,8 +1357,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(136, "Amped Octostamp", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(136, "Amped\nOctostamp", Rarity.Rare, 1f, "StampWave", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, I, 0, 0, 0 },
@@ -1367,8 +1367,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(137, "Flooder", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(137, "Flooder", Rarity.Common, 1f, "TakoDozer", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, I, 0, 0 },
 			{ 0, 0, S, 0, 0, 0, 0, 0 },
@@ -1377,8 +1377,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(138, "Octoballer", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(138, "Octoballer", Rarity.Common, 1f, "TakoStrike", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, I, I, 0, 0, 0 },
@@ -1387,8 +1387,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(139, "Octoling", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(139, "Octoling", Rarity.Rare, 1f, "TakoZonesu", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -1397,8 +1397,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(140, "DJ Octavio", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(140, "DJ Octavio", Rarity.Fresh, 1f, "TakowasaShogun", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, I, I, I, I, 0, 0, 0 },
@@ -1407,8 +1407,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, 0, I, 0 },
 			{ 0, 0, 0, I, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(141, "Chum", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(166, 105, 169), InkColour2 = new(121, 111, 174) },
+		new(141, "Chum", Rarity.Common, 1f, "Shake", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, S, 0, 0, 0, 0 },
@@ -1417,8 +1417,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(142, "Cohock", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(142, "Cohock", Rarity.Common, 1f, "Dosukoi", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, S, 0, 0, 0 },
@@ -1427,8 +1427,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(143, "Snatcher", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(143, "Snatcher", Rarity.Common, 1f, "Tamahiroi", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, I, 0, 0 },
@@ -1437,8 +1437,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(144, "Steelhead", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(144, "Steelhead", Rarity.Common, 1f, "Bakudan", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, S, I, I, 0, 0, 0, 0 },
@@ -1447,8 +1447,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(145, "Steel Eel", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(145, "Steel Eel", Rarity.Common, 1f, "Hebi", new Space[,] {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, S, I, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -1457,8 +1457,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(146, "Scrapper", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(146, "Scrapper", Rarity.Common, 1f, "Teppan", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
@@ -1467,8 +1467,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(147, "Stinger", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(147, "Stinger", Rarity.Common, 1f, "Tower", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -1477,8 +1477,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(148, "Maws", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(148, "Maws", Rarity.Common, 1f, "Mogura", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -1487,8 +1487,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, S, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(149, "Drizzler", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(149, "Drizzler", Rarity.Common, 1f, "Koumori", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, I, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -1497,8 +1497,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(150, "Flyfish", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(150, "Flyfish", Rarity.Common, 1f, "Katapaddo", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -1507,8 +1507,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(151, "Fish Stick", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(151, "Fish Stick", Rarity.Common, 1f, "Buranko", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, 0, 0, 0, 0, 0 },
@@ -1517,8 +1517,8 @@ public static class CardDatabase {
 			{ 0, I, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(152, "Flipper-Flopper", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(152, "Flipper-Flopper", Rarity.Common, 0.84f, "Iruka", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -1527,8 +1527,8 @@ public static class CardDatabase {
 			{ 0, I, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(153, "Slammin' Lid", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(153, "Slammin' Lid", Rarity.Common, 1f, "Nabebuta", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
@@ -1537,8 +1537,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(154, "Big Shot", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(154, "Big Shot", Rarity.Common, 1f, "Taihou", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, S, I, 0, 0 },
 			{ 0, 0, 0, 0, I, I, 0, 0 },
@@ -1547,8 +1547,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(155, "Goldie", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(155, "Goldie", Rarity.Rare, 1f, "Kinshake", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, I, 0, 0, 0 },
 			{ 0, 0, I, I, I, I, 0, 0 },
@@ -1557,8 +1557,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(156, "Griller", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(156, "Griller", Rarity.Rare, 1f, "Grill", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, S, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, I, 0, 0 },
@@ -1567,8 +1567,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(157, "Mothership", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(157, "Mothership", Rarity.Rare, 1f, "Hakobiya", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -1577,8 +1577,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(158, "Mudmouth", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(158, "Mudmouth", Rarity.Rare, 1f, "Tamaire", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, I, I, 0 },
@@ -1587,8 +1587,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(159, "Zapfish", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(159, "Zapfish", Rarity.Common, 1f, "Denchinamazu", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
@@ -1598,7 +1598,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(160, "Tower Control", Rarity.Rare, new Space[,] {
+		new(160, "Tower Control\nTower", Rarity.Rare, 0.91f, "GachiYagura", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, I, 0, 0 },
@@ -1608,7 +1608,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(161, "Rainmaker", Rarity.Rare, new Space[,] {
+		new(161, "Rainmaker", Rarity.Rare, 1f, "GachiHoko", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -1618,7 +1618,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(162, "Power Clam", Rarity.Rare, new Space[,] {
+		new(162, "Power Clam", Rarity.Rare, 1f, "GachiAsari", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, S, I, I, 0, 0, 0 },
@@ -1628,7 +1628,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(163, "Custom Splattershot Jr.", Rarity.Common, new Space[,] {
+		new(163, "Custom\nSplattershot Jr.", Rarity.Common, 0.8f, "ShooterFirst01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -1638,7 +1638,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(164, "Aerospray RG", Rarity.Common, new Space[,] {
+		new(164, "Aerospray RG", Rarity.Common, 0.94f, "ShooterBlaze01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -1648,7 +1648,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(165, "Tentatek Splattershot", Rarity.Common, new Space[,] {
+		new(165, "Tentatek\nSplattershot", Rarity.Common, 0.99f, "ShooterNormal01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -1658,7 +1658,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(166, "Forge Splattershot Pro", Rarity.Common, new Space[,] {
+		new(166, "Forge\nSplattershot Pro", Rarity.Common, 0.77f, "ShooterExpert01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, S, I, 0, 0, 0, 0 },
@@ -1668,7 +1668,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(167, "Splattershot Nova", Rarity.Common, new Space[,] {
+		new(167, "Splattershot Nova", Rarity.Common, 0.7f, "ShooterQuickLong00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -1678,7 +1678,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(168, "Luna Blaster Neo", Rarity.Common, new Space[,] {
+		new(168, "Luna Blaster\nNeo", Rarity.Common, 1f, "BlasterShort01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, S, 0, 0, 0, 0, 0 },
@@ -1688,7 +1688,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(169, "Carbon Roller Deco", Rarity.Common, new Space[,] {
+		new(169, "Carbon Roller\nDeco", Rarity.Common, 0.94f, "RollerCompact01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -1698,7 +1698,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(170, "Big Swig Roller", Rarity.Common, new Space[,] {
+		new(170, "Big Swig Roller", Rarity.Common, 0.86f, "RollerWide00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -1708,7 +1708,7 @@ public static class CardDatabase {
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(171, "Inkbrush Noveau", Rarity.Common, new Space[,] {
+		new(171, "Inkbrush\nNouveau", Rarity.Common, 1f, "BrushMini01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, I, 0, 0, 0, 0, 0 },
 			{ 0, S, I, 0, 0, 0, 0, 0 },
@@ -1718,7 +1718,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(172, "Snipewriter 5H", Rarity.Common, new Space[,] {
+		new(172, "Snipewriter 5H", Rarity.Common, 0.86f, "ChargerPencil00", new Space[,] {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -1728,7 +1728,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(173, "Slosher Deco", Rarity.Common, new Space[,] {
+		new(173, "Slosher Deco", Rarity.Common, 1f, "SlosherStrong01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -1738,7 +1738,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(174, "Zink Mini Splatling", Rarity.Common, new Space[,] {
+		new(174, "Zink Mini\nSplatling", Rarity.Common, 1f, "SpinnerQuick01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, S, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -1748,7 +1748,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(175, "Dapple Dualies Noveau", Rarity.Common, new Space[,] {
+		new(175, "Dapple Dualies\nNouveau", Rarity.Common, 0.88f, "ManeuverShort01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, S, I, 0, 0, 0 },
@@ -1758,7 +1758,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(176, "Neo Sploosh-o-matic", Rarity.Common, new Space[,] {
+		new(176, "Neo Sploosh-\no-matic", Rarity.Common, 1f, "ShooterShort01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -1768,7 +1768,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(177, "Neo Splash-o-matic", Rarity.Common, new Space[,] {
+		new(177, "Neo Splash-\no-matic", Rarity.Common, 1f, "ShooterPrecision01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, S, 0, 0, 0, 0 },
@@ -1778,7 +1778,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(178, "N-ZAP '89", Rarity.Common, new Space[,] {
+		new(178, "N-ZAP '89", Rarity.Common, 1f, "ShooterQuickMiddle01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -1788,7 +1788,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(179, ".96 Gal Deco", Rarity.Common, new Space[,] {
+		new(179, ".96 Gal Deco", Rarity.Common, 1f, "ShooterHeavy01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, S, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -1798,7 +1798,7 @@ public static class CardDatabase {
 			{ 0, 0, I, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(180, "Custom Jet Squelcher", Rarity.Common, new Space[,] {
+		new(180, "Custom Jet\nSquelcher", Rarity.Common, 1f, "ShooterLong01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -1808,7 +1808,7 @@ public static class CardDatabase {
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(181, "Clash Blaster Neo", Rarity.Common, new Space[,] {
+		new(181, "Clash Blaster\nNeo", Rarity.Common, 0.96f, "BlasterLightShort01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, S, 0, 0, 0, 0 },
@@ -1818,7 +1818,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(182, "Rapid Blaster Deco", Rarity.Common, new Space[,] {
+		new(182, "Rapid Blaster\nDeco", Rarity.Common, 0.96f, "BlasterLight01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -1828,7 +1828,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(183, "L-3 Nozzlenose D", Rarity.Common, new Space[,] {
+		new(183, "L-3 Nozzlenose D", Rarity.Common, 0.78f, "ShooterTripleQuick01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -1838,7 +1838,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(184, "Krak-On Splat Roller", Rarity.Common, new Space[,] {
+		new(184, "Krak-On Splat\nRoller", Rarity.Common, 0.93f, "RollerNormal01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -1848,7 +1848,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(185, "Z+F Splat Charger", Rarity.Common, new Space[,] {
+		new(185, "Z+F Splat\nCharger", Rarity.Common, 1f, "ChargerNormal01", new Space[,] {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -1858,7 +1858,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(186, "Z+F Splatterscope", Rarity.Common, new Space[,] {
+		new(186, "Z+F\nSplatterscope", Rarity.Common, 0.91f, "ChargerNormalScope01", new Space[,] {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -1868,7 +1868,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(187, "Tri-Slosher Noveau", Rarity.Common, new Space[,] {
+		new(187, "Tri-Slosher\nNouveau", Rarity.Common, 1f, "SlosherDiffusion01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -1878,7 +1878,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(188, "Kraken Royale", Rarity.Rare, 3, new Space[,] {
+		new(188, "Kraken Royale", Rarity.Rare, 3, 0.9f, "SpCastle", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -1888,7 +1888,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(189, "Super Chump", Rarity.Rare, 3, new Space[,] {
+		new(189, "Super Chump", Rarity.Rare, 3, 0.98f, "SpFirework", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, I, I, 0, 0, 0, 0 },
 			{ 0, I, I, I, 0, 0, 0, 0 },
@@ -1898,7 +1898,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(190, "Shelly & Donny", Rarity.Rare, new Space[,] {
+		new(190, "Shelly &\nDonny", Rarity.Rare, 1f, "MametsubuBukichi", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, I, I, 0 },
 			{ 0, 0, 0, 0, I, I, 0, 0 },
@@ -1907,8 +1907,8 @@ public static class CardDatabase {
 			{ 0, I, I, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(191, "Annie", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(235, 244, 120), InkColour2 = new(205, 244, 126) },
+		new(191, "Annie", Rarity.Rare, 1f, "Anemo", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, I, 0, I, 0, 0 },
 			{ 0, 0, S, 0, I, 0, 0, 0 },
@@ -1917,8 +1917,8 @@ public static class CardDatabase {
 			{ 0, I, 0, I, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(192, "Jelonzo", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(245, 171, 233), InkColour2 = new(203, 168, 230) },
+		new(192, "Jelonzo", Rarity.Rare, 1f, "Echizen", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, I, S, 0, I, 0, 0 },
@@ -1927,8 +1927,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(193, "Fred Crumbs", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(106, 178, 215), InkColour2 = new(149, 119, 220) },
+		new(193, "Fred Crumbs", Rarity.Rare, 1f, "Ajio", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, I, I, 0, 0, 0, 0, 0 },
@@ -1937,8 +1937,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(194, "Spyke", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(107, 130, 225), InkColour2 = new(235, 218, 71) },
+		new(194, "Spyke", Rarity.Rare, 1f, "Daunii", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, I, 0, I, 0, 0 },
 			{ 0, 0, I, 0, I, 0, 0, 0 },
@@ -1947,8 +1947,8 @@ public static class CardDatabase {
 			{ 0, I, 0, I, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(195, "The Eel Deal - Frye", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(154, 100, 234), InkColour2 = new(204, 139, 67) },
+		new(195, "The Eel\nDeal - Frye", Rarity.Fresh, 1f, "Utsuho1", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -1957,8 +1957,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, I, 0, 0 },
 			{ 0, 0, 0, I, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(196, "The Cold-Blooded Bandit - Shiver", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(146, 95, 251), InkColour2 = new(116, 112, 250) },
+		new(196, "The Cold-Blooded\nBandit - Shiver", Rarity.Fresh, 0.74f, "Fuka1", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -1967,8 +1967,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, I, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, I, 0, 0 }
-		}),
-		new(197, "The Hype Manta Storm - Big Man", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(246, 165, 119), InkColour2 = new(245, 229, 130) },
+		new(197, "The Hype Manta\nStorm - Big Man", Rarity.Fresh, 0.78f, "Mantaro1", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, I, I, I, 0, 0 },
@@ -1977,8 +1977,8 @@ public static class CardDatabase {
 			{ 0, I, I, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, I, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(198, "Z+F", Rarity.Rare, new Space[,] {
+		}) { InkColour1 = new(124, 231, 161), InkColour2 = new(220, 241, 141) },
+		new(198, "Z+F", Rarity.Rare, 1f, "Ezokkorii", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
@@ -1987,8 +1987,8 @@ public static class CardDatabase {
 			{ 0, 0, I, I, I, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(199, "Annaki Splattershot Nova", Rarity.Common, new Space[,] {
+		}) { InkColour1 = new(100, 103, 157), InkColour2 = new(246, 243, 219) },
+		new(199, "Annaki\nSplattershot Nova", Rarity.Common, 0.71f, "ShooterQuickLong01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, S, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -1998,7 +1998,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(200, "Rapid Blaster Pro Deco", Rarity.Common, new Space[,] {
+		new(200, "Rapid Blaster\nPro Deco", Rarity.Common, 0.96f, "BlasterLightLong01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -2008,7 +2008,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(201, "S-BLAST '92", Rarity.Common, new Space[,] {
+		new(201, "S-BLAST '92", Rarity.Common, 1f, "BlasterPrecision00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -2018,7 +2018,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(202, "H-3 Nozzlenose D", Rarity.Common, new Space[,] {
+		new(202, "H-3 Nozzlenose D", Rarity.Common, 0.76f, "ShooterTripleMiddle01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, S, 0, 0, 0, 0, 0 },
@@ -2028,7 +2028,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(203, "Big Swig Roller Express", Rarity.Common, new Space[,] {
+		new(203, "Big Swig\nRoller Express", Rarity.Common, 0.9f, "RollerWide01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
@@ -2038,7 +2038,7 @@ public static class CardDatabase {
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(204, "Painbrush", Rarity.Common, new Space[,] {
+		new(204, "Painbrush", Rarity.Common, 1f, "BrushHeavy00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, I, 0 },
 			{ 0, 0, 0, 0, I, I, 0, 0 },
@@ -2048,7 +2048,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(205, "Heavy Splatling Deco", Rarity.Common, new Space[,] {
+		new(205, "Heavy Splatling\nDeco", Rarity.Common, 0.81f, "SpinnerStandard01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, I, 0 },
 			{ 0, 0, 0, 0, 0, S, I, 0 },
@@ -2058,7 +2058,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(206, "Custom Dualie Squelchers", Rarity.Common, new Space[,] {
+		new(206, "Custom Dualie\nSquelchers", Rarity.Common, 0.89f, "ManeuverDual01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
@@ -2068,7 +2068,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(207, "Light Tetra Dualies", Rarity.Common, new Space[,] {
+		new(207, "Light Tetra\nDualies", Rarity.Common, 1f, "ManeuverStepper01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -2078,7 +2078,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(208, "Tenta Sorella Brella", Rarity.Common, new Space[,] {
+		new(208, "Tenta Sorella\nBrella", Rarity.Common, 0.95f, "ShelterWide01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -2088,7 +2088,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(209, "Splatana Wiper Deco", Rarity.Common, new Space[,] {
+		new(209, "Splatana\nWiper Deco", Rarity.Common, 1f, "SaberLight01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -2098,7 +2098,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(210,  -6, "Gold Dynamo Roller", Rarity.Common, new Space[,] {
+		new(210,  -6, "Gold Dynamo\nRoller", Rarity.Common, 0.98f, "RollerHeavy01", new Space[,] {
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -2108,7 +2108,7 @@ public static class CardDatabase {
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(211,  -5, "Octobrush Nouveau", Rarity.Common, new Space[,] {
+		new(211,  -5, "Octobrush\nNouveau", Rarity.Common, 1f, "BrushNormal01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, I, I, I, 0, 0, 0, 0 },
@@ -2118,7 +2118,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, I, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(212,  -1, "Custom Goo Tuber", Rarity.Common, new Space[,] {
+		new(212,  -1, "Custom Goo\nTuber", Rarity.Common, 1f, "ChargerKeeper01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, 0, 0, 0, 0 },
@@ -2128,7 +2128,7 @@ public static class CardDatabase {
 			{ 0, 0, I, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(213,  -2, "Sloshing Machine Neo", Rarity.Common, new Space[,] {
+		new(213,  -2, "Sloshing\nMachine Neo", Rarity.Common, 1f, "SlosherLauncher01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -2138,7 +2138,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(214,  -8, "Bloblobber Deco", Rarity.Common, new Space[,] {
+		new(214,  -8, "Bloblobber\nDeco", Rarity.Common, 1f, "SlosherBathtub01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, I, 0, 0, 0 },
@@ -2148,7 +2148,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(215,  -4, "Dread Wringer", Rarity.Common, new Space[,] {
+		new(215,  -4, "Dread Wringer", Rarity.Common, 0.87f, "SlosherDouble00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, I, 0, 0 },
@@ -2158,7 +2158,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(216, -12, "Ballpoint Splatling Nouveau", Rarity.Common, new Space[,] {
+		new(216, -12, "Ballpoint Splatling\nNouveau", Rarity.Common, 0.69f, "SpinnerDownpour01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, 0, 0, 0 },
 			{ 0, 0, 0, I, S, 0, 0, 0 },
@@ -2168,7 +2168,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(217,  -3, "Heavy Edit Splatling", Rarity.Common, new Space[,] {
+		new(217,  -3, "Heavy Edit\nSplatling", Rarity.Common, 1f, "SpinnerHyperShort00", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, I, I, 0, 0 },
 			{ 0, 0, 0, I, I, I, 0, 0 },
@@ -2178,7 +2178,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(218, -11, "Sorella Brella", Rarity.Common, new Space[,] {
+		new(218, -11, "Sorella Brella", Rarity.Common, 0.96f, "ShelterNormal01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, I, 0, 0, 0, 0 },
 			{ 0, 0, I, I, I, 0, 0, 0 },
@@ -2188,7 +2188,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(219,  -7, "Inkline Tri-Stringer", Rarity.Common, new Space[,] {
+		new(219,  -7, "Inkline\nTri-Stringer", Rarity.Common, 1f, "StringerNormal01", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, 0, 0, 0, 0, 0 },
@@ -2198,7 +2198,7 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
 		}),
-		new(220, -10, "Cohozuna", Rarity.Fresh, new Space[,] {
+		new(220, -10, "Cohozuna", Rarity.Fresh, 1f, "Yokozuna", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, I, I, 0, 0, 0 },
 			{ 0, I, I, I, I, I, 0, 0 },
@@ -2207,8 +2207,8 @@ public static class CardDatabase {
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, S, 0, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
-		new(221,  -9, "Horrorboros", Rarity.Fresh, new Space[,] {
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
+		new(221,  -9, "Horrorboros", Rarity.Fresh, 1f, "Tatsu", new Space[,] {
 			{ 0, 0, 0, 0, 0, 0, 0, 0 },
 			{ 0, 0, S, 0, 0, 0, 0, 0 },
 			{ 0, I, 0, I, 0, 0, 0, 0 },
@@ -2217,21 +2217,21 @@ public static class CardDatabase {
 			{ 0, 0, I, I, I, 0, I, 0 },
 			{ 0, 0, 0, 0, 0, I, 0, 0 },
 			{ 0, 0, 0, 0, 0, 0, 0, 0 }
-		}),
+		}) { InkColour1 = new(84, 142, 122), InkColour2 = new(193, 111, 98) },
 	};
 
 	private static readonly Dictionary<int, Card> byAltNumber;
 
 	public static int LastOfficialCardNumber { get; }
 
-	public static Version Version { get; } = new(5, 0, 1, 0);
-	public static DateTime LastModified { get; } = new(2023, 8, 30, 9, 0, 0, DateTimeKind.Utc);
+	public static Version Version { get; } = new(5, 0, 2, 0);
+	public static DateTime LastModified { get; } = new(2023, 10, 9, 22, 30, 0, DateTimeKind.Utc);
 	public static string JSON { get; }
 	public static ReadOnlyCollection<Card> Cards { get; }
 
 	static CardDatabase() {
 		Cards = Array.AsReadOnly(cards);
-		JSON = JsonConvert.SerializeObject(cards);
+		JSON = JsonUtils.Serialise(cards);
 		LastOfficialCardNumber = cards.Last(c => c.Number > 0).Number;
 		byAltNumber = new(from c in cards where c.Number < 0 || c.AltNumber is not null select new KeyValuePair<int, Card>(c.Number < 0 ? c.Number : c.AltNumber ?? 0, c));
 	}
diff --git a/TableturfBattleServer/Colour.cs b/TableturfBattleServer/Colour.cs
index dac809c..905f2fd 100644
--- a/TableturfBattleServer/Colour.cs
+++ b/TableturfBattleServer/Colour.cs
@@ -1,12 +1,7 @@
-using Newtonsoft.Json;
-
-namespace TableturfBattleServer;
+namespace TableturfBattleServer;
 public struct Colour {
-	[JsonProperty("r")]
 	public int R;
-	[JsonProperty("g")]
 	public int G;
-	[JsonProperty("b")]
 	public int B;
 
 	public Colour(int r, int g, int b) {
diff --git a/TableturfBattleServer/DataStructures.cs b/TableturfBattleServer/DataStructures.cs
index 95ef9cd..3debee5 100644
--- a/TableturfBattleServer/DataStructures.cs
+++ b/TableturfBattleServer/DataStructures.cs
@@ -14,7 +14,6 @@ internal class WebSocketPayload<T> {
 	}
 }
 internal class WebSocketPayloadWithPlayerData<T> : WebSocketPayload<T> {
-	[JsonProperty("playerData")]
 	public PlayerData? PlayerData;
 
 	public WebSocketPayloadWithPlayerData(string eventName, T payload, PlayerData? playerData) : base(eventName, payload)
@@ -22,18 +21,13 @@ internal class WebSocketPayloadWithPlayerData<T> : WebSocketPayload<T> {
 }
 
 public class PlayerData {
-	[JsonProperty("playerIndex")]
 	public int PlayerIndex;
-	[JsonProperty("hand")]
 	public Card[]? Hand;
-	[JsonProperty("deck")]
-	public Card[]? Deck;
-	[JsonProperty("move")]
+	public Deck? Deck;
 	public Move? Move;
-	[JsonProperty("cardsUsed")]
 	public List<int>? CardsUsed;
 
-	public PlayerData(int playerIndex, Card[]? hand, Card[]? deck, Move? move, List<int>? cardsUsed) {
+	public PlayerData(int playerIndex, Card[]? hand, Deck? deck, Move? move, List<int>? cardsUsed) {
 		this.PlayerIndex = playerIndex;
 		this.Hand = hand;
 		this.Deck = deck;
diff --git a/TableturfBattleServer/Deck.cs b/TableturfBattleServer/Deck.cs
new file mode 100644
index 0000000..b4933a5
--- /dev/null
+++ b/TableturfBattleServer/Deck.cs
@@ -0,0 +1,35 @@
+using Newtonsoft.Json;
+
+namespace TableturfBattleServer;
+public class Deck : IEquatable<Deck> {
+	[JsonProperty]
+	internal string Name;
+	[JsonProperty]
+	internal int Sleeves;
+	[JsonProperty]
+	internal Card[] Cards;
+	[JsonProperty]
+	internal int[] Upgrades;
+
+	public Deck(string name, int sleeves, Card[] cards, int[] levels) {
+		this.Name = name ?? throw new ArgumentNullException(nameof(name));
+		this.Sleeves = sleeves;
+		this.Cards = cards ?? throw new ArgumentNullException(nameof(cards));
+		this.Upgrades = levels ?? throw new ArgumentNullException(nameof(levels));
+	}
+
+	public bool Equals(Deck? other)
+		=> other is not null && this.Name == other.Name && this.Sleeves == other.Sleeves && this.Cards.SequenceEqual(other.Cards) && this.Upgrades.SequenceEqual(other.Upgrades);
+	public override bool Equals(object? other) => other is Deck deck && this.Equals(deck);
+
+	public override int GetHashCode() {
+		var hashCode = new HashCode();
+		hashCode.Add(this.Name);
+		hashCode.Add(this.Sleeves);
+		foreach (var card in this.Cards)
+			hashCode.Add(card.Number);
+		foreach (var n in this.Upgrades)
+			hashCode.Add(n);
+		return hashCode.ToHashCode();
+	}
+}
diff --git a/TableturfBattleServer/Error.cs b/TableturfBattleServer/Error.cs
index 41cd058..ff3527e 100644
--- a/TableturfBattleServer/Error.cs
+++ b/TableturfBattleServer/Error.cs
@@ -6,9 +6,7 @@ namespace TableturfBattleServer;
 public struct Error {
 	[JsonIgnore]
 	public HttpStatusCode HttpStatusCode { get; }
-	[JsonProperty("code")]
 	public string Code { get; }
-	[JsonProperty("description")]
 	public string Description { get; }
 
 	public Error(HttpStatusCode httpStatusCode, string code, string description) {
diff --git a/TableturfBattleServer/Game.cs b/TableturfBattleServer/Game.cs
index d186d05..516b432 100644
--- a/TableturfBattleServer/Game.cs
+++ b/TableturfBattleServer/Game.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
-using System.Numerics;
 using System.Text;
 
 using Newtonsoft.Json;
@@ -10,31 +9,25 @@ public class Game {
 	[JsonIgnore]
 	public Guid ID { get; } = Guid.NewGuid();
 
-	[JsonProperty("state")]
 	public GameState State { get; set; }
-	[JsonProperty("turnNumber")]
 	public int TurnNumber { get; set; }
-	[JsonProperty("players")]
 	public List<Player> Players { get; } = new(4);
-	[JsonProperty("maxPlayers")]
 	public int MaxPlayers { get; set; }
 	[JsonProperty("stage")]
 	public string? StageName { get; private set; }
-	[JsonProperty("board")]
 	public Space[,]? Board { get; private set; }
-	[JsonProperty("startSpaces")]
 	public Point[]? StartSpaces;
 
-	[JsonProperty("goalWinCount")]
 	public int? GoalWinCount { get; set; }
 
-	[JsonProperty("turnTimeLimit")]
 	public int? TurnTimeLimit { get; set; }
-	[JsonProperty("turnTimeLeft")]
 	public int? TurnTimeLeft { get; set; }
 	[JsonIgnore]
 	internal DateTime abandonedSince = DateTime.UtcNow;
 
+	[JsonIgnore]
+	internal List<Deck> deckCache = new();
+	[JsonIgnore]
 	internal List<string> setStages = new();
 
 	public Game(int maxPlayers) => this.MaxPlayers = maxPlayers;
@@ -77,6 +70,10 @@ public class Game {
 		return false;
 	}
 
+	public Deck GetDeck(string name, int sleeves, IEnumerable<int> cardNumbers, IEnumerable<int> cardUpgrades)
+		=> this.deckCache.FirstOrDefault(d => d.Name == name && d.Sleeves == sleeves && cardNumbers.SequenceEqual(from c in d.Cards select c.Number) && cardUpgrades.SequenceEqual(d.Upgrades))
+			?? new(name, sleeves, (from i in cardNumbers select CardDatabase.GetCard(i)).ToArray(), cardUpgrades.ToArray());
+
 	public bool CanPlay(int playerIndex, Card card, int x, int y, int rotation, bool isSpecialAttack) {
 		if (card is null) throw new ArgumentNullException(nameof(card));
 		if (this.Board is null || this.Players[playerIndex].CurrentGameData is not SingleGameData gameData) return false;
@@ -331,7 +328,7 @@ public class Game {
 				foreach (var player in this.Players) {
 					var index = player.GetHandIndex(player.Move!.Card.Number);
 					var draw = player.CurrentGameData.drawOrder![this.TurnNumber + 2];
-					player.Hand![index] = player.CurrentGameData.Deck![draw];
+					player.Hand![index] = player.CurrentGameData.Deck!.Cards[draw];
 					player.ClearMoves();
 				}
 				this.SendEvent("turn", new { game = this, moves, placements, specialSpacesActivated }, true);
@@ -372,9 +369,7 @@ public class Game {
 		}
 	}
 
-	internal void SendPlayerReadyEvent(int playerIndex, bool isTimeout) {
-		this.SendEvent("playerReady", new { playerIndex, isTimeout }, false);
-	}
+	internal void SendPlayerReadyEvent(int playerIndex, bool isTimeout) => this.SendEvent("playerReady", new { playerIndex, isTimeout }, false);
 
 	internal void SendEvent<T>(string eventType, T data, bool includePlayerData) {
 		foreach (var session in Program.httpServer!.WebSocketServices.Hosts.First().Sessions.Sessions) {
@@ -388,22 +383,24 @@ public class Game {
 							break;
 						}
 					}
-					behaviour.SendInternal(JsonConvert.SerializeObject(new DTO.WebSocketPayloadWithPlayerData<T>(eventType, data, playerData)));
+					behaviour.SendInternal(JsonUtils.Serialise(new DTO.WebSocketPayloadWithPlayerData<T>(eventType, data, playerData)));
 				} else {
-					behaviour.SendInternal(JsonConvert.SerializeObject(new DTO.WebSocketPayload<T>(eventType, data)));
+					behaviour.SendInternal(JsonUtils.Serialise(new DTO.WebSocketPayload<T>(eventType, data)));
 				}
 			}
 		}
 	}
 
 	public void WriteReplayData(Stream stream) {
-		const int VERSION = 2;
+		const int VERSION = 3;
 
 		if (this.State < GameState.SetEnded)
 			throw new InvalidOperationException("Can't save a replay until the set has ended.");
 
 		using var writer = new BinaryWriter(stream, Encoding.UTF8, true);
 		writer.Write((byte) VERSION);
+
+		// Players
 		writer.Write((byte) (this.Players.Count | (this.GoalWinCount ?? 0) << 4));
 		foreach (var player in this.Players) {
 			writer.Write((byte) player.Colour.R);
@@ -420,14 +417,29 @@ public class Game {
 			writer.Write((byte) (nameBytes.Length | (player.UIBaseColourIsSpecialColour ? 0x80 : 0)));
 			writer.Write(nameBytes);
 		}
+
+		// Deck cache
+		writer.Write7BitEncodedInt(this.deckCache.Count);
+		foreach (var deck in this.deckCache) {
+			writer.Write(deck.Name);
+			writer.Write((byte) deck.Sleeves);
+			foreach (var card in deck.Cards)
+				writer.Write((byte) card.Number);
+
+			int upgradesPacked = 0;
+			for (var i = 0; i < 15; i++)
+				upgradesPacked |= deck.Upgrades[i] << (i * 2);
+			writer.Write(upgradesPacked);
+		}
+
+		// Games
 		for (int i = 0; i < this.Players[0].Games.Count; i++) {
 			var stageNumber = Enumerable.Range(0, StageDatabase.Stages.Count).First(j => this.setStages[i] == StageDatabase.Stages[j].Name);
 			writer.Write((byte) stageNumber);
 
 			foreach (var player in this.Players) {
 				var gameData = player.Games[i];
-				foreach (var card in gameData.Deck!)
-					writer.Write((byte) card.Number);
+				writer.Write7BitEncodedInt(this.deckCache.IndexOf(gameData.Deck!));
 				for (int j = 0; j < 4; j += 2)
 					writer.Write((byte) (gameData.initialDrawOrder![j] | gameData.initialDrawOrder[j + 1] << 4));
 				for (int j = 0; j < 15; j += 2)
diff --git a/TableturfBattleServer/JsonUtils.cs b/TableturfBattleServer/JsonUtils.cs
new file mode 100644
index 0000000..0df3df9
--- /dev/null
+++ b/TableturfBattleServer/JsonUtils.cs
@@ -0,0 +1,9 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace TableturfBattleServer;
+internal class JsonUtils {
+	private static readonly JsonSerializerSettings serializerSettings = new() { ContractResolver = new CamelCasePropertyNamesContractResolver() };
+
+	internal static string Serialise(object? o) => JsonConvert.SerializeObject(o, serializerSettings);
+}
diff --git a/TableturfBattleServer/Move.cs b/TableturfBattleServer/Move.cs
index 2500041..a762664 100644
--- a/TableturfBattleServer/Move.cs
+++ b/TableturfBattleServer/Move.cs
@@ -1,22 +1,13 @@
 using System.ComponentModel;
 
-using Newtonsoft.Json;
-
 namespace TableturfBattleServer;
 public class Move {
-	[JsonProperty("card")]
 	public Card Card { get; }
-	[JsonProperty("isPass")]
 	public bool IsPass { get; }
-	[JsonProperty("x")]
 	public int X { get; }
-	[JsonProperty("y")]
 	public int Y { get; }
-	[JsonProperty("rotation")]
 	public int Rotation { get; }
-	[JsonProperty("isSpecialAttack")]
 	public bool IsSpecialAttack { get; }
-	[JsonProperty("isTimeout")]
 	public bool IsTimeout { get; }
 
 	public Move(Card card, bool isPass, int x, int y, int rotation, bool isSpecialAttack, bool isTimeout) {
diff --git a/TableturfBattleServer/Placement.cs b/TableturfBattleServer/Placement.cs
index 4b1a929..2077340 100644
--- a/TableturfBattleServer/Placement.cs
+++ b/TableturfBattleServer/Placement.cs
@@ -2,9 +2,8 @@
 
 namespace TableturfBattleServer;
 public class Placement {
-	[JsonProperty("players")]
 	public List<int> Players { get; } = new();
-	[JsonProperty("spacesAffected"), JsonConverter(typeof(SpacesAffectedDictionaryConverter))]
+	[JsonConverter(typeof(SpacesAffectedDictionaryConverter))]
 	public Dictionary<Point, Space> SpacesAffected { get; } = new();
 
 	internal class SpacesAffectedDictionaryConverter : JsonConverter<Dictionary<Point, Space>> {
diff --git a/TableturfBattleServer/Player.cs b/TableturfBattleServer/Player.cs
index b8e3229..32340e8 100644
--- a/TableturfBattleServer/Player.cs
+++ b/TableturfBattleServer/Player.cs
@@ -2,17 +2,12 @@
 
 namespace TableturfBattleServer;
 public class Player {
-	[JsonProperty("name")]
 	public string Name { get; }
 	[JsonIgnore]
 	public Guid Token { get; }
-	[JsonProperty("colour")]
 	public Colour Colour { get; set; }
-	[JsonProperty("specialColour")]
 	public Colour SpecialColour { get; set; }
-	[JsonProperty("specialAccentColour")]
 	public Colour SpecialAccentColour { get; set; }
-	[JsonProperty("uiBaseColourIsSpecialColour")]
 	public bool UIBaseColourIsSpecialColour { get; set; }
 
 	[JsonIgnore]
@@ -26,7 +21,6 @@ public class Player {
 	[JsonIgnore]
 	internal Move? ProvisionalMove;
 
-	[JsonProperty("gamesWon")]
 	public int GamesWon { get; set; }
 
 	[JsonIgnore]
@@ -35,15 +29,12 @@ public class Player {
 	[JsonIgnore]
 	public SingleGameData CurrentGameData => this.Games[^1];
 
-	[JsonProperty("specialPoints")]
 	public int SpecialPoints => this.CurrentGameData.SpecialPoints;
 
-	[JsonProperty("totalSpecialPoints")]
 	public int TotalSpecialPoints => this.CurrentGameData.TotalSpecialPoints;
-	[JsonProperty("passes")]
 	public int Passes => this.CurrentGameData.Passes;
+	public int? Sleeves => this.CurrentGameData.Deck?.Sleeves;
 
-	[JsonProperty("isReady")]
 	public bool IsReady => this.game.State switch {
 		GameState.WaitingForPlayers or GameState.ChoosingStage => this.selectedStageIndex != null,
 		GameState.ChoosingDeck => this.CurrentGameData.Deck != null,
@@ -75,7 +66,7 @@ public class Player {
 		if (this.CurrentGameData.Deck != null) {
 			this.Hand = new Card[4];
 			for (int i = 0; i < 4; i++) {
-				this.Hand[i] = this.CurrentGameData.Deck[this.CurrentGameData.drawOrder[i]];
+				this.Hand[i] = this.CurrentGameData.Deck.Cards[this.CurrentGameData.drawOrder[i]];
 			}
 		}
 	}
diff --git a/TableturfBattleServer/Point.cs b/TableturfBattleServer/Point.cs
index 30b7ea9..17fb550 100644
--- a/TableturfBattleServer/Point.cs
+++ b/TableturfBattleServer/Point.cs
@@ -1,10 +1,6 @@
-using Newtonsoft.Json;
-
-namespace TableturfBattleServer;
+namespace TableturfBattleServer;
 public struct Point {
-	[JsonProperty("x")]
 	public int X;
-	[JsonProperty("y")]
 	public int Y;
 
 	public Point(int x, int y) {
diff --git a/TableturfBattleServer/Program.cs b/TableturfBattleServer/Program.cs
index d0774ae..28dfc67 100644
--- a/TableturfBattleServer/Program.cs
+++ b/TableturfBattleServer/Program.cs
@@ -94,7 +94,7 @@ internal class Program {
 		if (!e.Request.RawUrl.StartsWith("/api/")) {
 			var path = e.Request.RawUrl == "/" || e.Request.RawUrl.StartsWith("/deckeditor") || e.Request.RawUrl.StartsWith("/game/") || e.Request.RawUrl.StartsWith("/replay/")
 				? "index.html"
-				: e.Request.RawUrl[1..];
+				: HttpUtility.UrlDecode(e.Request.RawUrl[1..]);
 			if (e.TryReadFile(path, out var bytes))
 				SetResponse(e.Response, HttpStatusCode.OK,
 					Path.GetExtension(path) switch {
@@ -102,6 +102,7 @@ internal class Program {
 						".css" => "text/css",
 						".js" => "text/javascript",
 						".png" => "image/png",
+						".webp" => "image/webp",
 						".woff" or ".woff2" => "font/woff",
 						_ => "application/octet-stream"
 					}, bytes);
@@ -163,7 +164,7 @@ internal class Program {
 					games.Add(game.ID, game);
 					timer.Start();
 
-					SetResponse(e.Response, HttpStatusCode.OK, "application/json", JsonConvert.SerializeObject(new { gameID = game.ID, clientToken, maxPlayers }));
+					SetResponse(e.Response, HttpStatusCode.OK, "application/json", JsonUtils.Serialise(new { gameID = game.ID, clientToken, maxPlayers }));
 					Console.WriteLine($"New game started: {game.ID}; {games.Count} games active; {inactiveGames.Count} inactive");
 				} catch (ArgumentException) {
 					SetErrorResponse(e.Response, new(HttpStatusCode.BadRequest, "InvalidRequestData", "Invalid form data"));
@@ -193,7 +194,7 @@ internal class Program {
 									SetErrorResponse(e.Response, new(HttpStatusCode.MethodNotAllowed, "MethodNotAllowed", "Invalid request method for this endpoint."));
 									return;
 								}
-								SetResponse(e.Response, HttpStatusCode.OK, "application/json", JsonConvert.SerializeObject(game));
+								SetResponse(e.Response, HttpStatusCode.OK, "application/json", JsonUtils.Serialise(game));
 								break;
 							}
 							case "playerData": {
@@ -206,7 +207,7 @@ internal class Program {
 								if (!Guid.TryParse(m.Groups[3].Value, out var clientToken))
 									clientToken = Guid.Empty;
 
-								SetResponse(e.Response, HttpStatusCode.OK, "application/json", JsonConvert.SerializeObject(new {
+								SetResponse(e.Response, HttpStatusCode.OK, "application/json", JsonUtils.Serialise(new {
 									game,
 									playerData = game.GetPlayer(clientToken, out var playerIndex, out var player)
 										? new PlayerData(playerIndex, player)
@@ -256,7 +257,7 @@ internal class Program {
 											game.SendEvent("join", new { playerIndex, player }, false);
 										}
 										// If they're already in the game, resend the original join response instead of an error.
-										SetResponse(e.Response, HttpStatusCode.OK, "application/json", JsonConvert.SerializeObject(new { playerIndex, clientToken }));
+										SetResponse(e.Response, HttpStatusCode.OK, "application/json", JsonUtils.Serialise(new { playerIndex, clientToken }));
 										timer.Start();
 									} catch (ArgumentException) {
 										SetErrorResponse(e.Response, new(HttpStatusCode.BadRequest, "InvalidRequestData", "Invalid form data"));
@@ -375,6 +376,11 @@ internal class Program {
 											SetErrorResponse(e.Response, new(HttpStatusCode.BadRequest, "InvalidDeckName", "Missing deck name."));
 											return;
 										}
+										var deckSleeves = 0;
+										if (d.TryGetValue("deckSleeves", out var deckSleevesString) && (!int.TryParse(deckSleevesString, out deckSleeves) || deckSleeves is < 0 or >= 25)) {
+											SetErrorResponse(e.Response, new(HttpStatusCode.BadRequest, "InvalidDeckSleeves", "Invalid deck sleeves."));
+											return;
+										}
 										if (!d.TryGetValue("deckCards", out var deckString)) {
 											SetErrorResponse(e.Response, new(HttpStatusCode.BadRequest, "InvalidDeckCards", "Missing deck cards."));
 											return;
@@ -384,8 +390,21 @@ internal class Program {
 											SetErrorResponse(e.Response, new(HttpStatusCode.UnprocessableEntity, "InvalidDeckCards", "Invalid deck list."));
 											return;
 										}
+										int[]? upgrades = null;
+										if (d.TryGetValue("deckUpgrades", out var deckUpgradesString)) {
+											upgrades = new int[15];
+											var array2 = deckUpgradesString.Split(new[] { ',', '+', ' ' }, 15);
+											for (var i = 0; i < 15; i++) {
+												if (int.TryParse(array2[i], out var j) && i is >= 0 and <= 2)
+													upgrades[i] = j;
+												else {
+													SetErrorResponse(e.Response, new(HttpStatusCode.UnprocessableEntity, "InvalidDeckUpgrades", "Invalid deck upgrade list."));
+													return;
+												}
+											}
+										}
 										var cards = new int[15];
-										for (int i = 0; i < 15; i++) {
+										for (var i = 0; i < 15; i++) {
 											if (!int.TryParse(array[i], out var cardNumber) || !CardDatabase.IsValidCardNumber(cardNumber)) {
 												SetErrorResponse(e.Response, new(HttpStatusCode.UnprocessableEntity, "InvalidDeckCards", "Invalid deck list."));
 												return;
@@ -406,7 +425,7 @@ internal class Program {
 											}
 										}
 
-										player.CurrentGameData.Deck = cards.Select(CardDatabase.GetCard).ToArray();
+										player.CurrentGameData.Deck = game.GetDeck(deckName, deckSleeves, cards, upgrades ?? Enumerable.Repeat(0, 15));
 										e.Response.StatusCode = (int) HttpStatusCode.NoContent;
 										game.SendPlayerReadyEvent(playerIndex, false);
 										timer.Start();
@@ -584,7 +603,7 @@ internal class Program {
 	}
 
 	private static void SetErrorResponse(HttpListenerResponse response, Error error) {
-		var bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(error));
+		var bytes = Encoding.UTF8.GetBytes(JsonUtils.Serialise(error));
 		SetResponse(response, error.HttpStatusCode, "application/json", bytes);
 	}
 	private static void SetResponse(HttpListenerResponse response, HttpStatusCode statusCode, string contentType, string content) {
diff --git a/TableturfBattleServer/SingleGameData.cs b/TableturfBattleServer/SingleGameData.cs
index a95df36..7d38cc3 100644
--- a/TableturfBattleServer/SingleGameData.cs
+++ b/TableturfBattleServer/SingleGameData.cs
@@ -2,12 +2,8 @@
 
 namespace TableturfBattleServer;
 public class SingleGameData {
-	[JsonProperty("specialPoints")]
 	public int SpecialPoints { get; set; }
-
-	[JsonProperty("totalSpecialPoints")]
 	public int TotalSpecialPoints { get; set; }
-	[JsonProperty("passes")]
 	public int Passes { get; set; }
 
 	[JsonIgnore]
@@ -17,7 +13,7 @@ public class SingleGameData {
 	internal List<ReplayTurn> turns = new(12);
 
 	[JsonIgnore]
-	internal Card[]? Deck;
+	internal Deck? Deck;
 	[JsonIgnore]
 	internal int[]? initialDrawOrder;
 	[JsonIgnore]
diff --git a/TableturfBattleServer/Stage.cs b/TableturfBattleServer/Stage.cs
index af1c919..edbd47b 100644
--- a/TableturfBattleServer/Stage.cs
+++ b/TableturfBattleServer/Stage.cs
@@ -2,9 +2,8 @@
 
 namespace TableturfBattleServer;
 public class Stage {
-	[JsonProperty("name")]
 	public string Name { get; }
-	[JsonProperty("grid")]
+	[JsonProperty]
 	internal readonly Space[,] grid;
 	/// <summary>
 	///		The lists of starting spaces on this stage.
@@ -13,7 +12,7 @@ public class Stage {
 	///		The smallest list with at least as many spaces as players in the game will be used.
 	///		For example, if there is a list of 3 and a list of 4, the list of 3 will be used for 2 or 3 players, and the list of 4 will be used for 4 players.
 	/// </remarks>
-	[JsonProperty("startSpaces")]
+	[JsonProperty]
 	internal readonly Point[][] startSpaces;
 
 	public Stage(string name, Space[,] grid, Point[][] startSpaces) {
diff --git a/TableturfBattleServer/StageDatabase.cs b/TableturfBattleServer/StageDatabase.cs
index 7ce4757..661ecbf 100644
--- a/TableturfBattleServer/StageDatabase.cs
+++ b/TableturfBattleServer/StageDatabase.cs
@@ -127,6 +127,6 @@ internal class StageDatabase {
 
 	static StageDatabase() {
 		Stages = Array.AsReadOnly(stages);
-		JSON = JsonConvert.SerializeObject(stages);
+		JSON = JsonUtils.Serialise(stages);
 	}
 }
diff --git a/TableturfBattleServer/TableturfWebSocketBehaviour.cs b/TableturfBattleServer/TableturfWebSocketBehaviour.cs
index 8c84612..a6e9058 100644
--- a/TableturfBattleServer/TableturfWebSocketBehaviour.cs
+++ b/TableturfBattleServer/TableturfWebSocketBehaviour.cs
@@ -30,9 +30,9 @@ internal class TableturfWebSocketBehaviour : WebSocketBehavior {
 					break;
 				}
 			}
-			this.Send(JsonConvert.SerializeObject(new DTO.WebSocketPayloadWithPlayerData<Game?>("sync", game, playerData)));
+			this.Send(JsonUtils.Serialise(new DTO.WebSocketPayloadWithPlayerData<Game?>("sync", game, playerData)));
 		} else
-			this.Send(JsonConvert.SerializeObject(new DTO.WebSocketPayloadWithPlayerData<Game?>("sync", null, null)));
+			this.Send(JsonUtils.Serialise(new DTO.WebSocketPayloadWithPlayerData<Game?>("sync", null, null)));
 	}
 
 	internal void SendInternal(string data) => this.Send(data);