Set `org-hide-macro-markers' to `t'
Don't use Diff-mode- anymore