Fixed 'Bug 11110 - SQL syntax highlighting broken'.

5 files changed, 174 insertions, 135 deletions

diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/SqlSyntaxMode.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/SqlSyntaxMode.xml
index 7872b3d0e6..a5991b9882 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/SqlSyntaxMode.xml
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/SqlSyntaxMode.xml
@@ -25,32 +25,38 @@
  
 <SyntaxMode name = "Sql" mimeTypes="text/x-sql" ignorecase="true">
 
-	<EolSpan color = "comment" rule="Comment" tagColor="comment.tag">-</EolSpan>
+	<EolSpan color = "Comment(Line)" rule="Comment" tagColor="comment.tag">-</EolSpan>
 	
-	<Span color = "comment.block" rule="Comment" tagColor="comment.tag.block">
-		<Begin>/*</Begin>

-		<End>*/</End>

+	<Span color = "Comment(Block)" rule="Comment" tagColor="comment.tag.block">
+		<Begin>/*</Begin>
+
+		<End>*/</End>
+
 	</Span>
 	
-	<Span color = "string" rule="String" stopateol = "true" escape='\"'>
+	<Span color = "String" rule="String" stopateol = "true" escape='\"'>
 		<Begin>"</Begin>
 		<End>"</End>
 	</Span>
 	
-	<Span color = "string" rule="String" stopateol = "true" escape='\"'>
+	<Span color = "String" rule="String" stopateol = "true" escape='\"'>
 		<Begin>'</Begin>
 		<End>'</End>
 	</Span>
 	
-	<Keywords color = "keyword.access">
+	<Keywords color = "Keyword(Access)">
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.operator">
-		<Word>+</Word>

-		<Word>-</Word>

-		<Word>=</Word>

+	<Keywords ignorecase="true" color = "Keyword(Operator)">
+		<Word>+</Word>
+
+		<Word>-</Word>
+
+		<Word>=</Word>
+
 		<Word>AND</Word>
-		<Word>ON</Word>

+		<Word>ON</Word>
+
 		<Word>OR</Word>
 		<Word>IN</Word>
 		<Word>NOT</Word>
@@ -67,11 +73,15 @@
 		
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.selection">
-		<Word>SELECT</Word>

-		<Word>FROM</Word>

-		<Word>WHERE</Word>

-		<Word>INNER JOIN</Word>

+	<Keywords ignorecase="true" color = "Keyword(Selection)">
+		<Word>SELECT</Word>
+
+		<Word>FROM</Word>
+
+		<Word>WHERE</Word>
+
+		<Word>INNER JOIN</Word>
+
 		<Word>LEFT JOIN</Word>
 		<Word>RIGHT JOIN</Word>
 		<Word>LEFT OUTER JOIN</Word>
@@ -92,34 +102,39 @@
 		<Word>EXISTS</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.iteration">
+	<Keywords ignorecase="true" color = "Keyword(Iteration)">
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.jump">
-		<Word>BREAK</Word>

+	<Keywords ignorecase="true" color = "Keyword(Jump)">
+		<Word>BREAK</Word>
+
 		<Word>RETURN</Word>
-		<Word>RETURNS</Word>

+		<Word>RETURNS</Word>
+
 	</Keywords>
 	
-	<Keywords color = "keyword.context">
+	<Keywords color = "Keyword(Context)">
 	</Keywords>
 	
-	<Keywords color = "keyword.exceptions">
+	<Keywords color = "Keyword(Exception)">
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "constant.language">

-		<Word>TRUE</Word>

+	<Keywords ignorecase="true" color = "Keyword(Constants)">
+
+		<Word>TRUE</Word>
+
 		<Word>FALSE</Word>
 		<Word>NULL</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.modifier">
+	<Keywords ignorecase="true" color = "Keyword(Modifiers)">
 		<Word>UNSIGNED</Word>
 		<Word>NOT NULL</Word>
 		<Word>DEFAULT</Word>
 	</Keywords>
-	

