diff --git a/syntaxes/poweron.language.json b/syntaxes/poweron.language.json
index 9bf83ad..23e0074 100644
--- a/syntaxes/poweron.language.json
+++ b/syntaxes/poweron.language.json
@@ -15,9 +15,6 @@
         },
         {
             "include": "#comment"
-        },
-        {
-            "include": "#operator"
         }
     ],
     "repository": {
@@ -54,7 +51,7 @@
             "patterns": [
                 {
                     "name": "keyword.control.poweron",
-                    "match": "[\\s]*(?i)(IF|ELSE|WHILE|FOR)[\\s]+"
+                    "match": "(?i)(?<!\\.)\\b(IF|WHILE|FOR)\\b(?![?!])"
                 },
                 {
                     "include": "#keyword"
@@ -67,6 +64,9 @@
                 },
                 {
                     "include": "#SpecialPowerOnKeywords"
+                },
+                {
+                    "include": "#SpecialPowerOnOperators"
                 }
             ]
         },
@@ -74,7 +74,7 @@
             "patterns": [
                 {
                     "name": "keyword.control.poweron",
-                    "match": "[\\s]*(?i)(#INCLUDE|ABS|ACROSS|ALL|ANYSERVICE|ANYWARNING|BELL|BLINK|BRIGHT|CALL|CAPITALIZE|CHARACTERREAD|CHARACTERSEARCH|CHRVALUE|CODEREAD|COL|CTRLCHR|DATAFILE|DATASIZE|DATEOFFSET|DATEREAD|DATEVALUE|DAY|DAYOFWEEK|DIALOGCLOSE|DIALOGDISPLAY|DIALOGENDGROUPBOX|DIALOGENDGROUPING|DIALOGINTROTEXT|DIALOGNEWCOLUMN|DIALOGPROMPTCHAR|DIALOGPROMPTCODE|DIALOGPROMPTCOMBOEND|DIALOGPROMPTCOMBOOPTION|DIALOGPROMPTCOMBOSTART|DIALOGPROMPTDATE|DIALOGPROMPTLISTEND|DIALOGPROMPTLISTOPTION|DIALOGPROMPTLISTSTART|DIALOGPROMPTMONEY|DIALOGPROMPTNUMBER|DIALOGPROMPTPASSWORD|DIALOGPROMPTRATE|DIALOGPROMPTYESNO|DIALOGSTART|DIALOGSTARTGROUPBOX|DIALOGSTARTGROUPING|DIALOGTEXTLISTEND|DIALOGTEXTLISTOPTION|DIALOGTEXTLISTSTART|DIM|DIVPROJECTCALC|DIVPROJECTINIT|EMAILLINE|EMAILSEND|EMAILSTART|ENTERCHARACTER|ENTERCODE|ENTERDATE|ENTERDELIMITER|ENTERLINE|ENTERMONEY|ENTERNUMBER|ENTERRATE|ENTERYESNO|EVERY #|EXECUTE|EXP|FILEARCHIVEADD|FILEARCHIVEEXTRACT|FILECLOSE|FILECREATE|FILEDECRYPT|FILEDELETE|FILEENCRYPT|FILEGETPOS|FILELISTCLOSE|FILELISTOPEN|FILELISTREAD|FILEOPEN|FILEREAD|FILEREADLINE|FILESETPOS|FILEWRITE|FILEWRITELINE|FLOATVALUE|FLOOR|FMPERFORM|FORMAT|FORMLENGTH|FTPCLOSE|FTPCMD|FTPGET|FTPLOGIN|FTPOPEN|FTPPUT|FULLYEAR|GETDATACHAR|GETDATADATE|GETDATAMONEY|GETDATANUMBER|GETDATARATE|GETFIELDDATAMAX|GETFIELDDATATYPE|GETFIELDHELPFILE|GETFIELDMNEMONIC|GETFIELDNAME|GETFIELDNUMBER|HEADER|HEADERS|HOUR|HPBOXDRAW|HPESC|HPFONT|HPLINEDRAW|HPLINESPERINCH|HPRESET|HPSETUP|HPUNDERLINE|HPXPOS|HPYPOS|HTMLVIEWDISPLAY|HTMLVIEWLINE|HTMLVIEWOPEN|INITCREDITREPORT|INITSUBROUTINE|INT|LABELS|LEFT|LENGTH|LOANPROJECTCALC|LOANPROJECTINIT|LOG|LOWERCASE|MINUTE|MOD|MONEYREAD|MONTH|NEWLINE|NEWPAGE|NONANSISTANDARD|NONE|NUMBERREAD|OUTPUTCLOSE|OUTPUTOPEN|OUTPUTSWITCH|OVERDRAWAVAILABLECALC|OVERDRAWAVAILABLEINIT|POPUPMESSAGE|PRINTCONTROL|PROCEDURE|PULLCREDITREPORT|PWR|RATEREAD|REPEATCHR|REPORTCATEGORY|RIGHT|SCREENXYPOS|SEGMENT|STARTING|STOPBLINK|SUBTOTAL|SUPPRESS|SUPPRESSNEWLINE|TERMINATE|TITLE|TRAILERS|TRANPERFORM|UNTIL|UPPERCASE|VALUE|WHILELIMIT|WIDTH|WINDDECONNECT|WINDDEDISCONNECT|WINDDEEXECUTE|WINDDEPOKEDATA|WINDOWSSEND|WINMESSAGEFIELD|WINMESSAGESEND|WINMESSAGESTART|WINMODETEXT|WINMODEWINDOWS|YEAR|YESNOPROMPT|YESNOREAD|DEFINE|LETTER|PRINT|SELECT|SETUP|SORT|TARGET|TOTAL|ANY|EACH|NOT|WITH|THEN|DO|END)[\\s]+"
+                    "match": "(?i)(?<!\\.)\\b(\\#INCLUDE|ABS|ACROSS|ALL|ANYSERVICE|ANYWARNING|BELL|BLINK|BRIGHT|CALL|CAPITALIZE|CHARACTERREAD|CHARACTERSEARCH|CHRVALUE|CODEREAD|COL|CTRLCHR|DATAFILE|DATASIZE|DATEOFFSET|DATEREAD|DATEVALUE|DAY|DAYOFWEEK|DIALOGCLOSE|DIALOGDISPLAY|DIALOGENDGROUPBOX|DIALOGENDGROUPING|DIALOGINTROTEXT|DIALOGNEWCOLUMN|DIALOGPROMPTCHAR|DIALOGPROMPTCODE|DIALOGPROMPTCOMBOEND|DIALOGPROMPTCOMBOOPTION|DIALOGPROMPTCOMBOSTART|DIALOGPROMPTDATE|DIALOGPROMPTLISTEND|DIALOGPROMPTLISTOPTION|DIALOGPROMPTLISTSTART|DIALOGPROMPTMONEY|DIALOGPROMPTNUMBER|DIALOGPROMPTPASSWORD|DIALOGPROMPTRATE|DIALOGPROMPTYESNO|DIALOGSTART|DIALOGSTARTGROUPBOX|DIALOGSTARTGROUPING|DIALOGTEXTLISTEND|DIALOGTEXTLISTOPTION|DIALOGTEXTLISTSTART|DIM|DIVPROJECTCALC|DIVPROJECTINIT|EMAILLINE|EMAILSEND|EMAILSTART|ENTERCHARACTER|ENTERCODE|ENTERDATE|ENTERDELIMITER|ENTERLINE|ENTERMONEY|ENTERNUMBER|ENTERRATE|ENTERYESNO|EVERY|EXECUTE|EXP|FILEARCHIVEADD|FILEARCHIVEEXTRACT|FILECLOSE|FILECREATE|FILEDECRYPT|FILEDELETE|FILEENCRYPT|FILEGETPOS|FILELISTCLOSE|FILELISTOPEN|FILELISTREAD|FILEOPEN|FILEREAD|FILEREADLINE|FILESETPOS|FILEWRITE|FILEWRITELINE|FLOATVALUE|FLOOR|FMPERFORM|FORMAT|FORMLENGTH|FTPCLOSE|FTPCMD|FTPGET|FTPLOGIN|FTPOPEN|FTPPUT|FULLYEAR|GETDATACHAR|GETDATADATE|GETDATAMONEY|GETDATANUMBER|GETDATARATE|GETFIELDDATAMAX|GETFIELDDATATYPE|GETFIELDHELPFILE|GETFIELDMNEMONIC|GETFIELDNAME|GETFIELDNUMBER|HEADER|HEADERS|HOUR|HPBOXDRAW|HPESC|HPFONT|HPLINEDRAW|HPLINESPERINCH|HPRESET|HPSETUP|HPUNDERLINE|HPXPOS|HPYPOS|HTMLVIEWDISPLAY|HTMLVIEWLINE|HTMLVIEWOPEN|INITCREDITREPORT|INITSUBROUTINE|INT|LABELS|LEFT|LENGTH|LOANPROJECTCALC|LOANPROJECTINIT|LOG|LOWERCASE|MINUTE|MOD|MONEYREAD|MONTH|NEWLINE|NEWPAGE|NONANSISTANDARD|NONE|NUMBERREAD|OUTPUTCLOSE|OUTPUTOPEN|OUTPUTSWITCH|OVERDRAWAVAILABLECALC|OVERDRAWAVAILABLEINIT|POPUPMESSAGE|PRINTCONTROL|PROCEDURE|PULLCREDITREPORT|PWR|RATEREAD|REPEATCHR|REPORTCATEGORY|RIGHT|SCREENXYPOS|SEGMENT|STARTING|STOPBLINK|SUBTOTAL|SUPPRESS|SUPPRESSNEWLINE|TERMINATE|TITLE|TRAILERS|TRANPERFORM|UNTIL|UPPERCASE|VALUE|WHILELIMIT|WIDTH|WINDDECONNECT|WINDDEDISCONNECT|WINDDEEXECUTE|WINDDEPOKEDATA|WINDOWSSEND|WINMESSAGEFIELD|WINMESSAGESEND|WINMESSAGESTART|WINMODETEXT|WINMODEWINDOWS|YEAR|YESNOPROMPT|YESNOREAD|DEFINE|LETTER|PRINT|SELECT|SETUP|SORT|TARGET|TOTAL|ANY|EACH|ELSE|WITH|THEN|DO|END)\\b(?![?!])"
                 }
             ]
         },
