"Harlequin Wrap" is a four letter word now... but thanks. I'm shooting for three colors when I get better.

Good eye! All correct with one slight exception: RD is unchanged. (FD is a more modern Simplex triple.) There's still one more switch you missed!