Add support for custom default theme