More changes, switched to Xrender, might try and go back to cairo