diff --git a/keyboards/42keebs/basketweave_s/basketweave_s.c b/keyboards/42keebs/basketweave_s/basketweave_s.c
new file mode 100644
index 0000000000..79d80e5008
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/basketweave_s.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 null-ll
+ *
+ * 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 "basketweave_s.h"
diff --git a/keyboards/42keebs/basketweave_s/basketweave_s.h b/keyboards/42keebs/basketweave_s/basketweave_s.h
new file mode 100644
index 0000000000..76a927dde1
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/basketweave_s.h
@@ -0,0 +1,40 @@
+/* Copyright 2020 null-ll
+ *
+ * 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
+
+#define ____ KC_NO
+
+#include "quantum.h"
+
+enum encoder_names {
+ _LEFT,
+ _RIGHT,
+};
+
+#define LAYOUT_default( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
+ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
+ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \
+ K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K214, K315, \
+ K401, K402, K404, K406, K408, K410, K411, K412, K413, K314 \
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
+ { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \
+ { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \
+ { ____, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
+ { ____, K401, K402, ____, K404, ____, K406, ____, K408, ____, K410, K411, K412, K413, ____, ____ } \
+}
diff --git a/keyboards/42keebs/basketweave_s/config.h b/keyboards/42keebs/basketweave_s/config.h
new file mode 100644
index 0000000000..dfab9d9702
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/config.h
@@ -0,0 +1,61 @@
+/* Copyright 2020 null-ll
+ *
+ * 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 VENDOR_ID 0x6B62
+#define PRODUCT_ID 0x6869
+#define DEVICE_VER 0x0001
+#define MANUFACTURER 42. Keebs
+#define PRODUCT Basketweave-S
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+#define MATRIX_ROW_PINS { A6, C6, C7, A7, A5 }
+#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, B0, B1, B2, D5, D6, C5, C4, C3, C2, C1, C0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define USB_MAX_POWER_CONSUMPTION 100
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+#define ENCODERS_PAD_A { B3, D1 }
+#define ENCODERS_PAD_B { B4, D0 }
+#define ENCODER_RESOLUTION 4
+#define TAP_CODE_DELAY 10
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
diff --git a/keyboards/42keebs/basketweave_s/info.json b/keyboards/42keebs/basketweave_s/info.json
new file mode 100644
index 0000000000..4c11917c09
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/info.json
@@ -0,0 +1,85 @@
+{
+ "keyboard_name": "Basketweave",
+ "url": "https://github.com/piit79/basketweave-s",
+ "maintainer": "piit79",
+ "width": 20,
+ "height": 5.25,
+ "layouts": {
+ "LAYOUT_default": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0},
+ {"label":"~", "x":1.5, "y":0},
+ {"label":"!", "x":2.5, "y":0},
+ {"label":"@", "x":3.5, "y":0},
+ {"label":"#", "x":4.5, "y":0},
+ {"label":"$", "x":5.5, "y":0},
+ {"label":"%", "x":6.5, "y":0},
+ {"label":"^", "x":7.5, "y":0},
+ {"label":"&", "x":10.5, "y":0},
+ {"label":"*", "x":11.5, "y":0},
+ {"label":"(", "x":12.5, "y":0},
+ {"label":")", "x":13.5, "y":0},
+ {"label":"_", "x":14.5, "y":0},
+ {"label":"+", "x":15.5, "y":0},
+ {"label":"Backspace", "x":16.5, "y":0, "w":2},
+ {"label":"Del", "x":17.5, "y":0},
+ {"label":"Page Up", "x":19, "y":0},
+ {"label":"Insert", "x":0, "y":1},
+ {"label":"Tab", "x":1.5, "y":1, "w":1.5},
+ {"label":"Q", "x":3, "y":1},
+ {"label":"W", "x":4, "y":1},
+ {"label":"E", "x":5, "y":1},
+ {"label":"R", "x":6, "y":1},
+ {"label":"T", "x":7, "y":1},
+ {"label":"Y", "x":10, "y":1},
+ {"label":"U", "x":11, "y":1},
+ {"label":"I", "x":12, "y":1},
+ {"label":"O", "x":13, "y":1},
+ {"label":"P", "x":14, "y":1},
+ {"label":"{", "x":15, "y":1},
+ {"label":"}", "x":16, "y":1},
+ {"label":"|", "x":17, "y":1, "w":1.5},
+ {"label":"Page Dn", "x":19, "y":1},
+ {"label":"Mute", "x":0, "y":2},
+ {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
+ {"label":"A", "x":3.25, "y":2},
+ {"label":"S", "x":4.25, "y":2},
+ {"label":"D", "x":5.25, "y":2},
+ {"label":"F", "x":6.25, "y":2},
+ {"label":"G", "x":7.25, "y":2},
+ {"label":"H", "x":10.25, "y":2},
+ {"label":"J", "x":11.25, "y":2},
+ {"label":"K", "x":12.25, "y":2},
+ {"label":"L", "x":13.25, "y":2},
+ {"label":":", "x":14.25, "y":2},
+ {"label":"\"", "x":15.25, "y":2},
+ {"label":"Enter", "x":16.25, "y":2, "w":2.25},
+ {"label":"Del", "x":19, "y":2},
+ {"label":"Shift", "x":1.5, "y":3, "w":2.25},
+ {"label":"Z", "x":3.75, "y":3},
+ {"label":"X", "x":4.75, "y":3},
+ {"label":"C", "x":5.75, "y":3},
+ {"label":"V", "x":6.75, "y":3},
+ {"label":"B", "x":7.75, "y":3},
+ {"label":"B", "x":9.75, "y":3},
+ {"label":"N", "x":10.75, "y":3},
+ {"label":"M", "x":11.75, "y":3},
+ {"label":"<", "x":12.75, "y":3},
+ {"label":">", "x":13.75, "y":3},
+ {"label":"?", "x":14.75, "y":3},
+ {"label":"Shift", "x":15.75, "y":3, "w":1.75},
+ {"label":"Up", "x":17.75, "y":3.25},
+ {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
+ {"label":"Alt", "x":4.5, "y":4, "w":1.5},
+ {"label":"Space", "x":6, "y":4, "w":2},
+ {"label":"Fn", "x":8, "y":4},
+ {"label":"Space", "x":9.75, "y":4, "w":2.75},
+ {"label":"Alt", "x":12.5, "y":4, "w":1.5},
+ {"label":"Ctrl", "x":15, "y":4, "w":1.5},
+ {"label":"Left", "x":16.75, "y":4.25},
+ {"label":"Down", "x":17.75, "y":4.25},
+ {"label":"Right", "x":18.75, "y":4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/42keebs/basketweave_s/keymaps/default/keymap.c b/keyboards/42keebs/basketweave_s/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ed0cf7601d
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/keymaps/default/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2020 null-ll
+ *
+ * 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 "basketweave_s.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_default( /* base */
+ KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
+ KC_INS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
+ KC_MUTE, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
+ KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+ ),
+
+
+ [1] = LAYOUT_default( /* fn */
+ /* esc ` 1 2 3 4 5 6 7 8 9 0 - = bspc */
+ KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+ /* ins tab Q W E R T Y U I O P [ ] \ */
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ /* rotary caps A S D F G H J K L ; ' enter */
+ KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS,
+ /* shift Z X C V B B N M , . / shift up */
+ KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_PGUP, KC_TRNS,
+ /* ctrl alt space fn space alt ctrl left down right */
+ KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_RCTL, KC_HOME, KC_PGDN, KC_END
+ )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+ if (index == _LEFT) {
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+ } else if (index == _RIGHT) {
+ if (clockwise) {
+ tap_code(KC_MS_WH_DOWN);
+ } else {
+ tap_code(KC_MS_WH_UP);
+ }
+ }
+ return true;
+}
diff --git a/keyboards/42keebs/basketweave_s/keymaps/via/keymap.c b/keyboards/42keebs/basketweave_s/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ed0cf7601d
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2020 null-ll
+ *
+ * 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 "basketweave_s.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_default( /* base */
+ KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
+ KC_INS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
+ KC_MUTE, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
+ KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+ ),
+
+
+ [1] = LAYOUT_default( /* fn */
+ /* esc ` 1 2 3 4 5 6 7 8 9 0 - = bspc */
+ KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+ /* ins tab Q W E R T Y U I O P [ ] \ */
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ /* rotary caps A S D F G H J K L ; ' enter */
+ KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS,
+ /* shift Z X C V B B N M , . / shift up */
+ KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_PGUP, KC_TRNS,
+ /* ctrl alt space fn space alt ctrl left down right */
+ KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_RCTL, KC_HOME, KC_PGDN, KC_END
+ )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+ if (index == _LEFT) {
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+ } else if (index == _RIGHT) {
+ if (clockwise) {
+ tap_code(KC_MS_WH_DOWN);
+ } else {
+ tap_code(KC_MS_WH_UP);
+ }
+ }
+ return true;
+}
diff --git a/keyboards/42keebs/basketweave_s/keymaps/via/rules.mk b/keyboards/42keebs/basketweave_s/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/42keebs/basketweave_s/keymaps/vial/config.h b/keyboards/42keebs/basketweave_s/keymaps/vial/config.h
new file mode 100644
index 0000000000..c9d3df365a
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/keymaps/vial/config.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x82, 0x1C, 0x92, 0xC7, 0x6B, 0xC1, 0xB2, 0xA9}
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
+
+#define VIAL_ENCODER_DEFAULT { KC_VOLU, KC_VOLD, KC_MS_WH_UP, KC_MS_WH_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS }
diff --git a/keyboards/42keebs/basketweave_s/keymaps/vial/keymap.c b/keyboards/42keebs/basketweave_s/keymaps/vial/keymap.c
new file mode 100644
index 0000000000..fa85f2758d
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/keymaps/vial/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2020 null-ll
+ *
+ * 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 "basketweave_s.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_default( /* base */
+ KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
+ KC_INS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
+ KC_MUTE, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
+ KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+ ),
+
+
+ [1] = LAYOUT_default( /* fn */
+ /* esc ` 1 2 3 4 5 6 7 8 9 0 - = bspc */
+ KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+ /* ins tab Q W E R T Y U I O P [ ] \ */
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ /* rotary caps A S D F G H J K L ; ' enter */
+ KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS,
+ /* shift Z X C V B B N M , . / shift up */
+ KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_PGUP, KC_TRNS,
+ /* ctrl alt space fn space alt ctrl left down right */
+ KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_RCTL, KC_HOME, KC_PGDN, KC_END
+ )
+};
diff --git a/keyboards/42keebs/basketweave_s/keymaps/vial/rules.mk b/keyboards/42keebs/basketweave_s/keymaps/vial/rules.mk
new file mode 100644
index 0000000000..6f7f2b3173
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/keymaps/vial/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+VIAL_ENCODERS_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/42keebs/basketweave_s/keymaps/vial/vial.json b/keyboards/42keebs/basketweave_s/keymaps/vial/vial.json
new file mode 100644
index 0000000000..4df5c010c3
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/keymaps/vial/vial.json
@@ -0,0 +1,348 @@
+{
+ "name": "Basketweave",
+ "vendorId": "0x6B62",
+ "productId": "0x6869",
+ "lighting": "none",
+ "matrix": {
+ "rows": 5,
+ "cols": 16
+ },
+ "layouts": {
+ "labels": [
+ "Split Backspace"
+ ],
+ "keymap": [
+ {
+ "name": "Basketweave"
+ },
+ [
+ {
+ "y": 0.25,
+ "x": 16.15,
+ "c": "#aaaaaa"
+ },
+ "0,14\n\n\n0,1",
+ "3,15\n\n\n0,1"
+ ],
+ [
+ {
+ "y": -0.10000000000000009,
+ "x": 1.5,
+ "c": "#777777"
+ },
+ "0,0",
+ {
+ "x": 16,
+ "c": "#aaaaaa"
+ },
+ "0,15"
+ ],
+ [
+ {
+ "y": -0.95,
+ "x": 4.75,
+ "c": "#cccccc"
+ },
+ "0,3",
+ {
+ "x": 8.4
+ },
+ "0,12"
+ ],
+ [
+ {
+ "y": -0.9500000000000002,
+ "x": 2.75
+ },
+ "0,1",
+ "0,2",
+ {
+ "x": 10.4
+ },
+ "0,13",
+ {
+ "c": "#aaaaaa",
+ "w": 2
+ },
+ "0,14\n\n\n0,0"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,1\n\n\n\n\n\n\n\n\ne",
+ {
+ "x": 18.5
+ },
+ "1,1\n\n\n\n\n\n\n\n\ne"
+ ],
+ [
+ {
+ "y": -0.3500000000000001,
+ "x": 1.25
+ },
+ "1,0",
+ {
+ "x": 16.5,
+ "c": "#aaaaaa"
+ },
+ "1,15"
+ ],
+ [
+ {
+ "y": -0.9499999999999997,
+ "x": 14,
+ "c": "#cccccc"
+ },
+ "1,11"
+ ],
+ [
+ {
+ "y": -0.9500000000000002,
+ "x": 2.5,
+ "c": "#aaaaaa",
+ "w": 1.5
+ },
+ "1,1",
+ {
+ "c": "#cccccc"
+ },
+ "1,2",
+ {
+ "x": 10
+ },
+ "1,12",
+ "1,13",
+ {
+ "w": 1.5
+ },
+ "1,14"
+ ],
+ [
+ {
+ "y": -0.75
+ },
+ "0,0\n\n\n\n\n\n\n\n\ne",
+ {
+ "x": 19
+ },
+ "1,0\n\n\n\n\n\n\n\n\ne"
+ ],
+ [
+ {
+ "y": -0.3500000000000001,
+ "x": 1
+ },
+ "2,0",
+ {
+ "x": 17,
+ "c": "#aaaaaa"
+ },
+ "2,15"
+ ],
+ [
+ {
+ "y": -0.9000000000000004,
+ "x": 2.25,
+ "w": 1.75
+ },
+ "2,1",
+ {
+ "c": "#cccccc"
+ },
+ "2,2",
+ {
+ "x": 9.4
+ },
+ "2,11",
+ "2,12",
+ {
+ "c": "#777777",
+ "w": 2.25
+ },
+ "2,13"
+ ],
+ [
+ {
+ "x": 2,
+ "c": "#aaaaaa",
+ "w": 2.25
+ },
+ "3,1",
+ {
+ "c": "#cccccc"
+ },
+ "3,2",
+ {
+ "x": 8.85
+ },
+ "3,11",
+ "3,12",
+ {
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "3,13"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 18.1,
+ "c": "#777777"
+ },
+ "2,14"
+ ],
+ [
+ {
+ "y": -0.25,
+ "x": 2,
+ "c": "#aaaaaa",
+ "w": 1.5
+ },
+ "4,1",
+ {
+ "x": 11.85,
+ "w": 1.5
+ },
+ "4,11"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 17.1,
+ "c": "#777777"
+ },
+ "4,12",
+ {
+ "x": 1
+ },
+ "3,14"
+ ],
+ [
+ {
+ "ry": 0.25,
+ "y": 5.25,
+ "x": 18.1
+ },
+ "4,13"
+ ],
+ [
+ {
+ "r": 12,
+ "ry": 0,
+ "x": 6.1,
+ "c": "#cccccc"
+ },
+ "0,4",
+ "0,5",
+ "0,6",
+ "0,7"
+ ],
+ [
+ {
+ "x": 5.6
+ },
+ "1,3",
+ "1,4",
+ "1,5",
+ "1,6"
+ ],
+ [
+ {
+ "x": 5.85
+ },
+ "2,3",
+ "2,4",
+ "2,5",
+ "2,6"
+ ],
+ [
+ {
+ "x": 6.3
+ },
+ "3,3",
+ "3,4",
+ "3,5",
+ "3,6"
+ ],
+ [
+ {
+ "x": 7.55,
+ "w": 2
+ },
+ "4,4",
+ {
+ "x": 0.049999999999998934,
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "4,6"
+ ],
+ [
+ {
+ "y": -0.8899999999999997,
+ "x": 6,
+ "w": 1.5
+ },
+ "4,2"
+ ],
+ [
+ {
+ "r": -12,
+ "y": -1.0100000000000007,
+ "x": 9.45,
+ "c": "#cccccc"
+ },
+ "0,8",
+ "0,9",
+ "0,10",
+ "0,11"
+ ],
+ [
+ {
+ "x": 9.05
+ },
+ "1,7",
+ "1,8",
+ "1,9",
+ "1,10"
+ ],
+ [
+ {
+ "x": 9.2
+ },
+ "2,7",
+ "2,8",
+ "2,9",
+ "2,10"
+ ],
+ [
+ {
+ "x": 8.75
+ },
+ "3,7",
+ "3,8",
+ "3,9",
+ "3,10"
+ ],
+ [
+ {
+ "x": 8.75,
+ "w": 2.75
+ },
+ "4,8"
+ ],
+ [
+ {
+ "y": -0.9000000000000004,
+ "x": 11.55,
+ "c": "#aaaaaa",
+ "w": 1.5
+ },
+ "4,10"
+ ]
+ ]
+ }
+}
diff --git a/keyboards/42keebs/basketweave_s/readme.md b/keyboards/42keebs/basketweave_s/readme.md
new file mode 100644
index 0000000000..10418b06d1
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/readme.md
@@ -0,0 +1,17 @@
+# Basketweave-S
+
+
+
+A through-hole Alice style keyboard with arrow keys, symmetric macro keys, and rotary encoders
+
+Based on [null-l's Basketweave](https://github.com/null-l/basketweave)
+
+* Keyboard Maintainer: [GerritPlehn](https://github.com/piit79)
+* Hardware Supported: atmega32a
+* Hardware Availability: [42. Keebs](https://42keebs.eu), [Github](https://github.com/piit79/basketweave-s)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make 42keebs/basketweave: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/42keebs/basketweave_s/rules.mk b/keyboards/42keebs/basketweave_s/rules.mk
new file mode 100644
index 0000000000..f3ae898749
--- /dev/null
+++ b/keyboards/42keebs/basketweave_s/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = atmega32a
+
+# Processor frequency
+F_CPU = 16000000
+
+# Bootloader selection
+BOOTLOADER = USBasp
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # 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
+ENCODER_ENABLE = yes