autoload/codecomm.vim | 7 +++++--
 syntax/codecomm.vim   | 2 +-

diff --git a/autoload/codecomm.vim b/autoload/codecomm.vim
index 89f73f5d9cb2e4d2545ed7f3aceb6886c0bb90808bb7fdc44d4b3747d478af3c..6e49b838bfda4515065a7c8b8a628f9b9ae35c9cbbdf2c3d9768736b26403401 100644
--- a/autoload/codecomm.vim
+++ b/autoload/codecomm.vim
@@ -2,7 +2,7 @@ vim9script
 
 const SHA1Len = 40
 const SHA256Len = 64
-const Separator = "---------------------------------- >8 ----------------------------------"
+const Separator = "--8<----------------------------------------------------------------8<--"
 
 export def Do(firstline: number, lastline: number, gitDir: string)
     if bufwinnr("CodeCommCommenting") != -1
@@ -35,7 +35,10 @@         header = add(header, path[SHA256Len + 1 :])
     else
         header = add(header, path)
     endif
-    var ready = [printf("-----#%2d [ %54S ]-----", g:codecomm_ctr_, join(header, " "))]
+    var ready = [printf("--8<--[ %56S ]--8<--", join(header, " "))]
+    if !exists("g:codecommNoCtr")
+        ready = [printf("--8<--#%2d [ %52S ]--8<--", g:codecomm_ctr_, join(header, " "))]
+    endif
 
     # Collect enumerated selected code block's lines
     var fmted: string
diff --git a/syntax/codecomm.vim b/syntax/codecomm.vim
index 9c0e9dbbdd518a745a07b5863973c3dd89af1fb325811a0d15b18d1873a3704a..83e32cea23373e501f9f62f2c98341ccb1421c62ce69c57d2f4285fbc3e4119f 100644
--- a/syntax/codecomm.vim
+++ b/syntax/codecomm.vim
@@ -1,2 +1,2 @@
-syntax region CCBlock start=/^-\{5}#/ end=/^-\+ >8 -\+/
+syntax region CCBlock start=/^--8<--/ end=/^--8<-\+--8<--/
 highlight link CCBlock Statement