Thanks! I've tamed Jekyll enough now that I don't mind it (but still wouldn't recommend it). Rebuilding my theme would be a boring job so I'm not keen to migrate.