diff --git a/keyboards/afternoonlabs/breeze/rev1/readme.md b/keyboards/afternoonlabs/breeze/rev1/readme.md
index 9d845f6f37..604d95f252 100644
--- a/keyboards/afternoonlabs/breeze/rev1/readme.md
+++ b/keyboards/afternoonlabs/breeze/rev1/readme.md
@@ -4,9 +4,9 @@
Split ergonomics meets productivity. Breeze Rev1 is a split keyboard with 6×4 keys, 4 key thumb cluster, arrow keys, and a 6 key macro cluster, with ortholinear column-staggered.
-* Keyboard Maintainer: [Eithan Shavit](https://github.com/eithanshavit)
+* Keyboard Maintainer: [AfternoonLabs](https://github.com/afternoonlabs)
* Hardware Supported: Breeze Rev1 PCB
-* Hardware Availability: Coming soon
+* Hardware Availability: [store.afternoonlab.com](https://store.afternoonlabs.com)
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/afternoonlabs/breeze/rev1/rules.mk b/keyboards/afternoonlabs/breeze/rev1/rules.mk
index d1847482f6..773650d128 100644
--- a/keyboards/afternoonlabs/breeze/rev1/rules.mk
+++ b/keyboards/afternoonlabs/breeze/rev1/rules.mk
@@ -9,8 +9,8 @@ BOOTLOADER = caterina
#
SPLIT_KEYBOARD = yes
BOOTMAGIC_ENABLE = lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/afternoonlabs/oceanbreeze/config.h b/keyboards/afternoonlabs/oceanbreeze/config.h
new file mode 100644
index 0000000000..1197fa2257
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Afternoon Labs
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/afternoonlabs/oceanbreeze/keymaps/default/keymap.c b/keyboards/afternoonlabs/oceanbreeze/keymaps/default/keymap.c
new file mode 100644
index 0000000000..73d0dda0f3
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/keymaps/default/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2021 Afternoon Labs
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+ _MAIN,
+ _LOWER,
+ _RAISE,
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_MAIN] = LAYOUT(
+ //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_MINS, KC_EQL, KC_GRV,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_LBRC, KC_RBRC, KC_BSLS,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_UP,
+ //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LEFT, KC_DOWN, KC_RIGHT,
+ //└────────┴────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┴────────┴────────┴────────┘└────────┴────────┴────────┘
+ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_ENT, RAISE, LOWER, XXXXXXX
+ // └────────┴────────┴────────┴────────┘ └────────┴────────┴────────┴────────┘
+ ),
+
+ [_LOWER] = LAYOUT(
+ //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ //└────────┴────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┴────────┴────────┴────────┘└────────┴────────┴────────┘
+ _______, _______, _______, _______, _______, _______, _______, _______
+ // └────────┴────────┴────────┴────────┘ └────────┴────────┴────────┴────────┘
+ ),
+
+ [_RAISE] = LAYOUT(
+ //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐
+ _______, _______, _______, _______, _______, _______, _______, KC_PEQL, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
+ _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, _______, _______, _______, _______,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
+ _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______,
+ //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______, _______,
+ //└────────┴────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┴────────┴────────┴────────┘└────────┴────────┴────────┘
+ _______, _______, _______, _______, _______, _______, KC_P0, KC_PDOT
+ // └────────┴────────┴────────┴────────┘ └────────┴────────┴────────┴────────┘
+ )
+};
diff --git a/keyboards/afternoonlabs/oceanbreeze/keymaps/default/readme.md b/keyboards/afternoonlabs/oceanbreeze/keymaps/default/readme.md
new file mode 100644
index 0000000000..109b0f5e77
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/keymaps/default/readme.md
@@ -0,0 +1,5 @@
+# Default Ocean Breeze Layout
+
+
+
+This is the default suggested layout for Ocean Breeze Split Keyboard.
diff --git a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c b/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c
new file mode 100644
index 0000000000..35268ecf6f
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Afternoon Labs
+ *
+ * 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 .
+ */
+
+#include "oceanbreeze.h"
diff --git a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h b/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h
new file mode 100644
index 0000000000..f51f55de13
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 Afternoon Labs
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#ifdef KEYBOARD_afternoonlabs_oceanbreeze_rev1
+# include "rev1.h"
+#endif
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
new file mode 100644
index 0000000000..6afe6b54e8
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2021 Afternoon Labs
+ *
+ * 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 .
+ */
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x616C
+#define PRODUCT_ID 0x0003
+#define DEVICE_VER 0x0001
+#define MANUFACTURER AfternoonLabs
+#define PRODUCT OceanBreeze
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 9
+
+// wiring of each half
+#define MATRIX_ROW_PINS \
+ { F4, F5, F6, F7, B1, B6 }
+#define MATRIX_COL_PINS \
+ { B2, D1, D0, D4, C6, D7, E6, B4, B5 }
+
+#define SPLIT_HAND_PIN B3
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define SOFT_SERIAL_PIN D2
+
+#define DIODE_DIRECTION COL2ROW
+
+#define BOOTMAGIC_LITE_ROW_RIGHT 0
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
+#define BOOTMAGIC_LITE_ROW_LEFT 0
+#define BOOTMAGIC_LITE_COLUMN_LEFT 5
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
new file mode 100644
index 0000000000..db7d533d12
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
@@ -0,0 +1,86 @@
+{
+ "keyboard_name": "OceanBreeze",
+ "url": "afternoonlabs.com",
+ "productId": "0x0003",
+ "maintainer": "afternoonlabs",
+ "width": 19,
+ "height": 6,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x":0, "y":0.375},
+ {"x":1, "y":0.375},
+ {"x":2, "y":0.125},
+ {"x":3, "y":0},
+ {"x":4, "y":0.125},
+ {"x":5, "y":0.25},
+ {"x":9.75, "y":0.25},
+ {"x":10.75, "y":0.125},
+ {"x":11.75, "y":0},
+ {"x":12.75, "y":0.125},
+ {"x":13.75, "y":0.375},
+ {"x":14.75, "y":0.375},
+ {"x":16, "y":0.375},
+ {"x":17, "y":0.375},
+ {"x":18, "y":0.375},
+
+ {"x":0, "y":1.375},
+ {"x":1, "y":1.375},
+ {"x":2, "y":1.125},
+ {"x":3, "y":1},
+ {"x":4, "y":1.125},
+ {"x":5, "y":1.25},
+ {"x":9.75, "y":1.25},
+ {"x":10.75, "y":1.125},
+ {"x":11.75, "y":1},
+ {"x":12.75, "y":1.125},
+ {"x":13.75, "y":1.375},
+ {"x":14.75, "y":1.375},
+ {"x":16, "y":1.375},
+ {"x":17, "y":1.375},
+ {"x":18, "y":1.375},
+
+ {"x":0, "y":2.375},
+ {"x":1, "y":2.375},
+ {"x":2, "y":2.125},
+ {"x":3, "y":2},
+ {"x":4, "y":2.125},
+ {"x":5, "y":2.25},
+ {"x":9.75, "y":2.25},
+ {"x":10.75, "y":2.125},
+ {"x":11.75, "y":2},
+ {"x":12.75, "y":2.125},
+ {"x":13.75, "y":2.375},
+ {"x":14.75, "y":2.375},
+ {"x":17, "y":2.375},
+
+ {"x":0, "y":3.375},
+ {"x":1, "y":3.375},
+ {"x":2, "y":3.125},
+ {"x":3, "y":3},
+ {"x":4, "y":3.125},
+ {"x":5, "y":3.25},
+ {"x":6.25, "y":3.75},
+ {"x":8.5, "y":3.75},
+ {"x":9.75, "y":3.25},
+ {"x":10.75, "y":3.125},
+ {"x":11.75, "y":3},
+ {"x":12.75, "y":3.125},
+ {"x":13.75, "y":3.375},
+ {"x":14.75, "y":3.375},
+ {"x":16, "y":3.375},
+ {"x":17, "y":3.375},
+ {"x":18, "y":3.375},
+
+ {"x":2.5, "y":4.25},
+ {"x":3.5, "y":4.25},
+ {"x":4.5, "y":4.5},
+ {"x":6.25, "y":4.75},
+ {"x":8.5, "y":4.75},
+ {"x":10.25, "y":4.5},
+ {"x":11.25, "y":4.25},
+ {"x":12.25, "y":4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/readme.md b/keyboards/afternoonlabs/oceanbreeze/rev1/readme.md
new file mode 100644
index 0000000000..0b82913c4b
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/readme.md
@@ -0,0 +1,15 @@
+# Breeze
+
+
+
+Special Edition of the [Breeze](https://afternoonlabs.com). This one has two 1Us instead of the larger 2U on the thumb cluster.
+
+* Keyboard Maintainer: [AfternoonLabs](https://github.com/afternoonlabs)
+* Hardware Supported: Ocean Breeze Rev1 PCB
+* Hardware Availability: [store.afternoonlab.com](https://store.afternoonlabs.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make afternoonlabs/oceanbreeze/rev1:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c
new file mode 100644
index 0000000000..35268ecf6f
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Afternoon Labs
+ *
+ * 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 .
+ */
+
+#include "oceanbreeze.h"
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h
new file mode 100644
index 0000000000..36de22ec18
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h
@@ -0,0 +1,44 @@
+/* Copyright 2021 Afternoon Labs
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#include "oceanbreeze.h"
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, MC0, MC1, MC2, \
+ L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, MC3, MC4, MC5, \
+ L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, AUP, \
+ L30, L31, L32, L33, L34, L35, LT4, RT1, R30, R31, R32, R33, R34, R35, ALT, ADN, ART, \
+ LT0, LT1, LT2, LT3, RT2, RT3, RT4, RT5 \
+) { \
+ { L05, L04, L03, L02, L01, L00, XXX, XXX, XXX }, \
+ { L15, L14, L13, L12, L11, L10, XXX, XXX, XXX }, \
+ { L25, L24, L23, L22, L21, L20, XXX, XXX, XXX }, \
+ { L35, L34, L33, L32, L31, L30, XXX, XXX, XXX }, \
+ { LT3, LT2, LT1, LT0, XXX, XXX, XXX, XXX, XXX }, \
+ { LT4, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
+ { R00, R01, R02, R03, R04, R05, MC0, MC1, MC2 }, \
+ { R10, R11, R12, R13, R14, R15, MC3, MC4, MC5 }, \
+ { R20, R21, R22, R23, R24, R25, XXX, AUP, XXX }, \
+ { R30, R31, R32, R33, R34, R35, ALT, ADN, ART }, \
+ { RT2, RT3, RT4, RT5, XXX, XXX, XXX, XXX, XXX }, \
+ { RT1, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
+}
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk b/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk
new file mode 100644
index 0000000000..96875e4ffe
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = yes # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
+SPLIT_KEYBOARD = yes