-	<Keywords ignorecase="true" color = "keyword.type">
+	
+
+	<Keywords ignorecase="true" color = "Keyword(Type)">
 		<Word>SmallInt</Word>
 		<Word>Integer</Word>
 		<Word>BigInt</Word>
@@ -188,39 +203,50 @@
 		<Word>Boolean</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.declaration">

+	<Keywords ignorecase="true" color = "Keyword(Declaration)">
+
 		<Word>CREATE DATABASE</Word>
 		<Word>CREATE TABLE</Word>
 		<Word>CREATE FUNCTION</Word>
 		<Word>CREATE PROCEDURE</Word>
 		<Word>ALTER DATABASE</Word>
-		<Word>ALTER TABLE</Word>

+		<Word>ALTER TABLE</Word>
+
 		<Word>ALTER FUNCTION</Word>
 		<Word>ALTER PROCEDURE</Word>
 		<Word>VIEW</Word>
-		<Word>TRIGGER</Word>

+		<Word>TRIGGER</Word>
+
 		<Word>BEGIN</Word>
 		<Word>END</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.parameter">

-		<Word>DECLARE</Word>

-		<Word>IN</Word>

+	<Keywords ignorecase="true" color = "Keyword(Parameter)">
+
+		<Word>DECLARE</Word>
+
+		<Word>IN</Word>
+
 		<Word>OUT</Word>
-	</Keywords>

+	</Keywords>
+
+
+	<Rule name = "text.preprocessor">
 
-	<Rule name = "text.preprocessor">

-		<Keywords color="text.preprocessor.keyword">

-		</Keywords>

 	</Rule>
 	
 	<Rule name = "Comment">
-		<Keywords color="comment.keyword.todo" ignorecase="True">
-			<Word>TODO</Word>

-			<Word>FIXME</Word>

-			<Word>HACK</Word>

-			<Word>UNDONE</Word>

-		</Keywords>	

+		<Keywords color="Comment Tag" ignorecase="True">
+			<Word>TODO</Word>
+
+			<Word>FIXME</Word>
+
+			<Word>HACK</Word>
+
+			<Word>UNDONE</Word>
+
+		</Keywords>	
+
 	</Rule>
 	
 	<Rule name = "String">
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MySqlSyntaxMode.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MySqlSyntaxMode.xml
index 9171115b98..bb01d4493d 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MySqlSyntaxMode.xml
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MySqlSyntaxMode.xml
@@ -25,24 +25,26 @@
  
 <SyntaxMode name = "MySql" mimeTypes="text/x-mysql" ignorecase="true">
 
-	<EolSpan color = "comment" rule="Comment" tagColor="comment.tag">-</EolSpan>
+	<EolSpan color = "Comment(Line)" rule="Comment" tagColor="comment.tag">-</EolSpan>
 	
-	<Span color = "comment.block" rule="Comment" tagColor="comment.tag.block">
-		<Begin>/*</Begin>

-		<End>*/</End>

+	<Span color = "Comment(Block)" rule="Comment" tagColor="comment.tag.block">
+		<Begin>/*</Begin>
+
+		<End>*/</End>
+
 	</Span>
 	
-	<Span color = "string" rule="String" stopateol = "true" escape='\"'>
+	<Span color = "String" rule="String" stopateol = "true" escape='\"'>
 		<Begin>"</Begin>
 		<End>"</End>
 	</Span>
 	
-	<Span color = "string" rule="String" stopateol = "true" escape='\"'>
+	<Span color = "String" rule="String" stopateol = "true" escape='\"'>
 		<Begin>'</Begin>
 		<End>'</End>
 	</Span>
 	
-	<Keywords color = "keyword.misc">
+	<Keywords color = "Keyword(Other)">
 		<Word>ABS</Word>
 		<Word>ACOS</Word>
 		<Word>ADDDATE</Word>
@@ -252,11 +254,13 @@
 		<Word>YEARWEEK</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.operator">
+	<Keywords ignorecase="true" color = "Keyword(Operator)">
 		<Word>BEGIN</Word>
 		<Word>END</Word>
-		<Word>AND</Word>

