remove extra theme files, fix highlighting