Diff margin style (fixes #49 and #50)