Merging changes from theme repo