Add support for custom theme