Replace substitutes with new stamen maps

Also DRY’ed the code a little bit while at it