6 files changed, 17 insertions, 17 deletions

diff --git a/keyboards/contra/info.json b/keyboards/contra/info.json
index 76f66dc3f8..a73d2477a5 100644
--- a/keyboards/contra/info.json
+++ b/keyboards/contra/info.json
@@ -8,6 +8,7 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "community_layouts": ["planck_mit", "ortho_4x12"],
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "x":11, "y":3}]
diff --git a/keyboards/contra/keymaps/bramver/keymap.c b/keyboards/contra/keymaps/bramver/keymap.c
index e84dcc9af6..3816ee629e 100644
--- a/keyboards/contra/keymaps/bramver/keymap.c
+++ b/keyboards/contra/keymaps/bramver/keymap.c
@@ -48,7 +48,7 @@ enum emoji_map {
   RGHT, // Point Right
 };
 
-const uint32_t PROGMEM unicode_map[] = {
+const uint32_t unicode_map[] PROGMEM = {
   [UNAM] = 0x1F612,
   [HEYE] = 0x1f60d,
   [OK]   = 0x1F44C,
diff --git a/keyboards/contra/keymaps/erovia/keymap.c b/keyboards/contra/keymaps/erovia/keymap.c
index 7063a85509..ed7c2873c6 100644
--- a/keyboards/contra/keymaps/erovia/keymap.c
+++ b/keyboards/contra/keymaps/erovia/keymap.c
@@ -22,7 +22,7 @@ enum {
   TD_SPACE_CADET_ENTER = 1
 };
 
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
   [TD_SPACE_CADET_SHIFT] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_LPRN),
   [TD_SPACE_CADET_ENTER] = ACTION_TAP_DANCE_DOUBLE(KC_ENT, KC_RPRN)
 };
diff --git a/keyboards/contra/keymaps/losinggeneration/keymap.c b/keyboards/contra/keymaps/losinggeneration/keymap.c
index 0e2478e1ae..c7fb08b8d8 100644
--- a/keyboards/contra/keymaps/losinggeneration/keymap.c
+++ b/keyboards/contra/keymaps/losinggeneration/keymap.c
@@ -29,11 +29,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |             |      | XXX  | Left | Down |Right |
  * `-----------------------------------------------------------------------------------'
  */
-[_ADJUST] = CATMAP( \
-  _______, KC_F1  ,  KC_F2 , KC_F3  , KC_F4  , _______, QK_BOOT, TO_GAME, TO_NUM , TO_MS  , _______, KC_SLEP, \
-  _______, KC_F5  ,  KC_F6 , KC_F7  , KC_F8  , _______, _______, QWERTY , COLEMAK, WORKMAN, DVORAK , _______, \
-  MT_CAPS, KC_F9  ,  KC_F10, KC_F11 , KC_F12 , _______, _______, _______, _______, _______, KC_UP  , _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT  \
+[_ADJUST] = CATMAP(
+  _______, KC_F1  ,  KC_F2 , KC_F3  , KC_F4  , _______, QK_BOOT, TO_GAME, TO_NUM , TO_MS  , _______, KC_SLEP,
+  _______, KC_F5  ,  KC_F6 , KC_F7  , KC_F8  , _______, _______, QWERTY , COLEMAK, WORKMAN, DVORAK , _______,
+  MT_CAPS, KC_F9  ,  KC_F10, KC_F11 , KC_F12 , _______, _______, _______, _______, _______, KC_UP  , _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT
 )
 
 };
diff --git a/keyboards/contra/keymaps/ryanm101/keymap.c b/keyboards/contra/keymaps/ryanm101/keymap.c
index 27c12bfa44..ff33043632 100644
--- a/keyboards/contra/keymaps/ryanm101/keymap.c
+++ b/keyboards/contra/keymaps/ryanm101/keymap.c
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // Parantheses
-void paranthesis_dance (qk_tap_dance_state_t *state, void *user_data) {
+void paranthesis_dance (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     SEND_STRING("()"); register_code(KC_LEFT); unregister_code(KC_LEFT);
   } else if (state->count == 2) {
@@ -151,7 +151,7 @@ void paranthesis_dance (qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-void curly_dance (qk_tap_dance_state_t *state, void *user_data) {
+void curly_dance (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     SEND_STRING("{}"); register_code(KC_LEFT); unregister_code(KC_LEFT);
   } else if (state->count == 2) {
@@ -161,7 +161,7 @@ void curly_dance (qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-void square_dance (qk_tap_dance_state_t *state, void *user_data) {
+void square_dance (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     SEND_STRING("[]"); register_code(KC_LEFT); unregister_code(KC_LEFT);
   } else if (state->count == 2) {
@@ -171,7 +171,7 @@ void square_dance (qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-void angular_dance (qk_tap_dance_state_t *state, void *user_data) {
+void angular_dance (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     SEND_STRING("<>"); register_code(KC_LEFT); unregister_code(KC_LEFT);
   } else if (state->count == 2) {
@@ -181,7 +181,7 @@ void angular_dance (qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-void tmux_dance (qk_tap_dance_state_t *state, void *user_data) {
+void tmux_dance (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     SEND_STRING("tmux"); register_code(KC_ENT); unregister_code(KC_ENT);
   } else if (state->count == 2) {
@@ -194,7 +194,7 @@ void tmux_dance (qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-void cmd_dance (qk_tap_dance_state_t *state, void *user_data) {
+void cmd_dance (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     register_mods(MOD_BIT(KC_LCTL));
     register_mods(MOD_BIT(KC_LALT));
@@ -219,7 +219,7 @@ void cmd_dance (qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-void cmd_sft_slash_pipe_down (qk_tap_dance_state_t *state, void *user_data) {
+void cmd_sft_slash_pipe_down (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     if (state->interrupted || state->pressed==0) {
       register_code (KC_NONUS_BACKSLASH);
@@ -232,7 +232,7 @@ void cmd_sft_slash_pipe_down (qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-void cmd_sft_slash_pipe_up (qk_tap_dance_state_t *state, void *user_data) {
+void cmd_sft_slash_pipe_up (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     if (keyboard_report->mods & MOD_BIT(KC_LSFT)) {
       unregister_code (KC_LSFT);
@@ -246,7 +246,7 @@ void cmd_sft_slash_pipe_up (qk_tap_dance_state_t *state, void *user_data) {
 }
 
  //All tap dance functions would go here. Only showing this one.
- qk_tap_dance_action_t tap_dance_actions[] = {
+ tap_dance_action_t tap_dance_actions[] = {
    [CLN] = ACTION_TAP_DANCE_DOUBLE (KC_SCLN, S(KC_SCLN ))
    ,[QUOT] = ACTION_TAP_DANCE_DOUBLE (KC_QUOT, S(KC_2))
    ,[CAD_CAE] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, NULL, cmd_dance )
diff --git a/keyboards/contra/rules.mk b/keyboards/contra/rules.mk
index c4e2ae20d1..4ed6c61a98 100755
--- a/keyboards/contra/rules.mk
+++ b/keyboards/contra/rules.mk
@@ -16,7 +16,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
-LAYOUTS = planck_mit ortho_4x12
 LAYOUTS_HAS_RGB = no
 
 # Disable unsupported hardware