50% translation
Merge branch 'patch-16' of https://github.com/colomet/3akai-ux into patch-16