Basten's theme update