Put ShapeManager on SceneWorld rather than in a singleton, fixes flickering with multiple panels Revert some experiments that shouldn't be in this branch Update shader files