using the theme framework + bugfixes