diff --git a/README.rst b/README.rst
index 82898d08..5dd3a18b 100644
--- a/README.rst
+++ b/README.rst
@@ -18,101 +18,104 @@ PlatformIO
     :alt:  License
 .. image:: https://img.shields.io/PlatformIO/Community.png
    :alt: Community Forums
-   :target: https://community.platformio.org
+   :target: https://community.platformio.org?utm_source=github&utm_medium=core
 .. image:: https://img.shields.io/PlatformIO/Plus.png?color=orange
    :alt: PlatformIO Plus: Professional solutions for an awesome open source PlatformIO ecosystem
-   :target: https://pioplus.com
+   :target: http://platformio.org/pricing?utm_source=github&utm_medium=core
 
-**Quick Links:** `Home Page <http://platformio.org>`_ |
-`PlatformIO Plus <https://pioplus.com>`_ |
-`PlatformIO IDE <http://platformio.org/platformio-ide>`_ |
+**Quick Links:** `Home Page <http://platformio.org?utm_source=github&utm_medium=core>`_ |
+`PlatformIO Plus <http://platformio.org/pricing?utm_source=github&utm_medium=core>`_ |
+`PlatformIO IDE <http://platformio.org/platformio-ide?utm_source=github&utm_medium=core>`_ |
 `Project Examples <https://github.com/platformio/platformio-examples/>`_ |
-`Docs <http://docs.platformio.org>`_ |
-`Donate <http://platformio.org/donate>`_ |
-`Contact Us <https://pioplus.com/contact.html>`_
+`Docs <http://docs.platformio.org?utm_source=github&utm_medium=core>`_ |
+`Donate <http://platformio.org/donate?utm_source=github&utm_medium=core>`_ |
+`Contact Us <http://platformio.org/contact?utm_source=github&utm_medium=core>`_
 
 **Social:** `Twitter <https://twitter.com/PlatformIO_Org>`_ |
 `Facebook <https://www.facebook.com/platformio>`_ |
 `Hackaday <https://hackaday.io/project/7980-platformio>`_ |
 `Bintray <https://bintray.com/platformio>`_ |
-`Community <https://community.platformio.org>`_
+`Community <https://community.platformio.org?utm_source=github&utm_medium=core>`_
 
 .. image:: https://raw.githubusercontent.com/platformio/platformio-web/develop/app/images/platformio-ide-laptop.png
-    :target: http://platformio.org
+    :target: http://platformio.org?utm_source=github&utm_medium=core
 
-`PlatformIO <http://platformio.org>`_ is an open source ecosystem for IoT
+`PlatformIO <http://platformio.org?utm_source=github&utm_medium=core>`_ is an open source ecosystem for IoT
 development. Cross-platform IDE and unified debugger. Remote unit testing and
 firmware updates.
 
 Get Started
 -----------
 
-* `What is PlatformIO? <http://docs.platformio.org/page/what-is-platformio.html>`_
+* `What is PlatformIO? <http://docs.platformio.org/en/latest/what-is-platformio.html?utm_source=github&utm_medium=core>`_
 
 Products
 --------
 
-* `PlatformIO IDE <http://platformio.org/platformio-ide>`_
-* `PlatformIO Core <http://docs.platformio.org/page/core.html>`_
-* `PIO Remote™ <http://docs.platformio.org/page/plus/pio-remote.html>`_
-* `PIO Unified Debugger <http://docs.platformio.org/page/plus/debugging.html>`_
-* `PIO Unit Testing <http://docs.platformio.org/page/plus/unit-testing.html>`_
-* `PIO Delivery™ <http://platformio.org/pricing#solution-pio-delivery>`_
-* `Cloud Builder <http://platformio.org/pricing#solution-cloud-builder>`_
+* `PlatformIO IDE <http://platformio.org/platformio-ide?utm_source=github&utm_medium=core>`_
+* `PlatformIO Core (CLI) <http://docs.platformio.org/en/latest/core.html?utm_source=github&utm_medium=core>`_
+* `PIO Remote™ <http://docs.platformio.org/en/latest/plus/pio-remote.html?utm_source=github&utm_medium=core>`_
+* `PIO Unified Debugger <http://docs.platformio.org/en/latest/plus/debugging.html?utm_source=github&utm_medium=core>`_
+* `PIO Unit Testing <http://docs.platformio.org/en/latest/plus/unit-testing.html?utm_source=github&utm_medium=core>`_
+* `PIO Delivery™ <http://platformio.org/pricing?utm_source=github&utm_medium=core#solution-pio-delivery>`_
+* `Cloud Builder <http://platformio.org/pricing?utm_source=github&utm_medium=core#solution-cloud-builder>`_
 
 Registry
 --------
 
