Re-structured styles