Zim - a desktop wiki. Since I'm working with Windows again, maybe it's time to either port my own desktop wiki again (sounds like work) or use another one that offers similar features. Zim looks quite good and is quite portable on the desktop - but I would probably have to adapt my Android app. Hmm. Sounds like work too ...