diff --git a/composer.json b/composer.json
index 4048b98cb1f00ac4097b15552a2ef7d1f5dec47c..ef341a52ed6d600ab6c227169b219239c7f1924b 100644
--- a/composer.json
+++ b/composer.json
@@ -82,6 +82,7 @@
         "wpackagist-theme/zenlite": "4.10",
         "npm-asset/scriptaculous-js": "1.9.0",
         "npm-asset/prototype-js-core": "1.7.3",
+	"noblogs/event-list": "0.8.6",
         "noblogs/r2db": "0.1.7",
         "noblogs/ai-global-activity-plugin": "0.0.18",
         "noblogs/ai-buddypress-plugin": "0.1.1",
@@ -94,7 +95,6 @@
         "wpackagist-plugin/classic-editor": "1.6.2",
         "wpackagist-plugin/disable-comments": "1.11.0",
         "wpackagist-plugin/dvk-social-sharing": "1.3.3",
-        "wpackagist-plugin/event-list": "0.8.6",
         "wpackagist-plugin/feedwordpress": "^2020.0818",
         "wpackagist-plugin/footnotation": "1.2",
         "wpackagist-plugin/i-love-xm24-ribbon": "0.0.4",
@@ -127,7 +127,8 @@
         "wpackagist-theme/newscard": "1.2.8",
         "wpackagist-theme/digitally": "1.0.8",
         "wpackagist-theme/ff-multipurpose": "1.2.0",
