Here is the old limit switches.

And here are the new ones. Notice now that I am using the limit switches as Normally-Closed. This is for better noise immunity and extra safety. Using NC switches has the added benefit that the machine will know if a wire comes loose on a limit switch.