bugfixes and theme fixes