misc changes and including other files in the theme