@@ -82,7 +82,7 @@
             "patterns": [
                 {
                     "name": "support.function.poweron",
-                    "match": "[\\s]*(?i)(ACCESS|ACCOUNTCHANGE|AFTERLAST|APPEND|ASCII|AUDIO|BEFOREFIRST|BLOCKSIZE|CARDCREATIONWIZARD|CERTIFICATE|CHANGE|CHECKDISBURSEDWIZARD|CHECKORDER|CLEARSERVICE|CLEARWARNING|COLLECTION|COPYAPP|CREATE|CREATEFINANCEFROMCREDREP|CUSTOMFORMS|CUSTOMFORMSWINDOWS|DELETE|EBCDIC|ESCROW|ESCROWANALYSIS|HOLD|INSERT|LANDSCAPE|LASTACCOUNT|LASTCREATE|LNSEGMENT|LOC|MCW|MCWINTERACTIVE|MD5HASH|MICRACCOUNTNUMBER|MODIFY|NEXT|NEXTACCOUNT|NEXTCARD|NEXTCHECK|NEXTCOLLATERAL|NEXTCTR|NEXTDOCUMENT|NEXTMBRADDRESS|OFACDETAILS|PASSWORDHASH|PORTRAIT|PREFIX|QUEUECREDITREPORT|READ|READWRITE|RECORDSIZE|REMOVE|REVISE|REVLANDSCAPE|REVPORTRAIT|SAVEMODE|SCHEDULE|SET|SETSERVICE|SETWARNING|STATELESS|SUBROUTINE|SYMCONNECT|TARGETFILE|TRANSACTION|TRANSFER|UNIQUEKEY|VALIDATEFIELDSET|VALIDATION|VIN|WINDOWS|WINDOWSPRINT|WRAP|WRITE)[\\s]+"
+                    "match": "(?i)(?<!\\.)\\b(ACCESS|ACCOUNTCHANGE|AFTERLAST|APPEND|ASCII|AUDIO|BEFOREFIRST|BLOCKSIZE|CARDCREATIONWIZARD|CERTIFICATE|CHANGE|CHECKDISBURSEDWIZARD|CHECKORDER|CLEARSERVICE|CLEARWARNING|COLLECTION|COPYAPP|CREATE|CREATEFINANCEFROMCREDREP|CUSTOMFORMS|CUSTOMFORMSWINDOWS|DELETE|EBCDIC|ESCROW|ESCROWANALYSIS|HOLD|INSERT|LANDSCAPE|LASTACCOUNT|LASTCREATE|LNSEGMENT|LOC|MCW|MCWINTERACTIVE|MD5HASH|MICRACCOUNTNUMBER|MODIFY|NEXT|NEXTACCOUNT|NEXTCARD|NEXTCHECK|NEXTCOLLATERAL|NEXTCTR|NEXTDOCUMENT|NEXTMBRADDRESS|OFACDETAILS|PASSWORDHASH|PORTRAIT|PREFIX|QUEUECREDITREPORT|READ|READWRITE|RECORDSIZE|REMOVE|REVISE|REVLANDSCAPE|REVPORTRAIT|SAVEMODE|SCHEDULE|SET|SETSERVICE|SETWARNING|STATELESS|SUBROUTINE|SYMCONNECT|TARGETFILE|TRANSACTION|TRANSFER|UNIQUEKEY|VALIDATEFIELDSET|VALIDATION|VIN|WINDOWS|WINDOWSPRINT|WRAP|WRITE)\\b(?![?!])"
                 }
             ]
         },
