Theme changes applied as per Tor - Nicorette