diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8c54a9..ca299c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.5.0] - 2017-12-28
+
+### Added
+- Added support for `istring` type highlighting
+- Added support for `fn` (`function` alias) highlighting
+
+### Fixed
+- Fixed highlighting for function begins with `$` (e.g. `$fetch`)
+- Fixed highlighting for begins with `$` (e.g. `$Resource`)
+
 ## [1.4.1] - 2017-12-28
 
 ### Changed
@@ -60,7 +70,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
  - Initial stable release
 
-[Unreleased]: https://github.com/zephir-lang/zephir-vscode/compare/v1.4.1...HEAD
+[Unreleased]: https://github.com/zephir-lang/zephir-vscode/compare/v1.5.0...HEAD
+[1.5.0]: https://github.com/zephir-lang/zephir-vscode/compare/v1.4.1...v1.5.0
 [1.4.1]: https://github.com/zephir-lang/zephir-vscode/compare/v1.4.0...v1.4.1
 [1.4.0]: https://github.com/zephir-lang/zephir-vscode/compare/v1.3.3...v1.4.0
 [1.3.3]: https://github.com/zephir-lang/zephir-vscode/compare/v1.3.2...v1.3.3
diff --git a/package.json b/package.json
index ea733ef..ebbe8a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zephir",
-    "version": "1.4.1",
+    "version": "1.5.0",
     "displayName": "Zephir for VSCode",
     "description": "Zephir Language syntax highlighting and snippets for VSCode.",
     "author": "Zephir Team",
diff --git a/syntaxes/zephir.tmLanguage.json b/syntaxes/zephir.tmLanguage.json
index 3400549..680ffb6 100644
--- a/syntaxes/zephir.tmLanguage.json
+++ b/syntaxes/zephir.tmLanguage.json
@@ -7,7 +7,7 @@
 	],
 	"name": "Zephir",
 	"comment": "Zephir Language support for VSCode",
-	"version": "1.4.1",
+	"version": "1.5.0",
 	"fileTypes": [
         "zep"
     ],
@@ -218,7 +218,7 @@
 			]
 		},
 		{
-			"begin": "(?i)^\\s*(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)",
+			"begin": "(?i)^\\s*(?:(abstract|final)\\s+)?(class)\\s+\\$?([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.${1:/downcase}.zephir"
@@ -343,7 +343,7 @@
 			"include": "#switch_statement"
 		},
 		{
-			"match": "\\s*\\b(break|case|continue|declare|default|die|let|var|do|else(if)?|exit|for|fetch|reverse|likely|unlikely|if|return|match|switch|use|while|loop|yield)\\b",
+			"match": "\\s*(?<!\\$)\\b(break|case|continue|declare|default|die|let|var|do|else(if)?|exit|for|fetch|reverse|(?:un)?likely|if|return|match|switch|use|while|loop|yield)\\b",
 			"captures": {
 				"1": {
 					"name": "keyword.control.${1:/downcase}.zephir"
@@ -419,7 +419,7 @@
 			"include": "#function-definition"
 		},
 		{
-			"begin": "((?:(?:final|abstract|public|private|protected|static|inline|internal|scoped|deprecated)\\s+)*)(function)\\s+(?i:(__(?:call|construct|debugInfo|destruct|get|set|isset|unset|toString|clone|set_state|sleep|wakeup|autoload|invoke|callStatic))|([a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*))\\s*(\\()",
+			"begin": "((?:(?:final|abstract|public|private|protected|static|inline|internal|scoped|deprecated)\\s+)*)(function|fn)\\s+\\$?(?i:([a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*))\\s*(\\()",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -433,12 +433,9 @@
 					"name": "storage.type.function.zephir"
 				},
 				"3": {
-					"name": "support.function.magic.zephir"
-				},
-				"4": {
 					"name": "entity.name.function.zephir"
 				},
-				"5": {
+				"4": {
 					"name": "punctuation.definition.parameters.begin.bracket.round.zephir"
 				}
 			},
@@ -520,7 +517,7 @@
 			]
 		},
 		{
-			"match": "(?i)(\\()\\s*(array|real|double|float|int(?:eger)?|bool(?:ean)?|string|u?long|u?char|void|unsigned|null|object|binary|unset)\\s*(\\))",
+			"match": "(?i)(\\()\\s*(array|real|double|float|int(?:eger)?|bool(?:ean)?|i?string|u?long|u?char|void|unsigned|null|object|binary|unset)\\s*(\\))",
 			"captures": {
 				"1": {
 					"name": "punctuation.definition.storage-type.begin.bracket.round.zephir"
@@ -870,7 +867,7 @@
 			]
 		},
 		"function-definition": {
-			"begin": "(?i)\\b(function)\\s*(?=\\()",
+			"begin": "(?i)\\b(function|fn)\\s*(?=\\()",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.type.function.zephir"