merge up to date changes to graphics