themeset and config fixes