-        "wpackagist-plugin/two-factor-provider-webauthn": "1.0.3"
+        "wpackagist-plugin/two-factor-provider-webauthn": "1.0.3",
+        "wpackagist-plugin/event-organiser": "^3.11"
     },    
     "extra": {
         "wordpress-install-dir": "app",
diff --git a/composer.lock b/composer.lock
index b9db2a1e9a30c730a136272b99e728ae2bca2e11..6dd0a8f0941fa8987befba472bcdf979648f0080 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5bdd2e97c8f73ec11ded238a4d03cb1c",
+    "content-hash": "9b7b2fd34d3cbee217c673cc08143068",
     "packages": [
         {
             "name": "bjornjohansen/wplang",
@@ -296,6 +296,15 @@
                 "wordpress/core-implementation": "5.9.2"
             },
             "type": "wordpress-core",
+            "extra": {
+                "patches_applied": {
+                    "Patch definition of WP_CONTENT_URL to include SSL when it might not ": "patches/core/0052-fix-ssl-wp-content-url.patch",
+                    "Anonymize requests to api.wordpress.org for updates": "patches/core/anonymize-update.php.patch",
+                    "Do not perform pingbacks and trackbacks when we update via cron": "patches/core/0103-Remove-pingback-trackback.patch",
+                    "Load JS library locally instead than from Googleapis": "patches/core/0155-Removing-reference-to-googleapis-from-wp-includes-up.patch",
+                    "Remove Google Fonts API calls": "patches/core/0165-remove-google-fonts.patch"
+                }
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "GPL-2.0-or-later"
@@ -516,6 +525,35 @@
             ],
             "description": "Wordpress plugin: EU cookie banner."
         },
+        {
+            "name": "noblogs/event-list",
+            "version": "0.8.6",
+            "source": {
+                "type": "git",
+                "url": "https://git.autistici.org/noblogs/event-list.git",
+                "reference": "c4eef56aec3f92dfeb49d0455e832ce4790acbcf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://git.autistici.org/api/v4/projects/571/packages/composer/archives/noblogs/event-list.zip?sha=c4eef56aec3f92dfeb49d0455e832ce4790acbcf",
+                "reference": "c4eef56aec3f92dfeb49d0455e832ce4790acbcf",
+                "shasum": ""
+            },
+            "require": {
+                "composer/installers": "^1.9"
+            },
+            "type": "wordpress-plugin",
+            "license": [
+                "GPL"
+            ],
+            "authors": [
+                {
+                    "name": "agata",
+                    "email": "agata@insiberia.net"
+                }
+            ],
+            "description": "Wordpress plugin: visualize a list of events."
+        },
         {
             "name": "noblogs/noblogs-home",
             "version": "0.1.4",
@@ -870,6 +908,12 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-plugin",
+            "extra": {
+                "patches_applied": {
+                    "Disable gravatar": "patches/buddypress/0053-Patch-buddypress.patch",
+                    "Force https on buddypress login redirect": "patches/buddypress/0147-forced-https-on-buddypress-login-redirect.patch"
+                }
+            },
             "homepage": "https://wordpress.org/plugins/buddypress/"
         },
         {
@@ -978,6 +1022,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-plugin",
+            "extra": {
+                "patches_applied": {
+                    "Run update checks during cron": "patches/plugins/disable-wordpress-updates.patch"
+                }
+            },
             "homepage": "https://wordpress.org/plugins/disable-wordpress-updates/"
         },
         {
@@ -999,22 +1048,22 @@
             "homepage": "https://wordpress.org/plugins/dvk-social-sharing/"
         },
         {
-            "name": "wpackagist-plugin/event-list",
-            "version": "0.8.6",
+            "name": "wpackagist-plugin/event-organiser",
+            "version": "3.11.0",
             "source": {
                 "type": "svn",
-                "url": "https://plugins.svn.wordpress.org/event-list/",
-                "reference": "tags/0.8.6"
+                "url": "https://plugins.svn.wordpress.org/event-organiser/",
+                "reference": "tags/3.11.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/event-list.0.8.6.zip"
+                "url": "https://downloads.wordpress.org/plugin/event-organiser.3.11.0.zip"
             },
             "require": {
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-plugin",
-            "homepage": "https://wordpress.org/plugins/event-list/"
+            "homepage": "https://wordpress.org/plugins/event-organiser/"
         },
         {
             "name": "wpackagist-plugin/feedwordpress",
@@ -1122,6 +1171,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-plugin",
+            "extra": {
+                "patches_applied": {
+                    "Do send mail on privacy setting change": "patches/plugins/more-privacy-options.patch"
+                }
+            },
             "homepage": "https://wordpress.org/plugins/more-privacy-options/"
         },
         {
@@ -1194,6 +1248,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-plugin",
+            "extra": {
+                "patches_applied": {
+                    "Small workaround to fix simplyexclude plugin broken with wordpress 4": "patches/plugins/0117-simplyexclude.patch"
+                }
+            },
             "homepage": "https://wordpress.org/plugins/simply-exclude/"
         },
         {
@@ -1320,6 +1379,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-plugin",
+            "extra": {
+                "patches_applied": {
+                    "Disable Piwik global updates": "patches/plugins/wp-piwik.patch"
+                }
+            },
             "homepage": "https://wordpress.org/plugins/wp-piwik/"
         },
         {
@@ -1338,6 +1402,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-plugin",
+            "extra": {
+                "patches_applied": {
+                    "Support for global recaptcha keys": "patches/plugins/wp-recaptcha-bp.patch"
+                }
+            },
             "homepage": "https://wordpress.org/plugins/wp-recaptcha-bp/"
         },
         {
@@ -1464,6 +1533,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Teme footer": "patches/themes/0056-Patch-theme-azul.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/azul/"
         },
         {
@@ -1500,6 +1574,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Footer credits": "patches/themes/0223-bliss-footer.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/bliss/"
         },
         {
@@ -1518,6 +1597,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0057-Patch-theme-carrington-blog.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/carrington-blog/"
         },
         {
@@ -1536,6 +1620,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0058-Patch-theme-classic.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/classic/"
         },
         {
@@ -1554,6 +1643,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0062-Patch-theme-default.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/default/"
         },
         {
@@ -1590,6 +1684,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0063-Patch-theme-disconnected.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/disconnected/"
         },
         {
@@ -1608,6 +1707,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0064-Patch-theme-elegant-grunge.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/elegant-grunge/"
         },
         {
@@ -1662,6 +1766,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0065-Patch-theme-fixed-blix.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/fixed-blix/"
         },
         {
@@ -1680,6 +1789,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0067-Patch-theme-fresh-editorial.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/fresh-editorial/"
         },
         {
@@ -1698,6 +1812,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0069-Patch-theme-gone-fishing.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/gone-fishing/"
         },
         {
@@ -1788,6 +1907,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/themes-minimalism.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/minimalism/"
         },
         {
@@ -1806,6 +1930,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0073-Patch-theme-mnml.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/mnml/"
         },
         {
@@ -1842,6 +1971,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0077-Patch-theme-ocular-professor.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/ocular-professor/"
         },
         {
@@ -1860,6 +1994,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0079-Patch-theme-primepress.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/primepress/"
         },
         {
@@ -1878,6 +2017,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0080-Patch-theme-rusty-grunge.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/rusty-grunge/"
         },
         {
@@ -1914,6 +2058,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0083-Patch-theme-simplex.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/simplex/"
         },
         {
@@ -1932,6 +2081,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0084-Patch-theme-tanzaku.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/tanzaku/"
         },
         {
@@ -1950,6 +2104,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0085-Patch-theme-the-scenery.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/the-scenery/"
         },
         {
@@ -1968,6 +2127,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Footer credits": "patches/themes/0223-thematic-footer.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/thematic/"
         },
         {
@@ -1986,6 +2150,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0086-Patch-theme-threattocreativity.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/threattocreativity/"
         },
         {
@@ -2004,6 +2173,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Footer credits": "patches/themes/0165-twentyeleven-footer.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/twentyeleven/"
         },
         {
@@ -2022,6 +2196,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Footer credits": "patches/themes/0187-twentyfifteen.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/twentyfifteen/"
         },
         {
@@ -2040,6 +2219,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Footer credits": "patches/themes/0187-twentyfourteen.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/twentyfourteen/"
         },
         {
@@ -2094,6 +2278,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Footer credits": "patches/themes/0223-twentysixteen-footer.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/twentysixteen/"
         },
         {
@@ -2112,6 +2301,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Footer credits": "patches/themes/0187-twentyten.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/twentyten/"
         },
         {
@@ -2130,6 +2324,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Footer credits": "patches/themes/0165-twentythirteen-footer.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/twentythirteen/"
         },
         {
@@ -2148,6 +2347,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Footer credits": "patches/themes/0165-twentytwelve-footer.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/twentytwelve/"
         },
         {
@@ -2184,6 +2388,11 @@
                 "composer/installers": "^1.0 || ^2.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Theme footer": "patches/themes/0090-Patch-theme-wp-andreas01.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/wp-andreas01/"
         },
         {