diff --git a/HISTORY.rst b/HISTORY.rst
index f13fd3bd..b00b54cc 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -553,7 +553,7 @@ PlatformIO 1.0
 1.5.0 (2015-05-15)
 ~~~~~~~~~~~~~~~~~~
 
-* Added support of `Framework mbed <http://platformio.org/#!/frameworks/mbed>`_
+* Added support of `Framework mbed <http://platformio.org/frameworks/mbed>`_
   for Teensy 3.1
   (`issue #183 <https://github.com/platformio/platformio/issues/183>`_)
 * Added GDB as alternative uploader to `ststm32 <http://docs.platformio.org/en/latest/platforms/ststm32.html>`__ platform
@@ -640,7 +640,7 @@ PlatformIO 1.0
 * Created new `Frameworks <http://docs.platformio.org/en/latest/frameworks/index.html>`__
   page in documentation and added to `PlatformIO Web Site <http://platformio.org>`_
   (`issue #115 <https://github.com/platformio/platformio/issues/115>`_)
-* Introduced online `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+* Introduced online `Embedded Boards Explorer <http://platformio.org/boards>`_
 * Automatically append define ``-DPLATFORMIO=%version%`` to
   builder (`issue #105 <https://github.com/platformio/platformio/issues/105>`_)
 * Renamed ``stm32`` development platform to
diff --git a/README.rst b/README.rst
index 9b16e468..e256a223 100644
--- a/README.rst
+++ b/README.rst
@@ -27,11 +27,11 @@ PlatformIO
    :target: http://community.platformio.org
 .. image:: https://img.shields.io/donate/PlatformIO.png?color=yellow
    :alt: Donate for PlatformIO.Org
-   :target: http://platformio.org/#!/donate
+   :target: http://platformio.org/donate
 
 
 `Home <http://platformio.org>`_ |
-`IDE <http://platformio.org/#!/platformio-ide>`_ |
+`IDE <http://platformio.org/platformio-ide>`_ |
 `Project Examples <https://github.com/platformio/platformio/tree/develop/examples>`_ |
 `Docs <http://docs.platformio.org>`_ |
 `Twitter <https://twitter.com/PlatformIO_Org>`_ |
@@ -39,8 +39,8 @@ PlatformIO
 `Hackaday <https://hackaday.io/project/7980-platformio>`_ |
 `Bintray <https://bintray.com/platformio>`_ |
 `Community <http://community.platformio.org>`_ |
-`Donate <http://platformio.org/#!/donate>`_ |
-`Contact Us <http://platformio.org/#!/contact>`_
+`Donate <http://platformio.org/donate>`_ |
+`Contact Us <http://platformio.org/contact>`_
 
 .. image:: https://raw.githubusercontent.com/platformio/platformio/develop/docs/_static/platformio-logo.png
     :target: http://platformio.org
@@ -72,12 +72,12 @@ libOpenCM3, etc.*
 .. image:: https://raw.githubusercontent.com/platformio/platformio/develop/docs/_static/platformio-demo-wiring.gif
     :target: http://platformio.org
 
-* `PlatformIO IDE <http://platformio.org/#!/platformio-ide>`_
-* `Get Started <http://platformio.org/#!/get-started>`_
-* `Web 2.0 Library Search <http://platformio.org/#!/lib>`_
-* `Development Platforms <http://platformio.org/#!/platforms>`_
-* `Frameworks <http://platformio.org/#!/frameworks>`_
-* `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+* `PlatformIO IDE <http://platformio.org/platformio-ide>`_
+* `Get Started <http://platformio.org/get-started>`_
+* `Web 2.0 Library Search <http://platformio.org/lib>`_
+* `Development Platforms <http://platformio.org/platforms>`_
+* `Frameworks <http://platformio.org/frameworks>`_
+* `Embedded Boards Explorer <http://platformio.org/boards>`_
 * `Library Manager <http://docs.platformio.org/en/latest/librarymanager/index.html>`_
 * `User Guide <http://docs.platformio.org/en/latest/userguide/index.html>`_
 * `Continuous Integration <http://docs.platformio.org/en/latest/ci/index.html>`_
@@ -98,7 +98,7 @@ sized computers (`Raspberry Pi <http://www.raspberrypi.org>`_,
 Embedded Development. *Easier Than Ever.*
 -----------------------------------------
 *PlatformIO* is well suited for embedded development and has pre-configured
-settings for most popular `Embedded Boards <http://platformio.org/#!/boards>`_.
+settings for most popular `Embedded Boards <http://platformio.org/boards>`_.
 
 * Colourful `command-line output <https://raw.githubusercontent.com/platformio/platformio/develop/examples/platformio-examples.png>`_
 * `IDE Integration <http://docs.platformio.org/en/latest/ide.html>`_ with
@@ -108,7 +108,7 @@ settings for most popular `Embedded Boards <http://platformio.org/#!/boards>`_.
 * Built-in `Serial Port Monitor <http://docs.platformio.org/en/latest/userguide/cmd_serialports.html#platformio-serialports-monitor>`_ and configurable
   `build -flags/-options <http://docs.platformio.org/en/latest/projectconf.html#build-flags>`_
 * Automatic **firmware uploading**
-* Pre-built tool chains, frameworks for the popular `Hardware Platforms <http://platformio.org/#!/platforms>`_
+* Pre-built tool chains, frameworks for the popular `Hardware Platforms <http://platformio.org/platforms>`_
 
 .. image:: https://raw.githubusercontent.com/platformio/platformio-web/develop/app/images/platformio-embedded-development.png
     :target: http://platformio.org
@@ -120,7 +120,7 @@ The Missing Library Manager. *It's here!*
 platforms which allows you to organize and have up-to-date external libraries.
 
 * Friendly `Command-Line Interface <http://docs.platformio.org/en/latest/librarymanager/index.html>`_
-* Modern `Web 2.0 Library Search <http://platformio.org/#!/lib>`_
+* Modern `Web 2.0 Library Search <http://platformio.org/lib>`_
 * Open Source `Library Registry API <https://github.com/platformio/platformio-api>`_
 * Library Crawler based on `library.json <http://docs.platformio.org/en/latest/librarymanager/config.html>`_
   specification
@@ -160,27 +160,27 @@ more).
 
 It has support for the most popular embedded platforms:
 
