cleanup
add support for '#define' commands in xdefaults