[IMP] Improved Cleave, Airmail, Narrative and Zenflat theme snippets