Merge "Update theme spec"