Improve Jappix support
Improve Jappix support