added some theming, needs to be finished