some support for themes added