diff --git a/src/private/templates/assigner.latte b/src/private/templates/assigner.latte
index 086c0f6..35d7b56 100644
--- a/src/private/templates/assigner.latte
+++ b/src/private/templates/assigner.latte
@@ -1,6 +1,6 @@
 {extends "body.latte"}
-{var title = __get("ASSIGNER_TITLE")}
-{var navActiveIndex = 2}
+{var $title = __get("ASSIGNER_TITLE")}
+{var $navActiveIndex = 2}
 
 {block content}
 
diff --git a/src/private/templates/bans.latte b/src/private/templates/bans.latte
index 6f7de57..0bbc912 100644
--- a/src/private/templates/bans.latte
+++ b/src/private/templates/bans.latte
@@ -1,6 +1,6 @@
 {extends "body.latte"}
-{var title = __get("BANS_TITLE")}
-{var navActiveIndex = 3}
+{var $title = __get("BANS_TITLE")}
+{var $navActiveIndex = 3}
 
 {block content}
 
diff --git a/src/private/templates/body.latte b/src/private/templates/body.latte
index 4a61d0a..3dbee32 100644
--- a/src/private/templates/body.latte
+++ b/src/private/templates/body.latte
@@ -191,7 +191,7 @@ $navActiveIndex = isset($navActiveIndex) ? (int) $navActiveIndex : 0;
 <!-- Moment.js 2.22.2 -->
 {$tplutils::includeScript("{cdnjs}/moment.js/2.24.0/moment.min.js", "sha256-4iQZ6BVL4qNKlQ27TExEhBN1HFPvAvAMbFavKKosSWQ=")}
 
-{var momentjslang = __get("MOMENTJS_LANG", [], true)}
+{var $momentjslang = __get("MOMENTJS_LANG", [], true)}
 {if $momentjslang !== null && $momentjslang !== "en-us"}
     {$tplutils::includeScript("{cdnjs}/moment.js/2.24.0/locale/$momentjslang.js")}
     <script>
diff --git a/src/private/templates/bootstrap-theme-test.latte b/src/private/templates/bootstrap-theme-test.latte
index a583429..1fc8f7f 100644
--- a/src/private/templates/bootstrap-theme-test.latte
+++ b/src/private/templates/bootstrap-theme-test.latte
@@ -1,5 +1,5 @@
 {extends "body.latte"}
-{var title = "TESTING"}
+{var $title = "TESTING"}
 
 {block content}
     <div class="card card-accent">
diff --git a/src/private/templates/faq.latte b/src/private/templates/faq.latte
index 039073b..30b97c0 100644
--- a/src/private/templates/faq.latte
+++ b/src/private/templates/faq.latte
@@ -1,6 +1,6 @@
 {extends "body.latte"}
-{var title = __get("FAQ_TITLE")}
-{var navActiveIndex = 5}
+{var $title = __get("FAQ_TITLE")}
+{var $navActiveIndex = 5}
 
 {block content}
     <div class="card card-accent">
diff --git a/src/private/templates/index.latte b/src/private/templates/index.latte
index 6f62009..69b265b 100644
--- a/src/private/templates/index.latte
+++ b/src/private/templates/index.latte
@@ -1,5 +1,5 @@
 {extends "body.latte"}
-{var title = __get("HOME_TITLE")}
+{var $title = __get("HOME_TITLE")}
 
 {block content}
     <div class="card card-titleblock card-accent">
diff --git a/src/private/templates/sidebar.latte b/src/private/templates/sidebar.latte
index c56e5c5..be5d0fa 100644
--- a/src/private/templates/sidebar.latte
+++ b/src/private/templates/sidebar.latte
@@ -45,7 +45,7 @@
 </div>
 
 {ifset $adminStatus}
-    {var offlineHiddenByDefault = $config["adminstatus_offlinehiddenbydefault"]}
+    {var $offlineHiddenByDefault = $config["adminstatus_offlinehiddenbydefault"]}
     <div class="card card-accent">
         <div class="card-header d-flex justify-content-between align-items-center">
         <span>
diff --git a/src/private/templates/simple-page.latte b/src/private/templates/simple-page.latte
index 563562e..0930b2f 100644
--- a/src/private/templates/simple-page.latte
+++ b/src/private/templates/simple-page.latte
@@ -1,5 +1,5 @@
 {extends "body.latte"}
-{var title = $pagetitle}
+{var $title = $pagetitle}
 
 {block content}
 <div class="card card-accent">
diff --git a/src/private/templates/utils/modal-login.latte b/src/private/templates/utils/modal-login.latte
index 92f9f69..fb4d315 100644
--- a/src/private/templates/utils/modal-login.latte
+++ b/src/private/templates/utils/modal-login.latte
@@ -43,7 +43,7 @@
                     <!-- <p class="mb-0">Still not working? Try <a href="#">other login methods</a></p> -->
 
                     <!-- Show a small IP debug -->
-                    {var utils = Wruczek\TSWebsite\Utils\Utils::class}
+                    {var $utils = Wruczek\TSWebsite\Utils\Utils::class}
                     <span class="loginDebugInfo"
                           data-toggle="tooltip"
                           data-html="true" title="Debug info: Your IP<br>Raw: {$utils::getClientIp(false)}<br>CF: {$utils::getClientIp(true)}">
diff --git a/src/private/templates/viewer.latte b/src/private/templates/viewer.latte
index 9d1ccbe..9766531 100644
--- a/src/private/templates/viewer.latte
+++ b/src/private/templates/viewer.latte
@@ -1,6 +1,6 @@
 {extends "body.latte"}
-{var title = __get("VIEWER_TITLE")}
-{var navActiveIndex = 1}
+{var $title = __get("VIEWER_TITLE")}
+{var $navActiveIndex = 1}
 
 {block content}
 <div class="card card-accent">