diff --git a/adm/style/portal/acp_portal_calendar.html b/adm/style/portal/acp_portal_calendar.html
index d7bfcd78..1f72e7bc 100644
--- a/adm/style/portal/acp_portal_calendar.html
+++ b/adm/style/portal/acp_portal_calendar.html
@@ -1,206 +1,206 @@
-<!-- INCLUDE overall_header.html -->
+{% INCLUDE 'overall_header.html' %}
 
 <a name="maincontent"></a>
 
-<h1>{L_TITLE}</h1>
+<h1>{{ lang('TITLE') }}</h1>
 
-<p>{L_TITLE_EXPLAIN}</p>
+<p>{{ lang('TITLE_EXPLAIN') }}</p>
 
-<!-- IF S_ERROR -->
+{% if S_ERROR %}
 	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
+		<h3>{{ lang('WARNING') }}</h3>
+		<p>{{ ERROR_MSG }}</p>
 	</div>
-<!-- ENDIF -->
+{% endif %}
 
-<!-- IF S_EDIT -->
-	<form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
+{% if S_EDIT %}
+	<form id="acp_portal_links" method="post" action="{{ B3P_U_ACTION }}">
 
 	<fieldset>
-		<legend>{L_ACP_PORTAL_EVENTS}</legend>
+		<legend>{{ lang('ACP_PORTAL_EVENTS') }}</legend>
 	<dl>
-		<dt><label for="event_title">{L_EVENT_TITLE}{L_COLON}</label></dt>
-		<dd><input name="event_title" type="text" id="event_title" value="{EVENT_TITLE}" maxlength="255" /></dd>
+		<dt><label for="event_title">{{ lang('EVENT_TITLE') }}{{ lang('COLON') }}</label></dt>
+		<dd><input name="event_title" type="text" id="event_title" value="{{ EVENT_TITLE }}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="event_desc">{L_EVENT_DESC}{L_COLON}</label></dt>
-		<dd><textarea id="event_desc" rows="6" cols="6" name="event_desc">{EVENT_DESC}</textarea></dd>
+		<dt><label for="event_desc">{{ lang('EVENT_DESC') }}{{ lang('COLON') }}</label></dt>
+		<dd><textarea id="event_desc" rows="6" cols="6" name="event_desc">{{ EVENT_DESC }}</textarea></dd>
 	</dl>
 	<dl>
 		<dt>
-			<label for="event_start_date">{L_ACP_PORTAL_EVENT_START_DATE}{L_COLON}</label><br />
-			<span>{L_ACP_PORTAL_EVENT_START_DATE_EXP}</span>
+			<label for="event_start_date">{{ lang('ACP_PORTAL_EVENT_START_DATE') }}{{ lang('COLON') }}</label><br />
+			<span>{{ lang('ACP_PORTAL_EVENT_START_DATE_EXP') }}</span>
 		</dt>
-		<dd><input name="event_start_date" type="text" id="event_start_date" value="{EVENT_START_DATE}" maxlength="255" /></dd>
+		<dd><input name="event_start_date" type="text" id="event_start_date" value="{{ EVENT_START_DATE }}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="event_all_day">{L_EVENT_ALL_DAY}{L_COLON}</label></dt>
+		<dt><label for="event_all_day">{{ lang('EVENT_ALL_DAY') }}{{ lang('COLON') }}</label></dt>
 		<dd>
