Yes, they made both, I want the Belpaire type. The last one which came up on ebay recently still fetched over £200 even though it looked as if it had fallen off the end of the fiddle yard.
Keyser also made one I think but that was with the original boiler. They come out a lot cheaper.
The Alan Gibson kit hasn't been available for some time but I may have to register an interest in case I live long enough for sufficient orders to be place so it will be made again.