-* `Atmel AVR <http://platformio.org/#!/platforms/atmelavr>`_
-* `Atmel SAM <http://platformio.org/#!/platforms/atmelsam>`_
-* `Espressif <http://platformio.org/#!/platforms/espressif>`_
-* `Freescale Kinetis <http://platformio.org/#!/platforms/freescalekinetis>`_
-* `Nordic nRF51 <http://platformio.org/#!/platforms/nordicnrf51>`_
-* `NXP LPC <http://platformio.org/#!/platforms/nxplpc>`_
-* `ST STM32 <http://platformio.org/#!/platforms/ststm32>`_
-* `Silicon Labs EFM32 <http://platformio.org/#!/platforms/siliconlabsefm32>`_
-* `Teensy <http://platformio.org/#!/platforms/teensy>`_
-* `TI MSP430 <http://platformio.org/#!/platforms/timsp430>`_
-* `TI TIVA C <http://platformio.org/#!/platforms/titiva>`_
+* `Atmel AVR <http://platformio.org/platforms/atmelavr>`_
+* `Atmel SAM <http://platformio.org/platforms/atmelsam>`_
+* `Espressif <http://platformio.org/platforms/espressif>`_
+* `Freescale Kinetis <http://platformio.org/platforms/freescalekinetis>`_
+* `Nordic nRF51 <http://platformio.org/platforms/nordicnrf51>`_
+* `NXP LPC <http://platformio.org/platforms/nxplpc>`_
+* `ST STM32 <http://platformio.org/platforms/ststm32>`_
+* `Silicon Labs EFM32 <http://platformio.org/platforms/siliconlabsefm32>`_
+* `Teensy <http://platformio.org/platforms/teensy>`_
+* `TI MSP430 <http://platformio.org/platforms/timsp430>`_
+* `TI TIVA C <http://platformio.org/platforms/titiva>`_
 
 Frameworks:
 
-* `Arduino <http://platformio.org/#!/frameworks/arduino>`_
-* `CMSIS <http://platformio.org/#!/frameworks/cmsis>`_
-* `libOpenCM3 <http://platformio.org/#!/frameworks/libopencm3>`_
-* `Energia <http://platformio.org/#!/frameworks/energia>`_
-* `SPL <http://platformio.org/#!/frameworks/spl>`_
-* `mbed <http://platformio.org/#!/frameworks/mbed>`_
-* `WiringPi <http://platformio.org/#!/frameworks/wiringpi>`_
+* `Arduino <http://platformio.org/frameworks/arduino>`_
+* `CMSIS <http://platformio.org/frameworks/cmsis>`_
+* `libOpenCM3 <http://platformio.org/frameworks/libopencm3>`_
+* `Energia <http://platformio.org/frameworks/energia>`_
+* `SPL <http://platformio.org/frameworks/spl>`_
+* `mbed <http://platformio.org/frameworks/mbed>`_
+* `WiringPi <http://platformio.org/frameworks/wiringpi>`_
 
 For further details, please refer to `What is PlatformIO? <http://docs.platformio.org/en/latest/faq.html#what-is-platformio>`_
 
diff --git a/docs/_templates/footer.html b/docs/_templates/footer.html
index d89a632e..3a6f2f5e 100644
--- a/docs/_templates/footer.html
+++ b/docs/_templates/footer.html
@@ -11,16 +11,16 @@
     <nav role="navigation">
       <div>
         <ul class="nav navbar-nav">
-          <li><a href="http://platformio.org/#!/get-started"><i class="fa fa-rocket fa-lg"></i>Get Started</a></li>
-          <li><a href="http://platformio.org/#!/platformio-ide"><i class="fa fa-cube fa-lg"></i>IDE</a></li>
-          <li><a href="http://platformio.org/#!/platforms"><i class="fa fa-wrench fa-lg"></i>Development</a></li>
-          <li ><a href="http://platformio.org/#!/lib"><i class="fa fa-code fa-lg"></i>Libraries</a></li>
+          <li><a href="http://platformio.org/get-started"><i class="fa fa-rocket fa-lg"></i>Get Started</a></li>
+          <li><a href="http://platformio.org/platformio-ide"><i class="fa fa-cube fa-lg"></i>IDE</a></li>
+          <li><a href="http://platformio.org/platforms"><i class="fa fa-wrench fa-lg"></i>Development</a></li>
+          <li ><a href="http://platformio.org/lib"><i class="fa fa-code fa-lg"></i>Libraries</a></li>
         </ul>
 
         <ul class="nav navbar-nav navbar-right">
           <li class="active"><a href="http://docs.platformio.org/"><i class="fa fa-book fa-lg"></i>Docs</a></li>
           <li><a href="http://community.platformio.org"><i class="fa fa-comments-o fa-lg"></i>Community</a></li>
