diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index cba4eae4..5fc07043 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -3,11 +3,13 @@
 Platform ``atmelavr``
 =====================
 
-`Atmel AVR® 8- and 32-bit MCUs <http://www.atmel.com/products/microcontrollers/avr/default.aspx>`_
-deliver a unique combination of performance, power efficiency and design
-flexibility. Optimized to speed time to market—and easily adapt to new
-ones—they are based on the industry's most code-efficient architecture for
-C and assembly programming.
+Atmel AVR 8- and 32-bit MCUs deliver a unique combination of
+performance, power efficiency and design flexibility. Optimized to
+speed time to market-and easily adapt to new ones-they are based on
+the industrys most code-efficient architecture for C and assembly
+programming.
+
+http://www.atmel.com/products/microcontrollers/avr/default.aspx
 
 .. contents::
 
@@ -18,45 +20,25 @@ Packages
     :header-rows:  1
 
     * - Name
-      - Alias
       - Contents
-    * - ``toolchain-atmelavr``
-      - toolchain
-      - `avr-gcc <https://gcc.gnu.org/wiki/avr-gcc>`_,
-        `GDB <http://www.gnu.org/software/gdb/>`_,
-        `AVaRICE <http://avarice.sourceforge.net>`_,
-        `SimulAVR <http://www.nongnu.org/simulavr/>`_
-    * - ``tool-avrdude``
-      - uploader
-      - `AVRDUDE <http://www.nongnu.org/avrdude/>`_
-    * - ``tool-micronucleus``
-      - uploader
-      - `Micronucleus <https://github.com/micronucleus/micronucleus>`_
-    * - ``framework-arduinoavr``
-      -
-      - See below in :ref:`atmelavr_frameworks`
 
+    * - ``toolchain-atmelavr``
+      - `avr-gcc <https://gcc.gnu.org/wiki/avr-gcc>`_, `GDB <http://www.gnu.org/software/gdb/>`_, `AVaRICE <http://avarice.sourceforge.net/>`_, `SimulAVR <http://www.nongnu.org/simulavr/>`_
+
+    * - ``tool-avrdude``
+      - `AVRDUDE <http://www.nongnu.org/avrdude/>`_
+
+    * - ``framework-arduinoavr``
+      - `Arduino Wiring-based Framework (AVR Core, 1.6) <http://arduino.cc/en/Reference/HomePage>`_
+
+    * - ``tool-micronucleus``
+      - `Micronucleus <https://github.com/micronucleus/micronucleus>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
-.. _atmelavr_frameworks:
-
-Frameworks
-----------
-
-.. list-table::
-    :header-rows:  1
-
-    * - Type ``framework``
-      - Name
-      - Reference
-    * - ``arduino``
-      - Arduino Wiring-based Framework (AVR Core, 1.6)
-      - `Documentation <http://arduino.cc/en/Reference/HomePage>`_
-
 
 Boards
 ------
@@ -66,224 +48,6 @@ Boards
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
-Arduino
-~~~~~~~
-
-.. list-table::
-    :header-rows:  1
-
-    * - Type ``board``
-      - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
-      - Flash
-      - RAM
-    * - ``atmegangatmega168``
-      - `Arduino NG or older (ATmega168)
-        <http://arduino.cc/en/main/boards>`_
-      - ATmega168 ``atmega168``
-      - 16 MHz ``16000000L``
-      - 16 Kb
-      - 1 Kb
-    * - ``atmegangatmega8``
-      - `Arduino Arduino NG or older (ATmega8)
-        <http://arduino.cc/en/main/boards>`_
-      - ATmega8 ``atmega8``
-      - 16 MHz ``16000000L``
-      - 8 Kb
-      - 1 Kb
-    * - ``btatmega168``
-      - `Arduino BT (ATmega168)
-        <http://arduino.cc/en/main/boards>`_
-      - ATmega168 ``atmega168``
-      - 16 MHz ``16000000L``
-      - 16 Kb
-      - 1 Kb
-    * - ``btatmega328``
-      - `Arduino BT (ATmega328)
-        <http://arduino.cc/en/main/boards>`_
-      - ATmega328 ``atmega328``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2 Kb
-    * - ``diecimilaatmega168``
-      - `Arduino Diecimila or Duemilanove (ATmega168)
-        <http://arduino.cc/en/Main/ArduinoBoardDiecimila>`_
-      - ATmega168 ``atmega168``
-      - 16 MHz ``16000000L``
-      - 16 Kb
-      - 1 Kb
-    * - ``diecimilaatmega328``
-      - `Arduino Diecimila or Duemilanove (ATmega328)
-        <http://arduino.cc/en/Main/ArduinoBoardDiecimila>`_
-      - ATmega328 ``atmega328``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2 Kb
-    * - ``esplora``
-      - `Arduino Esplora <http://arduino.cc/en/Main/ArduinoBoardEsplora>`_
-      - ATmega32u4 ``atmega32u4``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2.5 Kb
-    * - ``ethernet``
-      - `Arduino Ethernet
-        <http://arduino.cc/en/Main/ArduinoBoardEthernet>`_
-      - ATmega328P ``atmega328p``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2 Kb
-    * - ``fio``
-      - `Arduino Fio
-        <http://arduino.cc/en/Main/ArduinoBoardFio>`_
-      - ATmega328P ``atmega328p``
-      - 8 MHz ``8000000L``
-      - 32 Kb
-      - 2 Kb
-    * - ``leonardo``
-      - `Arduino Leonardo <http://arduino.cc/en/Main/arduinoBoardLeonardo>`_
-      - ATmega32u4 ``atmega32u4``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2.5 Kb
-    * - ``LilyPadUSB``
-      - `Arduino LilyPad USB
-        <http://arduino.cc/en/Main/ArduinoBoardLilyPadUSB>`_
-      - ATmega32u4 ``atmega32u4``
-      - 8 MHz ``8000000L``
-      - 32 Kb
-      - 2.5 Kb
-    * - ``lilypadatmega168``
-      - `Arduino LilyPad (ATmega168)
-        <http://arduino.cc/en/Main/ArduinoBoardLilyPad>`_
-      - ATmega168 ``atmega168``
-      - 8 MHz ``8000000L``
-      - 16 Kb
-      - 1 Kb
-    * - ``lilypadatmega328``
-      - `Arduino LilyPad (ATmega328)
-        <http://arduino.cc/en/Main/ArduinoBoardLilyPad>`_
-      - ATmega328P ``atmega328p``
-      - 8 MHz ``8000000L``
-      - 32 Kb
-      - 2 Kb
-    * - ``megaADK``
-      - `Arduino Mega ADK
-        <http://arduino.cc/en/Main/ArduinoBoardMegaADK>`_
-      - ATmega2560 ``atmega2560``
-      - 16 MHz ``16000000L``
-      - 256 Kb
-      - 8 Kb
-    * - ``megaatmega1280``
-      - `Arduino Mega (ATmega1280)
-        <http://arduino.cc/en/Main/arduinoBoardMega>`_
-      - ATmega1280 ``atmega1280``
-      - 16 MHz ``16000000L``
-      - 128 Kb
-      - 8 Kb
-    * - ``megaatmega2560``
-      - `Arduino Mega (ATmega2560)
-        <http://arduino.cc/en/Main/arduinoBoardMega2560>`_
-      - ATmega2560 ``atmega2560``
-      - 16 MHz ``16000000L``
-      - 256 Kb
-      - 8 Kb
-    * - ``micro``
-      - `Arduino Micro
-        <http://arduino.cc/en/Main/ArduinoBoardMicro>`_
-      - ATmega32u4 ``atmega32u4``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2.5 Kb
-    * - ``miniatmega168``
-      - `Arduino Mini (ATmega168)
-        <http://arduino.cc/en/Main/ArduinoBoardMini>`_
-      - ATmega168 ``atmega168``
-      - 16 MHz ``16000000L``
-      - 16 Kb
-      - 1 Kb
-    * - ``miniatmega328``
-      - `Arduino Mini (ATmega328P)
-        <http://arduino.cc/en/Main/ArduinoBoardMini>`_
-      - ATmega328P ``atmega328p``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2 Kb
-    * - ``nanoatmega168``
-      - `Arduino Nano (ATmega168)
-        <http://arduino.cc/en/Main/ArduinoBoardNano>`_
-      - ATmega168 ``atmega168``
-      - 16 MHz ``16000000L``
-      - 16 Kb
-      - 1 Kb
-    * - ``nanoatmega328``
-      - `Arduino Nano (ATmega328P)
-        <http://arduino.cc/en/Main/ArduinoBoardNano>`_
-      - ATmega328P ``atmega328p``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2 Kb
-    * - ``pro8MHzatmega168``
-      - `Arduino Pro or Pro Mini (ATmega168, 3.3V)
-        <http://arduino.cc/en/Main/ArduinoBoardProMini>`_
-      - ATmega168 ``atmega168``
-      - 8 MHz ``8000000L``
-      - 16 Kb
-      - 1 Kb
-    * - ``pro16MHzatmega168``
-      - `Arduino Pro or Pro Mini (ATmega168, 5V)
-        <http://arduino.cc/en/Main/ArduinoBoardProMini>`_
-      - ATmega168 ``atmega168``
-      - 16 MHz ``16000000L``
-      - 16 Kb
-      - 1 Kb
-    * - ``pro8MHzatmega328``
-      - `Arduino Pro or Pro Mini (ATmega328P, 3.3V)
-        <http://arduino.cc/en/Main/ArduinoBoardProMini>`_
-      - ATmega328P ``atmega328p``
-      - 8 MHz ``8000000L``
-      - 32 Kb
-      - 2 Kb
-    * - ``pro16MHzatmega328``
-      - `Arduino Pro or Pro Mini (ATmega328P, 5V)
-        <http://arduino.cc/en/Main/ArduinoBoardProMini>`_
-      - ATmega328P ``atmega328p``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2 Kb
-    * - ``robotControl``
-      - `Arduino Robot Control
-        <http://arduino.cc/en/Main/Robot>`_
-      - ATmega32u4 ``atmega32u4``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2.5 Kb
-    * - ``robotMotor``
-      - `Arduino Robot Motor
-        <http://arduino.cc/en/Main/Robot>`_
-      - ATmega32u4 ``atmega32u4``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2.5 Kb
-    * - ``uno``
-      - `Arduino Uno
-        <http://arduino.cc/en/Main/ArduinoBoardUno>`_
-      - ATmega328P ``atmega328p``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2 Kb
-    * - ``yun``
-      - `Arduino Yun
-        <http://arduino.cc/en/Main/ArduinoBoardYun>`_
-      - ATmega32u4 ``atmega32u4``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2.5 Kb
-
-More detailed information you can find here
-`Arduino boards <http://arduino.cc/en/Main/Products>`_.
-
-
 Adafruit
 ~~~~~~~~
 
