diff --git a/.assets/img/navigation.gif b/.assets/img/navigation.gif
new file mode 100644
index 00000000..4e922a53
Binary files /dev/null and b/.assets/img/navigation.gif differ
diff --git a/.assets/img/orgmode.gif b/.assets/img/orgmode.gif
new file mode 100644
index 00000000..ca3febf7
Binary files /dev/null and b/.assets/img/orgmode.gif differ
diff --git a/.assets/raw/Makefile b/.assets/raw/Makefile
new file mode 100644
index 00000000..29375bc2
--- /dev/null
+++ b/.assets/raw/Makefile
@@ -0,0 +1,3 @@
+all:
+	convert -delay 100 -loop 0 navigation_*.png navigation.gif
+	convert -delay 100 -loop 0 orgmode_*.png orgmode.gif
diff --git a/.assets/raw/navigation_00001.png b/.assets/raw/navigation_00001.png
new file mode 100644
index 00000000..c84cc1dd
Binary files /dev/null and b/.assets/raw/navigation_00001.png differ
diff --git a/.assets/raw/navigation_00002.png b/.assets/raw/navigation_00002.png
new file mode 100644
index 00000000..094f8156
Binary files /dev/null and b/.assets/raw/navigation_00002.png differ
diff --git a/.assets/raw/navigation_00003.png b/.assets/raw/navigation_00003.png
new file mode 100644
index 00000000..ac9a8a87
Binary files /dev/null and b/.assets/raw/navigation_00003.png differ
diff --git a/.assets/raw/navigation_00004.png b/.assets/raw/navigation_00004.png
new file mode 100644
index 00000000..bb44e481
Binary files /dev/null and b/.assets/raw/navigation_00004.png differ
diff --git a/.assets/raw/navigation_00005.png b/.assets/raw/navigation_00005.png
new file mode 100644
index 00000000..a05b6f1e
Binary files /dev/null and b/.assets/raw/navigation_00005.png differ
diff --git a/.assets/raw/navigation_00006.png b/.assets/raw/navigation_00006.png
new file mode 100644
index 00000000..47844e2e
Binary files /dev/null and b/.assets/raw/navigation_00006.png differ
diff --git a/.assets/raw/navigation_00007.png b/.assets/raw/navigation_00007.png
new file mode 100644
index 00000000..9ef8dc98
Binary files /dev/null and b/.assets/raw/navigation_00007.png differ
diff --git a/.assets/raw/navigation_00008.png b/.assets/raw/navigation_00008.png
new file mode 100644
index 00000000..59970bae
Binary files /dev/null and b/.assets/raw/navigation_00008.png differ
diff --git a/.assets/raw/navigation_00009.png b/.assets/raw/navigation_00009.png
new file mode 100644
index 00000000..9e21f318
Binary files /dev/null and b/.assets/raw/navigation_00009.png differ
diff --git a/.assets/raw/navigation_00010.png b/.assets/raw/navigation_00010.png
new file mode 100644
index 00000000..e9f02898
Binary files /dev/null and b/.assets/raw/navigation_00010.png differ
diff --git a/.assets/raw/navigation_00011.png b/.assets/raw/navigation_00011.png
new file mode 100644
index 00000000..95f93e60
Binary files /dev/null and b/.assets/raw/navigation_00011.png differ
diff --git a/.assets/raw/navigation_00012.png b/.assets/raw/navigation_00012.png
new file mode 100644
index 00000000..8a188508
Binary files /dev/null and b/.assets/raw/navigation_00012.png differ
diff --git a/.assets/raw/orgmode_00001.png b/.assets/raw/orgmode_00001.png
new file mode 100644
index 00000000..a128ea65
Binary files /dev/null and b/.assets/raw/orgmode_00001.png differ
diff --git a/.assets/raw/orgmode_00002.png b/.assets/raw/orgmode_00002.png
new file mode 100644
index 00000000..78806a54
Binary files /dev/null and b/.assets/raw/orgmode_00002.png differ
diff --git a/.assets/raw/orgmode_00003.png b/.assets/raw/orgmode_00003.png
new file mode 100644
index 00000000..d7759ef4
Binary files /dev/null and b/.assets/raw/orgmode_00003.png differ
diff --git a/.assets/raw/orgmode_00004.png b/.assets/raw/orgmode_00004.png
new file mode 100644
index 00000000..ea94ad4f
Binary files /dev/null and b/.assets/raw/orgmode_00004.png differ
diff --git a/.assets/raw/orgmode_00005.png b/.assets/raw/orgmode_00005.png
new file mode 100644
index 00000000..9f449e6b
Binary files /dev/null and b/.assets/raw/orgmode_00005.png differ
diff --git a/.assets/raw/orgmode_00006.png b/.assets/raw/orgmode_00006.png
new file mode 100644
index 00000000..1178b7b6
Binary files /dev/null and b/.assets/raw/orgmode_00006.png differ
diff --git a/.assets/raw/orgmode_00007.png b/.assets/raw/orgmode_00007.png
new file mode 100644
index 00000000..8006f6ed
Binary files /dev/null and b/.assets/raw/orgmode_00007.png differ
diff --git a/.assets/raw/orgmode_00008.png b/.assets/raw/orgmode_00008.png
new file mode 100644
index 00000000..3ed44f96
Binary files /dev/null and b/.assets/raw/orgmode_00008.png differ
diff --git a/.assets/raw/orgmode_00009.png b/.assets/raw/orgmode_00009.png
new file mode 100644
index 00000000..a8ebb80b
Binary files /dev/null and b/.assets/raw/orgmode_00009.png differ
diff --git a/.assets/raw/orgmode_00010.png b/.assets/raw/orgmode_00010.png
new file mode 100644
index 00000000..508ca641
Binary files /dev/null and b/.assets/raw/orgmode_00010.png differ
diff --git a/.assets/raw/orgmode_00011.png b/.assets/raw/orgmode_00011.png
new file mode 100644
index 00000000..33fe5d94
Binary files /dev/null and b/.assets/raw/orgmode_00011.png differ
diff --git a/.assets/raw/orgmode_00012.png b/.assets/raw/orgmode_00012.png
new file mode 100644
index 00000000..cb80715e
Binary files /dev/null and b/.assets/raw/orgmode_00012.png differ
diff --git a/.assets/raw/orgmode_00013.png b/.assets/raw/orgmode_00013.png
new file mode 100644
index 00000000..a1fef228
Binary files /dev/null and b/.assets/raw/orgmode_00013.png differ
diff --git a/.assets/raw/orgmode_00014.png b/.assets/raw/orgmode_00014.png
new file mode 100644
index 00000000..5f0c218b
Binary files /dev/null and b/.assets/raw/orgmode_00014.png differ
diff --git a/.assets/img/photo.xcf b/.assets/raw/photo.xcf
similarity index 100%
rename from .assets/img/photo.xcf
rename to .assets/raw/photo.xcf
diff --git a/README.md b/README.md
index 10a8b850..e3afa852 100644
--- a/README.md
+++ b/README.md
@@ -12,24 +12,40 @@
 </p>
 
 # Features
