Tweaks to work with tgstheme filtrate