added custom theme support