-- Manage your files directly from your browser
+- Manage your files from a browser
 - User friendly
 - Org mode friendly ([documentation](https://github.com/mickael-kerjean/nuage/wiki/Org-Mode))
+- Mobile friendly
 - Customisable ([documentation](https://github.com/mickael-kerjean/nuage/wiki/Customisation))
 - Super fast
 - Works offline
 - Upload files and folders
-- Works great on mobile
 - Multiple cloud providers and protocols, easily extensible
 - Audio player
 - Video player
 - Image viewer
-- Emacs keybindings `;)`
-- Frequently access folders are pin to the homepage for quick access
+- Quick access: frequently access folders are pin to the homepage
 - Stateless
+- Emacs keybindings `;)`
+
+# Screenshots
+
+<p align="center">
+    <a href="http://nuage.kerjean.me">
+        <img src="https://raw.githubusercontent.com/mickael-kerjean/nuage/master/.assets/img/navigation.gif" alt="user experience on navigation" />
+        Navigating in Nuage
+    </a>
+</p>
+
+<p align="center">
+    <a href="https://github.com/mickael-kerjean/nuage/wiki/Org-Mode">
+        <img src="https://raw.githubusercontent.com/mickael-kerjean/nuage/master/.assets/img/navigation.gif" alt="org mode" />
+        Bringing org mode everywhere
+    </a>
+</p>
 
 # Getting started - Installation
-Nuage can be used in different ways:
+Nuage can be used in different settings:
 - Selfhosting ([documentation](https://github.com/mickael-kerjean/nuage/wiki/Installation:-Selhosting)): install it somewhere you have full control (with docker, without docker, on a server or even android)
 - Paas ([documentation](https://github.com/mickael-kerjean/nuage/wiki/Installation:-PaaS)): deployment on Heroku or AWS Lambda
 - Saas ([documentation](https://github.com/mickael-kerjean/nuage/wiki/Installation:-SaaS)): official instance or private instance fully managed