-		<Word>&amp;&amp;</Word>

+		<Word>AND</Word>
+
+		<Word>&amp;&amp;</Word>
+
 		<Word>BETWEEN</Word>
 		<Word>Binary</Word>
 		<Word>&amp;</Word>
@@ -305,7 +309,7 @@
 		<Word>AS</Word>
 	</Keywords>
 	
-	<Keywords color = "keyword.declaration">
+	<Keywords color = "Keyword(Declaration)">
 		<Word>CREATE</Word>
 		<Word>DATABASE</Word>
 		<Word>SCHEMA</Word>
@@ -377,17 +381,21 @@
 		
 	</Keywords>
 	
-	<Keywords color = "keyword.parameter">
+	<Keywords color = "Keyword(Parameter)">
 		<Word>DECLARE</Word>
 		<Word>IN</Word>
 		<Word>OUT</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.selection">
-		<Word>SELECT</Word>

-		<Word>FROM</Word>

-		<Word>WHERE</Word>

-		<Word>INNER</Word>

+	<Keywords ignorecase="true" color = "Keyword(Selection)">
+		<Word>SELECT</Word>
+
+		<Word>FROM</Word>
+
+		<Word>WHERE</Word>
+
+		<Word>INNER</Word>
+
 		<Word>LEFT</Word>
 		<Word>RIGHT</Word>
 		<Word>CROSS</Word>
@@ -435,36 +443,41 @@
 		<Word>Having</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.iteration">
+	<Keywords ignorecase="true" color = "Keyword(Iteration)">
 		<Word>HANDLER</Word>
 		<Word>CALL</Word>
-		<Word>DO</Word>

+		<Word>DO</Word>
+
 		<Word>WHILE</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.jump">
-		<Word>BREAK</Word>

+	<Keywords ignorecase="true" color = "Keyword(Jump)">
+		<Word>BREAK</Word>
+
 		<Word>RETURN</Word>
 		<Word>RETURNS</Word>
 	</Keywords>
 	
-	<Keywords color = "keyword.context">
+	<Keywords color = "Keyword(Context)">
 	</Keywords>
 	
-	<Keywords color = "keyword.exceptions">
+	<Keywords color = "Keyword(Exception)">
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "constant.language">

-		<Word>TRUE</Word>

+	<Keywords ignorecase="true" color = "Keyword(Constants)">
+
+		<Word>TRUE</Word>
+
 		<Word>FALSE</Word>
 		<Word>NULL</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.modifier">
+	<Keywords ignorecase="true" color = "Keyword(Modifiers)">
 		<Word>DEFAULT</Word>
 	</Keywords>
-	

-	<Keywords ignorecase="true" color = "keyword.type">
+	
+
+	<Keywords ignorecase="true" color = "Keyword(Type)">
 		<Word>TinyInt</Word>
 		<Word>SmallInt</Word>
 		<Word>MediumInt</Word>
@@ -498,18 +511,22 @@
 		<Word>Set</Word>
 	</Keywords>
 
-	<Rule name = "text.preprocessor">

-		<Keywords color="text.preprocessor.keyword">

-		</Keywords>

+	<Rule name = "text.preprocessor">
+
 	</Rule>
 	
 	<Rule name = "Comment">
-		<Keywords color="comment.keyword.todo" ignorecase="True">
-			<Word>TODO</Word>

-			<Word>FIXME</Word>

-			<Word>HACK</Word>

-			<Word>UNDONE</Word>

-		</Keywords>	

+		<Keywords color="Comment Tag" ignorecase="True">
+			<Word>TODO</Word>
+
+			<Word>FIXME</Word>
+
+			<Word>HACK</Word>
+
+			<Word>UNDONE</Word>
+
+		</Keywords>	
+
 	</Rule>
 	
 	<Rule name = "String">
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSyntaxMode.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSyntaxMode.xml
index 3b391a5d09..295c35c19a 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSyntaxMode.xml
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSyntaxMode.xml
@@ -25,24 +25,24 @@
  
 <SyntaxMode name = "Npgsql" mimeTypes="text/x-npgsql" ignorecase="true">
 
