diff --git a/keyboards/hs60/v2/ansi/config.h b/keyboards/hs60/v2/ansi/config.h
index a02c362c96..4d0c03a9c3 100644
--- a/keyboards/hs60/v2/ansi/config.h
+++ b/keyboards/hs60/v2/ansi/config.h
@@ -142,5 +142,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
-#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
 
+// VIA lighting is handled by the keyboard-level code
+#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/hs60/v2/ansi/keymaps/default/config.h b/keyboards/hs60/v2/ansi/keymaps/default/config.h
deleted file mode 100644
index 96adaf5688..0000000000
--- a/keyboards/hs60/v2/ansi/keymaps/default/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2018 Yiancar
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-/* Include overwrites for specific keymap */
-
-#define HS60_ANSI
-#undef  PRODUCT_ID
-#define PRODUCT_ID      0x4854
diff --git a/keyboards/hs60/v2/ansi/keymaps/via/config.h b/keyboards/hs60/v2/ansi/keymaps/via/config.h
deleted file mode 100644
index 96adaf5688..0000000000
--- a/keyboards/hs60/v2/ansi/keymaps/via/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2018 Yiancar
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-/* Include overwrites for specific keymap */
-
-#define HS60_ANSI
-#undef  PRODUCT_ID
-#define PRODUCT_ID      0x4854
diff --git a/keyboards/hs60/v2/hhkb/config.h b/keyboards/hs60/v2/hhkb/config.h
index 45cfe57168..69c0a3fe03 100644
--- a/keyboards/hs60/v2/hhkb/config.h
+++ b/keyboards/hs60/v2/hhkb/config.h
@@ -142,5 +142,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
-#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
 
+// VIA lighting is handled by the keyboard-level code
+#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/hs60/v2/iso/config.h b/keyboards/hs60/v2/iso/config.h
index e252b1982c..5c2488c784 100644
--- a/keyboards/hs60/v2/iso/config.h
+++ b/keyboards/hs60/v2/iso/config.h
@@ -140,7 +140,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
-#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
 
 // VIA lighting is handled by the keyboard-level code
 #define VIA_CUSTOM_LIGHTING_ENABLE