Add dynamic colors and sorting