diff --git a/files/events/templates/music.html b/files/events/templates/music.html
index 52bb866bf..00805d218 100644
--- a/files/events/templates/music.html
+++ b/files/events/templates/music.html
@@ -1,7 +1,7 @@
 {% if not (v and v.poor) and (not g.event_v or g.event_v.event_music) and not (sub and sub.name == 'music') %}
 	{% if not song %}
 		{% set path = "assets/media/event/music" %}
-		{% set song = "/" + path + "/" + listdir('files/' + path)|random() + '?v=45' %}
+		{% set song = "/" ~ path ~ "/" ~ listdir('files/' ~ path)|random() ~ '?v=45' %}
 	{% endif %}
 	<script>
 		const audio = new Audio("{{song}}");
diff --git a/files/events/templates/sidebar_rDrama.html b/files/events/templates/sidebar_rDrama.html
index 37836a415..afa13b30a 100644
--- a/files/events/templates/sidebar_rDrama.html
+++ b/files/events/templates/sidebar_rDrama.html
@@ -4,8 +4,8 @@
 		{% set image = sub.sidebar_url %}
 	{% else %}
 		{% set sidebar_path = "assets/images/event/sidebar" %}
-		{% set selected_image = listdir('files/' + sidebar_path)|random() %}
-		{% set image = "/" + sidebar_path + "/" + selected_image + '?v=45' %}
+		{% set selected_image = listdir('files/' ~ sidebar_path)|random() %}
+		{% set image = "/" ~ sidebar_path ~ "/" ~ selected_image ~ '?v=45' %}
 	{% endif %}
 
 	{% if request.path != '/sidebar' %}
diff --git a/files/templates/default.html b/files/templates/default.html
index b1aea8d25..ba65a4df7 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -38,8 +38,8 @@
 		</div>
 		{% block sidebar %}
 			{% if has_sidebar and (home or p) %}
-				{% set sidebar = "sidebar_" + SITE_NAME + ".html" %}
-				{% include sidebar if not EVENT_SIDEBAR else 'event/' + sidebar %}
+				{% set sidebar = "sidebar_" ~ SITE_NAME ~ ".html" %}
+				{% include sidebar if not EVENT_SIDEBAR else 'event/' ~ sidebar %}
 			{% endif %}
 		{% endblock %}
 	</div>
diff --git a/files/templates/login/sign_up.html b/files/templates/login/sign_up.html
index 29b7106e6..b06ec5340 100644
--- a/files/templates/login/sign_up.html
+++ b/files/templates/login/sign_up.html
@@ -13,8 +13,8 @@
 
 {% set login_namespace = namespace() %}
 {% if ref_user %}
-	{% set login_namespace.authtitle = '@' + ref_user.username + ' has invited you!' %}
-	{% set login_namespace.authtext = 'Looks like someone wants you to join ' + SITE_NAME + '.' %}
+	{% set login_namespace.authtitle = '@' ~ ref_user.username ~ ' has invited you!' %}
+	{% set login_namespace.authtext = 'Looks like someone wants you to join ' ~ SITE_NAME ~ '.' %}
 {% elif not site_settings['login_required'] %}
 	{% set login_namespace.authtitle = "Create your account." %}
 	{% set login_namespace.authtext = "No email address required." %}
diff --git a/files/templates/login/sign_up_failed_ref.html b/files/templates/login/sign_up_failed_ref.html
index b6174316b..231870600 100644
--- a/files/templates/login/sign_up_failed_ref.html
+++ b/files/templates/login/sign_up_failed_ref.html
@@ -11,7 +11,7 @@
 {% block authtext %}Send this link to a friend instead :){% endblock %}
 {% block content %}
 <label>Referral code</label>
