diff --git a/STM32F1/boards.txt b/STM32F1/boards.txt
index 7fdc167..7d4571a 100644
--- a/STM32F1/boards.txt
+++ b/STM32F1/boards.txt
@@ -150,14 +150,6 @@ genericSTM32F103C.upload.use_1200bps_touch=false
 genericSTM32F103C.upload.file_type=bin
 genericSTM32F103C.upload.auto_reset=true
 
-## STM32F103C8 -------------------------
-genericSTM32F103C.menu.device_variant.STM32F103C8=STM32F103C8 (20k RAM. 64k Flash)
-genericSTM32F103C.menu.device_variant.STM32F103C8.build.cpu_flags=-DMCU_STM32F103C8
-genericSTM32F103C.menu.device_variant.STM32F103C8.build.ldscript=ld/jtag_c8.ld
-genericSTM32F103C.menu.device_variant.STM32F103C8.upload.maximum_size=65536
-genericSTM32F103C.menu.device_variant.STM32F103C8.upload.ram.maximum_size=20480
-genericSTM32F103C.menu.device_variant.STM32F103C8.upload.flash.maximum_size=65536
-
 ## STM32F103CB -------------------------
 genericSTM32F103C.menu.device_variant.STM32F103CB=STM32F103CB (20k RAM. 128k Flash)
 genericSTM32F103C.menu.device_variant.STM32F103CB.build.cpu_flags=-DMCU_STM32F103CB
@@ -166,6 +158,14 @@ genericSTM32F103C.menu.device_variant.STM32F103CB.upload.maximum_size=131072
 genericSTM32F103C.menu.device_variant.STM32F103CB.upload.ram.maximum_size=20480
 genericSTM32F103C.menu.device_variant.STM32F103CB.upload.flash.maximum_size=131072
 
+## STM32F103C8 -------------------------
+genericSTM32F103C.menu.device_variant.STM32F103C8=STM32F103C8 (20k RAM. 64k Flash)
+genericSTM32F103C.menu.device_variant.STM32F103C8.build.cpu_flags=-DMCU_STM32F103C8
+genericSTM32F103C.menu.device_variant.STM32F103C8.build.ldscript=ld/jtag_c8.ld
+genericSTM32F103C.menu.device_variant.STM32F103C8.upload.maximum_size=65536
+genericSTM32F103C.menu.device_variant.STM32F103C8.upload.ram.maximum_size=20480
+genericSTM32F103C.menu.device_variant.STM32F103C8.upload.flash.maximum_size=65536
+
 #---------------------------- UPLOAD METHODS ---------------------------
 
 genericSTM32F103C.menu.upload_method.DFUUploadMethod=STM32duino bootloader
@@ -181,6 +181,7 @@ genericSTM32F103C.menu.upload_method.serialMethod=Serial
 genericSTM32F103C.menu.upload_method.serialMethod.upload.protocol=maple_serial
 genericSTM32F103C.menu.upload_method.serialMethod.upload.tool=serial_upload
 
+
 genericSTM32F103C.menu.upload_method.STLinkMethod=STLink
 genericSTM32F103C.menu.upload_method.STLinkMethod.upload.protocol=STLink
 genericSTM32F103C.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
@@ -191,8 +192,75 @@ genericSTM32F103C.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp
 genericSTM32F103C.menu.upload_method.BMPMethod.upload.tool=bmp_upload
 genericSTM32F103C.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG
 
+########################### Generic STM32F103R ###########################
 