@@ -292,65 +56,311 @@ Adafruit
 
     * - Type ``board``
       - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
+      - Microcontroller
+      - Frequency
       - Flash
       - RAM
+
     * - ``flora8``
-      - `Adafruit Flora
-        <http://www.adafruit.com/product/659>`_
-      - ATmega32u4 ``atmega32u4``
-      - 8 MHz ``8000000L``
+      - `Adafruit Flora <http://www.adafruit.com/product/659>`_
+      - ATMEGA32U4
+      - 8 MHz
       - 32 Kb
       - 2.5 Kb
-    * - ``trinket3``
-      - `Adafruit Trinket 8MHz 3.3V LOGIC
-        <http://www.adafruit.com/products/1500>`_
-      - ATtiny85 ``attiny85``
-      - 8 MHz ``8000000L``
-      - 8 Kb
-      - 0.5 Kb
-    * - ``trinket5``
-      - `Adafruit Trinket 16MHz 5V LOGIC
-        <http://www.adafruit.com/products/1501>`_
-      - ATtiny85 ``ATtiny85``
-      - 16 MHz ``16000000L``
-      - 8 Kb
-      - 0.5 Kb
+      
+
     * - ``protrinket3``
-      - `Adafruit Pro Trinket 3V/12MHz (USB)
-        <http://www.adafruit.com/products/2010>`_
-      - ATmega328P ``atmega328p``
-      - 12 MHz ``12000000L``
+      - `Pro Trinket 3V/12MHz (USB) <http://www.adafruit.com/products/2010>`_
+      - ATMEGA328P
+      - 12 MHz
       - 32 Kb
       - 2 Kb
+      
+
     * - ``protrinket3ftdi``
-      - `Adafruit Pro Trinket 3V/12MHz (FTDI)
-        <http://www.adafruit.com/products/2010>`_
-      - ATmega328P ``atmega328p``
-      - 12 MHz ``12000000L``
+      - `Pro Trinket 3V/12MHz (FTDI) <http://www.adafruit.com/products/2010>`_
+      - ATMEGA328P
+      - 16 MHz
       - 32 Kb
       - 2 Kb
+      
+
     * - ``protrinket5``
-      - `Adafruit Pro Trinket 5V/16MHz (USB)
-        <http://www.adafruit.com/products/2000>`_
-      - ATmega328P ``atmega328p``
-      - 16 MHz ``16000000L``
+      - `Pro Trinket 5V/16MHz (USB) <http://www.adafruit.com/products/2000>`_
+      - ATMEGA328P
+      - 16 MHz
       - 32 Kb
       - 2 Kb
+      
+
     * - ``protrinket5ftdi``
-      - `Adafruit Pro Trinket 5V/16MHz (FTDI)
-        <http://www.adafruit.com/products/2000>`_
-      - ATmega328P ``atmega328p``
-      - 16 MHz ``16000000L``
+      - `Pro Trinket 5V/16MHz (USB) <http://www.adafruit.com/products/2000>`_
+      - ATMEGA328P
+      - 16 MHz
       - 32 Kb
       - 2 Kb
+      
 
-More detailed information you can find here
-`Adafruits boards <https://learn.adafruit.com/category/trinket>`_.
+    * - ``trinket3``
+      - `Adafruit Trinket 3V/8MHz <http://www.adafruit.com/products/1500>`_
+      - ATTINY85
+      - 8 MHz
+      - 8 Kb
+      - 0.5 Kb
+      
 
+    * - ``trinket5``
+      - `Adafruit Trinket 5V/16MHz <http://www.adafruit.com/products/1501>`_
+      - ATTINY85
+      - 16 MHz
+      - 8 Kb
+      - 0.5 Kb
+      
+Arduino
+~~~~~~~
 
-Digispark
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``LilyPadUSB``
+      - `LilyPad Arduino USB <http://arduino.cc/en/Main/ArduinoBoardLilyPadUSB>`_
+      - ATMEGA32U4
+      - 8 MHz
+      - 32 Kb
+      - 2.5 Kb
+      
+
+    * - ``atmegangatmega168``
+      - `Arduino NG or older ATmega168 <http://arduino.cc/en/main/boards>`_
+      - ATMEGA168
+      - 16 MHz
+      - 16 Kb
+      - 1 Kb
+      
+
+    * - ``atmegangatmega8``
+      - `Arduino NG or older ATmega8 <http://arduino.cc/en/main/boards>`_
+      - ATMEGA8
+      - 16 MHz
+      - 8 Kb
+      - 1 Kb
+      
+
+    * - ``btatmega168``
+      - `Arduino BT ATmega168 <http://arduino.cc/en/main/boards>`_
+      - ATMEGA168
+      - 16 MHz
+      - 16 Kb
+      - 1 Kb
+      
+
+    * - ``btatmega328``
+      - `Arduino BT ATmega328 <http://arduino.cc/en/main/boards>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+      
+
+    * - ``diecimilaatmega168``
+      - `Arduino Duemilanove or Diecimila ATmega168 <http://arduino.cc/en/Main/ArduinoBoardDiecimila>`_
+      - ATMEGA168
+      - 16 MHz
+      - 16 Kb
+      - 1 Kb
+      
+
+    * - ``diecimilaatmega328``
+      - `Arduino Duemilanove or Diecimila ATmega328 <http://arduino.cc/en/Main/ArduinoBoardDiecimila>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+      
+
+    * - ``esplora``
+      - `Arduino Esplora <http://arduino.cc/en/Main/ArduinoBoardEsplora>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+      
+
+    * - ``ethernet``
+      - `Arduino Ethernet <http://arduino.cc/en/Main/ArduinoBoardEthernet>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+      
+
+    * - ``fio``
+      - `Arduino Fio <http://arduino.cc/en/Main/ArduinoBoardFio>`_
+      - ATMEGA328P
+      - 8 MHz
+      - 32 Kb
+      - 2 Kb
+      
+
+    * - ``leonardo``
+      - `Arduino Leonardo <http://arduino.cc/en/Main/arduinoBoardLeonardo>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+      
+
+    * - ``lilypadatmega168``
+      - `LilyPad Arduino ATmega168 <http://arduino.cc/en/Main/ArduinoBoardLilyPad>`_
+      - ATMEGA168
+      - 8 MHz
+      - 16 Kb
+      - 1 Kb
+      
+
+    * - ``lilypadatmega328``
+      - `LilyPad Arduino ATmega328 <http://arduino.cc/en/Main/ArduinoBoardLilyPad>`_
+      - ATMEGA328P
+      - 8 MHz
+      - 32 Kb
+      - 2 Kb
+      
+
+    * - ``megaADK``
+      - `Arduino Mega ADK <http://arduino.cc/en/Main/ArduinoBoardMegaADK>`_
+      - ATMEGA2560
+      - 16 MHz
+      - 256 Kb
+      - 8 Kb
+      
+
+    * - ``megaatmega1280``
+      - `Arduino Mega or Mega 2560 ATmega1280 <http://arduino.cc/en/Main/arduinoBoardMega>`_
+      - ATMEGA1280
+      - 16 MHz
+      - 128 Kb
+      - 8 Kb
+      
+
+    * - ``megaatmega2560``
+      - `Arduino Mega or Mega 2560 ATmega2560 (Mega 2560) <http://arduino.cc/en/Main/arduinoBoardMega2560>`_
+      - ATMEGA2560
+      - 16 MHz
+      - 256 Kb
+      - 8 Kb
+      
+
+    * - ``micro``
+      - `Arduino Micro <http://arduino.cc/en/Main/ArduinoBoardMicro>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+      
+
+    * - ``miniatmega168``
+      - `Arduino Mini ATmega168 <http://arduino.cc/en/Main/ArduinoBoardMini>`_
+      - ATMEGA168
+      - 16 MHz
+      - 16 Kb
+      - 1 Kb
+      
+
+    * - ``miniatmega328``
+      - `Arduino Mini ATmega328 <http://arduino.cc/en/Main/ArduinoBoardMini>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+      
+
+    * - ``nanoatmega168``
+      - `Arduino Nano ATmega168 <http://arduino.cc/en/Main/ArduinoBoardNano>`_
+      - ATMEGA168
+      - 16 MHz
+      - 16 Kb
+      - 1 Kb
+      
+
+    * - ``nanoatmega328``
+      - `Arduino Nano ATmega328 <http://arduino.cc/en/Main/ArduinoBoardNano>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+      
+
+    * - ``pro16MHzatmega168``
+      - `Arduino Pro or Pro Mini ATmega168 (5V, 16 MHz) <http://arduino.cc/en/Main/ArduinoBoardProMini>`_
+      - ATMEGA168
+      - 16 MHz
+      - 16 Kb
+      - 1 Kb
+      
+
+    * - ``pro16MHzatmega328``
+      - `Arduino Pro or Pro Mini ATmega328 (5V, 16 MHz) <http://arduino.cc/en/Main/ArduinoBoardProMini>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+      
+
+    * - ``pro8MHzatmega168``
+      - `Arduino Pro or Pro Mini ATmega168 (3.3V, 8 MHz) <http://arduino.cc/en/Main/ArduinoBoardProMini>`_
+      - ATMEGA168
+      - 8 MHz
+      - 16 Kb
+      - 1 Kb
+      
+
+    * - ``pro8MHzatmega328``
+      - `Arduino Pro or Pro Mini ATmega328 (3.3V, 8 MHz) <http://arduino.cc/en/Main/ArduinoBoardProMini>`_
+      - ATMEGA328P
+      - 8 MHz
+      - 32 Kb
+      - 2 Kb
+      
+
+    * - ``robotControl``
+      - `Arduino Robot Control <http://arduino.cc/en/Main/Robot>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+      
+
+    * - ``robotMotor``
+      - `Arduino Robot Motor <http://arduino.cc/en/Main/Robot>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+      
+
+    * - ``uno``
+      - `Arduino Uno <http://arduino.cc/en/Main/ArduinoBoardUno>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+      
+
+    * - ``yun``
+      - `Arduino Yun <http://arduino.cc/en/Main/ArduinoBoardYun>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+      
+BitWizard
 ~~~~~~~~~
 
 .. list-table::
