diff --git a/.config/aider/aider.yaml b/.config/aider/aider.yaml
index b78a6b4..4744bb7 100644
--- a/.config/aider/aider.yaml
+++ b/.config/aider/aider.yaml
@@ -6,3 +6,4 @@ show-model-warnings: false
 max-chat-history-tokens: 8000
 disable-playwright: true
 watch-files: true
+auto-commits: false
diff --git a/.config/nvim b/.config/nvim
index ed1f52a..379f2ac 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit ed1f52af1109cc11c31a99dfc80e13c37c99a9aa
+Subproject commit 379f2acd55802b3b161152db5c3acd838a25992f
diff --git a/.local/aider/projects/runcats/aider.env b/.local/aider/projects/runcats/aider.env
index 9f4939e..48ec049 100644
--- a/.local/aider/projects/runcats/aider.env
+++ b/.local/aider/projects/runcats/aider.env
@@ -1,8 +1,2 @@
-AIDER_READ=README.md
-AIDER_READ=.aider/read/CONVENTIONS.md
-AIDER_READ=.aider/read/PROMPT.md
-AIDER_LINT=true
-AIDER_LINT_CMD="ts: go-task format-client"
-AIDER_LINT_CMD="js: go-task format-client"
-AIDER_LINT_CMD="vue: go-task format-client"
-AIDER_LINT_CMD="php: go-task format-server"
+AIDER_READ=[README.md,.aider/read/CONVENTIONS.md,.aider/read/PROMPT.md]
+AIDER_LINT_CMD="[ts: go-task format-client --,js: go-task format-client --,vue: go-task format-client --,php: go-task format-server --]"
diff --git a/.local/aider/projects/runcats/read/CONVENTIONS.md b/.local/aider/projects/runcats/read/CONVENTIONS.md
index 562efc7..4b65cbe 100644
--- a/.local/aider/projects/runcats/read/CONVENTIONS.md
+++ b/.local/aider/projects/runcats/read/CONVENTIONS.md
@@ -4,3 +4,8 @@
 - Do not try to reinvent the wheel. Use available APIs and tools where possible.
 - Follow best practices and common formatting for the programming language you are using.
 - Generate tests for new features and bug fixes.
+
+## PHP
+- The back end is analysed by PHPStan at the highest level. Ensure everything is typehinted and generics are properly used.
+- When fixing PHPStan errors do not ignore them. Fix using typehints, the webmozart assertion library, or docblocks, or by addressing legitimate bugs that could be caused as a result of the warning.
+- Sometimes a PHPStan error should be fixed by editing another file, e.g. one file expects a property to be of a certain type but that property type is not specified in the class. Rather than coercing the type in the file with the error, request access to the other file and modify the definition there.