Minor fixes and added more default colors.