diff --git a/README.md b/README.md
index 683c7a494..565243950 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,11 @@
 
 All your email, from all your accounts, in one place. Supports IMAP/SMTP, 
 [JMAP](https://github.com/cypht-org/cypht/issues/180) and 
-[soon EWS](https://github.com/cypht-org/cypht/issues/247). Cypht is like a 
+[EWS](https://github.com/cypht-org/cypht/issues/247). Cypht is like a 
 news reader, but for E-mail. Cypht does not replace your existing accounts - it 
 combines them into one. And it's also a news reader.
 
-![screenshot](https://github.com/cypht-org/cypht-website/blob/master/img/Inbox.PNG "Inbox View").
+![screenshot](https://github.com/cypht-org/cypht-website/blob/master/static/img/Inbox.PNG "Inbox View").
 
 The driving force behind Cypht development is to provide combined views for
 multiple accounts, but it's also a standard E-mail client that lets you browse
@@ -24,17 +24,17 @@ customize the program without hacking the code.
 
 
 Installation instructions
-* Cypht master: [https://cypht.org/install.html](https://cypht.org/install.html)
-* Version 1: [https://cypht.org/install-1x.html](https://cypht.org/install-1x.html)
-* Version 2: [https://cypht.org/install-2x.html](https://cypht.org/install-2x.html)
+* Cypht master: [https://cypht.org/install](https://cypht.org/install)
+* Version 1: [https://cypht.org/install-1x](https://cypht.org/install-1x)
+* Version 2: [https://cypht.org/install-2x](https://cypht.org/install-2x)
 
-Security details: [https://cypht.org/security.html](https://cypht.org/security.html)
+Security details: [https://cypht.org/security](https://cypht.org/security)
 
-Module info: [https://cypht.org/modules.html](https://cypht.org/modules.html)
+Module info: [https://cypht.org/modules](https://cypht.org/modules)
 
-Features: [https://cypht.org/features.html](https://cypht.org/features.html)
+Features: [https://cypht.org/features](https://cypht.org/features)
 
-License: [https://cypht.org/license.html](https://cypht.org/license.html)
+License: [https://cypht.org/license](https://cypht.org/license)
 
 Community chat room: [https://gitter.im/cypht-org/community](https://gitter.im/cypht-org/community)