@@ -90,7 +90,7 @@
             "patterns": [
                 {
                     "name": "support.type.poweron",
-                    "match": "[\\s]*(?i)(LIVEINSTCHECK|PREVSYSTEMDATE|SYSACTUALDATE|SYSACTUALTIME|SYSCLIENTNUMBER|SYSCONSOLENUM|SYSHOSTNAME|SYSMEMOMODE|SYSSYMDIRECTORY|SYSTEMDATE|SYSUSERNUMBER|SYSWINDOWSLEVEL)[\\s]+"
+                    "match": "(?i)(?<!\\.)\\b(LIVEINSTCHECK|PREVSYSTEMDATE|SYSACTUALDATE|SYSACTUALTIME|SYSCLIENTNUMBER|SYSCONSOLENUM|SYSHOSTNAME|SYSMEMOMODE|SYSSYMDIRECTORY|SYSTEMDATE|SYSUSERNUMBER|SYSWINDOWSLEVEL)\\b(?![?!])"
                 }
             ]
         },
@@ -98,10 +98,19 @@
             "patterns": [
                 {
                     "name": "support.class.poweron",
-                    "match": "[\\s]*(?i)(ACCOUNT|ACHADDENDA|ACHADDINFO|ACHEDIT|ACHITEM|ACTIVITY|AGREEMENT|AGREEMENT TRANSACTION|ATMDIALOG|BILL|CARD|CASHLETTER|CASHORDER|CDMDIALOG|CHECK|COLLATERAL|COLLATERAL COLLHOLD|COLLATERAL DOCUMENT|CORPTRANSFER|CPWORKCARD|CREDREP|CREDREP ITEM|CTR|CTRACCOUNT|CTRPERSON|COMMENT|DEALER|EFT|EFT ADDENDAINFO|EXCPADDENDA|EXCPADDINFO|EXCPITEM|EXTERNALACCOUNT|GLACCOUNT|GLENTRY|GLHISTORY|GLSUBACCOUNT|GLTRAN|HOUSEHOLD|INVENTORY|INVOICE|IRS|IRS DISTRIBUTION|IRA|LOAN|LOAN BANKRUPTCY|LOANAPP|LOANAPP FINANCE|LOANAPP PERSON|LOOKUP|MBRADDRESS|MEMBERREC|NAME|NONACCTNAME|NOTE|PARTICIPANT|PARTICIPANT TRANSACTION|PARTICIPATION|PARTICIPATIONLOAN|POOL|PAYEE|PAYROLL|PLEDGE|PORTFOLIO|PREFERENCE|REMITTANCE|RESERVEPLAN|RESERVEPLAN LOAN|RESERVEPLAN TRANSACTION|SHARE|SHARE ANALYSIS|SHARE ANALYSISGROUP|SHARE ANALYSISPLAN|SAVINGS|SITE|SITE CASHORDERTYPE|TRACKING|USER|VENDOR|WESTERNUNION|WIRE|WIRE BENEFICIARYADV|WIRE BENEFICIARYFIADV|WIRE BENEFICIARYFIINFO|WIRE BENEFICIARYINFO|WIRE DRAWDOWNDEBITACCTADV|WIRE FITOFIINFO|WIRE INTERMEDFIADV|WIRE INTERMEDFIINFO|WIRE RECEIVERFIINFO|WIRE SERVICEMESSAGE|WIRE USCAUDITINFO|WORKLISTEDIT|WORKLISTEDIT WORKLISTFIELD)[\\s]+"
+                    "match": "(?i)(?<!\\.)\\b(ACCOUNT|ACHADDENDA|ACHADDINFO|ACHEDIT|ACHITEM|ACTIVITY|AGREEMENT|ATMDIALOG|BILL|CARD|CASHLETTER|CASHORDER|CDMDIALOG|CHECK|COLLATERAL|CORPTRANSFER|CPWORKCARD|CREDREP|CTR|CTRACCOUNT|CTRPERSON|COMMENT|DEALER|EFT|EXCPADDENDA|EXCPADDINFO|EXCPITEM|EXTERNALACCOUNT|GLACCOUNT|GLENTRY|GLHISTORY|GLSUBACCOUNT|GLTRAN|HOUSEHOLD|INVENTORY|INVOICE|IRS|IRA|LOAN|LOANAPP|LOOKUP|MBRADDRESS|MEMBERREC|NAME|NONACCTNAME|NOTE|PARTICIPANT|PARTICIPATION|PARTICIPATIONLOAN|POOL|PAYEE|PAYROLL|PLEDGE|PORTFOLIO|PREFERENCE|REMITTANCE|RESERVEPLAN|SHARE|SAVINGS|SITE|TRACKING|USER|VENDOR|WESTERNUNION|WIRE|WORKLISTEDIT)\\b(?![?!])"
                 }
             ]
         },
