fixing some issues with the notification color branch