diff --git a/src/gas/gas.h b/src/gas/gas.h
index a6e1bc3d..3783617e 100644
--- a/src/gas/gas.h
+++ b/src/gas/gas.h
@@ -41,7 +41,7 @@ namespace upm {
  * sampling, threshold checking, a basic printing function and a standard read function.
  *
  * @defgroup gas libupm-gas
- * @ingroup seeed analog gaseous eak
+ * @ingroup seeed analog gaseous eak hak
  */
 class Gas {
     public:
diff --git a/src/gas/mq2.h b/src/gas/mq2.h
index 1c95d9a3..3d09b88a 100644
--- a/src/gas/mq2.h
+++ b/src/gas/mq2.h
@@ -35,6 +35,7 @@ namespace upm {
    * @type gaseous
    * @man seeed
    * @con analog
+   * @kit hak
    *
    * @brief API for MQ2 Gas Sensor
    *
diff --git a/src/gas/tp401.h b/src/gas/tp401.h
index 35825ba1..ae72eeca 100644
--- a/src/gas/tp401.h
+++ b/src/gas/tp401.h
@@ -36,6 +36,7 @@ namespace upm {
    * @type gaseous
    * @man seeed
    * @con analog
+   * @kit hak
    *
    * @brief API for Grove TP401 Air Quality Sensor
    *
diff --git a/src/grove/grove.h b/src/grove/grove.h
index 05837e5e..a42ca838 100644
--- a/src/grove/grove.h
+++ b/src/grove/grove.h
@@ -34,7 +34,7 @@ namespace upm {
 /**
  * @brief generic library for basic grove sensors
  * @defgroup grove libupm-grove
- * @ingroup seeed gpio pwm ainput button led light relay temp touch gsk eak
+ * @ingroup seeed gpio pwm ainput button led light relay temp touch gsk eak hak
  */
 class Grove {
     public:
diff --git a/src/grove/groverelay.h b/src/grove/groverelay.h
index b52f4e06..e108d2b8 100644
--- a/src/grove/groverelay.h
+++ b/src/grove/groverelay.h
@@ -30,7 +30,7 @@
  * @type relay
  * @man seeed
  * @con gpio
- * @kit gsk eak
+ * @kit gsk eak hak
  *
  * @brief API for Grove Relay
  *
diff --git a/src/grove/groverotary.h b/src/grove/groverotary.h
index 534e1d1f..a6334ca6 100644
--- a/src/grove/groverotary.h
+++ b/src/grove/groverotary.h
@@ -31,6 +31,7 @@
  * @type ainput
  * @man seeed
  * @con analog
+ * @kit gsk
  *
  * @brief API for Grove Rotary Angle Sensor (Knob)
  *
diff --git a/src/grovemoisture/grovemoisture.h b/src/grovemoisture/grovemoisture.h
index 07f42fcd..8ae2fd7a 100644
--- a/src/grovemoisture/grovemoisture.h
+++ b/src/grovemoisture/grovemoisture.h
@@ -30,7 +30,7 @@ namespace upm {
   /**
    * @brief Grove Moisture sensor library
    * @defgroup grovemoisture libupm-grovemoisture
-   * @ingroup seeed analog liquid eak
+   * @ingroup seeed analog liquid eak hak
    */
 
   /**
@@ -40,7 +40,7 @@ namespace upm {
    * @type liquid
    * @man seeed
    * @con analog
-   * @kit eak
+   * @kit eak hak
    *
    * @brief API for the Grove Moisture Sensor
    *
diff --git a/src/grovespeaker/grovespeaker.h b/src/grovespeaker/grovespeaker.h
index 6e1b49e2..fd000a85 100644
--- a/src/grovespeaker/grovespeaker.h
+++ b/src/grovespeaker/grovespeaker.h
@@ -35,7 +35,7 @@ namespace upm {
   /**
    * @brief Grove Speaker library
    * @defgroup grovespeaker libupm-grovespeaker
-   * @ingroup seeed gpio sound
+   * @ingroup seeed gpio sound hak
    */
 typedef struct
 {
@@ -53,6 +53,7 @@ typedef struct
    * @type sound
    * @man seeed
    * @con gpio
+   * @kit hak
    *
    * @brief API for the GroveSpeaker speaker
    *
diff --git a/src/otp538u/otp538u.h b/src/otp538u/otp538u.h
index e5d66b42..285d9c89 100644
--- a/src/otp538u/otp538u.h
+++ b/src/otp538u/otp538u.h
@@ -31,7 +31,7 @@ namespace upm {
   /**
    * @brief OTP538U IR Temperature Sensor library
    * @defgroup otp538u libupm-otp538u
-   * @ingroup seeed analog light
+   * @ingroup seeed analog light hak
    */
   /**
    * @library otp538u
@@ -41,6 +41,7 @@ namespace upm {
    * @type light
    * @man generic
    * @con analog
+   * @kit hak
    *
    * @brief API for the OTP538U IR Temperature Sensor
    *
diff --git a/src/rotaryencoder/rotaryencoder.h b/src/rotaryencoder/rotaryencoder.h
index da77b5bd..e7d8adca 100644
--- a/src/rotaryencoder/rotaryencoder.h
+++ b/src/rotaryencoder/rotaryencoder.h
@@ -33,7 +33,7 @@ namespace upm {
 /**
  * @brief Grove Rotary Encoder library
  * @defgroup rotaryencoder libupm-rotaryencoder
- * @ingroup seeed gpio other
+ * @ingroup seeed gpio other hak
  */
 /**
  * @library rotaryencoder
@@ -43,7 +43,7 @@ namespace upm {
  * @man seeed
  * @web http://www.seeedstudio.com/wiki/Grove_-_Encoder
  * @con gpio
- * @kit gsk
+ * @kit hak
  *
  * @brief API for the Grove Rotary Encoder
  * 
diff --git a/src/rpr220/rpr220.h b/src/rpr220/rpr220.h
index 17fd42f8..aa4d0b61 100644
--- a/src/rpr220/rpr220.h
+++ b/src/rpr220/rpr220.h
@@ -31,7 +31,7 @@ namespace upm {
 /**
  * @brief RPR220 IR reflective sensor library
  * @defgroup rpr220 libupm-rpr220
- * @ingroup seeed gpio light tsk
+ * @ingroup seeed gpio light tsk hak
  */
 /**
  * @library rpr220
@@ -42,7 +42,7 @@ namespace upm {
  * @man seeed
  * @web http://www.seeedstudio.com/wiki/Grove_-_Infrared_Reflective_Sensor
  * @con gpio
- * @kit tsk
+ * @kit tsk hak
  *
  * @brief API for the RPR220 based Grove IR Reflective Sensor
  * 
diff --git a/src/yg1006/yg1006.h b/src/yg1006/yg1006.h
index 2990f3c1..a60a7257 100644
--- a/src/yg1006/yg1006.h
+++ b/src/yg1006/yg1006.h
@@ -30,7 +30,7 @@ namespace upm {
     /**
      * @brief YG1006 flame sensor library
      * @defgroup yg1006 libupm-yg1006
-     * @ingroup seeed gpio light
+     * @ingroup seeed gpio light hak
      */
     /**
      * @library yg1006
@@ -41,6 +41,7 @@ namespace upm {
      * @man seeed
      * @web http://www.seeedstudio.com/wiki/Grove_-_Flame_Sensor
      * @con gpio
+     * @kit hak
      *
      * @brief API for the YG1006 flame sensor
      *