Redo locales and include in all builds