Updated to add mapping to watchface