@@ -358,32 +368,62 @@ Digispark
 
     * - Type ``board``
       - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
+      - Microcontroller
+      - Frequency
       - Flash
       - RAM
-    * - ``digispark-tiny``
-      - `Digispark USB Development Board <http://digistump.com/products/1>`_
-      - ATtiny85 ``attiny85``
-      - 16 MHz ``16000000L``
-      - 8 Kb
-      - 0.5 Kb
+
+    * - ``raspduino``
+      - `Raspduino <http://www.bitwizard.nl/wiki/index.php/Raspduino>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+      
+Digistump
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
     * - ``digispark-pro``
-      - `Digispark Pro (Default 16 Mhz) <http://digistump.com/products/109>`_
-      - ATtiny167 ``attiny167``
-      - 16 MHz ``16000000L``
+      - `Digispark Pro (Default 16 MHz) <http://digistump.com/products/109>`_
+      - ATTINY167
+      - 16 MHz
       - 16 Kb
       - 0.5 Kb
+      
+
     * - ``digispark-pro32``
-      - `Digispark Pro (16 Mhz) (32 byte buffer) <http://digistump.com/products/109>`_
-      - ATtiny167 ``attiny167``
-      - 16 Mhz ``16000000L``
-      - 16 kb
-      - 0.5  Kb
+      - `Digispark Pro (16 MHz) (32 byte buffer) <http://digistump.com/products/109>`_
+      - ATTINY167
+      - 16 MHz
+      - 16 Kb
+      - 0.5 Kb
+      
 
-More detailed information you can find here
-`Digistump Development Boards <http://digistump.com/wiki/start>`_.
+    * - ``digispark-pro64``
+      - `Digispark Pro (16 MHz) (64 byte buffer) <http://digistump.com/products/109>`_
+      - ATTINY167
+      - 16 MHz
+      - 16 Kb
+      - 0.5 Kb
+      
 
+    * - ``digispark-tiny``
+      - `Digispark (Default - 16 MHz) <http://digistump.com/products/1>`_
+      - ATTINY85
+      - 16 MHz
+      - 8 Kb
+      - 0.5 Kb
+      
 Engduino
 ~~~~~~~~
 
@@ -392,33 +432,34 @@ Engduino
 
     * - Type ``board``
       - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
+      - Microcontroller
+      - Frequency
       - Flash
       - RAM
+
     * - ``engduinov1``
       - `Engduino 1 <http://www.engduino.org>`_
-      - ATmega32u4 ``atmega32u4``
-      - 8 MHz ``8000000L``
+      - ATMEGA32U4
+      - 8 MHz
       - 32 Kb
       - 2.5 Kb
+      
+
     * - ``engduinov2``
       - `Engduino 2 <http://www.engduino.org>`_
-      - ATmega32u4 ``atmega32u4``
-      - 8 MHz ``8000000L``
+      - ATMEGA32U4
+      - 8 MHz
       - 32 Kb
       - 2.5 Kb
+      
+
     * - ``engduinov3``
       - `Engduino 3 <http://www.engduino.org>`_
-      - ATmega32u4 ``atmega32u4``
-      - 8 MHz ``8000000L``
+      - ATMEGA32U4
+      - 8 MHz
       - 32 Kb
       - 2.5 Kb
-
-More detailed information you can find here
-`Engduino Site <http://www.engduino.org>`_.
-
-
+      
 Microduino
 ~~~~~~~~~~
 
@@ -427,98 +468,79 @@ Microduino
 
     * - Type ``board``
       - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
+      - Microcontroller
+      - Frequency
       - Flash
       - RAM
-    * - ``168pa8m``
-      - `Microduino Core (ATmega168P, 3.3V)
-        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
-      - ATmega168P ``atmega168p``
-      - 8 MHz ``8000000L``
-      - 16 Kb
-      - 1 Kb
-    * - ``168pa16m``
-      - `Microduino Core (ATmega168P, 5V)
-        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
-      - ATmega168P ``atmega168p``
-      - 16 MHz ``16000000L``
-      - 16 Kb
-      - 1 Kb
-    * - ``328p8m``
-      - `Microduino Core (ATmega328P, 3.3V)
-        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
-      - ATmega328P ``atmega328p``
-      - 8 MHz ``8000000L``
-      - 32 Kb
-      - 2 Kb
-    * - ``328p16m``
-      - `Microduino Core (ATmega328P, 5V)
-        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
-      - ATmega328P ``atmega328p``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2 Kb
-    * - ``644pa8m``
-      - `Microduino Core+ (ATmega644PA, 3.3V)
-        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
-      - ATmega644PA ``atmega644p``
-      - 8 MHz ``8000000L``
-      - 64 Kb
-      - 4 Kb
-    * - ``644pa16m``
-      - `Microduino Core+ (ATmega644PA, 5V)
-        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
-      - ATmega644PA ``atmega644p``
-      - 16 MHz ``16000000L``
-      - 64 Kb
-      - 4 Kb
-    * - ``1284p8m``
-      - `Microduino Core+ (Atmega1284P, 3.3V)
-        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
-      - Atmega1284P ``atmega1284p``
-      - 8 MHz ``8000000L``
-      - 128 Kb
-      - 16 Kb
+
     * - ``1284p16m``
-      - `Microduino Core+ (Atmega1284P, 5V)
-        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
-      - Atmega1284P ``atmega1284p``
-      - 16 MHz ``16000000L``
+      - `Microduino Core+ (ATmega1284P@16M,5V) <https://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
+      - ATMEGA1284P
+      - 16 MHz
       - 128 Kb
       - 16 Kb
+      
+
+    * - ``1284p8m``
+      - `Microduino Core+ (ATmega1284P@8M,3.3V) <https://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
+      - ATMEGA1284P
+      - 8 MHz
+      - 128 Kb
+      - 16 Kb
+      
+
+    * - ``168pa16m``
+      - `Microduino Core (Atmega168PA@16M,5V) <https://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
+      - ATMEGA168P
+      - 16 MHz
+      - 16 Kb
+      - 1 Kb
+      
+
+    * - ``168pa8m``
+      - `Microduino Core (Atmega168PA@8M,3.3V) <https://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
+      - ATMEGA168P
+      - 8 MHz
+      - 16 Kb
+      - 1 Kb
+      
+
+    * - ``328p16m``
+      - `Microduino Core (Atmega328P@16M,5V) <https://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+      
+
+    * - ``328p8m``
+      - `Microduino Core (Atmega328P@8M,3.3V) <https://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
+      - ATMEGA328P
+      - 8 MHz
+      - 32 Kb
+      - 2 Kb
+      
+
     * - ``32u416m``
-      - `Microduino-Core USB
-        <https://www.microduino.cc/wiki/index.php?title=Microduino-CoreUSB>`_
-      - ATmega32u4 ``atmega32u4``
-      - 16 MHz ``16000000L``
+      - `Microduino Core USB (ATmega32U4@16M,5V) <https://www.microduino.cc/wiki/index.php?title=Microduino-CoreUSB>`_
+      - ATMEGA32U4
+      - 16 MHz
       - 32 Kb
       - 2.5 Kb
+      
 
+    * - ``644pa16m``
+      - `Microduino Core+ (Atmega644PA@16M,5V) <https://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
+      - ATMEGA644P
+      - 16 MHz
+      - 64 Kb
+      - 4 Kb
+      
 
-More detailed information you can find here
-`Microduino boards <https://www.microduino.cc/wiki/index.php?title=Main_Page>`_.
-
-
-Raspduino
-~~~~~~~~~
-
-.. list-table::
-    :header-rows:  1
-
-    * - Type ``board``
-      - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
-      - Flash
-      - RAM
-    * - ``raspduino``
-      - `Raspduino
-        <http://www.bitwizard.nl/wiki/index.php/Raspduino>`_
-      - ATmega328P ``atmega328p``
-      - 16 MHz ``16000000L``
-      - 32 Kb
-      - 2 Kb
-
-More detailed information you can find here
-`Wiki <http://www.bitwizard.nl/wiki/index.php/Raspduino>`_.
+    * - ``644pa8m``
+      - `Microduino Core+ (Atmega644PA@8M,3.3V) <https://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
+      - ATMEGA644P
+      - 8 MHz
+      - 64 Kb
+      - 4 Kb
+      
\ No newline at end of file
diff --git a/docs/platforms/atmelsam.rst b/docs/platforms/atmelsam.rst
index 14363615..a5b70073 100644
--- a/docs/platforms/atmelsam.rst
+++ b/docs/platforms/atmelsam.rst
@@ -3,10 +3,11 @@
 Platform ``atmelsam``
 =====================
 
-`Atmel® | SMART <http://www.atmel.com/products/microcontrollers/arm/default.aspx>`_
-offers Flash- based ARM® products based on the ARM Cortex-®M0+, Cortex-M3 and
-Cortex-M4 architectures, ranging from 8KB to 2MB of Flash including a rich
-peripheral and feature mix.
+Atmel | SMART offers Flash- based ARM products based on the ARM
+Cortex-M0+, Cortex-M3 and Cortex-M4 architectures, ranging from 8KB
+to 2MB of Flash including a rich peripheral and feature mix.
+
+http://www.atmel.com/products/microcontrollers/arm/default.aspx
 
 .. contents::
 
@@ -17,40 +18,25 @@ Packages
     :header-rows:  1
 
     * - Name
-      - Alias
       - Contents
-    * - ``toolchain-gccarmnoneeabi``
-      - toolchain
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_,
-        `GDB <http://www.gnu.org/software/gdb/>`_
-    * - ``tool-bossac``
-      - uploader
-      - `BOSSA CLI <https://sourceforge.net/projects/b-o-s-s-a/>`_
-    * - ``framework-arduino``
-      -
-      - See below in :ref:`atmelsam_frameworks`
 
