some fixes related to thememanager support :)