Move styling to theme