updated some colors and fixed overflow issue on spotlight header
fixing conflicts