Matching updates made in evolved-theme repo