Add `org-macro' and customize `org-latex-and-related' plus some Diff faces