-          <li><a href="http://platformio.org/#!/contact"><i class="fa fa-envelope fa-lg"></i>Contact</a></li>
+          <li><a href="http://platformio.org/contact"><i class="fa fa-envelope fa-lg"></i>Contact</a></li>
         </ul>
       </div>
 
diff --git a/docs/ci/circleci.rst b/docs/ci/circleci.rst
index 30fefe3f..ba6d6932 100644
--- a/docs/ci/circleci.rst
+++ b/docs/ci/circleci.rst
@@ -82,7 +82,7 @@ Install dependent library using :ref:`librarymanager`
             # Install the latest stable PlatformIO
             - sudo pip install -U platformio
 
-            # OneWire Library with ID=1 http://platformio.org/#!/lib/show/1/OneWire
+            # OneWire Library with ID=1 http://platformio.org/lib/show/1/OneWire
             - platformio lib install 1
 
     test:
@@ -157,8 +157,8 @@ Examples
             #
             # Libraries from PlatformIO Library Registry:
             #
-            # http://platformio.org/#!/lib/show/416/TinyGPS
-            # http://platformio.org/#!/lib/show/417/SPI4Teensy3
+            # http://platformio.org/lib/show/416/TinyGPS
+            # http://platformio.org/lib/show/417/SPI4Teensy3
             - platformio lib install 416 417
 
     test:
diff --git a/docs/ci/travis.rst b/docs/ci/travis.rst
index f737dde5..b725ae92 100644
--- a/docs/ci/travis.rst
+++ b/docs/ci/travis.rst
@@ -105,7 +105,7 @@ Install dependent library using :ref:`librarymanager`
         #
         # Libraries from PlatformIO Library Registry:
         #
-        # http://platformio.org/#!/lib/show/1/OneWire
+        # http://platformio.org/lib/show/1/OneWire
         platformio lib install 1
 
 Manually download dependent library and include in build process via ``--lib`` option
@@ -188,8 +188,8 @@ Examples
         #
         # Libraries from PlatformIO Library Registry:
         #
-        # http://platformio.org/#!/lib/show/416/TinyGPS
-        # http://platformio.org/#!/lib/show/417/SPI4Teensy3
+        # http://platformio.org/lib/show/416/TinyGPS
+        # http://platformio.org/lib/show/417/SPI4Teensy3
         - platformio lib install 416 417
 
     script:
@@ -260,7 +260,7 @@ Examples
         #
         # Libraries from PlatformIO Library Registry:
         #
-        # http://platformio.org/#!/lib/show/416/TinyGPS
+        # http://platformio.org/lib/show/416/TinyGPS
         - platformio lib install 416 421 422
 
     script:
diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst
index 270dce86..eac205e3 100644
--- a/docs/frameworks/arduino.rst
+++ b/docs/frameworks/arduino.rst
@@ -50,7 +50,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 Adafruit
diff --git a/docs/frameworks/cmsis.rst b/docs/frameworks/cmsis.rst
index 8c495c17..8a264924 100644
--- a/docs/frameworks/cmsis.rst
+++ b/docs/frameworks/cmsis.rst
@@ -35,7 +35,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 Armstrap
diff --git a/docs/frameworks/energia.rst b/docs/frameworks/energia.rst
index 1ed32ca8..ccdfc121 100644
--- a/docs/frameworks/energia.rst
+++ b/docs/frameworks/energia.rst
@@ -38,7 +38,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 TI
diff --git a/docs/frameworks/libopencm3.rst b/docs/frameworks/libopencm3.rst
index 729c7b30..1f422e82 100644
--- a/docs/frameworks/libopencm3.rst
+++ b/docs/frameworks/libopencm3.rst
@@ -38,7 +38,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 ST
diff --git a/docs/frameworks/mbed.rst b/docs/frameworks/mbed.rst
index fc69243f..eaea3167 100644
--- a/docs/frameworks/mbed.rst
+++ b/docs/frameworks/mbed.rst
@@ -53,7 +53,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 Atmel
diff --git a/docs/frameworks/spl.rst b/docs/frameworks/spl.rst
index 72cf9706..03316962 100644
--- a/docs/frameworks/spl.rst
+++ b/docs/frameworks/spl.rst
@@ -35,7 +35,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 Armstrap
diff --git a/docs/frameworks/wiringpi.rst b/docs/frameworks/wiringpi.rst
index 3e7876b3..46f705f3 100644
--- a/docs/frameworks/wiringpi.rst
+++ b/docs/frameworks/wiringpi.rst
@@ -35,7 +35,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 Raspberry Pi
diff --git a/docs/ide/_platformio_ide_extra.rst b/docs/ide/_platformio_ide_extra.rst
index 2dc0bf3e..56769fb3 100644
--- a/docs/ide/_platformio_ide_extra.rst
+++ b/docs/ide/_platformio_ide_extra.rst
@@ -10,7 +10,7 @@
     limitations under the License.
 
 .. note::