-* `Libraries <http://platformio.org/lib>`_
-* `Development Platforms <http://platformio.org/platforms>`_
-* `Frameworks <http://platformio.org/frameworks>`_
-* `Embedded Boards <http://platformio.org/boards>`_
+* `Libraries <http://platformio.org/lib?utm_source=github&utm_medium=core>`_
+* `Development Platforms <http://platformio.org/platforms?utm_source=github&utm_medium=core>`_
+* `Frameworks <http://platformio.org/frameworks?utm_source=github&utm_medium=core>`_
+* `Embedded Boards <http://platformio.org/boards?utm_source=github&utm_medium=core>`_
 
 Solutions
 ---------
 
-* `Library Manager <http://docs.platformio.org/page/librarymanager/index.html>`_
-* `Cloud IDEs Integration <http://platformio.org/pricing#solution-cloud-ide>`_
-* `Standalone IDEs Integration <http://docs.platformio.org/page/ide.html#other-ide>`_
-* `Continuous Integration <http://docs.platformio.org/page/ci/index.html>`_
+* `Library Manager <http://docs.platformio.org/en/latest/librarymanager/index.html?utm_source=github&utm_medium=core>`_
+* `Cloud IDEs Integration <http://platformio.org/pricing?utm_source=github&utm_medium=core#solution-cloud-ide>`_
+* `Standalone IDEs Integration <http://docs.platformio.org/en/latest/ide.html?utm_source=github&utm_medium=core#other-ide>`_
+* `Continuous Integration <http://docs.platformio.org/en/latest/ci/index.html?utm_source=github&utm_medium=core>`_
 
 Development Platforms
 ---------------------
 
-* `Atmel AVR <http://platformio.org/platforms/atmelavr>`_
-* `Atmel SAM <http://platformio.org/platforms/atmelsam>`_
-* `Espressif 32 <http://platformio.org/platforms/espressif32>`_
-* `Espressif 8266 <http://platformio.org/platforms/espressif8266>`_
-* `Freescale Kinetis <http://platformio.org/platforms/freescalekinetis>`_
-* `Intel ARC32 <http://platformio.org/platforms/intel_arc32>`_
-* `Lattice iCE40 <http://platformio.org/platforms/lattice_ice40>`_
-* `Maxim 32 <http://platformio.org/platforms/maxim32>`_
-* `Microchip PIC32 <http://platformio.org/platforms/microchippic32>`_
-* `Nordic nRF51 <http://platformio.org/platforms/nordicnrf51>`_
-* `Nordic nRF52 <http://platformio.org/platforms/nordicnrf52>`_
-* `NXP LPC <http://platformio.org/platforms/nxplpc>`_
-* `Silicon Labs EFM32 <http://platformio.org/platforms/siliconlabsefm32>`_
-* `ST STM32 <http://platformio.org/platforms/ststm32>`_
-* `Teensy <http://platformio.org/platforms/teensy>`_
-* `TI MSP430 <http://platformio.org/platforms/timsp430>`_
-* `TI Tiva <http://platformio.org/platforms/titiva>`_
-* `WIZNet W7500 <http://platformio.org/platforms/wiznet7500>`_
+* `Atmel AVR <http://platformio.org/platforms/atmelavr?utm_source=github&utm_medium=core>`_
+* `Atmel SAM <http://platformio.org/platforms/atmelsam?utm_source=github&utm_medium=core>`_
+* `Espressif 32 <http://platformio.org/platforms/espressif32?utm_source=github&utm_medium=core>`_
+* `Espressif 8266 <http://platformio.org/platforms/espressif8266?utm_source=github&utm_medium=core>`_
+* `Freescale Kinetis <http://platformio.org/platforms/freescalekinetis?utm_source=github&utm_medium=core>`_
+* `Intel ARC32 <http://platformio.org/platforms/intel_arc32?utm_source=github&utm_medium=core>`_
+* `Lattice iCE40 <http://platformio.org/platforms/lattice_ice40?utm_source=github&utm_medium=core>`_
+* `Maxim 32 <http://platformio.org/platforms/maxim32?utm_source=github&utm_medium=core>`_
+* `Microchip PIC32 <http://platformio.org/platforms/microchippic32?utm_source=github&utm_medium=core>`_
+* `Nordic nRF51 <http://platformio.org/platforms/nordicnrf51?utm_source=github&utm_medium=core>`_
+* `Nordic nRF52 <http://platformio.org/platforms/nordicnrf52?utm_source=github&utm_medium=core>`_
+* `NXP LPC <http://platformio.org/platforms/nxplpc?utm_source=github&utm_medium=core>`_
+* `Silicon Labs EFM32 <http://platformio.org/platforms/siliconlabsefm32?utm_source=github&utm_medium=core>`_
+* `ST STM32 <http://platformio.org/platforms/ststm32?utm_source=github&utm_medium=core>`_
+* `Teensy <http://platformio.org/platforms/teensy?utm_source=github&utm_medium=core>`_
+* `TI MSP430 <http://platformio.org/platforms/timsp430?utm_source=github&utm_medium=core>`_
+* `TI Tiva <http://platformio.org/platforms/titiva?utm_source=github&utm_medium=core>`_
+* `WIZNet W7500 <http://platformio.org/platforms/wiznet7500?utm_source=github&utm_medium=core>`_
 
 Frameworks
 ----------
 
