Various changes, mainly to get theme sta2 working