diff --git a/README.rst b/README.rst
index c4716782..6c4abe0f 100644
--- a/README.rst
+++ b/README.rst
@@ -17,21 +17,23 @@ PlatformIO
     :target: https://pypi.python.org/pypi/platformio/
     :alt:  License
 
-`Website <http://platformio.ikravets.com>`_ |
+`Website + Library Search <http://platformio.ikravets.com>`_ |
 `Documentation <http://docs.platformio.ikravets.com>`_ |
 `Project Examples <https://github.com/ivankravets/platformio/tree/develop/examples>`_ |
-`Bugs/Questions <https://github.com/ivankravets/platformio/issues>`_ |
 `Blog <http://www.ikravets.com/category/computer-life/platformio>`_ |
 `Twitter <https://twitter.com/PlatformIOTool>`_
 
-**PlatformIO** is a cross-platform code builder and library manager for
-*Arduino, MSP430, ARM*.
+.. image:: https://raw.githubusercontent.com/ivankravets/platformio/develop/docs/_static/platformio-logo.png
+    :target: http://platformio.ikravets.com
 
-* `Website + Library Search <http://platformio.ikravets.com>`_
-* `Quickstart <http://docs.platformio.ikravets.com/en/latest/quickstart.html>`_
-* `Installation <http://docs.platformio.ikravets.com/en/latest/installation.html>`_
-* `Project Configuration File <http://docs.platformio.ikravets.com/en/latest/projectconf.html>`_
-* `Platforms & Embedded Boards <http://docs.platformio.ikravets.com/en/latest/platforms/index.html>`_
+`PlatformIO <http://platformio.ikravets.com>`_ is a cross-platform code builder
+and the missing library manager.
+
+* `Get Started <http://platformio.ikravets.com/#!/get-started>`_
+* `Web 2.0 Library Search <http://platformio.ikravets.com/#!/lib>`_
+* `Development Platforms <http://platformio.ikravets.com/#!/platforms>`_
+* `Embedded Boards <http://platformio.ikravets.com/#!/boards>`_
+* `Library Manager <http://docs.platformio.ikravets.com/en/latest/librarymanager/index.html>`_
 * `User Guide <http://docs.platformio.ikravets.com/en/latest/userguide/index.html>`_
 * `IDE Integration <http://docs.platformio.ikravets.com/en/latest/ide.html>`_
 * `Release History <http://docs.platformio.ikravets.com/en/latest/history.html>`_
@@ -50,7 +52,7 @@ options: platform type, firmware uploading settings, pre-built framework
 and many more.
 
 .. image:: examples/platformio-examples.png
-    :target: https://github.com/ivankravets/platformio/raw/develop/examples/platformio-examples.png
+    :target: https://raw.githubusercontent.com/ivankravets/platformio/develop/examples/platformio-examples.png
     :alt:  Examples
     :width: 730px
 
@@ -59,19 +61,18 @@ and many more.
 * Automatically analyse dependency
 * Reliably detect build changes
 * Build framework or library source code to static library
-* Build *ELF* (executable and linkable firmware)
-* Convert *ELF* to *HEX* or *BIN* file
-* Extract *EEPROM* data
 * Upload firmware to your device
+* Lookup for external libraries which are installed via
+  `Library Manager <http://docs.platformio.ikravets.com/en/latest/librarymanager/index.html>`_
 
 It has support for many popular embedded platforms like these:
 
-* ``atmelavr`` `Atmel AVR <http://en.wikipedia.org/wiki/Atmel_AVR>`_
-  (including `Arduino <http://www.arduino.cc>`_ based boards)
-* ``timsp430`` `TI MSP430 <http://www.ti.com/lsds/ti/microcontroller/16-bit_msp430/overview.page>`_
-  (including `MSP430 LaunchPads <http://www.ti.com/ww/en/launchpad/launchpads-msp430.html>`_)
-* ``titiva`` `TI TIVA C <http://www.ti.com/lsds/ti/microcontroller/tiva_arm_cortex/c_series/overview.page>`_
-  (including `TIVA C Series LaunchPads <http://www.ti.com/ww/en/launchpad/launchpads-connected.html>`_)
+* ``atmelavr`` `Atmel AVR <http://platformio.ikravets.com/#!/platforms/atmelavr>`_
+  (including Arduino-based boards)
+* ``timsp430`` `TI MSP430 <http://platformio.ikravets.com/#!/platforms/timsp430>`_
+  (including MSP430 LaunchPads)
+* ``titiva`` `TI TIVA C <http://platformio.ikravets.com/#!/platforms/titiva>`_
+  (including TIVA C Series LaunchPads)
 
 
 Licence
