diff --git a/SubEthaEdit-Mac/Modes/SQL.seemode/Contents/Resources/SyntaxDefinition.xml b/SubEthaEdit-Mac/Modes/SQL.seemode/Contents/Resources/SyntaxDefinition.xml
index 90239f32b..63bd04cd4 100644
--- a/SubEthaEdit-Mac/Modes/SQL.seemode/Contents/Resources/SyntaxDefinition.xml
+++ b/SubEthaEdit-Mac/Modes/SQL.seemode/Contents/Resources/SyntaxDefinition.xml
@@ -839,6 +839,832 @@
                 <string>YEAR_MONTH</string>
                 <string>ZEROFILL</string>
                 <string>ZONE</string>
+                <string>a</string>
+                <string>abort</string>
+                <string>abs</string>
+                <string>absolute</string>
+                <string>access</string>
+                <string>action</string>
+                <string>ada</string>
+                <string>add</string>
+                <string>admin</string>
+                <string>after</string>
+                <string>aggregate</string>
+                <string>alias</string>
+                <string>all</string>
+                <string>allocate</string>
+                <string>also</string>
+                <string>alter</string>
+                <string>always</string>
+                <string>analyse</string>
+                <string>analyze</string>
+                <string>and</string>
+                <string>any</string>
+                <string>are</string>
+                <string>array</string>
+                <string>as</string>
+                <string>asc</string>
+                <string>asensitive</string>
+                <string>assertion</string>
+                <string>assignment</string>
+                <string>asymmetric</string>
+                <string>at</string>
+                <string>atomic</string>
+                <string>attribute</string>
+                <string>attributes</string>
+                <string>audit</string>
+                <string>authorization</string>
+                <string>auto_increment</string>
+                <string>avg</string>
+                <string>avg_row_length</string>
+                <string>backup</string>
+                <string>backward</string>
+                <string>before</string>
+                <string>begin</string>
+                <string>bernoulli</string>
+                <string>between</string>
+                <string>bigint</string>
+                <string>binary</string>
+                <string>bit</string>
+                <string>bit_length</string>
+                <string>bitvar</string>
+                <string>blob</string>
+                <string>bool</string>
+                <string>boolean</string>
+                <string>both</string>
+                <string>breadth</string>
+                <string>break</string>
+                <string>browse</string>
+                <string>bulk</string>
+                <string>by</string>
+                <string>c</string>
+                <string>cache</string>
+                <string>call</string>
+                <string>called</string>
+                <string>cardinality</string>
+                <string>cascade</string>
+                <string>cascaded</string>
+                <string>case</string>
+                <string>cast</string>
+                <string>catalog</string>
+                <string>catalog_name</string>
+                <string>ceil</string>
+                <string>ceiling</string>
+                <string>chain</string>
+                <string>change</string>
+                <string>char</string>
+                <string>char_length</string>
+                <string>character</string>
+                <string>character_length</string>
+                <string>character_set_catalog</string>
+                <string>character_set_name</string>
+                <string>character_set_schema</string>
+                <string>characteristics</string>
+                <string>characters</string>
+                <string>check</string>
+                <string>checked</string>
+                <string>checkpoint</string>
+                <string>checksum</string>
+                <string>class</string>
+                <string>class_origin</string>
+                <string>clob</string>
+                <string>close</string>
+                <string>cluster</string>
+                <string>clustered</string>
+                <string>coalesce</string>
+                <string>cobol</string>
+                <string>collate</string>
+                <string>collation</string>
+                <string>collation_catalog</string>
+                <string>collation_name</string>
+                <string>collation_schema</string>
+                <string>collect</string>
+                <string>column</string>
+                <string>column_name</string>
+                <string>columns</string>
+                <string>command_function</string>
+                <string>command_function_code</string>
+                <string>comment</string>
+                <string>commit</string>
+                <string>committed</string>
+                <string>completion</string>
+                <string>compress</string>
+                <string>compute</string>
+                <string>condition</string>
+                <string>condition_number</string>
+                <string>connect</string>
+                <string>connection</string>
+                <string>connection_name</string>
+                <string>constraint</string>
+                <string>constraint_catalog</string>
+                <string>constraint_name</string>
+                <string>constraint_schema</string>
+                <string>constraints</string>
+                <string>constructor</string>
+                <string>contains</string>
+                <string>containstable</string>
+                <string>continue</string>
+                <string>conversion</string>
+                <string>convert</string>
+                <string>copy</string>
+                <string>corr</string>
+                <string>corresponding</string>
+                <string>count</string>
+                <string>covar_pop</string>
+                <string>covar_samp</string>
+                <string>create</string>
+                <string>createdb</string>
+                <string>createrole</string>
+                <string>createuser</string>
+                <string>cross</string>
+                <string>csv</string>
+                <string>cube</string>
+                <string>cume_dist</string>
+                <string>current</string>
+                <string>current_date</string>
+                <string>current_default_transform_group</string>
+                <string>current_path</string>
+                <string>current_role</string>
+                <string>current_time</string>
+                <string>current_timestamp</string>
+                <string>current_transform_group_for_type</string>
+                <string>current_user</string>
+                <string>cursor</string>
+                <string>cursor_name</string>
+                <string>cycle</string>
+                <string>data</string>
+                <string>database</string>
+                <string>databases</string>
+                <string>date</string>
+                <string>datetime</string>
+                <string>datetime_interval_code</string>
+                <string>datetime_interval_precision</string>
+                <string>day</string>
+                <string>day_hour</string>
+                <string>day_microsecond</string>
+                <string>day_minute</string>
+                <string>day_second</string>
+                <string>dayofmonth</string>
+                <string>dayofweek</string>
+                <string>dayofyear</string>
+                <string>dbcc</string>
+                <string>deallocate</string>
+                <string>dec</string>
+                <string>decimal</string>
+                <string>declare</string>
+                <string>default</string>
+                <string>defaults</string>
+                <string>deferrable</string>
+                <string>deferred</string>
+                <string>defined</string>
+                <string>definer</string>
+                <string>degree</string>
+                <string>delay_key_write</string>
+                <string>delayed</string>
+                <string>delete</string>
+                <string>delimiter</string>
+                <string>delimiters</string>
+                <string>dense_rank</string>
+                <string>deny</string>
+                <string>depth</string>
+                <string>deref</string>
+                <string>derived</string>
+                <string>desc</string>
+                <string>describe</string>
+                <string>descriptor</string>
+                <string>destroy</string>
+                <string>destructor</string>
+                <string>deterministic</string>
+                <string>diagnostics</string>
+                <string>dictionary</string>
+                <string>disable</string>
+                <string>disconnect</string>
+                <string>disk</string>
+                <string>dispatch</string>
+                <string>distinct</string>
+                <string>distinctrow</string>
+                <string>distributed</string>
+                <string>div</string>
+                <string>do</string>
+                <string>domain</string>
+                <string>double</string>
+                <string>drop</string>
+                <string>dual</string>
+                <string>dummy</string>
+                <string>dump</string>
+                <string>dynamic</string>
+                <string>dynamic_function</string>
+                <string>dynamic_function_code</string>
+                <string>each</string>
+                <string>element</string>
+                <string>else</string>
+                <string>elseif</string>
+                <string>enable</string>
+                <string>enclosed</string>
+                <string>encoding</string>
+                <string>encrypted</string>
+                <string>end</string>
+                <string>end-exec</string>
+                <string>enum</string>
+                <string>equals</string>
+                <string>errlvl</string>
+                <string>escape</string>
+                <string>escaped</string>
+                <string>every</string>
+                <string>except</string>
+                <string>exception</string>
+                <string>exclude</string>
+                <string>excluding</string>
+                <string>exclusive</string>
+                <string>exec</string>
+                <string>execute</string>
+                <string>existing</string>
+                <string>exists</string>
+                <string>exit</string>
+                <string>exp</string>
+                <string>explain</string>
+                <string>external</string>
+                <string>extract</string>
+                <string>false</string>
+                <string>fetch</string>
+                <string>fields</string>
+                <string>file</string>
+                <string>fillfactor</string>
+                <string>filter</string>
+                <string>final</string>
+                <string>first</string>
+                <string>float</string>
+                <string>float4</string>
+                <string>float8</string>
+                <string>floor</string>
+                <string>flush</string>
+                <string>following</string>
+                <string>for</string>
+                <string>force</string>
+                <string>foreign</string>
+                <string>fortran</string>
+                <string>forward</string>
+                <string>found</string>
+                <string>free</string>
+                <string>freetext</string>
+                <string>freetexttable</string>
+                <string>freeze</string>
+                <string>from</string>
+                <string>full</string>
+                <string>fulltext</string>
+                <string>function</string>
+                <string>fusion</string>
+                <string>g</string>
+                <string>general</string>
+                <string>generated</string>
+                <string>get</string>
+                <string>global</string>
+                <string>go</string>
+                <string>goto</string>
+                <string>grant</string>
+                <string>granted</string>
+                <string>grants</string>
+                <string>greatest</string>
+                <string>group</string>
+                <string>grouping</string>
+                <string>handler</string>
+                <string>having</string>
+                <string>header</string>
+                <string>heap</string>
+                <string>hierarchy</string>
+                <string>high_priority</string>
+                <string>hold</string>
+                <string>holdlock</string>
+                <string>host</string>
+                <string>hosts</string>
+                <string>hour</string>
+                <string>hour_microsecond</string>
+                <string>hour_minute</string>
+                <string>hour_second</string>
+                <string>identified</string>
+                <string>identity</string>
+                <string>identity_insert</string>
+                <string>identitycol</string>
+                <string>if</string>
+                <string>ignore</string>
+                <string>ilike</string>
+                <string>immediate</string>
+                <string>immutable</string>
+                <string>implementation</string>
+                <string>implicit</string>
+                <string>in</string>
+                <string>include</string>
+                <string>including</string>
+                <string>increment</string>
+                <string>index</string>
+                <string>indicator</string>
+                <string>infile</string>
+                <string>infix</string>
+                <string>inherit</string>
+                <string>inherits</string>
+                <string>initial</string>
+                <string>initialize</string>
+                <string>initially</string>
+                <string>inner</string>
+                <string>inout</string>
+                <string>input</string>
+                <string>insensitive</string>
+                <string>insert</string>
+                <string>insert_id</string>
+                <string>instance</string>
+                <string>instantiable</string>
+                <string>instead</string>
+                <string>int</string>
+                <string>int1</string>
+                <string>int2</string>
+                <string>int3</string>
+                <string>int4</string>
+                <string>int8</string>
+                <string>integer</string>
+                <string>intersect</string>
+                <string>intersection</string>
+                <string>interval</string>
+                <string>into</string>
+                <string>invoker</string>
+                <string>is</string>
+                <string>isam</string>
+                <string>isnull</string>
+                <string>isolation</string>
+                <string>iterate</string>
+                <string>join</string>
+                <string>k</string>
+                <string>key</string>
+                <string>key_member</string>
+                <string>key_type</string>
+                <string>keys</string>
+                <string>kill</string>
+                <string>lancompiler</string>
+                <string>language</string>
+                <string>large</string>
+                <string>last</string>
+                <string>last_insert_id</string>
+                <string>lateral</string>
+                <string>lead</string>
+                <string>leading</string>
+                <string>least</string>
+                <string>leave</string>
+                <string>left</string>
+                <string>length</string>
+                <string>less</string>
+                <string>level</string>
+                <string>like</string>
+                <string>limit</string>
+                <string>lineno</string>
+                <string>lines</string>
+                <string>listen</string>
+                <string>ln</string>
+                <string>load</string>
+                <string>local</string>
+                <string>localtime</string>
+                <string>localtimestamp</string>
+                <string>location</string>
+                <string>locator</string>
+                <string>lock</string>
+                <string>login</string>
+                <string>logs</string>
+                <string>long</string>
+                <string>longblob</string>
+                <string>longtext</string>
+                <string>loop</string>
+                <string>low_priority</string>
+                <string>lower</string>
+                <string>m</string>
+                <string>map</string>
+                <string>match</string>
+                <string>matched</string>
+                <string>max</string>
+                <string>max_rows</string>
+                <string>maxextents</string>
+                <string>maxvalue</string>
+                <string>mediumblob</string>
+                <string>mediumint</string>
+                <string>mediumtext</string>
+                <string>member</string>
+                <string>merge</string>
+                <string>message_length</string>
+                <string>message_octet_length</string>
+                <string>message_text</string>
+                <string>method</string>
+                <string>middleint</string>
+                <string>min</string>
+                <string>min_rows</string>
+                <string>minus</string>
+                <string>minute</string>
+                <string>minute_microsecond</string>
+                <string>minute_second</string>
+                <string>minvalue</string>
+                <string>mlslabel</string>
+                <string>mod</string>
+                <string>mode</string>
+                <string>modifies</string>
+                <string>modify</string>
+                <string>module</string>
+                <string>month</string>
+                <string>monthname</string>
+                <string>more</string>
+                <string>move</string>
+                <string>multiset</string>
+                <string>mumps</string>
+                <string>myisam</string>
+                <string>name</string>
+                <string>names</string>
+                <string>national</string>
+                <string>natural</string>
+                <string>nchar</string>
+                <string>nclob</string>
+                <string>nesting</string>
+                <string>new</string>
+                <string>next</string>
+                <string>no</string>
+                <string>no_write_to_binlog</string>
+                <string>noaudit</string>
+                <string>nocheck</string>
+                <string>nocompress</string>
+                <string>nocreatedb</string>
+                <string>nocreaterole</string>
+                <string>nocreateuser</string>
+                <string>noinherit</string>
+                <string>nologin</string>
+                <string>nonclustered</string>
+                <string>none</string>
+                <string>normalize</string>
+                <string>normalized</string>
+                <string>nosuperuser</string>
+                <string>not</string>
+                <string>nothing</string>
+                <string>notify</string>
+                <string>notnull</string>
+                <string>nowait</string>
+                <string>null</string>
+                <string>nullable</string>
+                <string>nullif</string>
+                <string>nulls</string>
+                <string>number</string>
+                <string>numeric</string>
+                <string>object</string>
+                <string>octet_length</string>
+                <string>octets</string>
+                <string>of</string>
+                <string>off</string>
+                <string>offline</string>
+                <string>offset</string>
+                <string>offsets</string>
+                <string>oids</string>
+                <string>old</string>
+                <string>on</string>
+                <string>online</string>
+                <string>only</string>
+                <string>open</string>
+                <string>opendatasource</string>
+                <string>openquery</string>
+                <string>openrowset</string>
+                <string>openxml</string>
+                <string>operation</string>
+                <string>operator</string>
+                <string>optimize</string>
+                <string>option</string>
+                <string>optionally</string>
+                <string>options</string>
+                <string>or</string>
+                <string>order</string>
+                <string>ordering</string>
+                <string>ordinality</string>
+                <string>others</string>
+                <string>out</string>
+                <string>outer</string>
+                <string>outfile</string>
+                <string>output</string>
+                <string>over</string>
+                <string>overlaps</string>
+                <string>overlay</string>
+                <string>overriding</string>
+                <string>owner</string>
+                <string>pack_keys</string>
+                <string>pad</string>
+                <string>parameter</string>
+                <string>parameter_mode</string>
+                <string>parameter_name</string>
+                <string>parameter_ordinal_position</string>
+                <string>parameter_specific_catalog</string>
+                <string>parameter_specific_name</string>
+                <string>parameter_specific_schema</string>
+                <string>parameters</string>
+                <string>partial</string>
+                <string>partition</string>
+                <string>pascal</string>
+                <string>password</string>
+                <string>path</string>
+                <string>pctfree</string>
+                <string>percent</string>
+                <string>percent_rank</string>
+                <string>percentile_cont</string>
+                <string>percentile_disc</string>
+                <string>placing</string>
+                <string>plan</string>
+                <string>pli</string>
+                <string>position</string>
+                <string>postfix</string>
+                <string>power</string>
+                <string>preceding</string>
+                <string>precision</string>
+                <string>prefix</string>
+                <string>preorder</string>
+                <string>prepare</string>
+                <string>prepared</string>
+                <string>preserve</string>
+                <string>primary</string>
+                <string>print</string>
+                <string>prior</string>
+                <string>privileges</string>
+                <string>proc</string>
+                <string>procedural</string>
+                <string>procedure</string>
+                <string>process</string>
+                <string>processlist</string>
+                <string>public</string>
+                <string>purge</string>
+                <string>quote</string>
+                <string>raid0</string>
+                <string>raiserror</string>
+                <string>range</string>
+                <string>rank</string>
+                <string>raw</string>
+                <string>read</string>
+                <string>reads</string>
+                <string>readtext</string>
+                <string>real</string>
+                <string>recheck</string>
+                <string>reconfigure</string>
+                <string>recursive</string>
+                <string>ref</string>
+                <string>references</string>
+                <string>referencing</string>
+                <string>regexp</string>
+                <string>regr_avgx</string>
+                <string>regr_avgy</string>
+                <string>regr_count</string>
+                <string>regr_intercept</string>
+                <string>regr_r2</string>
+                <string>regr_slope</string>
+                <string>regr_sxx</string>
+                <string>regr_sxy</string>
+                <string>regr_syy</string>
+                <string>reindex</string>
+                <string>relative</string>
+                <string>release</string>
+                <string>reload</string>
+                <string>rename</string>
+                <string>repeat</string>
+                <string>repeatable</string>
+                <string>replace</string>
+                <string>replication</string>
+                <string>require</string>
+                <string>reset</string>
+                <string>resignal</string>
+                <string>resource</string>
+                <string>restart</string>
+                <string>restore</string>
+                <string>restrict</string>
+                <string>result</string>
+                <string>return</string>
+                <string>returned_cardinality</string>
+                <string>returned_length</string>
+                <string>returned_octet_length</string>
+                <string>returned_sqlstate</string>
+                <string>returns</string>
+                <string>revoke</string>
+                <string>right</string>
+                <string>rlike</string>
+                <string>role</string>
+                <string>rollback</string>
+                <string>rollup</string>
+                <string>routine</string>
+                <string>routine_catalog</string>
+                <string>routine_name</string>
+                <string>routine_schema</string>
+                <string>row</string>
+                <string>row_count</string>
+                <string>row_number</string>
+                <string>rowcount</string>
+                <string>rowguidcol</string>
+                <string>rowid</string>
+                <string>rownum</string>
+                <string>rows</string>
+                <string>rule</string>
+                <string>save</string>
+                <string>savepoint</string>
+                <string>scale</string>
+                <string>schema</string>
+                <string>schema_name</string>
+                <string>schemas</string>
+                <string>scope</string>
+                <string>scope_catalog</string>
+                <string>scope_name</string>
+                <string>scope_schema</string>
+                <string>scroll</string>
+                <string>search</string>
+                <string>second</string>
+                <string>second_microsecond</string>
+                <string>section</string>
+                <string>security</string>
+                <string>select</string>
+                <string>self</string>
+                <string>sensitive</string>
+                <string>separator</string>
+                <string>sequence</string>
+                <string>serializable</string>
+                <string>server_name</string>
+                <string>session</string>
+                <string>session_user</string>
+                <string>set</string>
+                <string>setof</string>
+                <string>sets</string>
+                <string>setuser</string>
+                <string>share</string>
+                <string>show</string>
+                <string>shutdown</string>
+                <string>signal</string>
+                <string>similar</string>
+                <string>simple</string>
+                <string>size</string>
+                <string>smallint</string>
+                <string>some</string>
+                <string>soname</string>
+                <string>source</string>
+                <string>space</string>
+                <string>spatial</string>
+                <string>specific</string>
+                <string>specific_name</string>
+                <string>specifictype</string>
+                <string>sql</string>
+                <string>sql_big_result</string>
+                <string>sql_big_selects</string>
+                <string>sql_big_tables</string>
+                <string>sql_calc_found_rows</string>
+                <string>sql_log_off</string>
+                <string>sql_log_update</string>
+                <string>sql_low_priority_updates</string>
+                <string>sql_select_limit</string>
+                <string>sql_small_result</string>
+                <string>sql_warnings</string>
+                <string>sqlca</string>
+                <string>sqlcode</string>
+                <string>sqlerror</string>
+                <string>sqlexception</string>
+                <string>sqlstate</string>
+                <string>sqlwarning</string>
+                <string>sqrt</string>
+                <string>ssl</string>
+                <string>stable</string>
+                <string>start</string>
+                <string>starting</string>
+                <string>state</string>
+                <string>statement</string>
+                <string>static</string>
+                <string>statistics</string>
+                <string>status</string>
+                <string>stddev_pop</string>
+                <string>stddev_samp</string>
+                <string>stdin</string>
+                <string>stdout</string>
+                <string>storage</string>
+                <string>straight_join</string>
+                <string>strict</string>
+                <string>string</string>
+                <string>structure</string>
+                <string>style</string>
+                <string>subclass_origin</string>
+                <string>sublist</string>
+                <string>submultiset</string>
+                <string>substring</string>
+                <string>successful</string>
+                <string>sum</string>
+                <string>superuser</string>
+                <string>symmetric</string>
+                <string>synonym</string>
+                <string>sysdate</string>
+                <string>sysid</string>
+                <string>system</string>
+                <string>system_user</string>
+                <string>table</string>
+                <string>table_name</string>
+                <string>tables</string>
+                <string>tablesample</string>
+                <string>tablespace</string>
+                <string>temp</string>
+                <string>template</string>
+                <string>temporary</string>
+                <string>terminate</string>
+                <string>terminated</string>
+                <string>text</string>
+                <string>textsize</string>
+                <string>than</string>
+                <string>then</string>
+                <string>ties</string>
+                <string>time</string>
+                <string>timestamp</string>
+                <string>timezone_hour</string>
+                <string>timezone_minute</string>
+                <string>tinyblob</string>
+                <string>tinyint</string>
+                <string>tinytext</string>
+                <string>to</string>
+                <string>toast</string>
+                <string>top</string>
+                <string>top_level_count</string>
+                <string>trailing</string>
+                <string>tran</string>
+                <string>transaction</string>
+                <string>transaction_active</string>
+                <string>transactions_committed</string>
+                <string>transactions_rolled_back</string>
+                <string>transform</string>
+                <string>transforms</string>
+                <string>translate</string>
+                <string>translation</string>
+                <string>treat</string>
+                <string>trigger</string>
+                <string>trigger_catalog</string>
+                <string>trigger_name</string>
+                <string>trigger_schema</string>
+                <string>trim</string>
+                <string>true</string>
+                <string>truncate</string>
+                <string>trusted</string>
+                <string>tsequal</string>
+                <string>type</string>
+                <string>uescape</string>
+                <string>uid</string>
+                <string>unbounded</string>
+                <string>uncommitted</string>
+                <string>under</string>
+                <string>undo</string>
+                <string>unencrypted</string>
+                <string>union</string>
+                <string>unique</string>
+                <string>unknown</string>
+                <string>unlisten</string>
+                <string>unlock</string>
+                <string>unnamed</string>
+                <string>unnest</string>
+                <string>unsigned</string>
+                <string>until</string>
+                <string>update</string>
+                <string>updatetext</string>
+                <string>upper</string>
+                <string>usage</string>
+                <string>use</string>
+                <string>user</string>
+                <string>user_defined_type_catalog</string>
+                <string>user_defined_type_code</string>
+                <string>user_defined_type_name</string>
+                <string>user_defined_type_schema</string>
+                <string>using</string>
+                <string>utc_date</string>
+                <string>utc_time</string>
+                <string>utc_timestamp</string>
+                <string>vacuum</string>
+                <string>valid</string>
+                <string>validate</string>
+                <string>validator</string>
+                <string>value</string>
+                <string>values</string>
+                <string>var_pop</string>
+                <string>var_samp</string>
+                <string>varbinary</string>
+                <string>varchar</string>
+                <string>varchar2</string>
+                <string>varcharacter</string>
+                <string>variable</string>
+                <string>variables</string>
+                <string>varying</string>
+                <string>verbose</string>
+                <string>view</string>
+                <string>volatile</string>
+                <string>waitfor</string>
+                <string>when</string>
+                <string>whenever</string>
+                <string>where</string>
+                <string>while</string>
+                <string>width_bucket</string>
+                <string>window</string>
+                <string>with</string>
+                <string>within</string>
+                <string>without</string>
+                <string>work</string>
+                <string>write</string>
+                <string>writetext</string>
+                <string>x509</string>
+                <string>xor</string>
+                <string>year</string>
+                <string>year_month</string>
+                <string>zerofill</string>
+                <string>zone</string>
             </keywords>
             
             <keywords id="Numbers" useforautocomplete="no" scope="language.constant.numeric">
