Finally - back to where I was when I hit the water line.

Had to take these off to install edge treatment, wanted to put them back correctly.

I cut off one live edge and glued it back on to get enough thickness for the mounting system.

Closet top trim cut back so the cabinets are flush against the wall.

Shower back together, much prettier