add: Include gfx.js before bootstrapping
mod: Formatting
add: Pass null object if Gfx not defined