More classic theme fixes