diff --git a/grammars/Handlebars.json b/grammars/Handlebars.json
index 39a14df..c5822e1 100644
--- a/grammars/Handlebars.json
+++ b/grammars/Handlebars.json
@@ -448,7 +448,7 @@
             ]
         },
         "block_helper": {
-            "begin": "(\\{\\{~?\\#)([-a-zA-Z0-9_\\./>]+)\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*",
+            "begin": "(\\{\\{~?\\#)([-a-zA-Zа-яА-Я0-9_\\./>]+)\\s?(@?[-a-zA-Zа-яА-Я0-9_\\./]+)*\\s?(@?[-a-zA-Zа-яА-Я0-9_\\./]+)*\\s?(@?[-a-zA-Zа-яА-Я0-9_\\./]+)*",
             "end": "(~?\\}\\})",
             "name": "meta.function.block.start.handlebars",
             "endCaptures": {
@@ -542,7 +542,7 @@
             "match": "\\\\\""
         },
         "partial_and_var": {
-            "begin": "(\\{\\{~?\\{*(>|!<)*)\\s*(@?[-a-zA-Z0-9_\\./]+)*",
+            "begin": "(\\{\\{~?\\{*(>|!<)*)\\s*(@?[-a-zA-Zа-яА-Я0-9_\\./]+)*",
             "end": "(~?\\}\\}\\}*)",
             "name": "meta.function.inline.other.handlebars",
             "beginCaptures": {
@@ -568,7 +568,7 @@
             ]
         },
         "handlebars_attribute_name": {
-            "begin": "\\b([-a-zA-Z0-9_\\.]+)\\b=",
+            "begin": "\\b([-a-zA-Zа-яА-Я0-9_\\.]+)\\b=",
             "captures": {
                 "1": {
                     "name": "variable.parameter.handlebars"
@@ -578,7 +578,7 @@
             "name": "entity.other.attribute-name.handlebars"
         },
         "handlebars_attribute_value": {
-            "begin": "([-a-zA-Z0-9_\\./]+)\\b\\s*",
+            "begin": "([-a-zA-Zа-яА-Я0-9_\\./]+)\\b\\s*",
             "captures": {
                 "1": {
                     "name": "variable.parameter.handlebars"
@@ -606,7 +606,7 @@
             "patterns": [
                 {
                     "end": "(\\}\\})",
-                    "begin": "(\\{\\{!<)\\s([-a-zA-Z0-9_\\./]+)",
+                    "begin": "(\\{\\{!<)\\s([-a-zA-Zа-я0-9_\\./]+)",
                     "beginCaptures": {
                         "1": {
                             "name": "support.function.handlebars"
@@ -625,7 +625,7 @@
             ]
         },
         "else_token": {
-            "begin": "(\\{\\{~?else)(@?\\s(if)\\s([-a-zA-Z0-9_\\./]+))?",
+            "begin": "(\\{\\{~?else)(@?\\s(if)\\s([-a-zA-Zа-я0-9_\\./]+))?",
             "end": "(~?\\}\\}\\}*)",
             "name": "meta.function.inline.else.handlebars",
             "beginCaptures": {
diff --git a/grammars/Handlebars.tmLanguage b/grammars/Handlebars.tmLanguage
index 842cdb9..b063877 100644
--- a/grammars/Handlebars.tmLanguage
+++ b/grammars/Handlebars.tmLanguage
@@ -124,7 +124,7 @@
 		<key>block_helper</key>
 		<dict>
 			<key>begin</key>
-			<string>(\{\{~?\#)([-a-zA-Z0-9_\./&gt;]+)\s?(@?[-a-zA-Z0-9_\./]+)*\s?(@?[-a-zA-Z0-9_\./]+)*\s?(@?[-a-zA-Z0-9_\./]+)*</string>
+			<string>(\{\{~?\#)([-a-zA-Zа-яА-Я0-9_\./&gt;]+)\s?(@?[-a-zA-Zа-яА-Я0-9_\./]+)*\s?(@?[-a-zA-Zа-яА-Я0-9_\./]+)*\s?(@?[-a-zA-Zа-яА-Я0-9_\./]+)*</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -237,7 +237,7 @@
 		<key>else_token</key>
 		<dict>
 			<key>begin</key>
-			<string>(\{\{~?else)(@?\s(if)\s([-a-zA-Z0-9_\./]+))?</string>
+			<string>(\{\{~?else)(@?\s(if)\s([-a-zA-Zа-яА-Я0-9_\./]+))?</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -352,7 +352,7 @@
 			<array>
 				<dict>
 					<key>begin</key>
-					<string>(\{\{!&lt;)\s([-a-zA-Z0-9_\./]+)</string>
+					<string>(\{\{!&lt;)\s([-a-zA-Zа-яА-Я0-9_\./]+)</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
@@ -398,7 +398,7 @@
 		<key>handlebars_attribute_name</key>
 		<dict>
 			<key>begin</key>
-			<string>\b([-a-zA-Z0-9_\.]+)\b=</string>
+			<string>\b([-a-zA-Zа-яА-Я0-9_\.]+)\b=</string>
 			<key>captures</key>
 			<dict>
 				<key>1</key>
@@ -415,7 +415,7 @@
 		<key>handlebars_attribute_value</key>
 		<dict>
 			<key>begin</key>
-			<string>([-a-zA-Z0-9_\./]+)\b\s*</string>
+			<string>([-a-zA-Zа-яА-Я0-9_\./]+)\b\s*</string>
 			<key>captures</key>
 			<dict>
 				<key>1</key>
@@ -1014,7 +1014,7 @@
 		<key>partial_and_var</key>
 		<dict>
 			<key>begin</key>
-			<string>(\{\{~?\{*(&gt;|!&lt;)*)\s*(@?[-a-zA-Z0-9_\./]+)*</string>
+			<string>(\{\{~?\{*(&gt;|!&lt;)*)\s*(@?[-a-zA-Zа-яА-Я0-9_\./]+)*</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>