Aubrey Organics Men's Stock (three different scents) comes in a brown rectangular bottle. My initial motivation was to buy some just for the glass bottle, but I have some of the Spice Island scent and really really like it.
This isn't going to be at Walmart or the major pharmacy chains, but at a store specializing in more natural products. You might have to ask. I got mine at a local herbalist and soapmaker who just happened to have a barely opened tester out back but none on the shelves.
I wouldn't consider Cool Wave an aftershave, i consider it a cologne. There are no beneficial ingredients, and the scent lasts forever. Which, in my eyes, makes it a cologne.