restructure, TODO: Missing progress color
closer, still missing progress color