+    * - ``framework-arduinosam``
+      - `Arduino Wiring-based Framework (SAM Core, 1.6) <http://arduino.cc/en/Reference/HomePage>`_
+
+    * - ``ldscripts``
+      - `Linker Scripts <https://sourceware.org/binutils/docs/ld/Scripts.html>`_
+
+    * - ``toolchain-gccarmnoneeabi``
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
+
+    * - ``tool-bossac``
+      - `BOSSA CLI <https://sourceforge.net/projects/b-o-s-s-a/>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
-.. _atmelsam_frameworks:
-
-Frameworks
-----------
-
-.. list-table::
-    :header-rows:  1
-
-    * - Type ``framework``
-      - Name
-      - Reference
-    * - ``arduino``
-      - Arduino Wiring-based Framework (SAM Core, 1.6)
-      - `Documentation <http://arduino.cc/en/Reference/HomePage>`_
-
 
 Boards
 ------
@@ -60,45 +46,79 @@ Boards
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
+Arduino
+~~~~~~~
+
 .. list-table::
     :header-rows:  1
 
     * - Type ``board``
       - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
+      - Microcontroller
+      - Frequency
       - Flash
       - RAM
+
     * - ``due``
       - `Arduino Due (Programming Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
-      - at91sam3x8e ``cortex-m3``
-      - 84 MHz ``84000000L``
+      - AT91SAM3X8E
+      - 84 MHz
       - 512 Kb
       - 32 Kb
+      
+
     * - ``dueUSB``
       - `Arduino Due (USB Native Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
-      - at91sam3x8e ``cortex-m3``
-      - 84 MHz ``84000000L``
+      - AT91SAM3X8E
+      - 84 MHz
       - 512 Kb
       - 32 Kb
+      
+Digistump
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
     * - ``digix``
       - `Digistump DigiX <http://digistump.com/products/50>`_
-      - at91sam3x8e ``cortex-m3``
-      - 84 MHz ``84000000L``
-      - 512 kb
-      - 32 Kb
+      - AT91SAM3X8E
+      - 84 MHz
+      - 512 Kb
+      - 28 Kb
+      
+SainSmart
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
     * - ``sainSmartDue``
       - `SainSmart Due (Programming Port) <http://www.sainsmart.com/arduino/control-boards/sainsmart-due-atmel-sam3x8e-arm-cortex-m3-board-black.html>`_
-      - at91sam3x8e ``cortex-m3``
-      - 84 MHz ``84000000L``
+      - AT91SAM3X8E
+      - 84 MHz
       - 512 Kb
       - 32 Kb
+      
+
     * - ``sainSmartDueUSB``
       - `SainSmart Due (USB Native Port) <http://www.sainsmart.com/arduino/control-boards/sainsmart-due-atmel-sam3x8e-arm-cortex-m3-board-black.html>`_
-      - at91sam3x8e ``cortex-m3``
-      - 84 MHz ``84000000L``
+      - AT91SAM3X8E
+      - 84 MHz
       - 512 Kb
       - 32 Kb
-
-More detailed information you can find here
-`Atmel SMART ARM-based MCUs <http://www.atmel.com/products/microcontrollers/arm/default.aspx>`_.
+      
\ No newline at end of file
diff --git a/docs/platforms/freescalekinetis.rst b/docs/platforms/freescalekinetis.rst
index de5f7aa4..86d39276 100644
--- a/docs/platforms/freescalekinetis.rst
+++ b/docs/platforms/freescalekinetis.rst
@@ -3,7 +3,12 @@
 Platform ``freescalekinetis``
 =============================
 
-`Freescale Kinetis Microcontrollers <http://www.freescale.com/webapp/sps/site/homepage.jsp?code=KINETIS>`_ is family of multiple hardware- and software-compatible ARM® Cortex®-M0+, Cortex-M4 and Cortex-M7-based MCU series. Kinetis MCUs offer exceptional low-power performance, scalability and feature integration.
+Freescale Kinetis Microcontrollers is family of multiple hardware- and
+software-compatible ARM Cortex-M0+, Cortex-M4 and Cortex-M7-based MCU
+series. Kinetis MCUs offer exceptional low-power performance,
+scalability and feature integration.
+
+http://www.freescale.com/webapp/sps/site/homepage.jsp?code=KINETIS
 
 .. contents::
 
@@ -14,36 +19,19 @@ Packages
     :header-rows:  1
 
     * - Name
-      - Alias
       - Contents
-    * - ``toolchain-gccarmnoneeabi``
-      - toolchain
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_,
-        `GDB <http://www.gnu.org/software/gdb/>`_
+
     * - ``framework-mbed``
-      -
-      - See below in :ref:`freescalekinetis_frameworks`
+      - `mbed Framework <http://mbed.org>`_
+
+    * - ``toolchain-gccarmnoneeabi``
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
-.. _freescalekinetis_frameworks:
-
-Frameworks
-----------
-
-.. list-table::
-    :header-rows:  1
-
-    * - Type ``framework``
-      - Name
-      - Reference
-    * - ``mbed``
-      - MBED Framework
-      - `Documentation <http://mbed.org>`__
-
 
 Boards
 ------
@@ -53,52 +41,63 @@ Boards
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
+Freescale
+~~~~~~~~~
+
 .. list-table::
     :header-rows:  1
 
     * - Type ``board``
       - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
+      - Microcontroller
+      - Frequency
       - Flash
       - RAM
-    * - ``frdm_kl05z``
-      - `Freescale Kinetis FRDM-KL05Z <https://developer.mbed.org/platforms/FRDM-KL05Z/>`_
-      - MKL05Z32VFM4 ``cortex-m0plus``
-      - 48 MHz ``48000000L``
-      - 32 Kb
-      - 4 Kb
-    * - ``frdm_kl25z``
-      - `Freescale Kinetis FRDM-KL25Z <https://developer.mbed.org/platforms/KL25Z/>`_
-      - MKL25Z128VLK4 ``cortex-m0plus``
-      - 48 MHz ``48000000L``
-      - 128 Kb
-      - 16 Kb
-    * - ``frdm_kl46z``
-      - `Freescale Kinetis FRDM-KL46Z <https://developer.mbed.org/platforms/FRDM-KL46Z/>`_
-      - MKL46Z256Vll4 ``cortex-m0plus``
-      - 48 MHz ``48000000L``
-      - 256 Kb
-      - 32 Kb
-    * - ``frdm_k22f``
-      - `Freescale Kinetis FRDM-K22F <https://developer.mbed.org/platforms/FRDM-K22F/>`_
-      - MK22FN512VLH12 ``cortex-m4``
-      - 120 MHz ``120000000L``
-      - 512 Kb
-      - 128 Kb
-    * - ``frdm_k64f``
-      - `Freescale Kinetis FRDM-K64F <https://developer.mbed.org/platforms/FRDM-K64F/>`_
-      - MK64fN1M0VLL12 ``cortex-m4``
-      - 120 MHz ``120000000L``
-      - 1 Mb
-      - 256 Kb
+
     * - ``frdm_k20d50m``
       - `Freescale Kinetis FRDM-K20D50M <https://developer.mbed.org/platforms/FRDM-K20D50M/>`_
-      - MK20DX128VLH5 ``cortex-m4``
-      - 48 MHz ``48000000L``
+      - MK20DX128VLH5
+      - 48 MHz
       - 128 Kb
       - 16 Kb
+      
 
+    * - ``frdm_k22f``
+      - `Freescale Kinetis FRDM-K22F <https://developer.mbed.org/platforms/FRDM-K22F/>`_
+      - MK22FN512VLH12
+      - 120 MHz
+      - 512 Kb
+      - 128 Kb
+      
 
-More detailed information you can find here
-`Freescale Kinetis platforms with support MBED framework <https://developer.mbed.org/platforms/?tvend=4>`_.
+    * - ``frdm_k64f``
+      - `Freescale Kinetis FRDM-K64F <https://developer.mbed.org/platforms/FRDM-K64F/>`_
+      - MK64FN1M0VLL12
+      - 120 MHz
+      - 1024 Kb
+      - 256 Kb
+      
+
+    * - ``frdm_kl05z``
+      - `Freescale Kinetis FRDM-KL05Z <https://developer.mbed.org/platforms/FRDM-KL05Z/>`_
+      - MKL05Z32VFM4
+      - 48 MHz
+      - 32 Kb
+      - 4 Kb
+      
+
+    * - ``frdm_kl25z``
+      - `Freescale Kinetis FRDM-KL25Z <https://developer.mbed.org/platforms/KL25Z/>`_
+      - MKL25Z128VLK4
+      - 48 MHz
+      - 128 Kb
+      - 16 Kb
+      
+
+    * - ``frdm_kl46z``
+      - `Freescale Kinetis FRDM-KL46Z <https://developer.mbed.org/platforms/FRDM-KL46Z/>`_
+      - MKL46Z256VLL4
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+      
\ No newline at end of file
diff --git a/docs/platforms/nordicnrf51.rst b/docs/platforms/nordicnrf51.rst
index 6241ee64..ff58ddd2 100644
--- a/docs/platforms/nordicnrf51.rst
+++ b/docs/platforms/nordicnrf51.rst
@@ -3,7 +3,14 @@
 Platform ``nordicnrf51``
 ========================
 
-`The Nordic nRF51 Series <https://www.nordicsemi.com/eng/Products/nRF51-Series-SoC>`_ is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
+The Nordic nRF51 Series is a family of highly flexible,
+multi-protocol, system-on-chip (SoC) devices for ultra-low power
+wireless applications. nRF51 Series devices support a range of
+protocol stacks including Bluetooth Smart (previously called
+Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as
+Gazell.
+
+https://www.nordicsemi.com/eng/Products/nRF51-Series-SoC
 
 .. contents::
 
@@ -14,36 +21,19 @@ Packages
     :header-rows:  1
 
     * - Name
-      - Alias
       - Contents
-    * - ``toolchain-gccarmnoneeabi``
-      - toolchain
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_,
-        `GDB <http://www.gnu.org/software/gdb/>`_
+
     * - ``framework-mbed``
-      -
-      - See below in :ref:`nordicnrf51_frameworks`
+      - `mbed Framework <http://mbed.org>`_
+
+    * - ``toolchain-gccarmnoneeabi``
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
-.. _nordicnrf51_frameworks:
-
-Frameworks
-----------
-
-.. list-table::
-    :header-rows:  1
-
-    * - Type ``framework``
-      - Name
-      - Reference
-    * - ``mbed``
-      - MBED Framework
-      - `Documentation <http://mbed.org>`__
-
 
 Boards
 ------
@@ -53,58 +43,107 @@ Boards
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
+JKSoft
+~~~~~~
+
 .. list-table::
     :header-rows:  1
 
     * - Type ``board``
       - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
+      - Microcontroller
+      - Frequency
       - Flash
       - RAM
-    * - ``nrf51_mkit``
-      - `Nordic nRF51822-mKIT <http://developer.mbed.org/platforms/Nordic-nRF51822/>`_
-      - nrf51822 ``cortex-m0``
-      - 16 MHz ``16000000L``
-      - 128 Kb
-      - 16 Kb
-    * - ``nrf51_dongle``
-      - `Nordic nRF51-Dongle <https://developer.mbed.org/platforms/Nordic-nRF51-Dongle/>`_
-      - nrf51822/nrf51422 ``cortex-m0``
-      - 32 MHz ``32000000L``
-      - 256 Kb
-      - 16 Kb
-    * - ``nrf51_dk``
-      - `Nordic nRF51-DK <https://developer.mbed.org/platforms/Nordic-nRF51-DK/>`_
-      - nrf51822/nrf51422 ``cortex-m0``
-      - 32 MHz ``32000000L``
-      - 256 Kb
-      - 16 Kb
-    * - ``redBearLab``
-      - `RedBearLab nRF51822 <https://developer.mbed.org/platforms/RedBearLab-nRF51822/>`_
-      - nrf51822 ``cortex-m0``
-      - 16 MHz ``16000000L``
-      - 256 Kb
-      - 16 Kb
-    * - ``redBearLabBLENano``
-      - `RedBearLab BLE Nano <https://developer.mbed.org/platforms/RedBearLab-BLE-Nano/>`_
-      - nrf51822 ``cortex-m0``
-      - 16 MHz ``16000000L``
-      - 256 Kb
-      - 16 Kb
+
     * - ``wallBotBLE``
       - `JKSoft Wallbot BLE <https://developer.mbed.org/platforms/JKSoft-Wallbot-BLE/>`_
-      - nrf51822 ``cortex-m0``
-      - 16 MHz ``16000000L``
+      - NRF51822
+      - 16 MHz
       - 128 Kb
       - 16 Kb
+      
+Nordic
+~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``nrf51_dk``
+      - `Nordic nRF51-DK <https://developer.mbed.org/platforms/Nordic-nRF51-DK/>`_
+      - NRF51822
+      - 32 MHz
+      - 256 Kb
+      - 32 Kb
+      
+
+    * - ``nrf51_dongle``
+      - `Nordic nRF51-Dongle <https://developer.mbed.org/platforms/Nordic-nRF51-Dongle/>`_
+      - NRF51822
+      - 32 MHz
+      - 256 Kb
+      - 32 Kb
+      
+
+    * - ``nrf51_mkit``
+      - `Nordic nRF51822-mKIT <http://developer.mbed.org/platforms/Nordic-nRF51822/>`_
+      - NRF51822
+      - 16 MHz
+      - 128 Kb
+      - 16 Kb
+      
+RedBearLab
+~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``redBearLab``
+      - `RedBearLab nRF51822 <https://developer.mbed.org/platforms/RedBearLab-nRF51822/>`_
+      - NRF51822
+      - 16 MHz
+      - 256 Kb
+      - 16 Kb
+      
+
+    * - ``redBearLabBLENano``
+      - `RedBearLab BLE Nano <https://developer.mbed.org/platforms/RedBearLab-BLE-Nano/>`_
+      - NRF51822
+      - 16 MHz
+      - 256 Kb
+      - 16 Kb
+      
+Switch Science
+~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
     * - ``hrm1017``
       - `Switch Science mbed HRM1017 <https://developer.mbed.org/platforms/mbed-HRM1017/>`_
-      - nrf51822 ``cortex-m0``
-      - 16 MHz ``16000000L``
-      - 128 Kb
+      - NRF51822
+      - 16 MHz
+      - 256 Kb
       - 16 Kb
-
-
-More detailed information you can find here
-`nRF51 platforms with support MBED framework <http://developer.mbed.org/platforms/?tvend=11>`_.
+      
\ No newline at end of file
diff --git a/docs/platforms/nxplpc.rst b/docs/platforms/nxplpc.rst
index d8dcff37..9ddaf80e 100644
--- a/docs/platforms/nxplpc.rst
+++ b/docs/platforms/nxplpc.rst
@@ -3,7 +3,14 @@
 Platform ``nxplpc``
 ===================
 
-`The NXP LPC <http://www.nxp.com/products/microcontrollers/>`_ is a family of 32-bit microcontroller integrated circuits by NXP Semiconductors. The LPC chips are grouped into related series that are based around the same 32-bit ARM processor core, such as the Cortex-M4F, Cortex-M3, Cortex-M0+, or Cortex-M0. Internally, each microcontroller consists of the processor core, static RAM memory, flash memory, debugging interface, and various peripherals.
+The NXP LPC is a family of 32-bit microcontroller integrated circuits
+by NXP Semiconductors. The LPC chips are grouped into related series
+that are based around the same 32-bit ARM processor core, such as the
+Cortex-M4F, Cortex-M3, Cortex-M0+, or Cortex-M0. Internally, each
+microcontroller consists of the processor core, static RAM memory,
+flash memory, debugging interface, and various peripherals.
+
+http://www.nxp.com/products/microcontrollers/
 
 .. contents::
 
@@ -14,36 +21,19 @@ Packages
     :header-rows:  1
 
     * - Name
-      - Alias
       - Contents
-    * - ``toolchain-gccarmnoneeabi``
-      - toolchain
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_,
-        `GDB <http://www.gnu.org/software/gdb/>`_
+
     * - ``framework-mbed``
-      -
-      - See below in :ref:`nxplpc_frameworks`
+      - `mbed Framework <http://mbed.org>`_
+
+    * - ``toolchain-gccarmnoneeabi``
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
-.. _nxplpc_frameworks:
-
-Frameworks
-----------
-
-.. list-table::
-    :header-rows:  1
-
-    * - Type ``framework``
-      - Name
-      - Reference
-    * - ``mbed``
-      - MBED Framework
-      - `Documentation <http://mbed.org>`__
-
 
 Boards
 ------
@@ -53,94 +43,215 @@ Boards
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
+CQ Publishing
+~~~~~~~~~~~~~
+
 .. list-table::
     :header-rows:  1
 
     * - Type ``board``
       - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
+      - Microcontroller
+      - Frequency
       - Flash
       - RAM
-    * - ``lpc1549``
-      - `LPCXpresso1549 <https://developer.mbed.org/platforms/LPCXpresso1549/>`_
-      - LPC1549 ``cortex-m3``
-      - 72 MHz ``72000000L``
-      - 256 Kb
-      - 36 Kb
-    * - ``lpc1768``
-      - `mbed LPC1768 <http://developer.mbed.org/platforms/mbed-LPC1768/>`_
-      - LPC1768 ``cortex-m3``
-      - 96 MHz ``96000000L``
-      - 512 Kb
-      - 32 Kb
-    * - ``seeeduinoArchPro``
-      - `Seeeduino-Arch-Pro <https://developer.mbed.org/platforms/Seeeduino-Arch-Pro/>`_
-      - LPC1768 ``cortex-m3``
-      - 96 MHz ``96000000L``
-      - 512 Kb
-      - 32 Kb
-    * - ``ubloxc027``
-      - `U-blox C027 <https://developer.mbed.org/platforms/u-blox-C027/>`_
-      - LPC1768 ``cortex-m3``
-      - 96 MHz ``96000000L``
-      - 512 Kb
-      - 32 Kb
-    * - ``lpc1114fn28``
-      - `mbed LPC1114FN28 <https://developer.mbed.org/platforms/LPC1114FN28/>`_
-      - LPC1114FN28 ``cortex-m0``
-      - 48 MHz ``48000000L``
-      - 32 Kb
-      - 4 Kb
-    * - ``lpc11u24``
-      - `mbed LPC11U24 <https://developer.mbed.org/platforms/mbed-LPC11U24/>`_
-      - LPC11U24 ``cortex-m0``
-      - 48 MHz ``48000000L``
-      - 32 Kb
-      - 8 Kb
-    * - ``dipcortexm0``
-      - `DipCortex M0 <https://developer.mbed.org/platforms/DipCortex-M0/>`_
-      - LPC11U24 ``cortex-m0``
-      - 50 MHz ``50000000L``
-      - 32 Kb
-      - 8 Kb
-    * - ``blueboard_lpc11u24``
-      - `BlueBoard-LPC11U24 <https://developer.mbed.org/platforms/BlueBoard-LPC11U24/>`_
-      - LPC11U24 ``cortex-m0``
-      - 48 MHz ``48000000L``
-      - 32 Kb
-      - 8 Kb
-    * - ``mbuino``
-      - `Outrageous Circuits mBuino <https://developer.mbed.org/platforms/Outrageous-Circuits-mBuino/>`_
-      - LPC11U24 ``cortex-m0``
-      - 50 MHz ``50000000L``
-      - 32 Kb
-      - 8 Kb
+
+    * - ``lpc11u35_501``
+      - `TG-LPC11U35-501 <https://developer.mbed.org/platforms/TG-LPC11U35-501/>`_
+      - LPC11U35
+      - 48 MHz
+      - 64 Kb
+      - 10 Kb
+      
+Embedded Artists
+~~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
     * - ``lpc11u35``
       - `EA LPC11U35 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC11U35/>`_
-      - LPC11U35 ``cortex-m0``
-      - 48 MHz ``48000000L``
-      - 64 Kb
-      - 10 Kb
-    * - ``lpc11u35_501``
-      - `TG-LPC11U35-501 QuickStart Board <https://developer.mbed.org/platforms/TG-LPC11U35-501/>`_
-      - LPC11U35 ``cortex-m0``
-      - 48 MHz ``48000000L``
+      - LPC11U35
+      - 48 MHz
       - 64 Kb
       - 10 Kb
+      
+
     * - ``lpc4088``
       - `EA LPC4088 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC4088/>`_
-      - LPC4088 ``cortex-m4``
-      - 120 MHz ``120000000L``
+      - LPC4088
+      - 120 MHz
       - 512 Kb
       - 96 Kb
+      
+
     * - ``lpc4088_dm``
       - `EA LPC4088 Display Module <https://developer.mbed.org/platforms/EA-LPC4088-Display-Module/>`_
-      - LPC4088 ``cortex-m4``
-      - 120 MHz ``120000000L``
+      - LPC4088
+      - 120 MHz
       - 512 Kb
       - 96 Kb
+      
+NGX Technologies
+~~~~~~~~~~~~~~~~
 
+.. list-table::
+    :header-rows:  1
 
-More detailed information you can find here
-`NXP platforms with support MBED framework <http://developer.mbed.org/platforms/?tvend=3>`_.
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``blueboard_lpc11u24``
+      - `BlueBoard-LPC11U24 <https://developer.mbed.org/platforms/BlueBoard-LPC11U24/>`_
+      - LPC11U24
+      - 48 MHz
+      - 32 Kb
+      - 8 Kb
+      
+NXP
+~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``lpc11u24``
+      - `mbed LPC11U24 <https://developer.mbed.org/platforms/mbed-LPC11U24/>`_
+      - LPC11U24
+      - 48 MHz
+      - 32 Kb
+      - 8 Kb
+      
+
+    * - ``lpc1549``
+      - `LPCXpresso1549 <https://developer.mbed.org/platforms/LPCXpresso1549/>`_
+      - LPC1549
+      - 72 MHz
+      - 256 Kb
+      - 36 Kb
+      
+
+    * - ``lpc1768``
+      - `mbed LPC1768 <http://developer.mbed.org/platforms/mbed-LPC1768/>`_
+      - LPC1768
+      - 96 MHz
+      - 512 Kb
+      - 32 Kb
+      
+Outrageous Circuits
+~~~~~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``mbuino``
+      - `Outrageous Circuits mBuino <https://developer.mbed.org/platforms/Outrageous-Circuits-mBuino/>`_
+      - LPC11U24
+      - 48 MHz
+      - 32 Kb
+      - 8 Kb
+      
+SeeedStudio
+~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``seeeduinoArchPro``
+      - `Seeeduino-Arch-Pro <https://developer.mbed.org/platforms/Seeeduino-Arch-Pro/>`_
+      - LPC1768
+      - 96 MHz
+      - 512 Kb
+      - 32 Kb
+      
+Solder Splash Labs
+~~~~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``dipcortexm0``
+      - `DipCortex M0 <https://developer.mbed.org/platforms/DipCortex-M0/>`_
+      - LPC11U24
+      - 50 MHz
+      - 32 Kb
+      - 8 Kb
+      
+Switch Science
+~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``lpc1114fn28``
+      - `mbed LPC1114FN28 <https://developer.mbed.org/platforms/LPC1114FN28/>`_
+      - LPC1114FN28
+      - 48 MHz
+      - 32 Kb
+      - 4 Kb
+      
+u-blox
+~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``ubloxc027``
+      - `u-blox C027 <https://developer.mbed.org/platforms/u-blox-C027/>`_
+      - LPC1768
+      - 96 MHz
+      - 512 Kb
+      - 32 Kb
+      
\ No newline at end of file
diff --git a/docs/platforms/ststm32.rst b/docs/platforms/ststm32.rst
index 4f024041..20717388 100644
--- a/docs/platforms/ststm32.rst
+++ b/docs/platforms/ststm32.rst
@@ -3,9 +3,14 @@
 Platform ``ststm32``
 ====================
 
-`The STM32 family of 32-bit Flash MCUs <http://www.st.com/web/en/catalog/mmc/FM141/SC1169?sc=stm32>`_ based on the ARM® Cortex®-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
+The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M
+processor is designed to offer new degrees of freedom to MCU users.
+It offers a 32-bit product range that combines very high performance,
+real-time capabilities, digital signal processing, and low-power,
+low-voltage operation, while maintaining full integration and ease of
+development.
 
-The unparalleled and large range of STM32 devices, based on an industry-standard core and accompanied by a vast choice of tools and software, makes this family of products the ideal choice, both for small projects and for entire platform decisions.
+http://www.st.com/web/en/catalog/mmc/FM141/SC1169?sc=stm32
 
 .. contents::
 
@@ -16,57 +21,34 @@ Packages
     :header-rows:  1
 
     * - Name
-      - Alias
       - Contents
+
     * - ``toolchain-gccarmnoneeabi``
-      - toolchain
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_,
-        `GDB <http://www.gnu.org/software/gdb/>`_
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
+
     * - ``tool-stlink``
-      - uploader
-      - `STLink <https://github.com/texane/stlink>`_
-    * - ``framework-cmsis``
-      -
-      - See below in :ref:`ststm32_frameworks`
+      - `ST-Link <https://github.com/texane/stlink>`_
+
     * - ``framework-spl``
-      -
-      - See below in :ref:`ststm32_frameworks`
-    * - ``framework-opencm3``
-      -
-      - See below in :ref:`ststm32_frameworks`
+      - `Standard Peripheral Library for STM32 MCUs <http://www.st.com/web/catalog/tools/FM147/CL1794/SC961/SS1743/PF257890>`_
+
+    * - ``framework-cmsis``
+      - `Vendor-independent hardware abstraction layer for the Cortex-M processor series <http://www.arm.com/products/processors/cortex-m/cortex-microcontroller-software-interface-standard.php>`_
+
     * - ``framework-mbed``
-      -
-      - See below in :ref:`ststm32_frameworks`
+      - `mbed Framework <http://mbed.org>`_
+
+    * - ``framework-opencm3``
+      - `libOpenCM3 Framework <http://www.libopencm3.org/>`_
+
+    * - ``ldscripts``
+      - `Linker Scripts <https://sourceware.org/binutils/docs/ld/Scripts.html>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
-.. _ststm32_frameworks:
-
-Frameworks
-----------
-
-.. list-table::
-    :header-rows:  1
-
-    * - Type ``framework``
-      - Name
-      - Reference
-    * - ``cmsis``
-      - Vendor-independent hardware abstraction layer for the Cortex-M processor series
-      - `Documentation <http://www.arm.com/products/processors/cortex-m/cortex-microcontroller-software-interface-standard.php>`__
-    * - ``spl``
-      - Standard Peripheral Library for ST STM32 MCUs
-      - `Documentation <http://www.st.com/web/catalog/tools/FM147/CL1794/SC961/SS1743/PF257890>`__
-    * - ``opencm3``
-      - libOpenCM3 Framework
-      - `Documentation <http://www.libopencm3.org>`__
-    * - ``mbed``
-      - MBED Framework
-      - `Documentation <http://mbed.org>`__
-
 
 Boards
 ------
@@ -76,149 +58,167 @@ Boards
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
+ST
+~~
+
 .. list-table::
     :header-rows:  1
 
     * - Type ``board``
       - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
+      - Microcontroller
+      - Frequency
       - Flash
       - RAM
-    * - ``disco_l152rb``
-      - `STM32LDISCOVERY
-        <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515>`_
-      - STM32L152rbt6 ``cortex-m3``
-      - 32 MHz ``32000000L``
+
+    * - ``disco_f051r8``
+      - `STM32F0DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF253215>`_
+      - STM32F051R8T6
+      - 48 MHz
+      - 64 Kb
+      - 8 Kb
+      
+
+    * - ``disco_f100rb``
+      - `STM32VLDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF250863>`_
+      - STM32F100RBT6
+      - 24 MHz
       - 128 Kb
-      - 16 Kb
+      - 8 Kb
+      
+
     * - ``disco_f303vc``
-      - `STM32F3DISCOVERY
-        <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044>`_
-      - STM32F303vct6 ``cortex-m4``
-      - 72 MHz ``72000000L``
+      - `STM32F3DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044>`_
+      - STM32F303VCT6
+      - 72 MHz
       - 256 Kb
       - 48 Kb
-    * - ``disco_f407vg``
-      - `STM32F4DISCOVERY
-        <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419>`_
-      - STM32F407vgt6 ``cortex-m4``
-      - 168 Mhz ``168000000L``
-      - 1 Mb
-      - 192 Kb
-    * - ``disco_f100rb``
-      - `STM32VLDISCOVERY
-        <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF250863>`_
-      - STM32F100rbt6 ``cortex-m3``
-      - 24 Mhz ``24000000L``
-      - 128 Kb
-      - 8 Kb
-    * - ``disco_f051r8``
-      - `STM32F0DISCOVERY
-        <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF253215>`_
-      - STM32F051r8t6 ``cortex-m0``
-      - 48 Mhz ``48000000L``
-      - 64 Kb
-      - 8 Kb
+      
+
     * - ``disco_f334c8``
-      - `32F3348DISCOVERY
-        <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF260318>`_
-      - STM32F334c8t6 ``cortex-m4``
-      - 72 Mhz ``72000000L``
+      - `32F3348DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF260318>`_
+      - STM32F334C8T6
+      - 72 MHz
       - 64 Kb
       - 16 Kb
+      
+
     * - ``disco_f401vc``
-      - `32F401CDISCOVERY
-        <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259098>`_
-      - STM32F401vct6 ``cortex-m4``
-      - 84 Mhz ``84000000L``
+      - `32F401CDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259098>`_
+      - STM32F401VCT6
+      - 84 MHz
       - 256 Kb
       - 64 Kb
+      
+
+    * - ``disco_f407vg``
+      - `STM32F4DISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419>`_
+      - STM32F407VGT6
+      - 168 MHz
+      - 1024 Kb
+      - 128 Kb
+      
+
     * - ``disco_f429zi``
-      - `32F429IDISCOVERY
-        <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259090>`_
-      - STM32F429zit6 ``cortex-m4``
-      - 180 Mhz ``180000000L``
-      - 2 Mb
+      - `32F429IDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259090>`_
+      - STM32F429ZIT6
+      - 180 MHz
+      - 2048 Kb
       - 256 Kb
+      
+
+    * - ``disco_l152rb``
+      - `STM32LDISCOVERY <http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515>`_
+      - STM32L152RBT6
+      - 32 MHz
+      - 128 Kb
+      - 16 Kb
+      
+
     * - ``nucleo_f030r8``
-      - `ST Nucleo F030R8
-        <https://developer.mbed.org/platforms/ST-Nucleo-F030R8/>`_
-      - STM32F030r8t6 ``cortex-m0``
-      - 48 Mhz ``48000000L``
+      - `ST Nucleo F030R8 <https://developer.mbed.org/platforms/ST-Nucleo-F030R8/>`_
+      - STM32F030R8T6
+      - 48 MHz
       - 64 Kb
       - 8 Kb
+      
+
     * - ``nucleo_f070rb``
-      - `ST Nucleo F070RB
-        <https://developer.mbed.org/platforms/ST-Nucleo-F070RB/>`_
-      - STM32F070rbt6 ``cortex-m0``
-      - 48 Mhz ``48000000L``
+      - `ST Nucleo F070RB <https://developer.mbed.org/platforms/ST-Nucleo-F070RB/>`_
+      - STM32F070RBT6
+      - 48 MHz
       - 128 Kb
       - 16 Kb
+      
+
     * - ``nucleo_f072rb``
-      - `ST Nucleo F072RB
-        <https://developer.mbed.org/platforms/ST-Nucleo-F072RB/>`_
-      - STM32F072rbt6 ``cortex-m0``
-      - 48 Mhz ``48000000L``
+      - `ST Nucleo F072RB <https://developer.mbed.org/platforms/ST-Nucleo-F072RB/>`_
+      - STM32F072RBT6
+      - 48 MHz
       - 128 Kb
       - 16 Kb
+      
+
     * - ``nucleo_f091rc``
-      - `ST Nucleo F091RC
-        <https://developer.mbed.org/platforms/ST-Nucleo-F091RC/>`_
-      - STM32F091rct6 ``cortex-m0``
-      - 48 Mhz ``48000000L``
+      - `ST Nucleo F091RC <https://developer.mbed.org/platforms/ST-Nucleo-F091RC/>`_
+      - STM32F091RCT6
+      - 48 MHz
       - 256 Kb
       - 32 Kb
+      
+
     * - ``nucleo_f103rb``
-      - `ST Nucleo F103RB
-        <https://developer.mbed.org/platforms/ST-Nucleo-F103RB/>`_
-      - STM32F103rbt6 ``cortex-m3``
-      - 72 Mhz ``72000000L``
+      - `ST Nucleo F103RB <https://developer.mbed.org/platforms/ST-Nucleo-F103RB/>`_
+      - STM32F103RBT6
+      - 72 MHz
       - 128 Kb
       - 20 Kb
+      
+
     * - ``nucleo_f302r8``
-      - `ST Nucleo F302R8
-        <https://developer.mbed.org/platforms/ST-Nucleo-F302R8/>`_
-      - STM32F302r8t6 ``cortex-m4``
-      - 72 Mhz ``72000000L``
+      - `ST Nucleo F302R8 <https://developer.mbed.org/platforms/ST-Nucleo-F302R8/>`_
+      - STM32F302R8T6
+      - 72 MHz
       - 64 Kb
       - 16 Kb
+      
+
     * - ``nucleo_f334r8``
-      - `ST Nucleo F334R8
-        <https://developer.mbed.org/platforms/ST-Nucleo-F334R8/>`_
-      - STM32F334r8t6 ``cortex-m4``
-      - 72 Mhz ``72000000L``
+      - `ST Nucleo F334R8 <https://developer.mbed.org/platforms/ST-Nucleo-F334R8/>`_
+      - STM32F334R8T6
+      - 72 MHz
       - 64 Kb
       - 16 Kb
+      
+
     * - ``nucleo_f401re``
-      - `ST Nucleo F401RE
-        <https://developer.mbed.org/platforms/ST-Nucleo-F401RE/>`_
-      - STM32F401ret6 ``cortex-m4``
-      - 84 Mhz ``84000000L``
+      - `ST Nucleo F401RE <https://developer.mbed.org/platforms/ST-Nucleo-F401RE/>`_
+      - STM32F401RET6
+      - 84 MHz
       - 512 Kb
       - 96 Kb
+      
+
     * - ``nucleo_f411re``
-      - `ST Nucleo F411RE
-        <https://developer.mbed.org/platforms/ST-Nucleo-F411RE/>`_
-      - STM32F411ret6 ``cortex-m4``
-      - 100 Mhz ``100000000L``
+      - `ST Nucleo F411RE <https://developer.mbed.org/platforms/ST-Nucleo-F411RE/>`_
+      - STM32F411RET6
+      - 100 MHz
       - 512 Kb
       - 128 Kb
+      
+
     * - ``nucleo_l053r8``
-      - `ST Nucleo L053R8
-        <https://developer.mbed.org/platforms/ST-Nucleo-L053R8/>`_
-      - STM32L053r8t6 ``cortex-m0``
-      - 48 Mhz ``48000000L``
+      - `ST Nucleo L053R8 <https://developer.mbed.org/platforms/ST-Nucleo-L053R8/>`_
+      - STM32L053R8T6
+      - 48 MHz
       - 64 Kb
       - 8 Kb
+      
+
     * - ``nucleo_l152re``
-      - `ST Nucleo L152RE
-        <https://developer.mbed.org/platforms/ST-Nucleo-L152RE/>`_
-      - STM32L152ret6 ``cortex-m3``
-      - 32 Mhz ``32000000L``
+      - `ST Nucleo L152RE <https://developer.mbed.org/platforms/ST-Nucleo-L152RE/>`_
+      - STM32L152RET6
+      - 32 MHz
       - 512 Kb
       - 80 Kb
-
-More detailed information you can find here
-`STM32 Discovery kits <http://www.st.com/web/en/catalog/tools/FM116/SC959/SS1532/LN1848?icmp=ln1848_pron_pr-stm32f446_dec2014&sc=stm32discovery-pr>`_ and here 
-`ST Nucleo boards with MBED support <https://developer.mbed.org/platforms/?tvend=10>`_.
+      
\ No newline at end of file
diff --git a/docs/platforms/teensy.rst b/docs/platforms/teensy.rst
index 37f172c6..21ff5fc5 100644
--- a/docs/platforms/teensy.rst
+++ b/docs/platforms/teensy.rst
@@ -3,7 +3,13 @@
 Platform ``teensy``
 ===================
 
-`Teensy <https://www.pjrc.com/teensy/>`_ is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard "Mini-B" USB cable and a PC or Macintosh with a USB port.
+Teensy is a complete USB-based microcontroller development system, in
+a very small footprint, capable of implementing many types of projects.
+All programming is done via the USB port. No special programmer is
+needed, only a standard "Mini-B" USB cable and a PC or Macintosh with
+a USB port.
+
+https://www.pjrc.com/teensy
 
 .. contents::
 
@@ -14,46 +20,28 @@ Packages
     :header-rows:  1
 
     * - Name
-      - Alias
       - Contents
-    * - ``toolchain-gccarmnoneeabi``
-      - toolchain
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_,
-        `GDB <http://www.gnu.org/software/gdb/>`_
-    * - ``toolchain-atmelavr``
-      - toolchain
-      - `avr-gcc <https://gcc.gnu.org/wiki/avr-gcc>`_,
-        `GDB <http://www.gnu.org/software/gdb/>`_,
-        `AVaRICE <http://avarice.sourceforge.net>`_,
-        `SimulAVR <http://www.nongnu.org/simulavr/>`_
-    * - ``tool-teensy``
-      - uploader
-      - `Teensy Loader <https://www.pjrc.com/teensy/loader.html>`_
-    * - ``framework-arduinoteensy``
-      -
-      - See below in :ref:`teensy_frameworks`
 
+    * - ``toolchain-atmelavr``
+      - `avr-gcc <https://gcc.gnu.org/wiki/avr-gcc>`_, `GDB <http://www.gnu.org/software/gdb/>`_, `AVaRICE <http://avarice.sourceforge.net/>`_, `SimulAVR <http://www.nongnu.org/simulavr/>`_
+
+    * - ``ldscripts``
+      - `Linker Scripts <https://sourceware.org/binutils/docs/ld/Scripts.html>`_
+
+    * - ``framework-arduinoteensy``
+      - `Arduino Wiring-based Framework <http://arduino.cc/en/Reference/HomePage>`_
+
+    * - ``toolchain-gccarmnoneeabi``
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
+
+    * - ``tool-teensy``
+      - `Teensy Loader <https://www.pjrc.com/teensy/loader.html>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
-.. _teensy_frameworks:
-
-Frameworks
-----------
-
-.. list-table::
-    :header-rows:  1
-
-    * - Type ``framework``
-      - Name
-      - Reference
-    * - ``arduino``
-      - Arduino Wiring-based Framework
-      - `Documentation <http://arduino.cc/en/Reference/HomePage>`_
-
 
 Boards
 ------
@@ -63,39 +51,47 @@ Boards
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
+Teensy
+~~~~~~
+
 .. list-table::
     :header-rows:  1
 
     * - Type ``board``
       - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
+      - Microcontroller
+      - Frequency
       - Flash
       - RAM
+
     * - ``teensy20``
       - `Teensy 2.0 <https://www.pjrc.com/store/teensy.html>`_
-      - ATmega32u4 ``atmega32u4``
-      - 16 MHz ``16000000L``
+      - ATMEGA32U4
+      - 16 MHz
       - 32 Kb
       - 2.5 Kb
+      
+
     * - ``teensy20pp``
       - `Teensy++ 2.0 <https://www.pjrc.com/store/teensypp.html>`_
-      - AT90USB1289 ``at90usb1286``
-      - 16 MHz ``16000000L``
+      - AT90USB1286
+      - 16 MHz
       - 128 Kb
       - 8 Kb
+      
+
     * - ``teensy30``
       - `Teensy 3.0 <https://www.pjrc.com/store/teensy3.html>`_
-      - MK20DX128 ``cortex-m4``
-      - 48 Mhz ``48000000L``
-      - 128 kb
+      - MK20DX128
+      - 48 MHz
+      - 128 Kb
       - 16 Kb
+      
+
     * - ``teensy31``
       - `Teensy 3.1 <https://www.pjrc.com/store/teensy31.html>`_
-      - MK20DX256 ``cortex-m4``
-      - 72 Mhz ``72000000L``
-      - 256 kb
+      - MK20DX256
+      - 72 MHz
+      - 256 Kb
       - 64 Kb
-
-More detailed information you can find here
-`Teensy USB Development Boards <https://www.pjrc.com/teensy/>`_.
+      
\ No newline at end of file
diff --git a/docs/platforms/timsp430.rst b/docs/platforms/timsp430.rst
index 256f9f36..3b733f87 100644
--- a/docs/platforms/timsp430.rst
+++ b/docs/platforms/timsp430.rst
@@ -3,10 +3,12 @@
 Platform ``timsp430``
 =====================
 
-`MSP430 microcontrollers (MCUs) from Texas Instruments (TI) <http://www.ti.com/lsds/ti/microcontrollers_16-bit_32-bit/msp/overview.page>`_
-are 16-bit, RISC-based, mixed-signal processors designed for ultra-low power.
-These MCUs offer the lowest power consumption and the perfect mix of integrated
-peripherals for thousands of applications.
+MSP430 microcontrollers (MCUs) from Texas Instruments (TI)
+are 16-bit, RISC-based, mixed-signal processors designed for ultra-low
+power. These MCUs offer the lowest power consumption and the perfect
+mix of integrated peripherals for thousands of applications.
+
+http://www.ti.com/lsds/ti/microcontrollers_16-bit_32-bit/msp/overview.page
 
 .. contents::
 
@@ -17,40 +19,22 @@ Packages
     :header-rows:  1
 
     * - Name
-      - Alias
       - Contents
-    * - ``toolchain-timsp430``
-      - toolchain
-      - `msp-gcc <http://sourceforge.net/projects/mspgcc/>`_,
-        `GDB <http://www.gnu.org/software/gdb/>`_
-    * - ``tool-mspdebug``
-      - uploader
-      - `MSPDebug <http://mspdebug.sourceforge.net>`_
-    * - ``framework-energiamsp430``
-      -
-      - See below in :ref:`timsp430_frameworks`
 
+    * - ``toolchain-timsp430``
+      - `msp-gcc <http://sourceforge.net/projects/mspgcc/>`_, `GDB <http://www.gnu.org/software/gdb/>`_
+
+    * - ``tool-mspdebug``
+      - `MSPDebug <http://mspdebug.sourceforge.net/>`_
+
+    * - ``framework-energiamsp430``
+      - `Energia Wiring-based Framework (MSP430 Core) <http://energia.nu/reference/>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
-.. _timsp430_frameworks:
-
-Frameworks
-----------
-
-.. list-table::
-    :header-rows:  1
-
-    * - Type ``framework``
-      - Name
-      - Reference
-    * - ``energia``
-      - Energia Wiring-based Framework (MSP430 Core)
-      - `Documentation <http://energia.nu/reference/>`_
-
 
 Boards
 ------
@@ -60,61 +44,71 @@ Boards
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
+TI
+~~
+
 .. list-table::
     :header-rows:  1
 
     * - Type ``board``
       - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
+      - Microcontroller
+      - Frequency
       - Flash
       - RAM
-    * - ``lpmsp430g2231``
-      - `MSP430G2231 LaunchPad <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
-      - MSP430G2231 ``msp430g2231``
-      - 16 MHz ``16000000L``
-      - 2 Kb
-      - 128 B
-    * - ``lpmsp430g2452``
-      - `MSP430G2452 LaunchPad <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
-      - MSP430G2452 ``msp430g2452``
-      - 16 MHz ``16000000L``
-      - 8 Kb
-      - 256 B
-    * - ``lpmsp430g2553``
-      - `MSP430G2553 LaunchPad <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
-      - MSP430G2553 ``msp430g2553``
-      - 16 MHz ``16000000L``
-      - 16 Kb
-      - 512 B
+
     * - ``lpmsp430f5529``
-      - `MSP430F5529 LaunchPad (16 Mhz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html>`_
-      - MSP430F5529 ``msp430f5529``
-      - 16 MHz ``16000000L``
+      - `LaunchPad w/ msp430f5529 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html>`_
+      - MSP430F5529
+      - 16 MHz
       - 128 Kb
-      - 8 KB
+      - 1 Kb
+      
+
     * - ``lpmsp430f5529_25``
-      - `MSP430F5529 LaunchPad (25 Mhz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html>`_
-      - MSP430F5529 ``msp430f5529``
-      - 25 MHz ``25000000L``
+      - `LaunchPad w/ msp430f5529 (25MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html>`_
+      - MSP430F5529
+      - 25 MHz
       - 128 Kb
-      - 8 KB
+      - 1 Kb
+      
+
     * - ``lpmsp430fr5739``
-      - `MSP430FR5739 Experimenter Board <http://www.ti.com/tool/msp-exp430fr5739>`_
-      - MSP430FR5739 ``msp430fr5739``
-      - 16 MHz ``16000000L``
+      - `FraunchPad w/ msp430fr5739 <http://www.ti.com/tool/msp-exp430fr5739>`_
+      - MSP430FR5739
+      - 16 MHz
       - 16 Kb
-      - 1 KB
+      - 1 Kb
+      
+
     * - ``lpmsp430fr5969``
-      - `MSP430FR5969 LaunchPad <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430fr5969.html>`_
-      - MSP430FR5969 ``msp430fr5969``
-      - 16 MHz ``16000000L``
+      - `LaunchPad w/ msp430fr5969 <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430fr5969.html>`_
+      - MSP430FR5969
+      - 8 MHz
       - 64 Kb
-      - 2 KB
-
-
-More detailed information you can find here
-`MSP430 LaunchPads <http://www.ti.com/ww/en/launchpad/launchpads-msp430.html>`_.
+      - 1 Kb
+      
 
+    * - ``lpmsp430g2231``
+      - `LaunchPad w/ msp430g2231 (1 MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
+      - MSP430G2231
+      - 1 MHz
+      - 2 Kb
+      - 0.125 Kb
+      
 
+    * - ``lpmsp430g2452``
+      - `LaunchPad w/ msp430g2452 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
+      - MSP430G2452
+      - 16 MHz
+      - 8 Kb
+      - 0.25 Kb
+      
 
+    * - ``lpmsp430g2553``
+      - `LaunchPad w/ msp430g2553 (16MHz) <http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html>`_
+      - MSP430G2553
+      - 16 MHz
+      - 16 Kb
+      - 0.5 Kb
+      
\ No newline at end of file
diff --git a/docs/platforms/titiva.rst b/docs/platforms/titiva.rst
index 208742d9..ce8078c3 100644
--- a/docs/platforms/titiva.rst
+++ b/docs/platforms/titiva.rst
@@ -3,12 +3,13 @@
 Platform ``titiva``
 ===================
 
-`Texas Instruments TM4C12x MCUs <http://www.ti.com/lsds/ti/microcontrollers_16-bit_32-bit/c2000_performance/control_automation/tm4c12x/overview.page>`_
-offer the industry’s most popular ARM®
-Cortex®-M4 core with scalable memory and package options, unparalleled
+Texas Instruments TM4C12x MCUs offer the industrys most popular
+ARM Cortex-M4 core with scalable memory and package options, unparalleled
 connectivity peripherals, advanced application functions, industry-leading
 analog integration, and extensive software solutions.
 
+http://www.ti.com/lsds/ti/microcontrollers_16-bit_32-bit/c2000_performance/control_automation/tm4c12x/overview.page
+
 .. contents::
 
 Packages
@@ -18,45 +19,28 @@ Packages
     :header-rows:  1
 
     * - Name
-      - Alias
       - Contents
+
+    * - ``ldscripts``
+      - `Linker Scripts <https://sourceware.org/binutils/docs/ld/Scripts.html>`_
+
     * - ``toolchain-gccarmnoneeabi``
-      - toolchain
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded/>`_,
-        `GDB <http://www.gnu.org/software/gdb/>`_
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
+
     * - ``tool-lm4flash``
-      - uploader
       - `Flash Programmer <http://www.ti.com/tool/lmflashprogrammer>`_
-    * - ``framework-energiativa``
-      -
-      - See below in :ref:`titiva_frameworks`
+
     * - ``framework-opencm3``
-      -
-      - See below in :ref:`titiva_frameworks`
+      - `libOpenCM3 Framework <http://www.libopencm3.org/>`_
+
+    * - ``framework-energiativa``
+      - `Energia Wiring-based Framework (LM4F Core) <http://energia.nu/reference/>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
-.. _titiva_frameworks:
-
-Frameworks
-----------
-
-.. list-table::
-    :header-rows:  1
-
-    * - Type ``framework``
-      - Name
-      - Reference
-    * - ``energia``
-      - Energia Wiring-based Framework (LM4F Core)
-      - `Documentation <http://energia.nu/reference/>`__
-    * - ``opencm3``
-      - libOpenCM3 Framework
-      - `Documentation <http://www.libopencm3.org>`__
-
 
 Boards
 ------
@@ -66,35 +50,39 @@ Boards
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
+TI
+~~
+
 .. list-table::
     :header-rows:  1
 
     * - Type ``board``
       - Name
-      - Microcontroller ``board_mcu``
-      - Frequency ``board_f_cpu``
+      - Microcontroller
+      - Frequency
       - Flash
       - RAM
-    * - ``lplm4f120h5qr``
-      - `Stellaris LM4F120 LaunchPad <http://www.ti.com/tool/ek-lm4f120xl>`_
-      - LM4F120H5QR ``cortex-m4``
-      - 80 MHz ``80000000L``
-      - 256 Kb
-      - 32 Kb
-    * - ``lptm4c1230c3pm``
-      - `Tiva C Series TM4C123G LaunchPad
-        <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c123gxl.html>`_
-      - TM4C123GH6PM ``cortex-m4``
-      - 80 MHz ``80000000L``
-      - 256 Kb
-      - 32 Kb
-    * - ``lptm4c1294ncpdt``
-      - `Tiva C Series TM4C1294 Connected LaunchPad
-        <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c1294xl.html>`_
-      - TM4C1294NCPDT ``cortex-m4``
-      - 120 Mhz ``120000000L``
-      - 1 Mb
-      - 256 Kb
 
-More detailed information you can find here
-`TIVA C Series LaunchPads <http://www.ti.com/ww/en/launchpad/launchpads-connected.html>`_.
+    * - ``lplm4f120h5qr``
+      - `LaunchPad (Stellaris) w/ lm4f120 (80MHz) <http://www.ti.com/tool/ek-lm4f120xl>`_
+      - LPLM4F120H5QR
+      - 80 MHz
+      - 256 Kb
+      - 32 Kb
+      
+
+    * - ``lptm4c1230c3pm``
+      - `LaunchPad (Tiva C) w/ tm4c123 (80MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c123gxl.html>`_
+      - LPTM4C1230C3PM
+      - 80 MHz
+      - 256 Kb
+      - 32 Kb
+      
+
+    * - ``lptm4c1294ncpdt``
+      - `LaunchPad (Tiva C) w/ tm4c129 (120MHz) <http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c1294xl.html>`_
+      - LPTM4C1294NCPDT
+      - 120 MHz
+      - 1024 Kb
+      - 256 Kb
+      
\ No newline at end of file