diff --git a/keyboards/kprepublic/bm980rgb/bm980rgb.c b/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c
similarity index 100%
rename from keyboards/kprepublic/bm980rgb/bm980rgb.c
rename to keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c
diff --git a/keyboards/kprepublic/bm980rgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
similarity index 100%
rename from keyboards/kprepublic/bm980rgb/config.h
rename to keyboards/kprepublic/bm980hsrgb/config.h
diff --git a/keyboards/kprepublic/bm980rgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json
similarity index 100%
rename from keyboards/kprepublic/bm980rgb/info.json
rename to keyboards/kprepublic/bm980hsrgb/info.json
diff --git a/keyboards/kprepublic/bm980rgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm980rgb/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm980hsrgb/keymaps/default/keymap.c
diff --git a/keyboards/kprepublic/bm980rgb/keymaps/default/readme.md b/keyboards/kprepublic/bm980hsrgb/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm980rgb/keymaps/default/readme.md
rename to keyboards/kprepublic/bm980hsrgb/keymaps/default/readme.md
diff --git a/keyboards/kprepublic/bm980rgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/config.h
similarity index 100%
rename from keyboards/kprepublic/bm980rgb/keymaps/peepeetee/config.h
rename to keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/config.h
diff --git a/keyboards/kprepublic/bm980rgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm980rgb/keymaps/peepeetee/keymap.c
rename to keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
diff --git a/keyboards/kprepublic/bm980rgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm980rgb/keymaps/via/keymap.c
rename to keyboards/kprepublic/bm980hsrgb/keymaps/via/keymap.c
diff --git a/keyboards/kprepublic/bm980rgb/keymaps/via/readme.md b/keyboards/kprepublic/bm980hsrgb/keymaps/via/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm980rgb/keymaps/via/readme.md
rename to keyboards/kprepublic/bm980hsrgb/keymaps/via/readme.md
diff --git a/keyboards/kprepublic/bm980rgb/keymaps/via/rules.mk b/keyboards/kprepublic/bm980hsrgb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm980rgb/keymaps/via/rules.mk
rename to keyboards/kprepublic/bm980hsrgb/keymaps/via/rules.mk
diff --git a/keyboards/kprepublic/bm980rgb/readme.md b/keyboards/kprepublic/bm980hsrgb/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm980rgb/readme.md
rename to keyboards/kprepublic/bm980hsrgb/readme.md
diff --git a/keyboards/kprepublic/bm980rgb/rules.mk b/keyboards/kprepublic/bm980hsrgb/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm980rgb/rules.mk
rename to keyboards/kprepublic/bm980hsrgb/rules.mk
diff --git a/lib/chibios b/lib/chibios
index 413e39c5681d..d7b9d1c87f72 160000
--- a/lib/chibios
+++ b/lib/chibios
@@ -1 +1 @@
-Subproject commit 413e39c5681d181720440f2a8b7391f581788d7b
+Subproject commit d7b9d1c87f724bd7c8cd1486d6d0dc3ba52e0d52
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index 4568901a91e9..d1c2126d1cd8 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit 4568901a91e9bef78ea96a7a83e8150fe1f7353a
+Subproject commit d1c2126d1cd867c50127da84425805e225df8555