Added config options and improved file names to match byblo