Added support for Terminal and Marked and refined support for OmniFocus.