Clean up the theme files a little bit