improved custom theme support