Revert "Per-App-Color & Expand revamp"

This reverts commit 8877d65b5034e684b4e2b153d0f8863e934fddad.