Diff styles

This brings the diff styles 90% there. Minor tweaks are expected once @jehlers sees it in action.