Nice work!
Not to add more to your plate… but… have you given this a look using the new rich text composer?