A redesigned and improved replacement keyboard for the Fadal CNC eliminates troublesome membrane keypads. Each key consists of a switch as used in conventional keyboards and is rated for over 3,000,000 operations. In addition, the keycaps are no longer prone to falling off as was the case with the original design. In the unlikely event that a key is damaged or is non-functional, individual keycap switches can be replaced instead of having to scrap the entire keyboard as is the case with membrane types which are non-repairable.