diff --git a/static/admin/config/collections/author.js b/static/admin/config/collections/author.js
index 0485dd41..1442df4e 100644
--- a/static/admin/config/collections/author.js
+++ b/static/admin/config/collections/author.js
@@ -19,49 +19,38 @@ const AuthorCollection = {
     field: "type",
     value: "author",
   },
-  view_filters: {
-    filters: [
-      {
-        name: "active",
-        label: "aktiv",
-        field: "active",
-        pattern: true,
-      },
-      {
-        name: "inactive",
-        label: "inaktiv",
-        field: "active",
-        pattern: false,
-      },
-      {
-        name: "simplified",
-        label: "einfach",
-        field: "simplified",
-        pattern: true,
-      },
-      {
-        name: "extended",
-        label: "erweitert",
-        field: "simplified",
-        pattern: false,
-      },
-    ],
-  },
-  view_groups: {
-    default: "active",
-    groups: [
-      {
-        name: "simplified",
-        label: "vereinfacht",
-        field: "simplified",
-      },
-      {
-        name: "active",
-        label: "aktiv",
-        field: "active",
-      },
-    ],
-  },
+  view_filters: [
+    {
+      label: "aktiv",
+      field: "active",
+      pattern: true,
+    },
+    {
+      label: "inaktiv",
+      field: "active",
+      pattern: false,
+    },
+    {
+      label: "einfach",
+      field: "simplified",
+      pattern: true,
+    },
+    {
+      label: "erweitert",
+      field: "simplified",
+      pattern: false,
+    },
+  ],
+  view_groups: [
+    {
+      label: "vereinfacht",
+      field: "simplified",
+    },
+    {
+      label: "aktiv",
+      field: "active",
+    },
+  ],
   summary_fields: ["title", "active", "simplified", "body"],
   fields: [
     {
diff --git a/static/admin/config/collections/blog.js b/static/admin/config/collections/blog.js
index d7948792..1405e936 100644
--- a/static/admin/config/collections/blog.js
+++ b/static/admin/config/collections/blog.js
@@ -24,16 +24,12 @@ const BlogCollection = {
     field: "type",
     value: "post",
   },
-  view_groups: {
-    default: "draft",
-    groups: [
-      {
-        name: "draft",
-        label: "Entwurf",
-        field: "draft",
-      },
-    ],
-  },
+  view_groups: [
+    {
+      label: "Entwurf",
+      field: "draft",
+    },
+  ],
   sortable_fields: {
     fields: ["date", "title"],
     default: {
diff --git a/static/admin/config/collections/cantorfora.js b/static/admin/config/collections/cantorfora.js
index f260471e..84cad60e 100644
--- a/static/admin/config/collections/cantorfora.js
+++ b/static/admin/config/collections/cantorfora.js
@@ -19,6 +19,12 @@ const CantorforaCollection = {
     frame: true,
     size: "half",
   },
+  view_groups: [
+    {
+      label: "Entwürfe",
+      field: "draft",
+    },
+  ],
   summary_fields: ["title", "draft", "description"],
   sortable_fields: {
     fields: ["index", "title"],
diff --git a/static/admin/config/index.js b/static/admin/config/index.js
index 1d92150d..d362236d 100644
--- a/static/admin/config/index.js
+++ b/static/admin/config/index.js
@@ -17,7 +17,6 @@ import {
   SuperhaufenCollection,
   WettbewerbeCollection,
 } from "./collections/index.js";
-import { GCGThemeDark, GCGThemeLight } from "./themes.js";
 
 const config = {
   backend: {
@@ -49,13 +48,6 @@ const config = {
     clean_accents: true,
     sanitize_replacement: "-",
   },
-  theme: {
-    include_built_in_themes: false,
-    themes: [
-      GCGThemeDark,
-      GCGThemeLight
-    ]    
-  },
   collections: [
     SettingsCollection,
     IndexPagesCollection,
diff --git a/static/admin/config/schulchronik.js b/static/admin/config/schulchronik.js
index f47f2e67..9425cfe0 100644
--- a/static/admin/config/schulchronik.js
+++ b/static/admin/config/schulchronik.js
@@ -7,7 +7,6 @@ import {
   StatsCollection,
   SuperhaufenCollection,
 } from "./collections/index.js";
-import { GCGThemeDark, GCGThemeLight } from "./themes.js";
 
 const config = {
   backend: {
@@ -39,13 +38,6 @@ const config = {
     clean_accents: true,
     sanitize_replacement: "-",
   },
-  theme: {
-    include_built_in_themes: false,
-    themes: [
-      GCGThemeDark,
-      GCGThemeLight
-    ]    
-  },
   collections: [
     ChronikjahreCollection,
     SuperhaufenCollection,
diff --git a/static/admin/config/themes.js b/static/admin/config/themes.js
deleted file mode 100644
index 3833404c..00000000
--- a/static/admin/config/themes.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const GCGThemeDark = {
-  name: "GCG.Dark",
-  extends: "dark",
-  primary: {
-    main: "#ffbc3b",
-    contrastColor: "#4b4b4b",
-  },
-  background: {
-    main: "#1a1a37",
-    dark: "#13132d",
-  },
-};
-
-const GCGThemeLight = {
-  name: "GCG.Light",
-  extends: "light",
-  primary: {
-    main: "#1a1a37",
-  },
-  background: {
-    dark: "#f1f3f5",
-  },
-};
-
-export { GCGThemeDark, GCGThemeLight };
diff --git a/static/admin/index.html b/static/admin/index.html
index b1773d39..e408d173 100644
--- a/static/admin/index.html
+++ b/static/admin/index.html
@@ -9,12 +9,12 @@
     />
     <link
       rel="stylesheet"
-      href="https://unpkg.com/@staticcms/app@next/dist/main.css"
+      href="https://cdn.jsdelivr.net/npm/@staticcms/app@^3.0.0/dist/main.css"
     />
     <title>Static CMS</title>
   </head>
   <body>
-    <script src="https://unpkg.com/@staticcms/app@next/dist/static-cms-app.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@staticcms/app@^3.0.0/dist/static-cms-app.js"></script>
     <script type="module">
       import config from "./config/index.js";
       // imports
diff --git a/static/schulchronik/admin/index.html b/static/schulchronik/admin/index.html
index ad174e42..a6b53991 100644
--- a/static/schulchronik/admin/index.html
+++ b/static/schulchronik/admin/index.html
@@ -9,12 +9,12 @@
     />
     <link
       rel="stylesheet"
-      href="https://unpkg.com/@staticcms/app@next/dist/main.css"
+      href="https://cdn.jsdelivr.net/npm/@staticcms/app@^3.0.0/dist/main.css"
     />
     <title>Chronikverwaltung</title>
   </head>
   <body>
-    <script src="https://unpkg.com/@staticcms/app@next/dist/static-cms-app.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@staticcms/app@^3.0.0/dist/static-cms-app.js"></script>
     <script type="module">
       import config from "../../admin/config/schulchronik.js";
       // imports