Given the difference between the two forks (and the refactoring work done on the fork for Delphi, splitting a piece of code into smaller units), perhaps you should start from the Delphi fork and porting the blikblum changes in this fork, and at the same time resolve all compilation errors. Once done, start fixing runtime bugs on Windows (and so on on the other os / widget sets). This work is huge for one person (kudos for blikblum)!