Move revenue data out of styling
Merge branch 'revenue'