[master] -> [r1-dev] Add support for custom theme