diff --git a/docs/_static/platformio-logo.png b/docs/_static/platformio-logo.png
new file mode 100644
index 00000000..62bde5ca
Binary files /dev/null and b/docs/_static/platformio-logo.png differ
diff --git a/docs/index.rst b/docs/index.rst
index a7b2254e..b72528a6 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,12 +1,15 @@
-PlatformIO: A cross-platform code builder and library manager for Arduino, MSP430, ARM
-======================================================================================
+PlatformIO: A cross-platform code builder and the missing library manager
+=========================================================================
+
+.. image:: _static/platformio-logo.png
+    :target: http://platformio.ikravets.com
 
 `Website + Library Search <http://platformio.ikravets.com>`_ |
 `Project Examples <https://github.com/ivankravets/platformio/tree/develop/examples>`_ |
 `Source Code <https://github.com/ivankravets/platformio>`_ |
-`Bugs/Questions <https://github.com/ivankravets/platformio/issues>`_ |
+`Issues <https://github.com/ivankravets/platformio/issues>`_ |
 `Blog <http://www.ikravets.com/category/computer-life/platformio>`_ |
-`Twitter <https://twitter.com/smartanthill>`_
+`Twitter <https://twitter.com/PlatformIOTool>`_
 
 You have no need to install any *IDE* or compile any tool chains. *PlatformIO*
 has pre-built different development platforms including: compiler, debugger,
@@ -27,9 +30,7 @@ instruments.
 * Automatically analyse dependency
 * Reliably detect build changes
 * Build framework or library source code to static library
-* Build *ELF* (executable and linkable firmware)
-* Convert *ELF* to *HEX* or *BIN* file
-* Extract *EEPROM* data
+* Lookup for external libraries which are installed via :ref:`librarymanager`
 * Upload firmware to your device
 
 
diff --git a/docs/librarymanager/config.rst b/docs/librarymanager/config.rst
index 62562296..fe6e573f 100644
--- a/docs/librarymanager/config.rst
+++ b/docs/librarymanager/config.rst
@@ -4,18 +4,17 @@
 library.json
 ============
 
-*PlatformIO*-suitable library should be defined by a manifest file
-``library.json`` in a `JSON-style <http://en.wikipedia.org/wiki/JSON>`_.
-A data in ``library.json`` should be represented via
-`associative array <http://en.wikipedia.org/wiki/Associative_array>`_
-(name/value pairs). An order doesn't matter.
+``library.json`` is a manifest file of development library.
 
-The allowable fields (names from pairs) are described below. The fields
-(:ref:`libjson_name`, :ref:`libjson_description`, :ref:`libjson_keywords`
-and :ref:`libjson_authors`)
-will be displayed in the search results at the :ref:`cmd_lib_search` (*CLI*)
-and at the `WebSite <http://platformio.ikravets.com/#!/lib>`_.
-Also, they can be used for searching for libraries.
+Initially it was
+developed for :ref:`librarymanager`, but later was accepted by worldwide embedded
+community like a **standard library specification**.
+
+A data in ``library.json`` should be represented
+in `JSON-style <http://en.wikipedia.org/wiki/JSON>`_ via
+`associative array <http://en.wikipedia.org/wiki/Associative_array>`_
+(name/value pairs). An order doesn't matter. The allowable fields
+(names from pairs) are described below.
 
 .. contents::
 
diff --git a/docs/librarymanager/index.rst b/docs/librarymanager/index.rst
index 774e90e0..5dcc323a 100644
--- a/docs/librarymanager/index.rst
+++ b/docs/librarymanager/index.rst
@@ -17,8 +17,8 @@ You don't need to bother for finding the latest version of library. Due to
 .. toctree::
     :maxdepth: 2
 
-    creating
     config
+    creating
     User Guide <../userguide/lib/index.rst>
 
 .. [#] Inspired by `npm <https://www.npmjs.org>`_ and `bower
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 6ad1551c..f211fdb2 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -3,6 +3,10 @@
 Quickstart
 ==========
 
+.. note::
+    Please read `Get Started <http://platformio.ikravets.com/#!/get-started>`_
+    article from the official WebSite.
+
 First, :ref:`Install PlatformIO <installation>`.
 
 Print all available development platforms for installing