added theming, small fixes