BAFU style

Trying to adapt for BAFU + i18n