[ticket/35] Fix language entries in acp

Also sneak in a new (tiny) feature ;D

Fix #35