-{% set link = SITE_FULL + "/signup?ref=" + request.values.get('ref') %}
+{% set link = SITE_FULL ~ "/signup?ref=" ~ request.values.get('ref') %}
 <input autocomplete="off" type="text" class="form-control copy-link" readonly value="{{link}}" data-clipboard-text="{{link}}">
 <div class="text-center text-muted text-small mt-5 mb-3">
 	Already have an account? <a href="/login{{'?redirect='+redirect if redirect else ''}}" class="font-weight-bold toggle-login">Log in</a>
diff --git a/files/templates/sidebar_PCM.html b/files/templates/sidebar_PCM.html
index f962b2e04..10f071c7e 100644
--- a/files/templates/sidebar_PCM.html
+++ b/files/templates/sidebar_PCM.html
@@ -3,7 +3,7 @@
 	{% if sub %}
 		{% set image=sub.sidebar_url %}
 	{% else %}
-		{# set image='/i/' + SITE_NAME + '/sidebar.webp?v=3009' #}
+		{# set image='/i/' ~ SITE_NAME ~ '/sidebar.webp?v=3009' #}
 	{% endif %}
 	
 	{% if request.path != '/sidebar' and image %}
@@ -48,7 +48,7 @@
 	<a rel="nofollow noopener" class="btn btn-primary btn-block" href="https://imgur.com/a/2wDZddF">PCM Shitposter Cutouts (2/?)</a>
 
 	<div class="sidebar--rules sidebar--rules--pcm">
-		{% set rules = "rules_" + SITE_NAME + ".html" %}
+		{% set rules = "rules_" ~ SITE_NAME ~ ".html" %}
 		{% include rules %}
 	</div>
 </div>
diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html
index 4b77ab367..9160a4375 100644
--- a/files/templates/sidebar_WPD.html
+++ b/files/templates/sidebar_WPD.html
@@ -3,7 +3,7 @@
 	{%- if v -%}
 		{%- set art_image = macros.random_image("sidebar") -%}
 	{%- else -%}
-		{%- set art_image = '/i/' + SITE_NAME + '/sidebar.webp?v=3000' -%}
+		{%- set art_image = '/i/' ~ SITE_NAME ~ '/sidebar.webp?v=3000' -%}
 	{%- endif -%}
 
 	{% if request.path != '/sidebar' %}
@@ -65,7 +65,7 @@
 	</div>
 
 	<div class="sidebar--rules sidebar--rules--wpd">
-		{% set rules = "rules_" + SITE_NAME + ".html" %}
+		{% set rules = "rules_" ~ SITE_NAME ~ ".html" %}
 		{% include rules %}
 	</div>
 </div>
diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html
index afa849dcd..9e07f432f 100644
--- a/files/templates/sidebar_rDrama.html
+++ b/files/templates/sidebar_rDrama.html
@@ -54,7 +54,7 @@
 		{%- endif %}
 
 		<div class="sidebar--rules sidebar--rules--rdrama">
-			{% set rules = "rules_" + SITE_NAME + ".html" %}
+			{% set rules = "rules_" ~ SITE_NAME ~ ".html" %}
 			{% include rules %}
 		</div>
 	{% endif %}
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index 2aef93606..8e7ed5819 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -11,7 +11,7 @@
 {% endmacro -%}
 
 {%- macro live_banner() -%}
-	{% set path = "files/assets/images/" + SITE_NAME %}
+	{% set path = "files/assets/images/" ~ SITE_NAME %}
 	{%- if not v and os_path.exists(path + "/cached.webp") -%}
 		{{ 'cached.webp' | asset_siteimg -}}
 	{% elif os_path.exists(path + "/banners") -%}
@@ -22,7 +22,7 @@
 {%- endmacro -%}
 
 {%- macro random_image(assetdir) -%}
-	{% set path = "assets/images/" + SITE_NAME + "/" + assetdir  -%}
+	{% set path = "assets/images/" ~ SITE_NAME ~ "/" ~ assetdir  -%}
 	{{- "/" + path + "/" + listdir('files/' + path)|random() + '?v=45' }}
 {%- endmacro -%}