Aigle Castle was undergoing some major work last year. I don't know if this is completed yet. The website makes no reference to it.

http://www.villars.ch/en/navpage_lis...CastlesVG.html

One suggestion - Travel to Chillon, then take the Chocolate Train from Montreux to Gruyere and Broc to finish with a visit to the Cailler Chocolate works!