diff --git a/keyboards/viterbi/Makefile b/keyboards/viterbi/Makefile
deleted file mode 100644
index 0c519b32..00000000
--- a/keyboards/viterbi/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBPROJECT_DEFAULT = rev1
-
-ifndef MAKEFILE_INCLUDED
-	include ../../Makefile
-endif
diff --git a/keyboards/viterbi/keymaps/default/Makefile b/keyboards/viterbi/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/viterbi/keymaps/default/Makefile
rename to keyboards/viterbi/keymaps/default/rules.mk
diff --git a/keyboards/viterbi/keymaps/dwallace/config.h b/keyboards/viterbi/keymaps/dwallace/config.h
index 558ae062..79bd8fd3 100644
--- a/keyboards/viterbi/keymaps/dwallace/config.h
+++ b/keyboards/viterbi/keymaps/dwallace/config.h
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #undef RGBLED_NUM
 #define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
+#define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/viterbi/keymaps/dwallace/keymap.c b/keyboards/viterbi/keymaps/dwallace/keymap.c
index c884c8a3..38d63ffa 100644
--- a/keyboards/viterbi/keymaps/dwallace/keymap.c
+++ b/keyboards/viterbi/keymaps/dwallace/keymap.c
@@ -19,6 +19,8 @@ enum custom_keycodes {
 #define KC_SAPP LGUI(KC_TAB)    // Switch between applications
 #define KC_FN1 MO(_FN)
 #define KC_LCAG LCAG(KC_NO)
+#define KC_RTOG RGB_TOG
+#define KC_RMOD RGB_MOD
 #define KC_RVAD RGB_VAD
 #define KC_RVAI RGB_VAI
 #define KC_CLRM KC_NO           // TODO: Clear sticky modifiers
@@ -48,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
          ,    ,    ,    ,RST ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
   //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,RVAD,RVAI,    ,    ,    ,
+         ,    ,    ,    ,    ,    ,    ,     RTOG,RMOD,RVAD,RVAI,    ,    ,    ,
   //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
          ,    ,    ,    ,    ,    ,    ,         ,MUTE,VOLD,VOLU,    ,    ,    ,
   //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
diff --git a/keyboards/viterbi/keymaps/dwallace/Makefile b/keyboards/viterbi/keymaps/dwallace/rules.mk
similarity index 100%
rename from keyboards/viterbi/keymaps/dwallace/Makefile
rename to keyboards/viterbi/keymaps/dwallace/rules.mk
diff --git a/keyboards/viterbi/keymaps/hexwire/Makefile b/keyboards/viterbi/keymaps/hexwire/rules.mk
similarity index 100%
rename from keyboards/viterbi/keymaps/hexwire/Makefile
rename to keyboards/viterbi/keymaps/hexwire/rules.mk