Add Oasis, Fix Spire Formatting