[IMP] Improved Sunday theme snippet