New color and adaptations for latest DB changes