Bug fixes and removed centralised Component colour in favour of
individual colour settings.