Updated components to use the latest libraries.  Had to redo a few traces (nothing major)