Resolved kimono issues with new sources