-* `Arduino <http://platformio.org/frameworks/arduino>`_
-* `ARTIK SDK <http://platformio.org/frameworks/artik-sdk>`_
-* `CMSIS <http://platformio.org/frameworks/cmsis>`_
-* `Energia <http://platformio.org/frameworks/energia>`_
-* `ESP-IDF <http://platformio.org/frameworks/espidf>`_
-* `libOpenCM3 <http://platformio.org/frameworks/libopencm3>`_
-* `mbed <http://platformio.org/frameworks/mbed>`_
-* `Pumbaa <http://platformio.org/frameworks/pumbaa>`_
-* `Simba <http://platformio.org/frameworks/simba>`_
-* `SPL <http://platformio.org/frameworks/spl>`_
-* `STM32Cube <http://platformio.org/frameworks/stm32cube>`_
-* `WiringPi <http://platformio.org/frameworks/wiringpi>`_
+* `Arduino <http://platformio.org/frameworks/arduino?utm_source=github&utm_medium=core>`_
+* `ARTIK SDK <http://platformio.org/frameworks/artik-sdk?utm_source=github&utm_medium=core>`_
+* `CMSIS <http://platformio.org/frameworks/cmsis?utm_source=github&utm_medium=core>`_
+* `Energia <http://platformio.org/frameworks/energia?utm_source=github&utm_medium=core>`_
+* `ESP-IDF <http://platformio.org/frameworks/espidf?utm_source=github&utm_medium=core>`_
+* `ESP8266 Non-OS SDK <http://platformio.org/frameworks/esp8266-nonos-sdk?utm_source=github&utm_medium=core>`_
+* `ESP8266 RTOS SDK <http://platformio.org/frameworks/esp8266-rtos-sdk?utm_source=github&utm_medium=core>`_
+* `libOpenCM3 <http://platformio.org/frameworks/libopencm3?utm_source=github&utm_medium=core>`_
+* `mbed <http://platformio.org/frameworks/mbed?utm_source=github&utm_medium=core>`_
+* `Pumbaa <http://platformio.org/frameworks/pumbaa?utm_source=github&utm_medium=core>`_
+* `Simba <http://platformio.org/frameworks/simba?utm_source=github&utm_medium=core>`_
+* `SPL <http://platformio.org/frameworks/spl?utm_source=github&utm_medium=core>`_
+* `STM32Cube <http://platformio.org/frameworks/stm32cube?utm_source=github&utm_medium=core>`_
+* `Tizen RT <http://platformio.org/frameworks/tizenrt?utm_source=github&utm_medium=core>`_
+* `WiringPi <http://platformio.org/frameworks/wiringpi?utm_source=github&utm_medium=core>`_
 
 Contributing
 ------------