diff --git a/development/extensions/tutorial_templates.rst b/development/extensions/tutorial_templates.rst
index 697a19f9..9d713ed8 100644
--- a/development/extensions/tutorial_templates.rst
+++ b/development/extensions/tutorial_templates.rst
@@ -7,14 +7,14 @@ Tutorial: Template syntax
Introduction
============
-Starting with version 3.1, phpBB is using the twig template engine that also provides extensive documentation:
-`Twig Documentation `_
+Starting with version 3.1, phpBB is using the Twig template engine. This tutorial will cover some of the details on
+the implementation of Twig's syntax in phpBB and its extensions, however more extensive documentation for Twig can
+be found here: `Twig Documentation `_.
-This tutorial will cover some of the details on the implementation of phpBB's own syntax as used before phpBB 3.2,
-as well as some specific phpBB specific implementations for using the template engine.
-Assigning data
-==============
+
+Assigning data in PHP
+=====================
Variables
---------
@@ -116,148 +116,125 @@ The blocks and nested loops can then be used accordingly in HTML files (see `Syn
Syntax elements
===============
-This section will highlight phpBB specific syntax elements in the template engine.
-The phpBB specific syntax will be deprecated in a later version of phpBB. It is therefore recommended to use
-the twig syntax instead:
-
-- `Twig Documentation `_
+This section will highlight Twig syntax elements in the template engine.
+The older phpBB specific syntax will be deprecated in a later version of phpBB. It is therefore recommended to use
+the documented Twig syntax instead:
Comments
--------
-To make comments inside the template you can use:
+To make comments inside the template you can use ``{# #}``:
-.. code-block:: html
+.. code-block:: twig
-
- Your comments can go here, because "0" is always false.
-
+ {# Your comments can go here. #}
Variables
---------
-Variables take the form ``{X_YYYYY}`` with the data being assigned from the source. Most language strings are not
-assigned from the source. When a language variable is found ``{L_YYYYYY}`` phpBB first looks if an assigned variable
-exists with that name. If it does, it uses that. If not it looks if an existing string defined in the language file
-exists.
+Variables in phpBB take the form of ``{{ X_YYYYY }}``, where the data is assigned from the source. However, most
+language strings are not assigned from the source. When a language variable is found, denoted as ``{{ lang('YYYYYY') }}``,
+phpBB first checks if an assigned variable with that name exists. If it does, it uses that. If not, it checks if an
+existing string defined in the language file exists.
+
+By using the language variable format, phpBB allows for more flexibility in the customization of language strings.
+This allows for easy modifications of language strings in the language files without having to modify the source code
+directly.
Blocks
------
-The basic block level loop remains and takes the form:
-
-.. code-block:: html
-
-
- markup, {loopname.X_YYYYY}, etc.
-
-
-However this has now been extended with the following additions. Firstly you can set the start and end points of the loop.
-For example:
+The basic block level loop takes the form:
-.. code-block:: html
+.. code-block:: twig
-
- markup
-
+ {% for item in loops.loopname %}
+ markup, {{ item.xyyyy }}, etc.
+ {% endfor %}
-Will start the loop on the third entry (note that indexes start at *zero*). Extensions of this are:
+A further extension to begin is to use ``else`` in a loop:
-- ``loopname(2,4)``: Starts loop on third values, ends on fourth
-- ``loopname(-4)``: Starts loop fourth from last value
-- ``loopname(2,-4)``: Starts loop on third value, ends four from end
+.. code-block:: twig
-A further extension to begin is BEGINELSE:
+ {% for item in loops.loopname %}
+ markup, {{ item.xyyyy }}, etc.
+ {% else %}
+ alternate markup
+ {% endfor %}
-.. code-block:: html
-
-
- markup
-
- markup
-
-
-This will cause the markup between ``BEGINELSE`` and ``END`` to be output if the loop contains no values.
+This will cause the markup between ``else`` and ``endfor`` to be output if the loop contains no values.
This is useful for forums with no topics (for example) ... in some ways it replaces "bits of" the existing
"switch" type control (the rest being replaced by conditionals, see below).
You can also check if your loop has any content similar to using ``count()`` in PHP:
-.. code-block:: html
+.. code-block:: twig
+
+ {% if loops.loopname|length %}
+ {% for item in loops.loopname %}
+ {{ item.xyyyy }}
+ {% endfor %}
+ {% endif %}
-
-
- markup, {loopname.X_YYYYY}, etc.
-
-
+``loops.loopname|length`` will output the size of the block array. This makes sense if you want to prevent, for example,
+an empty ``