Add more default styles, categorize code