Refinement to theme switching component. Underscore for theme directory/file when desired print output needs spaces.