diff --git a/.vscode/settings.json b/.vscode/settings.json
index 577fbb7..da222f7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,9 @@
 {
 	"apexPMD.enableCache": false,
 	"[css]": {
-		  "editor.formatOnSave": false
-	  }
-}
\ No newline at end of file
+		"editor.formatOnSave": true
+	},
+	"[js]": {
+		"editor.formatOnSave": true
+	}
+}
diff --git a/demo/cheatsheet.txt b/demo/cheatsheet.txt
index 4867169..630b1d8 100644
--- a/demo/cheatsheet.txt
+++ b/demo/cheatsheet.txt
@@ -17,3 +17,6 @@ node ./tools/build.js -t browser
 node tools/build.js -t node apex
 node tools/build.js -t cdn :common apex
 node tools/build.js -t browser :common apex
+
+# run tests
+npm run build_and_test
\ No newline at end of file
diff --git a/demo/markupcheck.html b/demo/markupcheck.html
index 9f9070c..c1dd1b4 100644
--- a/demo/markupcheck.html
+++ b/demo/markupcheck.html
@@ -7,7 +7,7 @@
 		<script charset="UTF-8" src="../dist/apex.min.js"></script>
 		<link rel="stylesheet" href="./testcode.css" />
 		<!-- <link rel="stylesheet" href="../src/styles/monokai-sublime-apex.css" /> -->
-    <link rel="stylesheet" href="vs.css" />
+		<link rel="stylesheet" href="vs.css" />
 		<script>
 			hljs.debugMode();
 			hljs.highlightAll();
@@ -36,7 +36,6 @@
     Integer z
   ) {
     
-    
     Account a = new Account();
     a.Custom__c = 'stringvalue';
     insert a;
@@ -71,7 +70,7 @@
 
 trigger CTrig on Custom__c (before insert){
   System.debug('inserting a record');
-  upsert myRecord__c;
+  upsert as system myRecord__c;
 }
 </code></pre>
 	</body>
diff --git a/demo/soqlsamples.txt b/demo/soqlsamples.txt
index 0e0a1f4..c01ee4e 100644
--- a/demo/soqlsamples.txt
+++ b/demo/soqlsamples.txt
@@ -39,7 +39,7 @@ WHERE Id IN
 [SELECT Id FROM Account WHERE CreatedDate = NEXT_N_FISCAL_QUARTERS:6]
 [SELECT Id FROM Opportunity WHERE CloseDate = N_WEEKS_AGO:3]
 [SELECT Id FROM Account WHERE CreatedDate = YESTERDAY]
-[SELECT Id, MSP1__c from CustObj__c WHERE MSP1__c includes ('AAA;BBB','CCC')]
+[SELECT Id, MSP1__c FROM CustObj__c WHERE MSP1__c includes ('AAA;BBB','CCC') WITH SYSTEM_MODE]
 [SELECT Id
 FROM Case
 WHERE Contact.LastName = null]
@@ -57,4 +57,4 @@ GROUP BY Name]
     GROUPING(LeadSource) grpLS, GROUPING(Rating) grpRating,
     COUNT(Name) cnt
 FROM Lead
-GROUP BY ROLLUP(LeadSource, Rating)]
\ No newline at end of file
+GROUP BY ROLLUP(LeadSource, Rating) WITH USER_MODE]
\ No newline at end of file
diff --git a/demo/testcode.html b/demo/testcode.html
index d7935c1..aadd87e 100644
--- a/demo/testcode.html
+++ b/demo/testcode.html
@@ -5,9 +5,9 @@
 		<meta charset="UTF-8" />
 		<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release/build/highlight.js"></script>
 		<script charset="UTF-8" src="../dist/apex.min.js"></script>
-		<link rel="stylesheet" href="./testcode.css" />
-		<!-- <link rel="stylesheet" href="../src/styles/monokai-sublime-apex.css" /> -->
-		<link rel="stylesheet" href="vs.css" />
+		<!-- <link rel="stylesheet" href="./testcode.css" /> -->
+		<link rel="stylesheet" href="../src/styles/monokai-sublime-apex.css" />
+		<!-- <link rel="stylesheet" href="vs.css" /> -->
 		<script>
 			hljs.debugMode();
 			hljs.highlightAll();
@@ -76,6 +76,13 @@
      * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
      * @group Visualforce
      * @since 2022
+     * @example 
+     * for (Dashboard d : dashboards) {
+     *     List<BotField> fields = new List<BotField>();
+     *     fields.add(new BotField('Name', d.Title, '/lightning/r/Dashboard/' + d.Id + '/view'));
+     *     fields.add(new BotField('Folder', d.FolderName));
+     *     records.add(new BotRecord(fields));
+     * }
      */
     public with sharing class ActionPlanDetailController {
 
@@ -325,7 +332,7 @@
 
       Database.insert(new planTaskIndexToTask.values());
 
-      Database.update(dependentTasksToUpdate);
+      Database.update(dependentTasksToUpdate, AccessLevel.USER_MODE);
 
       List&lt;Task&gt; myTasksWithOutEmail = new List&lt;Task&gt;();
 
@@ -408,6 +415,36 @@
       ActionPlansTriggerHandlers.actionPlansSObjectTriggerHandler('Account');
   }
 
