diff --git a/themes/hello-world/templates/doc.xml b/themes/hello-world/templates/doc.xml
index 549f02c..2d4e61a 100644
--- a/themes/hello-world/templates/doc.xml
+++ b/themes/hello-world/templates/doc.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-{#
+{{!
 A simple-as-possible WORD/DOC template for the "Hello World" theme.
 Uses the MS Word 2003 XML format.
-#}
+}}
 <?mso-application progid="Word.Document"?>
 <w:wordDocument xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
   <w:ignoreSubtree w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/>
diff --git a/themes/hello-world/templates/html.css b/themes/hello-world/templates/html.css
index 3c29971..ad94993 100644
--- a/themes/hello-world/templates/html.css
+++ b/themes/hello-world/templates/html.css
@@ -1 +1 @@
-{# An empty CSS file. #}
+{{! An empty CSS file. }}
diff --git a/themes/hello-world/templates/html.html b/themes/hello-world/templates/html.html
index ed47ba5..5d87e97 100644
--- a/themes/hello-world/templates/html.html
+++ b/themes/hello-world/templates/html.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-{# A simple-as-possible HTML template for the "Hello World" theme. #}
+{{! A simple-as-possible HTML template for the "Hello World" theme. }}
 <html style="height: 100%;">
   <head>
     <meta charset="utf-8">
diff --git a/themes/hello-world/templates/md.txt b/themes/hello-world/templates/md.txt
index ffd7bb3..d73d4d7 100644
--- a/themes/hello-world/templates/md.txt
+++ b/themes/hello-world/templates/md.txt
@@ -1,7 +1,7 @@
-{#
+{{!
 
   modern/md.txt
   A Markdown resume template for FluentCV's "hello-world" theme.
 
-#}
+}}
 # Hello, world! My name is {{ r.name }}.
diff --git a/themes/hello-world/templates/pdf.css b/themes/hello-world/templates/pdf.css
index 3c29971..ad94993 100644
--- a/themes/hello-world/templates/pdf.css
+++ b/themes/hello-world/templates/pdf.css
@@ -1 +1 @@
-{# An empty CSS file. #}
+{{! An empty CSS file. }}
diff --git a/themes/hello-world/templates/pdf.html b/themes/hello-world/templates/pdf.html
index c80540e..7390e27 100644
--- a/themes/hello-world/templates/pdf.html
+++ b/themes/hello-world/templates/pdf.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-{# A simple-as-possible HTML-to-PDF template for the "Hello World" theme. #}
+{{! A simple-as-possible HTML-to-PDF template for the "Hello World" theme. }}
 <html style="height: 100%;">
   <head>
     <meta charset="utf-8">
diff --git a/themes/hello-world/templates/txt.txt b/themes/hello-world/templates/txt.txt
index 7af91ed..9d0ce87 100644
--- a/themes/hello-world/templates/txt.txt
+++ b/themes/hello-world/templates/txt.txt
@@ -1,4 +1,4 @@
-{#
+{{!
 A simple-as-possible plain TXT resume template for the "Hello World" theme.
-#}
+}}
 Hello, world! My name is {{ r.name }}.
