[IMP] Improved snippets for cleave and sunday themes