diff --git a/themes/V3/5ePHB/snippets/classtable.gen.js b/themes/V3/5ePHB/snippets/classtable.gen.js
index 27d1e9153..719e3fa00 100644
--- a/themes/V3/5ePHB/snippets/classtable.gen.js
+++ b/themes/V3/5ePHB/snippets/classtable.gen.js
@@ -51,15 +51,26 @@ module.exports = {
 
 		const cantripsKnown = [2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4];
 		const spells = [
-			[2, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4],
-			['—', '—', 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
-			['—', '—', '—', '—', 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
-			['—', '—', '—', '—', '—', '—', 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3],
-			['—', '—', '—', '—', '—', '—', '—', '—', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2],
-			['—', '—', '—', '—', '—', '—', '—', '—', '—', '—', 1, 1, 1, 1, 1, 1, 1, 1, 2, 2],
-			['—', '—', '—', '—', '—', '—', '—', '—', '—', '—', '—', '—', 1, 1, 1, 1, 1, 1, 1, 2],
-			['—', '—', '—', '—', '—', '—', '—', '—', '—', '—', '—', '—', '—', '—', 1, 1, 1, 1, 1, 1],
-			['—', '—', '—', '—', '—', '—', '—', '—', '—', '—', '—', '—', '—', '—', '—', '—', 1, 1, 1, 1],
+			'2  | —  | —  | —  | —  | —  | —  | —  | — ',
+			'3  | —  | —  | —  | —  | —  | —  | —  | — ',
+			'4  | 2  | —  | —  | —  | —  | —  | —  | — ',
+			'4  | 3  | —  | —  | —  | —  | —  | —  | — ',
+			'4  | 3  | 2  | —  | —  | —  | —  | —  | — ',
+			'4  | 3  | 3  | —  | —  | —  | —  | —  | — ',
+			'4  | 3  | 3  | 1  | —  | —  | —  | —  | — ',
+			'4  | 3  | 3  | 2  | —  | —  | —  | —  | — ',
+			'4  | 3  | 3  | 2  | 1  | —  | —  | —  | — ',
+			'4  | 3  | 3  | 2  | 1  | —  | —  | —  | — ',
+			'4  | 3  | 3  | 2  | 1  | 1  | —  | —  | — ',
+			'4  | 3  | 3  | 2  | 1  | 1  | —  | —  | — ',
+			'4  | 3  | 3  | 2  | 1  | 1  | 1  | —  | — ',
+			'4  | 3  | 3  | 2  | 1  | 1  | 1  | —  | — ',
+			'4  | 3  | 3  | 2  | 1  | 1  | 1  | 1  | — ',
+			'4  | 3  | 3  | 2  | 1  | 1  | 1  | 1  | — ',
+			'4  | 3  | 3  | 2  | 1  | 1  | 1  | 1  | 1 ',
+			'4  | 3  | 3  | 3  | 1  | 1  | 1  | 1  | 1 ',
+			'4  | 3  | 3  | 3  | 2  | 2  | 1  | 1  | 1 ',
+			'4  | 3  | 3  | 3  | 2  | 2  | 2  | 1  | 1 '
 		];
 
 		return dedent`
@@ -69,17 +80,8 @@ module.exports = {
 		|      ^| Bonus      ^|             ^| Known   ^|1st |2nd |3rd |4th |5th |6th |7th |8th |9th |
 		|:-----:|:-----------:|:-------------|:--------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|
 		${
-			_.map(levels, function(levelName, level){
-				const res = [
-					_.pad(levelName, 5),
-					_.pad(`+${profBonus[level]}`, 2),
-					_.padEnd(_.sample(features), 21),
-					_.pad(cantripsKnown[level].toString(), 8),
-					spells.map((spellList)=>{
-						return _.pad(spellList[level].toString(), 2);
-					}).join(' | '),
-				].join(' | ');
-				return `| ${res} |`;
+			_.map(levels, function(level, idx){
+				return `| ${_.pad(level, 5)} | +${profBonus[idx]} | ${_.padEnd(_.sample(features), 21)} | ${_.pad(cantripsKnown[idx], 8)} | ${spells[idx]} |`;
 			}).join('\n')
 		}
 		}}\n\n`;