Modification of themes
Quotation pairing and binding (not done yet, I think)
Minor modifications