6 files changed, 20 insertions, 19 deletions
diff --git a/searx/brand.py b/searx/brand.py
index 91d2ab321..d71c57db7 100644
--- a/searx/brand.py
+++ b/searx/brand.py
@@ -1,6 +1,6 @@
-GIT_URL = 'https://github.com/asciimoo/searx'
+GIT_URL = 'https://github.com/searx/searx'
 GIT_BRANCH = 'master'
-ISSUE_URL = 'https://github.com/asciimoo/searx/issues'
+ISSUE_URL = 'https://github.com/searx/searx/issues'
 SEARX_URL = 'https://searx.me'
-DOCS_URL = 'https://asciimoo.github.io/searx'
+DOCS_URL = 'https://searx.github.io/searx'
 PUBLIC_INSTANCES = 'https://searx.space'
diff --git a/searx/engines/searx_engine.py b/searx/engines/searx_engine.py
index d4c85bdc5..87e5e05c2 100644
--- a/searx/engines/searx_engine.py
+++ b/searx/engines/searx_engine.py
@@ -1,8 +1,8 @@
 """
  Searx (all)
 
- @website     https://github.com/asciimoo/searx
- @provide-api yes (https://asciimoo.github.io/searx/dev/search_api.html)
+ @website     https://github.com/searx/searx
+ @provide-api yes (https://searx.github.io/searx/dev/search_api.html)
 
  @using-api   yes
  @results     JSON
diff --git a/searx/settings.yml b/searx/settings.yml
index 9140522c4..492d40586 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -60,7 +60,7 @@ outgoing: # communication with search engines
 #        - 1.1.1.2
 
 # External plugin configuration
-# See http://asciimoo.github.io/searx/dev/plugins.html for more details
+# See http://searx.github.io/searx/dev/plugins.html for more details
 #
 # plugins:
 #   - plugin1
diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html
index 9b34251a2..649e66163 100644
--- a/searx/templates/__common__/about.html
+++ b/searx/templates/__common__/about.html
@@ -7,10 +7,10 @@
     while not storing information about its users.
   </p>
 
-  <p>More about searx ...</p>
+  <p>More about searx...</p>
 
   <ul>
-    <li><a href="https://github.com/asciimoo/searx">github</a></li>
+    <li><a href="https://github.com/searx/searx">github</a></li>
     <li><a href="https://twitter.com/Searx_engine">twitter</a></li>
     <li>IRC: #searx @ freenode (<a href="https://kiwiirc.com/client/irc.freenode.com/searx">webclient</a>)</li>
     <li><a href="https://www.transifex.com/projects/p/searx/">transifex</a></li>
@@ -31,7 +31,7 @@
     </li>
     <li>
       Searx is free software, the code is 100% open and you can help to make it
-      better.  See more on <a href="https://github.com/asciimoo/searx">github</a>.
+      better.  See more on <a href="https://github.com/searx/searx">github</a>.
     </li>
   </ul>
 
@@ -49,10 +49,11 @@
 
     It provides basic privacy by mixing your queries with searches on other
     platforms without storing search data. Queries are made using a POST request
-    on every browser (except chrome*).  Therefore they show up in neither our
-    logs, nor your url history.  In case of Chrome* users there is an exception,
-    searx uses the search bar to perform GET requests.
-
+    on every browser (except Chromium-based browsers*).  Therefore they show up 
+    in neither our logs, nor your url history. In the case of Chromium-based
+    browser users there is an exception: searx uses the search bar to perform GET
+    requests.
+    
     Searx can be added to your browser's search bar; moreover, it can be set as
     the default search engine.
   </p>
@@ -66,8 +67,8 @@
 
   <ul>
     <li><a href="https://support.mozilla.org/en-US/kb/add-or-remove-search-engine-firefox">Firefox</a></li>
-    <li><a href="https://support.microsoft.com/en-us/help/4028574/microsoft-edge-change-the-default-search-engine" >Microsoft Edge</a></li>
-    <li>Chrome based browsers <a href="https://www.chromium.org/tab-to-search">only add websites that the user navigates to without a path.</a>
+    <li><a href="https://support.microsoft.com/en-us/help/4028574/microsoft-edge-change-the-default-search-engine">Microsoft Edge</a></li>
+    <li>Chromium-based browsers <a href="https://www.chromium.org/tab-to-search">only add websites that the user navigates to without a path.</a>
   </ul>
 
   <h2>Where to find anonymous usage statistics of this instance ?</h2>
@@ -80,13 +81,13 @@
 
   <p>
     Searx appreciates your concern regarding logs, so take the
-    code from the <a href="https://github.com/asciimoo/searx">original searx project</a> and
+    code from the <a href="https://github.com/searx/searx">original searx project</a> and
     run it yourself!
   </p>
   <p>
     Add your searx instance to this <a href="{{ brand.PUBLIC_INSTANCES }}"> list
     of public searx instances</a> to help other people reclaim their privacy and
-    make the Internet freer!  The more decentralized the Internet is, the more
+    make the Internet freer! The more decentralized the Internet is, the more
     freedom we have!
   </p>
 
diff --git a/searx/templates/courgette/github_ribbon.html b/searx/templates/courgette/github_ribbon.html
index bdd9cf180..fb38a2051 100644
--- a/searx/templates/courgette/github_ribbon.html
+++ b/searx/templates/courgette/github_ribbon.html
@@ -1,3 +1,3 @@
-<a href="https://github.com/asciimoo/searx" class="github">
+<a href="https://github.com/searx/searx" class="github">
     <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ url_for('static', filename='img/github_ribbon.png') }}" alt="Fork me on GitHub"  class="github"/>
 </a>
diff --git a/searx/templates/legacy/github_ribbon.html b/searx/templates/legacy/github_ribbon.html
index bdd9cf180..fb38a2051 100644
--- a/searx/templates/legacy/github_ribbon.html
+++ b/searx/templates/legacy/github_ribbon.html
@@ -1,3 +1,3 @@
-<a href="https://github.com/asciimoo/searx" class="github">
+<a href="https://github.com/searx/searx" class="github">
     <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ url_for('static', filename='img/github_ribbon.png') }}" alt="Fork me on GitHub"  class="github"/>
 </a>