more theming, adding content and source highlighting