add theme files and better defaults