diff --git a/halcyon_info.json b/halcyon_info.json
index 788919b8..7a4bbab4 100644
--- a/halcyon_info.json
+++ b/halcyon_info.json
@@ -63,6 +63,82 @@
                 {"matrix": [9, 3], "x": 12.5, "y": 6},
                 {"matrix": [9, 4], "x": 11.5, "y": 6}
             ]
+        },
+        "LAYOUT_elora_hlc": {
+            "layout": [
+                {"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
+                {"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
+                {"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25},
+                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
+                {"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
+                {"label": "R01", "matrix": [6, 1], "x": 10.5, "y": 0.5},
+                {"label": "R02", "matrix": [6, 2], "x": 11.5, "y": 0.25},
+                {"label": "R03", "matrix": [6, 3], "x": 12.5, "y": 0},
+                {"label": "R04", "matrix": [6, 4], "x": 13.5, "y": 0.25},
+                {"label": "R05", "matrix": [6, 5], "x": 14.5, "y": 0.75},
+                {"label": "R06", "matrix": [6, 6], "x": 15.5, "y": 0.75},
+                {"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75},
+                {"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75},
+                {"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25},
+                {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
+                {"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
+                {"label": "R07", "matrix": [7, 1], "x": 10.5, "y": 1.5},
+                {"label": "R08", "matrix": [7, 2], "x": 11.5, "y": 1.25},
+                {"label": "R09", "matrix": [7, 3], "x": 12.5, "y": 1},
+                {"label": "R10", "matrix": [7, 4], "x": 13.5, "y": 1.25},
+                {"label": "R11", "matrix": [7, 5], "x": 14.5, "y": 1.75},
+                {"label": "R12", "matrix": [7, 6], "x": 15.5, "y": 1.75},
+                {"label": "L18", "matrix": [2, 6], "x": 0, "y": 2.75},
+                {"label": "L17", "matrix": [2, 5], "x": 1, "y": 2.75},
+                {"label": "L16", "matrix": [2, 4], "x": 2, "y": 2.25},
+                {"label": "L15", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "L14", "matrix": [2, 2], "x": 4, "y": 2.25},
+                {"label": "L13", "matrix": [2, 1], "x": 5, "y": 2.5},
+                {"label": "R13", "matrix": [8, 1], "x": 10.5, "y": 2.5},
+                {"label": "R14", "matrix": [8, 2], "x": 11.5, "y": 2.25},
+                {"label": "R15", "matrix": [8, 3], "x": 12.5, "y": 2},
+                {"label": "R16", "matrix": [8, 4], "x": 13.5, "y": 2.25},
+                {"label": "R17", "matrix": [8, 5], "x": 14.5, "y": 2.75},
+                {"label": "R18", "matrix": [8, 6], "x": 15.5, "y": 2.75},
+                {"label": "L26", "matrix": [3, 6], "x": 0, "y": 3.75},
+                {"label": "L25", "matrix": [3, 5], "x": 1, "y": 3.75},
+                {"label": "L24", "matrix": [3, 4], "x": 2, "y": 3.25},
+                {"label": "L23", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "L22", "matrix": [3, 2], "x": 4, "y": 3.25},
+                {"label": "L21", "matrix": [3, 1], "x": 5, "y": 3.5},
+                {"label": "L20", "matrix": [4, 3], "x": 6, "y": 4},
+                {"label": "L19", "matrix": [3, 0], "x": 7, "y": 4.25},
+                {"label": "R19", "matrix": [9, 0], "x": 8.5, "y": 4.25},
+                {"label": "R20", "matrix": [10, 3], "x": 9.5, "y": 4},
+                {"label": "R21", "matrix": [9, 1], "x": 10.5, "y": 3.5},
+                {"label": "R22", "matrix": [9, 2], "x": 11.5, "y": 3.25},
+                {"label": "R23", "matrix": [9, 3], "x": 12.5, "y": 3},
+                {"label": "R24", "matrix": [9, 4], "x": 13.5, "y": 3.25},
+                {"label": "R26", "matrix": [9, 5], "x": 14.5, "y": 3.75},
+                {"label": "R27", "matrix": [9, 6], "x": 15.5, "y": 3.75},
+                {"label": "L31", "matrix": [4, 4], "x": 2.5, "y": 4.25},
+                {"label": "L30", "matrix": [4, 2], "x": 3.5, "y": 4.25},
+                {"label": "L29", "matrix": [4, 1], "x": 4.5, "y": 4.5},
+                {"label": "L28", "matrix": [4, 5], "x": 5.5, "y": 5},
+                {"label": "L27", "matrix": [4, 0], "x": 6.5, "y": 5.25},
+                {"label": "R27", "matrix": [10, 0], "x": 9, "y": 5.25},
+                {"label": "R28", "matrix": [10, 5], "x": 10, "y": 5},
+                {"label": "R29", "matrix": [10, 1], "x": 11, "y": 4.5},
+                {"label": "R30", "matrix": [10, 2], "x": 12, "y": 4.25},
+                {"label": "R31", "matrix": [10, 4], "x": 13, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 7},
+                {"matrix": [5, 1], "x": 1, "y": 7},
+                {"matrix": [5, 2], "x": 2, "y": 7},
+                {"matrix": [5, 3], "x": 3, "y": 7},
+                {"matrix": [5, 4], "x": 4, "y": 7},
+                {"matrix": [11, 0], "x": 15.5, "y": 7},
+                {"matrix": [11, 1], "x": 14.5, "y": 7},
+                {"matrix": [11, 2], "x": 13.5, "y": 7},
+                {"matrix": [11, 3], "x": 12.5, "y": 7},
+                {"matrix": [11, 4], "x": 11.5, "y": 7}
+            ]
         }
     }
 }
diff --git a/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/keymap.c b/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/keymap.c
index bbde0cdb..1cbc5f20 100644
--- a/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/keymap.c
+++ b/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | MUTE | ____ | _____ | ____ | ____ |                                              | MUTE | ____ | _____ | ____ | ____ |
  * `-----------------------------------'                                              `-----------------------------------'
  */
-    [_QWERTY] = LAYOUT_split_4x6_5_hlc(
+    [_QWERTY] = LAYOUT_elora_hlc(
      KC_ESC  , KC_1 ,  KC_2   ,  KC_3  ,   KC_4 ,   KC_5 ,                                        KC_6 ,  KC_7 ,  KC_8 ,   KC_9 ,  KC_0 , KC_ESC ,
      KC_TAB  , KC_Q ,  KC_W   ,  KC_E  ,   KC_R ,   KC_T ,                                        KC_Y,   KC_U ,  KC_I ,   KC_O ,  KC_P , KC_BSPC,
      CTL_ESC , KC_A ,  KC_S   ,  KC_D  ,   KC_F ,   KC_G ,                                        KC_H,   KC_J ,  KC_K ,   KC_L ,KC_SCLN,CTL_QUOT,
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | MUTE | ____ | _____ | ____ | ____ |                                              | MUTE | ____ | _____ | ____ | ____ |
  * `-----------------------------------'                                              `-----------------------------------'
  */
-    [_DVORAK] = LAYOUT_split_4x6_5_hlc(
+    [_DVORAK] = LAYOUT_elora_hlc(
      KC_ESC  , KC_1 ,  KC_2   ,  KC_3  ,   KC_4 ,   KC_5 ,                                        KC_6 ,  KC_7 ,  KC_8 ,   KC_9 ,  KC_0 , KC_ESC ,
      KC_TAB  ,KC_QUOTE,KC_COMM,  KC_DOT,   KC_P ,   KC_Y ,                                        KC_F,   KC_G ,  KC_C ,   KC_R ,  KC_L , KC_BSPC,
      CTL_ESC , KC_A ,  KC_O   ,  KC_E  ,   KC_U ,   KC_I ,                                        KC_D,   KC_H ,  KC_T ,   KC_N ,  KC_S , CTL_MINS,
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | MUTE | ____ | _____ | ____ | ____ |                                              | MUTE | ____ | _____ | ____ | ____ |
  * `-----------------------------------'                                              `-----------------------------------'
  */
-    [_COLEMAK_DH] = LAYOUT_split_4x6_5_hlc(
+    [_COLEMAK_DH] = LAYOUT_elora_hlc(
      KC_ESC  , KC_1 ,  KC_2   ,  KC_3  ,   KC_4 ,   KC_5 ,                                        KC_6 ,  KC_7 ,  KC_8 ,   KC_9 ,  KC_0 , KC_ESC ,
      KC_TAB  , KC_Q ,  KC_W   ,  KC_F  ,   KC_P ,   KC_B ,                                        KC_J,   KC_L ,  KC_U ,   KC_Y ,KC_SCLN, KC_BSPC,
      CTL_ESC , KC_A ,  KC_R   ,  KC_S  ,   KC_T ,   KC_G ,                                        KC_M,   KC_N ,  KC_E ,   KC_I ,  KC_O , CTL_QUOT,
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |       |      |      |                                              |      |      |       |      |      |
  * `-----------------------------------'                                              `-----------------------------------'
  */
-    [_NAV] = LAYOUT_split_4x6_5_hlc(
+    [_NAV] = LAYOUT_elora_hlc(
       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______,                                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_VOLU, KC_DEL,
       _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, _______,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_INS,
@@ -165,7 +165,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |       |      |      |                                              |      |      |       |      |      |
  * `-----------------------------------'                                              `-----------------------------------'
  */
-    [_SYM] = LAYOUT_split_4x6_5_hlc(
+    [_SYM] = LAYOUT_elora_hlc(
       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
       KC_GRV ,   KC_1 ,   KC_2 ,   KC_3 ,   KC_4 ,   KC_5 ,                                       KC_6 ,   KC_7 ,   KC_8 ,   KC_9 ,   KC_0 , KC_EQL ,
      KC_TILD , KC_EXLM,  KC_AT , KC_HASH,  KC_DLR, KC_PERC,                                     KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS,
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |       |      |      |                                              |      |      |       |      |      |
  * `-----------------------------------'                                              `-----------------------------------'
  */
-    [_FUNCTION] = LAYOUT_split_4x6_5_hlc(
+    [_FUNCTION] = LAYOUT_elora_hlc(
       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
       _______,  KC_F9 ,  KC_F10,  KC_F11,  KC_F12, _______,                                     _______, _______, _______, _______, _______, _______,
       _______,  KC_F5 ,  KC_F6 ,  KC_F7 ,  KC_F8 , _______,                                     _______, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, _______,
@@ -221,7 +221,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |       |      |      |                                              |      |      |       |      |      |
  * `-----------------------------------'                                              `-----------------------------------'
  */
-    [_ADJUST] = LAYOUT_split_4x6_5_hlc(
+    [_ADJUST] = LAYOUT_elora_hlc(
       _______, _______, _______, _______, _______, _______,                                    _______, _______, _______, _______,  _______, _______,
       _______, _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______,  _______, _______,
       _______, _______, _______, DVORAK , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, _______,
@@ -247,9 +247,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //  *                        `----------------------------------'  `----------------------------------'
 //  * ,-----------------------------------.                                              ,-----------------------------------.
 //  * |      |      |       |      |      |                                              |      |      |       |      |      |
-//  * `-----------------------------------'                                              `-----------------------------------' 
+//  * `-----------------------------------'                                              `-----------------------------------'
 //  */
-//     [_LAYERINDEX] = LAYOUT_split_4x6_5_hlc(
+//     [_LAYERINDEX] = LAYOUT_elora_hlc(
 //       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
 //       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
 //       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
@@ -258,4 +258,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      _______, _______,  _______, _______, _______,                                                       _______, _______, _______, _______, _______
 //     ),
 //
-};
\ No newline at end of file
+};
diff --git a/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/keymap.json b/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/keymap.json
index d28d0eac..3275d84a 100644
--- a/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/keymap.json
+++ b/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/keymap.json
@@ -2,7 +2,7 @@
     "keyboard": "splitkb/halcyon/elora/rev2",
     "keymap": "vial-hlc",
     "version": 1,
-    "layout": "LAYOUT_split_4x6_5_hlc",
+    "layout": "LAYOUT_elora_hlc",
     "layers": [
         [
             "KC_ESC"               , "KC_1"    , "KC_2"    , "KC_3"    , "KC_4"                 , "KC_5"    ,                                                 "KC_6"    , "KC_7"    , "KC_8"    , "KC_9"    , "KC_0"    , "KC_ESC"                 ,
diff --git a/users/halcyon_modules/splitkb/config.h b/users/halcyon_modules/splitkb/config.h
index f81adc42..08aee454 100644
--- a/users/halcyon_modules/splitkb/config.h
+++ b/users/halcyon_modules/splitkb/config.h
@@ -56,7 +56,7 @@
     #define ENCODER_B_PINS { GP18, HLC_ENCODER_B }
     #undef MATRIX_ROWS
     #define MATRIX_ROWS 12
-    #define LAYOUT_split_4x6_5_hlc(k0G, k0F, k0E, k0D, k0C, k0B, k6B, k6C, k6D, k6E, k6F, k6G, k1G, k1F, k1E, k1D, k1C, k1B, k7B, k7C, k7D, k7E, k7F, k7G, k2G, k2F, k2E, k2D, k2C, k2B, k8B, k8C, k8D, k8E, k8F, k8G, k3G, k3F, k3E, k3D, k3C, k3B, k4D, k3A, k9A, k10D, k9B, k9C, k9D, k9E, k9F, k9G, k4E, k4C, k4B, k4F, k4A, k10A, k10F, k10B, k10C, k10E, k5A, k5B, k5C, k5D, k5E, k11A, k11B, k11C, k11D, k11E) { \
+    #define LAYOUT_elora_hlc(k0G, k0F, k0E, k0D, k0C, k0B, k6B, k6C, k6D, k6E, k6F, k6G, k1G, k1F, k1E, k1D, k1C, k1B, k7B, k7C, k7D, k7E, k7F, k7G, k2G, k2F, k2E, k2D, k2C, k2B, k8B, k8C, k8D, k8E, k8F, k8G, k3G, k3F, k3E, k3D, k3C, k3B, k4D, k3A, k9A, k10D, k9B, k9C, k9D, k9E, k9F, k9G, k4E, k4C, k4B, k4F, k4A, k10A, k10F, k10B, k10C, k10E, k5A, k5B, k5C, k5D, k5E, k11A, k11B, k11C, k11D, k11E) { \
 	 {KC_NO, k0B, k0C, k0D, k0E, k0F, k0G}, \
 	 {KC_NO, k1B, k1C, k1D, k1E, k1F, k1G}, \
 	 {KC_NO, k2B, k2C, k2D, k2E, k2F, k2G}, \