diff --git a/Makefile b/Makefile
index 22f60fc..76eb357 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,20 @@
-suits := puppets bread wheels blades chairs cards
+suits := blades puppets chairs bread cards wheels
 values := 1 2 3 4 5 6 traveler knight wizard noble
 nobles := count-of-cards queen-of-puppets earl-of-bread scion-of-blades prince-of-wheels regent-of-chairs
 cards := $(foreach suit,$(suits),$(foreach value,$(values),$(value)-$(suit)))
+svgcards := $(foreach card,$(cards),build/$(card).svg)
+pngcards := $(foreach card,$(cards),build/$(card).png)
 
-svgdeck: $(foreach card,$(cards),build/$(card).svg)
+svgdeck: $(svgcards)
 
-pngdeck: $(foreach card,$(cards),build/$(card).png)
+pngdeck: $(pngcards)
 
 build/%.svg: deck.asy cards.asy numerals.asy suits.asy nobles.asy $(foreach suit,$(suits),$(suit).asy) $(foreach noble,$(nobles),$(noble).asy)
 	mkdir -p build
 	sh -c "buf_size=5000000 asy -globalwrite deck.asy"
 
-build/numbers.png: $(foreach card,$(cards),build/$(card).svg)
-	sh -c 'montage -density 100 -background transparent build/{1,2,3,4,5,6}-{blades,puppets,chairs,bread,cards,wheels}.svg -tile 6x6 -geometry +0+0 build/numbers.png'
+build/sample.png: $(svgcards)
+	montage -density 100 -background transparent $(svgcards) -tile 10x6 -geometry +0+0 build/sample.png
 
 build/%.png: build/%.svg
 	convert -density 512 -background transparent $< $@