diff --git a/vscode-extension/language-configuration.json b/vscode-extension/language-configuration.json
index ab81f4a2..2b4ce63a 100644
--- a/vscode-extension/language-configuration.json
+++ b/vscode-extension/language-configuration.json
@@ -7,14 +7,20 @@
     },
     // symbols used as brackets
     "brackets": [
-        ["(", ")"]
+        ["(", ")"],
+        ["[", "]"],
     ],
     // symbols that are auto closed when typing
     "autoClosingPairs": [
         ["(", ")"],
+        ["<", ">"],
+        ["[", "]"],
     ],
     // symbols that can be used to surround a selection
     "surroundingPairs": [
         ["(", ")"],
-    ]
+    ],
+    "folding": {
+        "offSide": true // This is not strictly true, but we encourage a coding style where blocks are somewhat based on indentation
+    }
 }
diff --git a/vscode-extension/syntaxes/numbat.tmLanguage.json b/vscode-extension/syntaxes/numbat.tmLanguage.json
index 578030ef..f0915269 100644
--- a/vscode-extension/syntaxes/numbat.tmLanguage.json
+++ b/vscode-extension/syntaxes/numbat.tmLanguage.json
@@ -86,8 +86,7 @@
         },
         "strings": {
             "name": "string.quoted.double",
-            "begin": "\"",
-            "end": "\""
+            "match": "((?<=})|\")((?!(?<!\\\\)[{\"])([^\"]|\\\"))*((?={)|\")"
         }
     },
     "scopeName": "source.numbat"