-    We are proud to present our official `PlatformIO IDE <http://platformio.org/#!/platformio-ide>`_ -
+    We are proud to present our official `PlatformIO IDE <http://platformio.org/platformio-ide>`_ -
     The next generation integrated development environment for IoT.
 
     * Cross-platform build system without external dependencies to the OS software:
@@ -28,4 +28,4 @@
     * Serial Port Monitor
     * Built-in Terminal with :ref:`PlatformIO CLI <userguide>` tool (``pio``, ``platformio``)
 
-    `Install PlatformIO IDE <http://platformio.org/#!/platformio-ide>`_.
+    `Install PlatformIO IDE <http://platformio.org/platformio-ide>`_.
diff --git a/docs/ide/clion.rst b/docs/ide/clion.rst
index 4085cc7b..ebdcbd66 100644
--- a/docs/ide/clion.rst
+++ b/docs/ide/clion.rst
@@ -31,7 +31,7 @@ page for more detailed information.
 Integration
 -----------
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
diff --git a/docs/ide/eclipse.rst b/docs/ide/eclipse.rst
index a6dbfcb7..4da704a7 100644
--- a/docs/ide/eclipse.rst
+++ b/docs/ide/eclipse.rst
@@ -35,7 +35,7 @@ page for more detailed information.
 Integration
 -----------
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
diff --git a/docs/ide/emacs.rst b/docs/ide/emacs.rst
index f325fb43..4a153c86 100644
--- a/docs/ide/emacs.rst
+++ b/docs/ide/emacs.rst
@@ -45,7 +45,7 @@ Code completion can optionally be provided by installing `irony-mode <https://gi
 Project Generator
 ^^^^^^^^^^^^^^^^^
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
diff --git a/docs/ide/netbeans.rst b/docs/ide/netbeans.rst
index c65f0da1..6cba0b76 100644
--- a/docs/ide/netbeans.rst
+++ b/docs/ide/netbeans.rst
@@ -33,7 +33,7 @@ install the C/C++ development plugins).
 Integration
 -----------
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
diff --git a/docs/ide/qtcreator.rst b/docs/ide/qtcreator.rst
index 953600a9..d0351c4b 100644
--- a/docs/ide/qtcreator.rst
+++ b/docs/ide/qtcreator.rst
@@ -35,7 +35,7 @@ Integration
 Project Generator
 ^^^^^^^^^^^^^^^^^
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
diff --git a/docs/ide/sublimetext.rst b/docs/ide/sublimetext.rst
index 1192ba6a..57746d9f 100644
--- a/docs/ide/sublimetext.rst
+++ b/docs/ide/sublimetext.rst
@@ -29,7 +29,7 @@ Integration
 Project Generator
 ^^^^^^^^^^^^^^^^^
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
diff --git a/docs/ide/visualstudio.rst b/docs/ide/visualstudio.rst
index fb29cbaf..84343e36 100644
--- a/docs/ide/visualstudio.rst
+++ b/docs/ide/visualstudio.rst
@@ -35,7 +35,7 @@ Integration
 Project Generator
 ^^^^^^^^^^^^^^^^^
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
diff --git a/docs/index.rst b/docs/index.rst
index 3634adda..d3f8e806 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -36,8 +36,8 @@ Silicon Labs EFM32, ST STM32, TI MSP430 & Tiva, Teensy, Arduino, mbed,
 libOpenCM3, etc.*
 
 * `Website <http://platformio.org>`_
-* `Web 2.0 Library Search <http://platformio.org/#!/lib>`_ |
-  `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+* `Web 2.0 Library Search <http://platformio.org/lib>`_ |
+  `Embedded Boards Explorer <http://platformio.org/boards>`_
 * `Project Examples <https://github.com/platformio/platformio/tree/develop/examples>`_
 * `Source Code <https://github.com/platformio/platformio>`_ |
   `Issues <https://github.com/platformio/platformio/issues>`_
@@ -71,7 +71,7 @@ The Missing Library Manager. *It's here!*
 -----------------------------------------
 
 * Friendly Command-Line Interface
-* Modern `Web 2.0 Library Search <http://platformio.org/#!/lib>`_
+* Modern `Web 2.0 Library Search <http://platformio.org/lib>`_
 * Library dependency management
 * Automatic library updating
 * It runs on Windows, Mac OS X, and Linux (+ARM).
diff --git a/docs/librarymanager/creating.rst b/docs/librarymanager/creating.rst
index 31ca2d50..efbfc32f 100644
--- a/docs/librarymanager/creating.rst
+++ b/docs/librarymanager/creating.rst
@@ -152,6 +152,6 @@ to :ref:`install <cmd_lib_install>` it.
 Examples
 --------
 
-* `GitHub + fixed release <http://platformio.org/#!/lib/show/552/ACNoblex>`_
-* `Dependencies by author and framework <http://platformio.org/#!/lib/show/3/PID-AutoTune>`_
+* `GitHub + fixed release <http://platformio.org/lib/show/552/ACNoblex>`_
+* `Dependencies by author and framework <http://platformio.org/lib/show/3/PID-AutoTune>`_
 * `Multiple libraries in the one repository <https://github.com/jrowberg/i2cdevlib/tree/master/Arduino>`_
diff --git a/docs/librarymanager/index.rst b/docs/librarymanager/index.rst
index 704feac2..8a935663 100644
--- a/docs/librarymanager/index.rst
+++ b/docs/librarymanager/index.rst
@@ -18,7 +18,7 @@ Library Manager
 You can search for new libraries via
 
 * :ref:`Command Line interface <cmd_lib_search>`
