Well just be sure to adopt the discipline of marking any existing tiddler you touch, and the ones you create, with the Custom and UserContent tags, then copy their contents into text files (i end them in .tid.html) so you can merge your changes using a merge tool when IO release a new version. I'm glad you're enjoying it!