BS3InputMacros: added missing input types & fixed btn detection