Revert "Per-App-Color & Expand revamp"

This reverts commit 50c13c1912889753594362ca4b1be20de37c34a7.