merge files into options in order to match teaspoons api

fix for modeset/teaspoon#200