-	<EolSpan color = "comment" rule="Comment" tagColor="comment.tag">-</EolSpan>
+	<EolSpan color = "Comment(Line)" rule="Comment" tagColor="comment.tag">-</EolSpan>
 	
-	<Span color = "comment.block" rule="Comment" tagColor="comment.tag.block">
+	<Span color = "Comment(Block)" rule="Comment" tagColor="comment.tag.block">
 		<Begin>/*</Begin>
 		<End>*/</End>
 	</Span>
 	
-	<Span color = "string" rule="String" stopateol = "true" escape='\"'>
+	<Span color = "String" rule="String" stopateol = "true" escape='\"'>
 		<Begin>"</Begin>
 		<End>"</End>
 	</Span>
 	
-	<Span color = "string" rule="String" stopateol = "true" escape='\"'>
+	<Span color = "String" rule="String" stopateol = "true" escape='\"'>
 		<Begin>'</Begin>
 		<End>'</End>
 	</Span>
 	
-	<Keywords color = "keyword.misc">
+	<Keywords color = "Keyword(Other)">
 		<Word>abs</Word>
 		<Word>cbrt</Word>
 		<Word>ceil</Word>
@@ -360,7 +360,7 @@
 	
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.operator">
+	<Keywords ignorecase="true" color = "Keyword(Operator)">
 		<Word>AND</Word>
 		<Word>OR</Word>
 		<Word>NOT</Word>
@@ -422,7 +422,7 @@
 		<Word>SOME</Word>
 	</Keywords>
 	
-	<Keywords color = "keyword.declaration">
+	<Keywords color = "Keyword(Declaration)">
 		<Word>CREATE</Word>
 		<Word>DATABASE</Word>
 		<Word>WITH</Word>
@@ -496,10 +496,10 @@
 		<Word>TEMP</Word>
 	</Keywords>
 	
-	<Keywords color = "keyword.parameter">
+	<Keywords color = "Keyword(Parameter)">
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.selection">
+	<Keywords ignorecase="true" color = "Keyword(Selection)">
 		<Word>SELECT</Word>
 		<Word>FROM</Word>
 		<Word>WHERE</Word>
@@ -529,32 +529,32 @@
 		<Word>Having</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.iteration">
+	<Keywords ignorecase="true" color = "Keyword(Iteration)">
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.jump">
+	<Keywords ignorecase="true" color = "Keyword(Jump)">
 		<Word>BREAK</Word>
 		<Word>RETURN</Word>
 		<Word>RETURNS</Word>
 	</Keywords>
 	
-	<Keywords color = "keyword.context">
+	<Keywords color = "Keyword(Context)">
 	</Keywords>
 	
-	<Keywords color = "keyword.exceptions">
+	<Keywords color = "Keyword(Exception)">
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "constant.language">
+	<Keywords ignorecase="true" color = "Keyword(Constants)">
 		<Word>TRUE</Word>
 		<Word>FALSE</Word>
 		<Word>NULL</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.modifier">
+	<Keywords ignorecase="true" color = "Keyword(Modifiers)">
 		<Word>DEFAULT</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.type">
+	<Keywords ignorecase="true" color = "Keyword(Type)">
 		<Word>bigint</Word>
 		<Word>bigserial</Word>
 		<Word>bit</Word>
@@ -594,12 +594,10 @@
 	</Keywords>
 
 	<Rule name = "text.preprocessor">
-		<Keywords color="text.preprocessor.keyword">
-		</Keywords>
 	</Rule>
 	
 	<Rule name = "Comment">
-		<Keywords color="comment.keyword.todo" ignorecase="True">
+		<Keywords color="Comment Tag" ignorecase="True">
 			<Word>TODO</Word>
 			<Word>FIXME</Word>
 			<Word>HACK</Word>
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSyntaxMode.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSyntaxMode.xml
index 3cdf3d826b..8cf8c6babe 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSyntaxMode.xml
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSyntaxMode.xml
@@ -25,19 +25,19 @@
  
 <SyntaxMode name = "SqlServer" mimeTypes="text/x-sqlserver" ignorecase="true">
 
