4 files changed, 30 insertions, 20 deletions

diff --git a/subprojects/frontend/package.json b/subprojects/frontend/package.json
index 4ecf2efb..02c6e026 100644
--- a/subprojects/frontend/package.json
+++ b/subprojects/frontend/package.json
@@ -23,7 +23,7 @@
   },
   "homepage": "https://refinery.tools",
   "dependencies": {
-    "@codemirror/autocomplete": "^6.1.1",
+    "@codemirror/autocomplete": "^6.2.0",
     "@codemirror/commands": "^6.1.0",
     "@codemirror/language": "^6.2.1",
     "@codemirror/lint": "^6.0.0",
@@ -39,7 +39,7 @@
     "@lezer/lr": "^1.2.3",
     "@material-icons/svg": "^1.0.33",
     "@mui/icons-material": "5.10.3",
-    "@mui/material": "5.10.4",
+    "@mui/material": "5.10.5",
     "ansi-styles": "^6.1.1",
     "escape-string-regexp": "^5.0.0",
     "lodash-es": "^4.17.21",
@@ -53,7 +53,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "xstate": "^4.33.6",
-    "zod": "^3.19.0"
+    "zod": "^3.19.1"
   },
   "devDependencies": {
     "@lezer/generator": "^1.1.1",
@@ -61,16 +61,16 @@
     "@types/html-minifier-terser": "^7.0.0",
     "@types/lodash-es": "^4.17.6",
     "@types/ms": "^0.7.31",
-    "@types/node": "^18.7.16",
+    "@types/node": "^18.7.18",
     "@types/prettier": "^2.7.0",
-    "@types/react": "^18.0.19",
+    "@types/react": "^18.0.20",
     "@types/react-dom": "^18.0.6",
-    "@typescript-eslint/eslint-plugin": "^5.36.2",
-    "@typescript-eslint/parser": "^5.36.2",
+    "@typescript-eslint/eslint-plugin": "^5.37.0",
+    "@typescript-eslint/parser": "^5.37.0",
     "@vitejs/plugin-react": "^2.1.0",
     "@xstate/cli": "^0.3.3",
     "cross-env": "^7.0.3",
-    "eslint": "^8.23.0",
+    "eslint": "^8.23.1",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.5.0",
diff --git a/subprojects/frontend/src/language/problem.grammar b/subprojects/frontend/src/language/problem.grammar
index 95861110..7feb6bfe 100644
--- a/subprojects/frontend/src/language/problem.grammar
+++ b/subprojects/frontend/src/language/problem.grammar
@@ -18,7 +18,10 @@ statement {
     (EnumBody { "{" sep<",", IndividualNodeName> "}" } | ".")
   } |
   PredicateDefinition {
-    (ckw<"error"> ckw<"pred">? | ckw<"pred">)
+    (
+      (ckw<"error"> | ckw<"contained"> | ckw<"containment">) ckw<"pred">? |
+      ckw<"pred">
+    )
     RelationName ParameterList<Parameter>?
     PredicateBody { ("<->" sep<OrOp, Conjunction>)?  "." }
   } |
@@ -28,23 +31,29 @@ statement {
     RuleBody { ":" sep<OrOp, Conjunction> "==>" sep<OrOp, Consequent> "." }
   } |
   Assertion {
-    kw<"default">? (NotOp | UnknownOp)? RelationName
+    ckw<"default">? (NotOp | UnknownOp)? RelationName
     ParameterList<AssertionArgument> (":" LogicValue)? "."
   } |
   NodeValueAssertion {
-    IndividualNodeName ":" Constant "."
+    QualifiedName ":" Constant "."
   } |
   IndividualDeclaration {
     ckw<"indiv"> sep<",", IndividualNodeName> "."
   } |
   ScopeDeclaration {
-    kw<"scope"> sep<",", ScopeElement> "."
+    ckw<"scope"> sep<",", ScopeElement> "."
   }
 }
 
 ReferenceDeclaration {
-  (kw<"refers"> | kw<"contains">)?
-  RelationName
+  (
+    ExplicitContainmentReference[@dynamicPrecedence=1] {
+      (ckw<"refers"> | ckw<"contains"> | ckw<"container">) RelationName ~containment
+    } |
+    ImplicitContainmentReference {
+      RelationName ~containment
+    }
+  )
   ("[" Multiplicity? "]")?
   RelationName
   (kw<"opposite"> RelationName)?
diff --git a/subprojects/frontend/src/language/problemLanguageSupport.ts b/subprojects/frontend/src/language/problemLanguageSupport.ts
index 07a884e7..03a7c4cc 100644
--- a/subprojects/frontend/src/language/problemLanguageSupport.ts
+++ b/subprojects/frontend/src/language/problemLanguageSupport.ts
@@ -27,7 +27,8 @@ const parserWithMetadata = parser.configure({
       LineComment: t.lineComment,
       BlockComment: t.blockComment,
       'problem class enum pred rule indiv scope': t.definitionKeyword,
-      'abstract extends refers contains opposite error default': t.modifier,
+      'abstract extends refers contains container opposite': t.modifier,
+      'default error contained containment': t.modifier,
       'true false unknown error': t.operatorKeyword,
       'may must current count': t.operatorKeyword,
       'new delete': t.keyword,
diff --git a/subprojects/frontend/src/theme/ThemeProvider.tsx b/subprojects/frontend/src/theme/ThemeProvider.tsx
index ffb18a06..550b3b30 100644
--- a/subprojects/frontend/src/theme/ThemeProvider.tsx
+++ b/subprojects/frontend/src/theme/ThemeProvider.tsx
@@ -70,8 +70,8 @@ const typography: TypographyVariantsOptions = {
   fontFamily:
     '"InterVariable", "Inter", "Roboto", "Helvetica", "Arial", sans-serif',
   fontWeightMedium: 600,
-  fontWeightEditorNormal: 450,
-  fontWeightEditorBold: 650,
+  fontWeightEditorNormal: 400,
+  fontWeightEditorBold: 700,
   editor: {
     fontFamily:
       '"JetBrains MonoVariable", "JetBrains Mono", "Cascadia Code", "Fira Code", monospace',
@@ -173,7 +173,7 @@ const lightTheme = createResponsiveTheme({
     divider: alpha('#19202b', 0.16),
     outer: {
       background: '#f5f5f5',
-      border: '#d6d7d9',
+      border: '#c8c8c8',
     },
     highlight: {
       number: '#0084bc',
@@ -200,8 +200,8 @@ const lightTheme = createResponsiveTheme({
 const darkTheme = createResponsiveTheme({
   typography: {
     ...typography,
-    fontWeightEditorNormal: 400,
-    fontWeightEditorBold: 600,
+    fontWeightEditorNormal: 350,
+    fontWeightEditorBold: 650,
   },
   components: {
     ...components,