Why not start from scratch ....
Johann Baptiste did it for me, I think the first work in this series is even a little nicer. The composer has a preference for D minor; most of the pieces in this series are in that key.
In this piece, the prelude is a bit longer. In the development I hear in bar 13 a motif like in the fast part of the entrance chorus to Bach Cantata 105. Here Bach probably made use of the "smaller" colleague, who lived somewhat before Bach - who knows ....?
The fugue has a very concise theme.
We hear all sounding voices of the demo version from the Mascioni organ at Alessandria.