Update remaining shapes