minor changes, do not load themes