Add Kirki and Tonesque support.