Reorganize styles