@@ -856,15 +1682,30 @@
                 <import mode="Base" state="EmailAndURLContainerState" keywords-only="yes"/>
             </state>
 
-            <state id="String" type="string" foldable="no" scope="string.double">
+            <!-- CODA <state id="String with double quotes" type="string"> -->
+            <state id="String with double quotes" type="string" usespellchecking="no" scope="string.double">
                 <begin><regex>"</regex></begin>
-                <end><regex>((?&lt;!\\)(\\\\)*)"</regex></end>
+                <end><regex>(((?&lt;!\\)(\\\\)*)|^)"</regex></end>
             </state>
 
-            <state id="case done Block" type="block" foldable="yes" indent="yes" scope="meta.block">
+            <!-- CODA <state id="String with single quotes" type="string"> -->
+            <state id="String with single quotes" type="string" usespellchecking="yes" scope="string.single">
+                <begin><regex>'</regex></begin>
+                <end><regex>(((?&lt;!\\)(\\\\)*)|^)'</regex></end>
+            </state>
+
+            <state id="CASE END Block" type="block" foldable="yes" indent="yes" scope="meta.block">
+                <begin><regex>(?&lt;![^;\s])CASE(?!\S)</regex></begin>
+                <end><regex>(?&lt;!\S)END(?!\S)</regex></end>
+                <autoend>END</autoend>
+
+                <import/>
+            </state>
+
+            <state id="case end Block" type="block" foldable="yes" indent="yes" scope="meta.block">
                 <begin><regex>(?&lt;![^;\s])case(?!\S)</regex></begin>
