Merge remote-tracking branch 'origin/master' into develop

16 files changed, 500 insertions, 66 deletions

diff --git a/keyboards/keebio/iris/keymaps/adamgate/config.h b/keyboards/keebio/iris/keymaps/adamgate/config.h
new file mode 100644
index 0000000000..48653a123e
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/adamgate/config.h
@@ -0,0 +1,24 @@
+/*
+Copyright 2022 Adam Applegate
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// #define USE_I2C
+#define EE_HANDS
+#define TAPPING_TOGGLE 3    //# of button presses needed to permanently toggle a layer
+// #define TAPPING_TERM 150     //# of ms before another input is accepted for tap dancing
+// #define RGBLIGHT_LAYERS 4   //# of layer of rgb (max of 8)ASDASDASDASDFASDF
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/adamgate/keymap.c b/keyboards/keebio/iris/keymaps/adamgate/keymap.c
new file mode 100644
index 0000000000..84c3b74711
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/adamgate/keymap.c
@@ -0,0 +1,82 @@
+/*
+  Copyright (c) 2022 Adam Applegate
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+  _QWERTY,
+  _LOWER,
+  _GAMING,
+  _RISE,
+}
+
+/*****************
+*** TAPDANCES ***
+*****************/
+enum custom_tapdances {
+   TD_SHFT_CAPS = 0,
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [TD_SHFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS), //shift if pressed 1x, caps lock if pressed 2x
+};
+
+/*****************
+***  KEYMAPS  ***
+*****************/
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+   // layout for everyday use
+  [_QWERTY] = LAYOUT(
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,
+     TD(TD_SHFT_CAPS), KC_A,    KC_S,    KC_D,    KC_F,  KC_G,                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,  KC_DEL,              KC_ENT, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_BSLS,
+                                        KC_RALT, KC_LGUI, KC_BSPC,         KC_SPC, TT(_LOWER), _______
+  ),
+
+  [_LOWER] = LAYOUT(
+     KC_GRAVE, KC_F1,  KC_F2,  KC_F3,  KC_F4,   KC_F5,                               KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_PEQL,
+     KC_F11,  KC_F12,  KC_UP,  _______, _______, KC_LPRN,                            KC_RPRN,  KC_7,    KC_8,    KC_9,   KC_PSLS, KC_PAST,
+     KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_LCBR,                           KC_RCBR,  KC_4,    KC_5,    KC_6,   KC_PMNS, KC_PPLS,
+     KC_LCTL, _______, _______, _______, _______, KC_LBRC, KC_DEL,            KC_ENT, KC_RBRC,  KC_1,    KC_2,    KC_3,   KC_PDOT, _______,
+                                       _______, TO(_QWERTY), KC_BSPC,         KC_SPC, TG(_GAMING), KC_0
+  ),
+
+  //makes gaming easier, adding a space for jumping closer to the movement keys
+  [_GAMING] = LAYOUT(
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,
+     KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,  KC_DEL,             KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_BSLS,
+                                        KC_RALT, KC_SPC, KC_BSPC,           KC_SPC, TG(_RAISE), TO(_LOWER) 
+  ),
+
+  //used for editing rgb settings, sound, and misc commands
+  [_RAISE] = LAYOUT(
+     RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,                            KC_MUTE, KC_VOLU, KC_MNXT, _______, KC_BRIU, KC_CALC,
+    _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,                            KC_MSTP, KC_VOLD, KC_MPRV, _______, KC_BRID, KC_MYCM,
+     DM_REC1, DM_REC2, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, KC_WSCH,
+     DM_PLY1, DM_PLY2, _______, _______, _______, _______, _______,         _______, _______, _______,  _______, _______, _______, _______,
+                                       DM_RSTP, TO(_GAMING), _______,        _______, _______, _______
+  )
+};
diff --git a/keyboards/keebio/iris/keymaps/adamgate/rules.mk b/keyboards/keebio/iris/keymaps/adamgate/rules.mk
new file mode 100644
index 0000000000..916d614967
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/adamgate/rules.mk
@@ -0,0 +1,6 @@
+TAP_DANCE_ENABLE = yes
+# COMBO_ENABLE = yes
+# RGBLIGHT_ENABLE = yes
+
+# Disable unnecessary things to save space
+# LTO_ENABLE = yes  #link time optimization
diff --git a/keyboards/keyten/aperture/aperture.c b/keyboards/keyten/aperture/aperture.c
new file mode 100644
index 0000000000..38415add5a
--- /dev/null
+++ b/keyboards/keyten/aperture/aperture.c
@@ -0,0 +1,17 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * 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 <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include "aperture.h"
diff --git a/keyboards/keyten/aperture/aperture.h b/keyboards/keyten/aperture/aperture.h
new file mode 100644
index 0000000000..e547c91794
--- /dev/null
+++ b/keyboards/keyten/aperture/aperture.h
@@ -0,0 +1,48 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * 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 <http://www.gnu.org/licenses/>. 
+  */ 
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/* LAYOUT_all
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │0E │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │2E │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3C    │3D │3E │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
+ * │40   │41 │42   │46                         │4A   │ │4C │4D │4E │
+ * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
+ */
+#define LAYOUT_all( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C, K3D, K3E, \
+	K40, K41, K42,                K46,                K4A,      K4C, K4D, K4E  \
+) { \
+	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3C, K3D, K3E }, \
+	{ K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, XXX, K4C, K4D, K4E }  \
+}
diff --git a/keyboards/keyten/aperture/config.h b/keyboards/keyten/aperture/config.h
new file mode 100644
index 0000000000..27eecf2602
--- /dev/null
+++ b/keyboards/keyten/aperture/config.h
@@ -0,0 +1,35 @@
+/*
+Copyright 2022 Ivan Gromov (@key10iq)
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D1, D0, F7, F5, F6 }
+#define MATRIX_COL_PINS { B7, F0, F1, F4, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/keyten/aperture/info.json b/keyboards/keyten/aperture/info.json
new file mode 100644
index 0000000000..e242337659
--- /dev/null
+++ b/keyboards/keyten/aperture/info.json
@@ -0,0 +1,89 @@
+{
+    "keyboard_name": "Aperture",
+	"manufacturer": "Bizunow",
+    "url": "",
+    "maintainer": "keyten",
+	"usb": {
+        "vid": "0xEB69",
+        "pid": "0x6501",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+				{"x":1, "y":0}, 
+				{"x":2, "y":0}, 
+				{"x":3, "y":0}, 
+				{"x":4, "y":0}, 
+				{"x":5, "y":0}, 
+				{"x":6, "y":0}, 
+				{"x":7, "y":0}, 
+				{"x":8, "y":0}, 
+				{"x":9, "y":0}, 
+				{"x":10, "y":0}, 
+				{"x":11, "y":0}, 
+				{"x":12, "y":0}, 
+				{"x":13, "y":0}, 
+				{"x":14, "y":0}, 
+				{"x":15, "y":0}, 
+				
+				{"x":0, "y":1, "w":1.5}, 
+				{"x":1.5, "y":1}, 
+				{"x":2.5, "y":1}, 
+				{"x":3.5, "y":1}, 
+				{"x":4.5, "y":1}, 
+				{"x":5.5, "y":1}, 
+				{"x":6.5, "y":1}, 
+				{"x":7.5, "y":1}, 
+				{"x":8.5, "y":1},
+				{"x":9.5, "y":1}, 
+				{"x":10.5, "y":1}, 
+				{"x":11.5, "y":1}, 
+				{"x":12.5, "y":1}, 
+				{"x":13.5, "y":1, "w":1.5}, 
+				{"x":15, "y":1}, 
+				
+				{"x":0, "y":2, "w":1.75}, 
+				{"x":1.75, "y":2}, 
+				{"x":2.75, "y":2}, 
+				{"x":3.75, "y":2}, 
+				{"x":4.75, "y":2}, 
+				{"x":5.75, "y":2}, 
+				{"x":6.75, "y":2}, 
+				{"x":7.75, "y":2}, 
+				{"x":8.75, "y":2}, 
+				{"x":9.75, "y":2}, 
+				{"x":10.75, "y":2}, 
+				{"x":11.75, "y":2}, 
+				{"x":12.75, "y":2, "w":2.25}, 
+				{"x":15, "y":2}, 
+				
+				{"x":0, "y":3, "w":2.25}, 
+				{"x":2.25, "y":3}, 
+				{"x":3.25, "y":3}, 
+				{"x":4.25, "y":3}, 
+				{"x":5.25, "y":3}, 
+				{"x":6.25, "y":3}, 
+				{"x":7.25, "y":3}, 
+				{"x":8.25, "y":3}, 
+				{"x":9.25, "y":3}, 
+				{"x":10.25, "y":3}, 
+				{"x":11.25, "y":3}, 
+				{"x":12.25, "y":3, "w":1.75}, 
+				{"x":14, "y":3},
+				{"x":15, "y":3}, 
+				
+				{"x":0, "y":4, "w":1.5}, 
+				{"x":1.5, "y":4}, 
+				{"x":2.5, "y":4, "w":1.5}, 
+				{"x":4, "y":4, "w":7}, 
+				{"x":11, "y":4, "w":1.5}, 
+				{"x":13, "y":4}, 
+				{"x":14, "y":4}, 
+				{"x":15, "y":4}
+            ]
+        }
+		
+    }
+}
diff --git a/keyboards/keyten/aperture/keymaps/default/keymap.c b/keyboards/keyten/aperture/keymaps/default/keymap.c
new file mode 100644
index 0000000000..732a9bbddc
--- /dev/null
+++ b/keyboards/keyten/aperture/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * 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 <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_ESC,  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_BSLS, KC_HOME,
+		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_BSPC, KC_PGUP,
+		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_PGDN,
+		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   MO(1),
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_all(
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+		_______, _______, _______,                            _______,                            _______,          _______, _______, _______)
+};
diff --git a/keyboards/keyten/aperture/keymaps/default/readme.md b/keyboards/keyten/aperture/keymaps/default/readme.md
new file mode 100644
index 0000000000..4b0dddb1c2
--- /dev/null
+++ b/keyboards/keyten/aperture/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Aperture

diff --git a/keyboards/keyten/aperture/keymaps/via/keymap.c b/keyboards/keyten/aperture/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f72f5dbb42
--- /dev/null
+++ b/keyboards/keyten/aperture/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * 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 <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_ESC,  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_BSLS, KC_HOME,
+		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_BSPC, KC_PGUP,
+		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_PGDN,
+		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   MO(1),
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_all(
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+		_______, _______, _______,                            _______,                            _______,          _______, _______, _______),
+
+	[2] = LAYOUT_all(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+		_______, _______, _______,                            _______,                            _______,          _______, _______, _______),
+		
+	[3] = LAYOUT_all(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+		_______, _______, _______,                            _______,                            _______,          _______, _______, _______)	
+};
diff --git a/keyboards/keyten/aperture/keymaps/via/readme.md b/keyboards/keyten/aperture/keymaps/via/readme.md
new file mode 100644
index 0000000000..9ee17fca40
--- /dev/null
+++ b/keyboards/keyten/aperture/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for Aperture
diff --git a/keyboards/keyten/aperture/keymaps/via/rules.mk b/keyboards/keyten/aperture/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keyten/aperture/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keyten/aperture/readme.md b/keyboards/keyten/aperture/readme.md
new file mode 100644
index 0000000000..80cd0b8b9e
--- /dev/null
+++ b/keyboards/keyten/aperture/readme.md
@@ -0,0 +1,29 @@
+# Aperture
+
+Aperture is a 65% keyboard with low height of the first row of switches.
+
+Case designed by [Bizunow](https://github.com/Bizunow) ans PCB designed by [keyten](https://github.com/key10iq).
+
+![Aperture image](https://i.imgur.com/L4Z9c96l.jpg)
+
+* Keyboard Maintainer: [keyten](https://github.com/key10iq)
+* Hardware Supported: Aperture PCB
+* Hardware Availability: [GB](https://t.me/gvalchcasciops)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aperture:default
+	
+Flashing example for this keyboard:
+
+	make aperture:default:flash
+
+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).
+
+## Bootloader 
+
+Enter the bootloader in 3 ways:
+
+* Bootmagic reset: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* Keycode in layout: Press the key mapped to RESET if it is available
+* Physical reset button: Press the button on the back of the PCB
diff --git a/keyboards/keyten/aperture/rules.mk b/keyboards/keyten/aperture/rules.mk
new file mode 100644
index 0000000000..6983d5c803
--- /dev/null
+++ b/keyboards/keyten/aperture/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes
diff --git a/keyboards/linworks/fave104/fave104.h b/keyboards/linworks/fave104/fave104.h
index ae906fb108..bd30b1e0c4 100644
--- a/keyboards/linworks/fave104/fave104.h
+++ b/keyboards/linworks/fave104/fave104.h
@@ -42,21 +42,21 @@
 
 #define LAYOUT_fullsize_ansi( \
     K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K10,  K11,        K12,    K13,  K14,  K15,    K16,  K17,  K18,  K19, \
-    K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K30,  K31,  K32,  K33,  K34,    K35,  K36,  K37,    K38,  K39,  K40,  K41, \
+    K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K30,  K31,  K32,        K34,    K35,  K36,  K37,    K38,  K39,  K40,  K41, \
     K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K50,  K51,  K52,  K53,  K54,        K55,    K56,  K57,  K58,    K59,  K60,  K61,  K62, \
     K63,  K64,  K65,  K66,  K67,  K68,  K69,  K70,  K71,  K72,  K73,  K74,              K76,                        K77,  K78,  K79,  K80, \
-    K81,        K83,  K84,  K85,  K86,  K87,  K88,  K89,  K90,  K91,  K92,                            K95,          K96,  K97,  K98,  K99, \
+    K81,        K83,  K84,  K85,  K86,  K87,  K88,  K89,  K90,  K91,  K92,  K93,                      K95,          K96,  K97,  K98,  K99, \
     K100, K101, K102,                   K103,                   K104, K105, K106,       K107,   K108, K109, K110,   K111, K112, K113, K114 \
 ) { \
   { K00,    K01,   K03,   K05,   K07,   K09,  K11,    K12,   K14,   K16,  K18 }, \
   { KC_NO,  K02,   K04,   K06,   K08,   K10,  KC_NO,  K13,   K15,   K17,  K19 }, \
   { K20,    K22,   K24,   K26,   K28,   K30,  K32,    K34,   K36,   K38,  K40 }, \
-  { K21,    K23,   K25,   K27,   K29,   K31,  K33,    K35,   K37,   K39,  K41 }, \
+  { K21,    K23,   K25,   K27,   K29,   K31,  KC_NO,  K35,   K37,   K39,  K41 }, \
   { K42,    K44,   K46,   K48,   K50,   K52,  K54,    K55,   K57,   K59,  K61 }, \
   { K43,    K45,   K47,   K49,   K51,   K53,  KC_NO,  K56,   K58,   K60,  K62 }, \
   { K63,    K65,   K67,   K69,   K71,   K73,  KC_NO,  K76,   KC_NO, K77,  K79 }, \
   { K64,    K66,   K68,   K70,   K72,   K74,  KC_NO,  KC_NO, KC_NO, K78,  K80 }, \
-  { K81,    K83,   K85,   K87,   K89,   K91,  KC_NO,  KC_NO, K95,   K96,  K98 }, \
+  { K81,    K83,   K85,   K87,   K89,   K91,  K93,    KC_NO, K95,   K96,  K98 }, \
   { KC_NO,  K84,   K86,   K88,   K90,   K92,  KC_NO,  KC_NO, KC_NO, K97,  K99 }, \
   { K100,   K102,  KC_NO, K103,  KC_NO, K104, K106,   K107,  K109,  K111, K113}, \
   { K101,   KC_NO, KC_NO, KC_NO, KC_NO, K105, KC_NO,  K108,  K110,  K112, K114}  \
diff --git a/keyboards/linworks/fave104/info.json b/keyboards/linworks/fave104/info.json
index f30313f7a3..f675f8c51f 100644
--- a/keyboards/linworks/fave104/info.json
+++ b/keyboards/linworks/fave104/info.json
@@ -50,10 +50,10 @@
                 {"label":"Insert", "x":15.25, "y":1.25},
                 {"label":"Home", "x":16.25, "y":1.25},
                 {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.5},
-                {"label":"/", "x":19.5, "y":1.5},
-                {"label":"*", "x":20.5, "y":1.5},
-                {"label":"-", "x":21.5, "y":1.5},
+                {"label":"Num Lock", "x":18.5, "y":1.25},
+                {"label":"/", "x":19.5, "y":1.25},
+                {"label":"*", "x":20.5, "y":1.25},
+                {"label":"-", "x":21.5, "y":1.25},
 
                 {"label":"Tab", "x":0, "y":2.25, "w":1.5},
                 {"label":"Q", "x":1.5, "y":2.25},
@@ -72,10 +72,10 @@
                 {"label":"Delete", "x":15.25, "y":2.25},
                 {"label":"End", "x":16.25, "y":2.25},
                 {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.5},
-                {"label":"8", "x":19.5, "y":2.5},
-                {"label":"9", "x":20.5, "y":2.5},
-                {"label":"+", "x":21.5, "y":2.5},
+                {"label":"7", "x":18.5, "y":2.25},
+                {"label":"8", "x":19.5, "y":2.25},
+                {"label":"9", "x":20.5, "y":2.25},
+                {"label":"+", "x":21.5, "y":2.25},
 
                 {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
                 {"label":"A", "x":1.75, "y":3.25},
@@ -91,10 +91,10 @@
                 {"label":"\"", "x":11.75, "y":3.25},
                 {"x":12.75, "y":3.25},
                 {"label":"Enter", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
-                {"label":"+", "x":21.5, "y":3.5},
+                {"label":"4", "x":18.5, "y":3.25},
+                {"label":"5", "x":19.5, "y":3.25},
+                {"label":"6", "x":20.5, "y":3.25},
+                {"label":"+", "x":21.5, "y":3.25},
 
                 {"label":"Shift", "x":0, "y":4.25, "w":1.25},
                 {"x":1.25, "y":4.25},
@@ -111,10 +111,10 @@
                 {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
                 {"x":14, "y":4.25},
                 {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.5},
-                {"label":"2", "x":19.5, "y":4.5},
-                {"label":"3", "x":20.5, "y":4.5},
-                {"label":"Enter", "x":21.5, "y":4.5},
+                {"label":"1", "x":18.5, "y":4.25},
+                {"label":"2", "x":19.5, "y":4.25},
+                {"label":"3", "x":20.5, "y":4.25},
+                {"label":"Enter", "x":21.5, "y":4.25},
 
                 {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
                 {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
@@ -127,10 +127,10 @@
                 {"label":"\u2190", "x":15.25, "y":5.25},
                 {"label":"\u2193", "x":16.25, "y":5.25},
                 {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.5},
-                {"label":"0", "x":19.5, "y":5.5},
-                {"label":".", "x":20.5, "y":5.5},
-                {"label":"Enter", "x":21.5, "y":5.5}
+                {"label":"0", "x":18.5, "y":5.25},
+                {"label":"0", "x":19.5, "y":5.25},
+                {"label":".", "x":20.5, "y":5.25},
+                {"label":"Enter", "x":21.5, "y":5.25}
             ]
         },
 
@@ -170,14 +170,14 @@
                 {"label":")", "x":10, "y":1.25},
                 {"label":"_", "x":11, "y":1.25},
                 {"label":"+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":14, "y":1.25, "w":2},
+                {"label":"Bksp", "x":13, "y":1.25, "w":2},
                 {"label":"Insert", "x":15.25, "y":1.25},
                 {"label":"Home", "x":16.25, "y":1.25},
                 {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.5},
-                {"label":"/", "x":19.5, "y":1.5},
-                {"label":"*", "x":20.5, "y":1.5},
-                {"label":"-", "x":21.5, "y":1.5},
+                {"label":"Num Lock", "x":18.5, "y":1.25},
+                {"label":"/", "x":19.5, "y":1.25},
+                {"label":"*", "x":20.5, "y":1.25},
+                {"label":"-", "x":21.5, "y":1.25},
 
                 {"label":"Tab", "x":0, "y":2.25, "w":1.5},
                 {"label":"Q", "x":1.5, "y":2.25},
@@ -196,10 +196,10 @@
                 {"label":"Delete", "x":15.25, "y":2.25},
                 {"label":"End", "x":16.25, "y":2.25},
                 {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.5},
-                {"label":"8", "x":19.5, "y":2.5},
-                {"label":"9", "x":20.5, "y":2.5},
-                {"label":"+", "x":21.5, "y":2.5},
+                {"label":"7", "x":18.5, "y":2.25},
+                {"label":"8", "x":19.5, "y":2.25},
+                {"label":"9", "x":20.5, "y":2.25},
+                {"label":"+", "x":21.5, "y":2.25},
 
                 {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
                 {"label":"A", "x":1.75, "y":3.25},
@@ -214,10 +214,10 @@
                 {"label":":", "x":10.75, "y":3.25},
                 {"label":"\"", "x":11.75, "y":3.25},
                 {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
-                {"label":"+", "x":21.5, "y":3.5},
+                {"label":"4", "x":18.5, "y":3.25},
+                {"label":"5", "x":19.5, "y":3.25},
+                {"label":"6", "x":20.5, "y":3.25},
+                {"label":"+", "x":21.5, "y":3.25},
 
                 {"label":"Shift", "x":0, "y":4.25, "w":2.25},
                 {"label":"Z", "x":2.25, "y":4.25},
@@ -232,10 +232,10 @@
                 {"label":"?", "x":11.25, "y":4.25},
                 {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
                 {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.5},
-                {"label":"2", "x":19.5, "y":4.5},
-                {"label":"3", "x":20.5, "y":4.5},
-                {"label":"Enter", "x":21.5, "y":4.5},
+                {"label":"1", "x":18.5, "y":4.25},
+                {"label":"2", "x":19.5, "y":4.25},
+                {"label":"3", "x":20.5, "y":4.25},
+                {"label":"Enter", "x":21.5, "y":4.25},
 
                 {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
                 {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
@@ -248,10 +248,10 @@
                 {"label":"\u2190", "x":15.25, "y":5.25},
                 {"label":"\u2193", "x":16.25, "y":5.25},
                 {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.5},
-                {"label":"0", "x":19.5, "y":5.5},
-                {"label":".", "x":20.5, "y":5.5},
-                {"label":"Enter", "x":21.5, "y":5.5}
+                {"label":"0", "x":18.5, "y":5.25},
+                {"label":"0", "x":19.5, "y":5.25},
+                {"label":".", "x":20.5, "y":5.25},
+                {"label":"Enter", "x":21.5, "y":5.25}
             ]
         },
 
@@ -296,10 +296,10 @@
                 {"label":"Insert", "x":15.25, "y":1.25},
                 {"label":"Home", "x":16.25, "y":1.25},
                 {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.5},
-                {"label":"/", "x":19.5, "y":1.5},
-                {"label":"*", "x":20.5, "y":1.5},
-                {"label":"-", "x":21.5, "y":1.5},
+                {"label":"Num Lock", "x":18.5, "y":1.25},
+                {"label":"/", "x":19.5, "y":1.25},
+                {"label":"*", "x":20.5, "y":1.25},
+                {"label":"-", "x":21.5, "y":1.25},
 
                 {"label":"Tab", "x":0, "y":2.25, "w":1.5},
                 {"label":"Q", "x":1.5, "y":2.25},
@@ -317,10 +317,10 @@
                 {"label":"Delete", "x":15.25, "y":2.25},
                 {"label":"End", "x":16.25, "y":2.25},
                 {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.5},
-                {"label":"8", "x":19.5, "y":2.5},
-                {"label":"9", "x":20.5, "y":2.5},
-                {"label":"+", "x":21.5, "y":2.5},
+                {"label":"7", "x":18.5, "y":2.25},
+                {"label":"8", "x":19.5, "y":2.25},
+                {"label":"9", "x":20.5, "y":2.25},
+                {"label":"+", "x":21.5, "y":2.25},