ROOMS-229: Clean up theme layer.