Merge "Revert "Update style names due to theme migration""