Additional theming, customizations & bug fixes