diff --git a/ILSpy.XSharpLanguage/XSharpHighlightingTokenWriter.prg b/ILSpy.XSharpLanguage/XSharpHighlightingTokenWriter.prg
index c2d5c5b..675f53b 100644
--- a/ILSpy.XSharpLanguage/XSharpHighlightingTokenWriter.prg
+++ b/ILSpy.XSharpLanguage/XSharpHighlightingTokenWriter.prg
@@ -400,9 +400,9 @@ BEGIN NAMESPACE ILSpy.XSharpLanguage
 				CASE "destructor"
 					color := structureKeywordsColor
 				CASE "where"
-					color := queryKeywordsColor
+					color := structureKeywordsColor
 				CASE "in"
-					color := queryKeywordsColor
+					color := structureKeywordsColor
 				CASE "as"
 				CASE "astype"
 				CASE "local"
@@ -419,7 +419,7 @@ BEGIN NAMESPACE ILSpy.XSharpLanguage
 				CASE "finally"
 					color := exceptionKeywordsColor
 				CASE "when"
-					color := queryKeywordsColor
+					color := structureKeywordsColor
 				CASE "get"
 				CASE "set"
 				CASE "add"
@@ -464,7 +464,7 @@ BEGIN NAMESPACE ILSpy.XSharpLanguage
 				CASE "join"
 				CASE "on"
 				CASE "equals"
-					color := queryKeywordsColor
+					color := structureKeywordsColor
 				CASE "explicit"
 				CASE "implicit"
 				CASE "operator"
diff --git a/ILSpy.XSharpLanguage/XSharpOutputVisitor.prg b/ILSpy.XSharpLanguage/XSharpOutputVisitor.prg
index 2d0842d..21c4c20 100644
--- a/ILSpy.XSharpLanguage/XSharpOutputVisitor.prg
+++ b/ILSpy.XSharpLanguage/XSharpOutputVisitor.prg
@@ -2150,6 +2150,7 @@ BEGIN NAMESPACE ILSpy.XSharpLanguage
 					//
 					IF (! (clause IS QueryContinuationClause))
 						//
+						SELF:WriteToken( ";" )
 						SELF:NewLine()
 					ENDIF
 				ENDIF