Move styles to the appropriate files