-			<label><input onchange="phpbb.toggleDisplay('end', -1)" type="radio" class="radio" name="event_all_day" value="1" id="event_all_day"<!-- IF EVENT_ALL_DAY --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-			<label><input onchange="phpbb.toggleDisplay('end', 1)" type="radio" class="radio" name="event_all_day" value="0"<!-- IF not EVENT_ALL_DAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			<label><input onchange="phpbb.toggleDisplay('end', -1)" type="radio" class="radio" name="event_all_day" value="1" id="event_all_day"{% if EVENT_ALL_DAY %} checked="checked"{% endif %} />{{ lang('YES') }}</label>
+			<label><input onchange="phpbb.toggleDisplay('end', 1)" type="radio" class="radio" name="event_all_day" value="0"{% if not EVENT_ALL_DAY %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
 		</dd>
 	</dl>
-	<div id="end"<!-- IF EVENT_ALL_DAY -->style="display: none;"<!-- ENDIF -->>
+	<div id="end"{% if EVENT_ALL_DAY %}style="display: none;"{% endif %}>
 	<dl>
 		<dt>
-			<label for="event_end_date">{L_ACP_PORTAL_EVENT_END_DATE}{L_COLON}</label><br />
-			<span>{L_ACP_PORTAL_EVENT_END_DATE_EXP}</span>
+			<label for="event_end_date">{{ lang('ACP_PORTAL_EVENT_END_DATE') }}{{ lang('COLON') }}</label><br />
+			<span>{{ lang('ACP_PORTAL_EVENT_END_DATE_EXP') }}</span>
 		</dt>
-		<dd><input name="event_end_date" type="text" id="event_end_date" value="{EVENT_END_DATE}" maxlength="255" /></dd>
+		<dd><input name="event_end_date" type="text" id="event_end_date" value="{{ EVENT_END_DATE }}" maxlength="255" /></dd>
 	</dl>
 	</div>
 	<dl>
 		<dt>
-			<label for="event_url">{L_EVENT_LINK}{L_COLON}</label><br />
-			<span>{L_EVENT_LINK_EXP}</span>
+			<label for="event_url">{{ lang('EVENT_LINK') }}{{ lang('COLON') }}</label><br />
+			<span>{{ lang('EVENT_LINK_EXP') }}</span>
 		</dt>
-		<dd><input name="event_url" type="text" id="event_url" value="{EVENT_URL}" maxlength="255" /></dd>
+		<dd><input name="event_url" type="text" id="event_url" value="{{ EVENT_URL }}" maxlength="255" /></dd>
 	</dl>
 	<dl>
 		<dt>
-			<label for="permission-setting-calendar">{L_ACP_PORTAL_CALENDAR_PERMISSION}{L_COLON}</label><br />
-			<span>{L_ACP_PORTAL_CALENDAR_PERMISSION_EXP}</span>
+			<label for="permission-setting-calendar">{{ lang('ACP_PORTAL_CALENDAR_PERMISSION') }}{{ lang('COLON') }}</label><br />
+			<span>{{ lang('ACP_PORTAL_CALENDAR_PERMISSION_EXP') }}</span>
 		</dt>
 		<dd>
 			<select id="permission-setting-calendar" size="10" multiple="multiple" name="permission-setting-calendar[]">
-				<!-- BEGIN permission_setting_calendar -->
-				<option value="{permission_setting_calendar.GROUP_ID}"<!-- IF permission_setting_calendar.SELECTED -->selected="selected"<!-- ENDIF -->>{permission_setting_calendar.GROUP_NAME}</option>
-				<!-- END permission_setting_calendar -->
+				{% for permission_setting_calendar in loops.permission_setting_calendar %}
+				<option value="{{ permission_setting_calendar.GROUP_ID }}"{% if permission_setting_calendar.SELECTED %}selected="selected"{% endif %}>{{ permission_setting_calendar.GROUP_NAME }}</option>
+				{% endfor %}
 			</select>
 		</dd>
 	</dl>
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
 
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
+		<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
+		{{ S_FORM_TOKEN }}
 	</p>
 	</fieldset>
 	</form>
 
-<!-- ELSE -->
-	<form id="acp_portal_calendar" method="post" action="{B3P_U_ACTION}">
-	<!-- IF SHOW_MODULE_OPTIONS -->
+{% else %}
+	<form id="acp_portal_calendar" method="post" action="{{ B3P_U_ACTION }}">
+	{% if SHOW_MODULE_OPTIONS %}
 	<fieldset>
-		<legend>{L_MODULE_OPTIONS}</legend>
+		<legend>{{ lang('MODULE_OPTIONS') }}</legend>
 		<dl>
-			<dt><label for="module_name">{L_MODULE_NAME}{L_COLON}</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
-			<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
+			<dt><label for="module_name">{{ lang('MODULE_NAME') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_NAME_EXP') }}</span></dt>
+			<dd><input id="module_name" type="text" value="{{ MODULE_NAME }}" name="module_name" maxlength="255" size="64" /></dd>
 		</dl>
-		<!-- IF MODULE_SHOW_IMAGE -->
+		{% if MODULE_SHOW_IMAGE %}
 		<dl>
-			<dt><label for="module_image">{L_MODULE_IMAGE}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
-			<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
-			<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
+			<dt><label for="module_image">{{ lang('MODULE_IMAGE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_EXP') }}</span></dt>
+			<dd><input id="module_image" type="text" value="{{ MODULE_IMAGE }}" name="module_image" maxlength="255" size="64" /></dd>
+			{% if MODULE_IMAGE_SRC %}<dd><img src="{{ MODULE_IMAGE_SRC }}" alt="{{ lang('MODULE_IMAGE') }}" /></dd>{% endif %}
 		</dl>
-		<!-- IF MODULE_IMAGE_SRC -->
+		{% if MODULE_IMAGE_SRC %}
 		<dl>
-			<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
-			<dd><input id="module_img_width" type="text" value="{MODULE_IMAGE_WIDTH}" name="module_img_width" maxlength="3" size="3" />px</dd>
+			<dt><label for="module_img_width">{{ lang('MODULE_IMAGE_WIDTH') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_WIDTH_EXP') }}</span></dt>
+			<dd><input id="module_img_width" type="number" value="{{ MODULE_IMAGE_WIDTH }}" name="module_img_width" min="1" />&nbsp;{{ lang('PIXEL') }}</dd>
 		</dl>
 		<dl>
-			<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
-			<dd><input id="module_img_height" type="text" value="{MODULE_IMAGE_HEIGHT}" name="module_img_height" maxlength="3" size="3" />px</dd>
+			<dt><label for="module_img_height">{{ lang('MODULE_IMAGE_HEIGHT') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_HEIGHT_EXP') }}</span></dt>
+			<dd><input id="module_img_height" type="number" value="{{ MODULE_IMAGE_HEIGHT }}" name="module_img_height" min="1" />&nbsp;{{ lang('PIXEL') }}</dd>
 		</dl>
-		<!-- ENDIF -->
+		{% endif %}
 		<dl>
-			<dt><label for="module_fa">{L_MODULE_FA}{L_COLON}</label><br/><span>{L_MODULE_FA_EXP}</span></dt>
-			<dd><input id="module_fa" type="text" value="{MODULE_FA}" name="module_fa" maxlength="255" size="64"/></dd>
+			<dt><label for="module_fa">{{ lang('MODULE_FA') }}{{ lang('COLON') }}</label><br/><span>{{ lang('MODULE_FA_EXP') }}</span></dt>
+			<dd><input id="module_fa" type="text" value="{{ MODULE_FA }}" name="module_fa" maxlength="255" size="64"/></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_fa_size">{L_MODULE_FA_SIZE}{L_COLON}</label><br/><span>{L_MODULE_FA_SIZE_EXP}</span></dt>
-			<dd><input id="module_fa_size" type="number" value="{MODULE_FA_SIZE}" name="module_fa_size" min="1"/>&nbsp;{L_PIXEL}</dd>
+			<dt><label for="module_fa_size">{{ lang('MODULE_FA_SIZE') }}{{ lang('COLON') }}</label><br/><span>{{ lang('MODULE_FA_SIZE_EXP') }}</span></dt>
+			<dd><input id="module_fa_size" type="number" value="{{ MODULE_FA_SIZE }}" name="module_fa_size" min="1"/>&nbsp;{{ lang('PIXEL') }}</dd>
 		</dl>
-		<!-- ENDIF -->
+		{% endif %}
 		<dl>
-			<dt><label for="module_reset">{L_MODULE_RESET}{L_COLON}</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
+			<dt><label for="module_reset">{{ lang('MODULE_RESET') }}{{ lang('COLON') }}</label><br /><span style="color: #BC2A4D;">{{ lang('MODULE_RESET_EXP') }}</span></dt>
 			<dd><input id="module_reset" type="checkbox" value="1" name="module_reset" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_status">{L_MODULE_STATUS}{L_COLON}</label></dt>
+			<dt><label for="module_status">{{ lang('MODULE_STATUS') }}{{ lang('COLON') }}</label></dt>
 			<dd>
-				<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-				<label><input type="radio" class="radio" name="module_status" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"{% if MODULE_ENABLED %} checked="checked"{% endif %} />{{ lang('YES') }}</label>
+				<label><input type="radio" class="radio" name="module_status" value="0"{% if not MODULE_ENABLED %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
 			</dd>
 		</dl>
-		<!-- IF .permission_setting -->
+		{% if loops.permission_setting|length %}
 		<dl>
-			<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}{L_COLON}</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
+			<dt><label for="permission-setting">{{ lang('MODULE_PERMISSIONS') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_PERMISSIONS_EXP') }}</span></dt>
 			<dd>
 				<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
-					<!-- BEGIN permission_setting -->
-					<option value="{permission_setting.GROUP_ID}"<!-- IF permission_setting.SELECTED -->selected="selected"<!-- ENDIF -->>{permission_setting.GROUP_NAME}</option>
-					<!-- END permission_setting -->
+					{% for permission_setting in loops.permission_setting %}
+					<option value="{{ permission_setting.GROUP_ID }}"{% if permission_setting.SELECTED %}selected="selected"{% endif %}>{{ permission_setting.GROUP_NAME }}</option>
+					{% endfor %}
 				</select>
 			</dd>
 		</dl>
-		<!-- ENDIF -->
+		{% endif %}
 	</fieldset>
-	<!-- ENDIF -->
-<!-- BEGIN options -->
-	<!-- IF options.S_LEGEND -->
-		<!-- IF not options.S_FIRST_ROW -->
+	{% endif %}
+{% for options in loops.options %}
+	{% if options.S_LEGEND %}
+		{% if not options.S_FIRST_ROW %}
 			</fieldset>
-		<!-- ENDIF -->
+		{% endif %}
 		<fieldset>
-			<legend>{options.LEGEND}</legend>
-	<!-- ELSE -->
+			<legend>{{ options.LEGEND }}</legend>
+	{% else %}
 
 		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{options.CONTENT}</dd>
+			<dt><label for="{{ options.KEY }}">{{ options.TITLE }}{{ lang('COLON') }}</label>{% if options.S_EXPLAIN %}<br /><span>{{ options.TITLE_EXPLAIN }}</span>{% endif %}</dt>
+			<dd>{{ options.CONTENT }}</dd>
 		</dl>
 
-	<!-- ENDIF -->
-<!-- END options -->
+	{% endif %}
+{% endfor %}
 	</fieldset>
 
 	<fieldset>
-		<legend>{L_ACP_PORTAL_EVENTS}</legend>
+		<legend>{{ lang('ACP_PORTAL_EVENTS') }}</legend>
 		<fieldset class="tabulated">
 
 		<p class="quick">
-			<input class="button2" name="add" type="submit" value="{L_ADD_EVENT}" />
+			<input class="button2" name="add" type="submit" value="{{ lang('ADD_EVENT') }}" />
 		</p>
 
 		<table style="cellspacing: 1;">
 		<thead>
 		<tr>
-			<th>{L_EVENT_TITLE}</th>
-			<th>{L_EVENT_DESC}</th>
-			<th>{L_EVENT_TIME}</th>
-			<th>{L_EVENT_LINK}</th>
-			<th>{L_ACTION}</th>
+			<th>{{ lang('EVENT_TITLE') }}</th>
+			<th>{{ lang('EVENT_DESC') }}</th>
+			<th>{{ lang('EVENT_TIME') }}</th>
+			<th>{{ lang('EVENT_LINK') }}</th>
+			<th>{{ lang('ACTION') }}</th>
 		</tr>
 		</thead>
 		<tbody>
-		<!-- BEGIN events -->
-			<!-- IF events.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td style="text-align: center;">{events.EVENT_TITLE}</td>
-			<td style="text-align: center;">{events.EVENT_DESC}</td>
-			<td style="text-align: center;"><!-- IF events.EVENT_END -->{L_EVENT_START}{L_COLON}&nbsp;{events.EVENT_START}&nbsp;&#124;&nbsp;{L_EVENT_END}{L_COLON}&nbsp;{events.EVENT_END}<!-- ELSE -->{L_EVENT_TIME}{L_COLON}&nbsp;{events.EVENT_START}<!-- IF events.EVENT_ALL_DAY -->&nbsp;&#124;&nbsp;{L_EVENT_ALL_DAY}<!-- ENDIF --><!-- ENDIF --></td>
-			<td style="text-align: center;"><a href="{events.EVENT_URL}" alt="{events.EVENT_TITLE}">{events.EVENT_URL_RAW}</td>
+		{% for events in loops.events %}
+			{% if events.S_ROW_COUNT is even %}<tr class="row1">{% else %}<tr class="row2">{% endif %}
+			<td style="text-align: center;">{{ events.EVENT_TITLE }}</td>
+			<td style="text-align: center;">{{ events.EVENT_DESC }}</td>
+			<td style="text-align: center;">{% if events.EVENT_END %}{{ lang('EVENT_START') }}{{ lang('COLON') }}&nbsp;{{ events.EVENT_START }}&nbsp;&#124;&nbsp;{{ lang('EVENT_END') }}{{ lang('COLON') }}&nbsp;{{ events.EVENT_END }}{% else %}{{ lang('EVENT_TIME') }}{{ lang('COLON') }}&nbsp;{{ events.EVENT_START }}{% if events.EVENT_ALL_DAY %}&nbsp;&#124;&nbsp;{{ lang('EVENT_ALL_DAY') }}{% endif %}{% endif %}</td>
+			<td style="text-align: center;"><a href="{{ events.EVENT_URL }}" alt="{{ events.EVENT_TITLE }}">{{ events.EVENT_URL_RAW }}</td>
 			<td style="text-align: center;">
-				<a href="{events.U_EDIT}">{ICON_EDIT}</a> <a href="{events.U_DELETE}">{ICON_DELETE}</a>
+				<a href="{{ events.U_EDIT }}">{{ ICON_EDIT }}</a> <a href="{{ events.U_DELETE }}">{{ ICON_DELETE }}</a>
 			</td>
 		</tr>
-		<!-- BEGINELSE -->
+		{% else %}
 		<tr class="row1">
-			<td style="text-align: center;" colspan="5">{L_NO_EVENTS}</td>
+			<td style="text-align: center;" colspan="5">{{ lang('NO_EVENTS') }}</td>
 		</tr>
-		<!-- END events -->
+		{% endfor %}
 		</tbody>
 		</table>
 		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+			<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+			<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
 		</p>
-		{S_FORM_TOKEN}
+		{{ S_FORM_TOKEN }}
 		</fieldset>
 	</fieldset>
 	</form>
 
-<!-- ENDIF -->
+{% endif %}
 
-<!-- INCLUDE overall_footer.html -->
+{% INCLUDE 'overall_footer.html' %}
diff --git a/adm/style/portal/acp_portal_config.html b/adm/style/portal/acp_portal_config.html
index 3b537f2a..53ad26ce 100644
--- a/adm/style/portal/acp_portal_config.html
+++ b/adm/style/portal/acp_portal_config.html
@@ -1,109 +1,109 @@
-<!-- INCLUDE overall_header.html -->
+{% INCLUDE 'overall_header.html' %}
 
 <a name="maincontent"></a>
 
-<h1>{L_TITLE}</h1>
+<h1>{{ lang('TITLE') }}</h1>
 
-<p>{L_TITLE_EXPLAIN}</p>
+<p>{{ lang('TITLE_EXPLAIN') }}</p>
 
-<!-- IF S_ERROR -->
+{% if S_ERROR %}
 	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
+		<h3>{{ lang('WARNING') }}</h3>
+		<p>{{ ERROR_MSG }}</p>
 	</div>
-<!-- ENDIF -->
+{% endif %}
 
-<form id="acp_portal_config" method="post" action="{B3P_U_ACTION}">
-<!-- IF SHOW_MODULE_OPTIONS -->
+<form id="acp_portal_config" method="post" action="{{ B3P_U_ACTION }}">
+{% if SHOW_MODULE_OPTIONS %}
 		<fieldset>
-			<legend>{L_MODULE_OPTIONS}</legend>
-			<!-- IF MODULE_NAME -->
+			<legend>{{ lang('MODULE_OPTIONS') }}</legend>
+			{% if MODULE_NAME %}
 			<dl>
-				<dt><label for="module_name">{L_MODULE_NAME}{L_COLON}</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
-				<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
+				<dt><label for="module_name">{{ lang('MODULE_NAME') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_NAME_EXP') }}</span></dt>
+				<dd><input id="module_name" type="text" value="{{ MODULE_NAME }}" name="module_name" maxlength="255" size="64" /></dd>
 			</dl>
-			<!-- ENDIF -->
-			<!-- IF MODULE_SHOW_IMAGE -->
+			{% endif %}
+			{% if MODULE_SHOW_IMAGE %}
 			<dl>
-				<dt><label for="module_image">{L_MODULE_IMAGE}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
-				<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
-				<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
+				<dt><label for="module_image">{{ lang('MODULE_IMAGE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_EXP') }}</span></dt>
+				<dd><input id="module_image" type="text" value="{{ MODULE_IMAGE }}" name="module_image" maxlength="255" size="64" /></dd>
+				{% if MODULE_IMAGE_SRC %}<dd><img src="{{ MODULE_IMAGE_SRC }}" alt="{{ lang('MODULE_IMAGE') }}" /></dd>{% endif %}
 			</dl>
-			<!-- IF MODULE_IMAGE_SRC -->
+			{% if MODULE_IMAGE_SRC %}
 			<dl>
-				<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
-				<dd><input id="module_img_width" type="text" value="{MODULE_IMAGE_WIDTH}" name="module_img_width" maxlength="3" size="3" />px</dd>
+				<dt><label for="module_img_width">{{ lang('MODULE_IMAGE_WIDTH') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_WIDTH_EXP') }}</span></dt>
+				<dd><input id="module_img_width" type="number" value="{{ MODULE_IMAGE_WIDTH }}" name="module_img_width"  min="1" />&nbsp;{{ lang('PIXEL') }}</dd>
 			</dl>
 			<dl>
-				<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
-				<dd><input id="module_img_height" type="text" value="{MODULE_IMAGE_HEIGHT}" name="module_img_height" maxlength="3" size="3" />px</dd>
+				<dt><label for="module_img_height">{{ lang('MODULE_IMAGE_HEIGHT') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_HEIGHT_EXP') }}</span></dt>
+				<dd><input id="module_img_height" type="number" value="{{ MODULE_IMAGE_HEIGHT }}" name="module_img_height" min="1" />&nbsp;{{ lang('PIXEL') }}</dd>
 			</dl>
-			<!-- ENDIF -->
+			{% endif %}
 			<dl>
-				<dt><label for="module_fa">{L_MODULE_FA}{L_COLON}</label><br/><span>{L_MODULE_FA_EXP}</span></dt>
-				<dd><input id="module_fa" type="text" value="{MODULE_FA}" name="module_fa" maxlength="255" size="64"/></dd>
+				<dt><label for="module_fa">{{ lang('MODULE_FA') }}{{ lang('COLON') }}</label><br/><span>{{ lang('MODULE_FA_EXP') }}</span></dt>
+				<dd><input id="module_fa" type="text" value="{{ MODULE_FA }}" name="module_fa" maxlength="255" size="64"/></dd>
 			</dl>
 			<dl>
-				<dt><label for="module_fa_size">{L_MODULE_FA_SIZE}{L_COLON}</label><br/><span>{L_MODULE_FA_SIZE_EXP}</span></dt>
-				<dd><input id="module_fa_size" type="number" value="{MODULE_FA_SIZE}" name="module_fa_size" min="1"/>&nbsp;{L_PIXEL}</dd>
+				<dt><label for="module_fa_size">{{ lang('MODULE_FA_SIZE') }}{{ lang('COLON') }}</label><br/><span>{{ lang('MODULE_FA_SIZE_EXP') }}</span></dt>
+				<dd><input id="module_fa_size" type="number" value="{{ MODULE_FA_SIZE }}" name="module_fa_size" min="1"/>&nbsp;{{ lang('PIXEL') }}</dd>
 			</dl>
-			<!-- ENDIF -->
+			{% endif %}
 			<dl>
-				<dt><label for="module_reset">{L_MODULE_RESET}{L_COLON}</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
+				<dt><label for="module_reset">{{ lang('MODULE_RESET') }}{{ lang('COLON') }}</label><br /><span style="color: #BC2A4D;">{{ lang('MODULE_RESET_EXP') }}</span></dt>
 				<dd><input id="module_reset" type="checkbox" value="1" name="module_reset" /></dd>
 			</dl>
 			<dl>
-				<dt><label for="module_status">{L_MODULE_STATUS}{L_COLON}</label></dt>
+				<dt><label for="module_status">{{ lang('MODULE_STATUS') }}{{ lang('COLON') }}</label></dt>
 				<dd>
-					<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-					<label><input type="radio" class="radio" name="module_status" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+					<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"{% if MODULE_ENABLED %} checked="checked"{% endif %} />{{ lang('YES') }}</label>
+					<label><input type="radio" class="radio" name="module_status" value="0"{% if not MODULE_ENABLED %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
 				</dd>
 			</dl>
-			<!-- IF .permission_setting -->
+			{% if loops.permission_setting|length %}
 			<dl>
-				<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}{L_COLON}</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
+				<dt><label for="permission-setting">{{ lang('MODULE_PERMISSIONS') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_PERMISSIONS_EXP') }}</span></dt>
 				<dd>
 					<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
-						<!-- BEGIN permission_setting -->
-						<option value="{permission_setting.GROUP_ID}"<!-- IF permission_setting.SELECTED -->selected="selected"<!-- ENDIF -->>{permission_setting.GROUP_NAME}</option>
-						<!-- END permission_setting -->
+						{% for permission_setting in loops.permission_setting %}
+						<option value="{{ permission_setting.GROUP_ID }}"{% if permission_setting.SELECTED %}selected="selected"{% endif %}>{{ permission_setting.GROUP_NAME }}</option>
+						{% endfor %}
 					</select>
 				</dd>
 			</dl>
-			<!-- ENDIF -->
+			{% endif %}
 		</fieldset>
-<!-- ENDIF -->
-<!-- BEGIN options -->
-	<!-- IF options.S_LEGEND -->
-		<!-- IF not options.S_FIRST_ROW -->
+{% endif %}
+{% for options in loops.options %}
+	{% if options.S_LEGEND %}
+		{% if not options.S_FIRST_ROW %}
 			</fieldset>
-		<!-- ENDIF -->
+		{% endif %}
 		<fieldset>
-			<legend>{options.LEGEND}</legend>
-	<!-- ELSE -->
+			<legend>{{ options.LEGEND }}</legend>
+	{% else %}
 
 		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{options.CONTENT}</dd>
+			<dt><label for="{{ options.KEY }}">{{ options.TITLE }}{{ lang('COLON') }}</label>{% if options.S_EXPLAIN %}<br /><span>{{ options.TITLE_EXPLAIN }}</span>{% endif %}</dt>
+			<dd>{{ options.CONTENT }}</dd>
 		</dl>
 
-	<!-- ENDIF -->
-<!-- BEGINELSE -->
+	{% endif %}
+{% else %}
 	<fieldset>
-<!-- END options -->
+{% endfor %}
 
-<!-- IF S_AUTH -->
-	<!-- BEGIN auth_tpl -->
-		{auth_tpl.TPL}
-	<!-- END auth_tpl -->
-<!-- ENDIF -->
+{% if S_AUTH %}
+	{% for auth_tpl in loops.auth_tpl %}
+		{{ auth_tpl.TPL }}
+	{% endfor %}
+{% endif %}
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
 	</p>
-	{S_FORM_TOKEN}
+	{{ S_FORM_TOKEN }}
 </fieldset>
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+{% INCLUDE 'overall_footer.html' %}
diff --git a/adm/style/portal/acp_portal_custom.html b/adm/style/portal/acp_portal_custom.html
index 23fbab34..f570e591 100644
--- a/adm/style/portal/acp_portal_custom.html
+++ b/adm/style/portal/acp_portal_custom.html
@@ -1,6 +1,6 @@
-<!-- INCLUDE overall_header.html -->
+{% INCLUDE 'overall_header.html' %}
 
-<!-- INCLUDEJS portal/acp_editor.js -->
+{% INCLUDEJS 'portal/acp_editor.js' %}
 <script type="text/javascript">
 // <![CDATA[
 /**
@@ -29,28 +29,28 @@ var upload = false;
 
 // Define the bbCode tags
 var bbcode = new Array();
-var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
+var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'{% for custom_tags in loops.custom_tags %}, {{ custom_tags.BBCODE_NAME }}{% endfor %});
 var imageTag = false;
 
 // Helpline messages
 var help_line = {
-	b: '{LA_BBCODE_B_HELP}',
-	i: '{LA_BBCODE_I_HELP}',
-	u: '{LA_BBCODE_U_HELP}',
-	q: '{LA_BBCODE_Q_HELP}',
-	c: '{LA_BBCODE_C_HELP}',
-	l: '{LA_BBCODE_L_HELP}',
-	o: '{LA_BBCODE_O_HELP}',
-	p: '{LA_BBCODE_P_HELP}',
-	w: '{LA_BBCODE_W_HELP}',
-	a: '{LA_BBCODE_A_HELP}',
-	s: '{LA_BBCODE_S_HELP}',
-	f: '{LA_BBCODE_F_HELP}',
-	e: '{LA_BBCODE_E_HELP}',
-	d: '{LA_BBCODE_D_HELP}'
-	<!-- BEGIN custom_tags -->
-		,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
-	<!-- END custom_tags -->
+	b: '{{ lang('BBCODE_B_HELP')|escape('js') }}',
+	i: '{{ lang('BBCODE_I_HELP')|escape('js') }}',
+	u: '{{ lang('BBCODE_U_HELP')|escape('js') }}',
+	q: '{{ lang('BBCODE_Q_HELP')|escape('js') }}',
+	c: '{{ lang('BBCODE_C_HELP')|escape('js') }}',
+	l: '{{ lang('BBCODE_L_HELP')|escape('js') }}',
+	o: '{{ lang('BBCODE_O_HELP')|escape('js') }}',
+	p: '{{ lang('BBCODE_P_HELP')|escape('js') }}',
+	w: '{{ lang('BBCODE_W_HELP')|escape('js') }}',
+	a: '{{ lang('BBCODE_A_HELP')|escape('js') }}',
+	s: '{{ lang('BBCODE_S_HELP')|escape('js') }}',
+	f: '{{ lang('BBCODE_F_HELP')|escape('js') }}',
+	e: '{{ lang('BBCODE_E_HELP')|escape('js') }}',
+	d: '{{ lang('BBCODE_D_HELP')|escape('js') }}'
+	{% for custom_tags in loops.custom_tags %}
+		,cb_{{ custom_tags.BBCODE_ID }}: '{{ custom_tags.A_BBCODE_HELPLINE }}'
+	{% endfor %}
 }
 
 function change_palette()
@@ -60,11 +60,11 @@ function change_palette()
 
 	if (e.style.display == 'block')
 	{
-		document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
+		document.getElementById('bbpalette').value = '{{ lang('FONT_COLOR_HIDE')|escape('js') }}';
 	}
 	else
 	{
-		document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
+		document.getElementById('bbpalette').value = '{{ lang('FONT_COLOR')|escape('js') }}';
 	}
 }
 
@@ -73,92 +73,92 @@ function change_palette()
 
 <a name="maincontent"></a>
 
-<h1>{L_TITLE}</h1>
+<h1>{{ lang('TITLE') }}</h1>
 
-<p>{L_TITLE_EXPLAIN}</p>
+<p>{{ lang('TITLE_EXPLAIN') }}</p>
 
-<!-- IF S_ERROR -->
+{% if S_ERROR %}
 	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
+		<h3>{{ lang('WARNING') }}</h3>
+		<p>{{ ERROR_MSG }}</p>
 	</div>
-<!-- ENDIF -->
-<form id="acp_portal_config" method="post" action="{B3P_U_ACTION}">
-<!-- IF SHOW_MODULE_OPTIONS -->
+{% endif %}
+<form id="acp_portal_config" method="post" action="{{ B3P_U_ACTION }}">
+{% if SHOW_MODULE_OPTIONS %}
 		<fieldset>
-			<legend>{L_MODULE_OPTIONS}</legend>
+			<legend>{{ lang('MODULE_OPTIONS') }}</legend>
 			<dl>
-				<dt><label for="module_name">{L_MODULE_NAME}{L_COLON}</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
-				<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
+				<dt><label for="module_name">{{ lang('MODULE_NAME') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_NAME_EXP') }}</span></dt>
+				<dd><input id="module_name" type="text" value="{{ MODULE_NAME }}" name="module_name" maxlength="255" size="64" /></dd>
 			</dl>
-			<!-- IF MODULE_SHOW_IMAGE -->
+			{% if MODULE_SHOW_IMAGE %}
 			<dl>
-				<dt><label for="module_image">{L_MODULE_IMAGE}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
-				<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
-				<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
+				<dt><label for="module_image">{{ lang('MODULE_IMAGE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_EXP') }}</span></dt>
+				<dd><input id="module_image" type="text" value="{{ MODULE_IMAGE }}" name="module_image" maxlength="255" size="64" /></dd>
+				{% if MODULE_IMAGE_SRC %}<dd><img src="{{ MODULE_IMAGE_SRC }}" alt="{{ lang('MODULE_IMAGE') }}" /></dd>{% endif %}
 			</dl>
-			<!-- IF MODULE_IMAGE_SRC -->
+			{% if MODULE_IMAGE_SRC %}
 			<dl>
-				<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
-				<dd><input id="module_img_width" type="text" value="{MODULE_IMAGE_WIDTH}" name="module_img_width" maxlength="3" size="3" />px</dd>
+				<dt><label for="module_img_width">{{ lang('MODULE_IMAGE_WIDTH') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_WIDTH_EXP') }}</span></dt>
+				<dd><input id="module_img_width" type="number" value="{{ MODULE_IMAGE_WIDTH }}" name="module_img_width" min="1" />&nbsp;{{ lang('PIXEL') }}</dd>
 			</dl>
 			<dl>
-				<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
-				<dd><input id="module_img_height" type="text" value="{MODULE_IMAGE_HEIGHT}" name="module_img_height" maxlength="3" size="3" />px</dd>
+				<dt><label for="module_img_height">{{ lang('MODULE_IMAGE_HEIGHT') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_HEIGHT_EXP') }}</span></dt>
+				<dd><input id="module_img_height" type="number" value="{{ MODULE_IMAGE_HEIGHT }}" name="module_img_height" min="1" />&nbsp;{{ lang('PIXEL') }}</dd>
 			</dl>
-			<!-- ENDIF -->
+			{% endif %}
 			<dl>
-				<dt><label for="module_fa">{L_MODULE_FA}{L_COLON}</label><br/><span>{L_MODULE_FA_EXP}</span></dt>
-				<dd><input id="module_fa" type="text" value="{MODULE_FA}" name="module_fa" maxlength="255" size="64"/></dd>
+				<dt><label for="module_fa">{{ lang('MODULE_FA') }}{{ lang('COLON') }}</label><br/><span>{{ lang('MODULE_FA_EXP') }}</span></dt>
+				<dd><input id="module_fa" type="text" value="{{ MODULE_FA }}" name="module_fa" maxlength="255" size="64"/></dd>
 			</dl>
 			<dl>
-				<dt><label for="module_fa_size">{L_MODULE_FA_SIZE}{L_COLON}</label><br/><span>{L_MODULE_FA_SIZE_EXP}</span></dt>
-				<dd><input id="module_fa_size" type="number" value="{MODULE_FA_SIZE}" name="module_fa_size" min="1"/>&nbsp;{L_PIXEL}</dd>
+				<dt><label for="module_fa_size">{{ lang('MODULE_FA_SIZE') }}{{ lang('COLON') }}</label><br/><span>{{ lang('MODULE_FA_SIZE_EXP') }}</span></dt>
+				<dd><input id="module_fa_size" type="number" value="{{ MODULE_FA_SIZE }}" name="module_fa_size" min="1"/>&nbsp;{{ lang('PIXEL') }}</dd>
 			</dl>
-			<!-- ENDIF -->
+			{% endif %}
 			<dl>
-				<dt><label for="module_reset">{L_MODULE_RESET}{L_COLON}</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
+				<dt><label for="module_reset">{{ lang('MODULE_RESET') }}{{ lang('COLON') }}</label><br /><span style="color: #BC2A4D;">{{ lang('MODULE_RESET_EXP') }}</span></dt>
 				<dd><input id="module_reset" type="checkbox" value="1" name="module_reset" /></dd>
 			</dl>
 			<dl>
-				<dt><label for="module_status">{L_MODULE_STATUS}{L_COLON}</label></dt>
+				<dt><label for="module_status">{{ lang('MODULE_STATUS') }}{{ lang('COLON') }}</label></dt>
 				<dd>
-					<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-					<label><input type="radio" class="radio" name="module_status" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+					<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"{% if MODULE_ENABLED %} checked="checked"{% endif %} />{{ lang('YES') }}</label>
+					<label><input type="radio" class="radio" name="module_status" value="0"{% if not MODULE_ENABLED %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
 				</dd>
 			</dl>
-			<!-- IF .permission_setting -->
+			{% if loops.permission_setting|length %}
 			<dl>
-				<dt><label for="permission-setting">{L_ACP_PORTAL_CUSTOM_PERMISSION}{L_COLON}</label><br /><span>{L_ACP_PORTAL_CUSTOM_PERMISSION_EXP}</span></dt>
+				<dt><label for="permission-setting">{{ lang('ACP_PORTAL_CUSTOM_PERMISSION') }}{{ lang('COLON') }}</label><br /><span>{{ lang('ACP_PORTAL_CUSTOM_PERMISSION_EXP') }}</span></dt>
 				<dd>
 					<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
-						<!-- BEGIN permission_setting -->
-						<option value="{permission_setting.GROUP_ID}"<!-- IF permission_setting.SELECTED -->selected="selected"<!-- ENDIF -->>{permission_setting.GROUP_NAME}</option>
-						<!-- END permission_setting -->
+						{% for permission_setting in loops.permission_setting %}
+						<option value="{{ permission_setting.GROUP_ID }}"{% if permission_setting.SELECTED %}selected="selected"{% endif %}>{{ permission_setting.GROUP_NAME }}</option>
+						{% endfor %}
 					</select>
 				</dd>
 			</dl>
-			<!-- ENDIF -->
+			{% endif %}
 		</fieldset>
-<!-- ENDIF -->
-		<!-- IF S_PREVIEW -->
+{% endif %}
+		{% if S_PREVIEW %}
 		<fieldset>
-			<legend>{L_ACP_PORTAL_CUSTOM_PREVIEW}</legend>
+			<legend>{{ lang('ACP_PORTAL_CUSTOM_PREVIEW') }}</legend>
 		<dl>
 			<dt style="border: none; width: 100%;">
-				{PREVIEW_TEXT}
+				{{ PREVIEW_TEXT }}
 			</dt>
 		</dl>
 		</fieldset>
-		<!-- ENDIF -->
+		{% endif %}
 		<fieldset>
-			<legend>{L_PORTAL_CUSTOM}</legend>
-		<dl id="bbcode-buttons"<!-- IF not CUSTOM_USE_BBCODE --> style="display: none;"<!-- ENDIF -->>
+			<legend>{{ lang('PORTAL_CUSTOM') }}</legend>
+		<dl id="bbcode-buttons"{% if not CUSTOM_USE_BBCODE %} style="display: none;"{% endif %}>
 			<dt></dt>
 			<dd>
 				<div id="colour_palette" style="display: none;">
 					<dl style="clear: left;">
-						<dt style="border: none;"><label>{L_FONT_COLOR}{L_COLON}</label></dt>
+						<dt style="border: none;"><label>{{ lang('FONT_COLOR') }}{{ lang('COLON') }}</label></dt>
 						<dd></dd>
 					</dl>
 					<dl style="clear: left;">
@@ -167,73 +167,73 @@ function change_palette()
 					</dl>
 				</div>
 				<div id="format-buttons">
-					<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
-					<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
-					<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
-					<!-- IF S_BBCODE_QUOTE -->
-						<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
-					<!-- ENDIF -->
-					<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
-					<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
-					<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
-					<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
-					<!-- IF S_BBCODE_IMG -->
-						<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
-					<!-- ENDIF -->
-					<!-- IF S_LINKS_ALLOWED -->
-						<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
-					<!-- ENDIF -->
-					<!-- IF S_BBCODE_FLASH -->
-						<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
-					<!-- ENDIF -->
-					<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
-						<option value="50">{L_FONT_TINY}</option>
-						<option value="85">{L_FONT_SMALL}</option>
-						<option value="100" selected="selected">{L_FONT_NORMAL}</option>
-						<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
-							<option value="150">{L_FONT_LARGE}</option>
-							<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
-								<option value="200">{L_FONT_HUGE}</option>
-							<!-- ENDIF -->
-						<!-- ENDIF -->
+					<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{{ lang('BBCODE_B_HELP') }}" />
+					<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{{ lang('BBCODE_I_HELP') }}" />
+					<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{{ lang('BBCODE_U_HELP') }}" />
+					{% if S_BBCODE_QUOTE %}
+						<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{{ lang('BBCODE_Q_HELP') }}" />
+					{% endif %}
+					<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{{ lang('BBCODE_C_HELP') }}" />
+					<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{{ lang('BBCODE_L_HELP') }}" />
+					<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{{ lang('BBCODE_O_HELP') }}" />
+					<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{{ lang('BBCODE_LISTITEM_HELP') }}" />
+					{% if S_BBCODE_IMG %}
+						<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{{ lang('BBCODE_P_HELP') }}" />
+					{% endif %}
+					{% if S_LINKS_ALLOWED %}
+						<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{{ lang('BBCODE_W_HELP') }}" />
+					{% endif %}
+					{% if S_BBCODE_FLASH %}
+						<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{{ lang('BBCODE_D_HELP') }}" />
+					{% endif %}
+					<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{{ lang('BBCODE_F_HELP') }}">
+						<option value="50">{{ lang('FONT_TINY') }}</option>
+						<option value="85">{{ lang('FONT_SMALL') }}</option>
+						<option value="100" selected="selected">{{ lang('FONT_NORMAL') }}</option>
+						{% if not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 %}
+							<option value="150">{{ lang('FONT_LARGE') }}</option>
+							{% if not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 %}
+								<option value="200">{{ lang('FONT_HUGE') }}</option>
+							{% endif %}
+						{% endif %}
 					</select>
-					<input type="button" class="button2" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" />
-					<!-- BEGIN custom_tags -->
-						<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
-					<!-- END custom_tags -->
+					<input type="button" class="button2" name="bbpalette" id="bbpalette" value="{{ lang('FONT_COLOR') }}" onclick="change_palette();" title="{{ lang('BBCODE_S_HELP') }}" />
+					{% for custom_tags in loops.custom_tags %}
+						<input type="button" class="button2" name="addbbcode{{ custom_tags.BBCODE_ID }}" value="{{ custom_tags.BBCODE_TAG }}" onclick="bbstyle({{ custom_tags.BBCODE_ID }})" title="{{ custom_tags.BBCODE_HELPLINE }}" />
+					{% endfor %}
 				</div>
 			</dd>
 		</dl>
 		<dl>
 			<dt>
-				<label for="custom_code">{L_ACP_PORTAL_CUSTOM_CODE}{L_COLON}</label><br />
-				<span>{L_ACP_PORTAL_CUSTOM_CODE_EXP}</span>
+				<label for="custom_code">{{ lang('ACP_PORTAL_CUSTOM_CODE') }}{{ lang('COLON') }}</label><br />
+				<span>{{ lang('ACP_PORTAL_CUSTOM_CODE_EXP') }}</span>
 			</dt>
-			<dd><textarea name="custom_code" id="custom_code" cols="6" rows="12">{CUSTOM_CODE}</textarea></dd>
+			<dd><textarea name="custom_code" id="custom_code" cols="6" rows="12">{{ CUSTOM_CODE }}</textarea></dd>
 		</dl>
 		<dl>
 			<dt>
-				<label for="custom_use_bbcode">{L_ACP_PORTAL_CUSTOM_BBCODE}</label><br />
-				<span>{L_ACP_PORTAL_CUSTOM_BBCODE_EXP}</span>
+				<label for="custom_use_bbcode">{{ lang('ACP_PORTAL_CUSTOM_BBCODE') }}</label><br />
+				<span>{{ lang('ACP_PORTAL_CUSTOM_BBCODE_EXP') }}</span>
 			</dt>
 			<dd>
-				<label><input onchange="phpbb.toggleDisplay('bbcode-buttons', 1)" class="radio" type="radio" value="1" name="custom_use_bbcode" id="custom_use_bbcode"<!-- IF CUSTOM_USE_BBCODE --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-				<label><input onchange="phpbb.toggleDisplay('bbcode-buttons', -1)" class="radio" type="radio" value="0" name="custom_use_bbcode"<!-- IF not CUSTOM_USE_BBCODE --> checked="checked"<!-- ENDIF --> />{L_NO}</label>
+				<label><input onchange="phpbb.toggleDisplay('bbcode-buttons', 1)" class="radio" type="radio" value="1" name="custom_use_bbcode" id="custom_use_bbcode"{% if CUSTOM_USE_BBCODE %} checked="checked"{% endif %} />{{ lang('YES') }}</label>
+				<label><input onchange="phpbb.toggleDisplay('bbcode-buttons', -1)" class="radio" type="radio" value="0" name="custom_use_bbcode"{% if not CUSTOM_USE_BBCODE %} checked="checked"{% endif %} />{{ lang('NO') }}</label>
 			</dd>
 		</dl>
-<!-- IF S_AUTH -->
-	<!-- BEGIN auth_tpl -->
-		{auth_tpl.TPL}
-	<!-- END auth_tpl -->
-<!-- ENDIF -->
+{% if S_AUTH %}
+	{% for auth_tpl in loops.auth_tpl %}
+		{{ auth_tpl.TPL }}
+	{% endfor %}
+{% endif %}
 
 	<p class="submit-buttons">
-		<input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" />&nbsp;
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button2" type="submit" id="preview" name="preview" value="{{ lang('PREVIEW') }}" />&nbsp;
+		<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
 	</p>
-	{S_FORM_TOKEN}
+	{{ S_FORM_TOKEN }}
 </fieldset>
 </form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+{% INCLUDE 'overall_footer.html' %}
\ No newline at end of file
diff --git a/adm/style/portal/acp_portal_links.html b/adm/style/portal/acp_portal_links.html
index c71d78d0..9283f643 100644
--- a/adm/style/portal/acp_portal_links.html
+++ b/adm/style/portal/acp_portal_links.html
@@ -1,187 +1,187 @@
-<!-- INCLUDE overall_header.html -->
+{% INCLUDE 'overall_header.html' %}
 
 <a name="maincontent"></a>
 
-<h1>{L_TITLE}</h1>
+<h1>{{ lang('TITLE') }}</h1>
 
-<p>{L_TITLE_EXPLAIN}</p>
+<p>{{ lang('TITLE_EXPLAIN') }}</p>
 
-<!-- IF S_ERROR -->
+{% if S_ERROR %}
 	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
+		<h3>{{ lang('WARNING') }}</h3>
+		<p>{{ ERROR_MSG }}</p>
 	</div>
-<!-- ENDIF -->
+{% endif %}
 
-<!-- IF S_EDIT -->
-	<form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
+{% if S_EDIT %}
+	<form id="acp_portal_links" method="post" action="{{ B3P_U_ACTION }}">
 
 	<fieldset>
-		<legend>{L_ACP_PORTAL_LINKS}</legend>
+		<legend>{{ lang('ACP_PORTAL_LINKS') }}</legend>
 	<dl>
-		<dt><label for="link_title">{L_ACP_PORTAL_LINK_TITLE}{L_COLON}</label></dt>
-		<dd><input name="link_title" type="text" id="link_title" value="{LINK_TITLE}" maxlength="255" /></dd>
+		<dt><label for="link_title">{{ lang('ACP_PORTAL_LINK_TITLE') }}{{ lang('COLON') }}</label></dt>
+		<dd><input name="link_title" type="text" id="link_title" value="{{ LINK_TITLE }}" maxlength="255" /></dd>
 	</dl>
 	<dl>
 		<dt>
-			<label for="link_type">{L_ACP_PORTAL_LINK_TYPE}{L_COLON}</label><br />
-			<span>{L_ACP_PORTAL_LINK_TYPE_EXP}</span>
+			<label for="link_type">{{ lang('ACP_PORTAL_LINK_TYPE') }}{{ lang('COLON') }}</label><br />
+			<span>{{ lang('ACP_PORTAL_LINK_TYPE_EXP') }}</span>
 		</dt>
 		<dd>
-			<label><input type="radio" class="radio" name="link_type" value="1" id="link_type"<!-- IF S_LINK_IS_INT --> checked="checked"<!-- ENDIF --> />{L_ACP_PORTAL_LINK_INT}</label>
-			<label><input type="radio" class="radio" name="link_type" value="2"<!-- IF not S_LINK_IS_INT --> checked="checked"<!-- ENDIF --> /> {L_ACP_PORTAL_LINK_EXT}</label>
+			<label><input type="radio" class="radio" name="link_type" value="1" id="link_type"{% if S_LINK_IS_INT %} checked="checked"{% endif %} />{{ lang('ACP_PORTAL_LINK_INT') }}</label>
+			<label><input type="radio" class="radio" name="link_type" value="2"{% if not S_LINK_IS_INT %} checked="checked"{% endif %} /> {{ lang('ACP_PORTAL_LINK_EXT') }}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt>
-			<label for="link_url">{L_ACP_PORTAL_LINK_URL}{L_COLON}</label><br />
-			<span>{L_ACP_PORTAL_LINK_URL_EXP}</span>
+			<label for="link_url">{{ lang('ACP_PORTAL_LINK_URL') }}{{ lang('COLON') }}</label><br />
+			<span>{{ lang('ACP_PORTAL_LINK_URL_EXP') }}</span>
 		</dt>
-		<dd><input name="link_url" type="text" id="link_url" value="{LINK_URL}" maxlength="255" /></dd>
+		<dd><input name="link_url" type="text" id="link_url" value="{{ LINK_URL }}" maxlength="255" /></dd>
 	</dl>
 	<dl>
 		<dt>
-			<label for="permission-setting-link">{L_ACP_PORTAL_LINK_PERMISSION}{L_COLON}</label><br />
-			<span>{L_ACP_PORTAL_LINK_PERMISSION_EXP}</span>
+			<label for="permission-setting-link">{{ lang('ACP_PORTAL_LINK_PERMISSION') }}{{ lang('COLON') }}</label><br />
+			<span>{{ lang('ACP_PORTAL_LINK_PERMISSION_EXP') }}</span>
 		</dt>
 		<dd>
 			<select id="permission-setting-link" size="10" multiple="multiple" name="permission-setting-link[]">
-				<!-- BEGIN permission_setting_link -->
-				<option value="{permission_setting_link.GROUP_ID}"<!-- IF permission_setting_link.SELECTED -->selected="selected"<!-- ENDIF -->>{permission_setting_link.GROUP_NAME}</option>
-				<!-- END permission_setting_link -->
+				{% for permission_setting_link in loops.permission_setting_link %}
+				<option value="{{ permission_setting_link.GROUP_ID }}"{% if permission_setting_link.SELECTED %}selected="selected"{% endif %}>{{ permission_setting_link.GROUP_NAME }}</option>
+				{% endfor %}
 			</select>
 		</dd>
 	</dl>
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
-		<!-- IF LINK_ID !== '' --><input type="hidden" name="id" value="{LINK_ID}" /><!-- ENDIF -->
+		{% if LINK_ID !== '' %}<input type="hidden" name="id" value="{{ LINK_ID }}" />{% endif %}
 
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
+		<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
+		{{ S_FORM_TOKEN }}
 	</p>
 	</fieldset>
 	</form>
 
-<!-- ELSE -->
-	<form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
-	<!-- IF SHOW_MODULE_OPTIONS -->
+{% else %}
+	<form id="acp_portal_links" method="post" action="{{ B3P_U_ACTION }}">
+	{% if SHOW_MODULE_OPTIONS %}
 	<fieldset>
-		<legend>{L_MODULE_OPTIONS}</legend>
+		<legend>{{ lang('MODULE_OPTIONS') }}</legend>
 		<dl>
-			<dt><label for="module_name">{L_MODULE_NAME}{L_COLON}</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
-			<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
+			<dt><label for="module_name">{{ lang('MODULE_NAME') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_NAME_EXP') }}</span></dt>
+			<dd><input id="module_name" type="text" value="{{ MODULE_NAME }}" name="module_name" maxlength="255" size="64" /></dd>
 		</dl>
-		<!-- IF MODULE_SHOW_IMAGE -->
+		{% if MODULE_SHOW_IMAGE %}
 		<dl>
-			<dt><label for="module_image">{L_MODULE_IMAGE}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
-			<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
-			<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
+			<dt><label for="module_image">{{ lang('MODULE_IMAGE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_EXP') }}</span></dt>
+			<dd><input id="module_image" type="text" value="{{ MODULE_IMAGE }}" name="module_image" maxlength="255" size="64" /></dd>
+			{% if MODULE_IMAGE_SRC %}<dd><img src="{{ MODULE_IMAGE_SRC }}" alt="{{ lang('MODULE_IMAGE') }}" /></dd>{% endif %}
 		</dl>
-		<!-- IF MODULE_IMAGE_SRC -->
+		{% if MODULE_IMAGE_SRC %}
 		<dl>
-			<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
-			<dd><input id="module_img_width" type="text" value="{MODULE_IMAGE_WIDTH}" name="module_img_width" maxlength="3" size="3" />px</dd>
+			<dt><label for="module_img_width">{{ lang('MODULE_IMAGE_WIDTH') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_WIDTH_EXP') }}</span></dt>
+			<dd><input id="module_img_width" type="number" value="{{ MODULE_IMAGE_WIDTH }}" name="module_img_width" min="1" />&nbsp;{{ lang('PIXEL') }}</dd>
 		</dl>
 		<dl>
-			<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
-			<dd><input id="module_img_height" type="text" value="{MODULE_IMAGE_HEIGHT}" name="module_img_height" maxlength="3" size="3" />px</dd>
+			<dt><label for="module_img_height">{{ lang('MODULE_IMAGE_HEIGHT') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_HEIGHT_EXP') }}</span></dt>
+			<dd><input id="module_img_height" type="number" value="{{ MODULE_IMAGE_HEIGHT }}" name="module_img_height" min="1" />&nbsp;{{ lang('PIXEL') }}</dd>
 		</dl>
-		<!-- ENDIF -->
+		{% endif %}
 		<dl>
-			<dt><label for="module_fa">{L_MODULE_FA}{L_COLON}</label><br/><span>{L_MODULE_FA_EXP}</span></dt>
-			<dd><input id="module_fa" type="text" value="{MODULE_FA}" name="module_fa" maxlength="255" size="64"/></dd>
+			<dt><label for="module_fa">{{ lang('MODULE_FA') }}{{ lang('COLON') }}</label><br/><span>{{ lang('MODULE_FA_EXP') }}</span></dt>
+			<dd><input id="module_fa" type="text" value="{{ MODULE_FA }}" name="module_fa" maxlength="255" size="64"/></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_fa_size">{L_MODULE_FA_SIZE}{L_COLON}</label><br/><span>{L_MODULE_FA_SIZE_EXP}</span></dt>
-			<dd><input id="module_fa_size" type="number" value="{MODULE_FA_SIZE}" name="module_fa_size" min="1"/>&nbsp;{L_PIXEL}</dd>
+			<dt><label for="module_fa_size">{{ lang('MODULE_FA_SIZE') }}{{ lang('COLON') }}</label><br/><span>{{ lang('MODULE_FA_SIZE_EXP') }}</span></dt>
+			<dd><input id="module_fa_size" type="number" value="{{ MODULE_FA_SIZE }}" name="module_fa_size" min="1"/>&nbsp;{{ lang('PIXEL') }}</dd>
 		</dl>
-		<!-- ENDIF -->
+		{% endif %}
 		<dl>
-			<dt><label for="module_reset">{L_MODULE_RESET}{L_COLON}</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
+			<dt><label for="module_reset">{{ lang('MODULE_RESET') }}{{ lang('COLON') }}</label><br /><span style="color: #BC2A4D;">{{ lang('MODULE_RESET_EXP') }}</span></dt>
 			<dd><input id="module_reset" type="checkbox" value="1" name="module_reset" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_status">{L_MODULE_STATUS}{L_COLON}</label></dt>
+			<dt><label for="module_status">{{ lang('MODULE_STATUS') }}{{ lang('COLON') }}</label></dt>
 			<dd>
-				<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-				<label><input type="radio" class="radio" name="module_status" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"{% if MODULE_ENABLED %} checked="checked"{% endif %} />{{ lang('YES') }}</label>
+				<label><input type="radio" class="radio" name="module_status" value="0"{% if not MODULE_ENABLED %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
 			</dd>
 		</dl>
-		<!-- IF .permission_setting -->
+		{% if loops.permission_setting|length %}
 		<dl>
-			<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}{L_COLON}</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
+			<dt><label for="permission-setting">{{ lang('MODULE_PERMISSIONS') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_PERMISSIONS_EXP') }}</span></dt>
 			<dd>
 				<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
-					<!-- BEGIN permission_setting -->
-					<option value="{permission_setting.GROUP_ID}"<!-- IF permission_setting.SELECTED -->selected="selected"<!-- ENDIF -->>{permission_setting.GROUP_NAME}</option>
-					<!-- END permission_setting -->
+					{% for permission_setting in loops.permission_setting %}
+					<option value="{{ permission_setting.GROUP_ID }}"{% if permission_setting.SELECTED %}selected="selected"{% endif %}>{{ permission_setting.GROUP_NAME }}</option>
+					{% endfor %}
 				</select>
 			</dd>
 		</dl>
-		<!-- ENDIF -->
+		{% endif %}
 	</fieldset>
-	<!-- ENDIF -->	
-<!-- BEGIN options -->
-	<!-- IF options.S_LEGEND -->
-		<!-- IF not options.S_FIRST_ROW -->
+	{% endif %}	
+{% for options in loops.options %}
+	{% if options.S_LEGEND %}
+		{% if not options.S_FIRST_ROW %}
 			</fieldset>
-		<!-- ENDIF -->
+		{% endif %}
 		<fieldset>
-			<legend>{options.LEGEND}</legend>
-	<!-- ELSE -->
+			<legend>{{ options.LEGEND }}</legend>
+	{% else %}
 
 		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{options.CONTENT}</dd>
+			<dt><label for="{{ options.KEY }}">{{ options.TITLE }}{{ lang('COLON') }}</label>{% if options.S_EXPLAIN %}<br /><span>{{ options.TITLE_EXPLAIN }}</span>{% endif %}</dt>
+			<dd>{{ options.CONTENT }}</dd>
 		</dl>
 
-	<!-- ENDIF -->
-<!-- BEGINELSE -->
+	{% endif %}
+{% else %}
 	<fieldset>
-<!-- END options -->
+{% endfor %}
 	<fieldset class="tabulated">
-	<legend>{L_ACP_PORTAL_LINKS}</legend>
+	<legend>{{ lang('ACP_PORTAL_LINKS') }}</legend>
 
 	<p class="quick">
-		<input class="button2" name="add" type="submit" value="{L_ACP_PORTAL_LINK_ADD}" />
+		<input class="button2" name="add" type="submit" value="{{ lang('ACP_PORTAL_LINK_ADD') }}" />
 	</p>
 
 	<table style="cellspacing: 1;">
 	<thead>
 	<tr>
-		<th>{L_ACP_PORTAL_LINK_TITLE}</th>
-		<th>{L_ACP_PORTAL_LINK_URL}</th>
-		<th>{L_ACTION}</th>
+		<th>{{ lang('ACP_PORTAL_LINK_TITLE') }}</th>
+		<th>{{ lang('ACP_PORTAL_LINK_URL') }}</th>
+		<th>{{ lang('ACTION') }}</th>
 	</tr>
 	</thead>
 	<tbody>
-	<!-- BEGIN links -->
-		<!-- IF links.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td style="text-align: center;"<!-- IF links.S_LINK_IS_CAT --> class="row3" colspan="2"<!-- ENDIF -->>{links.LINK_TITLE}</td>
-		<!-- IF not links.S_LINK_IS_CAT --><td style="text-align: center;">{links.LINK_URL}</td><!-- ENDIF -->
+	{% for links in loops.links %}
+		{% if links.S_ROW_COUNT is even %}<tr class="row1">{% else %}<tr class="row2">{% endif %}
+		<td style="text-align: center;"{% if links.S_LINK_IS_CAT %} class="row3" colspan="2"{% endif %}>{{ links.LINK_TITLE }}</td>
+		{% if not links.S_LINK_IS_CAT %}<td style="text-align: center;">{{ links.LINK_URL }}</td>{% endif %}
 		<td style="text-align: center;">
-			<!-- IF links.S_FIRST_ROW -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{links.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
-			<!-- IF links.S_LAST_ROW -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{links.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->&nbsp;
-			<a href="{links.U_EDIT}">{ICON_EDIT}</a> <a href="{links.U_DELETE}">{ICON_DELETE}</a>
+			{% if links.S_FIRST_ROW %}{{ ICON_MOVE_UP_DISABLED }}{% else %}<a href="{{ links.U_MOVE_UP }}">{{ ICON_MOVE_UP }}</a>{% endif %}&nbsp;
+			{% if links.S_LAST_ROW %}{{ ICON_MOVE_DOWN_DISABLED }}{% else %}<a href="{{ links.U_MOVE_DOWN }}">{{ ICON_MOVE_DOWN }}</a>{% endif %}&nbsp;
+			<a href="{{ links.U_EDIT }}">{{ ICON_EDIT }}</a> <a href="{{ links.U_DELETE }}">{{ ICON_DELETE }}</a>
 		</td>
 	</tr>
-	<!-- BEGINELSE -->
+	{% else %}
 	<tr class="row1">
-		<td style="text-align: center;" colspan="3">{L_LINKS_NO_LINKS}</td>
+		<td style="text-align: center;" colspan="3">{{ lang('LINKS_NO_LINKS') }}</td>
 	</tr>
-	<!-- END links -->
+	{% endfor %}
 	</tbody>
 	</table>
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
 	</p>
-	{S_FORM_TOKEN}
+	{{ S_FORM_TOKEN }}
 	</fieldset>
 	</fieldset>
 	</form>
 
-<!-- ENDIF -->
+{% endif %}
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+{% INCLUDE 'overall_footer.html' %}
\ No newline at end of file
diff --git a/adm/style/portal/acp_portal_menu.html b/adm/style/portal/acp_portal_menu.html
index 02c1ac26..85b0fffa 100644
--- a/adm/style/portal/acp_portal_menu.html
+++ b/adm/style/portal/acp_portal_menu.html
@@ -1,194 +1,194 @@
-<!-- INCLUDE overall_header.html -->
+{% INCLUDE 'overall_header.html' %}
 
 <a name="maincontent"></a>
 
-<h1>{L_TITLE}</h1>
+<h1>{{ lang('TITLE') }}</h1>
 
-<p>{L_TITLE_EXPLAIN}</p>
+<p>{{ lang('TITLE_EXPLAIN') }}</p>
 
-<!-- IF S_ERROR -->
+{% if S_ERROR %}
 	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
+		<h3>{{ lang('WARNING') }}</h3>
+		<p>{{ ERROR_MSG }}</p>
 	</div>
-<!-- ENDIF -->
+{% endif %}
 
-<!-- IF S_EDIT -->
-	<form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
+{% if S_EDIT %}
+	<form id="acp_portal_links" method="post" action="{{ B3P_U_ACTION }}">
 
 	<fieldset>
-		<legend>{L_ACP_PORTAL_MENU_LINK_SETTINGS}</legend>
+		<legend>{{ lang('ACP_PORTAL_MENU_LINK_SETTINGS') }}</legend>
 	<dl>
-		<dt><label for="link_title">{L_ACP_PORTAL_MENU_TITLE}{L_COLON}</label></dt>
-		<dd><input name="link_title" type="text" id="link_title" value="{LINK_TITLE}" maxlength="255" /></dd>
+		<dt><label for="link_title">{{ lang('ACP_PORTAL_MENU_TITLE') }}{{ lang('COLON') }}</label></dt>
+		<dd><input name="link_title" type="text" id="link_title" value="{{ LINK_TITLE }}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="link_is_cat">{L_ACP_PORTAL_MENU_IS_CAT}{L_COLON}</label></dt>
-		<dd><label><input onchange="phpbb.toggleDisplay('url', -1)" type="radio" class="radio" name="link_is_cat" value="1" id="link_is_cat"<!-- IF S_LINK_IS_CAT --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-			<label><input onchange="phpbb.toggleDisplay('url', 1)" type="radio" class="radio" name="link_is_cat" value="0"<!-- IF not S_LINK_IS_CAT --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dt><label for="link_is_cat">{{ lang('ACP_PORTAL_MENU_IS_CAT') }}{{ lang('COLON') }}</label></dt>
+		<dd><label><input onchange="phpbb.toggleDisplay('url', -1)" type="radio" class="radio" name="link_is_cat" value="1" id="link_is_cat"{% if S_LINK_IS_CAT %} checked="checked"{% endif %} />{{ lang('YES') }}</label>
+			<label><input onchange="phpbb.toggleDisplay('url', 1)" type="radio" class="radio" name="link_is_cat" value="0"{% if not S_LINK_IS_CAT %} checked="checked"{% endif %} /> {{ lang('NO') }}</label></dd>
 	</dl>
-	<div id="url"<!-- IF S_LINK_IS_CAT --> style="display: none;"<!-- ENDIF -->>
+	<div id="url"{% if S_LINK_IS_CAT %} style="display: none;"{% endif %}>
 	<dl>
 		<dt>
-			<label for="link_type">{L_ACP_PORTAL_MENU_TYPE}{L_COLON}</label><br />
-			<span>{L_ACP_PORTAL_MENU_TYPE_EXP}</span>
+			<label for="link_type">{{ lang('ACP_PORTAL_MENU_TYPE') }}{{ lang('COLON') }}</label><br />
+			<span>{{ lang('ACP_PORTAL_MENU_TYPE_EXP') }}</span>
 		</dt>
 		<dd>
-			<label><input type="radio" class="radio" name="link_type" value="1" id="link_type"<!-- IF S_LINK_IS_INT --> checked="checked"<!-- ENDIF --> />{L_ACP_PORTAL_MENU_INT}</label>
-			<label><input type="radio" class="radio" name="link_type" value="2"<!-- IF not S_LINK_IS_INT --> checked="checked"<!-- ENDIF --> /> {L_ACP_PORTAL_MENU_EXT}</label>
+			<label><input type="radio" class="radio" name="link_type" value="1" id="link_type"{% if S_LINK_IS_INT %} checked="checked"{% endif %} />{{ lang('ACP_PORTAL_MENU_INT') }}</label>
+			<label><input type="radio" class="radio" name="link_type" value="2"{% if not S_LINK_IS_INT %} checked="checked"{% endif %} /> {{ lang('ACP_PORTAL_MENU_EXT') }}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt>
-			<label for="link_url">{L_ACP_PORTAL_MENU_URL}{L_COLON}</label><br />
-			<span>{L_ACP_PORTAL_MENU_URL_EXP}</span>
+			<label for="link_url">{{ lang('ACP_PORTAL_MENU_URL') }}{{ lang('COLON') }}</label><br />
+			<span>{{ lang('ACP_PORTAL_MENU_URL_EXP') }}</span>
 		</dt>
-		<dd><input name="link_url" type="text" id="link_url" value="{LINK_URL}" maxlength="255" /></dd>
+		<dd><input name="link_url" type="text" id="link_url" value="{{ LINK_URL }}" maxlength="255" /></dd>
 	</dl>
 	<dl>
 		<dt>
-			<label for="permission-setting-menu">{L_ACP_PORTAL_MENU_PERMISSION}{L_COLON}</label><br />
-			<span>{L_ACP_PORTAL_MENU_PERMISSION_EXP}</span>
+			<label for="permission-setting-menu">{{ lang('ACP_PORTAL_MENU_PERMISSION') }}{{ lang('COLON') }}</label><br />
+			<span>{{ lang('ACP_PORTAL_MENU_PERMISSION_EXP') }}</span>
 		</dt>
 		<dd>
 			<select id="permission-setting-menu" size="10" multiple="multiple" name="permission-setting-menu[]">
-				<!-- BEGIN permission_setting_menu -->
-				<option value="{permission_setting_menu.GROUP_ID}"<!-- IF permission_setting_menu.SELECTED -->selected="selected"<!-- ENDIF -->>{permission_setting_menu.GROUP_NAME}</option>
-				<!-- END permission_setting_menu -->
+				{% for permission_setting_menu in loops.permission_setting_menu %}
+				<option value="{{ permission_setting_menu.GROUP_ID }}"{% if permission_setting_menu.SELECTED %}selected="selected"{% endif %}>{{ permission_setting_menu.GROUP_NAME }}</option>
+				{% endfor %}
 			</select>
 		</dd>
 	</dl>
 	</div>
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
-		<!-- IF LINK_ID !== '' --><input type="hidden" name="id" value="{LINK_ID}" /><!-- ENDIF -->
+		{% if LINK_ID !== '' %}<input type="hidden" name="id" value="{{ LINK_ID }}" />{% endif %}
 
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
+		<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
+		{{ S_FORM_TOKEN }}
 	</p>
 	</fieldset>
 	</form>
 
-<!-- ELSE -->
-	<form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
-	<!-- IF SHOW_MODULE_OPTIONS -->
+{% else %}
+	<form id="acp_portal_links" method="post" action="{{ B3P_U_ACTION }}">
+	{% if SHOW_MODULE_OPTIONS %}
 	<fieldset>
-		<legend>{L_MODULE_OPTIONS}</legend>
+		<legend>{{ lang('MODULE_OPTIONS') }}</legend>
 		<dl>
-			<dt><label for="module_name">{L_MODULE_NAME}{L_COLON}</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
-			<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
+			<dt><label for="module_name">{{ lang('MODULE_NAME') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_NAME_EXP') }}</span></dt>
+			<dd><input id="module_name" type="text" value="{{ MODULE_NAME }}" name="module_name" maxlength="255" size="64" /></dd>
 		</dl>
-		<!-- IF MODULE_SHOW_IMAGE -->
+		{% if MODULE_SHOW_IMAGE %}
 		<dl>
-			<dt><label for="module_image">{L_MODULE_IMAGE}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
-			<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
-			<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
+			<dt><label for="module_image">{{ lang('MODULE_IMAGE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_EXP') }}</span></dt>
+			<dd><input id="module_image" type="text" value="{{ MODULE_IMAGE }}" name="module_image" maxlength="255" size="64" /></dd>
+			{% if MODULE_IMAGE_SRC %}<dd><img src="{{ MODULE_IMAGE_SRC }}" alt="{{ lang('MODULE_IMAGE') }}" /></dd>{% endif %}
 		</dl>
-		<!-- IF MODULE_IMAGE_SRC -->
+		{% if MODULE_IMAGE_SRC %}
 		<dl>
-			<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
-			<dd><input id="module_img_width" type="text" value="{MODULE_IMAGE_WIDTH}" name="module_img_width" maxlength="3" size="3" />px</dd>
+			<dt><label for="module_img_width">{{ lang('MODULE_IMAGE_WIDTH') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_WIDTH_EXP') }}</span></dt>
+			<dd><input id="module_img_width" type="number" value="{{ MODULE_IMAGE_WIDTH }}" name="module_img_width" min="1" />&nbsp;{{ lang('PIXEL') }}</dd>
 		</dl>
 		<dl>
-			<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
-			<dd><input id="module_img_height" type="text" value="{MODULE_IMAGE_HEIGHT}" name="module_img_height" maxlength="3" size="3" />px</dd>
+			<dt><label for="module_img_height">{{ lang('MODULE_IMAGE_HEIGHT') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_HEIGHT_EXP') }}</span></dt>
+			<dd><input id="module_img_height" type="number" value="{{ MODULE_IMAGE_HEIGHT }}" name="module_img_height" min="1" />&nbsp;{{ lang('PIXEL') }}</dd>
 		</dl>
-		<!-- ENDIF -->
+		{% endif %}
 		<dl>
-			<dt><label for="module_fa">{L_MODULE_FA}{L_COLON}</label><br/><span>{L_MODULE_FA_EXP}</span></dt>
-			<dd><input id="module_fa" type="text" value="{MODULE_FA}" name="module_fa" maxlength="255" size="64"/></dd>
+			<dt><label for="module_fa">{{ lang('MODULE_FA') }}{{ lang('COLON') }}</label><br/><span>{{ lang('MODULE_FA_EXP') }}</span></dt>
+			<dd><input id="module_fa" type="text" value="{{ MODULE_FA }}" name="module_fa" maxlength="255" size="64"/></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_fa_size">{L_MODULE_FA_SIZE}{L_COLON}</label><br/><span>{L_MODULE_FA_SIZE_EXP}</span></dt>
-			<dd><input id="module_fa_size" type="number" value="{MODULE_FA_SIZE}" name="module_fa_size" min="1"/>&nbsp;{L_PIXEL}</dd>
+			<dt><label for="module_fa_size">{{ lang('MODULE_FA_SIZE') }}{{ lang('COLON') }}</label><br/><span>{{ lang('MODULE_FA_SIZE_EXP') }}</span></dt>
+			<dd><input id="module_fa_size" type="number" value="{{ MODULE_FA_SIZE }}" name="module_fa_size" min="1"/>&nbsp;{{ lang('PIXEL') }}</dd>
 		</dl>
-		<!-- ENDIF -->
+		{% endif %}
 		<dl>
-			<dt><label for="module_reset">{L_MODULE_RESET}{L_COLON}</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
+			<dt><label for="module_reset">{{ lang('MODULE_RESET') }}{{ lang('COLON') }}</label><br /><span style="color: #BC2A4D;">{{ lang('MODULE_RESET_EXP') }}</span></dt>
 			<dd><input id="module_reset" type="checkbox" value="1" name="module_reset" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_status">{L_MODULE_STATUS}{L_COLON}</label></dt>
+			<dt><label for="module_status">{{ lang('MODULE_STATUS') }}{{ lang('COLON') }}</label></dt>
 			<dd>
-				<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-				<label><input type="radio" class="radio" name="module_status" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"{% if MODULE_ENABLED %} checked="checked"{% endif %} />{{ lang('YES') }}</label>
+				<label><input type="radio" class="radio" name="module_status" value="0"{% if not MODULE_ENABLED %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
 			</dd>
 		</dl>
-		<!-- IF .permission_setting -->
+		{% if loops.permission_setting|length %}
 		<dl>
-			<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}{L_COLON}</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
+			<dt><label for="permission-setting">{{ lang('MODULE_PERMISSIONS') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_PERMISSIONS_EXP') }}</span></dt>
 			<dd>
 				<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
-					<!-- BEGIN permission_setting -->
-					<option value="{permission_setting.GROUP_ID}"<!-- IF permission_setting.SELECTED -->selected="selected"<!-- ENDIF -->>{permission_setting.GROUP_NAME}</option>
-					<!-- END permission_setting -->
+					{% for permission_setting in loops.permission_setting %}
+					<option value="{{ permission_setting.GROUP_ID }}"{% if permission_setting.SELECTED %}selected="selected"{% endif %}>{{ permission_setting.GROUP_NAME }}</option>
+					{% endfor %}
 				</select>
 			</dd>
 		</dl>
-		<!-- ENDIF -->
+		{% endif %}
 	</fieldset>
-	<!-- ENDIF -->	
-<!-- BEGIN options -->
-	<!-- IF options.S_LEGEND -->
-		<!-- IF not options.S_FIRST_ROW -->
+	{% endif %}	
+{% for options in loops.options %}
+	{% if options.S_LEGEND %}
+		{% if not options.S_FIRST_ROW %}
 			</fieldset>
-		<!-- ENDIF -->
+		{% endif %}
 		<fieldset>
-			<legend>{options.LEGEND}</legend>
-	<!-- ELSE -->
+			<legend>{{ options.LEGEND }}</legend>
+	{% else %}
 
 		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{options.CONTENT}</dd>
+			<dt><label for="{{ options.KEY }}">{{ options.TITLE }}{{ lang('COLON') }}</label>{% if options.S_EXPLAIN %}<br /><span>{{ options.TITLE_EXPLAIN }}</span>{% endif %}</dt>
+			<dd>{{ options.CONTENT }}</dd>
 		</dl>
 
-	<!-- ENDIF -->
-<!-- BEGINELSE -->
+	{% endif %}
+{% else %}
 	<fieldset>
-<!-- END options -->
+{% endfor %}
 	<fieldset class="tabulated">
-	<legend>{L_ACP_PORTAL_LINKS}</legend>
+	<legend>{{ lang('ACP_PORTAL_LINKS') }}</legend>
 
 	<p class="quick">
-		<input class="button2" name="add" type="submit" value="{L_ACP_PORTAL_MENU_ADD}" />
+		<input class="button2" name="add" type="submit" value="{{ lang('ACP_PORTAL_MENU_ADD') }}" />
 	</p>
 
 	<table style="cellspacing: 1;">
 	<thead>
 	<tr>
-		<th>{L_ACP_PORTAL_MENU_TITLE}</th>
-		<th>{L_ACP_PORTAL_MENU_URL}</th>
-		<th>{L_ACTION}</th>
+		<th>{{ lang('ACP_PORTAL_MENU_TITLE') }}</th>
+		<th>{{ lang('ACP_PORTAL_MENU_URL') }}</th>
+		<th>{{ lang('ACTION') }}</th>
 	</tr>
 	</thead>
 	<tbody>
-	<!-- BEGIN links -->
-		<!-- IF links.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td style="text-align: center;"<!-- IF links.S_LINK_IS_CAT --> class="row3" colspan="2"<!-- ENDIF -->>{links.LINK_TITLE}</td>
-		<!-- IF not links.S_LINK_IS_CAT --><td style="text-align: center;">{links.LINK_URL}</td><!-- ENDIF -->
+	{% for links in loops.links %}
+		{% if links.S_ROW_COUNT is even %}<tr class="row1">{% else %}<tr class="row2">{% endif %}
+		<td style="text-align: center;"{% if links.S_LINK_IS_CAT %} class="row3" colspan="2"{% endif %}>{{ links.LINK_TITLE }}</td>
+		{% if not links.S_LINK_IS_CAT %}<td style="text-align: center;">{{ links.LINK_URL }}</td>{% endif %}
 		<td style="text-align: center;">
-			<!-- IF links.S_FIRST_ROW -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{links.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
-			<!-- IF links.S_LAST_ROW -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{links.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->&nbsp;
-			<a href="{links.U_EDIT}">{ICON_EDIT}</a> <a href="{links.U_DELETE}">{ICON_DELETE}</a>
+			{% if links.S_FIRST_ROW %}{{ ICON_MOVE_UP_DISABLED }}{% else %}<a href="{{ links.U_MOVE_UP }}">{{ ICON_MOVE_UP }}</a>{% endif %}&nbsp;
+			{% if links.S_LAST_ROW %}{{ ICON_MOVE_DOWN_DISABLED }}{% else %}<a href="{{ links.U_MOVE_DOWN }}">{{ ICON_MOVE_DOWN }}</a>{% endif %}&nbsp;
+			<a href="{{ links.U_EDIT }}">{{ ICON_EDIT }}</a> <a href="{{ links.U_DELETE }}">{{ ICON_DELETE }}</a>
 		</td>
 	</tr>
-	<!-- BEGINELSE -->
+	{% else %}
 	<tr class="row1">
-		<td style="text-align: center;" colspan="3">{L_MENU_NO_LINKS}</td>
+		<td style="text-align: center;" colspan="3">{{ lang('MENU_NO_LINKS') }}</td>
 	</tr>
-	<!-- END links -->
+	{% endfor %}
 	</tbody>
 	</table>
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
 	</p>
-	{S_FORM_TOKEN}
+	{{ S_FORM_TOKEN }}
 	</fieldset>
 	</fieldset>
 	</form>
 
-<!-- ENDIF -->
+{% endif %}
 
-<!-- INCLUDE overall_footer.html -->
+{% INCLUDE 'overall_footer.html' %}
diff --git a/adm/style/portal/acp_portal_modules.html b/adm/style/portal/acp_portal_modules.html
index ec92b97f..3da91601 100644
--- a/adm/style/portal/acp_portal_modules.html
+++ b/adm/style/portal/acp_portal_modules.html
@@ -1,78 +1,78 @@
-<!-- IF S_AJAX_REQUEST -->
-	<form id="acp_portal_modules" method="post" action="{U_ACTION}">
+{% if S_AJAX_REQUEST %}
+	<form id="acp_portal_modules" method="post" action="{{ U_ACTION }}">
 		<fieldset>
 			<dl>
-				<dt><label for="module_classname" style="display: inline;">{L_CHOOSE_MODULE}{L_COLON}</label><br /><span>{L_CHOOSE_MODULE_EXP}</span></dt>
-				<dd><select name="module_classname" id="module_classname">{S_MODULE_NAMES}</select></dd>
+				<dt><label for="module_classname" style="display: inline;">{{ lang('CHOOSE_MODULE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('CHOOSE_MODULE_EXP') }}</span></dt>
+				<dd><select name="module_classname" id="module_classname">{{ S_MODULE_NAMES }}</select></dd>
 			</dl>
 
 			<p class="submit-buttons">
-				<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-				<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-				{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
+				<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+				<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
+				{{ S_FORM_TOKEN }}{{ S_HIDDEN_FIELDS }}
 			</p>
 		</fieldset>
 	</form>
 
-<!-- ELSE -->
-<!-- INCLUDECSS portal/b3p_admin.css -->
-<!-- INCLUDE overall_header.html -->
+{% else %}
+{% INCLUDECSS 'portal/b3p_admin.css' %}
+{% INCLUDE 'overall_header.html' %}
 
 <a name="maincontent"></a>
 
-<!-- IF S_EDIT -->
+{% if S_EDIT %}
 
-<h1>{L_ACP_PORTAL_MODULES}</h1>
-<p>{L_ACP_PORTAL_MODULES_EXP}</p>
+<h1>{{ lang('ACP_PORTAL_MODULES') }}</h1>
+<p>{{ lang('ACP_PORTAL_MODULES_EXP') }}</p>
 
-<form id="acp_portal_modules" method="post" action="{B3P_U_ACTION}">
+<form id="acp_portal_modules" method="post" action="{{ B3P_U_ACTION }}">
 	<fieldset>
 		<dl>
-			<dt><label for="module_classname">{L_CHOOSE_MODULE}{L_COLON}</label><br /><span>{L_CHOOSE_MODULE_EXP}</span></dt>
-			<dd><select name="module_classname" id="module_classname">{S_MODULE_NAMES}</select></dd>
+			<dt><label for="module_classname">{{ lang('CHOOSE_MODULE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('CHOOSE_MODULE_EXP') }}</span></dt>
+			<dd><select name="module_classname" id="module_classname">{{ S_MODULE_NAMES }}</select></dd>
 		</dl>
 
 		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-			{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
+			<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+			<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
+			{{ S_FORM_TOKEN }}{{ S_HIDDEN_FIELDS }}
 		</p>
 	</fieldset>
 </form>
 
-<!-- ELSE -->
+{% else %}
 
-<h1>{L_ACP_PORTAL_MODULES}</h1>
-<p>{L_ACP_PORTAL_MODULES_EXP}</p>
+<h1>{{ lang('ACP_PORTAL_MODULES') }}</h1>
+<p>{{ lang('ACP_PORTAL_MODULES_EXP') }}</p>
 
-<form id="acp_portal_modules" method="post" action="{B3P_U_ACTION}" data-ajax="true">
+<form id="acp_portal_modules" method="post" action="{{ B3P_U_ACTION }}" data-ajax="true">
 	<fieldset class="tabulated">
-	<legend>{L_ACP_PORTAL_MODULES}</legend>
+	<legend>{{ lang('ACP_PORTAL_MODULES') }}</legend>
 
 	<table class="portal-modules-overview">
 		<tr>
-			<th style="text-align: center;">{L_MODULE_POS_TOP}</th>
+			<th style="text-align: center;">{{ lang('MODULE_POS_TOP') }}</th>
 		</tr>
-		<!-- BEGIN modules_top -->
-			<!-- IF not modules_top.MODULE_ENABLED --><tr class="row3"><!-- ELSEIF modules_top.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		{% for modules_top in loops.modules_top %}
+			{% if not modules_top.MODULE_ENABLED %}<tr class="row3">{% elseif modules_top.S_ROW_COUNT is even %}<tr class="row1">{% else %}<tr class="row2">{% endif %}
 				<td>
-					{modules_top.MODULE_IMAGE} {modules_top.MODULE_NAME}<br />
+					{{ modules_top.MODULE_IMAGE }} {{ modules_top.MODULE_NAME }}<br />
 					<br />
-					<span<!-- IF not modules_top.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_UP_DISABLED}&nbsp;</span>
-					<span<!-- IF modules_top.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_top.U_MOVE_UP}" data-ajax="b3p_move_module_up">{ICON_MOVE_UP}</a>&nbsp;</span>
-					<span<!-- IF not modules_top.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_DOWN_DISABLED}&nbsp;</span>
-					<span<!-- IF modules_top.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_top.U_MOVE_DOWN}" data-ajax="b3p_move_module_down">{ICON_MOVE_DOWN}</a>&nbsp;</span>
-					<a href="{modules_top.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_top.U_DELETE}" data-ajax="b3p_delete_module">{ICON_DELETE}</a>
+					<span{% if not modules_top.S_FIRST_ROW %} style="display: none;"{% endif %}>{{ ICON_MOVE_UP_DISABLED }}&nbsp;</span>
+					<span{% if modules_top.S_FIRST_ROW %} style="display: none;"{% endif %}><a href="{{ modules_top.U_MOVE_UP }}" data-ajax="b3p_move_module_up">{{ ICON_MOVE_UP }}</a>&nbsp;</span>
+					<span{% if not modules_top.S_LAST_ROW %} style="display: none;"{% endif %}>{{ ICON_MOVE_DOWN_DISABLED }}&nbsp;</span>
+					<span{% if modules_top.S_LAST_ROW %} style="display: none;"{% endif %}><a href="{{ modules_top.U_MOVE_DOWN }}" data-ajax="b3p_move_module_down">{{ ICON_MOVE_DOWN }}</a>&nbsp;</span>
+					<a href="{{ modules_top.U_EDIT }}">{{ ICON_EDIT }}</a> <a href="{{ modules_top.U_DELETE }}" data-ajax="b3p_delete_module">{{ ICON_DELETE }}</a>
 				</td>
 			</tr>
-		<!-- BEGINELSE -->
+		{% else %}
 			<tr>
-				<td class="row1" style="text-align: center;">{L_NO_MODULES}</td>
+				<td class="row1" style="text-align: center;">{{ lang('NO_MODULES') }}</td>
 			</tr>
-		<!-- END modules_top -->
+		{% endfor %}
 	</table>
 	<p class="quick">
-		<input class="button2" name="add[top]" type="submit" value="{L_ADD_MODULE}" />
+		<input class="button2" name="add[top]" type="submit" value="{{ lang('ADD_MODULE') }}" />
 	</p>
 
 	<table style="background-color: transparent; border: none; padding: 0px; margin: 0px;">
@@ -80,88 +80,88 @@
 				<td style="width: 20%; font-size: 100%; line-height: 100%; padding: 0px; margin: 0px;">
 	<table class="portal-modules-overview">
 		<tr>
-				<th>{L_MODULE_POS_LEFT}</th>
+				<th>{{ lang('MODULE_POS_LEFT') }}</th>
 		</tr>
-		<!-- BEGIN modules_left -->
-			<!-- IF not modules_left.MODULE_ENABLED --><tr class="row3"><!-- ELSEIF modules_left.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		{% for modules_left in loops.modules_left %}
+			{% if not modules_left.MODULE_ENABLED %}<tr class="row3">{% elseif modules_left.S_ROW_COUNT is even %}<tr class="row1">{% else %}<tr class="row2">{% endif %}
 				<td>
-					{modules_left.MODULE_IMAGE} {modules_left.MODULE_NAME}<br />
+					{{ modules_left.MODULE_IMAGE }} {{ modules_left.MODULE_NAME }}<br />
 					<br />
-					<span<!-- IF not modules_left.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_UP_DISABLED}&nbsp;</span>
-					<span<!-- IF modules_left.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_left.U_MOVE_UP}" data-ajax="b3p_move_module_up">{ICON_MOVE_UP}</a>&nbsp;</span>
-					<!-- IF modules_left.U_MOVE_RIGHT --><a href="{modules_left.U_MOVE_RIGHT}"><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{ICON_MOVE_LEFT}<!-- ELSE -->{ICON_MOVE_RIGHT}<!-- ENDIF --></a><!-- ELSE --><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{ICON_MOVE_LEFT_DISABLED}<!-- ELSE -->{ICON_MOVE_RIGHT_DISABLED}<!-- ENDIF --><!-- ENDIF -->&nbsp;
-					<a href="{modules_left.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_left.U_DELETE}" data-ajax="b3p_delete_module">{ICON_DELETE}</a><br />
-					<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{ICON_MOVE_RIGHT_DISABLED}<!-- ELSE -->{ICON_MOVE_LEFT_DISABLED}<!-- ENDIF -->&nbsp;
-					<span<!-- IF not modules_left.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_DOWN_DISABLED}&nbsp;</span>
-					<span<!-- IF modules_left.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_left.U_MOVE_DOWN}" data-ajax="b3p_move_module_down">{ICON_MOVE_DOWN}</a></span>
+					<span{% if not modules_left.S_FIRST_ROW %} style="display: none;"{% endif %}>{{ ICON_MOVE_UP_DISABLED }}&nbsp;</span>
+					<span{% if modules_left.S_FIRST_ROW %} style="display: none;"{% endif %}><a href="{{ modules_left.U_MOVE_UP }}" data-ajax="b3p_move_module_up">{{ ICON_MOVE_UP }}</a>&nbsp;</span>
+					{% if modules_left.U_MOVE_RIGHT %}<a href="{{ modules_left.U_MOVE_RIGHT }}">{% if S_CONTENT_DIRECTION eq 'rtl' %}{{ ICON_MOVE_LEFT }}{% else %}{{ ICON_MOVE_RIGHT }}{% endif %}</a>{% else %}{% if S_CONTENT_DIRECTION eq 'rtl' %}{{ ICON_MOVE_LEFT_DISABLED }}{% else %}{{ ICON_MOVE_RIGHT_DISABLED }}{% endif %}{% endif %}&nbsp;
+					<a href="{{ modules_left.U_EDIT }}">{{ ICON_EDIT }}</a> <a href="{{ modules_left.U_DELETE }}" data-ajax="b3p_delete_module">{{ ICON_DELETE }}</a><br />
+					{% if S_CONTENT_DIRECTION eq 'rtl' %}{{ ICON_MOVE_RIGHT_DISABLED }}{% else %}{{ ICON_MOVE_LEFT_DISABLED }}{% endif %}&nbsp;
+					<span{% if not modules_left.S_LAST_ROW %} style="display: none;"{% endif %}>{{ ICON_MOVE_DOWN_DISABLED }}&nbsp;</span>
+					<span{% if modules_left.S_LAST_ROW %} style="display: none;"{% endif %}><a href="{{ modules_left.U_MOVE_DOWN }}" data-ajax="b3p_move_module_down">{{ ICON_MOVE_DOWN }}</a></span>
 				</td>
 			</tr>
-		<!-- BEGINELSE -->
+		{% else %}
 			<tr>
-				<td class="row1" style="text-align: center;">{L_NO_MODULES}</td>
+				<td class="row1" style="text-align: center;">{{ lang('NO_MODULES') }}</td>
 			</tr>
-		<!-- END modules_left -->
+		{% endfor %}
 	</table>
 	<p class="quick">
-		<input class="button2" name="add[left]" type="submit" value="{L_ADD_MODULE}" />
+		<input class="button2" name="add[left]" type="submit" value="{{ lang('ADD_MODULE') }}" />
 	</p>
 				</td>
 				<td style="font-size: 100%; line-height: 100%; padding: 0 12px;">
 	<table class="portal-modules-overview">
 		<tr>
-				<th style="text-align: center;">{L_MODULE_POS_CENTER}</th>
+				<th style="text-align: center;">{{ lang('MODULE_POS_CENTER') }}</th>
 		</tr>
-		<!-- BEGIN modules_center -->
-			<!-- IF not modules_center.MODULE_ENABLED --><tr class="row3"><!-- ELSEIF modules_center.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		{% for modules_center in loops.modules_center %}
+			{% if not modules_center.MODULE_ENABLED %}<tr class="row3">{% elseif modules_center.S_ROW_COUNT is even %}<tr class="row1">{% else %}<tr class="row2">{% endif %}
 				<td>
-					{modules_center.MODULE_IMAGE} {modules_center.MODULE_NAME}<br />
+					{{ modules_center.MODULE_IMAGE }} {{ modules_center.MODULE_NAME }}<br />
 					<br />
-					<span<!-- IF not modules_center.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_UP_DISABLED}&nbsp;</span>
-					<span<!-- IF modules_center.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_center.U_MOVE_UP}" data-ajax="b3p_move_module_up">{ICON_MOVE_UP}</a>&nbsp;</span>
-					<!-- IF modules_center.U_MOVE_RIGHT --><a href="{modules_center.U_MOVE_RIGHT}">{ICON_MOVE_RIGHT}</a><!-- ELSE -->{ICON_MOVE_RIGHT_DISABLED}<!-- ENDIF -->&nbsp;
-					<a href="{modules_center.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_center.U_DELETE}" data-ajax="b3p_delete_module">{ICON_DELETE}</a><br />
-					<!-- IF modules_center.U_MOVE_LEFT --><a href="{modules_center.U_MOVE_LEFT}">{ICON_MOVE_LEFT}</a><!-- ELSE -->{ICON_MOVE_LEFT_DISABLED}<!-- ENDIF -->&nbsp;
-					<span<!-- IF not modules_center.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_DOWN_DISABLED}&nbsp;</span>
-					<span<!-- IF modules_center.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_center.U_MOVE_DOWN}" data-ajax="b3p_move_module_down">{ICON_MOVE_DOWN}</a></span>
+					<span{% if not modules_center.S_FIRST_ROW %} style="display: none;"{% endif %}>{{ ICON_MOVE_UP_DISABLED }}&nbsp;</span>
+					<span{% if modules_center.S_FIRST_ROW %} style="display: none;"{% endif %}><a href="{{ modules_center.U_MOVE_UP }}" data-ajax="b3p_move_module_up">{{ ICON_MOVE_UP }}</a>&nbsp;</span>
+					{% if modules_center.U_MOVE_RIGHT %}<a href="{{ modules_center.U_MOVE_RIGHT }}">{{ ICON_MOVE_RIGHT }}</a>{% else %}{{ ICON_MOVE_RIGHT_DISABLED }}{% endif %}&nbsp;
+					<a href="{{ modules_center.U_EDIT }}">{{ ICON_EDIT }}</a> <a href="{{ modules_center.U_DELETE }}" data-ajax="b3p_delete_module">{{ ICON_DELETE }}</a><br />
+					{% if modules_center.U_MOVE_LEFT %}<a href="{{ modules_center.U_MOVE_LEFT }}">{{ ICON_MOVE_LEFT }}</a>{% else %}{{ ICON_MOVE_LEFT_DISABLED }}{% endif %}&nbsp;
+					<span{% if not modules_center.S_LAST_ROW %} style="display: none;"{% endif %}>{{ ICON_MOVE_DOWN_DISABLED }}&nbsp;</span>
+					<span{% if modules_center.S_LAST_ROW %} style="display: none;"{% endif %}><a href="{{ modules_center.U_MOVE_DOWN }}" data-ajax="b3p_move_module_down">{{ ICON_MOVE_DOWN }}</a></span>
 				</td>
 			</tr>
-		<!-- BEGINELSE -->
+		{% else %}
 			<tr>
-				<td class="row1" style="text-align: center;">{L_NO_MODULES}</td>
+				<td class="row1" style="text-align: center;">{{ lang('NO_MODULES') }}</td>
 			</tr>
-		<!-- END modules_center -->
+		{% endfor %}
 	</table>
 	<p class="quick">
-		<input class="button2" name="add[center]" type="submit" value="{L_ADD_MODULE}" />
+		<input class="button2" name="add[center]" type="submit" value="{{ lang('ADD_MODULE') }}" />
 	</p>
 				</td>
 				<td style="width: 20%; font-size: 100%; line-height: 100%; padding: 0px;">
 	<table class="portal-modules-overview">
 		<tr>
-				<th>{L_MODULE_POS_RIGHT}</th>
+				<th>{{ lang('MODULE_POS_RIGHT') }}</th>
 		</tr>
-		<!-- BEGIN modules_right -->
-			<!-- IF not modules_right.MODULE_ENABLED --><tr class="row3"><!-- ELSEIF modules_right.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		{% for modules_right in loops.modules_right %}
+			{% if not modules_right.MODULE_ENABLED %}<tr class="row3">{% elseif modules_right.S_ROW_COUNT is even %}<tr class="row1">{% else %}<tr class="row2">{% endif %}
 				<td>
-					{modules_right.MODULE_IMAGE} {modules_right.MODULE_NAME}<br />
+					{{ modules_right.MODULE_IMAGE }} {{ modules_right.MODULE_NAME }}<br />
 					<br />
-					<span<!-- IF not modules_right.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_UP_DISABLED}&nbsp;</span>
-					<span<!-- IF modules_right.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_right.U_MOVE_UP}" data-ajax="b3p_move_module_up">{ICON_MOVE_UP}</a>&nbsp;</span>
-					<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{ICON_MOVE_LEFT_DISABLED}<!-- ELSE -->{ICON_MOVE_RIGHT_DISABLED}<!-- ENDIF -->&nbsp;
-					<a href="{modules_right.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_right.U_DELETE}" data-ajax="b3p_delete_module">{ICON_DELETE}</a><br />
-					<!-- IF modules_right.U_MOVE_LEFT --><a href="{modules_right.U_MOVE_LEFT}"><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{ICON_MOVE_RIGHT}<!-- ELSE -->{ICON_MOVE_LEFT}<!-- ENDIF --></a><!-- ELSE --><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{ICON_MOVE_RIGHT_DISABLED}<!-- ELSE -->{ICON_MOVE_LEFT_DISABLED}<!-- ENDIF --><!-- ENDIF -->&nbsp;
-					<span<!-- IF not modules_right.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_DOWN_DISABLED}&nbsp;</span>
-					<span<!-- IF modules_right.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_right.U_MOVE_DOWN}" data-ajax="b3p_move_module_down">{ICON_MOVE_DOWN}</a></span>
+					<span{% if not modules_right.S_FIRST_ROW %} style="display: none;"{% endif %}>{{ ICON_MOVE_UP_DISABLED }}&nbsp;</span>
+					<span{% if modules_right.S_FIRST_ROW %} style="display: none;"{% endif %}><a href="{{ modules_right.U_MOVE_UP }}" data-ajax="b3p_move_module_up">{{ ICON_MOVE_UP }}</a>&nbsp;</span>
+					{% if S_CONTENT_DIRECTION eq 'rtl' %}{{ ICON_MOVE_LEFT_DISABLED }}{% else %}{{ ICON_MOVE_RIGHT_DISABLED }}{% endif %}&nbsp;
+					<a href="{{ modules_right.U_EDIT }}">{{ ICON_EDIT }}</a> <a href="{{ modules_right.U_DELETE }}" data-ajax="b3p_delete_module">{{ ICON_DELETE }}</a><br />
+					{% if modules_right.U_MOVE_LEFT %}<a href="{{ modules_right.U_MOVE_LEFT }}">{% if S_CONTENT_DIRECTION eq 'rtl' %}{{ ICON_MOVE_RIGHT }}{% else %}{{ ICON_MOVE_LEFT }}{% endif %}</a>{% else %}{% if S_CONTENT_DIRECTION eq 'rtl' %}{{ ICON_MOVE_RIGHT_DISABLED }}{% else %}{{ ICON_MOVE_LEFT_DISABLED }}{% endif %}{% endif %}&nbsp;
+					<span{% if not modules_right.S_LAST_ROW %} style="display: none;"{% endif %}>{{ ICON_MOVE_DOWN_DISABLED }}&nbsp;</span>
+					<span{% if modules_right.S_LAST_ROW %} style="display: none;"{% endif %}><a href="{{ modules_right.U_MOVE_DOWN }}" data-ajax="b3p_move_module_down">{{ ICON_MOVE_DOWN }}</a></span>
 				</td>
 			</tr>
-		<!-- BEGINELSE -->
+		{% else %}
 			<tr>
-				<td class="row1" style="text-align: center;">{L_NO_MODULES}</td>
+				<td class="row1" style="text-align: center;">{{ lang('NO_MODULES') }}</td>
 			</tr>
-		<!-- END modules_right -->
+		{% endfor %}
 	</table>
 	<p class="quick">
-		<input class="button2" name="add[right]" type="submit" value="{L_ADD_MODULE}" />
+		<input class="button2" name="add[right]" type="submit" value="{{ lang('ADD_MODULE') }}" />
 	</p>
 				</td>
 		</tr>
@@ -170,37 +170,37 @@
 
 	<table class="portal-modules-overview">
 		<tr>
-			<th style="text-align: center;">{L_MODULE_POS_BOTTOM}</th>
+			<th style="text-align: center;">{{ lang('MODULE_POS_BOTTOM') }}</th>
 		</tr>
-		<!-- BEGIN modules_bottom -->
-			<!-- IF not modules_bottom.MODULE_ENABLED --><tr class="row3"><!-- ELSEIF modules_bottom.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		{% for modules_bottom in loops.modules_bottom %}
+			{% if not modules_bottom.MODULE_ENABLED %}<tr class="row3">{% elseif modules_bottom.S_ROW_COUNT is even %}<tr class="row1">{% else %}<tr class="row2">{% endif %}
 				<td>
-					{modules_bottom.MODULE_IMAGE} {modules_bottom.MODULE_NAME}<br />
+					{{ modules_bottom.MODULE_IMAGE }} {{ modules_bottom.MODULE_NAME }}<br />
 					<br />
-					<span<!-- IF not modules_bottom.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_UP_DISABLED}&nbsp;</span>
-					<span<!-- IF modules_bottom.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_bottom.U_MOVE_UP}" data-ajax="b3p_move_module_up">{ICON_MOVE_UP}</a>&nbsp;</span>
-					<span<!-- IF not modules_bottom.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_DOWN_DISABLED}&nbsp;</span>
-					<span<!-- IF modules_bottom.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_bottom.U_MOVE_DOWN}" data-ajax="b3p_move_module_down">{ICON_MOVE_DOWN}</a>&nbsp;</span>
-					<a href="{modules_bottom.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_bottom.U_DELETE}" data-ajax="b3p_delete_module">{ICON_DELETE}</a>
+					<span{% if not modules_bottom.S_FIRST_ROW %} style="display: none;"{% endif %}>{{ ICON_MOVE_UP_DISABLED }}&nbsp;</span>
+					<span{% if modules_bottom.S_FIRST_ROW %} style="display: none;"{% endif %}><a href="{{ modules_bottom.U_MOVE_UP }}" data-ajax="b3p_move_module_up">{{ ICON_MOVE_UP }}</a>&nbsp;</span>
+					<span{% if not modules_bottom.S_LAST_ROW %} style="display: none;"{% endif %}>{{ ICON_MOVE_DOWN_DISABLED }}&nbsp;</span>
+					<span{% if modules_bottom.S_LAST_ROW %} style="display: none;"{% endif %}><a href="{{ modules_bottom.U_MOVE_DOWN }}" data-ajax="b3p_move_module_down">{{ ICON_MOVE_DOWN }}</a>&nbsp;</span>
+					<a href="{{ modules_bottom.U_EDIT }}">{{ ICON_EDIT }}</a> <a href="{{ modules_bottom.U_DELETE }}" data-ajax="b3p_delete_module">{{ ICON_DELETE }}</a>
 				</td>
 			</tr>
-		<!-- BEGINELSE -->
+		{% else %}
 			<tr>
-				<td class="row1" style="text-align: center;">{L_NO_MODULES}</td>
+				<td class="row1" style="text-align: center;">{{ lang('NO_MODULES') }}</td>
 			</tr>
-		<!-- END modules_bottom -->
+		{% endfor %}
 	</table>
 	<p class="quick">
-		<input class="button2" name="add[bottom]" type="submit" value="{L_ADD_MODULE}" />
+		<input class="button2" name="add[bottom]" type="submit" value="{{ lang('ADD_MODULE') }}" />
 	</p>
 
-	{S_FORM_TOKEN}
+	{{ S_FORM_TOKEN }}
 	</fieldset>
 </form>
 
-<!-- ENDIF -->
+{% endif %}
 
-<!-- INCLUDEJS portal/ajax.js -->
+{% INCLUDEJS 'portal/ajax.js' %}
 
-<!-- INCLUDE overall_footer.html -->
-<!-- ENDIF -->
\ No newline at end of file
+{% INCLUDE 'overall_footer.html' %}
+{% endif %}
\ No newline at end of file
diff --git a/adm/style/portal/acp_portal_welcome.html b/adm/style/portal/acp_portal_welcome.html
index cc4037ca..632e1995 100644
--- a/adm/style/portal/acp_portal_welcome.html
+++ b/adm/style/portal/acp_portal_welcome.html
@@ -1,6 +1,6 @@
-<!-- INCLUDE overall_header.html -->
+{% INCLUDE 'overall_header.html' %}
 
-<!-- INCLUDEJS portal/acp_editor.js -->
+{% INCLUDEJS 'portal/acp_editor.js' %}
 <script type="text/javascript">
 // <![CDATA[
 /**
@@ -29,28 +29,28 @@ var upload = false;
 
 // Define the bbCode tags
 var bbcode = new Array();
-var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
+var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'{% for custom_tags in loops.custom_tags %}, {{ custom_tags.BBCODE_NAME }}{% endfor %});
 var imageTag = false;
 
 // Helpline messages
 var help_line = {
-	b: '{LA_BBCODE_B_HELP}',
-	i: '{LA_BBCODE_I_HELP}',
-	u: '{LA_BBCODE_U_HELP}',
-	q: '{LA_BBCODE_Q_HELP}',
-	c: '{LA_BBCODE_C_HELP}',
-	l: '{LA_BBCODE_L_HELP}',
-	o: '{LA_BBCODE_O_HELP}',
-	p: '{LA_BBCODE_P_HELP}',
-	w: '{LA_BBCODE_W_HELP}',
-	a: '{LA_BBCODE_A_HELP}',
-	s: '{LA_BBCODE_S_HELP}',
-	f: '{LA_BBCODE_F_HELP}',
-	e: '{LA_BBCODE_E_HELP}',
-	d: '{LA_BBCODE_D_HELP}'
-	<!-- BEGIN custom_tags -->
-		,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
-	<!-- END custom_tags -->
+	b: '{{ lang('BBCODE_B_HELP')|escape('js') }}',
+	i: '{{ lang('BBCODE_I_HELP')|escape('js') }}',
+	u: '{{ lang('BBCODE_U_HELP')|escape('js') }}',
+	q: '{{ lang('BBCODE_Q_HELP')|escape('js') }}',
+	c: '{{ lang('BBCODE_C_HELP')|escape('js') }}',
+	l: '{{ lang('BBCODE_L_HELP')|escape('js') }}',
+	o: '{{ lang('BBCODE_O_HELP')|escape('js') }}',
+	p: '{{ lang('BBCODE_P_HELP')|escape('js') }}',
+	w: '{{ lang('BBCODE_W_HELP')|escape('js') }}',
+	a: '{{ lang('BBCODE_A_HELP')|escape('js') }}',
+	s: '{{ lang('BBCODE_S_HELP')|escape('js') }}',
+	f: '{{ lang('BBCODE_F_HELP')|escape('js') }}',
+	e: '{{ lang('BBCODE_E_HELP')|escape('js') }}',
+	d: '{{ lang('BBCODE_D_HELP')|escape('js') }}'
+	{% for custom_tags in loops.custom_tags %}
+		,cb_{{ custom_tags.BBCODE_ID }}: '{{ custom_tags.A_BBCODE_HELPLINE }}'
+	{% endfor %}
 }
 
 function change_palette()
@@ -60,11 +60,11 @@ function change_palette()
 
 	if (e.style.display == 'block')
 	{
-		document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
+		document.getElementById('bbpalette').value = '{{ lang('FONT_COLOR_HIDE')|escape('js') }}';
 	}
 	else
 	{
-		document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
+		document.getElementById('bbpalette').value = '{{ lang('FONT_COLOR')|escape('js') }}';
 	}
 }
 
@@ -73,91 +73,91 @@ function change_palette()
 
 <a name="maincontent"></a>
 
-<h1>{L_TITLE}</h1>
+<h1>{{ lang('TITLE') }}</h1>
 
-<p>{L_TITLE_EXPLAIN}</p>
+<p>{{ lang('TITLE_EXPLAIN') }}</p>
 
-<!-- IF S_ERROR -->
+{% if S_ERROR %}
 	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
+		<h3>{{ lang('WARNING') }}</h3>
+		<p>{{ ERROR_MSG }}</p>
 	</div>
-<!-- ENDIF -->
-<form id="acp_portal_config" method="post" action="{B3P_U_ACTION}">
-<!-- IF SHOW_MODULE_OPTIONS -->
+{% endif %}
+<form id="acp_portal_config" method="post" action="{{ B3P_U_ACTION }}">
+{% if SHOW_MODULE_OPTIONS %}
 		<fieldset>
-			<legend>{L_MODULE_OPTIONS}</legend>
+			<legend>{{ lang('MODULE_OPTIONS') }}</legend>
 			<dl>
-				<dt><label for="module_name">{L_MODULE_NAME}{L_COLON}</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
-				<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
+				<dt><label for="module_name">{{ lang('MODULE_NAME') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_NAME_EXP') }}</span></dt>
+				<dd><input id="module_name" type="text" value="{{ MODULE_NAME }}" name="module_name" maxlength="255" size="64" /></dd>
 			</dl>
-			<!-- IF MODULE_SHOW_IMAGE -->
+			{% if MODULE_SHOW_IMAGE %}
 			<dl>
-				<dt><label for="module_image">{L_MODULE_IMAGE}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
-				<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
-				<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
+				<dt><label for="module_image">{{ lang('MODULE_IMAGE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_EXP') }}</span></dt>
+				<dd><input id="module_image" type="text" value="{{ MODULE_IMAGE }}" name="module_image" maxlength="255" size="64" /></dd>
+				{% if MODULE_IMAGE_SRC %}<dd><img src="{{ MODULE_IMAGE_SRC }}" alt="{{ lang('MODULE_IMAGE') }}" /></dd>{% endif %}
 			</dl>
-			<!-- IF MODULE_IMAGE_SRC -->
+			{% if MODULE_IMAGE_SRC %}
 			<dl>
-				<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
-				<dd><input id="module_img_width" type="text" value="{MODULE_IMAGE_WIDTH}" name="module_img_width" maxlength="3" size="3" />px</dd>
+				<dt><label for="module_img_width">{{ lang('MODULE_IMAGE_WIDTH') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_WIDTH_EXP') }}</span></dt>
+				<dd><input id="module_img_width" type="number" value="{{ MODULE_IMAGE_WIDTH }}" name="module_img_width" min="1" />&nbsp;{{ lang('PIXEL') }}</dd>
 			</dl>
 			<dl>
-				<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
-				<dd><input id="module_img_height" type="text" value="{MODULE_IMAGE_HEIGHT}" name="module_img_height" maxlength="3" size="3" />px</dd>
+				<dt><label for="module_img_height">{{ lang('MODULE_IMAGE_HEIGHT') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_IMAGE_HEIGHT_EXP') }}</span></dt>
+				<dd><input id="module_img_height" type="number" value="{{ MODULE_IMAGE_HEIGHT }}" name="module_img_height" min="1" />&nbsp;{{ lang('PIXEL') }}</dd>
 			</dl>
-			<!-- ENDIF -->
+			{% endif %}
 			<dl>
-				<dt><label for="module_fa">{L_MODULE_FA}{L_COLON}</label><br/><span>{L_MODULE_FA_EXP}</span></dt>
-				<dd><input id="module_fa" type="text" value="{MODULE_FA}" name="module_fa" maxlength="255" size="64"/></dd>
+				<dt><label for="module_fa">{{ lang('MODULE_FA') }}{{ lang('COLON') }}</label><br/><span>{{ lang('MODULE_FA_EXP') }}</span></dt>
+				<dd><input id="module_fa" type="text" value="{{ MODULE_FA }}" name="module_fa" maxlength="255" size="64"/></dd>
 			</dl>
 			<dl>
-				<dt><label for="module_fa_size">{L_MODULE_FA_SIZE}{L_COLON}</label><br/><span>{L_MODULE_FA_SIZE_EXP}</span></dt>
-				<dd><input id="module_fa_size" type="number" value="{MODULE_FA_SIZE}" name="module_fa_size" min="1"/>&nbsp;{L_PIXEL}</dd>
+				<dt><label for="module_fa_size">{{ lang('MODULE_FA_SIZE') }}{{ lang('COLON') }}</label><br/><span>{{ lang('MODULE_FA_SIZE_EXP') }}</span></dt>
+				<dd><input id="module_fa_size" type="number" value="{{ MODULE_FA_SIZE }}" name="module_fa_size" min="1"/>&nbsp;{{ lang('PIXEL') }}</dd>
 			</dl>
-			<!-- ENDIF -->
+			{% endif %}
 			<dl>
-				<dt><label for="module_reset">{L_MODULE_RESET}{L_COLON}</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
+				<dt><label for="module_reset">{{ lang('MODULE_RESET') }}{{ lang('COLON') }}</label><br /><span style="color: #BC2A4D;">{{ lang('MODULE_RESET_EXP') }}</span></dt>
 				<dd><input id="module_reset" type="checkbox" value="1" name="module_reset" /></dd>
 			</dl>
 			<dl>
-				<dt><label for="module_status">{L_MODULE_STATUS}{L_COLON}</label></dt>
+				<dt><label for="module_status">{{ lang('MODULE_STATUS') }}{{ lang('COLON') }}</label></dt>
 				<dd>
-					<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-					<label><input type="radio" class="radio" name="module_status" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+					<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"{% if MODULE_ENABLED %} checked="checked"{% endif %} />{{ lang('YES') }}</label>
+					<label><input type="radio" class="radio" name="module_status" value="0"{% if not MODULE_ENABLED %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
 				</dd>
 			</dl>
-			<!-- IF .permission_setting -->
+			{% if loops.permission_setting|length %}
 			<dl>
-				<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}{L_COLON}</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
+				<dt><label for="permission-setting">{{ lang('MODULE_PERMISSIONS') }}{{ lang('COLON') }}</label><br /><span>{{ lang('MODULE_PERMISSIONS_EXP') }}</span></dt>
 				<dd>
 					<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
-						<!-- BEGIN permission_setting -->
-						<option value="{permission_setting.GROUP_ID}"<!-- IF permission_setting.SELECTED -->selected="selected"<!-- ENDIF -->>{permission_setting.GROUP_NAME}</option>
-						<!-- END permission_setting -->
+						{% for permission_setting in loops.permission_setting %}
+						<option value="{{ permission_setting.GROUP_ID }}"{% if permission_setting.SELECTED %}selected="selected"{% endif %}>{{ permission_setting.GROUP_NAME }}</option>
+						{% endfor %}
 					</select>
 				</dd>
 			</dl>
-			<!-- ENDIF -->
+			{% endif %}
 		</fieldset>
-<!-- ENDIF -->
-		<!-- IF S_PREVIEW -->
+{% endif %}
+		{% if S_PREVIEW %}
 		<fieldset>
-			<legend>{L_ACP_PORTAL_WELCOME_PREVIEW}</legend>
+			<legend>{{ lang('ACP_PORTAL_WELCOME_PREVIEW') }}</legend>
 		<dl>
 			<dt style="border: none; width: 100%;">
-				{PREVIEW_TEXT}
+				{{ PREVIEW_TEXT }}
 			</dt>
 		</dl>
 		</fieldset>
-		<!-- ENDIF -->
+		{% endif %}
 		<fieldset>
-			<legend>{L_PORTAL_WELCOME}</legend>
+			<legend>{{ lang('PORTAL_WELCOME') }}</legend>
 		<dl><dt style="display: none;"></dt>
 			<dd>
 				<div id="colour_palette" style="display: none;">
 					<dl style="clear: left;">
-						<dt style="border: none;"><label>{L_FONT_COLOR}{L_COLON}</label></dt>
+						<dt style="border: none;"><label>{{ lang('FONT_COLOR') }}{{ lang('COLON') }}</label></dt>
 						<dd></dd>
 					</dl>
 					<dl style="clear: left;">
@@ -166,63 +166,63 @@ function change_palette()
 					</dl>
 				</div>
 				<div id="format-buttons">
-					<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
-					<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
-					<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
-					<!-- IF S_BBCODE_QUOTE -->
-						<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
-					<!-- ENDIF -->
-					<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
-					<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
-					<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
-					<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
-					<!-- IF S_BBCODE_IMG -->
-						<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
-					<!-- ENDIF -->
-					<!-- IF S_LINKS_ALLOWED -->
-						<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
-					<!-- ENDIF -->
-					<!-- IF S_BBCODE_FLASH -->
-						<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
-					<!-- ENDIF -->
-					<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
-						<option value="50">{L_FONT_TINY}</option>
-						<option value="85">{L_FONT_SMALL}</option>
-						<option value="100" selected="selected">{L_FONT_NORMAL}</option>
-						<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
-							<option value="150">{L_FONT_LARGE}</option>
-							<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
-								<option value="200">{L_FONT_HUGE}</option>
-							<!-- ENDIF -->
-						<!-- ENDIF -->
+					<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{{ lang('BBCODE_B_HELP') }}" />
+					<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{{ lang('BBCODE_I_HELP') }}" />
+					<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{{ lang('BBCODE_U_HELP') }}" />
+					{% if S_BBCODE_QUOTE %}
+						<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{{ lang('BBCODE_Q_HELP') }}" />
+					{% endif %}
+					<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{{ lang('BBCODE_C_HELP') }}" />
+					<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{{ lang('BBCODE_L_HELP') }}" />
+					<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{{ lang('BBCODE_O_HELP') }}" />
+					<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{{ lang('BBCODE_LISTITEM_HELP') }}" />
+					{% if S_BBCODE_IMG %}
+						<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{{ lang('BBCODE_P_HELP') }}" />
+					{% endif %}
+					{% if S_LINKS_ALLOWED %}
+						<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{{ lang('BBCODE_W_HELP') }}" />
+					{% endif %}
+					{% if S_BBCODE_FLASH %}
+						<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{{ lang('BBCODE_D_HELP') }}" />
+					{% endif %}
+					<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{{ lang('BBCODE_F_HELP') }}">
+						<option value="50">{{ lang('FONT_TINY') }}</option>
+						<option value="85">{{ lang('FONT_SMALL') }}</option>
+						<option value="100" selected="selected">{{ lang('FONT_NORMAL') }}</option>
+						{% if not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 %}
+							<option value="150">{{ lang('FONT_LARGE') }}</option>
+							{% if not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 %}
+								<option value="200">{{ lang('FONT_HUGE') }}</option>
+							{% endif %}
+						{% endif %}
 					</select>
-					<input type="button" class="button2" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" />
-					<!-- BEGIN custom_tags -->
-						<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
-					<!-- END custom_tags -->
+					<input type="button" class="button2" name="bbpalette" id="bbpalette" value="{{ lang('FONT_COLOR') }}" onclick="change_palette();" title="{{ lang('BBCODE_S_HELP') }}" />
+					{% for custom_tags in loops.custom_tags %}
+						<input type="button" class="button2" name="addbbcode{{ custom_tags.BBCODE_ID }}" value="{{ custom_tags.BBCODE_TAG }}" onclick="bbstyle({{ custom_tags.BBCODE_ID }})" title="{{ custom_tags.BBCODE_HELPLINE }}" />
+					{% endfor %}
 				</div>
 			</dd>
 		</dl>
 		<dl>
 			<dt>
-				<label for="welcome_message">{L_ACP_PORTAL_WELCOME_MESSAGE}{L_COLON}</label><br />
-				<span>{L_ACP_PORTAL_WELCOME_MESSAGE_EXP}</span>
+				<label for="welcome_message">{{ lang('ACP_PORTAL_WELCOME_MESSAGE') }}{{ lang('COLON') }}</label><br />
+				<span>{{ lang('ACP_PORTAL_WELCOME_MESSAGE_EXP') }}</span>
 			</dt>
-			<dd><textarea name="welcome_message" id="welcome_message" cols="6" rows="12">{WELCOME_MESSAGE}</textarea></dd>
+			<dd><textarea name="welcome_message" id="welcome_message" cols="6" rows="12">{{ WELCOME_MESSAGE }}</textarea></dd>
 		</dl>
-<!-- IF S_AUTH -->
-	<!-- BEGIN auth_tpl -->
-		{auth_tpl.TPL}
-	<!-- END auth_tpl -->
-<!-- ENDIF -->
+{% if S_AUTH %}
+	{% for auth_tpl in loops.auth_tpl %}
+		{{ auth_tpl.TPL }}
+	{% endfor %}
+{% endif %}
 
 	<p class="submit-buttons">
-		<input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" />&nbsp;
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button2" type="submit" id="preview" name="preview" value="{{ lang('PREVIEW') }}" />&nbsp;
+		<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
 	</p>
-	{S_FORM_TOKEN}
+	{{ S_FORM_TOKEN }}
 </fieldset>
 </form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+{% INCLUDE 'overall_footer.html' %}
\ No newline at end of file