Fixed shader swap bug, added commons include, wip environment