Added support for Grid, tidied up JS includes
Fixed default color option updates