tweaks to get the theme function on w2p v3.0