diff --git a/inc/lib/gettext/gettext.inc b/inc/lib/gettext/gettext.inc
index cb21fea5..bfa6a482 100644
--- a/inc/lib/gettext/gettext.inc
+++ b/inc/lib/gettext/gettext.inc
@@ -88,18 +88,18 @@ function get_list_of_locales($locale) {
       if ($modifier) {
         if ($country) {
           if ($charset)
-            array_push($locale_names, "${lang}_$country.$charset@$modifier");
-          array_push($locale_names, "${lang}_$country@$modifier");
+            array_push($locale_names, "{$lang}_$country.$charset@$modifier");
+          array_push($locale_names, "{$lang}_$country@$modifier");
         } elseif ($charset)
-            array_push($locale_names, "${lang}.$charset@$modifier");
+            array_push($locale_names, "{$lang}.$charset@$modifier");
         array_push($locale_names, "$lang@$modifier");
       }
       if ($country) {
         if ($charset)
-          array_push($locale_names, "${lang}_$country.$charset");
-        array_push($locale_names, "${lang}_$country");
+          array_push($locale_names, "{$lang}_$country.$charset");
+        array_push($locale_names, "{$lang}_$country");
       } elseif ($charset)
-          array_push($locale_names, "${lang}.$charset");
+          array_push($locale_names, "{$lang}.$charset");
       array_push($locale_names, $lang);
     }
 
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 3fcc5504..35f12626 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1270,7 +1270,7 @@ function mod_move_reply($originBoard, $postID) {
         // trigger themes
         rebuildThemes('post', $targetBoard);
         // mod log
-        modLog("Moved post #${postID} to " . sprintf($config['board_abbreviation'], $targetBoard) . " (#${newID})", $originBoard);
+        modLog("Moved post #{$postID} to " . sprintf($config['board_abbreviation'], $targetBoard) . " (#{$newID})", $originBoard);
 
         // return to original board
         openBoard($originBoard);
@@ -1450,7 +1450,7 @@ function mod_move($originBoard, $postID) {
             }
         }
 
-        modLog("Moved thread #${postID} to " . sprintf($config['board_abbreviation'], $targetBoard) . " (#${newID})", $originBoard);
+        modLog("Moved thread #{$postID} to " . sprintf($config['board_abbreviation'], $targetBoard) . " (#{$newID})", $originBoard);
 
         // build new thread
         buildThread($newID);
@@ -1582,7 +1582,7 @@ function mod_merge($originBoard, $postID) {
 
             // trigger themes
             rebuildThemes('post', $targetBoard);
-            modLog("Merged thread with  #${sourceOp} to " . sprintf($config['board_abbreviation'], $targetBoard) . " (#${targetOp})", $originBoard);
+            modLog("Merged thread with  #{$sourceOp} to " . sprintf($config['board_abbreviation'], $targetBoard) . " (#{$targetOp})", $originBoard);
 
             // redirect
             header('Location: ?/' . sprintf($config['board_path'], $board['uri']) . $config['dir']['res'] . link_for($newpost) . '#' . $targetOp, true, $config['redirect_http']);
@@ -1707,7 +1707,7 @@ function mod_merge($originBoard, $postID) {
                 }
             }
 
-            modLog("Moved thread #${postID} to " . sprintf($config['board_abbreviation'], $targetBoard) . " (#${newID})", $originBoard);
+            modLog("Moved thread #{$postID} to " . sprintf($config['board_abbreviation'], $targetBoard) . " (#{$newID})", $originBoard);
 
             // build new thread
             buildThread($newID);
@@ -1741,7 +1741,7 @@ function mod_merge($originBoard, $postID) {
 
             // trigger themes
             rebuildThemes('post', $targetBoard);
-            modLog("Merged thread with  #${newID} to " . sprintf($config['board_abbreviation'], $targetBoard) . " (#${targetOp})", $targetBoard);
+            modLog("Merged thread with  #{$newID} to " . sprintf($config['board_abbreviation'], $targetBoard) . " (#{$targetOp})", $targetBoard);
 
             // redirect
             header('Location: ?/' . sprintf($config['board_path'], $board['uri']) . $config['dir']['res'] . link_for($newpost) . '#' . $targetOp, true, $config['redirect_http']);
@@ -1901,7 +1901,7 @@ function mod_ban_post(string $board, $delete, $post_num, $token = false) {
                 $dt = new DateTime("@$time");
                 $autotag = "";
                 $autotag .= $name . " " . $subject . " " . $dt->format('Y-m-d H:i:s')  . " No.". $post . "\r\n";
-                $autotag .= "/${board}/" . " " . $filehash .  " " . $filename ."\r\n";
+                $autotag .= "/{$board}/" . " " . $filehash .  " " . $filename ."\r\n";
                 $autotag .= $body . "\r\n";
                 $autotag = escape_markup_modifiers($autotag);
                 markup($autotag);
@@ -2015,7 +2015,7 @@ function mod_warning_post($board,$post, $token = false) {
                     $dt = new DateTime("@$time");
                     $autotag = "Post warned\r\n";
                     $autotag .= $name . " " . $subject . " " . $dt->format('Y-m-d H:i:s')  . " No.". $post . "\r\n";
-                    $autotag .= "/${board}/" . " " . $filehash .  " " . $filename ."\r\n";
+                    $autotag .= "/{$board}/" . " " . $filehash .  " " . $filename ."\r\n";
                     $autotag .= $body . "\r\n";
                     $autotag = escape_markup_modifiers($autotag);
                     markup($autotag);
@@ -2169,7 +2169,7 @@ function mod_delete($board, $post) {
             $dt = new DateTime("@$time");
             $autotag = "";
             $autotag .= $name . " " . $subject . " " . $dt->format('Y-m-d H:i:s')  . " No.". $post . "\r\n";
-            $autotag .= "/${board}/" . " " . $filehash .  " " . $filename ."\r\n";
+            $autotag .= "/{$board}/" . " " . $filehash .  " " . $filename ."\r\n";
             $autotag .= $body . "\r\n";
             $autotag = escape_markup_modifiers($autotag);
             markup($autotag);
@@ -2337,7 +2337,7 @@ function mod_deletebyip($boardName, $post, $global = false) {
                 $dt = new DateTime("@$time");
                 $autotag = "";
                 $autotag .= $name . " " . $subject . " " . $dt->format('Y-m-d H:i:s')  . " No.". $post['id'] . "\r\n";
-                $autotag .= "/${post['board']}/" . " " . $filehash .  " " . $filename ."\r\n";
+                $autotag .= "/{$post['board']}/" . " " . $filehash .  " " . $filename ."\r\n";
                 $autotag .= $body . "\r\n";
                 $autotag = escape_markup_modifiers($autotag);
                 markup($autotag);
diff --git a/inc/template.php b/inc/template.php
index 45596d18..9bc70221 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -60,7 +60,7 @@ function Element($templateFile, array $options) {
     }
 
     // Read the template file
-    if (@file_get_contents("{$config['dir']['template']}/${templateFile}")) {
+    if (@file_get_contents("{$config['dir']['template']}/{$templateFile}")) {
         $body = $twig->render($templateFile, $options);
 
         if ($config['minify_html'] && preg_match('/\.html$/', $templateFile)) {
@@ -69,7 +69,7 @@ function Element($templateFile, array $options) {
 
         return $body;
     } else {
-        throw new Exception("Template file '${templateFile}' does not exist or is empty in '{$config['dir']['template']}'!");
+        throw new Exception("Template file '{$templateFile}' does not exist or is empty in '{$config['dir']['template']}'!");
     }
 }