fix key conflict and update colors