29 files changed, 136 insertions, 125 deletions

diff --git a/markers/marker_0_a.png b/markers/marker_0_a.png
deleted file mode 100644
index 0ac6226..0000000
--- a/markers/marker_0_a.png
+++ /dev/null
diff --git a/markers/marker_12_a.png b/markers/marker_12_a.png
deleted file mode 100644
index 3858258..0000000
--- a/markers/marker_12_a.png
+++ /dev/null
diff --git a/markers/marker_13_a.png b/markers/marker_13_a.png
deleted file mode 100644
index 3861bc5..0000000
--- a/markers/marker_13_a.png
+++ /dev/null
diff --git a/markers/marker_14_a.png b/markers/marker_14_a.png
deleted file mode 100644
index 5c2dfd9..0000000
--- a/markers/marker_14_a.png
+++ /dev/null
diff --git a/markers/marker_15_a.png b/markers/marker_15_a.png
deleted file mode 100644
index 15458e4..0000000
--- a/markers/marker_15_a.png
+++ /dev/null
diff --git a/markers/marker_16_a.png b/markers/marker_16_a.png
deleted file mode 100644
index b24f43f..0000000
--- a/markers/marker_16_a.png
+++ /dev/null
diff --git a/markers/marker_17_a.png b/markers/marker_17_a.png
deleted file mode 100644
index be95f88..0000000
--- a/markers/marker_17_a.png
+++ /dev/null
diff --git a/markers/marker_1_a.png b/markers/marker_1_a.png
deleted file mode 100644
index 4054d96..0000000
--- a/markers/marker_1_a.png
+++ /dev/null
diff --git a/markers/marker_24_a.png b/markers/marker_24_a.png
deleted file mode 100644
index 1f9b69e..0000000
--- a/markers/marker_24_a.png
+++ /dev/null
diff --git a/markers/marker_25_a.png b/markers/marker_25_a.png
deleted file mode 100644
index 88bf159..0000000
--- a/markers/marker_25_a.png
+++ /dev/null
diff --git a/markers/marker_26_a.png b/markers/marker_26_a.png
deleted file mode 100644
index 5d4fca3..0000000
--- a/markers/marker_26_a.png
+++ /dev/null
diff --git a/markers/marker_27_a.png b/markers/marker_27_a.png
deleted file mode 100644
index 85a0af6..0000000
--- a/markers/marker_27_a.png
+++ /dev/null
diff --git a/markers/marker_28_a.png b/markers/marker_28_a.png
deleted file mode 100644
index 3d49004..0000000
--- a/markers/marker_28_a.png
+++ /dev/null
diff --git a/markers/marker_29_a.png b/markers/marker_29_a.png
deleted file mode 100644
index ed658b9..0000000
--- a/markers/marker_29_a.png
+++ /dev/null
diff --git a/markers/marker_2_a.png b/markers/marker_2_a.png
deleted file mode 100644
index c74af39..0000000
--- a/markers/marker_2_a.png
+++ /dev/null
diff --git a/markers/marker_36_a.png b/markers/marker_36_a.png
deleted file mode 100644
index ab2d6e4..0000000
--- a/markers/marker_36_a.png
+++ /dev/null
diff --git a/markers/marker_37_a.png b/markers/marker_37_a.png
deleted file mode 100644
index ee2ba7e..0000000
--- a/markers/marker_37_a.png
+++ /dev/null
diff --git a/markers/marker_38_a.png b/markers/marker_38_a.png
deleted file mode 100644
index efa421a..0000000
--- a/markers/marker_38_a.png
+++ /dev/null
diff --git a/markers/marker_39_a.png b/markers/marker_39_a.png
deleted file mode 100644
index 4389978..0000000
--- a/markers/marker_39_a.png
+++ /dev/null
diff --git a/markers/marker_3_a.png b/markers/marker_3_a.png
deleted file mode 100644
index c3598c4..0000000
--- a/markers/marker_3_a.png
+++ /dev/null
diff --git a/markers/marker_40_a.png b/markers/marker_40_a.png
deleted file mode 100644
index feda739..0000000
--- a/markers/marker_40_a.png
+++ /dev/null
diff --git a/markers/marker_41_a.png b/markers/marker_41_a.png
deleted file mode 100644
index 14ff43d..0000000
--- a/markers/marker_41_a.png
+++ /dev/null
diff --git a/markers/marker_47_a.png b/markers/marker_47_a.png
deleted file mode 100644
index 8a3665a..0000000
--- a/markers/marker_47_a.png
+++ /dev/null
diff --git a/markers/marker_48_a.png b/markers/marker_48_a.png
deleted file mode 100644
index 18afe58..0000000
--- a/markers/marker_48_a.png
+++ /dev/null
diff --git a/markers/marker_4_a.png b/markers/marker_4_a.png
deleted file mode 100644
index 2685408..0000000
--- a/markers/marker_4_a.png
+++ /dev/null
diff --git a/markers/marker_5_a.png b/markers/marker_5_a.png
deleted file mode 100644
index 39756fa..0000000
--- a/markers/marker_5_a.png
+++ /dev/null
diff --git a/play.css b/play.css
index f4d0baa..42388f6 100644
--- a/play.css
+++ b/play.css
@@ -506,7 +506,7 @@ body.shift #capabilities2 {
 
 .box {
 	position: absolute;
-	border: 3px solid gray;
+	border: 3px solid transparent;
 }
 
 .box.calendar.action {
@@ -517,7 +517,7 @@ body.shift #capabilities2 {
 .locale {
 	box-sizing: border-box;
 	position: absolute;
-	border: 3px solid gray;
+	border: 3px solid transparent;
 }
 
 .locale.town { border-radius: 24px 24px 0 0 }
@@ -638,6 +638,12 @@ body.shift #capabilities2 {
 .vassal.vassal_westmorld { background-image: url(images/vassal_westmorld.png) }
 .vassal.vassal_worcester { background-image: url(images/vassal_worcester.png) }
 
+.vassal.special_hastings { background-image: url(images/marker_hastings.png) }
+.vassal.special_clifford { background-image: url(images/marker_clifford.png) }
+.vassal.special_edward { background-image: url(images/marker_edward.png) }
+.vassal.special_stanley { background-image: url(images/marker_stanley.png) }
+.vassal.special_trollope { background-image: url(images/marker_trollope.png) }
+
 .seat.lancaster.lord_buckingham { background-image: url(images/seat_lancaster_buckingham.png) }
 .seat.lancaster.lord_clarence { background-image: url(images/seat_lancaster_clarence.png) }
 .seat.lancaster.lord_exeter { background-image: url(images/seat_lancaster_exeter.png) }
@@ -666,31 +672,35 @@ body.shift #capabilities2 {
 
 /* CARD IMAGES */
 
-.card.cc.lancaster.lancaster_1 { background-image: url(cards.1x/cc_lancaster_1.png) }
-.card.cc.lancaster.lancaster_2 { background-image: url(cards.1x/cc_lancaster_2.png) }
-.card.cc.lancaster.lancaster_3 { background-image: url(cards.1x/cc_lancaster_3.png) }
-.card.cc.lancaster.lancaster_4 { background-image: url(cards.1x/cc_lancaster_4.png) }
-.card.cc.lancaster.lancaster_5 { background-image: url(cards.1x/cc_lancaster_5.png) }
-.card.cc.lancaster.lancaster_6 { background-image: url(cards.1x/cc_lancaster_6.png) }
-.card.cc.lancaster.lancaster_7 { background-image: url(cards.1x/cc_lancaster_7.png) }
-.card.cc.lancaster.lancaster_8 { background-image: url(cards.1x/cc_lancaster_8.png) }
-.card.cc.lancaster.lancaster_9 { background-image: url(cards.1x/cc_lancaster_9.png) }
-.card.cc.lancaster.lancaster_10 { background-image: url(cards.1x/cc_lancaster_10.png) }
-.card.cc.lancaster.lancaster_11 { background-image: url(cards.1x/cc_lancaster_11.png) }
-.card.cc.lancaster.lancaster_12 { background-image: url(cards.1x/cc_lancaster_12.png) }
-.card.cc.york.york_1 { background-image: url(cards.1x/cc_york_1.png) }
-.card.cc.york.york_2 { background-image: url(cards.1x/cc_york_2.png) }
-.card.cc.york.york_3 { background-image: url(cards.1x/cc_york_3.png) }
-.card.cc.york.york_4 { background-image: url(cards.1x/cc_york_4.png) }
-.card.cc.york.york_5 { background-image: url(cards.1x/cc_york_5.png) }
-.card.cc.york.york_6 { background-image: url(cards.1x/cc_york_6.png) }
-.card.cc.york.york_7 { background-image: url(cards.1x/cc_york_7.png) }
-.card.cc.york.york_8 { background-image: url(cards.1x/cc_york_8.png) }
-.card.cc.york.york_9 { background-image: url(cards.1x/cc_york_9.png) }
-.card.cc.york.york_10 { background-image: url(cards.1x/cc_york_10.png) }
-.card.cc.york.york_11 { background-image: url(cards.1x/cc_york_11.png) }
-.card.cc.york.york_12 { background-image: url(cards.1x/cc_york_12.png) }
-.card.cc.york.york_13 { background-image: url(cards.1x/cc_york_13.png) }
+.card.cc.york { background-image: url(cards.1x/cc_york_back.png) }
+.card.cc.york.lord_devon { background-image: url(cards.1x/cc_york_devon.png) }
+.card.cc.york.lord_edward_iv { background-image: url(cards.1x/cc_york_edward_iv.png) }
+.card.cc.york.lord_gloucester { background-image: url(cards.1x/cc_york_gloucester.png) }
+.card.cc.york.lord_march { background-image: url(cards.1x/cc_york_march.png) }
+.card.cc.york.lord_norfolk { background-image: url(cards.1x/cc_york_norfolk.png) }
+.card.cc.york.lord_northumberland { background-image: url(cards.1x/cc_york_northumberland.png) }
+.card.cc.york.lord_pass { background-image: url(cards.1x/cc_york_pass.png) }
+.card.cc.york.lord_pembroke { background-image: url(cards.1x/cc_york_pembroke.png) }
+.card.cc.york.lord_richard_iii { background-image: url(cards.1x/cc_york_richard_iii.png) }
+.card.cc.york.lord_rutland { background-image: url(cards.1x/cc_york_rutland.png) }
+.card.cc.york.lord_salisbury { background-image: url(cards.1x/cc_york_salisbury.png) }
+.card.cc.york.lord_warwick { background-image: url(cards.1x/cc_york_warwick.png) }
+.card.cc.york.lord_york { background-image: url(cards.1x/cc_york_york.png) }
+
+.card.cc.lancaster { background-image: url(cards.1x/cc_lancaster_back.png) }
+.card.cc.lancaster.lord_buckingham { background-image: url(cards.1x/cc_lancaster_buckingham.png) }
+.card.cc.lancaster.lord_clarence { background-image: url(cards.1x/cc_lancaster_clarence.png) }
+.card.cc.lancaster.lord_exeter { background-image: url(cards.1x/cc_lancaster_exeter.png) }
+.card.cc.lancaster.lord_henry_tudor { background-image: url(cards.1x/cc_lancaster_henry_tudor.png) }
+.card.cc.lancaster.lord_henry_vi { background-image: url(cards.1x/cc_lancaster_henry_vi.png) }
+.card.cc.lancaster.lord_jasper_tudor { background-image: url(cards.1x/cc_lancaster_jasper_tudor.png) }
+.card.cc.lancaster.lord_margaret { background-image: url(cards.1x/cc_lancaster_margaret.png) }
+.card.cc.lancaster.lord_northumberland { background-image: url(cards.1x/cc_lancaster_northumberland.png) }
+.card.cc.lancaster.lord_oxford { background-image: url(cards.1x/cc_lancaster_oxford.png) }
+.card.cc.lancaster.lord_pass { background-image: url(cards.1x/cc_lancaster_pass.png) }
+.card.cc.lancaster.lord_somerset { background-image: url(cards.1x/cc_lancaster_somerset.png) }
+.card.cc.lancaster.lord_warwick { background-image: url(cards.1x/cc_lancaster_warwick.png) }
+
 .card.lord.lancaster.lancaster_1 { background-image: url(cards.1x/lord_lancaster_1.png) }
 .card.lord.lancaster.lancaster_2 { background-image: url(cards.1x/lord_lancaster_2.png) }
 .card.lord.lancaster.lancaster_3 { background-image: url(cards.1x/lord_lancaster_3.png) }
@@ -721,80 +731,81 @@ body.shift #capabilities2 {
 .card.lord.york.york_13 { background-image: url(cards.1x/lord_york_13.png) }
 .card.lord.york.york_14 { background-image: url(cards.1x/lord_york_14.png) }
 .card.lord.york.york_15 { background-image: url(cards.1x/lord_york_15.png) }
-.card.aow.york.york_1 { background-image: url(cards.1x/awo_york_1.png) }
-.card.aow.york.york_2 { background-image: url(cards.1x/awo_york_2.png) }
-.card.aow.york.york_3 { background-image: url(cards.1x/awo_york_3.png) }
-.card.aow.york.york_4 { background-image: url(cards.1x/awo_york_4.png) }
-.card.aow.york.york_5 { background-image: url(cards.1x/awo_york_5.png) }
-.card.aow.york.york_6 { background-image: url(cards.1x/awo_york_6.png) }
-.card.aow.york.york_7 { background-image: url(cards.1x/awo_york_7.png) }
-.card.aow.york.york_8 { background-image: url(cards.1x/awo_york_8.png) }
-.card.aow.york.york_9 { background-image: url(cards.1x/awo_york_9.png) }
-.card.aow.york.york_10 { background-image: url(cards.1x/awo_york_10.png) }
-.card.aow.york.york_11 { background-image: url(cards.1x/awo_york_11.png) }
-.card.aow.york.york_12 { background-image: url(cards.1x/awo_york_12.png) }
-.card.aow.york.york_13 { background-image: url(cards.1x/awo_york_13.png) }
-.card.aow.york.york_14 { background-image: url(cards.1x/awo_york_14.png) }
-.card.aow.york.york_15 { background-image: url(cards.1x/awo_york_15.png) }
-.card.aow.york.york_16 { background-image: url(cards.1x/awo_york_16.png) }
-.card.aow.york.york_17 { background-image: url(cards.1x/awo_york_17.png) }
-.card.aow.york.york_18 { background-image: url(cards.1x/awo_york_18.png) }
-.card.aow.york.york_19 { background-image: url(cards.1x/awo_york_19.png) }
-.card.aow.york.york_20 { background-image: url(cards.1x/awo_york_20.png) }
-.card.aow.york.york_21 { background-image: url(cards.1x/awo_york_21.png) }
-.card.aow.york.york_22 { background-image: url(cards.1x/awo_york_22.png) }
-.card.aow.york.york_23 { background-image: url(cards.1x/awo_york_23.png) }
-.card.aow.york.york_24 { background-image: url(cards.1x/awo_york_24.png) }
-.card.aow.york.york_25 { background-image: url(cards.1x/awo_york_25.png) }
-.card.aow.york.york_26 { background-image: url(cards.1x/awo_york_26.png) }
-.card.aow.york.york_27 { background-image: url(cards.1x/awo_york_27.png) }
-.card.aow.york.york_28 { background-image: url(cards.1x/awo_york_28.png) }
-.card.aow.york.york_29 { background-image: url(cards.1x/awo_york_29.png) }
-.card.aow.york.york_30 { background-image: url(cards.1x/awo_york_30.png) }
-.card.aow.york.york_31 { background-image: url(cards.1x/awo_york_31.png) }
-.card.aow.york.york_32 { background-image: url(cards.1x/awo_york_32.png) }
-.card.aow.york.york_33 { background-image: url(cards.1x/awo_york_33.png) }
-.card.aow.york.york_34 { background-image: url(cards.1x/awo_york_34.png) }
-.card.aow.york.york_35 { background-image: url(cards.1x/awo_york_35.png) }
-.card.aow.york.york_36 { background-image: url(cards.1x/awo_york_36.png) }
-.card.aow.york.york_37 { background-image: url(cards.1x/awo_york_37.png) }
-.card.aow.lancaster.lancaster_1 { background-image: url(cards.1x/awo_lancaster_1.png) }
-.card.aow.lancaster.lancaster_2 { background-image: url(cards.1x/awo_lancaster_2.png) }
-.card.aow.lancaster.lancaster_3 { background-image: url(cards.1x/awo_lancaster_3.png) }
-.card.aow.lancaster.lancaster_4 { background-image: url(cards.1x/awo_lancaster_4.png) }
-.card.aow.lancaster.lancaster_5 { background-image: url(cards.1x/awo_lancaster_5.png) }
-.card.aow.lancaster.lancaster_6 { background-image: url(cards.1x/awo_lancaster_6.png) }
-.card.aow.lancaster.lancaster_7 { background-image: url(cards.1x/awo_lancaster_7.png) }
-.card.aow.lancaster.lancaster_8 { background-image: url(cards.1x/awo_lancaster_8.png) }
-.card.aow.lancaster.lancaster_9 { background-image: url(cards.1x/awo_lancaster_9.png) }
-.card.aow.lancaster.lancaster_10 { background-image: url(cards.1x/awo_lancaster_10.png) }
-.card.aow.lancaster.lancaster_11 { background-image: url(cards.1x/awo_lancaster_11.png) }
-.card.aow.lancaster.lancaster_12 { background-image: url(cards.1x/awo_lancaster_12.png) }
-.card.aow.lancaster.lancaster_13 { background-image: url(cards.1x/awo_lancaster_13.png) }
-.card.aow.lancaster.lancaster_14 { background-image: url(cards.1x/awo_lancaster_14.png) }
-.card.aow.lancaster.lancaster_15 { background-image: url(cards.1x/awo_lancaster_15.png) }
-.card.aow.lancaster.lancaster_16 { background-image: url(cards.1x/awo_lancaster_16.png) }
-.card.aow.lancaster.lancaster_17 { background-image: url(cards.1x/awo_lancaster_17.png) }
-.card.aow.lancaster.lancaster_18 { background-image: url(cards.1x/awo_lancaster_18.png) }
-.card.aow.lancaster.lancaster_19 { background-image: url(cards.1x/awo_lancaster_19.png) }
-.card.aow.lancaster.lancaster_20 { background-image: url(cards.1x/awo_lancaster_20.png) }
-.card.aow.lancaster.lancaster_21 { background-image: url(cards.1x/awo_lancaster_21.png) }
-.card.aow.lancaster.lancaster_22 { background-image: url(cards.1x/awo_lancaster_22.png) }
-.card.aow.lancaster.lancaster_23 { background-image: url(cards.1x/awo_lancaster_23.png) }
-.card.aow.lancaster.lancaster_24 { background-image: url(cards.1x/awo_lancaster_24.png) }
-.card.aow.lancaster.lancaster_25 { background-image: url(cards.1x/awo_lancaster_25.png) }
-.card.aow.lancaster.lancaster_26 { background-image: url(cards.1x/awo_lancaster_26.png) }
-.card.aow.lancaster.lancaster_27 { background-image: url(cards.1x/awo_lancaster_27.png) }
-.card.aow.lancaster.lancaster_28 { background-image: url(cards.1x/awo_lancaster_28.png) }
-.card.aow.lancaster.lancaster_29 { background-image: url(cards.1x/awo_lancaster_29.png) }
-.card.aow.lancaster.lancaster_30 { background-image: url(cards.1x/awo_lancaster_30.png) }
-.card.aow.lancaster.lancaster_31 { background-image: url(cards.1x/awo_lancaster_31.png) }
-.card.aow.lancaster.lancaster_32 { background-image: url(cards.1x/awo_lancaster_32.png) }
-.card.aow.lancaster.lancaster_33 { background-image: url(cards.1x/awo_lancaster_33.png) }
-.card.aow.lancaster.lancaster_34 { background-image: url(cards.1x/awo_lancaster_34.png) }
-.card.aow.lancaster.lancaster_35 { background-image: url(cards.1x/awo_lancaster_35.png) }
-.card.aow.lancaster.lancaster_36 { background-image: url(cards.1x/awo_lancaster_36.png) }
-.card.aow.lancaster.lancaster_37 { background-image: url(cards.1x/awo_lancaster_37.png) }
+
+.card.aow.york.york_1 { background-image: url(cards.1x/aow_york_1.png) }
+.card.aow.york.york_2 { background-image: url(cards.1x/aow_york_2.png) }
+.card.aow.york.york_3 { background-image: url(cards.1x/aow_york_3.png) }
+.card.aow.york.york_4 { background-image: url(cards.1x/aow_york_4.png) }
+.card.aow.york.york_5 { background-image: url(cards.1x/aow_york_5.png) }
+.card.aow.york.york_6 { background-image: url(cards.1x/aow_york_6.png) }
+.card.aow.york.york_7 { background-image: url(cards.1x/aow_york_7.png) }
+.card.aow.york.york_8 { background-image: url(cards.1x/aow_york_8.png) }
+.card.aow.york.york_9 { background-image: url(cards.1x/aow_york_9.png) }
+.card.aow.york.york_10 { background-image: url(cards.1x/aow_york_10.png) }
+.card.aow.york.york_11 { background-image: url(cards.1x/aow_york_11.png) }
+.card.aow.york.york_12 { background-image: url(cards.1x/aow_york_12.png) }
+.card.aow.york.york_13 { background-image: url(cards.1x/aow_york_13.png) }
+.card.aow.york.york_14 { background-image: url(cards.1x/aow_york_14.png) }
+.card.aow.york.york_15 { background-image: url(cards.1x/aow_york_15.png) }
+.card.aow.york.york_16 { background-image: url(cards.1x/aow_york_16.png) }
+.card.aow.york.york_17 { background-image: url(cards.1x/aow_york_17.png) }
+.card.aow.york.york_18 { background-image: url(cards.1x/aow_york_18.png) }
+.card.aow.york.york_19 { background-image: url(cards.1x/aow_york_19.png) }
+.card.aow.york.york_20 { background-image: url(cards.1x/aow_york_20.png) }
+.card.aow.york.york_21 { background-image: url(cards.1x/aow_york_21.png) }
+.card.aow.york.york_22 { background-image: url(cards.1x/aow_york_22.png) }
+.card.aow.york.york_23 { background-image: url(cards.1x/aow_york_23.png) }
+.card.aow.york.york_24 { background-image: url(cards.1x/aow_york_24.png) }
+.card.aow.york.york_25 { background-image: url(cards.1x/aow_york_25.png) }
+.card.aow.york.york_26 { background-image: url(cards.1x/aow_york_26.png) }
+.card.aow.york.york_27 { background-image: url(cards.1x/aow_york_27.png) }
+.card.aow.york.york_28 { background-image: url(cards.1x/aow_york_28.png) }
+.card.aow.york.york_29 { background-image: url(cards.1x/aow_york_29.png) }
+.card.aow.york.york_30 { background-image: url(cards.1x/aow_york_30.png) }
+.card.aow.york.york_31 { background-image: url(cards.1x/aow_york_31.png) }
+.card.aow.york.york_32 { background-image: url(cards.1x/aow_york_32.png) }
+.card.aow.york.york_33 { background-image: url(cards.1x/aow_york_33.png) }
+.card.aow.york.york_34 { background-image: url(cards.1x/aow_york_34.png) }
+.card.aow.york.york_35 { background-image: url(cards.1x/aow_york_35.png) }
+.card.aow.york.york_36 { background-image: url(cards.1x/aow_york_36.png) }
+.card.aow.york.york_37 { background-image: url(cards.1x/aow_york_37.png) }
+.card.aow.lancaster.lancaster_1 { background-image: url(cards.1x/aow_lancaster_1.png) }
+.card.aow.lancaster.lancaster_2 { background-image: url(cards.1x/aow_lancaster_2.png) }
+.card.aow.lancaster.lancaster_3 { background-image: url(cards.1x/aow_lancaster_3.png) }
+.card.aow.lancaster.lancaster_4 { background-image: url(cards.1x/aow_lancaster_4.png) }
+.card.aow.lancaster.lancaster_5 { background-image: url(cards.1x/aow_lancaster_5.png) }
+.card.aow.lancaster.lancaster_6 { background-image: url(cards.1x/aow_lancaster_6.png) }
+.card.aow.lancaster.lancaster_7 { background-image: url(cards.1x/aow_lancaster_7.png) }
+.card.aow.lancaster.lancaster_8 { background-image: url(cards.1x/aow_lancaster_8.png) }
+.card.aow.lancaster.lancaster_9 { background-image: url(cards.1x/aow_lancaster_9.png) }
+.card.aow.lancaster.lancaster_10 { background-image: url(cards.1x/aow_lancaster_10.png) }
+.card.aow.lancaster.lancaster_11 { background-image: url(cards.1x/aow_lancaster_11.png) }
+.card.aow.lancaster.lancaster_12 { background-image: url(cards.1x/aow_lancaster_12.png) }
+.card.aow.lancaster.lancaster_13 { background-image: url(cards.1x/aow_lancaster_13.png) }
+.card.aow.lancaster.lancaster_14 { background-image: url(cards.1x/aow_lancaster_14.png) }
+.card.aow.lancaster.lancaster_15 { background-image: url(cards.1x/aow_lancaster_15.png) }
+.card.aow.lancaster.lancaster_16 { background-image: url(cards.1x/aow_lancaster_16.png) }
+.card.aow.lancaster.lancaster_17 { background-image: url(cards.1x/aow_lancaster_17.png) }
+.card.aow.lancaster.lancaster_18 { background-image: url(cards.1x/aow_lancaster_18.png) }
+.card.aow.lancaster.lancaster_19 { background-image: url(cards.1x/aow_lancaster_19.png) }
+.card.aow.lancaster.lancaster_20 { background-image: url(cards.1x/aow_lancaster_20.png) }
+.card.aow.lancaster.lancaster_21 { background-image: url(cards.1x/aow_lancaster_21.png) }
+.card.aow.lancaster.lancaster_22 { background-image: url(cards.1x/aow_lancaster_22.png) }
+.card.aow.lancaster.lancaster_23 { background-image: url(cards.1x/aow_lancaster_23.png) }
+.card.aow.lancaster.lancaster_24 { background-image: url(cards.1x/aow_lancaster_24.png) }
+.card.aow.lancaster.lancaster_25 { background-image: url(cards.1x/aow_lancaster_25.png) }
+.card.aow.lancaster.lancaster_26 { background-image: url(cards.1x/aow_lancaster_26.png) }
+.card.aow.lancaster.lancaster_27 { background-image: url(cards.1x/aow_lancaster_27.png) }
+.card.aow.lancaster.lancaster_28 { background-image: url(cards.1x/aow_lancaster_28.png) }
+.card.aow.lancaster.lancaster_29 { background-image: url(cards.1x/aow_lancaster_29.png) }
+.card.aow.lancaster.lancaster_30 { background-image: url(cards.1x/aow_lancaster_30.png) }
+.card.aow.lancaster.lancaster_31 { background-image: url(cards.1x/aow_lancaster_31.png) }
+.card.aow.lancaster.lancaster_32 { background-image: url(cards.1x/aow_lancaster_32.png) }
+.card.aow.lancaster.lancaster_33 { background-image: url(cards.1x/aow_lancaster_33.png) }
+.card.aow.lancaster.lancaster_34 { background-image: url(cards.1x/aow_lancaster_34.png) }
+.card.aow.lancaster.lancaster_35 { background-image: url(cards.1x/aow_lancaster_35.png) }
+.card.aow.lancaster.lancaster_36 { background-image: url(cards.1x/aow_lancaster_36.png) }
+.card.aow.lancaster.lancaster_37 { background-image: url(cards.1x/aow_lancaster_37.png) }
 
 /* ULTRA-WIDE SCREEN LAYOUTS */
 
diff --git a/play.js b/play.js
index 7250f78..263b737 100644
--- a/play.js
+++ b/play.js
@@ -670,7 +670,7 @@ function build_lord_mat(lord, ix, side, name) {
 
 function build_card(side, c) {
 	let card = ui.cards[c] = document.createElement("div")
-	card.className = `card ${side} aow_${c}`
+	card.className = `card aow ${side} ${side}_${c}`
 	register_action(card, "card", c)
 }
 
@@ -835,24 +835,24 @@ function restart_cache() {
 function update_current_card_display() {
 	if (typeof view.what === "number" && view.what >= 0) {
 		if (view.what <= first_p1_card)
-			ui.command.className = `card york aow_${view.what}`
+			ui.command.className = `card aow york york_${view.what}`
 		else
-			ui.command.className = `card lancaster aow_${view.what}`
+			ui.command.className = `card aow lancaster lancaster_${view.what}`
 	} else if ((view.turn & 1) === 0) {
 		if (player === "Lancaster")
-			ui.command.className = `card lancaster aow_back`
+			ui.command.className = `card aow lancaster`
 		else
-			ui.command.className = `card york aow_back`
+			ui.command.className = `card aow york`
 	} else if (view.command < 0) {
 		if (player === "Lancaster")
-			ui.command.className = `card lancaster cc_back`
+			ui.command.className = `card cc lancaster`
 		else
-			ui.command.className = `card york cc_back`
+			ui.command.className = `card cc york`
 	} else {
 		if (view.command < 6)
-			ui.command.className = `card lancaster cc_lord_${view.command}`
+			ui.command.className = `card cc lancaster lord_${view.command}`
 		else
-			ui.command.className = `card york cc_lord_${view.command}`
+			ui.command.className = `card cc york lord_${view.command}`
 	}
 }
 
@@ -1424,9 +1424,9 @@ function on_update() {
 
 function on_focus_card_tip(c) {
 	if (c <= first_p1_card)
-		ui.command.className = `card york aow_${c}`
+		ui.command.className = `card aow york york_${c}`
 	else
-		ui.command.className = `card lancaster aow_${c}`
+		ui.command.className = `card aow lancaster lancaster_${c}`
 }
 
 function on_blur_card_tip() {
diff --git a/tools/render_cards.sh b/tools/render_cards.sh
index e9c13a2..f172b0b 100644
--- a/tools/render_cards.sh
+++ b/tools/render_cards.sh
@@ -8,20 +8,20 @@ mkdir -p HIRES/cards75
 mkdir -p HIRES/cards150
 mkdir -p cards.1x cards.2x
 
-# gs -dUseBleedBox -sDEVICE=png16m -r1200 -o HIRES/cards/aow_lancaster_%d.png "HIRES/Plantagenet-AoW-Lanc (11).pdf"
-# gs -dUseBleedBox -sDEVICE=png16m -r1200 -o HIRES/cards/aow_york_%d.png "HIRES/Plantagenet-AoW-York (15).pdf"
-# gs -dUseBleedBox -sDEVICE=png16m -r1200 -o HIRES/cards/cc_lancaster_%d.png "HIRES/PLNT_CC_Lancaster-Front-HiRes.pdf"
-# gs -dUseBleedBox -sDEVICE=png16m -r1200 -o HIRES/cards/cc_york_%d.png "HIRES/PLNT_CC_YORK-Front-HiRes.pdf"
-# gs -dUseBleedBox -sDEVICE=png16m -r1200 -o HIRES/cards/lord_lancaster_%d.png "HIRES/PLNT_LordCards_Lancaster-HiRes.pdf"
-# gs -dUseBleedBox -sDEVICE=png16m -r1200 -o HIRES/cards/lord_york_%d.png "HIRES/PLNT_LordCards_York-HiRes.pdf"
+gs -dUseBleedBox -sDEVICE=png16m -r1200 -o HIRES/cards/aow_lancaster_%d.png "HIRES/Plantagenet-AoW-Lanc (11).pdf"
+gs -dUseBleedBox -sDEVICE=png16m -r1200 -o HIRES/cards/aow_york_%d.png "HIRES/Plantagenet-AoW-York (15).pdf"
+gs -dUseBleedBox -sDEVICE=png16m -r1200 -o HIRES/cards/cc_lancaster_%d.png "HIRES/PLNT_CC_Lancaster-Front-HiRes.pdf"
+gs -dUseBleedBox -sDEVICE=png16m -r1200 -o HIRES/cards/cc_york_%d.png "HIRES/PLNT_CC_YORK-Front-HiRes.pdf"
+gs -dUseBleedBox -sDEVICE=png16m -r1200 -o HIRES/cards/lord_lancaster_%d.png "HIRES/PLNT_LordCards_Lancaster-HiRes.pdf"
+gs -dUseBleedBox -sDEVICE=png16m -r1200 -o HIRES/cards/lord_york_%d.png "HIRES/PLNT_LordCards_York-HiRes.pdf"
 
 for F in HIRES/cards/*.png
 do
 	B=$(basename $F)
 	echo $B
-	# crop to 186x261 (actual size is 187.5 x 263 - we trim 0.75 to 1 pixel off each margin)
-	convert -colorspace RGB +repage -gravity Center -crop 2976x4176+0+0 -resize 12.5% -colorspace sRGB $F HIRES/cards150/$B
-	convert -colorspace RGB +repage -gravity Center -crop 2976x4176+0+0 -resize 6.25% -colorspace sRGB $F HIRES/cards75/$B
+	# crop to 186x260 (actual size is 187.5 x 263 - we trim 0.75 to 1 pixel off each margin)
+	convert -colorspace RGB +repage -gravity Center -crop 2976x4160+0+0 -resize 12.5% -colorspace sRGB $F HIRES/cards150/$B
+	convert -colorspace RGB +repage -gravity Center -crop 2976x4160+0+0 -resize 6.25% -colorspace sRGB $F HIRES/cards75/$B
 done
 
 function mv_card {
@@ -29,11 +29,11 @@ function mv_card {
 	cp HIRES/cards75/$1.png cards.1x/$2.png
 }
 
-mv HIRES/cards75/aow_* cards.1x
-mv HIRES/cards150/aow_* cards.2x
+cp HIRES/cards75/aow_* cards.1x
+cp HIRES/cards150/aow_* cards.2x
 
-# mv HIRES/cards75/lord_* cards.1x
-# mv HIRES/cards150/lord_* cards.2x
+cp HIRES/cards75/lord_* cards.1x
+cp HIRES/cards150/lord_* cards.2x
 
 mv_card lord_york_1 lord_york_york
 mv_card lord_york_2 lord_york_march