Merge "Refactor Taskbar Button Coloring Code" into main