diff --git a/CHANGELOG.md b/CHANGELOG.md
index c860dff..b7a7138 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to the "nav-cside-color-theme" extension will be documented in this file.
 
+## [0.0.4] - 2017-12-04
+- Fix unwanted syntax coloring in comment lines
+- Fix missing colors in trigger parameters
+- Change text selection background to original C/Side blue
+- Reorganized theme.json
+
 ## [0.0.3] - 2017-12-04
 - Updated package information
 
diff --git a/bin/nav-cside-color-theme-0.0.3.vsix b/bin/nav-cside-color-theme-0.0.4.vsix
similarity index 92%
rename from bin/nav-cside-color-theme-0.0.3.vsix
rename to bin/nav-cside-color-theme-0.0.4.vsix
index 4e5707f..5f4285a 100644
Binary files a/bin/nav-cside-color-theme-0.0.3.vsix and b/bin/nav-cside-color-theme-0.0.4.vsix differ
diff --git a/package.json b/package.json
index 9558d4c..3b9dacc 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "nav-cside-color-theme",
     "displayName": "Dynamics NAV C/Side Theme",
     "description": "A VSCode color theme inspired by Microsoft Dynamics NAV C/Side Editor",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "publisher": "martonsagi",
     "license": "MIT",
     "author": {
diff --git a/syntax/alsyntax.extended.json b/syntax/alsyntax.extended.json
index b17e912..8217f09 100644
--- a/syntax/alsyntax.extended.json
+++ b/syntax/alsyntax.extended.json
@@ -20,7 +20,7 @@
 					"name": "entity.name.trigger.al"
 				}
 			},
-			"match": "\\b(?i:(trigger|procedure))\\b\\s+(\\w+(\\.\\w+)?)(\\(.*?\\))?\\s*",
+			"match": "\\b(?i:(trigger|procedure))\\b\\s+(\\w+(\\.\\w+)?)\\s*",
 			"name": "meta.trigger.al"
 		},		
 		{
@@ -33,7 +33,13 @@
 				}
 			},
 			"name": "entity.trigger.call.al"
-		}		
+		},
+		{
+			"begin": ".*",
+			"end": ".*",
+			"match": "([\/]+.*)",
+			"name": "comment.line.al.restored"
+		}
 	],
 	"scopeName": "al.extended"
 }
\ No newline at end of file
diff --git a/themes/nav-cside-color-theme.json b/themes/nav-cside-color-theme.json
index 7e2f0b4..e53659d 100644
--- a/themes/nav-cside-color-theme.json
+++ b/themes/nav-cside-color-theme.json
@@ -38,7 +38,8 @@
 		"titleBar.border": "#e1e4e8",
 		"notification.background": "#54a3ff",
 		"statusBar.debuggingBackground": "#fafbfc",
-		"statusBar.debuggingForeground": "#24292e"
+		"statusBar.debuggingForeground": "#24292e",
+		"editor.selectionBackground": "#99C9EF"
 	},
 	"tokenColors": [
 		{
@@ -78,92 +79,6 @@
 				"foreground": "#005cc5"
 			}
 		},
-		{
-			"scope": [
-				"markup.fenced_code",
-				"markup.inline"
-			],
-			"settings": {
-				"foreground": "#6a737d"
-			}
-		},
-		{
-			"scope": "string",
-			"settings": {
-				"foreground": "#032f62"
-			}
-		},
-		{
-			"scope": [
-				"constant.numeric",
-				"constant.language",
-				"variable.language.this",
-				"variable.other.class",
-				"variable.other.constant",
-				"meta.property-name",
-				"meta.property-value",
-				"support"
-			],
-			"settings": {
-				"foreground": "#005cc5"
-			}
-		},
-		{
-			"scope": [
-				"keyword",
-				"storage.modifier",
-				"storage.type",
-				"support.function.node",
-				"support.type.property-name.json",
-				"punctuation.separator.key-value",
-				"punctuation.definition.template-expression"
-			],
-			"settings": {
-				"foreground": "#d73a49"
-			}
-		},
-		{
-			"scope": "variable.parameter.function",
-			"settings": {
-				"foreground": "#E27F2D"
-			}
-		},
-		{
-			"scope": [
-				"keyword.operator.accessor",
-				"meta.group.braces.round.function.arguments",
-				"meta.template.expression"
-			],
-			"settings": {
-				"foreground": "#24292eff"
-			}
-		},
-		{
-			"scope": [
-				"entity.name.type",
-				"entity.other.inherited-class",
-				"meta.function-call",
-				"meta.instance.constructor",
-				"entity.other.attribute-name",
-				"entity.name.function"
-			],
-			"settings": {
-				"foreground": "#6f42c1"
-			}
-		},
-		{
-			"scope": [
-				"entity.name.tag",
-				"string.quoted",
-				"string.regexp",
-				"string.interpolated",
-				"string.template",
-				"keyword.other.template"
-			],
-			"settings": {
-				"foreground": "#dd0000"
-			}
-		},
 		{
 			"scope": "token.info-token",
 			"settings": {
@@ -188,12 +103,6 @@
 				"foreground": "#800080"
 			}
 		},
-		{
-			"scope": "comment",
-			"settings": {
-				"foreground": "#008000"
-			}
-		},
 		{
 			"scope": "string",
 			"settings": {
@@ -201,43 +110,44 @@
 			}
 		},
 		{
-			"scope": "keyword",
+			"scope": [
+				"keyword",
+				"entity.name.type.al",
+				"constant.boolean.al"
+			],
 			"settings": {
 				"foreground": "#0000FF"
 			}
 		},
 		{
-			"scope": ["entity.name.trigger.al"],
+			"scope": [
+				"entity.name.trigger.al", 
+				"entity.trigger.call1"
+			],
 			"settings": {
 				"foreground": "#000080",
 				"fontStyle": "bold"
 			}
 		},
 		{
-			"scope": ["entity.name.type.al"],
+			"scope": "constant.boolean.al",
 			"settings": {
-				"foreground": "#0000FF",
-				"fontStyle": ""
-			}
-		},
-		{
-			"scope": ["entity.trigger.call1"],
-			"settings": {
-				"foreground": "#000080",
-				"fontStyle": "bold"
+				"fontStyle": "italic"
 			}
 		},
 		{
-			"scope": ["constant.boolean.al"],
+			"scope": "constant.numeric",
 			"settings": {
-				"foreground": "#0000FF",
-				"fontStyle": "italic"
+				"foreground": "#FF00FF"
 			}
 		},
 		{
-			"scope": "constant.numeric",
+			"scope": [
+				"comment", 
+				"comment.line.al.restored"
+			],
 			"settings": {
-				"foreground": "#FF00FF"
+				"foreground": "#008000"
 			}
 		}
 	]