More changes to the Caspeet theme