Below is a post of mine from several years ago which should cover your needs. I would use Johnsons floor paste wax. I know it says 'floor' but it is a very good general purpose wax and smells like wax should smell! Jenkins make their own floor wax which is almost identical to Johnsons which you can get directly from them or rest express. Your faded areas may need a reviver if re-waxing does not work.
To revitalize wax I would normally just apply another coat of wax, if the waxed surface you are trying to revive is dirty you could apply some wax on a wad of fine wire wool ( 0000 ) this will clean off any surface dirt. If you feel you need to take off the existing wax then you could use Liberon 'wax and polish remover' which is a white spirit based cleaner, just wipe on, leave a few minutes and wipe or scrub off, leave for several hours to dry and then re-wax. A third method is to make your own reviver, something restorers have always done, the recipes vary but are more or less the same, here is mine.
One third raw linseed oil, one third turpentine ( or white spirit ) one sixth meths and one sixth ammonia. Put into a strong glass bottle ( HP sauce ) give it a good shake before use. Apply with a rag or fine wire wool as above. This reviver will also work to remove ring and bloom marks from polished furniture. If a little more power is required then you can add a fine grit to the mix like flour emery or pumice powder.