Major rework
Change to style and listings
Merge remote-tracking branch 'origin/master'