fixes some theme edit issues

#399