diff --git a/src/App/Project.hpp b/src/App/Project.hpp
index bdf3174..f9bdc03 100644
--- a/src/App/Project.hpp
+++ b/src/App/Project.hpp
@@ -12,5 +12,5 @@ constexpr auto Author = "psiberx";
 constexpr auto NameW = L"TweakXL";
 constexpr auto AuthorW = L"psiberx";
 
-constexpr auto Version = semver::from_string_noexcept("1.8.2").value();
+constexpr auto Version = semver::from_string_noexcept("1.8.3").value();
 }
diff --git a/src/App/Tweaks/Declarative/Yaml/YamlReader.Template.cpp b/src/App/Tweaks/Declarative/Yaml/YamlReader.Template.cpp
index f6ee59f..4b0d65f 100644
--- a/src/App/Tweaks/Declarative/Yaml/YamlReader.Template.cpp
+++ b/src/App/Tweaks/Declarative/Yaml/YamlReader.Template.cpp
@@ -133,6 +133,17 @@ void FormatNode(const YAML::Node& aNode, const InstanceData& aData)
         const auto markPos = value.find(AttrMark);
         if (markPos != std::string::npos)
         {
+            if (markPos == 0)
+            {
+                const auto attr = MakeKey(value.data() + 2, value.size() - 3);
+                const auto it = aData.find(attr);
+                if (it != aData.end())
+                {
+                    const_cast<YAML::Node&>(aNode) = it.value().node;
+                    return;
+                }
+            }
+
             auto node = YAML::Node(FormatString(value, aData));
             node.SetTag(aNode.Tag());
 
diff --git a/src/App/Version.rc b/src/App/Version.rc
index 002e59b..ba5ddc3 100644
--- a/src/App/Version.rc
+++ b/src/App/Version.rc
@@ -1,9 +1,9 @@
-#define VER_PRODUCTVERSION     1,8,2,0
-#define VER_FILEVERSION        1,8,2,2404042341
+#define VER_PRODUCTVERSION     1,8,3,0
+#define VER_FILEVERSION        1,8,3,2404061953
 
 #define VER_PRODUCTNAME_STR    "TweakXL\0"
-#define VER_PRODUCTVERSION_STR "1.8.2\0"
-#define VER_FILEVERSION_STR    "1.8.2.2404042341\0"
+#define VER_PRODUCTVERSION_STR "1.8.3\0"
+#define VER_FILEVERSION_STR    "1.8.3.2404061953\0"
 
 1 VERSIONINFO
 FILEVERSION     VER_FILEVERSION
diff --git a/xmake.lua b/xmake.lua
index 063d1e4..5b9efe1 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -1,7 +1,7 @@
 set_xmakever("2.5.9")
 
 set_project("TweakXL")
-set_version("1.8.2", {build = "%y%m%d%H%M"})
+set_version("1.8.3", {build = "%y%m%d%H%M"})
 
 set_arch("x64")
 set_languages("cxx2a")