-* `Web 2.0 Library Search <http://platformio.org/#!/lib>`_
+* `Web 2.0 Library Search <http://platformio.org/lib>`_
 
 You don't need to bother for finding the latest version of library. Due to
 :ref:`cmd_lib_update` command you will have up-to-date external libraries.
diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index 356582af..780aae4d 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -65,7 +65,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/atmelsam.rst b/docs/platforms/atmelsam.rst
index 5d71c4d6..21fc3d9b 100644
--- a/docs/platforms/atmelsam.rst
+++ b/docs/platforms/atmelsam.rst
@@ -74,7 +74,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/creating_board.rst b/docs/platforms/creating_board.rst
index 32b617a8..60c6e2e5 100644
--- a/docs/platforms/creating_board.rst
+++ b/docs/platforms/creating_board.rst
@@ -17,7 +17,7 @@ Custom Board
 *PlatformIO* has pre-built settings for the most popular embedded boards. This
 list is available:
 
-* `Embedded Boards Explorer <http://platformio.org/#!/boards>`_ (Web)
+* `Embedded Boards Explorer <http://platformio.org/boards>`_ (Web)
 * :ref:`cmd_boards` (CLI command)
 
 Nevertheless, PlatformIO allows to create own board or override existing
diff --git a/docs/platforms/espressif.rst b/docs/platforms/espressif.rst
index 609b2549..2a3cca1d 100644
--- a/docs/platforms/espressif.rst
+++ b/docs/platforms/espressif.rst
@@ -71,7 +71,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/freescalekinetis.rst b/docs/platforms/freescalekinetis.rst
index cab19469..f30ba372 100644
--- a/docs/platforms/freescalekinetis.rst
+++ b/docs/platforms/freescalekinetis.rst
@@ -59,7 +59,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/linux_arm.rst b/docs/platforms/linux_arm.rst
index 42c072ab..821a60f6 100644
--- a/docs/platforms/linux_arm.rst
+++ b/docs/platforms/linux_arm.rst
@@ -15,7 +15,7 @@ Platform ``linux_arm``
 ======================
 Linux ARM is a Unix-like and mostly POSIX-compliant computer operating system (OS) assembled under the model of free and open-source software development and distribution. Using host OS (Mac OS X, Linux ARM) you can build native application for Linux ARM platform.
 
-For more detailed information please visit `vendor site <http://platformio.org/#!/platforms/linux_arm>`_.
+For more detailed information please visit `vendor site <http://platformio.org/platforms/linux_arm>`_.
 
 .. contents::
 
@@ -50,7 +50,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/linux_i686.rst b/docs/platforms/linux_i686.rst
index 5afbda65..eab273a7 100644
--- a/docs/platforms/linux_i686.rst
+++ b/docs/platforms/linux_i686.rst
@@ -15,7 +15,7 @@ Platform ``linux_i686``
 =======================
 Linux i686 (32-bit) is a Unix-like and mostly POSIX-compliant computer operating system (OS) assembled under the model of free and open-source software development and distribution. Using host OS (Mac OS X or Linux 32-bit) you can build native application for Linux i686 platform.
 
-For more detailed information please visit `vendor site <http://platformio.org/#!/platforms/linux_i686>`_.
+For more detailed information please visit `vendor site <http://platformio.org/platforms/linux_i686>`_.
 
 .. contents::
 
diff --git a/docs/platforms/linux_x86_64.rst b/docs/platforms/linux_x86_64.rst
index a3353056..c368a17d 100644
--- a/docs/platforms/linux_x86_64.rst
+++ b/docs/platforms/linux_x86_64.rst
@@ -15,7 +15,7 @@ Platform ``linux_x86_64``
 =========================
 Linux x86_64 (64-bit) is a Unix-like and mostly POSIX-compliant computer operating system (OS) assembled under the model of free and open-source software development and distribution. Using host OS (Mac OS X or Linux 64-bit) you can build native application for Linux x86_64 platform.
 
-For more detailed information please visit `vendor site <http://platformio.org/#!/platforms/linux_i686>`_.
+For more detailed information please visit `vendor site <http://platformio.org/platforms/linux_i686>`_.
 
 .. contents::
 
diff --git a/docs/platforms/native.rst b/docs/platforms/native.rst
index 4b501f1f..74d1afd5 100644
--- a/docs/platforms/native.rst
+++ b/docs/platforms/native.rst
@@ -15,6 +15,6 @@ Platform ``native``
 ===================
 Native development platform is intended to be used for desktop OS. This platform uses built-in toolchains (preferable based on GCC), frameworks, libs from particular OS where it will be run.
 
-For more detailed information please visit `vendor site <http://platformio.org/#!/platforms/native>`_.
+For more detailed information please visit `vendor site <http://platformio.org/platforms/native>`_.
 
 .. contents::
