diff --git a/README.md b/README.md
index 0c4becacc4..4cbca25d8a 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@
     <h1 align="center">Welcome to Forgejo</h1>
 </div>
 
+# This is NOT the original Forgejo repository hosted at Alpsource. Original is from codeberg at [forgejo/forgejo](https://codeberg.org/forgejo/forgejo)
+
 Hi there! Tired of big platforms playing monopoly?
 Providing Git hosting for your project, friends, company or community?
 **Forgejo** (/for'd&#865;ʒe.jo/ inspired by forĝejo – the Esperanto word for *forge*) has you covered with its intuitive interface,
diff --git a/assets/favicon.svg b/assets/favicon.svg
index bcacdc0200..311ebbbce3 100644
--- a/assets/favicon.svg
+++ b/assets/favicon.svg
@@ -1,27 +1,9 @@
-<svg viewBox="0 0 212 212" xmlns="http://www.w3.org/2000/svg">
-  <style type="text/css">
-    circle {
-      fill: none;
-      stroke: #000;
-      stroke-width: 15;
-    }
-    path {
-      fill: none;
-      stroke: #000;
-      stroke-width: 25;
-    }
-    .orange {
-      stroke:#ff6600;
-    }
-    .red {
-      stroke:#d40000;
-    }
-  </style>
-  <g transform="translate(6,6)">
-    <path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" class="orange" />
-    <path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" class="red" />
-    <circle cx="142" cy="20" r="18" class="orange" />
-    <circle cx="142" cy="88" r="18" class="red" />
-    <circle cx="58" cy="180" r="18" class="red" />
-  </g>
+<svg width="212" height="212" viewBox="0 0 212 212" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M31.5966 74.7492H23.0093V1.26337H48.9757C55.5865 1.26337 60.6299 3.12333 64.1057 6.84324C67.5815 10.5632 69.3194 15.757 69.3194 22.4248C69.3194 28.3907 67.8201 33.1634 64.8213 36.7429C61.8226 40.3225 57.4608 42.393 51.7359 42.9545L69.9328 74.7492H60.3232L42.9441 43.3756H31.5966V74.7492ZM48.7712 35.9007C52.3833 35.9007 55.1776 34.9882 57.1541 33.1634C59.1987 31.2683 60.221 28.6012 60.221 25.1621V19.6875C60.221 16.2483 59.1987 13.6163 57.1541 11.7914C55.1776 9.89638 52.3833 8.94885 48.7712 8.94885H31.5966V35.9007H48.7712Z" fill="#EA76CB"/>
+<path d="M166.909 76.0126C160.503 76.0126 155.255 74.8194 151.166 72.433C147.076 69.9765 143.703 66.8532 141.045 63.0631L147.281 57.799C150.075 61.3786 153.006 64.0457 156.073 65.8004C159.208 67.555 162.922 68.4324 167.216 68.4324C172.395 68.4324 176.348 67.2041 179.074 64.7476C181.801 62.291 183.164 58.8519 183.164 54.4301C183.164 50.8505 182.175 48.0781 180.199 46.1129C178.223 44.0775 174.781 42.6386 169.874 41.7964L161.9 40.4277C158.424 39.7961 155.493 38.8485 153.108 37.5852C150.791 36.3218 148.917 34.8128 147.485 33.0581C146.054 31.2332 145.032 29.268 144.418 27.1624C143.805 24.9866 143.498 22.7406 143.498 20.4244C143.498 13.6865 145.645 8.59791 149.939 5.15875C154.233 1.71958 160.026 0 167.318 0C173.043 0 177.848 0.982619 181.732 2.94786C185.685 4.91309 188.854 7.68548 191.24 11.265L185.208 16.6343C183.232 13.9672 180.846 11.7914 178.052 10.1069C175.258 8.42245 171.646 7.58021 167.216 7.58021C162.377 7.58021 158.663 8.63301 156.073 10.7386C153.483 12.8442 152.188 16.0027 152.188 20.2139C152.188 23.5127 153.142 26.2149 155.05 28.3205C157.027 30.3559 160.537 31.8298 165.58 32.7423L173.247 34.1109C176.723 34.7426 179.654 35.6901 182.039 36.9535C184.424 38.2169 186.333 39.7259 187.764 41.4806C189.263 43.2352 190.32 45.2005 190.933 47.3763C191.546 49.5521 191.853 51.8331 191.853 54.2195C191.853 61.0276 189.672 66.3619 185.31 70.2222C181.017 74.0824 174.883 76.0126 166.909 76.0126Z" fill="#EA76CB"/>
+<path d="M46.1132 212C36.5718 212 29.4838 208.701 24.8494 202.104C20.2831 195.436 18 186.066 18 173.994C18 161.922 20.2831 152.587 24.8494 145.989C29.4838 139.321 36.5718 135.987 46.1132 135.987C49.7935 135.987 53.0308 136.514 55.8251 137.567C58.6875 138.549 61.141 139.953 63.1856 141.778C65.2302 143.603 66.9 145.814 68.1949 148.411C69.558 151.007 70.6143 153.92 71.364 157.149L57.0518 160.728C56.6429 158.974 56.1658 157.359 55.6206 155.885C55.0754 154.412 54.3598 153.148 53.4738 152.095C52.6559 151.043 51.5996 150.235 50.3047 149.674C49.0779 149.042 47.5785 148.726 45.8065 148.726C41.6492 148.726 38.6845 150.411 36.9125 153.78C35.2087 157.079 34.3568 161.676 34.3568 167.572V180.416C34.3568 186.312 35.2087 190.944 36.9125 194.313C38.6845 197.612 41.6492 199.261 45.8065 199.261C49.3505 199.261 51.9063 198.138 53.4738 195.892C55.1095 193.646 56.3021 190.768 57.0518 187.259L71.364 190.839C70.6143 194.067 69.558 196.98 68.1949 199.577C66.9 202.174 65.2302 204.42 63.1856 206.315C61.141 208.14 58.6875 209.543 55.8251 210.526C53.0308 211.509 49.7935 212 46.1132 212Z" fill="#EA76CB"/>
+<path d="M168.749 212C159.208 212 152.12 208.701 147.485 202.104C142.919 195.436 140.636 186.066 140.636 173.994C140.636 161.922 142.919 152.587 147.485 145.989C152.12 139.321 159.208 135.987 168.749 135.987C172.429 135.987 175.667 136.514 178.461 137.567C181.323 138.549 183.777 139.953 185.822 141.778C187.866 143.603 189.536 145.814 190.831 148.411C192.194 151.007 193.25 153.92 194 157.149L179.688 160.728C179.279 158.974 178.802 157.359 178.257 155.885C177.711 154.412 176.996 153.148 176.11 152.095C175.292 151.043 174.236 150.235 172.941 149.674C171.714 149.042 170.215 148.726 168.443 148.726C164.285 148.726 161.32 150.411 159.549 153.78C157.845 157.079 156.993 161.676 156.993 167.572V180.416C156.993 186.312 157.845 190.944 159.549 194.313C161.32 197.612 164.285 199.261 168.443 199.261C171.986 199.261 174.542 198.138 176.11 195.892C177.745 193.646 178.938 190.768 179.688 187.259L194 190.839C193.25 194.067 192.194 196.98 190.831 199.577C189.536 202.174 187.866 204.42 185.822 206.315C183.777 208.14 181.323 209.543 178.461 210.526C175.667 211.509 172.429 212 168.749 212Z" fill="#EA76CB"/>
+<path d="M209.588 142.3L153.702 86.4164C152.936 85.6504 152.027 85.0427 151.026 84.628C150.026 84.2134 148.953 84 147.87 84C146.787 84 145.715 84.2134 144.714 84.628C143.714 85.0427 142.805 85.6504 142.039 86.4164L130.439 98.023L145.157 112.741C146.887 112.154 148.748 112.062 150.527 112.477C152.307 112.891 153.936 113.796 155.228 115.087C156.528 116.388 157.435 118.029 157.847 119.822C158.258 121.615 158.156 123.487 157.553 125.224L171.744 139.411C173.482 138.807 175.354 138.705 177.148 139.117C178.941 139.529 180.581 140.438 181.882 141.74C182.793 142.65 183.515 143.732 184.008 144.922C184.501 146.111 184.755 147.387 184.755 148.675C184.755 149.963 184.501 151.238 184.008 152.428C183.515 153.618 182.793 154.699 181.882 155.61C180.04 157.449 177.544 158.483 174.941 158.483C172.338 158.483 169.842 157.449 168.001 155.61C166.633 154.24 165.701 152.495 165.322 150.597C164.943 148.698 165.135 146.73 165.872 144.939L152.639 131.71V166.531C154.035 167.221 155.248 168.234 156.175 169.486C157.103 170.738 157.718 172.192 157.972 173.729C158.225 175.267 158.108 176.842 157.631 178.325C157.155 179.808 156.331 181.157 155.23 182.258C154.319 183.169 153.238 183.892 152.048 184.384C150.858 184.877 149.583 185.131 148.295 185.131C147.007 185.131 145.731 184.877 144.541 184.384C143.351 183.892 142.27 183.169 141.36 182.258C140.449 181.347 139.726 180.266 139.233 179.076C138.74 177.886 138.486 176.611 138.486 175.322C138.486 174.034 138.74 172.759 139.233 171.569C139.726 170.379 140.449 169.297 141.36 168.387C142.277 167.467 143.368 166.738 144.569 166.243V131.101C143.373 130.609 142.286 129.885 141.371 128.971C140.456 128.057 139.73 126.971 139.235 125.776C138.741 124.58 138.487 123.299 138.49 122.006C138.492 120.712 138.749 119.432 139.248 118.238L124.736 103.723L86.4117 142.038C84.8673 143.585 84 145.682 84 147.868C84 150.054 84.8673 152.151 86.4117 153.699L142.301 209.589C143.849 211.133 145.945 212 148.131 212C150.317 212 152.413 211.133 153.961 209.589L209.588 153.961C211.133 152.413 212 150.316 212 148.13C212 145.944 211.133 143.847 209.588 142.3Z" fill="#8839EF"/>
+<path d="M147.485 202.104C152.12 208.701 159.208 212 168.749 212C172.429 212 175.667 211.509 178.461 210.526C181.323 209.543 183.777 208.14 185.822 206.315C187.866 204.42 189.536 202.174 190.831 199.577C192.194 196.98 193.25 194.067 194 190.839L179.688 187.259C178.938 190.768 177.745 193.646 176.11 195.892C174.542 198.138 171.986 199.261 168.443 199.261C164.285 199.261 161.32 197.612 159.549 194.313C157.845 190.944 156.993 186.312 156.993 180.416V173.994H140.636C140.636 186.066 142.919 195.436 147.485 202.104Z" fill="#EA76CB"/>
+<path d="M178.461 137.567C175.667 136.514 172.429 135.987 168.749 135.987C167.545 135.987 166.381 136.04 165.255 136.147L168.443 148.726C170.215 148.726 171.714 149.042 172.941 149.674C174.236 150.235 175.292 151.043 176.11 152.095C176.996 153.148 177.711 154.412 178.257 155.885C178.802 157.359 179.279 158.974 179.688 160.728L194 157.149C193.25 153.92 192.194 151.007 190.831 148.411C189.536 145.814 187.866 143.603 185.822 141.778C183.777 139.953 181.323 138.549 178.461 137.567Z" fill="#EA76CB"/>
 </svg>
diff --git a/assets/favicon.svg.old b/assets/favicon.svg.old
new file mode 100644
index 0000000000..bcacdc0200
--- /dev/null
+++ b/assets/favicon.svg.old
@@ -0,0 +1,27 @@
+<svg viewBox="0 0 212 212" xmlns="http://www.w3.org/2000/svg">
+  <style type="text/css">
+    circle {
+      fill: none;
+      stroke: #000;
+      stroke-width: 15;
+    }
+    path {
+      fill: none;
+      stroke: #000;
+      stroke-width: 25;
+    }
+    .orange {
+      stroke:#ff6600;
+    }
+    .red {
+      stroke:#d40000;
+    }
+  </style>
+  <g transform="translate(6,6)">
+    <path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" class="orange" />
+    <path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" class="red" />
+    <circle cx="142" cy="20" r="18" class="orange" />
+    <circle cx="142" cy="88" r="18" class="red" />
+    <circle cx="58" cy="180" r="18" class="red" />
+  </g>
+</svg>
diff --git a/assets/logo.svg b/assets/logo.svg
index bcacdc0200..311ebbbce3 100644
--- a/assets/logo.svg
+++ b/assets/logo.svg
@@ -1,27 +1,9 @@
-<svg viewBox="0 0 212 212" xmlns="http://www.w3.org/2000/svg">
-  <style type="text/css">
-    circle {
-      fill: none;
-      stroke: #000;
-      stroke-width: 15;
-    }
-    path {
-      fill: none;
-      stroke: #000;
-      stroke-width: 25;
-    }
-    .orange {
-      stroke:#ff6600;
-    }
-    .red {
-      stroke:#d40000;
-    }
-  </style>
-  <g transform="translate(6,6)">
-    <path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" class="orange" />
-    <path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" class="red" />
-    <circle cx="142" cy="20" r="18" class="orange" />
-    <circle cx="142" cy="88" r="18" class="red" />
-    <circle cx="58" cy="180" r="18" class="red" />
-  </g>
+<svg width="212" height="212" viewBox="0 0 212 212" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M31.5966 74.7492H23.0093V1.26337H48.9757C55.5865 1.26337 60.6299 3.12333 64.1057 6.84324C67.5815 10.5632 69.3194 15.757 69.3194 22.4248C69.3194 28.3907 67.8201 33.1634 64.8213 36.7429C61.8226 40.3225 57.4608 42.393 51.7359 42.9545L69.9328 74.7492H60.3232L42.9441 43.3756H31.5966V74.7492ZM48.7712 35.9007C52.3833 35.9007 55.1776 34.9882 57.1541 33.1634C59.1987 31.2683 60.221 28.6012 60.221 25.1621V19.6875C60.221 16.2483 59.1987 13.6163 57.1541 11.7914C55.1776 9.89638 52.3833 8.94885 48.7712 8.94885H31.5966V35.9007H48.7712Z" fill="#EA76CB"/>
+<path d="M166.909 76.0126C160.503 76.0126 155.255 74.8194 151.166 72.433C147.076 69.9765 143.703 66.8532 141.045 63.0631L147.281 57.799C150.075 61.3786 153.006 64.0457 156.073 65.8004C159.208 67.555 162.922 68.4324 167.216 68.4324C172.395 68.4324 176.348 67.2041 179.074 64.7476C181.801 62.291 183.164 58.8519 183.164 54.4301C183.164 50.8505 182.175 48.0781 180.199 46.1129C178.223 44.0775 174.781 42.6386 169.874 41.7964L161.9 40.4277C158.424 39.7961 155.493 38.8485 153.108 37.5852C150.791 36.3218 148.917 34.8128 147.485 33.0581C146.054 31.2332 145.032 29.268 144.418 27.1624C143.805 24.9866 143.498 22.7406 143.498 20.4244C143.498 13.6865 145.645 8.59791 149.939 5.15875C154.233 1.71958 160.026 0 167.318 0C173.043 0 177.848 0.982619 181.732 2.94786C185.685 4.91309 188.854 7.68548 191.24 11.265L185.208 16.6343C183.232 13.9672 180.846 11.7914 178.052 10.1069C175.258 8.42245 171.646 7.58021 167.216 7.58021C162.377 7.58021 158.663 8.63301 156.073 10.7386C153.483 12.8442 152.188 16.0027 152.188 20.2139C152.188 23.5127 153.142 26.2149 155.05 28.3205C157.027 30.3559 160.537 31.8298 165.58 32.7423L173.247 34.1109C176.723 34.7426 179.654 35.6901 182.039 36.9535C184.424 38.2169 186.333 39.7259 187.764 41.4806C189.263 43.2352 190.32 45.2005 190.933 47.3763C191.546 49.5521 191.853 51.8331 191.853 54.2195C191.853 61.0276 189.672 66.3619 185.31 70.2222C181.017 74.0824 174.883 76.0126 166.909 76.0126Z" fill="#EA76CB"/>
+<path d="M46.1132 212C36.5718 212 29.4838 208.701 24.8494 202.104C20.2831 195.436 18 186.066 18 173.994C18 161.922 20.2831 152.587 24.8494 145.989C29.4838 139.321 36.5718 135.987 46.1132 135.987C49.7935 135.987 53.0308 136.514 55.8251 137.567C58.6875 138.549 61.141 139.953 63.1856 141.778C65.2302 143.603 66.9 145.814 68.1949 148.411C69.558 151.007 70.6143 153.92 71.364 157.149L57.0518 160.728C56.6429 158.974 56.1658 157.359 55.6206 155.885C55.0754 154.412 54.3598 153.148 53.4738 152.095C52.6559 151.043 51.5996 150.235 50.3047 149.674C49.0779 149.042 47.5785 148.726 45.8065 148.726C41.6492 148.726 38.6845 150.411 36.9125 153.78C35.2087 157.079 34.3568 161.676 34.3568 167.572V180.416C34.3568 186.312 35.2087 190.944 36.9125 194.313C38.6845 197.612 41.6492 199.261 45.8065 199.261C49.3505 199.261 51.9063 198.138 53.4738 195.892C55.1095 193.646 56.3021 190.768 57.0518 187.259L71.364 190.839C70.6143 194.067 69.558 196.98 68.1949 199.577C66.9 202.174 65.2302 204.42 63.1856 206.315C61.141 208.14 58.6875 209.543 55.8251 210.526C53.0308 211.509 49.7935 212 46.1132 212Z" fill="#EA76CB"/>
+<path d="M168.749 212C159.208 212 152.12 208.701 147.485 202.104C142.919 195.436 140.636 186.066 140.636 173.994C140.636 161.922 142.919 152.587 147.485 145.989C152.12 139.321 159.208 135.987 168.749 135.987C172.429 135.987 175.667 136.514 178.461 137.567C181.323 138.549 183.777 139.953 185.822 141.778C187.866 143.603 189.536 145.814 190.831 148.411C192.194 151.007 193.25 153.92 194 157.149L179.688 160.728C179.279 158.974 178.802 157.359 178.257 155.885C177.711 154.412 176.996 153.148 176.11 152.095C175.292 151.043 174.236 150.235 172.941 149.674C171.714 149.042 170.215 148.726 168.443 148.726C164.285 148.726 161.32 150.411 159.549 153.78C157.845 157.079 156.993 161.676 156.993 167.572V180.416C156.993 186.312 157.845 190.944 159.549 194.313C161.32 197.612 164.285 199.261 168.443 199.261C171.986 199.261 174.542 198.138 176.11 195.892C177.745 193.646 178.938 190.768 179.688 187.259L194 190.839C193.25 194.067 192.194 196.98 190.831 199.577C189.536 202.174 187.866 204.42 185.822 206.315C183.777 208.14 181.323 209.543 178.461 210.526C175.667 211.509 172.429 212 168.749 212Z" fill="#EA76CB"/>
+<path d="M209.588 142.3L153.702 86.4164C152.936 85.6504 152.027 85.0427 151.026 84.628C150.026 84.2134 148.953 84 147.87 84C146.787 84 145.715 84.2134 144.714 84.628C143.714 85.0427 142.805 85.6504 142.039 86.4164L130.439 98.023L145.157 112.741C146.887 112.154 148.748 112.062 150.527 112.477C152.307 112.891 153.936 113.796 155.228 115.087C156.528 116.388 157.435 118.029 157.847 119.822C158.258 121.615 158.156 123.487 157.553 125.224L171.744 139.411C173.482 138.807 175.354 138.705 177.148 139.117C178.941 139.529 180.581 140.438 181.882 141.74C182.793 142.65 183.515 143.732 184.008 144.922C184.501 146.111 184.755 147.387 184.755 148.675C184.755 149.963 184.501 151.238 184.008 152.428C183.515 153.618 182.793 154.699 181.882 155.61C180.04 157.449 177.544 158.483 174.941 158.483C172.338 158.483 169.842 157.449 168.001 155.61C166.633 154.24 165.701 152.495 165.322 150.597C164.943 148.698 165.135 146.73 165.872 144.939L152.639 131.71V166.531C154.035 167.221 155.248 168.234 156.175 169.486C157.103 170.738 157.718 172.192 157.972 173.729C158.225 175.267 158.108 176.842 157.631 178.325C157.155 179.808 156.331 181.157 155.23 182.258C154.319 183.169 153.238 183.892 152.048 184.384C150.858 184.877 149.583 185.131 148.295 185.131C147.007 185.131 145.731 184.877 144.541 184.384C143.351 183.892 142.27 183.169 141.36 182.258C140.449 181.347 139.726 180.266 139.233 179.076C138.74 177.886 138.486 176.611 138.486 175.322C138.486 174.034 138.74 172.759 139.233 171.569C139.726 170.379 140.449 169.297 141.36 168.387C142.277 167.467 143.368 166.738 144.569 166.243V131.101C143.373 130.609 142.286 129.885 141.371 128.971C140.456 128.057 139.73 126.971 139.235 125.776C138.741 124.58 138.487 123.299 138.49 122.006C138.492 120.712 138.749 119.432 139.248 118.238L124.736 103.723L86.4117 142.038C84.8673 143.585 84 145.682 84 147.868C84 150.054 84.8673 152.151 86.4117 153.699L142.301 209.589C143.849 211.133 145.945 212 148.131 212C150.317 212 152.413 211.133 153.961 209.589L209.588 153.961C211.133 152.413 212 150.316 212 148.13C212 145.944 211.133 143.847 209.588 142.3Z" fill="#8839EF"/>
+<path d="M147.485 202.104C152.12 208.701 159.208 212 168.749 212C172.429 212 175.667 211.509 178.461 210.526C181.323 209.543 183.777 208.14 185.822 206.315C187.866 204.42 189.536 202.174 190.831 199.577C192.194 196.98 193.25 194.067 194 190.839L179.688 187.259C178.938 190.768 177.745 193.646 176.11 195.892C174.542 198.138 171.986 199.261 168.443 199.261C164.285 199.261 161.32 197.612 159.549 194.313C157.845 190.944 156.993 186.312 156.993 180.416V173.994H140.636C140.636 186.066 142.919 195.436 147.485 202.104Z" fill="#EA76CB"/>
+<path d="M178.461 137.567C175.667 136.514 172.429 135.987 168.749 135.987C167.545 135.987 166.381 136.04 165.255 136.147L168.443 148.726C170.215 148.726 171.714 149.042 172.941 149.674C174.236 150.235 175.292 151.043 176.11 152.095C176.996 153.148 177.711 154.412 178.257 155.885C178.802 157.359 179.279 158.974 179.688 160.728L194 157.149C193.25 153.92 192.194 151.007 190.831 148.411C189.536 145.814 187.866 143.603 185.822 141.778C183.777 139.953 181.323 138.549 178.461 137.567Z" fill="#EA76CB"/>
 </svg>
diff --git a/assets/logo.svg.old b/assets/logo.svg.old
new file mode 100644
index 0000000000..bcacdc0200
--- /dev/null
+++ b/assets/logo.svg.old
@@ -0,0 +1,27 @@
+<svg viewBox="0 0 212 212" xmlns="http://www.w3.org/2000/svg">
+  <style type="text/css">
+    circle {
+      fill: none;
+      stroke: #000;
+      stroke-width: 15;
+    }
+    path {
+      fill: none;
+      stroke: #000;
+      stroke-width: 25;
+    }
+    .orange {
+      stroke:#ff6600;
+    }
+    .red {
+      stroke:#d40000;
+    }
+  </style>
+  <g transform="translate(6,6)">
+    <path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" class="orange" />
+    <path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" class="red" />
+    <circle cx="142" cy="20" r="18" class="orange" />
+    <circle cx="142" cy="88" r="18" class="red" />
+    <circle cx="58" cy="180" r="18" class="red" />
+  </g>
+</svg>