-########################### Generic STM32F103R ########################################
+genericSTM32F103R.name=Generic STM32F103R series
+#genericSTM32F103R.build.variant=generic_stm32f103r
+genericSTM32F103R.build.vect=VECT_TAB_ADDR=0x8000000
+genericSTM32F103R.build.core=maple
+genericSTM32F103R.build.board=GENERIC_STM32F103R
+genericSTM32F103R.upload.use_1200bps_touch=false
+genericSTM32F103R.upload.file_type=bin
+genericSTM32F103R.upload.auto_reset=true
+
+genericSTM32F103R.menu.device_variant.STM32F103R8=STM32F103R8 (20k RAM. 64k Flash)
+genericSTM32F103R.menu.device_variant.STM32F103R8.build.variant=generic_stm32f103r8
+genericSTM32F103R.menu.device_variant.STM32F103R8.build.cpu_flags=-DMCU_STM32F103R8
+genericSTM32F103R.menu.device_variant.STM32F103R8.upload.maximum_size=65536
+genericSTM32F103R.menu.device_variant.STM32F103R8.upload.ram.maximum_size=20480
+genericSTM32F103R.menu.device_variant.STM32F103R8.upload.flash.maximum_size=65536
+genericSTM32F103R.menu.device_variant.STM32F103R8.build.ldscript=ld/stm32f103r8.ld
+
+genericSTM32F103R.menu.device_variant.STM32F103RB=STM32F103RB (20k RAM. 128k Flash)
+genericSTM32F103R.menu.device_variant.STM32F103RB.build.variant=generic_stm32f103r8
+genericSTM32F103R.menu.device_variant.STM32F103RB.build.cpu_flags=-DMCU_STM32F103RB
+genericSTM32F103R.menu.device_variant.STM32F103RB.upload.maximum_size=131072
+genericSTM32F103R.menu.device_variant.STM32F103RB.upload.ram.maximum_size=20480
+genericSTM32F103R.menu.device_variant.STM32F103RB.upload.flash.maximum_size=131072
+genericSTM32F103R.menu.device_variant.STM32F103RB.build.ldscript=ld/stm32f103rb.ld
+
+genericSTM32F103R.menu.device_variant.STM32F103RC=STM32F103RC (48k RAM. 256k Flash)
+genericSTM32F103R.menu.device_variant.STM32F103RC.build.variant=generic_stm32f103r
+genericSTM32F103R.menu.device_variant.STM32F103RC.build.cpu_flags=-DMCU_STM32F103RC
+genericSTM32F103R.menu.device_variant.STM32F103RC.upload.maximum_size=262144
+genericSTM32F103R.menu.device_variant.STM32F103RC.upload.ram.maximum_size=49152
+genericSTM32F103R.menu.device_variant.STM32F103RC.upload.flash.maximum_size=262144
+genericSTM32F103R.menu.device_variant.STM32F103RC.build.ldscript=ld/stm32f103rc.ld
+
+genericSTM32F103R.menu.device_variant.STM32F103RE=STM32F103RE (64k RAM. 512k Flash)
+genericSTM32F103R.menu.device_variant.STM32F103RE.build.variant=generic_stm32f103r
+genericSTM32F103R.menu.device_variant.STM32F103RE.build.cpu_flags=-DMCU_STM32F103RE
+genericSTM32F103R.menu.device_variant.STM32F103RE.upload.maximum_size=524288
+genericSTM32F103R.menu.device_variant.STM32F103RE.upload.ram.maximum_size=65536
+genericSTM32F103R.menu.device_variant.STM32F103RE.upload.flash.maximum_size=524288
+genericSTM32F103R.menu.device_variant.STM32F103RE.build.ldscript=ld/stm32f103re.ld
+
+#---------------------------- UPLOAD METHODS ---------------------------
+
+genericSTM32F103R.menu.upload_method.DFUUploadMethod=STM32duino bootloader
+genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu
+genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload
+genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER
+genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000
+genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.ldscript=ld/bootloader.ld
+genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003
+genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.altID=2
+
+genericSTM32F103R.menu.upload_method.serialMethod=Serial
+genericSTM32F103R.menu.upload_method.serialMethod.upload.protocol=maple_serial
+genericSTM32F103R.menu.upload_method.serialMethod.upload.tool=serial_upload
+
+genericSTM32F103R.menu.upload_method.STLinkMethod=STLink
+genericSTM32F103R.menu.upload_method.STLinkMethod.upload.protocol=STLink
+genericSTM32F103R.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
+genericSTM32F103R.menu.upload_method.STLinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DSERIAL_USB -DGENERIC_BOOTLOADER
+
+genericSTM32F103R.menu.upload_method.BMPMethod=BMP (Black Magic Probe)
+genericSTM32F103R.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp
+genericSTM32F103R.menu.upload_method.BMPMethod.upload.tool=bmp_upload
+genericSTM32F103R.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG
+
+###################### Generic STM32F103T ########################################
 
 genericSTM32F103T.name=Generic STM32F103T series
 genericSTM32F103T.build.variant=generic_stm32f103t
@@ -203,14 +271,6 @@ genericSTM32F103T.upload.use_1200bps_touch=false
 genericSTM32F103T.upload.file_type=bin
 genericSTM32F103T.upload.auto_reset=true
 
-## STM32F103T8 -------------------------
-genericSTM32F103T.menu.device_variant.STM32F103T8=STM32F103T8 (20k RAM. 64k Flash)
-genericSTM32F103T.menu.device_variant.STM32F103T8.build.cpu_flags=-DMCU_STM32F103T8
-genericSTM32F103T.menu.device_variant.STM32F103T8.build.ldscript=ld/jtag_t8.ld
-genericSTM32F103T.menu.device_variant.STM32F103T8.upload.maximum_size=65536
-genericSTM32F103T.menu.device_variant.STM32F103T8.upload.ram.maximum_size=20480
-genericSTM32F103T.menu.device_variant.STM32F103T8.upload.flash.maximum_size=65536
-
 ## STM32F103TB -------------------------
 genericSTM32F103T.menu.device_variant.STM32F103TB=STM32F103TB (20k RAM. 128k Flash)
 genericSTM32F103T.menu.device_variant.STM32F103TB.build.cpu_flags=-DMCU_STM32F103TB
@@ -219,6 +279,14 @@ genericSTM32F103T.menu.device_variant.STM32F103TB.upload.maximum_size=131072
 genericSTM32F103T.menu.device_variant.STM32F103TB.upload.ram.maximum_size=20480
 genericSTM32F103T.menu.device_variant.STM32F103TB.upload.flash.maximum_size=131072
 
+## STM32F103T8 -------------------------
+genericSTM32F103T.menu.device_variant.STM32F103T8=STM32F103T8 (20k RAM. 64k Flash)
+genericSTM32F103T.menu.device_variant.STM32F103T8.build.cpu_flags=-DMCU_STM32F103T8
+genericSTM32F103T.menu.device_variant.STM32F103T8.build.ldscript=ld/jtag_t8.ld
+genericSTM32F103T.menu.device_variant.STM32F103T8.upload.maximum_size=65536
+genericSTM32F103T.menu.device_variant.STM32F103T8.upload.ram.maximum_size=20480
+genericSTM32F103T.menu.device_variant.STM32F103T8.upload.flash.maximum_size=65536
+
 #---------------------------- UPLOAD METHODS ---------------------------
 
 genericSTM32F103T.menu.upload_method.DFUUploadMethod=STM32duino bootloader