Made refinements to theme