Add EnergySavvy, remove ActiveBuilding for now since it's white.