updated templates. Updated some include theme files.