updated macro names; reverted key codes to match expected values