fix sources/kinds defines to work on my machine
avoid opening new windows for diff