\ No newline at end of file
diff --git a/docs/platforms/nordicnrf51.rst b/docs/platforms/nordicnrf51.rst
index 9d51cb4c..c8b26477 100644
--- a/docs/platforms/nordicnrf51.rst
+++ b/docs/platforms/nordicnrf51.rst
@@ -68,7 +68,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/nxplpc.rst b/docs/platforms/nxplpc.rst
index 9eeeb669..c751439e 100644
--- a/docs/platforms/nxplpc.rst
+++ b/docs/platforms/nxplpc.rst
@@ -59,7 +59,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/siliconlabsefm32.rst b/docs/platforms/siliconlabsefm32.rst
index 4095ef5a..13b3055d 100644
--- a/docs/platforms/siliconlabsefm32.rst
+++ b/docs/platforms/siliconlabsefm32.rst
@@ -59,7 +59,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/ststm32.rst b/docs/platforms/ststm32.rst
index 62e0dc85..6e2bca58 100644
--- a/docs/platforms/ststm32.rst
+++ b/docs/platforms/ststm32.rst
@@ -83,7 +83,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/teensy.rst b/docs/platforms/teensy.rst
index c8a74616..a7877479 100644
--- a/docs/platforms/teensy.rst
+++ b/docs/platforms/teensy.rst
@@ -74,7 +74,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/timsp430.rst b/docs/platforms/timsp430.rst
index 39aea248..b9653c03 100644
--- a/docs/platforms/timsp430.rst
+++ b/docs/platforms/timsp430.rst
@@ -68,7 +68,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/titiva.rst b/docs/platforms/titiva.rst
index 8effb509..ce2514a5 100644
--- a/docs/platforms/titiva.rst
+++ b/docs/platforms/titiva.rst
@@ -71,7 +71,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/windows_x86.rst b/docs/platforms/windows_x86.rst
index 8f2c2ff6..3836a807 100644
--- a/docs/platforms/windows_x86.rst
+++ b/docs/platforms/windows_x86.rst
@@ -15,7 +15,7 @@ Platform ``windows_x86``
 ========================
 Windows x86 (32-bit) is a metafamily of graphical operating systems developed and marketed by Microsoft. Using host OS (Windows, Linux 32/64 or Mac OS X) you can build native application for Windows x86 platform.
 
-For more detailed information please visit `vendor site <http://platformio.org/#!/platforms/windows_x86>`_.
+For more detailed information please visit `vendor site <http://platformio.org/platforms/windows_x86>`_.
 
 .. contents::
 
diff --git a/docs/projectconf.rst b/docs/projectconf.rst
index 2f1c368a..00168b59 100644
--- a/docs/projectconf.rst
+++ b/docs/projectconf.rst
@@ -178,7 +178,7 @@ need to specify ``board_mcu``, ``board_f_cpu``, ``upload_protocol`` or
 pre-fill options described above with appropriate values.
 
 You can find the ``board`` type in *Boards* section of each :ref:`platforms` or
-using `PlatformIO Embedded Boards Explorer <http://platformio.org/#!/boards>`_.
+using `PlatformIO Embedded Boards Explorer <http://platformio.org/boards>`_.
 
 
 Board options
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 08490e18..f70bbe63 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -60,7 +60,7 @@ Board Identifier
 ----------------
 
 :ref:`cmd_init` command requires to specify board identifier (ID/TYPE). It can
-be found using `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+be found using `Embedded Boards Explorer <http://platformio.org/boards>`_
 or :ref:`cmd_boards` command. For example, using :ref:`cmd_boards` let's try
 to find Teensy boards:
 
diff --git a/docs/userguide/lib/cmd_install.rst b/docs/userguide/lib/cmd_install.rst
index dbeaed73..a28c24a6 100644
--- a/docs/userguide/lib/cmd_install.rst
+++ b/docs/userguide/lib/cmd_install.rst
@@ -28,7 +28,7 @@ Description
 -----------
 
 Install new library  by specified
-`PlatformIO Library Registry ID <http://platformio.org/#!/lib>`_.
+`PlatformIO Library Registry ID <http://platformio.org/lib>`_.
 
 Options
 -------
@@ -48,7 +48,7 @@ Examples
 
 .. code-block:: bash
 
-    # IRremote: http://platformio.org/#!/lib/show/4/IRremote
+    # IRremote: http://platformio.org/lib/show/4/IRremote
     $ platformio lib install 4
     # Installing library [ 4 ]:
     # Downloading  [####################################]  100%
@@ -60,7 +60,7 @@ Examples
 
 .. code-block:: bash
 
-    # XBee: http://platformio.org/#!/lib/show/6/XBee
+    # XBee: http://platformio.org/lib/show/6/XBee
     $ platformio lib install 6 --version=0.5
     # Installing library [ 6 ]:
     # Downloading  [####################################]  100%
@@ -72,7 +72,7 @@ Examples
 
 .. code-block:: bash
 
-    # Adafruit-ST7735: http://platformio.org/#!/lib/show/12/Adafruit-ST7735
+    # Adafruit-ST7735: http://platformio.org/lib/show/12/Adafruit-ST7735
     $ platformio lib install 12
     # Installing library [ 12 ]:
     # Downloading  [####################################]  100%
diff --git a/docs/userguide/lib/cmd_search.rst b/docs/userguide/lib/cmd_search.rst
index 51f12248..9ad9d66f 100644
--- a/docs/userguide/lib/cmd_search.rst
+++ b/docs/userguide/lib/cmd_search.rst
@@ -27,7 +27,7 @@ Usage
 Description
 -----------
 
-Search for library in `PlatformIO Library Registry <http://platformio.org/#!/lib>`_
+Search for library in `PlatformIO Library Registry <http://platformio.org/lib>`_
 by :ref:`library_config` fields in the boolean mode.
 
 The boolean search capability supports the following operators:
