WIP: I18n fixes

Closes #425

Refactors and fixes bad practices regarding i18n.

Work in progress, especially dependent #426.