Per-App-Color & Expand revamp