diff --git a/doc/full_rm/Doxyfile_html b/doc/full_rm/Doxyfile_html
index ed8b1fe00..d52a315e2 100644
--- a/doc/full_rm/Doxyfile_html
+++ b/doc/full_rm/Doxyfile_html
@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 20.3.0
+PROJECT_NUMBER         = 21.6.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/doc/hal/Doxyfile_chm b/doc/hal/Doxyfile_chm
index 284696a74..6bf01b95d 100644
--- a/doc/hal/Doxyfile_chm
+++ b/doc/hal/Doxyfile_chm
@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/HAL
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 7.1.0
+PROJECT_NUMBER         = 7.2.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/doc/hal/Doxyfile_html b/doc/hal/Doxyfile_html
index b6fadce15..0260f36ae 100644
--- a/doc/hal/Doxyfile_html
+++ b/doc/hal/Doxyfile_html
@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/HAL
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 7.1.0
+PROJECT_NUMBER         = 7.2.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/doc/nil/Doxyfile_chm b/doc/nil/Doxyfile_chm
index f7e6c5cc3..8eb2c06f7 100644
--- a/doc/nil/Doxyfile_chm
+++ b/doc/nil/Doxyfile_chm
@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/NIL
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.0.0
+PROJECT_NUMBER         = 4.1.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/doc/nil/Doxyfile_html b/doc/nil/Doxyfile_html
index 024d46ad3..503d8e7f4 100644
--- a/doc/nil/Doxyfile_html
+++ b/doc/nil/Doxyfile_html
@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/NIL
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.0.0
+PROJECT_NUMBER         = 4.1.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/doc/rt/Doxyfile_chm b/doc/rt/Doxyfile_chm
index 1c12576a3..58356cc0e 100644
--- a/doc/rt/Doxyfile_chm
+++ b/doc/rt/Doxyfile_chm
@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/RT
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 6.1.0
+PROJECT_NUMBER         = 7.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/doc/rt/Doxyfile_html b/doc/rt/Doxyfile_html
index f0727e123..dd8234fff 100644
--- a/doc/rt/Doxyfile_html
+++ b/doc/rt/Doxyfile_html
@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/RT
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 6.1.0
+PROJECT_NUMBER         = 7.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/os/common/ports/templates/chcore.c b/os/common/ports/templates/chcore.c
index 7ef05c1db..be97763e1 100644
--- a/os/common/ports/templates/chcore.c
+++ b/os/common/ports/templates/chcore.c
@@ -21,7 +21,7 @@
  * @file    templates/chcore.c
  * @brief   Port related template code.
  *
- * @addtogroup TEMPLATE_CORE
+ * @addtogroup port_core
  * @details Non portable code templates.
  * @{
  */
diff --git a/os/common/ports/templates/chcore.h b/os/common/ports/templates/chcore.h
index f473c8e4e..102285301 100644
--- a/os/common/ports/templates/chcore.h
+++ b/os/common/ports/templates/chcore.h
@@ -23,7 +23,7 @@
  * @details This file is a template of the system driver macros provided by
  *          a port.
  *
- * @addtogroup TEMPLATE_CORE
+ * @addtogroup port_core
  * @{
  */
 
diff --git a/os/common/ports/templates/chtypes.h b/os/common/ports/templates/chtypes.h
index 72db112f4..da46297cd 100644
--- a/os/common/ports/templates/chtypes.h
+++ b/os/common/ports/templates/chtypes.h
@@ -21,7 +21,7 @@
  * @file    templates/chtypes.h
  * @brief   Template port system types.
  *
- * @addtogroup TEMPLATE_CORE
+ * @addtogroup port_types
  * @{
  */
 
diff --git a/os/hal/dox/hal_interfaces.dox b/os/hal/dox/hal_interfaces.dox
index c27305ad8..62388d41c 100644
--- a/os/hal/dox/hal_interfaces.dox
+++ b/os/hal/dox/hal_interfaces.dox
@@ -54,7 +54,18 @@
  * @ingroup HAL_INTERFACES
  */
 
+/**
+ * @defgroup HAL_BUFFERED_STREAMS Buffered Streams Class
+ * @ingroup HAL_INTERFACES
+ */
+
 /**
  * @defgroup HAL_CHPRINTF Output Formatter Utility
  * @ingroup HAL_INTERFACES
  */
+
+/**
+ * @defgroup HAL_CHSCANF Input Formatter Utility
+ * @ingroup HAL_INTERFACES
+ */
+ 
\ No newline at end of file
diff --git a/os/nil/include/ch.h b/os/nil/include/ch.h
index aa1d2f338..3825ad790 100644
--- a/os/nil/include/ch.h
+++ b/os/nil/include/ch.h
@@ -80,7 +80,7 @@
  * @note    It is meant to be used in configuration files as switch.
  */
 #if !defined(FALSE) || defined(__DOXYGEN__)
-#define FALSE               0
+#define FALSE                   0
 #endif
 
 /**
@@ -88,7 +88,7 @@
  * @note    It is meant to be used in configuration files as switch.
  */
 #if !defined(TRUE) || defined(__DOXYGEN__)
-#define TRUE                1
+#define TRUE                    1
 #endif
 /** @} */
 
diff --git a/os/rt/dox/rt.dox b/os/rt/dox/rt.dox
index 98d5f8cf4..8e6554864 100644
--- a/os/rt/dox/rt.dox
+++ b/os/rt/dox/rt.dox
@@ -59,12 +59,12 @@
  */
 
 /**
- * @defgroup instances OS Instances
+ * @defgroup os_structures OS Types and Structures
  * @ingroup os
  */
 
 /**
- * @defgroup system System Management
+ * @defgroup instances OS Instances
  * @ingroup os
  */
 
@@ -88,6 +88,11 @@
  * @ingroup kernel
  */
 
+/**
+ * @defgroup system System Management
+ * @ingroup base
+ */
+
 /**
  * @defgroup mem Memory Alignment
  * @ingroup base