Working except for beamer
Updated for ORG 8  and Beamer