Fix macro names && Add divider image