fixes in ThemeNameParser