Theme updates from Ant

various Updates from Ant.