+        "SpecialPowerOnOperators": {
+            "patterns": [
+                {
+                    "name": "support.operators.poweron",
+                    "match": "(?i)(?<!\\.)\\b(\\=|\\+|AND|OR|NOT|\\/|>|<|<=|>=|\\*|<>)\\b(?![?!])"
+                }
+            ]
+        },
+        
         "character": {
             "name": "string.quoted.double.poweron",
             "begin": "\"",
@@ -134,7 +143,7 @@
                 },
                 {
                     "name": "storage.type.poweron",
-                    "match": "[\\s]*(?i)(CHARACTER|CODE|DATE|FLOAT|MONEY|NUMBER|RATE)[\\s]+"
+                    "match": "(?i)(?<!\\.)\\b(CHARACTER|CODE|DATE|FLOAT|MONEY|NUMBER|RATE)\\b(?![?!])"
                 }
             ]
         },
@@ -146,25 +155,6 @@
                 }
             ]
         },
-        "operator": {
-            "patterns": [
-                {
-                    "include": "#equalOperator"
-                },
-                {
-                    "name": "support.function.poweron",
-                    "match": "[\\s]*(?i)(\\=|\\+|AND|OR|\\/|>|<|<=|>=|\\*|<>|\\|)[\\s]+"
-                }
-            ]
-        },
-        "equalOperator": {
-            "patterns": [
-                {
-                    "name": "support.function.thing.poweron",
-                    "match": "="
-                }
-            ]
-        },
         "variable": {
             "patterns": [
                 {