Changed some styling to Theme