Updated, separated styling