Fix Links

diff --git a/README.html b/README.html
index 12028968..1b1f0279 100644
--- a/README.html
+++ b/README.html
@@ -52,7 +52,7 @@ pkgman install psi_plus

 <h2>Development</h2>

-<p>In 2009 a Psi fork named <a href="https://psi-plus.com/">Psi+</a> was started. Project purposes were: implementation of new features, writing of patches and plugins for transferring them to upstream. As of 2017 all active Psi+ developers have become official Psi developers and now Psi+ is just a development branch of Psi with rolling release development model.</p>
+<p>In 2009 a Psi fork named <a href="https://sourceforge.net/projects/psiplus/">Psi+</a> was started. Project purposes were: implementation of new features, writing of patches and plugins for transferring them to upstream. As of 2017 all active Psi+ developers have become official Psi developers and now Psi+ is just a development branch of Psi with rolling release development model.</p>

 <p>Users who wants to receive new features and bug fixes very quickly may use Psi+ on daily basis. Users who do not care about new trends and prefer constancy may choose Psi as it uses classical development model and its releases are quite rare.</p>

@@ -134,7 +134,6 @@ pkgman install psi_plus
 <li><a href="https://github.com/psi-im/plugins">Officially supported plugins</a> (sources)</li>
 <li><a href="https://github.com/psi-im/psimedia">Multimedia plugin for audio and video calls</a> (sources)</li>
 <li><a href="https://github.com/psi-im/resources">Extra resources</a> (iconsets, sounds, skins, themes, etc.)</li>
-<li><a href="https://psi-plus.com/">Psi+ project</a> (official website)</li>
 <li><a href="https://github.com/psi-plus/psi-plus-snapshots">Psi+ snapshots</a> (sources)</li>
 <li><a href="https://github.com/psi-plus/psi-plus-l10n">Psi+ translations</a> (sources)</li>
 </ul>
@@ -149,7 +148,7 @@ pkgman install psi_plus
 <li><a href="https://sourceforge.net/projects/psiplus/files/macOS/tehnick/">Psi+ builds for macOS</a></li>
 <li><a href="https://depot.haiku-os.org/psi_plus">Psi+ package in Haiku</a></li>
 <li><a href="https://launchpad.net/~psi-plus/+archive/ubuntu/ppa">Official PPA for Ubuntu and distros based on it</a> (daily builds)</li>
-<li><a href="http://notesalexp.org/index-old.html">Unofficial PPA for Debian and Ubuntu</a> (see <a href="https://psi-plus.com/wiki/en:debian#nightly_builds">notes</a> about using it)</li>
+<li><a href="http://notesalexp.org/index-old.html">Unofficial PPA for Debian and Ubuntu</a> (see <a href="https://psi-im.org/wiki/doku.php?id=en:debian#nightly_builds">notes</a> about using it)</li>
 <li><a href="https://software.opensuse.org/package/psi-plus">Unofficial PPA for openSUSE</a> (daily builds)</li>
 <li><a href="https://copr.fedorainfracloud.org/coprs/valdikss/psi-plus-snapshots/">Unofficial PPA for Fedora</a> (outdated)</li>
 <li><a href="https://repology.org/metapackage/psi-plus/versions">Packages for different Linux distros</a></li>
