fix issue #3 - theming