diff --git a/.gitmodules b/.gitmodules
index 117f9b69..0eb5a928 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "external/nextcloud-news"]
 	path = external/nextcloud-news
 	url = https://github.com/nextcloud/news
-[submodule "external/openapi-generator"]
-	path = external/openapi-generator
-	url = https://github.com/OpenAPITools/openapi-generator
 [submodule "external/seti-ui"]
 	path = external/seti-ui
 	url = https://github.com/jesseweed/seti-ui
diff --git a/.idea/nextcloud-neon.iml b/.idea/nextcloud-neon.iml
index bd9753c6..8309bce8 100644
--- a/.idea/nextcloud-neon.iml
+++ b/.idea/nextcloud-neon.iml
@@ -9,36 +9,18 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/build" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/packages/file_icons/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages/file_icons/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/file_icons/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/packages/sort_box/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/packages/sort_box/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages/sort_box/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/build" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/build" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages/spec_templates/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/spec_templates/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/packages/spec_templates/build" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart2/petstore_client_lib/build" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart2/petstore_client_lib/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/samples/openapi3/client/petstore/dart2/petstore_client_lib/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/settings/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages/settings/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/settings/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/bin/utils/dart-keywords/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/bin/utils/dart-keywords/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/external/openapi-generator/bin/utils/dart-keywords/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages/nextcloud/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/nextcloud/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/packages/nextcloud/build" />
@@ -61,6 +43,9 @@
       <excludeFolder url="file://$MODULE_DIR$/packages/neon/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/neon/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages/neon/android/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/dynamite/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/dynamite/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/dynamite/build" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 32 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 6b5ae81c..13220d0b 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -6,7 +6,6 @@
     <mapping directory="$PROJECT_DIR$/external/nextcloud-notes" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/external/nextcloud-notifications" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/external/nextcloud-server" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/external/openapi-generator" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/external/seti-ui" vcs="Git" />
   </component>
 </project>
diff --git a/external/openapi-generator b/external/openapi-generator
deleted file mode 160000
index 9e412edb..00000000
--- a/external/openapi-generator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9e412edb640a8e7e49db1ecc24958fdc9a50533e