Some more cleanup, only one template now and readded %-sign