some cosmetic changes, update themes for trunk version numbers