#406 Enhance language files