If you've forked the Lavender theme, just add the original source as another remote:
$ git remote add upstream git://github.com/NodeBB/nodebb-theme-lavender.git
Then every time you want to merge the latest changes in:
$ git fetch upstream && git merge upstream/master
I have attached the screenshot below, the mixes category is the one that's causing me issues. I have also included the raw HTML below so you can see how it's affecting the p tags. General discussion is how it should look. Ideally with the soundcloud embedded. But that's another issue I can deal with later.