Reimplement custom names, fix some color issues