improve config org-mode v >= 8