Fixing issue #178 possibly some tweaking left on colours.