@@ -121,7 +121,7 @@ Examples
     # Show next libraries? [y/N]:
     # ...
 
-2. Search for `1-Wire libraries <http://platformio.org/#!/lib/search?query=%25221-wire%2522>`_
+2. Search for `1-Wire libraries <http://platformio.org/lib/search?query=%25221-wire%2522>`_
 
 .. code-block:: bash
 
@@ -133,7 +133,7 @@ Examples
     # [  1  ] OneWire          arduino, atmelavr     "Paul Stoffregen": Control devices (from Dallas Semiconductor) that use the One Wire protocol (DS18S20, DS18B20, DS2408 and etc)
     # ...
 
-3. Search for `Arduino-based "I2C" libraries <http://platformio.org/#!/lib/search?query=framework%253Aarduino%2520i2c>`_
+3. Search for `Arduino-based "I2C" libraries <http://platformio.org/lib/search?query=framework%253Aarduino%2520i2c>`_
 
 .. code-block:: bash
 
@@ -148,7 +148,7 @@ Examples
     # [ 14  ] Adafruit-9DOF-Unified arduino, atmelavr     "Adafruit Industries": Unified sensor driver for the Adafruit 9DOF Breakout (L3GD20 / LSM303)
     # ...
 
-4. Search for `libraries by "web" and "http" keywords <http://platformio.org/#!/lib/search?query=keyword%253A%2522web%2522%2520keyword%253A%2522http%2522>`_.
+4. Search for `libraries by "web" and "http" keywords <http://platformio.org/lib/search?query=keyword%253A%2522web%2522%2520keyword%253A%2522http%2522>`_.
 
 .. code-block:: bash
 
@@ -161,7 +161,7 @@ Examples
     # [ 17  ] Adafruit-CC3000  arduino, atmelavr     "Adafruit Industries": Library code for Adafruit's CC3000 Wi-Fi/WiFi breakouts
     # ...
 
-5. Search for `libraries by "Adafruit Industries" author <http://platformio.org/#!/lib/search?query=author%253A%2522Adafruit%20Industries%2522>`_
+5. Search for `libraries by "Adafruit Industries" author <http://platformio.org/lib/search?query=author%253A%2522Adafruit%20Industries%2522>`_
 
 .. code-block:: bash
 
@@ -176,7 +176,7 @@ Examples
     # [ 26  ] Adafruit-LSM303DLHC-Unified arduino, atmelavr     "Adafruit Industries": Unified sensor driver for Adafruit's LSM303 Breakout (Accelerometer + Magnetometer)
     # ...
 
-6. Search for `libraries which are compatible with Dallas temperature sensors <http://platformio.org/#!/lib/search?query=DS*>`_
+6. Search for `libraries which are compatible with Dallas temperature sensors <http://platformio.org/lib/search?query=DS*>`_
    like DS18B20, DS18S20 and etc.
 
 .. code-block:: bash
@@ -189,7 +189,7 @@ Examples
     # [  1  ] OneWire          arduino, atmelavr     "Paul Stoffregen": Control devices (from Dallas Semiconductor) that use the One Wire protocol (DS18S20, DS18B20, DS2408 and etc)
     # ...
 
-7. Search for `Energia-based *nRF24* or *HttpClient* libraries <http://platformio.org/#!/lib/search?query=framework%253Aenergia%2520%252B(nRF24%2520HttpClient)>`_.
+7. Search for `Energia-based *nRF24* or *HttpClient* libraries <http://platformio.org/lib/search?query=framework%253Aenergia%2520%252B(nRF24%2520HttpClient)>`_.
    The search query that is described below can be interpreted like
    ``energia nRF24 OR energia HttpClient``
 
@@ -204,7 +204,7 @@ Examples
     # [ 43  ] nRF24            energia, timsp430     "Eric": The nRF24L01 is a low-cost 2.4GHz ISM transceiver module. It supports a number of channel frequencies in the 2.4GHz band and a range of data rates.
 
 
-8. Search for the `all sensor libraries excluding temperature <http://platformio.org/#!/lib/search?query=sensor%2520-temperature>`_.
+8. Search for the `all sensor libraries excluding temperature <http://platformio.org/lib/search?query=sensor%2520-temperature>`_.
 
 .. code-block:: bash
 
diff --git a/docs/userguide/lib/cmd_show.rst b/docs/userguide/lib/cmd_show.rst
index 0273f3a2..745685d1 100644
--- a/docs/userguide/lib/cmd_show.rst
+++ b/docs/userguide/lib/cmd_show.rst
@@ -35,7 +35,7 @@ Examples
 
 .. code-block:: bash
 
-    # OneWire: http://platformio.org/#!/lib/show/1/OneWire
+    # OneWire: http://platformio.org/lib/show/1/OneWire
     $ platformio lib show 1
     # OneWire
     # -------
diff --git a/docs/userguide/lib/cmd_uninstall.rst b/docs/userguide/lib/cmd_uninstall.rst
index 8e487e36..df99372b 100644
--- a/docs/userguide/lib/cmd_uninstall.rst
+++ b/docs/userguide/lib/cmd_uninstall.rst
@@ -35,6 +35,6 @@ Examples
 
 .. code-block:: bash
 
-    # XBee: http://platformio.org/#!/lib/show/6/XBee
+    # XBee: http://platformio.org/lib/show/6/XBee
     $ platformio lib uninstall 6
     # The library #6 'XBee' has been successfully uninstalled!
