Fixed issue where word index was not correctly set when current theme
was not specified.