Improved support for sunrise themes