+  public with sharing class GetFirstFromCollection {
+    @InvocableMethod
+    public static List <Results> execute (List<Requests> requestList) {
+      List<SObject> inputCollection = requestList[0].inputCollection;
+      SObject outputMember = inputCollection[0];
+  
+      //Create a Results object to hold the return values
+      Results response = new Results();
+  
+      //Add the return values to the Results object
+      response.outputMember = outputMember;
+  
+      //Wrap the Results object in a List container 
+      //(an extra step added to allow this interface to also support bulkification)
+      List<Results> responseWrapper= new List<Results>();
+      responseWrapper.add(response);
+      return responseWrapper;    
+    }
+  
+  public class Requests {
+    @InvocableVariable(label='Records for Input' description='yourDescription' required=true)
+    public List<SObject> inputCollection;
+    }
+  
+  public class Results {
+    @InvocableVariable(label='Records for Output' description='yourDescription' required=true)
+    public SObject outputMember;
+    }
+  }
+
   /**
   * SHOULD BE RECOGNIZED AS JAVA
   * @author John Smith 
diff --git a/demo/testcode.txt b/demo/testcode.txt
index 95ab29b..45f7ee3 100644
--- a/demo/testcode.txt
+++ b/demo/testcode.txt
@@ -464,7 +464,7 @@ private void method2() {
 @future
 (label = true)
 private void method3() {
-  Contact[] acctContacts = [SELECT Id FROM Contact WHERE AccountId IN :newRecordsMap.keyset() WITH SECURITY_ENFORCED];
+  Contact[] acctContacts = [SELECT Id FROM Contact WHERE AccountId IN :newRecordsMap.keyset() WITH USER_MODE];
   List<Contact> acctContacts2 = [SELECT Id FROM Contact WHERE ID = '012000000' AND CreatedDate = :LAST_N_DAYS:90 WITH SECURITY_ENFORCED];
   if (Contact.getSObjectType().getDescribe().isUpdateable()) {
 	update as user acctContacts; //NOPMD
diff --git a/dist/apex.es.min.js b/dist/apex.es.min.js
index 8db20d8..e31f913 100644
--- a/dist/apex.es.min.js
+++ b/dist/apex.es.min.js
@@ -1,4 +1,4 @@
-/*! `apex` grammar compiled for Highlight.js 11.9.0 */
+/*! `apex` grammar compiled for Highlight.js 11.11.1 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const t=e.regex,a="[a-zA-Z][a-zA-Z_0-9]*",c="\\b"+a+"\\b",n="@"+a,s=/(?=\s*\()/,o=/\s+/,r=/\?\./,i=[{
 match:/(?<!\?)\./,scope:"punctuation",relevance:0},{match:r,scope:"operator",
@@ -6,19 +6,19 @@ relevance:0}];function l(...e){return t.concat("(?!",e.join("|"),")")}const p={
 scope:"number",
 match:t.either(/\b(\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(\.\d{1,3})?(\-|\+)\d{2}\:\d{2})\b/,/\b(\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(\.\d{1,3})?(Z)?)\b/,/\b(\d{4}\-\d{2}\-\d{2})\b/,/\b0(x|X)[0-9a-fA-F_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/\b0(b|B)[01_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/\b([0-9]+)?\.[0-9]+((e|E)[0-9]+)?(F|f|D|d|M|m)?\b/,/(-?)\b[0-9]+(e|E)[0-9]+(F|f|D|d|M|m)?\b/,/(-?)\b[0-9]+(F|f|D|d|M|m)\b/,/(-?)\b[0-9]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/(-?)(\b0[0-9]+|(\b\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?)/),
 relevance:0
-},b=["try","catch","finally","get","set","put","if","for","else","do","while","continue","break","implements","extends","return","throw","when","new"],u=["instanceof","super","this"],d=["abstract","final","global","override","private","protected","public","static","testMethod","transient","virtual","webservice"],m=["anytype|0","blob|0","boolean|0","byte|0","currency|0","date|0","datetime|0","decimal|0","double|0","enum|0","float|0","integer|0","long|0","object|0","pagereference|8","selectoption|8","short|0","sobject|10","string|0","time|0","void|0","float|0"],E=["insert","update","upsert","delete","undelete","merge","convertLead"],A=["AppLauncher","Approval","Auth","Cache","Canvas","ChatterAnswers","CommercePayments","ConnectApi","Database","Datacloud","Dataweave","DataSource","Dom","EventBus","ExternalService","Flow","Functions","Invocable","KbManagement","LxScheduler","Messaging","Metadata","Pref_center","Process","QuickAction","Reports","RichMessageing","Schema","Search","Sfc","Sfdc_Checkout","sfdc_surveys","Site","Slack","Support","System","TerritoryMgmt","TxnSecurity","UserProvisioning","VisualEditor","Wave"],h=["AccessLevel","Address","Answers","ApexPages","Approval","Assert","AsyncInfo","AsyncOptions","BusinessHours","Cases","Collator","Compression","Continuation","Cookie","Crypto","Database","Date","Datetime","Decimal","Domain","DomainCreator","DomainParser","EmailMessages","EncodingUtil","EventBus","Exception","FeatureManagement","FlexQueue","Formula","FormulaEval","FormulaRecalcFieldError","FormulaRecalcResult","Http","HttpRequest","HttpResponse","Ideas","IsvPartners","JSON","JSONGenerator","JSONParser","Label","Limits","Location","Matcher","Math","Messaging","MultiStaticResourceCalloutMock","Network","OrgLimit","OrgLimits","Packaging","PageReference","Pattern","QueueableDuplicateSignature","QueueableDuplicateSignature.Builder","QuickAction","Request","ResetPasswordResult","RestContext","RestRequest","RestResponse","Search","Security","SelectOption","Site","SObject","SObjectAccessDecision","StaticResourceCalloutMock","Test","TimeZone","Type","URL","UserInfo","UserManagement","UUID","Version","WebServiceCallout","XmlStreamReader","XmlStreamWriter"],v=["AccessType","AccessLevel","DomainType","JSONToken","LoggingLevel","Quiddity","TriggerOperation","operationType"],S=["false","true","null"],R={
+},b=["try","catch","finally","get","set","put","if","for","else","do","while","continue","break","implements","extends","return","throw","when","new"],u=["instanceof","super","this"],d=["abstract","final","global","override","private","protected","public","static","testMethod","transient","virtual","webservice"],m=["anytype|0","blob|0","boolean|0","byte|0","currency|0","date|0","datetime|0","decimal|0","double|0","enum|0","float|0","integer|0","long|0","object|0","pagereference|8","selectoption|8","short|0","sobject|10","string|0","time|0","void|0","float|0"],E=["insert","update","upsert","delete","undelete","merge","convertLead"],h=["AppLauncher","Approval","Auth","Cache","Canvas","ChatterAnswers","CommerceOrders","fsccashflow","CommercePayments","ConnectApi","Context","Database","Datacloud","DataRetrieval","DataSource","Dataweave","Dom","EventBus","ExternalService","Flow","FormulaEval","Functions","id_verification","industriesDigitalLending","Invocable","KbManagement","LxScheduler","Messaging","Metadata","Pref_center","Process","QuickAction","Reports","RichMessageing","Schema","Search","Sfc","Sfdc_Checkout","IndustriesNlpSvc","PlaceQuote","Sfdc_Enablement","sfdc_surveys","Site","Slack","Support","System","TerritoryMgmt","TxnSecurity","UserProvisioning","VisualEditor","Wave"],v=["Address","Answers","ApexPages","Approval","Assert","AsyncInfo","AsyncOptions","BusinessHours","Cases","Collator","Compression","Continuation","Cookie","Crypto","Database","Date","Datetime","Decimal","Domain","DomainCreator","DomainParser","EmailMessages","EncodingUtil","EventBus","Exception","FeatureManagement","FlexQueue","Formula","FormulaRecalcFieldError","FormulaRecalcResult","Http","HttpRequest","HttpResponse","Ideas","IsvPartners","JSON","JSONGenerator","JSONParser","Label","Limits","Location","Matcher","Math","Messaging","MultiStaticResourceCalloutMock","Network","OrgLimit","OrgLimits","Packaging","PageReference","Pattern","QueueableDuplicateSignature","QueueableDuplicateSignature.Builder","QuickAction","Request","ResetPasswordResult","RestContext","RestRequest","RestResponse","Search","Security","SelectOption","Site","SObject","SObjectAccessDecision","StaticResourceCalloutMock","Test","TimeZone","Type","URL","UserInfo","UserManagement","UUID","Version","WebServiceCallout","XmlStreamReader","XmlStreamWriter"],A=["AccessType","AccessLevel","CallbackStatus","DomainType","JSONToken","LoggingLevel","Quiddity","TriggerOperation","operationType"],S=["false","true","null"],R={
 match:/,/,scope:"punctuation",relevance:0
-},T=[/--/,/\+\+/,/\&\&|\|\|/,/\*\=|\/\=|\%\=|\+\=|-\=/,/\&\=|\^\=|<<\=|>>\=|>>>\=|\|\=/,/\&|~|\^|\|/,/<<|>>/,/<\=|>\=|\s(<|>)\s/,/\=\=|!\=/,/\=>/,/!(?=\w)/,/(?<=\s)(\?|:)(?=\s)/,r,/(?<=\s)(\?\?)(?=\s)/,/(?<!\?)\?(?!\?|\.|\[)/,/%[^%]|\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/(?<!\=|!)\=(?!\=|>)/],g=A.concat(...h),y={
+},g=[/--/,/\+\+/,/\&\&|\|\|/,/\*\=|\/\=|\%\=|\+\=|-\=/,/\&\=|\^\=|<<\=|>>\=|>>>\=|\|\=/,/\&|~|\^|\|/,/<<|>>/,/<\=|>\=|\s(<|>)\s/,/\=\=|!\=/,/\=>/,/!(?=\w)/,/(?<=\s)(\?|:)(?=\s)/,r,/(?<=\s)(\?\?)(?=\s)/,/(?<!\?)\?(?!\?|\.|\[)/,/%[^%]|\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/(?<!\=|!)\=(?!\=|>)/],T=h.concat(...v),y={
 $pattern:t.concat(/(?<!\.)\b/,a,/\b/),keyword:[...b,...d,...E],type:m,literal:S
-},L=[...S,...b,...d,...A,...h,...v,...u,...E],N={
+},O=[...S,...b,...d,...h,...v,...A,...u,...E],N={
 match:t.concat(/\b/,t.either(...u),/\b/),scope:"variable.language",relevance:0
-},O=[{match:[t.concat(/\b/,t.either(...v)),/\./,a,/\b\s*(?![\.\(])/],scope:{
+},L=[{match:[t.concat(/\b/,t.either(...A)),/\./,a,/\b\s*(?![\.\(])/],scope:{
 1:"built_in",2:"punctuation",3:"variable"},relevance:0},{
-match:[t.concat(/\b/,t.either(...h)),/\./,a,/\b\s*(?![\.\(])/],scope:{
+match:[t.concat(/\b/,t.either(...v)),/\./,a,/\b\s*(?![\.\(])/],scope:{
 1:"built_in",2:"punctuation",3:"type"},relevance:0},{
-match:[t.concat(/\b/,t.either(...A)),/\./,c,/\b(?=\.)/],scope:{1:"built_in",
+match:[t.concat(/\b/,t.either(...h)),/\./,c,/\b(?=\.)/],scope:{1:"built_in",
 2:"punctuation",3:"type"}},{
-match:[t.concat(/\b/,t.either(...A,...h)),/\./,c,/\b(?!\.)/],scope:{
+match:[t.concat(/\b/,t.either(...h,...v)),/\./,c,/\b(?!\.)/],scope:{
 1:"built_in",2:"punctuation",3:"keyword"}},{
 match:[/\bTrigger\b/,/\./,/(isExecuting|isInsert|isUpdate|isDelete|isBefore|isAfter|isUndelete|new|newMap|old|oldMap|size|operationType)\b(?!\.)/],
 scope:{1:"built_in",2:"punctuation",3:"type"},relevance:10},{
@@ -26,17 +26,17 @@ match:[/\btrigger\b/,/\./,"operationtype",/\./,t.concat(c,/\b/)],scope:{
 1:"built_in",2:"punctuation",3:"keyword",4:"punctuation",5:"variable.constant"},
 relevance:10}],C=[{
 match:t.either(",",/;/,/(?<=\w)\>/,/\<(?=\w)/,/\{|\}/,/\(|\)/,/\{|\}/),
-scope:"punctuation",relevance:0},R],I=e.inherit(e.APOS_STRING_MODE,{
+scope:"punctuation",relevance:0},R],D=e.inherit(e.APOS_STRING_MODE,{
 scope:"string",relevance:0,contains:[{match:/\\'/,scope:"literal",relevance:0}]
-}),w=e.COMMENT("//",/[$\n]/,{relevance:0}),D=[e.COMMENT("/\\*","\\*/",{
+}),I=e.COMMENT("//",/[$\n]/,{relevance:0}),_=[e.COMMENT("/\\*","\\*/",{
 relevance:0,contains:[{begin:/\w+@/,relevance:0},{
 match:[/@(?:exception|throws)/,o,a],scope:{1:"doctag",3:"title.class"},
 relevance:0},{begin:"@[A-Za-z_-]+",scope:"doctag",relevance:0},{
-match:[/(?<=@param)\s+/,a],scope:{2:"variable"},relevance:0},{excludeBegin:!0,
-excludeEnd:!0,contains:[e.BACKSLASH_ESCAPE],relevance:0,variants:[{begin:"`",
-end:"`",scope:"subst"},{begin:/'/,end:/'/,scope:"string"}]}]}),w],_={
-match:t.either(...T),scope:"operator",relevance:0},U={match:/(?<!\.)\bId\b/,
-scope:"type",relevance:8},f=[{begin:/\b(list|set|map)(?=\s*<)/,
+match:[/(?<=@param)\s+/,a],scope:{2:"variable"},relevance:0},{
+contains:[e.BACKSLASH_ESCAPE],relevance:0,variants:[{begin:"`",end:"`",
+scope:"string"},{begin:/'/,end:/'/,scope:"string"}],contains:[]}]}),I],w={
+match:t.either(...g),scope:"operator",relevance:0},f={match:/(?<!\.)\bId\b/,
+scope:"type",relevance:8},U=[{begin:/\b(list|set|map)(?=\s*<)/,
 beginScope:"type",end:/\>+/,endScope:"punctuation",contains:[{match:/\<|\,/,
 scope:"punctuation"},{match:c,scope:"type"}],relevance:8},{
 match:[t.optional(c),/\[/,t.optional(/\d+/),/\]/],scope:{1:"variable",
@@ -44,30 +44,31 @@ match:[t.optional(c),/\[/,t.optional(/\d+/),/\]/],scope:{1:"variable",
 2:"punctuation"},relevance:0}],M=[{match:t.concat(n,/\b(?!\s*\()/),scope:"meta"
 },{scope:"meta",begin:[t.concat(n,/\b/),/\s*/,/\(/],beginScope:{3:"punctuation"
 },end:/\)/,endScope:"punctuation",contains:[{match:[c,/\s*=/],scope:{
-1:"keyword",2:"operator"},contains:[_]},I,p],keywords:{literal:S}}],k={
+1:"keyword",2:"operator"},contains:[w]},D,p],keywords:{literal:S}}],k={
 match:[/\b[a-zA-Z0-9\.]*Exception/,o,a],scope:{1:"type",3:"variable"},
-relevance:0},F={match:[/(?<!\.)/,c,/\s*(?=\=[^\>])/],scope:{2:"variable"},
-relevance:0},P={match:[/(?<=\=\s*\()/,a,"(?=\\)\\s*"+a+")"],scope:{2:"type"},
-relevance:0},Y={match:[/\bnew\s+/,a,s],scope:{2:"type"},relevance:0};let W={
-scope:"params_call",begin:/\(/,beginScope:"punctuation",end:/\)/,
-endScope:"punctuation",relevance:0,keywords:y,contains:[]};const x=[{
-match:[/(?<=\.)/,a,s],scope:{2:"title.function.invoke"},relevance:1,
-contains:[...i],starts:W},{match:[/^\s*/,l(...b),a,s],scope:{
-3:"title.function.invoke"},relevance:1,starts:W}]
-;W.contains=[I,Y,D,_,f,O,p,U,x,{keywords:{KEYWORDS:y},
+relevance:0},F=[{match:[/(?<!\.)/,c,/\s*(?=\=[^\>])/],scope:{2:"variable"},
+relevance:0},{match:[c,"(?=\\s+"+a+/\s*\=/+")"],scope:{1:"type"},relevance:0},{
+match:[c,o,c,/\s*(?=\=[^\>])/],scope:{1:"type",3:"variable"},relevance:0}],P={
+match:[/(?<=\=\s*\()/,a,"(?=\\)\\s*"+a+")"],scope:{2:"type"},relevance:0},Y={
+match:[/\bnew\s+/,a,s],scope:{2:"type"},relevance:0};let W={scope:"params_call",
+begin:/\(/,beginScope:"punctuation",end:/\)/,endScope:"punctuation",relevance:0,
+keywords:y,contains:[]};const H=[{match:[/(?<=\.)/,a,s],scope:{
+2:"title.function.invoke"},relevance:1,contains:[...i],starts:W},{
+match:[/^\s*/,l(...b),a,s],scope:{3:"title.function.invoke"},relevance:1,
+starts:W}];W.contains=[D,Y,_,w,U,L,p,f,H,{keywords:{KEYWORDS:y},
 match:t.concat(/(?<=\s|\(|\,)/,l(...S),a,/\b/,/(?!\.)/),scope:"variable",
 relevance:0},{match:/\(|\,|\./,scope:"punctuation",relevance:0},{match:a,
-scope:"variable"}];const H={scope:"params",end:/\)/,endScope:"punctuation",
-relevance:1,keywords:y,contains:[p,I,D,f,...O,{match:/\,|\(/,scope:"punctuation"
-},U,{match:[/(?<=\(|\,)\s*/,a,/(?=\s)/],scope:{2:"type"}},{
+scope:"variable"}];const x={scope:"params",end:/\)/,endScope:"punctuation",
+relevance:1,keywords:y,contains:[p,D,_,U,...L,{match:/\,|\(/,scope:"punctuation"
+},f,{match:[/(?<=\(|\,)\s*/,a,/(?=\s)/],scope:{2:"type"}},{
 match:[o,a,/\s*(?=[,)])/],scope:{2:"variable"}}]},G={
 match:[/\bswitch\s+on\s+/,a],scope:{1:"keyword",2:"variable"}};return{
-name:"Apex",aliases:["apex","lightning","soql"],case_insensitive:!0,
+name:"Apex",aliases:["apex","lightning","soql","sosl"],case_insensitive:!0,
 disableAutodetect:!1,ignoreIllegals:!1,keywords:y,
 illegal:["</","<#","<]","<div>","\x3c!--","!DOCTYPE",/<iframe\b/,/^#/,/^import \.[a-zA-Z]+\./,/^import [\w]+/,/^import$/,/^include </,/^use\s+</,/\b(const|var)\s+\w+\s*=/,/\bstruct\b/,"System.log","console.log",/\bfor\s+\w+\s+IN\s+/,/\bif\s+\w+\s+IN\s+/,/\bend\s+if\b/,/\bend\s+select\b/,/\b(int|var)\s+\w+\s+=/,/\b(int[0-9]+|bool)\b/,/\b\$/,/\b_/,"::=",/\s#[a-zA-Z]/,/\s_[a-zA-Z]/,/\s\$[a-zA-Z]/,"#if","%if",/\bif(?!\s+\()/,"%endif","#endif","#_",/\d\s+\d/,/\w::\w/,/\bfloat\b/,/(SELECT|RETURNING)\s+\*/,/END\s+LOOP/,/CREATE\s+FUNCTION/,/\bint\b/,/import\s+\w+\s+=\s+require\("\w+"\)/,"/^include\b/",/\buse\s+strict\b/,/\w+\s+=\s+"\S*";/,/\/include\//,/\Anamespace\b/,/\bend(\.)?\n/,'"""',/\+\+\+/,/<%/,"<%#","%%>","<%%",":-",/\bmergesort\(/,/\bvar\s+env\b/,/\bdef\b\s\W:/,/"[^"]+"/,/\(\*|\*\)/],
-contains:[D,M,I,p,P,f,[{begin:[/\btrigger/,o,a,o,"on",o,a],beginScope:{
+contains:[_,M,D,p,P,U,[{begin:[/\btrigger/,o,a,o,"on",o,a],beginScope:{
 1:"keyword",3:"title.class",5:"operator",7:"type"},end:/(?=\{)/,returnEnd:!0,
-contains:[D,{begin:/\(/,end:/\)/,contains:[{
+contains:[_,{begin:/\(/,end:/\)/,contains:[{
 match:/\b(before|after)\s+(insert|update|delete|merge|undelete)\b/,
 scope:"keyword",relevance:5},R]}]},{relevance:5,
 match:/\b(with|without|inherited)\s+sharing\b/,scope:"keyword"},{
@@ -77,31 +78,31 @@ match:[/(?<=\bclass)\s+/,a],scope:{2:"title.class"}},{returnEnd:!0,
 endsWithParent:!0,beginKeywords:"implements extends",end:/\{/,contains:[{
 match:[c,/(?=\.)/],scope:{1:"built_in"}},{match:t.concat(c,/(?=\>)/),
 scope:"type"},{match:c,scope:"title.class.inherited"},{match:/<|>|,/,
-scope:"punctuation"},O],relevance:0}]},{begin:[/\benum\s+/,a,/\s*\{/],
+scope:"punctuation"},L],relevance:0}]},{begin:[/\benum\s+/,a,/\s*\{/],
 beginScope:{2:"type",3:"punctuation"},end:/\}/,endScope:"punctuation",
-relevance:0,contains:[D,R,{match:t.concat(c),scope:"variable.constant"}]},{
+relevance:0,contains:[_,R,{match:t.concat(c),scope:"variable.constant"}]},{
 match:[/(public|private|protected)\s+/,a,s],scope:{1:"keyword",
-2:"title.function"},starts:H,relevance:1},{
+2:"title.function"},starts:x,relevance:1},{
 match:[/(?<!new)(?<!return)(?<=\<|\>|\w)\s+/,a,s],scope:{2:"title.function"},
-relevance:1,starts:H}],[{match:/as\s+(user|system)\b/,scope:"keyword"}],k,{
-match:[/\bfor\b\s*/,/\(/,a,o,a,/\s*/,/:/],scope:{3:"type",5:"variable",
-7:"operator"}},x,Y,N,O,U,{begin:[/\[/,/\s*(?=(SELECT|FIND)\b)/],end:/\]/,
-beginScope:{1:"punctuation"},endScope:"punctuation",scope:"soql",relevance:10,
-endsWithParent:!0,keywords:{literal:y.literal,built_in:g},contains:[p,_,I,R,{
-match:/\(|\)/,scope:"punctuation",relevance:0},...i,{begin:[/\bFROM\b/,o],
-beginScope:{1:"keyword"},end:/(?=\bWHERE\b|\]|\s|\))/,contains:[{match:a,
-scope:"type"},...i]},{
-match:t.concat(/\b/,t.either("CALENDAR_MONTH","CALENDAR_QUARTER","CALENDAR_YEAR","DAY_IN_MONTH","DAY_IN_WEEK","DAY_IN_YEAR","DAY_ONLY","FISCAL_MONTH","FISCAL_QUARTER","FISCAL_YEAR","HOUR_IN_DAY","WEEK_IN_MONTH","WEEK_IN_YEAR","AVG","convertCurrency","convertTimezone","COUNT_DISTINCT","COUNT","DISTANCE","EXCLUDES","FIELDS","FORMAT","GEOLOCATION","GROUPING","ROLLUP","CUBE","INCLUDES","MAX","MIN","SUM","toLabel"),/\b/),
+relevance:1,starts:x}],[{match:/as\s+(user|system)\b/,scope:"keyword",
+relevance:5}],k,{match:[/\bfor\b\s*/,/\(/,a,o,a,/\s*/,/:/],scope:{3:"type",
+5:"variable",7:"operator"}},H,Y,N,L,f,{begin:[/\[/,/\s*(?=(SELECT|FIND)\b)/],
+end:/\]/,beginScope:{1:"punctuation"},endScope:"punctuation",scope:"soql",
+relevance:10,endsWithParent:!0,keywords:{literal:y.literal,built_in:T},
+contains:[p,w,D,R,{match:/\(|\)/,scope:"punctuation",relevance:0},...i,{
+begin:[/\bFROM\b/,o],beginScope:{1:"keyword"},end:/(?=\bWHERE\b|\]|\s|\))/,
+contains:[{match:a,scope:"type"},...i]},{
+match:t.concat(/\b/,t.either("CALENDAR_MONTH","CALENDAR_QUARTER","CALENDAR_YEAR","DAY_IN_MONTH","DAY_IN_WEEK","DAY_IN_YEAR","DAY_ONLY","FISCAL_MONTH","FISCAL_QUARTER","FISCAL_YEAR","HOUR_IN_DAY","WEEK_IN_MONTH","WEEK_IN_YEAR","AVG","convertCurrency","convertTimezone","COUNT_DISTINCT","COUNT","DISTANCE","EXCLUDES","FIELDS","FORMAT","GEOLOCATION","GROUPING","ROLLUP","CUBE","INCLUDES","MAX","MIN","SUM","toLabel","USER_MODE","SYSTEM_MODE","SECURITY_ENFORCED"),/\b/),
 scope:"title.function"},{match:/\b(GROUP|ORDER)\s+BY\b/,scope:"title.function"
 },{match:/\b(TODAY|TOMORROW|YESTERDAY)\b/,scope:"keyword"},{
 match:/(NEXT|LAST|THIS)_(90_DAY|DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEEK|YEAR)S?\b/,
 scope:"keyword",relevance:8},{
 match:[/(NEXT|LAST)_N_(DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEEK|YEAR)S/,/\s*:\s*/,/\d+/],
 scope:{1:"keyword",2:"operator",3:"number"},relevance:8},{
-match:t.concat(/\b/,t.either(...y.keyword,"ABOVE_OR_BELOW","ABOVE","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","ASC","BELOW","CATEGORY","CONTAINS","CUSTOM","DATA","DESC","DIVISION","ELSE","END","FIND","FROM","METADATA","NETWORK","ON","PricebookId","RETURNING","ROLLUP","ROWS","SEARCH","SECURITY_ENFORCED","SELECT","SNIPPET","SORT","SPELL_CORRECTION","STANDARD","THEN","USER_MODE","USING","WHEN","WHERE","WITH","SCOPE","Delegated","Everything","Mine","My_Territory","My_Team_Territory","Team","AND","AT","FIRST","FOR","HAVING","IN","LAST","LIKE","LIMIT","LISTVIEW","NOT","NULLS","OFFSET","OR","REFERENCE","TRACKING","TYPEOF","UPDATE","VIEW","VIEWSTAT"),/\b/),
+match:t.concat(/\b/,t.either(...y.keyword,"ABOVE_OR_BELOW","ABOVE","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","ASC","BELOW","CATEGORY","CONTAINS","CUSTOM","DATA","DESC","DIVISION","ELSE","END","FIND","FROM","METADATA","NETWORK","ON","PricebookId","RETURNING","ROLLUP","ROWS","SEARCH","SELECT","SNIPPET","SORT","SPELL_CORRECTION","STANDARD","THEN","USING","WHEN","WHERE","WITH","SCOPE","Delegated","Everything","Mine","My_Territory","My_Team_Territory","Team","AND","AT","FIRST","FOR","HAVING","IN","LAST","LIKE","LIMIT","LISTVIEW","NOT","NULLS","OFFSET","OR","REFERENCE","TRACKING","TYPEOF","UPDATE","VIEW","VIEWSTAT"),/\b/),
 scope:"keyword"},{match:[/(?<=:)/,/\s*/,c,/(?!\()/],scope:{3:"variable"},
 relevance:0},{match:[/(?<=:|\.)/,a,/(?=\s*\()/],scope:{2:"title.function.invoke"
 },relevance:0},{match:/:/,scope:"operator",relevance:0}],illegal:"::"
-},G,F,_,C,i,{match:t.concat("(?<=this.)",a,"(?!\\()"),scope:"variable"},{
-match:[t.concat(/\b/,l(...L)),a,o,/(?=\{)/],scope:{2:"property"},relevance:0}]}}
+},G,F,w,C,i,{match:t.concat("(?<=this.)",a,"(?!\\()"),scope:"variable"},{
+match:[t.concat(/\b/,l(...O)),a,o,/(?=\{)/],scope:{2:"property"},relevance:0}]}}
 })();export default hljsGrammar;
\ No newline at end of file
diff --git a/dist/apex.min.js b/dist/apex.min.js
index f894b8a..3d90469 100644
--- a/dist/apex.min.js
+++ b/dist/apex.min.js
@@ -1,4 +1,4 @@
-/*! `apex` grammar compiled for Highlight.js 11.9.0 */
+/*! `apex` grammar compiled for Highlight.js 11.11.1 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const t=e.regex,a="[a-zA-Z][a-zA-Z_0-9]*",n="\\b"+a+"\\b",c="@"+a,s=/(?=\s*\()/,o=/\s+/,r=/\?\./,i=[{
 match:/(?<!\?)\./,scope:"punctuation",relevance:0},{match:r,scope:"operator",
@@ -6,19 +6,19 @@ relevance:0}];function l(...e){return t.concat("(?!",e.join("|"),")")}const p={
 scope:"number",
 match:t.either(/\b(\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(\.\d{1,3})?(\-|\+)\d{2}\:\d{2})\b/,/\b(\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(\.\d{1,3})?(Z)?)\b/,/\b(\d{4}\-\d{2}\-\d{2})\b/,/\b0(x|X)[0-9a-fA-F_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/\b0(b|B)[01_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/\b([0-9]+)?\.[0-9]+((e|E)[0-9]+)?(F|f|D|d|M|m)?\b/,/(-?)\b[0-9]+(e|E)[0-9]+(F|f|D|d|M|m)?\b/,/(-?)\b[0-9]+(F|f|D|d|M|m)\b/,/(-?)\b[0-9]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/(-?)(\b0[0-9]+|(\b\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?)/),
 relevance:0
-},b=["try","catch","finally","get","set","put","if","for","else","do","while","continue","break","implements","extends","return","throw","when","new"],u=["instanceof","super","this"],d=["abstract","final","global","override","private","protected","public","static","testMethod","transient","virtual","webservice"],m=["anytype|0","blob|0","boolean|0","byte|0","currency|0","date|0","datetime|0","decimal|0","double|0","enum|0","float|0","integer|0","long|0","object|0","pagereference|8","selectoption|8","short|0","sobject|10","string|0","time|0","void|0","float|0"],E=["insert","update","upsert","delete","undelete","merge","convertLead"],A=["AppLauncher","Approval","Auth","Cache","Canvas","ChatterAnswers","CommercePayments","ConnectApi","Database","Datacloud","Dataweave","DataSource","Dom","EventBus","ExternalService","Flow","Functions","Invocable","KbManagement","LxScheduler","Messaging","Metadata","Pref_center","Process","QuickAction","Reports","RichMessageing","Schema","Search","Sfc","Sfdc_Checkout","sfdc_surveys","Site","Slack","Support","System","TerritoryMgmt","TxnSecurity","UserProvisioning","VisualEditor","Wave"],h=["AccessLevel","Address","Answers","ApexPages","Approval","Assert","AsyncInfo","AsyncOptions","BusinessHours","Cases","Collator","Compression","Continuation","Cookie","Crypto","Database","Date","Datetime","Decimal","Domain","DomainCreator","DomainParser","EmailMessages","EncodingUtil","EventBus","Exception","FeatureManagement","FlexQueue","Formula","FormulaEval","FormulaRecalcFieldError","FormulaRecalcResult","Http","HttpRequest","HttpResponse","Ideas","IsvPartners","JSON","JSONGenerator","JSONParser","Label","Limits","Location","Matcher","Math","Messaging","MultiStaticResourceCalloutMock","Network","OrgLimit","OrgLimits","Packaging","PageReference","Pattern","QueueableDuplicateSignature","QueueableDuplicateSignature.Builder","QuickAction","Request","ResetPasswordResult","RestContext","RestRequest","RestResponse","Search","Security","SelectOption","Site","SObject","SObjectAccessDecision","StaticResourceCalloutMock","Test","TimeZone","Type","URL","UserInfo","UserManagement","UUID","Version","WebServiceCallout","XmlStreamReader","XmlStreamWriter"],v=["AccessType","AccessLevel","DomainType","JSONToken","LoggingLevel","Quiddity","TriggerOperation","operationType"],S=["false","true","null"],g={
+},b=["try","catch","finally","get","set","put","if","for","else","do","while","continue","break","implements","extends","return","throw","when","new"],u=["instanceof","super","this"],d=["abstract","final","global","override","private","protected","public","static","testMethod","transient","virtual","webservice"],m=["anytype|0","blob|0","boolean|0","byte|0","currency|0","date|0","datetime|0","decimal|0","double|0","enum|0","float|0","integer|0","long|0","object|0","pagereference|8","selectoption|8","short|0","sobject|10","string|0","time|0","void|0","float|0"],E=["insert","update","upsert","delete","undelete","merge","convertLead"],h=["AppLauncher","Approval","Auth","Cache","Canvas","ChatterAnswers","CommerceOrders","fsccashflow","CommercePayments","ConnectApi","Context","Database","Datacloud","DataRetrieval","DataSource","Dataweave","Dom","EventBus","ExternalService","Flow","FormulaEval","Functions","id_verification","industriesDigitalLending","Invocable","KbManagement","LxScheduler","Messaging","Metadata","Pref_center","Process","QuickAction","Reports","RichMessageing","Schema","Search","Sfc","Sfdc_Checkout","IndustriesNlpSvc","PlaceQuote","Sfdc_Enablement","sfdc_surveys","Site","Slack","Support","System","TerritoryMgmt","TxnSecurity","UserProvisioning","VisualEditor","Wave"],v=["Address","Answers","ApexPages","Approval","Assert","AsyncInfo","AsyncOptions","BusinessHours","Cases","Collator","Compression","Continuation","Cookie","Crypto","Database","Date","Datetime","Decimal","Domain","DomainCreator","DomainParser","EmailMessages","EncodingUtil","EventBus","Exception","FeatureManagement","FlexQueue","Formula","FormulaRecalcFieldError","FormulaRecalcResult","Http","HttpRequest","HttpResponse","Ideas","IsvPartners","JSON","JSONGenerator","JSONParser","Label","Limits","Location","Matcher","Math","Messaging","MultiStaticResourceCalloutMock","Network","OrgLimit","OrgLimits","Packaging","PageReference","Pattern","QueueableDuplicateSignature","QueueableDuplicateSignature.Builder","QuickAction","Request","ResetPasswordResult","RestContext","RestRequest","RestResponse","Search","Security","SelectOption","Site","SObject","SObjectAccessDecision","StaticResourceCalloutMock","Test","TimeZone","Type","URL","UserInfo","UserManagement","UUID","Version","WebServiceCallout","XmlStreamReader","XmlStreamWriter"],A=["AccessType","AccessLevel","CallbackStatus","DomainType","JSONToken","LoggingLevel","Quiddity","TriggerOperation","operationType"],S=["false","true","null"],g={
 match:/,/,scope:"punctuation",relevance:0
-},R=[/--/,/\+\+/,/\&\&|\|\|/,/\*\=|\/\=|\%\=|\+\=|-\=/,/\&\=|\^\=|<<\=|>>\=|>>>\=|\|\=/,/\&|~|\^|\|/,/<<|>>/,/<\=|>\=|\s(<|>)\s/,/\=\=|!\=/,/\=>/,/!(?=\w)/,/(?<=\s)(\?|:)(?=\s)/,r,/(?<=\s)(\?\?)(?=\s)/,/(?<!\?)\?(?!\?|\.|\[)/,/%[^%]|\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/(?<!\=|!)\=(?!\=|>)/],T=A.concat(...h),y={
+},R=[/--/,/\+\+/,/\&\&|\|\|/,/\*\=|\/\=|\%\=|\+\=|-\=/,/\&\=|\^\=|<<\=|>>\=|>>>\=|\|\=/,/\&|~|\^|\|/,/<<|>>/,/<\=|>\=|\s(<|>)\s/,/\=\=|!\=/,/\=>/,/!(?=\w)/,/(?<=\s)(\?|:)(?=\s)/,r,/(?<=\s)(\?\?)(?=\s)/,/(?<!\?)\?(?!\?|\.|\[)/,/%[^%]|\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/(?<!\=|!)\=(?!\=|>)/],T=h.concat(...v),y={
 $pattern:t.concat(/(?<!\.)\b/,a,/\b/),keyword:[...b,...d,...E],type:m,literal:S
-},L=[...S,...b,...d,...A,...h,...v,...u,...E],N={
+},O=[...S,...b,...d,...h,...v,...A,...u,...E],L={
 match:t.concat(/\b/,t.either(...u),/\b/),scope:"variable.language",relevance:0
-},O=[{match:[t.concat(/\b/,t.either(...v)),/\./,a,/\b\s*(?![\.\(])/],scope:{
+},N=[{match:[t.concat(/\b/,t.either(...A)),/\./,a,/\b\s*(?![\.\(])/],scope:{
 1:"built_in",2:"punctuation",3:"variable"},relevance:0},{
-match:[t.concat(/\b/,t.either(...h)),/\./,a,/\b\s*(?![\.\(])/],scope:{
+match:[t.concat(/\b/,t.either(...v)),/\./,a,/\b\s*(?![\.\(])/],scope:{
 1:"built_in",2:"punctuation",3:"type"},relevance:0},{
-match:[t.concat(/\b/,t.either(...A)),/\./,n,/\b(?=\.)/],scope:{1:"built_in",
+match:[t.concat(/\b/,t.either(...h)),/\./,n,/\b(?=\.)/],scope:{1:"built_in",
 2:"punctuation",3:"type"}},{
-match:[t.concat(/\b/,t.either(...A,...h)),/\./,n,/\b(?!\.)/],scope:{
+match:[t.concat(/\b/,t.either(...h,...v)),/\./,n,/\b(?!\.)/],scope:{
 1:"built_in",2:"punctuation",3:"keyword"}},{
 match:[/\bTrigger\b/,/\./,/(isExecuting|isInsert|isUpdate|isDelete|isBefore|isAfter|isUndelete|new|newMap|old|oldMap|size|operationType)\b(?!\.)/],
 scope:{1:"built_in",2:"punctuation",3:"type"},relevance:10},{
@@ -26,15 +26,15 @@ match:[/\btrigger\b/,/\./,"operationtype",/\./,t.concat(n,/\b/)],scope:{
 1:"built_in",2:"punctuation",3:"keyword",4:"punctuation",5:"variable.constant"},
 relevance:10}],C=[{
 match:t.either(",",/;/,/(?<=\w)\>/,/\<(?=\w)/,/\{|\}/,/\(|\)/,/\{|\}/),
-scope:"punctuation",relevance:0},g],I=e.inherit(e.APOS_STRING_MODE,{
+scope:"punctuation",relevance:0},g],D=e.inherit(e.APOS_STRING_MODE,{
 scope:"string",relevance:0,contains:[{match:/\\'/,scope:"literal",relevance:0}]
-}),w=e.COMMENT("//",/[$\n]/,{relevance:0}),D=[e.COMMENT("/\\*","\\*/",{
+}),I=e.COMMENT("//",/[$\n]/,{relevance:0}),_=[e.COMMENT("/\\*","\\*/",{
 relevance:0,contains:[{begin:/\w+@/,relevance:0},{
 match:[/@(?:exception|throws)/,o,a],scope:{1:"doctag",3:"title.class"},
 relevance:0},{begin:"@[A-Za-z_-]+",scope:"doctag",relevance:0},{
-match:[/(?<=@param)\s+/,a],scope:{2:"variable"},relevance:0},{excludeBegin:!0,
-excludeEnd:!0,contains:[e.BACKSLASH_ESCAPE],relevance:0,variants:[{begin:"`",
-end:"`",scope:"subst"},{begin:/'/,end:/'/,scope:"string"}]}]}),w],_={
+match:[/(?<=@param)\s+/,a],scope:{2:"variable"},relevance:0},{
+contains:[e.BACKSLASH_ESCAPE],relevance:0,variants:[{begin:"`",end:"`",
+scope:"string"},{begin:/'/,end:/'/,scope:"string"}],contains:[]}]}),I],w={
 match:t.either(...R),scope:"operator",relevance:0},U={match:/(?<!\.)\bId\b/,
 scope:"type",relevance:8},f=[{begin:/\b(list|set|map)(?=\s*<)/,
 beginScope:"type",end:/\>+/,endScope:"punctuation",contains:[{match:/\<|\,/,
@@ -44,30 +44,31 @@ match:[t.optional(n),/\[/,t.optional(/\d+/),/\]/],scope:{1:"variable",
 2:"punctuation"},relevance:0}],M=[{match:t.concat(c,/\b(?!\s*\()/),scope:"meta"
 },{scope:"meta",begin:[t.concat(c,/\b/),/\s*/,/\(/],beginScope:{3:"punctuation"
 },end:/\)/,endScope:"punctuation",contains:[{match:[n,/\s*=/],scope:{
-1:"keyword",2:"operator"},contains:[_]},I,p],keywords:{literal:S}}],k={
+1:"keyword",2:"operator"},contains:[w]},D,p],keywords:{literal:S}}],k={
 match:[/\b[a-zA-Z0-9\.]*Exception/,o,a],scope:{1:"type",3:"variable"},
-relevance:0},F={match:[/(?<!\.)/,n,/\s*(?=\=[^\>])/],scope:{2:"variable"},
-relevance:0},P={match:[/(?<=\=\s*\()/,a,"(?=\\)\\s*"+a+")"],scope:{2:"type"},
-relevance:0},Y={match:[/\bnew\s+/,a,s],scope:{2:"type"},relevance:0};let W={
-scope:"params_call",begin:/\(/,beginScope:"punctuation",end:/\)/,
-endScope:"punctuation",relevance:0,keywords:y,contains:[]};const x=[{
-match:[/(?<=\.)/,a,s],scope:{2:"title.function.invoke"},relevance:1,
-contains:[...i],starts:W},{match:[/^\s*/,l(...b),a,s],scope:{
-3:"title.function.invoke"},relevance:1,starts:W}]
-;W.contains=[I,Y,D,_,f,O,p,U,x,{keywords:{KEYWORDS:y},
+relevance:0},F=[{match:[/(?<!\.)/,n,/\s*(?=\=[^\>])/],scope:{2:"variable"},
+relevance:0},{match:[n,"(?=\\s+"+a+/\s*\=/+")"],scope:{1:"type"},relevance:0},{
+match:[n,o,n,/\s*(?=\=[^\>])/],scope:{1:"type",3:"variable"},relevance:0}],P={
+match:[/(?<=\=\s*\()/,a,"(?=\\)\\s*"+a+")"],scope:{2:"type"},relevance:0},Y={
+match:[/\bnew\s+/,a,s],scope:{2:"type"},relevance:0};let W={scope:"params_call",
+begin:/\(/,beginScope:"punctuation",end:/\)/,endScope:"punctuation",relevance:0,
+keywords:y,contains:[]};const H=[{match:[/(?<=\.)/,a,s],scope:{
+2:"title.function.invoke"},relevance:1,contains:[...i],starts:W},{
+match:[/^\s*/,l(...b),a,s],scope:{3:"title.function.invoke"},relevance:1,
+starts:W}];W.contains=[D,Y,_,w,f,N,p,U,H,{keywords:{KEYWORDS:y},
 match:t.concat(/(?<=\s|\(|\,)/,l(...S),a,/\b/,/(?!\.)/),scope:"variable",
 relevance:0},{match:/\(|\,|\./,scope:"punctuation",relevance:0},{match:a,
-scope:"variable"}];const H={scope:"params",end:/\)/,endScope:"punctuation",
-relevance:1,keywords:y,contains:[p,I,D,f,...O,{match:/\,|\(/,scope:"punctuation"
+scope:"variable"}];const x={scope:"params",end:/\)/,endScope:"punctuation",
+relevance:1,keywords:y,contains:[p,D,_,f,...N,{match:/\,|\(/,scope:"punctuation"
 },U,{match:[/(?<=\(|\,)\s*/,a,/(?=\s)/],scope:{2:"type"}},{
 match:[o,a,/\s*(?=[,)])/],scope:{2:"variable"}}]},B={
 match:[/\bswitch\s+on\s+/,a],scope:{1:"keyword",2:"variable"}};return{
-name:"Apex",aliases:["apex","lightning","soql"],case_insensitive:!0,
+name:"Apex",aliases:["apex","lightning","soql","sosl"],case_insensitive:!0,
 disableAutodetect:!1,ignoreIllegals:!1,keywords:y,
 illegal:["</","<#","<]","<div>","\x3c!--","!DOCTYPE",/<iframe\b/,/^#/,/^import \.[a-zA-Z]+\./,/^import [\w]+/,/^import$/,/^include </,/^use\s+</,/\b(const|var)\s+\w+\s*=/,/\bstruct\b/,"System.log","console.log",/\bfor\s+\w+\s+IN\s+/,/\bif\s+\w+\s+IN\s+/,/\bend\s+if\b/,/\bend\s+select\b/,/\b(int|var)\s+\w+\s+=/,/\b(int[0-9]+|bool)\b/,/\b\$/,/\b_/,"::=",/\s#[a-zA-Z]/,/\s_[a-zA-Z]/,/\s\$[a-zA-Z]/,"#if","%if",/\bif(?!\s+\()/,"%endif","#endif","#_",/\d\s+\d/,/\w::\w/,/\bfloat\b/,/(SELECT|RETURNING)\s+\*/,/END\s+LOOP/,/CREATE\s+FUNCTION/,/\bint\b/,/import\s+\w+\s+=\s+require\("\w+"\)/,"/^include\b/",/\buse\s+strict\b/,/\w+\s+=\s+"\S*";/,/\/include\//,/\Anamespace\b/,/\bend(\.)?\n/,'"""',/\+\+\+/,/<%/,"<%#","%%>","<%%",":-",/\bmergesort\(/,/\bvar\s+env\b/,/\bdef\b\s\W:/,/"[^"]+"/,/\(\*|\*\)/],
-contains:[D,M,I,p,P,f,[{begin:[/\btrigger/,o,a,o,"on",o,a],beginScope:{
+contains:[_,M,D,p,P,f,[{begin:[/\btrigger/,o,a,o,"on",o,a],beginScope:{
 1:"keyword",3:"title.class",5:"operator",7:"type"},end:/(?=\{)/,returnEnd:!0,
-contains:[D,{begin:/\(/,end:/\)/,contains:[{
+contains:[_,{begin:/\(/,end:/\)/,contains:[{
 match:/\b(before|after)\s+(insert|update|delete|merge|undelete)\b/,
 scope:"keyword",relevance:5},g]}]},{relevance:5,
 match:/\b(with|without|inherited)\s+sharing\b/,scope:"keyword"},{
@@ -77,31 +78,31 @@ match:[/(?<=\bclass)\s+/,a],scope:{2:"title.class"}},{returnEnd:!0,
 endsWithParent:!0,beginKeywords:"implements extends",end:/\{/,contains:[{
 match:[n,/(?=\.)/],scope:{1:"built_in"}},{match:t.concat(n,/(?=\>)/),
 scope:"type"},{match:n,scope:"title.class.inherited"},{match:/<|>|,/,
-scope:"punctuation"},O],relevance:0}]},{begin:[/\benum\s+/,a,/\s*\{/],
+scope:"punctuation"},N],relevance:0}]},{begin:[/\benum\s+/,a,/\s*\{/],
 beginScope:{2:"type",3:"punctuation"},end:/\}/,endScope:"punctuation",
-relevance:0,contains:[D,g,{match:t.concat(n),scope:"variable.constant"}]},{
+relevance:0,contains:[_,g,{match:t.concat(n),scope:"variable.constant"}]},{
 match:[/(public|private|protected)\s+/,a,s],scope:{1:"keyword",
-2:"title.function"},starts:H,relevance:1},{
+2:"title.function"},starts:x,relevance:1},{
 match:[/(?<!new)(?<!return)(?<=\<|\>|\w)\s+/,a,s],scope:{2:"title.function"},
-relevance:1,starts:H}],[{match:/as\s+(user|system)\b/,scope:"keyword"}],k,{
-match:[/\bfor\b\s*/,/\(/,a,o,a,/\s*/,/:/],scope:{3:"type",5:"variable",
-7:"operator"}},x,Y,N,O,U,{begin:[/\[/,/\s*(?=(SELECT|FIND)\b)/],end:/\]/,
-beginScope:{1:"punctuation"},endScope:"punctuation",scope:"soql",relevance:10,
-endsWithParent:!0,keywords:{literal:y.literal,built_in:T},contains:[p,_,I,g,{
-match:/\(|\)/,scope:"punctuation",relevance:0},...i,{begin:[/\bFROM\b/,o],
-beginScope:{1:"keyword"},end:/(?=\bWHERE\b|\]|\s|\))/,contains:[{match:a,
-scope:"type"},...i]},{
-match:t.concat(/\b/,t.either("CALENDAR_MONTH","CALENDAR_QUARTER","CALENDAR_YEAR","DAY_IN_MONTH","DAY_IN_WEEK","DAY_IN_YEAR","DAY_ONLY","FISCAL_MONTH","FISCAL_QUARTER","FISCAL_YEAR","HOUR_IN_DAY","WEEK_IN_MONTH","WEEK_IN_YEAR","AVG","convertCurrency","convertTimezone","COUNT_DISTINCT","COUNT","DISTANCE","EXCLUDES","FIELDS","FORMAT","GEOLOCATION","GROUPING","ROLLUP","CUBE","INCLUDES","MAX","MIN","SUM","toLabel"),/\b/),
+relevance:1,starts:x}],[{match:/as\s+(user|system)\b/,scope:"keyword",
+relevance:5}],k,{match:[/\bfor\b\s*/,/\(/,a,o,a,/\s*/,/:/],scope:{3:"type",
+5:"variable",7:"operator"}},H,Y,L,N,U,{begin:[/\[/,/\s*(?=(SELECT|FIND)\b)/],
+end:/\]/,beginScope:{1:"punctuation"},endScope:"punctuation",scope:"soql",
+relevance:10,endsWithParent:!0,keywords:{literal:y.literal,built_in:T},
+contains:[p,w,D,g,{match:/\(|\)/,scope:"punctuation",relevance:0},...i,{
+begin:[/\bFROM\b/,o],beginScope:{1:"keyword"},end:/(?=\bWHERE\b|\]|\s|\))/,
+contains:[{match:a,scope:"type"},...i]},{
+match:t.concat(/\b/,t.either("CALENDAR_MONTH","CALENDAR_QUARTER","CALENDAR_YEAR","DAY_IN_MONTH","DAY_IN_WEEK","DAY_IN_YEAR","DAY_ONLY","FISCAL_MONTH","FISCAL_QUARTER","FISCAL_YEAR","HOUR_IN_DAY","WEEK_IN_MONTH","WEEK_IN_YEAR","AVG","convertCurrency","convertTimezone","COUNT_DISTINCT","COUNT","DISTANCE","EXCLUDES","FIELDS","FORMAT","GEOLOCATION","GROUPING","ROLLUP","CUBE","INCLUDES","MAX","MIN","SUM","toLabel","USER_MODE","SYSTEM_MODE","SECURITY_ENFORCED"),/\b/),
 scope:"title.function"},{match:/\b(GROUP|ORDER)\s+BY\b/,scope:"title.function"
 },{match:/\b(TODAY|TOMORROW|YESTERDAY)\b/,scope:"keyword"},{
 match:/(NEXT|LAST|THIS)_(90_DAY|DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEEK|YEAR)S?\b/,
 scope:"keyword",relevance:8},{
 match:[/(NEXT|LAST)_N_(DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEEK|YEAR)S/,/\s*:\s*/,/\d+/],
 scope:{1:"keyword",2:"operator",3:"number"},relevance:8},{
-match:t.concat(/\b/,t.either(...y.keyword,"ABOVE_OR_BELOW","ABOVE","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","ASC","BELOW","CATEGORY","CONTAINS","CUSTOM","DATA","DESC","DIVISION","ELSE","END","FIND","FROM","METADATA","NETWORK","ON","PricebookId","RETURNING","ROLLUP","ROWS","SEARCH","SECURITY_ENFORCED","SELECT","SNIPPET","SORT","SPELL_CORRECTION","STANDARD","THEN","USER_MODE","USING","WHEN","WHERE","WITH","SCOPE","Delegated","Everything","Mine","My_Territory","My_Team_Territory","Team","AND","AT","FIRST","FOR","HAVING","IN","LAST","LIKE","LIMIT","LISTVIEW","NOT","NULLS","OFFSET","OR","REFERENCE","TRACKING","TYPEOF","UPDATE","VIEW","VIEWSTAT"),/\b/),
+match:t.concat(/\b/,t.either(...y.keyword,"ABOVE_OR_BELOW","ABOVE","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","ASC","BELOW","CATEGORY","CONTAINS","CUSTOM","DATA","DESC","DIVISION","ELSE","END","FIND","FROM","METADATA","NETWORK","ON","PricebookId","RETURNING","ROLLUP","ROWS","SEARCH","SELECT","SNIPPET","SORT","SPELL_CORRECTION","STANDARD","THEN","USING","WHEN","WHERE","WITH","SCOPE","Delegated","Everything","Mine","My_Territory","My_Team_Territory","Team","AND","AT","FIRST","FOR","HAVING","IN","LAST","LIKE","LIMIT","LISTVIEW","NOT","NULLS","OFFSET","OR","REFERENCE","TRACKING","TYPEOF","UPDATE","VIEW","VIEWSTAT"),/\b/),
 scope:"keyword"},{match:[/(?<=:)/,/\s*/,n,/(?!\()/],scope:{3:"variable"},
 relevance:0},{match:[/(?<=:|\.)/,a,/(?=\s*\()/],scope:{2:"title.function.invoke"
 },relevance:0},{match:/:/,scope:"operator",relevance:0}],illegal:"::"
-},B,F,_,C,i,{match:t.concat("(?<=this.)",a,"(?!\\()"),scope:"variable"},{
-match:[t.concat(/\b/,l(...L)),a,o,/(?=\{)/],scope:{2:"property"},relevance:0}]}}
+},B,F,w,C,i,{match:t.concat("(?<=this.)",a,"(?!\\()"),scope:"variable"},{
+match:[t.concat(/\b/,l(...O)),a,o,/(?=\{)/],scope:{2:"property"},relevance:0}]}}
 })();hljs.registerLanguage("apex",e)})();
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 8e39e4b..9902145 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
 			"version": "1.4.0",
 			"license": "MIT",
 			"dependencies": {
-				"@highlightjs/cdn-assets": "^11.9.0"
+				"@highlightjs/cdn-assets": "^11.11.1"
 			},
 			"devDependencies": {
 				"minimist": "^1.2.8",
diff --git a/package.json b/package.json
index 860ab30..36f1fca 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
 	},
 	"homepage": "https://github.com/highlightjs/highlightjs-apex#readme",
 	"dependencies": {
-		"@highlightjs/cdn-assets": "^11.9.0"
+		"@highlightjs/cdn-assets": "^11.11.1"
 	},
 	"devDependencies": {
 		"minimist": "^1.2.8",
diff --git a/src/languages/apex.js b/src/languages/apex.js
index 22c1149..1ff7447 100644
--- a/src/languages/apex.js
+++ b/src/languages/apex.js
@@ -133,17 +133,24 @@ export default function (hljs) {
     'Cache',
     'Canvas',
     'ChatterAnswers',
+    'CommerceOrders',
+    'fsccashflow',
     'CommercePayments',
     'ConnectApi',
+    'Context',
     'Database',
     'Datacloud',
-    'Dataweave',
+    'DataRetrieval',
     'DataSource',
+    'Dataweave',
     'Dom',
     'EventBus',
     'ExternalService',
     'Flow',
+    'FormulaEval',
     'Functions',
+    'id_verification',
+    'industriesDigitalLending',
     'Invocable',
     'KbManagement',
     'LxScheduler',
@@ -158,6 +165,9 @@ export default function (hljs) {
     'Search',
     'Sfc',
     'Sfdc_Checkout',
+    'IndustriesNlpSvc',
+    'PlaceQuote',
+    'Sfdc_Enablement',
     'sfdc_surveys',
     'Site',
     'Slack',
@@ -170,9 +180,8 @@ export default function (hljs) {
     'Wave'
   ];
 
-  // TODO: Check if these are necessary
   const SYSTEM_CLASSES = [
-    'AccessLevel',
+    //'AccessLevel',
     'Address',
     'Answers',
     'ApexPages',
@@ -201,7 +210,6 @@ export default function (hljs) {
     'FeatureManagement',
     'FlexQueue',
     'Formula',
-    'FormulaEval',
     'FormulaRecalcFieldError',
     'FormulaRecalcResult',
     'Http',
@@ -258,6 +266,7 @@ export default function (hljs) {
   const SYSTEM_ENUMS = [
     'AccessType',
     'AccessLevel',
+    'CallbackStatus',
     'DomainType',
     'JSONToken',
     'LoggingLevel',
@@ -278,11 +287,7 @@ export default function (hljs) {
     /\{|\}/
   ];
 
-  const PUNCTUATION_COMMA = {
-    match: /,/,
-    scope: 'punctuation',
-    relevance: 0
-  };
+  const PUNCTUATION_COMMA = { match: /,/, scope: 'punctuation', relevance: 0 };
 
   const OPERATORS_LIST = [
     /--/, // decrement
@@ -359,7 +364,7 @@ export default function (hljs) {
       match: [
         regex.concat(/\b/, regex.either(...NAMESPACE_LIST)),
         /\./,
-        APEX_IDENT_WORD_RE, 
+        APEX_IDENT_WORD_RE,
         /\b(?=\.)/
       ],
       scope: { 1: 'built_in', 2: 'punctuation', 3: 'type' }
@@ -419,9 +424,7 @@ export default function (hljs) {
     contains: [{ match: /\\'/, scope: 'literal', relevance: 0 }]
   });
 
-  const COMMENT_LINE = hljs.COMMENT('//', /[$\n]/, {
-    relevance: 0
-  });
+  const COMMENT_LINE = hljs.COMMENT('//', /[$\n]/, { relevance: 0 });
 
   const COMMENT_BLOCK = hljs.COMMENT('/\\*', '\\*/', {
     relevance: 0,
@@ -436,11 +439,7 @@ export default function (hljs) {
         scope: { 1: 'doctag', 3: 'title.class' },
         relevance: 0
       },
-      {
-        begin: '@[A-Za-z_-]+',
-        scope: 'doctag',
-        relevance: 0
-      },
+      { begin: '@[A-Za-z_-]+', scope: 'doctag', relevance: 0 },
       {
         match: [/(?<=@param)\s+/, APEX_IDENT_RE],
         scope: { 2: 'variable' },
@@ -450,15 +449,19 @@ export default function (hljs) {
         /* begin: '`',
         end: '`',
         scope: 'string', */
-        excludeBegin: true,
-        excludeEnd: true,
+        //excludeBegin: true,
+        //excludeEnd: true,
         contains: [hljs.BACKSLASH_ESCAPE],
         relevance: 0,
         variants: [
-          { begin: '`', end: '`', scope: 'subst' },
+          { begin: '`', end: '`', scope: 'string' }, //, beginScope: 'hidden', endScope: 'hidden' },
           { begin: /'/, end: /'/, scope: 'string' }
+        ],
+        contains: [
+          // {match: '`', scope: 'hidden'}
         ]
       }
+      // TODO : Code Sample in method header
     ]
   });
 
@@ -470,11 +473,7 @@ export default function (hljs) {
     relevance: 0
   };
 
-  const SALESFORCE_ID = {
-    match: /(?<!\.)\bId\b/,
-    scope: 'type',
-    relevance: 8
-  };
+  const SALESFORCE_ID = { match: /(?<!\.)\bId\b/, scope: 'type', relevance: 8 };
 
   const COLLECTIONS = [
     {
@@ -485,10 +484,7 @@ export default function (hljs) {
       endScope: 'punctuation',
       contains: [
         { match: /\<|\,/, scope: 'punctuation' },
-        {
-          match: APEX_IDENT_WORD_RE,
-          scope: 'type'
-        }
+        { match: APEX_IDENT_WORD_RE, scope: 'type' }
       ],
       relevance: 8
     },
@@ -505,10 +501,7 @@ export default function (hljs) {
     {
       // type[] var = new type[]{values}
       match: [APEX_IDENT_RE, /\[\]/], // array notation
-      scope: {
-        1: 'type',
-        2: 'punctuation'
-      },
+      scope: { 1: 'type', 2: 'punctuation' },
       relevance: 0
     }
   ];
@@ -535,18 +528,13 @@ export default function (hljs) {
       contains: [
         {
           match: [APEX_IDENT_WORD_RE, /\s*=/],
-          scope: {
-            1: 'keyword',
-            2: 'operator'
-          },
+          scope: { 1: 'keyword', 2: 'operator' },
           contains: [OPERATORS]
         },
         STRINGS,
         NUMBERS
       ],
-      keywords: {
-        literal: LITERALS
-      }
+      keywords: { literal: LITERALS }
     }
   ];
 
@@ -556,13 +544,26 @@ export default function (hljs) {
     scope: { 1: 'type', 3: 'variable' },
     relevance: 0
   };
-  const VAR_ASSIGN = {
-    // mynum =
-    // could also be a collection variable
-    match: [/(?<!\.)/, APEX_IDENT_WORD_RE, /\s*(?=\=[^\>])/],
-    scope: { 2: 'variable' },
-    relevance: 0
-  };
+  const VAR_ASSIGN = [
+    {
+      // mynum =
+      // could also be a collection variable
+      match: [/(?<!\.)/, APEX_IDENT_WORD_RE, /\s*(?=\=[^\>])/],
+      scope: { 2: 'variable' },
+      relevance: 0
+    },
+    {
+      // MyType mynum =
+      match: [APEX_IDENT_WORD_RE, '(?=\\s+' + APEX_IDENT_RE + /\s*\=/ + ')'],
+      scope: { 1: 'type' },
+      relevance: 0
+    },
+    {
+      match: [APEX_IDENT_WORD_RE, SPACE, APEX_IDENT_WORD_RE, /\s*(?=\=[^\>])/],
+      scope: { 1: 'type', 3: 'variable' },
+      relevance: 0
+    }
+  ];
   const CASTING = {
     // Casting
     match: [/(?<=\=\s*\()/, APEX_IDENT_RE, '(?=\\)\\s*' + APEX_IDENT_RE + ')'],
@@ -672,18 +673,9 @@ export default function (hljs) {
     beginKeywords: 'implements extends',
     end: /\{/,
     contains: [
-      {
-        match: [APEX_IDENT_WORD_RE, /(?=\.)/],
-        scope: { 1: 'built_in' }
-      },
-      {
-        match: regex.concat(APEX_IDENT_WORD_RE, /(?=\>)/),
-        scope: 'type'
-      },
-      {
-        match: APEX_IDENT_WORD_RE,
-        scope: 'title.class.inherited'
-      },
+      { match: [APEX_IDENT_WORD_RE, /(?=\.)/], scope: { 1: 'built_in' } },
+      { match: regex.concat(APEX_IDENT_WORD_RE, /(?=\>)/), scope: 'type' },
+      { match: APEX_IDENT_WORD_RE, scope: 'title.class.inherited' },
       { match: /<|>|,/, scope: 'punctuation' },
       NAMESPACES
     ],
@@ -701,12 +693,7 @@ export default function (hljs) {
       SPACE,
       APEX_IDENT_RE
     ],
-    beginScope: {
-      1: 'keyword',
-      3: 'title.class',
-      5: 'operator',
-      7: 'type'
-    },
+    beginScope: { 1: 'keyword', 3: 'title.class', 5: 'operator', 7: 'type' },
     end: /(?=\{)/,
     returnEnd: true,
     //scope: 'clause: trigger_declaration',
@@ -759,10 +746,7 @@ export default function (hljs) {
     contains: [
       COMMENTS,
       PUNCTUATION_COMMA,
-      {
-        match: regex.concat(APEX_IDENT_WORD_RE),
-        scope: 'variable.constant'
-      }
+      { match: regex.concat(APEX_IDENT_WORD_RE), scope: 'variable.constant' }
     ]
   };
 
@@ -779,10 +763,7 @@ export default function (hljs) {
         APEX_IDENT_RE,
         SPACEPARENS_LOOKAHEAD
       ],
-      scope: {
-        1: 'keyword',
-        2: 'title.function'
-      },
+      scope: { 1: 'keyword', 2: 'title.function' },
       starts: PARAMS_DECLARATION,
       relevance: 1
     },
@@ -804,12 +785,7 @@ export default function (hljs) {
     scope: { 1: 'keyword', 2: 'variable' }
   };
 
-  const DML_OPERATIONS = [
-    {
-      match: /as\s+(user|system)\b/,
-      scope: 'keyword'
-    }
-  ];
+  const DML_OPERATIONS = [{ match: /as\s+(user|system)\b/, scope: 'keyword', relevance: 5 }];
 
   /**
    * SOQL SECTION
@@ -845,14 +821,12 @@ export default function (hljs) {
     'ROLLUP',
     'ROWS',
     'SEARCH',
-    'SECURITY_ENFORCED',
     'SELECT',
     'SNIPPET',
     'SORT',
     'SPELL_CORRECTION',
     'STANDARD',
     'THEN',
-    'USER_MODE',
     'USING',
     'WHEN',
     'WHERE',
@@ -910,7 +884,10 @@ export default function (hljs) {
     'MAX',
     'MIN',
     'SUM',
-    'toLabel'
+    'toLabel',
+    'USER_MODE',
+    'SYSTEM_MODE',
+    'SECURITY_ENFORCED'
   ];
 
   const SOQL_DATE_SELECT_FUNCTIONS = [
@@ -945,11 +922,7 @@ export default function (hljs) {
       /\s*:\s*/,
       /\d+/
     ],
-    scope: {
-      1: 'keyword',
-      2: 'operator',
-      3: 'number'
-    },
+    scope: { 1: 'keyword', 2: 'operator', 3: 'number' },
     relevance: 8
   };
   const SOQL_DATE_LITERALS = [
@@ -966,10 +939,7 @@ export default function (hljs) {
     scope: 'soql',
     relevance: 10,
     endsWithParent: true,
-    keywords: {
-      literal: KEYWORDS.literal,
-      built_in: BUILT_INS
-    },
+    keywords: { literal: KEYWORDS.literal, built_in: BUILT_INS },
     contains: [
       NUMBERS,
       OPERATORS,
@@ -993,10 +963,7 @@ export default function (hljs) {
         ),
         scope: 'title.function'
       },
-      {
-        match: /\b(GROUP|ORDER)\s+BY\b/,
-        scope: 'title.function'
-      },
+      { match: /\b(GROUP|ORDER)\s+BY\b/, scope: 'title.function' },
       ...SOQL_DATE_LITERALS,
       {
         match: regex.concat(
@@ -1038,11 +1005,7 @@ export default function (hljs) {
       /\s*/,
       /:/
     ],
-    scope: {
-      3: 'type',
-      5: 'variable',
-      7: 'operator'
-    }
+    scope: { 3: 'type', 5: 'variable', 7: 'operator' }
   };
 
   const THIS = {
@@ -1128,7 +1091,7 @@ export default function (hljs) {
 
   return {
     name: 'Apex',
-    aliases: ['apex', 'lightning', 'soql'],
+    aliases: ['apex', 'lightning', 'soql', 'sosl'],
     case_insensitive: true, // language is case-insensitive
     disableAutodetect: false,
     ignoreIllegals: false,
diff --git a/src/styles/monokai-sublime-apex.css b/src/styles/monokai-sublime-apex.css
index fc3fbfe..e08880b 100644
--- a/src/styles/monokai-sublime-apex.css
+++ b/src/styles/monokai-sublime-apex.css
@@ -10,8 +10,8 @@ code.hljs {
 }
 /*
 
-Monokai Sublime Apex style derived from Sublime MavensMate Monokai theme by David Schach https://github.com/dschach
-Sublime MavensMate Monokai theme by SubC4i https://github.com/SubC4i/Sublime-MavensMate-Monokai
+Monokai Sublime Apex style by David Schach https://github.com/dschach
+Derived from Sublime MavensMate Monokai theme by SubC4i https://github.com/SubC4i/Sublime-MavensMate-Monokai
 Monokai-Sublime style derived from Monokai by noformnocontent http://nn.mit-license.org/
 Monokai color scheme by Wimer Hazenberg 2006 https://monokai.nl/
 */