-	<EolSpan color = "comment" rule="Comment" tagColor="comment.tag">-</EolSpan>
+	<EolSpan color = "Comment(Line)" rule="Comment" tagColor="comment.tag">-</EolSpan>
 	
-	<Span color = "comment.block" rule="Comment" tagColor="comment.tag.block">
+	<Span color = "Comment(Block)" rule="Comment" tagColor="comment.tag.block">
 		<Begin>/*</Begin>
 		<End>*/</End>
 	</Span>
 	
-	<Span color = "string" rule="String" stopateol = "true" escape='\"'>
+	<Span color = "String" rule="String" stopateol = "true" escape='\"'>
 		<Begin>'</Begin>
 		<End>'</End>
 	</Span>
 	
-	<Keywords color = "keyword.misc">
+	<Keywords color = "Keyword(Other)">
 		<Word>@@DATEFIRST</Word>
 		<Word>@@OPTIONS</Word>
 		<Word>@@DBTS</Word>
@@ -1141,7 +1141,7 @@
 		<Word>sp_xml_schema_rowset2</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.operator">
+	<Keywords ignorecase="true" color = "Keyword(Operator)">
 		<Word>+</Word>
 		<Word>-</Word>
 		<Word>*</Word>
@@ -1173,7 +1173,7 @@
 		<Word>@</Word>
 	</Keywords>
 	
-	<Keywords color = "keyword.declaration">
+	<Keywords color = "Keyword(Declaration)">
 		<Word>CREATE</Word>
 		<Word>DATABASE</Word>
 		<Word>COLLATE</Word>
@@ -1211,10 +1211,10 @@
 		<Word>ACTION</Word>
 	</Keywords>
 	
-	<Keywords color = "keyword.parameter">
+	<Keywords color = "Keyword(Parameter)">
 	</Keywords>
 
-	<Keywords ignorecase="true" color = "keyword.selection">
+	<Keywords ignorecase="true" color = "Keyword(Selection)">
 		<Word>SELECT</Word>
 		<Word>FROM</Word>
 		<Word>WHERE</Word>
@@ -1248,10 +1248,10 @@
 		<Word>HAVING</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.iteration">
+	<Keywords ignorecase="true" color = "Keyword(Iteration)">
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.jump">
+	<Keywords ignorecase="true" color = "Keyword(Jump)">
 		<Word>BREAK</Word>
 		<Word>RETURN</Word>
 		<Word>RETURNS</Word>
@@ -1260,24 +1260,24 @@
 		<Word>READONLY</Word>
 	</Keywords>
 	
-	<Keywords color = "keyword.context">
+	<Keywords color = "Keyword(Context)">
 	</Keywords>
 	
-	<Keywords color = "keyword.exceptions">
+	<Keywords color = "Keyword(Exception)">
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "constant.language">
+	<Keywords ignorecase="true" color = "Keyword(Constants)">
 		<Word>TRUE</Word>
 		<Word>FALSE</Word>
 		<Word>NULL</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.modifier">
+	<Keywords ignorecase="true" color = "Keyword(Modifiers)">
 		<Word>RETURNS</Word>
 		<Word>AS</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.type">
+	<Keywords ignorecase="true" color = "Keyword(Type)">
 		<Word>bigint</Word>
 		<Word>numeric</Word>
 		<Word>bit</Word>
@@ -1314,12 +1314,10 @@
 	</Keywords>
 
 	<Rule name = "text.preprocessor">
-		<Keywords color="text.preprocessor.keyword">
-		</Keywords>
 	</Rule>
 	
 	<Rule name = "Comment">
