Improve Diazo theme
This refs #5396