Also, re-use some of the color variables while at it.
Co-authored-by: EloquentShashank <52653070+EloquentShashank@users.noreply.github.com>