The work has been done, the lost/missing components/options that we care about have been brought back, and the unwanted ones have been removed.

 

Components lost with the Jethro merge


In bold: what's coming back

 

%: The program got carried over, but some of its options didn't.

Jed: put them back, they can't be that heavy and might be useful

Components added by the Jethro merge


In bold: what to remove

Components that where there all along but should be removed (non-exhaustive...)