Apple theme improved