-syntax match level1 /^[*][*][*][*][^*]\zs.*/
-syntax match level2 /^[*][*][*][^*]\zs.*/
-syntax match level3 /^[*][*][^*]\zs.*/
-syntax match level4 /^[*][^*]\zs.*/
-syntax match VICTORY /^\(VICTORY\|DONE\|YAY\)!\?[^ ]* \zs.*/
-syntax match maybedone /^done?.\zs.*/
-syntax match moot /^[#?].*/
-syntax match headline /^ \+\zs[^ ]*/
+syntax match partial /^*\+\t\+\zs.*p[0-9]\{1,2}$/
+syntax match done /^\(VICTORY\|DONE\|done\|YAY\|:)\|!\|+\)!\?\t\+\zs.*/
+syntax match done /^\*\+\t\+\zs[0-9]\+$/
+syntax match done /^\*\+\t\+\zs.*[^0-9]$/
+syntax match done /^\*\+\t\+\zs.*[^p0-9].$/
+syntax match done /^\*\+\t\+\zs.*[^p][0-9][0-9]$/
+syntax match done /^\*\+\t\+\zs.*p1$/
+syntax match done /^\*\*\+\t\+\zs.*p2$/
+syntax match done /^\*\*\*\+\t\+\zs.*p3$/
+syntax match done /^\*\*\*\*\+\t\+\zs.*p4$/
+syntax match done /^\*\*\*\*\*\+\t\+\zs.*p5$/
+syntax match done /^\*\*\*\*\*\*\+\t\+\zs.*p6$/
+syntax match done /^\*\*\*\*\*\*\*\+\t\+\zs.*p7$/
+syntax match done /^\*\*\*\*\*\*\*\*\+\t\+\zs.*p8$/
+syntax match done /^\*\*\*\*\*\*\*\*\*\+\t\+\zs.*p9$/
+syntax match done /^\*\*\*\*\*\*\*\*\*\*\+\t\+\zs.*p10$/
+syntax match done /^\*\*\*\*\*\*\*\*\*\*\*\+\t\+\zs.*p11$/
+syntax match done /^\*\*\*\*\*\*\*\*\*\*\*\*\+\t\+\zs.*p12$/
+syntax match done /^\*\*\*\*\*\*\*\*\*\*\*\*\*\+\t\+\zs.*p13$/
+syntax match done /^\*\*\*\*\*\*\*\*\*\*\*\*\*\*\+\t\+\zs.*p14$/
+syntax match done /^\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\+\t\+\zs.*p15$/
+syntax match done /^\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\+\t\+\zs.*p16$/
+syntax match done /^\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\+\t\+\zs.*p17$/
+syntax match done /^\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\+\t\+\zs.*p18$/
+syntax match maybedone /^\(done\)\??\t\+\zs.*/
+syntax match moot /^[#]\t\+.*/
+syntax match headline /^ \+\zs[^\t]*/