diff --git a/keyboards/planck/keymaps/fguiotte/keymap.c b/keyboards/planck/keymaps/fguiotte/keymap.c
index ec10fee2f6..21565ce697 100644
--- a/keyboards/planck/keymaps/fguiotte/keymap.c
+++ b/keyboards/planck/keymaps/fguiotte/keymap.c
@@ -335,26 +335,26 @@ bool dip_switch_update_user(uint8_t index, bool active) {
 }
 
 //bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-bool rgb_matrix_indicators_kb(void) {
-    if (!rgb_matrix_indicators_user()) {
-        return false;
-    }
-    //uint8_t layer = default_layer_state; //get_highest_layer(layer_state);
-//    if (default_layer_state == QWERTY) {
-//        rgb_matrix_set_color(1, 255, 0, 0);
+//bool rgb_matrix_indicators_kb(void) {
+//    if (!rgb_matrix_indicators_user()) {
+//        return false;
 //    }
-
-
-    if (biton32(default_layer_state) == _GAMING) {
-        // LED3 for QWERTY
-        rgb_matrix_set_color(3,  255, 0, 0);
-        rgb_matrix_set_color(14, 255, 0, 0);
-        rgb_matrix_set_color(15, 255, 0, 0);
-        rgb_matrix_set_color(16, 255, 0, 0);
-    }
-
-    return true;
-}
+//
+//    //uint8_t layer = default_layer_state; //get_highest_layer(layer_state);
+//    //if (default_layer_state == QWERTY) {
+//    //rgb_matrix_set_color(1, 255, 0, 0);
+//    // }
+//
+//    if (biton32(default_layer_state) == _GAMING) {
+//        // LED3 for QWERTY
+//        rgb_matrix_set_color(3,  255, 0, 0);
+//        rgb_matrix_set_color(14, 255, 0, 0);
+//        rgb_matrix_set_color(15, 255, 0, 0);
+//        rgb_matrix_set_color(16, 255, 0, 0);
+//    }
+//
+//    return true;
+//}
 
 //bool rgb_matrix_indicators_user(){
 //    if (IS_LAYER_ON(_ADJUST)) {
diff --git a/keyboards/planck/keymaps/fguiotte/readme.md b/keyboards/planck/keymaps/fguiotte/readme.md
index a4543a1048..8da2643e12 100644
--- a/keyboards/planck/keymaps/fguiotte/readme.md
+++ b/keyboards/planck/keymaps/fguiotte/readme.md
@@ -7,10 +7,18 @@ Just setup your keyboard layout to `English (US, intl., with dead keys)`.
 
 ## Flash the planck
 
+### Light
+
 ```bash
 qmk flash -kb planck/light -km fguiotte
 ```
 
+### Rev 7
+
+```bash
+qmk flash -kb planck/rev7 -km fguiotte
+```
+
 
 ## Layout and layers
 
@@ -78,5 +86,5 @@ Tap set on `/` to react as right shift if hold.
     + set é and è (e.g. raise a and s)
     + set FR_MDDT ·
     + set ' and " as not dead keys? Still need for « minä » so...
-- [ ] Refactor gaming mode, now it's hacky stuff replacing Colemak layer
+- [ ] Refactor gaming mode, now it's hacky stuff replacing Colemak layer. Plus it is not compatible with rev7!
 
diff --git a/lib/chibios b/lib/chibios
index 11edb16109..0062927e30 160000
--- a/lib/chibios
+++ b/lib/chibios
@@ -1 +1 @@
-Subproject commit 11edb1610980f213b9f83161e1715a46fb7e4c51
+Subproject commit 0062927e3058a8b5ef587234bbd98d42fb4e595e
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index da78eb3759..a224be155a 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit da78eb3759b8d1779b237657c7667baa4aa95ca1
+Subproject commit a224be155ae18d38deccf33a6c1d259b9a5ad8d3