Improved interfaces, adjusted colours slightly.