Feature/rework translations