diff --git a/docs/what-is-platformio.rst b/docs/what-is-platformio.rst
index b214fbb3..0eb61dd5 100644
--- a/docs/what-is-platformio.rst
+++ b/docs/what-is-platformio.rst
@@ -75,7 +75,7 @@ console application, it can be used in combination with one's favorite
 Alright, so PlatformIO can run on different operating systems. But more
 importantly, from development perspective at least, is a list of supported
 boards and MCUs. To keep things short: PlatformIO supports approximately 200
-`Embedded Boards <http://platformio.org/#!/boards>`_ and all major
+`Embedded Boards <http://platformio.org/boards>`_ and all major
 :ref:`Development Platforms <platforms>`.
 
 User SHOULD have a choice
diff --git a/platformio/maintenance.py b/platformio/maintenance.py
index 441f5072..4cc417cf 100644
--- a/platformio/maintenance.py
+++ b/platformio/maintenance.py
@@ -147,12 +147,12 @@ def after_upgrade(ctx):
     if not getenv("PLATFORMIO_IDE"):
         click.echo("- %s PlatformIO IDE for IoT development > %s" % (
             click.style("try", fg="cyan"),
-            click.style("http://platformio.org/#!/platformio-ide", fg="cyan")
+            click.style("http://platformio.org/platformio-ide", fg="cyan")
         ))
     if not util.is_ci():
         click.echo("- %s to keep PlatformIO alive! > %s" % (
             click.style("donate", fg="cyan"),
-            click.style("http://platformio.org/#!/donate", fg="cyan")
+            click.style("http://platformio.org/donate", fg="cyan")
         ))
 
     click.echo("*" * terminal_width)
diff --git a/platformio/platforms/linux_arm.py b/platformio/platforms/linux_arm.py
index 3517441a..79c03ad5 100644
--- a/platformio/platforms/linux_arm.py
+++ b/platformio/platforms/linux_arm.py
@@ -26,7 +26,7 @@ class Linux_armPlatform(BasePlatform):
         Using host OS (Mac OS X, Linux ARM) you can build native application
         for Linux ARM platform.
 
-        http://platformio.org/#!/platforms/linux_arm
+        http://platformio.org/platforms/linux_arm
     """
 
     PACKAGES = {
diff --git a/platformio/platforms/linux_i686.py b/platformio/platforms/linux_i686.py
index 0d889e67..11f1ac01 100644
--- a/platformio/platforms/linux_i686.py
+++ b/platformio/platforms/linux_i686.py
@@ -26,7 +26,7 @@ class Linux_i686Platform(BasePlatform):
         Using host OS (Mac OS X or Linux 32-bit) you can build native
         application for Linux i686 platform.
 
-        http://platformio.org/#!/platforms/linux_i686
+        http://platformio.org/platforms/linux_i686
     """
 
     PACKAGES = {
diff --git a/platformio/platforms/linux_x86_64.py b/platformio/platforms/linux_x86_64.py
index 876ac562..c3bf330e 100644
--- a/platformio/platforms/linux_x86_64.py
+++ b/platformio/platforms/linux_x86_64.py
@@ -26,7 +26,7 @@ class Linux_x86_64Platform(BasePlatform):
         Using host OS (Mac OS X or Linux 64-bit) you can build native
         application for Linux x86_64 platform.
 
-        http://platformio.org/#!/platforms/linux_i686
+        http://platformio.org/platforms/linux_i686
     """
 
     PACKAGES = {
diff --git a/platformio/platforms/native.py b/platformio/platforms/native.py
index 0e61965c..9c4ed8bb 100644
--- a/platformio/platforms/native.py
+++ b/platformio/platforms/native.py
@@ -22,7 +22,7 @@ class NativePlatform(BasePlatform):
     This platform uses built-in toolchains (preferable based on GCC),
     frameworks, libs from particular OS where it will be run.
 
-    http://platformio.org/#!/platforms/native
+    http://platformio.org/platforms/native
     """
 
     PACKAGES = {
diff --git a/platformio/platforms/windows_x86.py b/platformio/platforms/windows_x86.py
index 260e5ac6..bf52cc1c 100644
--- a/platformio/platforms/windows_x86.py
+++ b/platformio/platforms/windows_x86.py
@@ -23,7 +23,7 @@ class Windows_x86Platform(BasePlatform):
         Using host OS (Windows, Linux 32/64 or Mac OS X) you can build native
         application for Windows x86 platform.
 
-        http://platformio.org/#!/platforms/windows_x86
+        http://platformio.org/platforms/windows_x86
     """
 
     PACKAGES = {
diff --git a/scripts/99-platformio-udev.rules b/scripts/99-platformio-udev.rules
index fe59cb18..5ac03b12 100644
--- a/scripts/99-platformio-udev.rules
+++ b/scripts/99-platformio-udev.rules
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# UDEV Rules for PlatformIO supported boards, http://platformio.org/#!/boards
+# UDEV Rules for PlatformIO supported boards, http://platformio.org/boards
 #
 # The latest version of this file may be found at:
 # 	https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules
diff --git a/scripts/docspregen.py b/scripts/docspregen.py
index 176e3308..a899fdbd 100644
--- a/scripts/docspregen.py
+++ b/scripts/docspregen.py
@@ -200,7 +200,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 """)
@@ -282,7 +282,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 """)