customdefs: orgmode: enhancements + refactoring