some tweaks on theming