Revert "Update graphics system"

This reverts commit f821cd6ea348f332f3ad03cefe7d5dd6c49bf7a3.
Revert "Revert "Update graphics system""

This reverts commit b839b6f1f97124dc6aef18d162f6444aaed96e1d.