4 files changed, 16 insertions, 8 deletions
diff --git a/src/gwin/button.c b/src/gwin/button.c
index 0c2c1ab3..9a06f4fe 100644
--- a/src/gwin/button.c
+++ b/src/gwin/button.c
@@ -17,14 +17,16 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 /**
  * @file    src/gwin/button.c
  * @brief   GWIN sub-system button code.
  *
- * @addtogroup GWIN_BUTTON
+ * @defgroup Button Button
+ * @ingroup GWIN
+ *
  * @{
  */
+
 #include "ch.h"
 #include "hal.h"
 #include "gfx.h"
diff --git a/src/gwin/console.c b/src/gwin/console.c
index 7854b658..0297da30 100644
--- a/src/gwin/console.c
+++ b/src/gwin/console.c
@@ -17,14 +17,16 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 /**
  * @file    src/gwin/console.c
  * @brief   GWIN sub-system console code.
  *
- * @addtogroup GWIN_CONSOLE
+ * @defgroup Console Console
+ * @ingroup GWIN
+ *
  * @{
  */
+
 #include "ch.h"
 #include "hal.h"
 #include "gfx.h"
diff --git a/src/gwin/graph.c b/src/gwin/graph.c
index cc457d7d..39628047 100644
--- a/src/gwin/graph.c
+++ b/src/gwin/graph.c
@@ -17,14 +17,16 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 /**
  * @file    src/gwin/button.c
  * @brief   GWIN sub-system button code.
  *
- * @addtogroup GWIN_BUTTON
+ * @defgroup Button Button
+ * @ingroup GWIN
+ *
  * @{
  */
+
 #include "ch.h"
 #include "hal.h"
 #include "gfx.h"
diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c
index 999ea304..4eef79ad 100644
--- a/src/gwin/gwin.c
+++ b/src/gwin/gwin.c
@@ -17,14 +17,16 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 /**
  * @file    src/gwin/gwin.c
  * @brief   GWIN sub-system code.
  *
- * @addtogroup GWIN
+ * @defgroup Window Window
+ * @ingroup GWIN
+ *
  * @{
  */
+
 #include "ch.h"
 #include "hal.h"
 #include "gfx.h"