diff --git a/README.md b/README.md
index 4dd696d..2c2dae9 100644
--- a/README.md
+++ b/README.md
@@ -5,16 +5,14 @@
 This script crawls known sources of published Session Communities,
 queries their servers for available information and
 displays this information as a static HTML page.
-The results of this can be viewed on https://sessioncommunities.online/.
-
+The results of this can be viewed on <https://sessioncommunities.online/>.
 
 ## What is Session?
 
 Session is a private messaging app that protects your meta-data,
 encrypts your communications, and makes sure your messaging activities
 leave no digital trail behind.
-https://getsession.org/
-
+<https://getsession.org/>
 
 ## Details
 
@@ -59,20 +57,28 @@ The details can be seen in [`curl_get_contents()`](php/utils/utils.php).
 
 ### Official repositories
 
-- GitHub: <https://github.com/mdPlusPlus/sessioncommunities.online>
-- Lokinet Gitea: <https://lokilocker.com/SomeGuy/sessioncommunities.online>
+- Codeberg: <https://codeberg.org/gravel/sessioncommunities.online>
+- Lokinet Gitea (mirror): <https://lokilocker.com/gravel/sessioncommunities.online>
+- GitHub (former official repository): <https://github.com/mdPlusPlus/sessioncommunities.online>
+- Lokinet Gitea (former mirror): <https://lokilocker.com/SomeGuy/sessioncommunities.online>
 
 If your favourite Session community is missing a language flag,
 you can issue a pull request here:
 
 - <https://github.com/mdPlusPlus/sessioncommunities.online-languages/>
 
+Alternatively, support this issue on Oxen Github to make language tags a native feature:
+
+- <https://github.com/oxen-io/session-pysogs/issues/186>
+
 ### Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## Contact
 
-If you want to contact me, you can add me on Session via my
-[ONS](https://docs.oxen.io/using-the-oxen-blockchain/using-oxen-name-system):
-`someguy`.
+To report issues, visit the Web Development Community on [caliban.org](http://sog.caliban.org/r/webdev).
+
+Contact gravel on Session as `gravel` (Registered ID) or [read more](https://codeberg.org/gravel/gravel).
+
+Contact SomeGuy on Session as `someguy` (Registered ID).
diff --git a/sites/index.php b/sites/index.php
index 1221d6c..11b6854 100644
--- a/sites/index.php
+++ b/sites/index.php
@@ -92,7 +92,7 @@
 					<br>
 					Communities shown are fetched automatically from
 					<a
-						href="https://github.com/mdPlusPlus/sessioncommunities.online#which-sources-are-crawled"
+						href="https://codeberg.org/gravel/sessioncommunities.online#which-sources-are-crawled"
 						target="_blank"
 					>various sources</a>.
 					<br>
@@ -144,17 +144,12 @@
 			</nav>
 			<nav>
 				<a
-					href="https://github.com/mdPlusPlus/sessioncommunities.online"
+					href="https://codeberg.org/gravel/sessioncommunities.online"
 					target="_blank"
-					title="sessioncommunities.online repository on GitHub."
+					title="sessioncommunities.online repository on Codeberg."
 				>Source Code</a>
 				<a
-					href="https://lokilocker.com/someguy/sessioncommunities.online"
-					target="_blank"
-					title="sessioncommunities.online repository on Lokinet Gitea."
-				>Source Code (Mirror)</a>
-				<a
-					href="https://github.com/mdPlusPlus/sessioncommunities.online#contact"
+					href="https://codeberg.org/gravel/sessioncommunities.online#contact"
 					target="_blank"
 					rel="author"
 					title="Information on how to contact the maintainer of sessioncommunities.online"