diff --git a/SVGs/services/fe/fe.svg b/SVGs/services/fe/fe.svg
index a0aa14e..5819a5a 100644
--- a/SVGs/services/fe/fe.svg
+++ b/SVGs/services/fe/fe.svg
@@ -1,20 +1,20 @@
-
-
diff --git a/SVGs/services/fe/fe_circle.svg b/SVGs/services/fe/fe_circle.svg
new file mode 100644
index 0000000..489b477
--- /dev/null
+++ b/SVGs/services/fe/fe_circle.svg
@@ -0,0 +1,117 @@
+
+
diff --git a/favicons2022/Circled/bin/android-chrome-192x192.png b/favicons/Circled/bin/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/bin/android-chrome-192x192.png
rename to favicons/Circled/bin/android-chrome-192x192.png
diff --git a/favicons2022/Circled/bin/android-chrome-512x512.png b/favicons/Circled/bin/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/bin/android-chrome-512x512.png
rename to favicons/Circled/bin/android-chrome-512x512.png
diff --git a/favicons2022/Circled/bin/apple-touch-icon.png b/favicons/Circled/bin/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/bin/apple-touch-icon.png
rename to favicons/Circled/bin/apple-touch-icon.png
diff --git a/favicons2022/Circled/bin/bin.zip b/favicons/Circled/bin/bin.zip
similarity index 100%
rename from favicons2022/Circled/bin/bin.zip
rename to favicons/Circled/bin/bin.zip
diff --git a/favicons2022/Circled/bin/favicon-16x16.png b/favicons/Circled/bin/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/bin/favicon-16x16.png
rename to favicons/Circled/bin/favicon-16x16.png
diff --git a/favicons2022/Circled/bin/favicon-32x32.png b/favicons/Circled/bin/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/bin/favicon-32x32.png
rename to favicons/Circled/bin/favicon-32x32.png
diff --git a/favicons2022/Circled/bin/favicon.ico b/favicons/Circled/bin/favicon.ico
similarity index 100%
rename from favicons2022/Circled/bin/favicon.ico
rename to favicons/Circled/bin/favicon.ico
diff --git a/favicons2022/Circled/bin/pastebin.png b/favicons/Circled/bin/pastebin.png
similarity index 100%
rename from favicons2022/Circled/bin/pastebin.png
rename to favicons/Circled/bin/pastebin.png
diff --git a/favicons2022/Circled/bin/site.webmanifest b/favicons/Circled/bin/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/bin/site.webmanifest
rename to favicons/Circled/bin/site.webmanifest
diff --git a/favicons2022/Circled/calls/android-chrome-192x192.png b/favicons/Circled/calls/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/calls/android-chrome-192x192.png
rename to favicons/Circled/calls/android-chrome-192x192.png
diff --git a/favicons2022/Circled/calls/android-chrome-512x512.png b/favicons/Circled/calls/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/calls/android-chrome-512x512.png
rename to favicons/Circled/calls/android-chrome-512x512.png
diff --git a/favicons2022/Circled/calls/apple-touch-icon.png b/favicons/Circled/calls/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/calls/apple-touch-icon.png
rename to favicons/Circled/calls/apple-touch-icon.png
diff --git a/favicons2022/Circled/calls/calls.zip b/favicons/Circled/calls/calls.zip
similarity index 100%
rename from favicons2022/Circled/calls/calls.zip
rename to favicons/Circled/calls/calls.zip
diff --git a/favicons2022/Circled/calls/favicon-16x16.png b/favicons/Circled/calls/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/calls/favicon-16x16.png
rename to favicons/Circled/calls/favicon-16x16.png
diff --git a/favicons2022/Circled/calls/favicon-32x32.png b/favicons/Circled/calls/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/calls/favicon-32x32.png
rename to favicons/Circled/calls/favicon-32x32.png
diff --git a/favicons2022/Circled/calls/favicon.ico b/favicons/Circled/calls/favicon.ico
similarity index 100%
rename from favicons2022/Circled/calls/favicon.ico
rename to favicons/Circled/calls/favicon.ico
diff --git a/favicons2022/Circled/calls/jitsi.png b/favicons/Circled/calls/jitsi.png
similarity index 100%
rename from favicons2022/Circled/calls/jitsi.png
rename to favicons/Circled/calls/jitsi.png
diff --git a/favicons2022/Circled/calls/site.webmanifest b/favicons/Circled/calls/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/calls/site.webmanifest
rename to favicons/Circled/calls/site.webmanifest
diff --git a/favicons2022/Circled/cloud/android-chrome-192x192.png b/favicons/Circled/cloud/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/cloud/android-chrome-192x192.png
rename to favicons/Circled/cloud/android-chrome-192x192.png
diff --git a/favicons2022/Circled/cloud/android-chrome-512x512.png b/favicons/Circled/cloud/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/cloud/android-chrome-512x512.png
rename to favicons/Circled/cloud/android-chrome-512x512.png
diff --git a/favicons2022/Circled/cloud/apple-touch-icon.png b/favicons/Circled/cloud/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/cloud/apple-touch-icon.png
rename to favicons/Circled/cloud/apple-touch-icon.png
diff --git a/favicons2022/Circled/cloud/cloud.png b/favicons/Circled/cloud/cloud.png
similarity index 100%
rename from favicons2022/Circled/cloud/cloud.png
rename to favicons/Circled/cloud/cloud.png
diff --git a/favicons2022/Circled/cloud/cloud.zip b/favicons/Circled/cloud/cloud.zip
similarity index 100%
rename from favicons2022/Circled/cloud/cloud.zip
rename to favicons/Circled/cloud/cloud.zip
diff --git a/favicons2022/Circled/cloud/favicon-16x16.png b/favicons/Circled/cloud/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/cloud/favicon-16x16.png
rename to favicons/Circled/cloud/favicon-16x16.png
diff --git a/favicons2022/Circled/cloud/favicon-32x32.png b/favicons/Circled/cloud/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/cloud/favicon-32x32.png
rename to favicons/Circled/cloud/favicon-32x32.png
diff --git a/favicons2022/Circled/cloud/favicon.ico b/favicons/Circled/cloud/favicon.ico
similarity index 100%
rename from favicons2022/Circled/cloud/favicon.ico
rename to favicons/Circled/cloud/favicon.ico
diff --git a/favicons2022/Circled/cloud/site.webmanifest b/favicons/Circled/cloud/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/cloud/site.webmanifest
rename to favicons/Circled/cloud/site.webmanifest
diff --git a/favicons2022/Circled/cryptpad/android-chrome-192x192.png b/favicons/Circled/cryptpad/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/cryptpad/android-chrome-192x192.png
rename to favicons/Circled/cryptpad/android-chrome-192x192.png
diff --git a/favicons2022/Circled/cryptpad/android-chrome-512x512.png b/favicons/Circled/cryptpad/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/cryptpad/android-chrome-512x512.png
rename to favicons/Circled/cryptpad/android-chrome-512x512.png
diff --git a/favicons2022/Circled/cryptpad/apple-touch-icon.png b/favicons/Circled/cryptpad/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/cryptpad/apple-touch-icon.png
rename to favicons/Circled/cryptpad/apple-touch-icon.png
diff --git a/favicons2022/Circled/cryptpad/cryptpad.png b/favicons/Circled/cryptpad/cryptpad.png
similarity index 100%
rename from favicons2022/Circled/cryptpad/cryptpad.png
rename to favicons/Circled/cryptpad/cryptpad.png
diff --git a/favicons2022/Circled/cryptpad/cryptpad.zip b/favicons/Circled/cryptpad/cryptpad.zip
similarity index 100%
rename from favicons2022/Circled/cryptpad/cryptpad.zip
rename to favicons/Circled/cryptpad/cryptpad.zip
diff --git a/favicons2022/Circled/cryptpad/favicon-16x16.png b/favicons/Circled/cryptpad/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/cryptpad/favicon-16x16.png
rename to favicons/Circled/cryptpad/favicon-16x16.png
diff --git a/favicons2022/Circled/cryptpad/favicon-32x32.png b/favicons/Circled/cryptpad/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/cryptpad/favicon-32x32.png
rename to favicons/Circled/cryptpad/favicon-32x32.png
diff --git a/favicons2022/Circled/cryptpad/favicon.ico b/favicons/Circled/cryptpad/favicon.ico
similarity index 100%
rename from favicons2022/Circled/cryptpad/favicon.ico
rename to favicons/Circled/cryptpad/favicon.ico
diff --git a/favicons2022/Circled/cryptpad/site.webmanifest b/favicons/Circled/cryptpad/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/cryptpad/site.webmanifest
rename to favicons/Circled/cryptpad/site.webmanifest
diff --git a/favicons2022/Circled/disroot.org/D.png b/favicons/Circled/disroot.org/D.png
similarity index 100%
rename from favicons2022/Circled/disroot.org/D.png
rename to favicons/Circled/disroot.org/D.png
diff --git a/favicons2022/Circled/disroot.org/D.zip b/favicons/Circled/disroot.org/D.zip
similarity index 100%
rename from favicons2022/Circled/disroot.org/D.zip
rename to favicons/Circled/disroot.org/D.zip
diff --git a/favicons2022/Circled/disroot.org/android-chrome-192x192.png b/favicons/Circled/disroot.org/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/disroot.org/android-chrome-192x192.png
rename to favicons/Circled/disroot.org/android-chrome-192x192.png
diff --git a/favicons2022/Circled/disroot.org/android-chrome-512x512.png b/favicons/Circled/disroot.org/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/disroot.org/android-chrome-512x512.png
rename to favicons/Circled/disroot.org/android-chrome-512x512.png
diff --git a/favicons2022/Circled/disroot.org/apple-touch-icon.png b/favicons/Circled/disroot.org/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/disroot.org/apple-touch-icon.png
rename to favicons/Circled/disroot.org/apple-touch-icon.png
diff --git a/favicons2022/Circled/disroot.org/favicon-16x16.png b/favicons/Circled/disroot.org/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/disroot.org/favicon-16x16.png
rename to favicons/Circled/disroot.org/favicon-16x16.png
diff --git a/favicons2022/Circled/disroot.org/favicon-32x32.png b/favicons/Circled/disroot.org/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/disroot.org/favicon-32x32.png
rename to favicons/Circled/disroot.org/favicon-32x32.png
diff --git a/favicons2022/Circled/disroot.org/favicon.ico b/favicons/Circled/disroot.org/favicon.ico
similarity index 100%
rename from favicons2022/Circled/disroot.org/favicon.ico
rename to favicons/Circled/disroot.org/favicon.ico
diff --git a/favicons2022/Circled/disroot.org/site.webmanifest b/favicons/Circled/disroot.org/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/disroot.org/site.webmanifest
rename to favicons/Circled/disroot.org/site.webmanifest
diff --git a/favicons/Circled/fe/android-chrome-192x192.png b/favicons/Circled/fe/android-chrome-192x192.png
new file mode 100644
index 0000000..811c852
Binary files /dev/null and b/favicons/Circled/fe/android-chrome-192x192.png differ
diff --git a/favicons/Circled/fe/android-chrome-512x512.png b/favicons/Circled/fe/android-chrome-512x512.png
new file mode 100644
index 0000000..a1a68db
Binary files /dev/null and b/favicons/Circled/fe/android-chrome-512x512.png differ
diff --git a/favicons/Circled/fe/apple-touch-icon.png b/favicons/Circled/fe/apple-touch-icon.png
new file mode 100644
index 0000000..6bda01b
Binary files /dev/null and b/favicons/Circled/fe/apple-touch-icon.png differ
diff --git a/favicons/Circled/fe/favicon-16x16.png b/favicons/Circled/fe/favicon-16x16.png
new file mode 100644
index 0000000..6a026ed
Binary files /dev/null and b/favicons/Circled/fe/favicon-16x16.png differ
diff --git a/favicons/Circled/fe/favicon-32x32.png b/favicons/Circled/fe/favicon-32x32.png
new file mode 100644
index 0000000..987e630
Binary files /dev/null and b/favicons/Circled/fe/favicon-32x32.png differ
diff --git a/favicons/Circled/fe/favicon.ico b/favicons/Circled/fe/favicon.ico
new file mode 100644
index 0000000..7af803c
Binary files /dev/null and b/favicons/Circled/fe/favicon.ico differ
diff --git a/favicons2022/Circled/fe/fe.png b/favicons/Circled/fe/fe.png
similarity index 100%
rename from favicons2022/Circled/fe/fe.png
rename to favicons/Circled/fe/fe.png
diff --git a/favicons/Circled/fe/fe.zip b/favicons/Circled/fe/fe.zip
new file mode 100644
index 0000000..b8462db
Binary files /dev/null and b/favicons/Circled/fe/fe.zip differ
diff --git a/favicons2022/Circled/fe/site.webmanifest b/favicons/Circled/fe/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/fe/site.webmanifest
rename to favicons/Circled/fe/site.webmanifest
diff --git a/favicons2022/Circled/git/android-chrome-192x192.png b/favicons/Circled/git/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/git/android-chrome-192x192.png
rename to favicons/Circled/git/android-chrome-192x192.png
diff --git a/favicons2022/Circled/git/android-chrome-512x512.png b/favicons/Circled/git/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/git/android-chrome-512x512.png
rename to favicons/Circled/git/android-chrome-512x512.png
diff --git a/favicons2022/Circled/git/apple-touch-icon.png b/favicons/Circled/git/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/git/apple-touch-icon.png
rename to favicons/Circled/git/apple-touch-icon.png
diff --git a/favicons2022/Circled/git/favicon-16x16.png b/favicons/Circled/git/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/git/favicon-16x16.png
rename to favicons/Circled/git/favicon-16x16.png
diff --git a/favicons2022/Circled/git/favicon-32x32.png b/favicons/Circled/git/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/git/favicon-32x32.png
rename to favicons/Circled/git/favicon-32x32.png
diff --git a/favicons2022/Circled/git/favicon.ico b/favicons/Circled/git/favicon.ico
similarity index 100%
rename from favicons2022/Circled/git/favicon.ico
rename to favicons/Circled/git/favicon.ico
diff --git a/favicons2022/Circled/git/forgejo.png b/favicons/Circled/git/forgejo.png
similarity index 100%
rename from favicons2022/Circled/git/forgejo.png
rename to favicons/Circled/git/forgejo.png
diff --git a/favicons2022/Circled/git/git.zip b/favicons/Circled/git/git.zip
similarity index 100%
rename from favicons2022/Circled/git/git.zip
rename to favicons/Circled/git/git.zip
diff --git a/favicons2022/Circled/git/site.webmanifest b/favicons/Circled/git/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/git/site.webmanifest
rename to favicons/Circled/git/site.webmanifest
diff --git a/favicons2022/Circled/howto.disroot.org/android-chrome-192x192.png b/favicons/Circled/howto.disroot.org/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/howto.disroot.org/android-chrome-192x192.png
rename to favicons/Circled/howto.disroot.org/android-chrome-192x192.png
diff --git a/favicons2022/Circled/howto.disroot.org/android-chrome-512x512.png b/favicons/Circled/howto.disroot.org/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/howto.disroot.org/android-chrome-512x512.png
rename to favicons/Circled/howto.disroot.org/android-chrome-512x512.png
diff --git a/favicons2022/Circled/howto.disroot.org/apple-touch-icon.png b/favicons/Circled/howto.disroot.org/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/howto.disroot.org/apple-touch-icon.png
rename to favicons/Circled/howto.disroot.org/apple-touch-icon.png
diff --git a/favicons2022/Circled/howto.disroot.org/favicon-16x16.png b/favicons/Circled/howto.disroot.org/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/howto.disroot.org/favicon-16x16.png
rename to favicons/Circled/howto.disroot.org/favicon-16x16.png
diff --git a/favicons2022/Circled/howto.disroot.org/favicon-32x32.png b/favicons/Circled/howto.disroot.org/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/howto.disroot.org/favicon-32x32.png
rename to favicons/Circled/howto.disroot.org/favicon-32x32.png
diff --git a/favicons2022/Circled/howto.disroot.org/favicon.ico b/favicons/Circled/howto.disroot.org/favicon.ico
similarity index 100%
rename from favicons2022/Circled/howto.disroot.org/favicon.ico
rename to favicons/Circled/howto.disroot.org/favicon.ico
diff --git a/favicons2022/Circled/howto.disroot.org/howto.png b/favicons/Circled/howto.disroot.org/howto.png
similarity index 100%
rename from favicons2022/Circled/howto.disroot.org/howto.png
rename to favicons/Circled/howto.disroot.org/howto.png
diff --git a/favicons2022/Circled/howto.disroot.org/howto.zip b/favicons/Circled/howto.disroot.org/howto.zip
similarity index 100%
rename from favicons2022/Circled/howto.disroot.org/howto.zip
rename to favicons/Circled/howto.disroot.org/howto.zip
diff --git a/favicons2022/Circled/howto.disroot.org/site.webmanifest b/favicons/Circled/howto.disroot.org/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/howto.disroot.org/site.webmanifest
rename to favicons/Circled/howto.disroot.org/site.webmanifest
diff --git a/favicons2022/Circled/mumble/android-chrome-192x192.png b/favicons/Circled/mumble/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/mumble/android-chrome-192x192.png
rename to favicons/Circled/mumble/android-chrome-192x192.png
diff --git a/favicons2022/Circled/mumble/android-chrome-512x512.png b/favicons/Circled/mumble/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/mumble/android-chrome-512x512.png
rename to favicons/Circled/mumble/android-chrome-512x512.png
diff --git a/favicons2022/Circled/mumble/apple-touch-icon.png b/favicons/Circled/mumble/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/mumble/apple-touch-icon.png
rename to favicons/Circled/mumble/apple-touch-icon.png
diff --git a/favicons2022/Circled/mumble/favicon-16x16.png b/favicons/Circled/mumble/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/mumble/favicon-16x16.png
rename to favicons/Circled/mumble/favicon-16x16.png
diff --git a/favicons2022/Circled/mumble/favicon-32x32.png b/favicons/Circled/mumble/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/mumble/favicon-32x32.png
rename to favicons/Circled/mumble/favicon-32x32.png
diff --git a/favicons2022/Circled/mumble/favicon.ico b/favicons/Circled/mumble/favicon.ico
similarity index 100%
rename from favicons2022/Circled/mumble/favicon.ico
rename to favicons/Circled/mumble/favicon.ico
diff --git a/favicons2022/Circled/mumble/mumble.png b/favicons/Circled/mumble/mumble.png
similarity index 100%
rename from favicons2022/Circled/mumble/mumble.png
rename to favicons/Circled/mumble/mumble.png
diff --git a/favicons2022/Circled/mumble/mumble.zip b/favicons/Circled/mumble/mumble.zip
similarity index 100%
rename from favicons2022/Circled/mumble/mumble.zip
rename to favicons/Circled/mumble/mumble.zip
diff --git a/favicons2022/Circled/mumble/site.webmanifest b/favicons/Circled/mumble/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/mumble/site.webmanifest
rename to favicons/Circled/mumble/site.webmanifest
diff --git a/favicons2022/Circled/pad/etherpad/android-chrome-192x192.png b/favicons/Circled/pad/etherpad/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/pad/etherpad/android-chrome-192x192.png
rename to favicons/Circled/pad/etherpad/android-chrome-192x192.png
diff --git a/favicons2022/Circled/pad/etherpad/android-chrome-512x512.png b/favicons/Circled/pad/etherpad/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/pad/etherpad/android-chrome-512x512.png
rename to favicons/Circled/pad/etherpad/android-chrome-512x512.png
diff --git a/favicons2022/Circled/pad/etherpad/apple-touch-icon.png b/favicons/Circled/pad/etherpad/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/pad/etherpad/apple-touch-icon.png
rename to favicons/Circled/pad/etherpad/apple-touch-icon.png
diff --git a/favicons2022/Circled/pad/etherpad/etherpad.png b/favicons/Circled/pad/etherpad/etherpad.png
similarity index 100%
rename from favicons2022/Circled/pad/etherpad/etherpad.png
rename to favicons/Circled/pad/etherpad/etherpad.png
diff --git a/favicons2022/Circled/pad/etherpad/favicon-16x16.png b/favicons/Circled/pad/etherpad/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/pad/etherpad/favicon-16x16.png
rename to favicons/Circled/pad/etherpad/favicon-16x16.png
diff --git a/favicons2022/Circled/pad/etherpad/favicon-32x32.png b/favicons/Circled/pad/etherpad/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/pad/etherpad/favicon-32x32.png
rename to favicons/Circled/pad/etherpad/favicon-32x32.png
diff --git a/favicons2022/Circled/pad/etherpad/favicon.ico b/favicons/Circled/pad/etherpad/favicon.ico
similarity index 100%
rename from favicons2022/Circled/pad/etherpad/favicon.ico
rename to favicons/Circled/pad/etherpad/favicon.ico
diff --git a/favicons2022/Circled/pad/etherpad/pad.zip b/favicons/Circled/pad/etherpad/pad.zip
similarity index 100%
rename from favicons2022/Circled/pad/etherpad/pad.zip
rename to favicons/Circled/pad/etherpad/pad.zip
diff --git a/favicons2022/Circled/pad/etherpad/site.webmanifest b/favicons/Circled/pad/etherpad/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/pad/etherpad/site.webmanifest
rename to favicons/Circled/pad/etherpad/site.webmanifest
diff --git a/favicons2022/Circled/pad/pens/pens.png b/favicons/Circled/pad/pens/pens.png
similarity index 100%
rename from favicons2022/Circled/pad/pens/pens.png
rename to favicons/Circled/pad/pens/pens.png
diff --git a/favicons2022/Circled/search/android-chrome-192x192.png b/favicons/Circled/search/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/search/android-chrome-192x192.png
rename to favicons/Circled/search/android-chrome-192x192.png
diff --git a/favicons2022/Circled/search/android-chrome-512x512.png b/favicons/Circled/search/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/search/android-chrome-512x512.png
rename to favicons/Circled/search/android-chrome-512x512.png
diff --git a/favicons2022/Circled/search/apple-touch-icon.png b/favicons/Circled/search/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/search/apple-touch-icon.png
rename to favicons/Circled/search/apple-touch-icon.png
diff --git a/favicons2022/Circled/search/favicon-16x16.png b/favicons/Circled/search/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/search/favicon-16x16.png
rename to favicons/Circled/search/favicon-16x16.png
diff --git a/favicons2022/Circled/search/favicon-32x32.png b/favicons/Circled/search/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/search/favicon-32x32.png
rename to favicons/Circled/search/favicon-32x32.png
diff --git a/favicons2022/Circled/search/favicon.ico b/favicons/Circled/search/favicon.ico
similarity index 100%
rename from favicons2022/Circled/search/favicon.ico
rename to favicons/Circled/search/favicon.ico
diff --git a/favicons2022/Circled/search/search.zip b/favicons/Circled/search/search.zip
similarity index 100%
rename from favicons2022/Circled/search/search.zip
rename to favicons/Circled/search/search.zip
diff --git a/favicons2022/Circled/search/searx.png b/favicons/Circled/search/searx.png
similarity index 100%
rename from favicons2022/Circled/search/searx.png
rename to favicons/Circled/search/searx.png
diff --git a/favicons2022/Circled/search/site.webmanifest b/favicons/Circled/search/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/search/site.webmanifest
rename to favicons/Circled/search/site.webmanifest
diff --git a/favicons2022/Circled/status.disroot.org/status.png b/favicons/Circled/status.disroot.org/status.png
similarity index 100%
rename from favicons2022/Circled/status.disroot.org/status.png
rename to favicons/Circled/status.disroot.org/status.png
diff --git a/favicons2022/Circled/upload/android-chrome-192x192.png b/favicons/Circled/upload/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/upload/android-chrome-192x192.png
rename to favicons/Circled/upload/android-chrome-192x192.png
diff --git a/favicons2022/Circled/upload/android-chrome-512x512.png b/favicons/Circled/upload/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/upload/android-chrome-512x512.png
rename to favicons/Circled/upload/android-chrome-512x512.png
diff --git a/favicons2022/Circled/upload/apple-touch-icon.png b/favicons/Circled/upload/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/upload/apple-touch-icon.png
rename to favicons/Circled/upload/apple-touch-icon.png
diff --git a/favicons2022/Circled/upload/favicon-16x16.png b/favicons/Circled/upload/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/upload/favicon-16x16.png
rename to favicons/Circled/upload/favicon-16x16.png
diff --git a/favicons2022/Circled/upload/favicon-32x32.png b/favicons/Circled/upload/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/upload/favicon-32x32.png
rename to favicons/Circled/upload/favicon-32x32.png
diff --git a/favicons2022/Circled/upload/favicon.ico b/favicons/Circled/upload/favicon.ico
similarity index 100%
rename from favicons2022/Circled/upload/favicon.ico
rename to favicons/Circled/upload/favicon.ico
diff --git a/favicons2022/Circled/upload/lufi.png b/favicons/Circled/upload/lufi.png
similarity index 100%
rename from favicons2022/Circled/upload/lufi.png
rename to favicons/Circled/upload/lufi.png
diff --git a/favicons2022/Circled/upload/site.webmanifest b/favicons/Circled/upload/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/upload/site.webmanifest
rename to favicons/Circled/upload/site.webmanifest
diff --git a/favicons2022/Circled/upload/upload.zip b/favicons/Circled/upload/upload.zip
similarity index 100%
rename from favicons2022/Circled/upload/upload.zip
rename to favicons/Circled/upload/upload.zip
diff --git a/favicons2022/Circled/user.disroot.org/settings/android-chrome-192x192.png b/favicons/Circled/user.disroot.org/settings/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/user.disroot.org/settings/android-chrome-192x192.png
rename to favicons/Circled/user.disroot.org/settings/android-chrome-192x192.png
diff --git a/favicons2022/Circled/user.disroot.org/settings/android-chrome-512x512.png b/favicons/Circled/user.disroot.org/settings/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/user.disroot.org/settings/android-chrome-512x512.png
rename to favicons/Circled/user.disroot.org/settings/android-chrome-512x512.png
diff --git a/favicons2022/Circled/user.disroot.org/settings/apple-touch-icon.png b/favicons/Circled/user.disroot.org/settings/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/user.disroot.org/settings/apple-touch-icon.png
rename to favicons/Circled/user.disroot.org/settings/apple-touch-icon.png
diff --git a/favicons2022/Circled/user.disroot.org/settings/favicon-16x16.png b/favicons/Circled/user.disroot.org/settings/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/user.disroot.org/settings/favicon-16x16.png
rename to favicons/Circled/user.disroot.org/settings/favicon-16x16.png
diff --git a/favicons2022/Circled/user.disroot.org/settings/favicon-32x32.png b/favicons/Circled/user.disroot.org/settings/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/user.disroot.org/settings/favicon-32x32.png
rename to favicons/Circled/user.disroot.org/settings/favicon-32x32.png
diff --git a/favicons2022/Circled/user.disroot.org/settings/favicon.ico b/favicons/Circled/user.disroot.org/settings/favicon.ico
similarity index 100%
rename from favicons2022/Circled/user.disroot.org/settings/favicon.ico
rename to favicons/Circled/user.disroot.org/settings/favicon.ico
diff --git a/favicons2022/Circled/user.disroot.org/settings/settings.png b/favicons/Circled/user.disroot.org/settings/settings.png
similarity index 100%
rename from favicons2022/Circled/user.disroot.org/settings/settings.png
rename to favicons/Circled/user.disroot.org/settings/settings.png
diff --git a/favicons2022/Circled/user.disroot.org/settings/settings.zip b/favicons/Circled/user.disroot.org/settings/settings.zip
similarity index 100%
rename from favicons2022/Circled/user.disroot.org/settings/settings.zip
rename to favicons/Circled/user.disroot.org/settings/settings.zip
diff --git a/favicons2022/Circled/user.disroot.org/settings/site.webmanifest b/favicons/Circled/user.disroot.org/settings/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/user.disroot.org/settings/site.webmanifest
rename to favicons/Circled/user.disroot.org/settings/site.webmanifest
diff --git a/favicons2022/Circled/user.disroot.org/user/user.png b/favicons/Circled/user.disroot.org/user/user.png
similarity index 100%
rename from favicons2022/Circled/user.disroot.org/user/user.png
rename to favicons/Circled/user.disroot.org/user/user.png
diff --git a/favicons2022/Circled/webchat/redpill/android-chrome-192x192.png b/favicons/Circled/webchat/redpill/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/webchat/redpill/android-chrome-192x192.png
rename to favicons/Circled/webchat/redpill/android-chrome-192x192.png
diff --git a/favicons2022/Circled/webchat/redpill/android-chrome-512x512.png b/favicons/Circled/webchat/redpill/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/webchat/redpill/android-chrome-512x512.png
rename to favicons/Circled/webchat/redpill/android-chrome-512x512.png
diff --git a/favicons2022/Circled/webchat/redpill/apple-touch-icon.png b/favicons/Circled/webchat/redpill/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/webchat/redpill/apple-touch-icon.png
rename to favicons/Circled/webchat/redpill/apple-touch-icon.png
diff --git a/favicons2022/Circled/webchat/redpill/favicon-16x16.png b/favicons/Circled/webchat/redpill/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/webchat/redpill/favicon-16x16.png
rename to favicons/Circled/webchat/redpill/favicon-16x16.png
diff --git a/favicons2022/Circled/webchat/redpill/favicon-32x32.png b/favicons/Circled/webchat/redpill/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/webchat/redpill/favicon-32x32.png
rename to favicons/Circled/webchat/redpill/favicon-32x32.png
diff --git a/favicons2022/Circled/webchat/redpill/favicon.ico b/favicons/Circled/webchat/redpill/favicon.ico
similarity index 100%
rename from favicons2022/Circled/webchat/redpill/favicon.ico
rename to favicons/Circled/webchat/redpill/favicon.ico
diff --git a/favicons2022/Circled/webchat/redpill/redpill.png b/favicons/Circled/webchat/redpill/redpill.png
similarity index 100%
rename from favicons2022/Circled/webchat/redpill/redpill.png
rename to favicons/Circled/webchat/redpill/redpill.png
diff --git a/favicons2022/Circled/webchat/redpill/redpill.zip b/favicons/Circled/webchat/redpill/redpill.zip
similarity index 100%
rename from favicons2022/Circled/webchat/redpill/redpill.zip
rename to favicons/Circled/webchat/redpill/redpill.zip
diff --git a/favicons2022/Circled/webchat/redpill/site.webmanifest b/favicons/Circled/webchat/redpill/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/webchat/redpill/site.webmanifest
rename to favicons/Circled/webchat/redpill/site.webmanifest
diff --git a/favicons2022/Circled/webchat/xmpp/android-chrome-192x192.png b/favicons/Circled/webchat/xmpp/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/webchat/xmpp/android-chrome-192x192.png
rename to favicons/Circled/webchat/xmpp/android-chrome-192x192.png
diff --git a/favicons2022/Circled/webchat/xmpp/android-chrome-512x512.png b/favicons/Circled/webchat/xmpp/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/webchat/xmpp/android-chrome-512x512.png
rename to favicons/Circled/webchat/xmpp/android-chrome-512x512.png
diff --git a/favicons2022/Circled/webchat/xmpp/apple-touch-icon.png b/favicons/Circled/webchat/xmpp/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/webchat/xmpp/apple-touch-icon.png
rename to favicons/Circled/webchat/xmpp/apple-touch-icon.png
diff --git a/favicons2022/Circled/webchat/xmpp/favicon-16x16.png b/favicons/Circled/webchat/xmpp/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/webchat/xmpp/favicon-16x16.png
rename to favicons/Circled/webchat/xmpp/favicon-16x16.png
diff --git a/favicons2022/Circled/webchat/xmpp/favicon-32x32.png b/favicons/Circled/webchat/xmpp/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/webchat/xmpp/favicon-32x32.png
rename to favicons/Circled/webchat/xmpp/favicon-32x32.png
diff --git a/favicons2022/Circled/webchat/xmpp/favicon.ico b/favicons/Circled/webchat/xmpp/favicon.ico
similarity index 100%
rename from favicons2022/Circled/webchat/xmpp/favicon.ico
rename to favicons/Circled/webchat/xmpp/favicon.ico
diff --git a/favicons2022/Circled/webchat/xmpp/site.webmanifest b/favicons/Circled/webchat/xmpp/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/webchat/xmpp/site.webmanifest
rename to favicons/Circled/webchat/xmpp/site.webmanifest
diff --git a/favicons2022/Circled/webchat/xmpp/xmpp.png b/favicons/Circled/webchat/xmpp/xmpp.png
similarity index 100%
rename from favicons2022/Circled/webchat/xmpp/xmpp.png
rename to favicons/Circled/webchat/xmpp/xmpp.png
diff --git a/favicons2022/Circled/webchat/xmpp/xmpp.zip b/favicons/Circled/webchat/xmpp/xmpp.zip
similarity index 100%
rename from favicons2022/Circled/webchat/xmpp/xmpp.zip
rename to favicons/Circled/webchat/xmpp/xmpp.zip
diff --git a/favicons2022/Circled/webmail/android-chrome-192x192.png b/favicons/Circled/webmail/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/Circled/webmail/android-chrome-192x192.png
rename to favicons/Circled/webmail/android-chrome-192x192.png
diff --git a/favicons2022/Circled/webmail/android-chrome-512x512.png b/favicons/Circled/webmail/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/Circled/webmail/android-chrome-512x512.png
rename to favicons/Circled/webmail/android-chrome-512x512.png
diff --git a/favicons2022/Circled/webmail/apple-touch-icon.png b/favicons/Circled/webmail/apple-touch-icon.png
similarity index 100%
rename from favicons2022/Circled/webmail/apple-touch-icon.png
rename to favicons/Circled/webmail/apple-touch-icon.png
diff --git a/favicons2022/Circled/webmail/favicon-16x16.png b/favicons/Circled/webmail/favicon-16x16.png
similarity index 100%
rename from favicons2022/Circled/webmail/favicon-16x16.png
rename to favicons/Circled/webmail/favicon-16x16.png
diff --git a/favicons2022/Circled/webmail/favicon-32x32.png b/favicons/Circled/webmail/favicon-32x32.png
similarity index 100%
rename from favicons2022/Circled/webmail/favicon-32x32.png
rename to favicons/Circled/webmail/favicon-32x32.png
diff --git a/favicons2022/Circled/webmail/favicon.ico b/favicons/Circled/webmail/favicon.ico
similarity index 100%
rename from favicons2022/Circled/webmail/favicon.ico
rename to favicons/Circled/webmail/favicon.ico
diff --git a/favicons2022/Circled/webmail/mail.png b/favicons/Circled/webmail/mail.png
similarity index 100%
rename from favicons2022/Circled/webmail/mail.png
rename to favicons/Circled/webmail/mail.png
diff --git a/favicons2022/Circled/webmail/site.webmanifest b/favicons/Circled/webmail/site.webmanifest
similarity index 100%
rename from favicons2022/Circled/webmail/site.webmanifest
rename to favicons/Circled/webmail/site.webmanifest
diff --git a/favicons2022/Circled/webmail/webmail.zip b/favicons/Circled/webmail/webmail.zip
similarity index 100%
rename from favicons2022/Circled/webmail/webmail.zip
rename to favicons/Circled/webmail/webmail.zip
diff --git a/favicons2022/NotCirceld/bin/android-chrome-192x192.png b/favicons/NotCirceld/bin/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/bin/android-chrome-192x192.png
rename to favicons/NotCirceld/bin/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/bin/android-chrome-512x512.png b/favicons/NotCirceld/bin/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/bin/android-chrome-512x512.png
rename to favicons/NotCirceld/bin/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/bin/apple-touch-icon.png b/favicons/NotCirceld/bin/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/bin/apple-touch-icon.png
rename to favicons/NotCirceld/bin/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/bin/bin.zip b/favicons/NotCirceld/bin/bin.zip
similarity index 100%
rename from favicons2022/NotCirceld/bin/bin.zip
rename to favicons/NotCirceld/bin/bin.zip
diff --git a/favicons2022/NotCirceld/bin/favicon-16x16.png b/favicons/NotCirceld/bin/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/bin/favicon-16x16.png
rename to favicons/NotCirceld/bin/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/bin/favicon-32x32.png b/favicons/NotCirceld/bin/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/bin/favicon-32x32.png
rename to favicons/NotCirceld/bin/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/bin/favicon.ico b/favicons/NotCirceld/bin/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/bin/favicon.ico
rename to favicons/NotCirceld/bin/favicon.ico
diff --git a/favicons2022/NotCirceld/bin/pastebin.png b/favicons/NotCirceld/bin/pastebin.png
similarity index 100%
rename from favicons2022/NotCirceld/bin/pastebin.png
rename to favicons/NotCirceld/bin/pastebin.png
diff --git a/favicons2022/NotCirceld/bin/site.webmanifest b/favicons/NotCirceld/bin/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/bin/site.webmanifest
rename to favicons/NotCirceld/bin/site.webmanifest
diff --git a/favicons2022/NotCirceld/calls/android-chrome-192x192.png b/favicons/NotCirceld/calls/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/calls/android-chrome-192x192.png
rename to favicons/NotCirceld/calls/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/calls/android-chrome-512x512.png b/favicons/NotCirceld/calls/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/calls/android-chrome-512x512.png
rename to favicons/NotCirceld/calls/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/calls/apple-touch-icon.png b/favicons/NotCirceld/calls/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/calls/apple-touch-icon.png
rename to favicons/NotCirceld/calls/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/calls/calls.zip b/favicons/NotCirceld/calls/calls.zip
similarity index 100%
rename from favicons2022/NotCirceld/calls/calls.zip
rename to favicons/NotCirceld/calls/calls.zip
diff --git a/favicons2022/NotCirceld/calls/favicon-16x16.png b/favicons/NotCirceld/calls/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/calls/favicon-16x16.png
rename to favicons/NotCirceld/calls/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/calls/favicon-32x32.png b/favicons/NotCirceld/calls/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/calls/favicon-32x32.png
rename to favicons/NotCirceld/calls/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/calls/favicon.ico b/favicons/NotCirceld/calls/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/calls/favicon.ico
rename to favicons/NotCirceld/calls/favicon.ico
diff --git a/favicons2022/NotCirceld/calls/jitsi.png b/favicons/NotCirceld/calls/jitsi.png
similarity index 100%
rename from favicons2022/NotCirceld/calls/jitsi.png
rename to favicons/NotCirceld/calls/jitsi.png
diff --git a/favicons2022/NotCirceld/calls/site.webmanifest b/favicons/NotCirceld/calls/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/calls/site.webmanifest
rename to favicons/NotCirceld/calls/site.webmanifest
diff --git a/favicons2022/NotCirceld/cloud/android-chrome-192x192.png b/favicons/NotCirceld/cloud/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/cloud/android-chrome-192x192.png
rename to favicons/NotCirceld/cloud/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/cloud/android-chrome-512x512.png b/favicons/NotCirceld/cloud/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/cloud/android-chrome-512x512.png
rename to favicons/NotCirceld/cloud/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/cloud/apple-touch-icon.png b/favicons/NotCirceld/cloud/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/cloud/apple-touch-icon.png
rename to favicons/NotCirceld/cloud/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/cloud/cloud.png b/favicons/NotCirceld/cloud/cloud.png
similarity index 100%
rename from favicons2022/NotCirceld/cloud/cloud.png
rename to favicons/NotCirceld/cloud/cloud.png
diff --git a/favicons2022/NotCirceld/cloud/cloud.zip b/favicons/NotCirceld/cloud/cloud.zip
similarity index 100%
rename from favicons2022/NotCirceld/cloud/cloud.zip
rename to favicons/NotCirceld/cloud/cloud.zip
diff --git a/favicons2022/NotCirceld/cloud/favicon-16x16.png b/favicons/NotCirceld/cloud/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/cloud/favicon-16x16.png
rename to favicons/NotCirceld/cloud/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/cloud/favicon-32x32.png b/favicons/NotCirceld/cloud/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/cloud/favicon-32x32.png
rename to favicons/NotCirceld/cloud/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/cloud/favicon.ico b/favicons/NotCirceld/cloud/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/cloud/favicon.ico
rename to favicons/NotCirceld/cloud/favicon.ico
diff --git a/favicons2022/NotCirceld/cloud/site.webmanifest b/favicons/NotCirceld/cloud/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/cloud/site.webmanifest
rename to favicons/NotCirceld/cloud/site.webmanifest
diff --git a/favicons2022/NotCirceld/cryptpad/android-chrome-192x192.png b/favicons/NotCirceld/cryptpad/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/cryptpad/android-chrome-192x192.png
rename to favicons/NotCirceld/cryptpad/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/cryptpad/android-chrome-512x512.png b/favicons/NotCirceld/cryptpad/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/cryptpad/android-chrome-512x512.png
rename to favicons/NotCirceld/cryptpad/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/cryptpad/apple-touch-icon.png b/favicons/NotCirceld/cryptpad/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/cryptpad/apple-touch-icon.png
rename to favicons/NotCirceld/cryptpad/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/cryptpad/cryptpad.png b/favicons/NotCirceld/cryptpad/cryptpad.png
similarity index 100%
rename from favicons2022/NotCirceld/cryptpad/cryptpad.png
rename to favicons/NotCirceld/cryptpad/cryptpad.png
diff --git a/favicons2022/NotCirceld/cryptpad/cryptpad.zip b/favicons/NotCirceld/cryptpad/cryptpad.zip
similarity index 100%
rename from favicons2022/NotCirceld/cryptpad/cryptpad.zip
rename to favicons/NotCirceld/cryptpad/cryptpad.zip
diff --git a/favicons2022/NotCirceld/cryptpad/favicon-16x16.png b/favicons/NotCirceld/cryptpad/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/cryptpad/favicon-16x16.png
rename to favicons/NotCirceld/cryptpad/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/cryptpad/favicon-32x32.png b/favicons/NotCirceld/cryptpad/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/cryptpad/favicon-32x32.png
rename to favicons/NotCirceld/cryptpad/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/cryptpad/favicon.ico b/favicons/NotCirceld/cryptpad/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/cryptpad/favicon.ico
rename to favicons/NotCirceld/cryptpad/favicon.ico
diff --git a/favicons2022/NotCirceld/cryptpad/site.webmanifest b/favicons/NotCirceld/cryptpad/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/cryptpad/site.webmanifest
rename to favicons/NotCirceld/cryptpad/site.webmanifest
diff --git a/favicons2022/NotCirceld/disroot.org/D.png b/favicons/NotCirceld/disroot.org/D.png
similarity index 100%
rename from favicons2022/NotCirceld/disroot.org/D.png
rename to favicons/NotCirceld/disroot.org/D.png
diff --git a/favicons2022/NotCirceld/disroot.org/D.zip b/favicons/NotCirceld/disroot.org/D.zip
similarity index 100%
rename from favicons2022/NotCirceld/disroot.org/D.zip
rename to favicons/NotCirceld/disroot.org/D.zip
diff --git a/favicons2022/NotCirceld/disroot.org/android-chrome-192x192.png b/favicons/NotCirceld/disroot.org/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/disroot.org/android-chrome-192x192.png
rename to favicons/NotCirceld/disroot.org/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/disroot.org/android-chrome-512x512.png b/favicons/NotCirceld/disroot.org/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/disroot.org/android-chrome-512x512.png
rename to favicons/NotCirceld/disroot.org/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/disroot.org/apple-touch-icon.png b/favicons/NotCirceld/disroot.org/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/disroot.org/apple-touch-icon.png
rename to favicons/NotCirceld/disroot.org/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/disroot.org/favicon-16x16.png b/favicons/NotCirceld/disroot.org/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/disroot.org/favicon-16x16.png
rename to favicons/NotCirceld/disroot.org/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/disroot.org/favicon-32x32.png b/favicons/NotCirceld/disroot.org/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/disroot.org/favicon-32x32.png
rename to favicons/NotCirceld/disroot.org/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/disroot.org/favicon.ico b/favicons/NotCirceld/disroot.org/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/disroot.org/favicon.ico
rename to favicons/NotCirceld/disroot.org/favicon.ico
diff --git a/favicons2022/NotCirceld/disroot.org/site.webmanifest b/favicons/NotCirceld/disroot.org/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/disroot.org/site.webmanifest
rename to favicons/NotCirceld/disroot.org/site.webmanifest
diff --git a/favicons/NotCirceld/fe/android-chrome-192x192.png b/favicons/NotCirceld/fe/android-chrome-192x192.png
new file mode 100644
index 0000000..4a5e9f6
Binary files /dev/null and b/favicons/NotCirceld/fe/android-chrome-192x192.png differ
diff --git a/favicons/NotCirceld/fe/android-chrome-512x512.png b/favicons/NotCirceld/fe/android-chrome-512x512.png
new file mode 100644
index 0000000..eddaa6d
Binary files /dev/null and b/favicons/NotCirceld/fe/android-chrome-512x512.png differ
diff --git a/favicons/NotCirceld/fe/apple-touch-icon.png b/favicons/NotCirceld/fe/apple-touch-icon.png
new file mode 100644
index 0000000..8cdbf2a
Binary files /dev/null and b/favicons/NotCirceld/fe/apple-touch-icon.png differ
diff --git a/favicons/NotCirceld/fe/favicon-16x16.png b/favicons/NotCirceld/fe/favicon-16x16.png
new file mode 100644
index 0000000..d25a284
Binary files /dev/null and b/favicons/NotCirceld/fe/favicon-16x16.png differ
diff --git a/favicons/NotCirceld/fe/favicon-32x32.png b/favicons/NotCirceld/fe/favicon-32x32.png
new file mode 100644
index 0000000..ffbe764
Binary files /dev/null and b/favicons/NotCirceld/fe/favicon-32x32.png differ
diff --git a/favicons/NotCirceld/fe/favicon.ico b/favicons/NotCirceld/fe/favicon.ico
new file mode 100644
index 0000000..8b609c6
Binary files /dev/null and b/favicons/NotCirceld/fe/favicon.ico differ
diff --git a/favicons2022/NotCirceld/fe/fe.png b/favicons/NotCirceld/fe/fe.png
similarity index 100%
rename from favicons2022/NotCirceld/fe/fe.png
rename to favicons/NotCirceld/fe/fe.png
diff --git a/favicons/NotCirceld/fe/fe.zip b/favicons/NotCirceld/fe/fe.zip
new file mode 100644
index 0000000..f467b38
Binary files /dev/null and b/favicons/NotCirceld/fe/fe.zip differ
diff --git a/favicons2022/NotCirceld/fe/site.webmanifest b/favicons/NotCirceld/fe/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/fe/site.webmanifest
rename to favicons/NotCirceld/fe/site.webmanifest
diff --git a/favicons2022/NotCirceld/git/android-chrome-192x192.png b/favicons/NotCirceld/git/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/git/android-chrome-192x192.png
rename to favicons/NotCirceld/git/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/git/android-chrome-512x512.png b/favicons/NotCirceld/git/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/git/android-chrome-512x512.png
rename to favicons/NotCirceld/git/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/git/apple-touch-icon.png b/favicons/NotCirceld/git/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/git/apple-touch-icon.png
rename to favicons/NotCirceld/git/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/git/favicon-16x16.png b/favicons/NotCirceld/git/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/git/favicon-16x16.png
rename to favicons/NotCirceld/git/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/git/favicon-32x32.png b/favicons/NotCirceld/git/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/git/favicon-32x32.png
rename to favicons/NotCirceld/git/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/git/favicon.ico b/favicons/NotCirceld/git/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/git/favicon.ico
rename to favicons/NotCirceld/git/favicon.ico
diff --git a/favicons2022/NotCirceld/git/forgejo.png b/favicons/NotCirceld/git/forgejo.png
similarity index 100%
rename from favicons2022/NotCirceld/git/forgejo.png
rename to favicons/NotCirceld/git/forgejo.png
diff --git a/favicons2022/NotCirceld/git/git.zip b/favicons/NotCirceld/git/git.zip
similarity index 100%
rename from favicons2022/NotCirceld/git/git.zip
rename to favicons/NotCirceld/git/git.zip
diff --git a/favicons2022/NotCirceld/git/site.webmanifest b/favicons/NotCirceld/git/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/git/site.webmanifest
rename to favicons/NotCirceld/git/site.webmanifest
diff --git a/favicons2022/NotCirceld/howto.disroot.org/android-chrome-192x192.png b/favicons/NotCirceld/howto.disroot.org/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/howto.disroot.org/android-chrome-192x192.png
rename to favicons/NotCirceld/howto.disroot.org/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/howto.disroot.org/android-chrome-512x512.png b/favicons/NotCirceld/howto.disroot.org/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/howto.disroot.org/android-chrome-512x512.png
rename to favicons/NotCirceld/howto.disroot.org/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/howto.disroot.org/apple-touch-icon.png b/favicons/NotCirceld/howto.disroot.org/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/howto.disroot.org/apple-touch-icon.png
rename to favicons/NotCirceld/howto.disroot.org/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/howto.disroot.org/favicon-16x16.png b/favicons/NotCirceld/howto.disroot.org/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/howto.disroot.org/favicon-16x16.png
rename to favicons/NotCirceld/howto.disroot.org/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/howto.disroot.org/favicon-32x32.png b/favicons/NotCirceld/howto.disroot.org/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/howto.disroot.org/favicon-32x32.png
rename to favicons/NotCirceld/howto.disroot.org/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/howto.disroot.org/favicon.ico b/favicons/NotCirceld/howto.disroot.org/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/howto.disroot.org/favicon.ico
rename to favicons/NotCirceld/howto.disroot.org/favicon.ico
diff --git a/favicons2022/NotCirceld/howto.disroot.org/howto.png b/favicons/NotCirceld/howto.disroot.org/howto.png
similarity index 100%
rename from favicons2022/NotCirceld/howto.disroot.org/howto.png
rename to favicons/NotCirceld/howto.disroot.org/howto.png
diff --git a/favicons2022/NotCirceld/howto.disroot.org/howto.zip b/favicons/NotCirceld/howto.disroot.org/howto.zip
similarity index 100%
rename from favicons2022/NotCirceld/howto.disroot.org/howto.zip
rename to favicons/NotCirceld/howto.disroot.org/howto.zip
diff --git a/favicons2022/NotCirceld/howto.disroot.org/site.webmanifest b/favicons/NotCirceld/howto.disroot.org/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/howto.disroot.org/site.webmanifest
rename to favicons/NotCirceld/howto.disroot.org/site.webmanifest
diff --git a/favicons2022/NotCirceld/mumble/android-chrome-192x192.png b/favicons/NotCirceld/mumble/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/mumble/android-chrome-192x192.png
rename to favicons/NotCirceld/mumble/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/mumble/android-chrome-512x512.png b/favicons/NotCirceld/mumble/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/mumble/android-chrome-512x512.png
rename to favicons/NotCirceld/mumble/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/mumble/apple-touch-icon.png b/favicons/NotCirceld/mumble/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/mumble/apple-touch-icon.png
rename to favicons/NotCirceld/mumble/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/mumble/favicon-16x16.png b/favicons/NotCirceld/mumble/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/mumble/favicon-16x16.png
rename to favicons/NotCirceld/mumble/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/mumble/favicon-32x32.png b/favicons/NotCirceld/mumble/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/mumble/favicon-32x32.png
rename to favicons/NotCirceld/mumble/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/mumble/favicon.ico b/favicons/NotCirceld/mumble/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/mumble/favicon.ico
rename to favicons/NotCirceld/mumble/favicon.ico
diff --git a/favicons2022/NotCirceld/mumble/mumble.png b/favicons/NotCirceld/mumble/mumble.png
similarity index 100%
rename from favicons2022/NotCirceld/mumble/mumble.png
rename to favicons/NotCirceld/mumble/mumble.png
diff --git a/favicons2022/NotCirceld/mumble/mumble.zip b/favicons/NotCirceld/mumble/mumble.zip
similarity index 100%
rename from favicons2022/NotCirceld/mumble/mumble.zip
rename to favicons/NotCirceld/mumble/mumble.zip
diff --git a/favicons2022/NotCirceld/mumble/site.webmanifest b/favicons/NotCirceld/mumble/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/mumble/site.webmanifest
rename to favicons/NotCirceld/mumble/site.webmanifest
diff --git a/favicons2022/NotCirceld/pad/etherpad/android-chrome-192x192.png b/favicons/NotCirceld/pad/etherpad/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/pad/etherpad/android-chrome-192x192.png
rename to favicons/NotCirceld/pad/etherpad/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/pad/etherpad/android-chrome-512x512.png b/favicons/NotCirceld/pad/etherpad/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/pad/etherpad/android-chrome-512x512.png
rename to favicons/NotCirceld/pad/etherpad/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/pad/etherpad/apple-touch-icon.png b/favicons/NotCirceld/pad/etherpad/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/pad/etherpad/apple-touch-icon.png
rename to favicons/NotCirceld/pad/etherpad/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/pad/etherpad/etherpad.png b/favicons/NotCirceld/pad/etherpad/etherpad.png
similarity index 100%
rename from favicons2022/NotCirceld/pad/etherpad/etherpad.png
rename to favicons/NotCirceld/pad/etherpad/etherpad.png
diff --git a/favicons2022/NotCirceld/pad/etherpad/favicon-16x16.png b/favicons/NotCirceld/pad/etherpad/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/pad/etherpad/favicon-16x16.png
rename to favicons/NotCirceld/pad/etherpad/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/pad/etherpad/favicon-32x32.png b/favicons/NotCirceld/pad/etherpad/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/pad/etherpad/favicon-32x32.png
rename to favicons/NotCirceld/pad/etherpad/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/pad/etherpad/favicon.ico b/favicons/NotCirceld/pad/etherpad/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/pad/etherpad/favicon.ico
rename to favicons/NotCirceld/pad/etherpad/favicon.ico
diff --git a/favicons2022/NotCirceld/pad/etherpad/pad.zip b/favicons/NotCirceld/pad/etherpad/pad.zip
similarity index 100%
rename from favicons2022/NotCirceld/pad/etherpad/pad.zip
rename to favicons/NotCirceld/pad/etherpad/pad.zip
diff --git a/favicons2022/NotCirceld/pad/etherpad/site.webmanifest b/favicons/NotCirceld/pad/etherpad/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/pad/etherpad/site.webmanifest
rename to favicons/NotCirceld/pad/etherpad/site.webmanifest
diff --git a/favicons2022/NotCirceld/pad/pens/pens.png b/favicons/NotCirceld/pad/pens/pens.png
similarity index 100%
rename from favicons2022/NotCirceld/pad/pens/pens.png
rename to favicons/NotCirceld/pad/pens/pens.png
diff --git a/favicons2022/NotCirceld/search/android-chrome-192x192.png b/favicons/NotCirceld/search/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/search/android-chrome-192x192.png
rename to favicons/NotCirceld/search/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/search/android-chrome-512x512.png b/favicons/NotCirceld/search/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/search/android-chrome-512x512.png
rename to favicons/NotCirceld/search/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/search/apple-touch-icon.png b/favicons/NotCirceld/search/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/search/apple-touch-icon.png
rename to favicons/NotCirceld/search/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/search/favicon-16x16.png b/favicons/NotCirceld/search/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/search/favicon-16x16.png
rename to favicons/NotCirceld/search/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/search/favicon-32x32.png b/favicons/NotCirceld/search/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/search/favicon-32x32.png
rename to favicons/NotCirceld/search/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/search/favicon.ico b/favicons/NotCirceld/search/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/search/favicon.ico
rename to favicons/NotCirceld/search/favicon.ico
diff --git a/favicons2022/NotCirceld/search/search.zip b/favicons/NotCirceld/search/search.zip
similarity index 100%
rename from favicons2022/NotCirceld/search/search.zip
rename to favicons/NotCirceld/search/search.zip
diff --git a/favicons2022/NotCirceld/search/searx.png b/favicons/NotCirceld/search/searx.png
similarity index 100%
rename from favicons2022/NotCirceld/search/searx.png
rename to favicons/NotCirceld/search/searx.png
diff --git a/favicons2022/NotCirceld/search/site.webmanifest b/favicons/NotCirceld/search/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/search/site.webmanifest
rename to favicons/NotCirceld/search/site.webmanifest
diff --git a/favicons2022/NotCirceld/status.disroot.org/status.png b/favicons/NotCirceld/status.disroot.org/status.png
similarity index 100%
rename from favicons2022/NotCirceld/status.disroot.org/status.png
rename to favicons/NotCirceld/status.disroot.org/status.png
diff --git a/favicons2022/NotCirceld/upload/android-chrome-192x192.png b/favicons/NotCirceld/upload/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/upload/android-chrome-192x192.png
rename to favicons/NotCirceld/upload/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/upload/android-chrome-512x512.png b/favicons/NotCirceld/upload/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/upload/android-chrome-512x512.png
rename to favicons/NotCirceld/upload/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/upload/apple-touch-icon.png b/favicons/NotCirceld/upload/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/upload/apple-touch-icon.png
rename to favicons/NotCirceld/upload/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/upload/favicon-16x16.png b/favicons/NotCirceld/upload/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/upload/favicon-16x16.png
rename to favicons/NotCirceld/upload/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/upload/favicon-32x32.png b/favicons/NotCirceld/upload/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/upload/favicon-32x32.png
rename to favicons/NotCirceld/upload/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/upload/favicon.ico b/favicons/NotCirceld/upload/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/upload/favicon.ico
rename to favicons/NotCirceld/upload/favicon.ico
diff --git a/favicons2022/NotCirceld/upload/lufi.png b/favicons/NotCirceld/upload/lufi.png
similarity index 100%
rename from favicons2022/NotCirceld/upload/lufi.png
rename to favicons/NotCirceld/upload/lufi.png
diff --git a/favicons2022/NotCirceld/upload/site.webmanifest b/favicons/NotCirceld/upload/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/upload/site.webmanifest
rename to favicons/NotCirceld/upload/site.webmanifest
diff --git a/favicons2022/NotCirceld/user.disroot.org/settings/android-chrome-192x192.png b/favicons/NotCirceld/user.disroot.org/settings/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/user.disroot.org/settings/android-chrome-192x192.png
rename to favicons/NotCirceld/user.disroot.org/settings/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/user.disroot.org/settings/android-chrome-512x512.png b/favicons/NotCirceld/user.disroot.org/settings/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/user.disroot.org/settings/android-chrome-512x512.png
rename to favicons/NotCirceld/user.disroot.org/settings/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/user.disroot.org/settings/apple-touch-icon.png b/favicons/NotCirceld/user.disroot.org/settings/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/user.disroot.org/settings/apple-touch-icon.png
rename to favicons/NotCirceld/user.disroot.org/settings/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/user.disroot.org/settings/favicon-16x16.png b/favicons/NotCirceld/user.disroot.org/settings/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/user.disroot.org/settings/favicon-16x16.png
rename to favicons/NotCirceld/user.disroot.org/settings/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/user.disroot.org/settings/favicon-32x32.png b/favicons/NotCirceld/user.disroot.org/settings/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/user.disroot.org/settings/favicon-32x32.png
rename to favicons/NotCirceld/user.disroot.org/settings/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/user.disroot.org/settings/favicon.ico b/favicons/NotCirceld/user.disroot.org/settings/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/user.disroot.org/settings/favicon.ico
rename to favicons/NotCirceld/user.disroot.org/settings/favicon.ico
diff --git a/favicons2022/NotCirceld/user.disroot.org/settings/settings.png b/favicons/NotCirceld/user.disroot.org/settings/settings.png
similarity index 100%
rename from favicons2022/NotCirceld/user.disroot.org/settings/settings.png
rename to favicons/NotCirceld/user.disroot.org/settings/settings.png
diff --git a/favicons2022/NotCirceld/user.disroot.org/settings/settings.zip b/favicons/NotCirceld/user.disroot.org/settings/settings.zip
similarity index 100%
rename from favicons2022/NotCirceld/user.disroot.org/settings/settings.zip
rename to favicons/NotCirceld/user.disroot.org/settings/settings.zip
diff --git a/favicons2022/NotCirceld/user.disroot.org/settings/site.webmanifest b/favicons/NotCirceld/user.disroot.org/settings/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/user.disroot.org/settings/site.webmanifest
rename to favicons/NotCirceld/user.disroot.org/settings/site.webmanifest
diff --git a/favicons2022/NotCirceld/user.disroot.org/user/user.png b/favicons/NotCirceld/user.disroot.org/user/user.png
similarity index 100%
rename from favicons2022/NotCirceld/user.disroot.org/user/user.png
rename to favicons/NotCirceld/user.disroot.org/user/user.png
diff --git a/favicons2022/NotCirceld/webchat/redpill/android-chrome-192x192.png b/favicons/NotCirceld/webchat/redpill/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/webchat/redpill/android-chrome-192x192.png
rename to favicons/NotCirceld/webchat/redpill/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/webchat/redpill/android-chrome-512x512.png b/favicons/NotCirceld/webchat/redpill/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/webchat/redpill/android-chrome-512x512.png
rename to favicons/NotCirceld/webchat/redpill/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/webchat/redpill/apple-touch-icon.png b/favicons/NotCirceld/webchat/redpill/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/webchat/redpill/apple-touch-icon.png
rename to favicons/NotCirceld/webchat/redpill/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/webchat/redpill/favicon-16x16.png b/favicons/NotCirceld/webchat/redpill/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/webchat/redpill/favicon-16x16.png
rename to favicons/NotCirceld/webchat/redpill/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/webchat/redpill/favicon-32x32.png b/favicons/NotCirceld/webchat/redpill/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/webchat/redpill/favicon-32x32.png
rename to favicons/NotCirceld/webchat/redpill/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/webchat/redpill/favicon.ico b/favicons/NotCirceld/webchat/redpill/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/webchat/redpill/favicon.ico
rename to favicons/NotCirceld/webchat/redpill/favicon.ico
diff --git a/favicons2022/NotCirceld/webchat/redpill/redpill.png b/favicons/NotCirceld/webchat/redpill/redpill.png
similarity index 100%
rename from favicons2022/NotCirceld/webchat/redpill/redpill.png
rename to favicons/NotCirceld/webchat/redpill/redpill.png
diff --git a/favicons2022/NotCirceld/webchat/redpill/redpill.zip b/favicons/NotCirceld/webchat/redpill/redpill.zip
similarity index 100%
rename from favicons2022/NotCirceld/webchat/redpill/redpill.zip
rename to favicons/NotCirceld/webchat/redpill/redpill.zip
diff --git a/favicons2022/NotCirceld/webchat/redpill/site.webmanifest b/favicons/NotCirceld/webchat/redpill/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/webchat/redpill/site.webmanifest
rename to favicons/NotCirceld/webchat/redpill/site.webmanifest
diff --git a/favicons2022/NotCirceld/webchat/xmpp/android-chrome-192x192.png b/favicons/NotCirceld/webchat/xmpp/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/webchat/xmpp/android-chrome-192x192.png
rename to favicons/NotCirceld/webchat/xmpp/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/webchat/xmpp/android-chrome-512x512.png b/favicons/NotCirceld/webchat/xmpp/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/webchat/xmpp/android-chrome-512x512.png
rename to favicons/NotCirceld/webchat/xmpp/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/webchat/xmpp/apple-touch-icon.png b/favicons/NotCirceld/webchat/xmpp/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/webchat/xmpp/apple-touch-icon.png
rename to favicons/NotCirceld/webchat/xmpp/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/webchat/xmpp/favicon-16x16.png b/favicons/NotCirceld/webchat/xmpp/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/webchat/xmpp/favicon-16x16.png
rename to favicons/NotCirceld/webchat/xmpp/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/webchat/xmpp/favicon-32x32.png b/favicons/NotCirceld/webchat/xmpp/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/webchat/xmpp/favicon-32x32.png
rename to favicons/NotCirceld/webchat/xmpp/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/webchat/xmpp/favicon.ico b/favicons/NotCirceld/webchat/xmpp/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/webchat/xmpp/favicon.ico
rename to favicons/NotCirceld/webchat/xmpp/favicon.ico
diff --git a/favicons2022/NotCirceld/webchat/xmpp/site.webmanifest b/favicons/NotCirceld/webchat/xmpp/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/webchat/xmpp/site.webmanifest
rename to favicons/NotCirceld/webchat/xmpp/site.webmanifest
diff --git a/favicons2022/NotCirceld/webchat/xmpp/xmpp.png b/favicons/NotCirceld/webchat/xmpp/xmpp.png
similarity index 100%
rename from favicons2022/NotCirceld/webchat/xmpp/xmpp.png
rename to favicons/NotCirceld/webchat/xmpp/xmpp.png
diff --git a/favicons2022/NotCirceld/webchat/xmpp/xmpp.zip b/favicons/NotCirceld/webchat/xmpp/xmpp.zip
similarity index 100%
rename from favicons2022/NotCirceld/webchat/xmpp/xmpp.zip
rename to favicons/NotCirceld/webchat/xmpp/xmpp.zip
diff --git a/favicons2022/NotCirceld/webmail/android-chrome-192x192.png b/favicons/NotCirceld/webmail/android-chrome-192x192.png
similarity index 100%
rename from favicons2022/NotCirceld/webmail/android-chrome-192x192.png
rename to favicons/NotCirceld/webmail/android-chrome-192x192.png
diff --git a/favicons2022/NotCirceld/webmail/android-chrome-512x512.png b/favicons/NotCirceld/webmail/android-chrome-512x512.png
similarity index 100%
rename from favicons2022/NotCirceld/webmail/android-chrome-512x512.png
rename to favicons/NotCirceld/webmail/android-chrome-512x512.png
diff --git a/favicons2022/NotCirceld/webmail/apple-touch-icon.png b/favicons/NotCirceld/webmail/apple-touch-icon.png
similarity index 100%
rename from favicons2022/NotCirceld/webmail/apple-touch-icon.png
rename to favicons/NotCirceld/webmail/apple-touch-icon.png
diff --git a/favicons2022/NotCirceld/webmail/favicon-16x16.png b/favicons/NotCirceld/webmail/favicon-16x16.png
similarity index 100%
rename from favicons2022/NotCirceld/webmail/favicon-16x16.png
rename to favicons/NotCirceld/webmail/favicon-16x16.png
diff --git a/favicons2022/NotCirceld/webmail/favicon-32x32.png b/favicons/NotCirceld/webmail/favicon-32x32.png
similarity index 100%
rename from favicons2022/NotCirceld/webmail/favicon-32x32.png
rename to favicons/NotCirceld/webmail/favicon-32x32.png
diff --git a/favicons2022/NotCirceld/webmail/favicon.ico b/favicons/NotCirceld/webmail/favicon.ico
similarity index 100%
rename from favicons2022/NotCirceld/webmail/favicon.ico
rename to favicons/NotCirceld/webmail/favicon.ico
diff --git a/favicons2022/NotCirceld/webmail/mail.png b/favicons/NotCirceld/webmail/mail.png
similarity index 100%
rename from favicons2022/NotCirceld/webmail/mail.png
rename to favicons/NotCirceld/webmail/mail.png
diff --git a/favicons2022/NotCirceld/webmail/site.webmanifest b/favicons/NotCirceld/webmail/site.webmanifest
similarity index 100%
rename from favicons2022/NotCirceld/webmail/site.webmanifest
rename to favicons/NotCirceld/webmail/site.webmanifest
diff --git a/favicons2022/NotCirceld/webmail/webmail.zip b/favicons/NotCirceld/webmail/webmail.zip
similarity index 100%
rename from favicons2022/NotCirceld/webmail/webmail.zip
rename to favicons/NotCirceld/webmail/webmail.zip
diff --git a/favicons2022/installation.md b/favicons/installation.md
similarity index 100%
rename from favicons2022/installation.md
rename to favicons/installation.md
diff --git a/favicons2022/Circled/fe/android-chrome-192x192.png b/favicons2022/Circled/fe/android-chrome-192x192.png
deleted file mode 100644
index 197b6fe..0000000
Binary files a/favicons2022/Circled/fe/android-chrome-192x192.png and /dev/null differ
diff --git a/favicons2022/Circled/fe/android-chrome-512x512.png b/favicons2022/Circled/fe/android-chrome-512x512.png
deleted file mode 100644
index 742a31a..0000000
Binary files a/favicons2022/Circled/fe/android-chrome-512x512.png and /dev/null differ
diff --git a/favicons2022/Circled/fe/apple-touch-icon.png b/favicons2022/Circled/fe/apple-touch-icon.png
deleted file mode 100644
index 4205e9c..0000000
Binary files a/favicons2022/Circled/fe/apple-touch-icon.png and /dev/null differ
diff --git a/favicons2022/Circled/fe/favicon-16x16.png b/favicons2022/Circled/fe/favicon-16x16.png
deleted file mode 100644
index 5a72f52..0000000
Binary files a/favicons2022/Circled/fe/favicon-16x16.png and /dev/null differ
diff --git a/favicons2022/Circled/fe/favicon-32x32.png b/favicons2022/Circled/fe/favicon-32x32.png
deleted file mode 100644
index e67f54b..0000000
Binary files a/favicons2022/Circled/fe/favicon-32x32.png and /dev/null differ
diff --git a/favicons2022/Circled/fe/favicon.ico b/favicons2022/Circled/fe/favicon.ico
deleted file mode 100644
index 01d2b4c..0000000
Binary files a/favicons2022/Circled/fe/favicon.ico and /dev/null differ
diff --git a/favicons2022/Circled/fe/fe.zip b/favicons2022/Circled/fe/fe.zip
deleted file mode 100644
index 8421055..0000000
Binary files a/favicons2022/Circled/fe/fe.zip and /dev/null differ
diff --git a/favicons2022/NotCirceld/fe/android-chrome-192x192.png b/favicons2022/NotCirceld/fe/android-chrome-192x192.png
deleted file mode 100644
index 9678ba4..0000000
Binary files a/favicons2022/NotCirceld/fe/android-chrome-192x192.png and /dev/null differ
diff --git a/favicons2022/NotCirceld/fe/android-chrome-512x512.png b/favicons2022/NotCirceld/fe/android-chrome-512x512.png
deleted file mode 100644
index cbea4b8..0000000
Binary files a/favicons2022/NotCirceld/fe/android-chrome-512x512.png and /dev/null differ
diff --git a/favicons2022/NotCirceld/fe/apple-touch-icon.png b/favicons2022/NotCirceld/fe/apple-touch-icon.png
deleted file mode 100644
index ec22363..0000000
Binary files a/favicons2022/NotCirceld/fe/apple-touch-icon.png and /dev/null differ
diff --git a/favicons2022/NotCirceld/fe/favicon-16x16.png b/favicons2022/NotCirceld/fe/favicon-16x16.png
deleted file mode 100644
index cfada97..0000000
Binary files a/favicons2022/NotCirceld/fe/favicon-16x16.png and /dev/null differ
diff --git a/favicons2022/NotCirceld/fe/favicon-32x32.png b/favicons2022/NotCirceld/fe/favicon-32x32.png
deleted file mode 100644
index 8ba9a36..0000000
Binary files a/favicons2022/NotCirceld/fe/favicon-32x32.png and /dev/null differ
diff --git a/favicons2022/NotCirceld/fe/favicon.ico b/favicons2022/NotCirceld/fe/favicon.ico
deleted file mode 100644
index b8c884a..0000000
Binary files a/favicons2022/NotCirceld/fe/favicon.ico and /dev/null differ
diff --git a/favicons2022/NotCirceld/fe/fe.zip b/favicons2022/NotCirceld/fe/fe.zip
deleted file mode 100644
index 01436e9..0000000
Binary files a/favicons2022/NotCirceld/fe/fe.zip and /dev/null differ