-                <end><regex>(?&lt;!\S)done(?!\S)</regex></end>
-                <autoend>done</autoend>
+                <end><regex>(?&lt;!\S)end(?!\S)</regex></end>
+                <autoend>end</autoend>
 
                 <import/>
             </state>
diff --git a/SubEthaEdit-Mac/Modes/SQL.seemode/Contents/Resources/de.lproj/Localizable.strings b/SubEthaEdit-Mac/Modes/SQL.seemode/Contents/Resources/de.lproj/Localizable.strings
index 01a28bbb2..73192d50b 100644
Binary files a/SubEthaEdit-Mac/Modes/SQL.seemode/Contents/Resources/de.lproj/Localizable.strings and b/SubEthaEdit-Mac/Modes/SQL.seemode/Contents/Resources/de.lproj/Localizable.strings differ
diff --git a/SubEthaEdit-Mac/Modes/SQL.seemode/Contents/Resources/en.lproj/Localizable.strings b/SubEthaEdit-Mac/Modes/SQL.seemode/Contents/Resources/en.lproj/Localizable.strings
index 054614edb..3a8915543 100644
Binary files a/SubEthaEdit-Mac/Modes/SQL.seemode/Contents/Resources/en.lproj/Localizable.strings and b/SubEthaEdit-Mac/Modes/SQL.seemode/Contents/Resources/en.lproj/Localizable.strings differ