Upgrades should count too.
But the discount on the upgrade is because you have already bought part of the product so really if its store wide then the 20% should apply to upgrades aswell.
If this was so I'd be tempted to get the css suite for starters.
regards
Jon