-		<Keywords color="comment.keyword.todo" ignorecase="True">
+		<Keywords color="Comment Tag" ignorecase="True">
 			<Word>TODO</Word>
 			<Word>FIXME</Word>
 			<Word>HACK</Word>
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/SqliteSyntaxMode.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/SqliteSyntaxMode.xml
index 7304804ff7..659f3e2caa 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/SqliteSyntaxMode.xml
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/SqliteSyntaxMode.xml
@@ -25,24 +25,24 @@
  
 <SyntaxMode name = "Sqlite" mimeTypes="text/x-sqlite" ignorecase="true">
 
-	<EolSpan color = "comment" rule="Comment" tagColor="comment.tag">-</EolSpan>
+	<EolSpan color = "Comment(Line)" rule="Comment" tagColor="comment.tag">-</EolSpan>
 	
-	<Span color = "comment.block" rule="Comment" tagColor="comment.tag.block">
+	<Span color = "Comment(Block)" rule="Comment" tagColor="comment.tag.block">
 		<Begin>/*</Begin>
 		<End>*/</End>
 	</Span>
 	
-	<Span color = "string" rule="String" stopateol = "true" escape='\"'>
+	<Span color = "String" rule="String" stopateol = "true" escape='\"'>
 		<Begin>"</Begin>
 		<End>"</End>
 	</Span>
 	
-	<Span color = "string" rule="String" stopateol = "true" escape='\"'>
+	<Span color = "String" rule="String" stopateol = "true" escape='\"'>
 		<Begin>'</Begin>
 		<End>'</End>
 	</Span>
 	
-	<Keywords color = "keyword.misc">
+	<Keywords color = "Keyword(Other)">
 		<Word>COUNT</Word>
 		<Word>AVG</Word>
 		<Word>GROUP_CONCAT</Word>
@@ -83,7 +83,7 @@
 		<Word>julianday</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.operator">
+	<Keywords ignorecase="true" color = "Keyword(Operator)">
 		<Word>||</Word>
 		<Word>AS</Word>
 		<Word>*</Word>
@@ -113,7 +113,7 @@
 		<Word>OR</Word>
 	</Keywords>
 	
-	<Keywords color = "keyword.declaration">
+	<Keywords color = "Keyword(Declaration)">
 		<Word>TABLE</Word>
 		<Word>RENAME</Word>
 		<Word>TO</Word>
@@ -164,10 +164,10 @@
 		<Word>REINDEX</Word>
 	</Keywords>
 	
-	<Keywords color = "keyword.parameter">
+	<Keywords color = "Keyword(Parameter)">
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.selection">
+	<Keywords ignorecase="true" color = "Keyword(Selection)">
 		<Word>ANALYZE</Word>
 		<Word>BEGIN</Word>
 		<Word>COMMIT</Word>
@@ -217,19 +217,19 @@
 		<Word>SET</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.iteration">
+	<Keywords ignorecase="true" color = "Keyword(Iteration)">
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.jump">
+	<Keywords ignorecase="true" color = "Keyword(Jump)">
 	</Keywords>
 	
-	<Keywords color = "keyword.context">
+	<Keywords color = "Keyword(Context)">
 	</Keywords>
 	
-	<Keywords color = "keyword.exceptions">
+	<Keywords color = "Keyword(Exception)">
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "constant.language">
+	<Keywords ignorecase="true" color = "Keyword(Constants)">
 		<Word>TRUE</Word>
 		<Word>FALSE</Word>
 		<Word>Yes</Word>
@@ -240,11 +240,11 @@
 		<Word>0</Word>
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.modifier">
+	<Keywords ignorecase="true" color = "Keyword(Modifiers)">
 		
 	</Keywords>
 	
-	<Keywords ignorecase="true" color = "keyword.type">
+	<Keywords ignorecase="true" color = "Keyword(Type)">
 		<Word>NULL</Word>
 		<Word>INTEGER</Word>
 		<Word>REAL</Word>
@@ -298,7 +298,7 @@
 	</Rule>
 	
 	<Rule name = "Comment">
-		<Keywords color="comment.keyword.todo" ignorecase="True">
+		<Keywords color="Comment Tag" ignorecase="True">
 			<Word>TODO</Word>
 			<Word>FIXME</Word>
 			<Word>HACK</Word>