This one will be moved to Graphics when it works a bit better, so I think it makes sense to keep it gs.

The rest are correct changes though, thanks!