Merge "Update style names due to theme migration"