diff --git a/templates/default.c b/templates/default.c
index e0ec53d..2c316a1 100644
--- a/templates/default.c
+++ b/templates/default.c
@@ -1,5 +1,4 @@
-// vim: set filetype=c syntax=c autoindent noexpandtab sts=2 ts=2 sw=2:
-// vim: foldmethod=marker foldmarker=[[[,]]]:
+// vim: set filetype=c autoindent noexpandtab sts=2 ts=2 sw=2:
 
 <$ LICENSE.MIT $>
 
diff --git a/templates/default.go b/templates/default.go
index 60a9eb4..dba3f6c 100644
--- a/templates/default.go
+++ b/templates/default.go
@@ -1,4 +1,3 @@
-// vim: set filetype=go syntax=go noexpandtab ts=2 sts=2 sw=2 foldmethod=marker:
-// vim: set foldmarker=[[[,]]]:
+// vim: set filetype=go noexpandtab ts=2 sts=2 sw=2:
 // Package <# DIRNAME #> is
 package <# DIRNAME #>
diff --git a/templates/default.h b/templates/default.h
index 7ba5575..033edc2 100644
--- a/templates/default.h
+++ b/templates/default.h
@@ -1,5 +1,4 @@
-// vim: set filetype=c syntax=c autoindent noexpandtab sts=2 ts=2 sw=2:
-// vim: foldmethod=marker foldmarker=[[[,]]]:
+// vim: set filetype=c autoindent noexpandtab sts=2 ts=2 sw=2:
 
 <$ LICENSE.MIT $>
 
diff --git a/templates/default.py b/templates/default.py
index cee5a69..30e5ee6 100644
--- a/templates/default.py
+++ b/templates/default.py
@@ -1,2 +1,2 @@
 #!/usr/bin/env python3
-# vim: set expandtab sw=4 ts=4 sts=4 foldmethod=indent filetype=python syntax=python:
+# vim: set expandtab sw=4 ts=4 sts=4 foldmethod=indent filetype=python:
diff --git a/templates/default.sh b/templates/default.sh
index b6755cb..fbf50fc 100644
--- a/templates/default.sh
+++ b/templates/default.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# vim: set filetype=sh noexpandtab ts=2 sts=2 sw=2 foldmethod=marker:
-# vim: set foldmarker=[[[,]]]:
+# vim: set filetype=sh noexpandtab ts=2 sts=2 sw=2:
 
 set -e
diff --git a/templates/default.tex b/templates/default.tex
index de86450..b25ceba 100644
--- a/templates/default.tex
+++ b/templates/default.tex
@@ -1,4 +1,4 @@
-% vim: set autoindent sts=4 ts=4 sw=4 noexpandtab foldmethod=syntax
+% vim: set autoindent sts=4 ts=4 sw=4 noexpandtab foldmethod=syntax:
 
 \documentclass{article}
 
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index b689f7b..1d3cab4 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
-# vim: set filetype=sh noexpandtab ts=2 sts=2 sw=2 foldmethod=marker:
-# vim: set foldmarker=[[[,]]]:
+# vim: set filetype=sh noexpandtab ts=2 sts=2 sw=2:
 
 set -e