diff --git a/autotests/proxymodeltestsuite/templates/datachanged.cpp b/autotests/proxymodeltestsuite/templates/datachanged.cpp
index dba7771..0ad5cd0 100644
--- a/autotests/proxymodeltestsuite/templates/datachanged.cpp
+++ b/autotests/proxymodeltestsuite/templates/datachanged.cpp
@@ -1,8 +1,8 @@
 
-{
+  {
     ModelDataChangeCommand dataChangeCommand(&rootModel);
     dataChangeCommand.setAncestorRowNumbers({{ event.rowAncestors }});
     dataChangeCommand.setStartRow({{ event.start }});
     dataChangeCommand.setEndRow({{ event.end }});
     dataChangeCommand.doCommand();
-}
+  }
diff --git a/autotests/proxymodeltestsuite/templates/init.cpp b/autotests/proxymodeltestsuite/templates/init.cpp
index 61564b9..5255384 100644
--- a/autotests/proxymodeltestsuite/templates/init.cpp
+++ b/autotests/proxymodeltestsuite/templates/init.cpp
@@ -1,10 +1,11 @@
 
-{ % if event.interpretString % } {
-ModelInsertCommand insertCommand(&rootModel);
+{% if event.interpretString %}
+  {
+    ModelInsertCommand insertCommand(&rootModel);
     insertCommand.setStartRow(0);
     insertCommand.interpret(
-    {{ event.interpretString }}
+{{ event.interpretString }}
     );
     insertCommand.doCommand();
-}
-{ % endif % }
+  }
+{% endif %}
diff --git a/autotests/proxymodeltestsuite/templates/layoutchanged.cpp b/autotests/proxymodeltestsuite/templates/layoutchanged.cpp
index 856c09f..a27e9aa 100644
--- a/autotests/proxymodeltestsuite/templates/layoutchanged.cpp
+++ b/autotests/proxymodeltestsuite/templates/layoutchanged.cpp
@@ -1,18 +1,18 @@
 
-{
+  {
     ModelLayoutChangeCommand layoutChangeCommand(&rootModel);
     layoutChangeCommand.setInitialTree(
-    {{ event.interpretString }}
+{{ event.interpretString }}
     );
     QList<ModelLayoutChangeCommand::PersistentChange> changes;
-    { % for change in event.changes % }
-{
-    ModelLayoutChangeCommand::PersistentChange change;
-    change.oldPath = {{ change.oldPath }};
-    change.newPath = {{ change.newPath }};
-    changes.append(change);
+    {% for change in event.changes %}
+    {
+      ModelLayoutChangeCommand::PersistentChange change;
+      change.oldPath = {{ change.oldPath }};
+      change.newPath = {{ change.newPath }};
+      changes.append(change);
     }
-    { % endfor % }
+    {% endfor %}
     layoutChangeCommand.setPersistentChanges(changes);
     layoutChangeCommand.doCommand();
-}
+  }
diff --git a/autotests/proxymodeltestsuite/templates/main.cpp b/autotests/proxymodeltestsuite/templates/main.cpp
index 5d24faa..a7953f4 100644
--- a/autotests/proxymodeltestsuite/templates/main.cpp
+++ b/autotests/proxymodeltestsuite/templates/main.cpp
@@ -2,42 +2,27 @@
 #include <QApplication>
 #include <dynamictreemodel.h>
 
-int main(int argc, char **argv)
+int main (int argc, char **argv)
 {
-    QApplication app(argc, argv);
+  QApplication app(argc, argv);
 
-    DynamicTreeModel rootModel;
-    {
-        % if initEvent %
-    } {
-    % with initEvent as event %
-}
-// Include {{ "init.cpp" }}: {% include "init.cpp" %}
-{
-    % endwith %
-} {
-    % endif %
-}
+  DynamicTreeModel rootModel;
+{% if initEvent %} {% with initEvent as event %}
+  // Include {{ "init.cpp" }}: {% include "init.cpp" %}
+{% endwith %} {% endif %}
 
-// Create and connect the proxy model here.
-// eg:
+  // Create and connect the proxy model here.
+  // eg:
 
-// QSortFilterProxyModel proxy;
-// proxy.setDynamicSortFilter(true);
-// proxy.setSourceModel(&rootModel);
+  // QSortFilterProxyModel proxy;
+  // proxy.setDynamicSortFilter(true);
+  // proxy.setSourceModel(&rootModel);
+
+  // Have {{ events|length }} Events.
+{% for event in events %} {% with event.type|lower|stringformat:"%1.cpp" as eventtemplate %}
+  // Include {{ eventtemplate }}: {% include eventtemplate %}
+{% endwith %} {% endfor %}
 
-// Have {{ events|length }} Events.
-{
-    % for event in events %
-    } {
-% with event.type | lower | stringformat: "%1.cpp" as eventtemplate %
-}
-// Include {{ eventtemplate }}: {% include eventtemplate %}
-{
-    % endwith %
-} {
-    % endfor %
-}
 
-return app.exec();
+  return app.exec();
 }
diff --git a/autotests/proxymodeltestsuite/templates/modelreset.cpp b/autotests/proxymodeltestsuite/templates/modelreset.cpp
index 934681d..2b9c24f 100644
--- a/autotests/proxymodeltestsuite/templates/modelreset.cpp
+++ b/autotests/proxymodeltestsuite/templates/modelreset.cpp
@@ -1,8 +1,8 @@
 
-{
+  {
     ModelResetCommand resetCommand(&rootModel);
     resetCommand.setInitialTree(
-    {{ event.interpretString }}
+{{ event.interpretString }}
     );
     resetCommand.doCommand();
-}
+  }
diff --git a/autotests/proxymodeltestsuite/templates/rowsinserted.cpp b/autotests/proxymodeltestsuite/templates/rowsinserted.cpp
index 4bb73a4..d949941 100644
--- a/autotests/proxymodeltestsuite/templates/rowsinserted.cpp
+++ b/autotests/proxymodeltestsuite/templates/rowsinserted.cpp
@@ -1,14 +1,14 @@
 
-{
+  {
     ModelInsertCommand insertCommand(&rootModel);
     insertCommand.setAncestorRowNumbers({{ event.rowAncestors }});
     insertCommand.setStartRow({{ event.start }});
-    { % if event.interpretString % }
-insertCommand.interpret(
+{% if event.interpretString %}
+    insertCommand.interpret(
 {{ event.interpretString }}
-);
-    { % else % }
+    );
+{% else %}
     insertCommand.setEnd({{ event.end }});
-    { % endif % }
+{% endif %}
     insertCommand.doCommand();
-}
+  }
diff --git a/autotests/proxymodeltestsuite/templates/rowsremoved.cpp b/autotests/proxymodeltestsuite/templates/rowsremoved.cpp
index 3cde979..2da8b94 100644
--- a/autotests/proxymodeltestsuite/templates/rowsremoved.cpp
+++ b/autotests/proxymodeltestsuite/templates/rowsremoved.cpp
@@ -1,8 +1,8 @@
 
-{
+  {
     ModelRemoveCommand removeCommand(&rootModel);
     removeCommand.setAncestorRowNumbers({{ event.rowAncestors }});
     removeCommand.setStartRow({{ event.start }});
     removeCommand.setEndRow({{ event.end }});
     removeCommand.doCommand();
-}
+  }