Edits to theme from warranty feedback