diff --git a/README.md b/README.md
index 6b37b27d..62f202df 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ MS Windows users may download official installers and portable builds from [Sour

 ## Development

-In 2009 a Psi fork named [Psi+](https://psi-plus.com/) was started. Project purposes were: implementation of new features, writing of patches and plugins for transferring them to upstream. As of 2017 all active Psi+ developers have become official Psi developers and now Psi+ is just a development branch of Psi with rolling release development model.
+In 2009 a Psi fork named [Psi+](https://sourceforge.net/projects/psiplus/) was started. Project purposes were: implementation of new features, writing of patches and plugins for transferring them to upstream. As of 2017 all active Psi+ developers have become official Psi developers and now Psi+ is just a development branch of Psi with rolling release development model.

 Users who wants to receive new features and bug fixes very quickly may use Psi+ on daily basis. Users who do not care about new trends and prefer constancy may choose Psi as it uses classical development model and its releases are quite rare.

@@ -125,7 +125,6 @@ If you want to donate some money for development of Psi and Psi+ project, it is
 * [Officially supported plugins](https://github.com/psi-im/plugins) (sources)
 * [Multimedia plugin for audio and video calls](https://github.com/psi-im/psimedia) (sources)
 * [Extra resources](https://github.com/psi-im/resources) (iconsets, sounds, skins, themes, etc.)
-* [Psi+ project](https://psi-plus.com/) (official website)
 * [Psi+ snapshots](https://github.com/psi-plus/psi-plus-snapshots) (sources)
 * [Psi+ translations](https://github.com/psi-plus/psi-plus-l10n) (sources)

@@ -138,7 +137,7 @@ If you want to donate some money for development of Psi and Psi+ project, it is
 * [Psi+ builds for macOS](https://sourceforge.net/projects/psiplus/files/macOS/tehnick/)
 * [Psi+ package in Haiku](https://depot.haiku-os.org/psi_plus)
 * [Official PPA for Ubuntu and distros based on it](https://launchpad.net/~psi-plus/+archive/ubuntu/ppa) (daily builds)
-* [Unofficial PPA for Debian and Ubuntu](http://notesalexp.org/index-old.html) (see [notes](https://psi-plus.com/wiki/en:debian#nightly_builds) about using it)
+* [Unofficial PPA for Debian and Ubuntu](http://notesalexp.org/index-old.html) (see [notes](https://psi-im.org/wiki/doku.php?id=en:debian#nightly_builds) about using it)
 * [Unofficial PPA for openSUSE](https://software.opensuse.org/package/psi-plus) (daily builds)
 * [Unofficial PPA for Fedora](https://copr.fedorainfracloud.org/coprs/valdikss/psi-plus-snapshots/) (outdated)
 * [Packages for different Linux distros](https://repology.org/metapackage/psi-plus/versions)
diff --git a/linux/psi-plus.appdata.xml b/linux/psi-plus.appdata.xml
index 36b0dca1..67b9889c 100644
--- a/linux/psi-plus.appdata.xml
+++ b/linux/psi-plus.appdata.xml
@@ -30,11 +30,11 @@
     <p>Psi+ is a development branch of Psi with rolling release development model. Users who wants to receive new features and bug fixes very quickly may use Psi+ on daily basis. Users who do not care about new trends and prefer constancy may choose Psi as it uses classical development model and its releases are quite rare.</p>
     <p xml:lang="ru">Psi+ — это ветка разработки клиента Psi, для которой используется модель разработки с плавающим релизом. Пользователи, которые хотят быстро получать новые функции и исправления ошибок, могут использовать Psi+ на ежедневной основе. Пользователи, которые не заботятся о новых тенденциях и предпочитают постоянство, могут выбрать Psi, поскольку он использует классическую модель разработки и его выпуски довольно редки.</p>
   </description>
-  <url type="homepage">https://psi-plus.com/</url>
+  <url type="homepage">https://psi-im.org/</url>
   <url type="bugtracker">https://github.com/psi-im/psi/issues</url>
   <screenshots>
     <screenshot type="default">
-      <image>https://psi-plus.com/wi/psiplus_screen_linux_big.png</image>
+      <image>https://psi-im.org/wiki/lib/exe/fetch.php?cache=&media=psiplus_screen_linux_big.png</image>
     </screenshot>
   </screenshots>
   <content_rating type="oars-1.1">
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93ddc22e..a91f387e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -188,16 +188,15 @@ elseif(IS_WEBENGINE)
     set(PSI_VER_SUFFIX ", webengine")
 endif()

+set(CLIENT_CAPS_NODE "https://psi-im.org")
 if( NOT PSI_PLUS )
     set(CLIENT_NAME "Psi")
     set(CLIENT_SNAME "psi")
-    set(CLIENT_CAPS_NODE "https://psi-im.org")
     set(PSILOGO_PREFIX "")
     set(MAIN_ICON "psimain.png")
 else()
     set(CLIENT_NAME "Psi+")
     set(CLIENT_SNAME "psi+")
-    set(CLIENT_CAPS_NODE "https://psi-plus.com")
     set(PSILOGO_PREFIX "psiplus/")
     set(MAIN_ICON "psiplus_icon.png")
 endif()
diff --git a/src/aboutdlg.cpp b/src/aboutdlg.cpp
index 261f4ae5..acd30747 100644
--- a/src/aboutdlg.cpp
+++ b/src/aboutdlg.cpp
@@ -67,7 +67,7 @@ AboutDlg::AboutDlg(QWidget *parent) : QDialog(parent)

     // fill in About Psi+ tab...
     QString psiplus;
-    psiplus += details(QString::fromUtf8("Psi+ Project"), "", "[email protected]", "https://psi-plus.com/",
+    psiplus += details(QString::fromUtf8("Psi+ Project"), "", "[email protected]", "https://psi-im.org/",
                        tr("Active project members are presents below:"));
     psiplus += details(QString::fromUtf8("rion"), "[email protected]", "", "", tr("Founder and Lead Patcher"));
     psiplus += details(QString::fromUtf8("zet"), "[email protected]", "", "",
diff --git a/src/mainwin.cpp b/src/mainwin.cpp
index 493d9096..6816f0d5 100644
--- a/src/mainwin.cpp
+++ b/src/mainwin.cpp
@@ -1001,7 +1001,7 @@ void MainWin::actOnlineWikiActivated()
 #ifndef PSI_PLUS
         "https://github.com/psi-im/psi/wiki"
 #else
-        "https://psi-plus.com/wiki/en:main"
+        "https://psi-im.org/wiki/"
 #endif
     );
 }
@@ -1009,11 +1009,7 @@ void MainWin::actOnlineWikiActivated()
 void MainWin::actOnlineHomeActivated()
 {
     DesktopUtil::openUrl(
-#ifndef PSI_PLUS
         "https://psi-im.org"
-#else
-        "https://psi-plus.com"
-#endif
     );
 }