From 733f961fc6dbdef12b709a1c7437c18a333d5419 Mon Sep 17 00:00:00 2001
From: Thomaz <thomaz.peres21@hotmail.com>
Date: Wed, 15 Mar 2023 19:16:31 -0300
Subject: [PATCH 1/8] Adding rkg68 royalkludge

---
 keyboards/rkg68/config.h                 | 23 ++++++
 keyboards/rkg68/info.json                | 89 ++++++++++++++++++++++++
 keyboards/rkg68/keymaps/default/keymap.c | 59 ++++++++++++++++
 keyboards/rkg68/keymaps/default/rules.mk |  1 +
 keyboards/rkg68/keymaps/via/keymap.c     | 49 +++++++++++++
 keyboards/rkg68/keymaps/via/rules.mk     |  4 ++
 keyboards/rkg68/readme.md                | 21 ++++++
 keyboards/rkg68/rkg68.c                  | 17 +++++
 keyboards/rkg68/rules.mk                 |  1 +
 9 files changed, 264 insertions(+)
 create mode 100644 keyboards/rkg68/config.h
 create mode 100644 keyboards/rkg68/info.json
 create mode 100644 keyboards/rkg68/keymaps/default/keymap.c
 create mode 100644 keyboards/rkg68/keymaps/default/rules.mk
 create mode 100644 keyboards/rkg68/keymaps/via/keymap.c
 create mode 100644 keyboards/rkg68/keymaps/via/rules.mk
 create mode 100644 keyboards/rkg68/readme.md
 create mode 100644 keyboards/rkg68/rkg68.c
 create mode 100644 keyboards/rkg68/rules.mk

diff --git a/keyboards/rkg68/config.h b/keyboards/rkg68/config.h
new file mode 100644
index 000000000000..0d9353a1e421
--- /dev/null
+++ b/keyboards/rkg68/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2022 DeskDaily
+ *
+ * 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 MATRIX_ROW_PINS { B3, B2, B1, B0, B7  }
+#define MATRIX_COL_PINS { D0, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
\ No newline at end of file
diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/info.json
new file mode 100644
index 000000000000..be5c06db5e10
--- /dev/null
+++ b/keyboards/rkg68/info.json
@@ -0,0 +1,89 @@
+{
+    "keyboard_name": "rkg68",
+    "manufacturer": "Royal Kludge",
+    "url": "https://bit.ly/3JI7KUg",
+    "maintainer": "Thomaz-Peres",
+    "usb": {
+        "vid": "0x05C4",
+        "pid": "0x05C4",
+        "device_version": "1.0.0"
+    },
+	"processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+		"LAYOUT": {
+			"layout": [
+				{"matrix": [0, 0], "x": 0, "y": 0.0},
+				{"matrix": [0, 1], "x": 1, "y": 0.0},
+				{"matrix": [0, 2], "x": 2, "y": 0.0},
+				{"matrix": [0, 3], "x": 3, "y": 0.0},
+				{"matrix": [0, 4], "x": 4, "y": 0.0},
+				{"matrix": [0, 5], "x": 5, "y": 0.0},
+				{"matrix": [0, 6], "x": 6, "y": 0.0},
+				{"matrix": [0, 7], "x": 7, "y": 0.0},
+				{"matrix": [0, 8], "x": 8, "y": 0.0},
+				{"matrix": [0, 9], "x": 9, "y": 0.0},
+				{"matrix": [0, 10], "x": 10, "y": 0.0},
+				{"matrix": [0, 11], "x": 11, "y": 0.0},
+				{"matrix": [0, 12], "x": 12, "y": 0.0},
+				{"matrix": [0, 13], "x": 13, "y": 0.0},
+				{"matrix": [0, 14], "x": 14, "y": 0.0},
+				{"matrix": [0, 15], "x": 15, "y": 0.0},
+				{"matrix": [1, 0], "x": 0, "y": 1.0, "w": 1.5},
+				{"matrix": [1, 1], "x": 1.5, "y": 1.0},
+				{"matrix": [1, 2], "x": 2.5, "y": 1.0},
+				{"matrix": [1, 3], "x": 3.5, "y": 1.0},
+				{"matrix": [1, 4], "x": 4.5, "y": 1.0},
+				{"matrix": [1, 5], "x": 5.5, "y": 1.0},
+				{"matrix": [1, 6], "x": 6.5, "y": 1.0},
+				{"matrix": [1, 7], "x": 7.5, "y": 1.0},
+				{"matrix": [1, 8], "x": 8.5, "y": 1.0},
+				{"matrix": [1, 9], "x": 9.5, "y": 1.0},
+				{"matrix": [1, 10], "x": 10.5, "y": 1.0},
+				{"matrix": [1, 11], "x": 11.5, "y": 1.0},
+				{"matrix": [1, 12], "x": 12.5, "y": 1.0},
+				{"matrix": [1, 13], "x": 13.5, "y": 1.0, "w": 1.5},
+				{"matrix": [1, 15], "x": 15, "y": 1.0},
+				{"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+				{"matrix": [2, 1], "x": 1.75, "y": 2.0},
+				{"matrix": [2, 2], "x": 2.75, "y": 2.0},
+				{"matrix": [2, 3], "x": 3.75, "y": 2.0},
+				{"matrix": [2, 4], "x": 4.75, "y": 2.0},
+				{"matrix": [2, 5], "x": 5.75, "y": 2.0},
+				{"matrix": [2, 6], "x": 6.75, "y": 2.0},
+				{"matrix": [2, 7], "x": 7.75, "y": 2.0},
+				{"matrix": [2, 8], "x": 8.75, "y": 2.0},
+				{"matrix": [2, 9], "x": 9.75, "y": 2.0},
+				{"matrix": [2, 10], "x": 10.75, "y": 2.0},
+				{"matrix": [2, 11], "x": 11.75, "y": 2.0},
+				{"matrix": [2, 13], "x": 12.75, "y": 2.0, "w": 2.25},
+				{"matrix": [2, 15], "x": 15, "y": 2.0},
+				{"matrix": [3, 0], "x": 0, "y": 3.0, "w": 2.25},
+				{"matrix": [3, 1], "x": 1.25, "y": 3.0},
+				{"matrix": [3, 2], "x": 2.25, "y": 3.0},
+				{"matrix": [3, 3], "x": 3.25, "y": 3.0},
+				{"matrix": [3, 4], "x": 4.25, "y": 3.0},
+				{"matrix": [3, 5], "x": 5.25, "y": 3.0},
+				{"matrix": [3, 6], "x": 6.25, "y": 3.0},
+				{"matrix": [3, 7], "x": 7.25, "y": 3.0},
+				{"matrix": [3, 8], "x": 8.25, "y": 3.0},
+				{"matrix": [3, 9], "x": 9.25, "y": 3.0},
+				{"matrix": [3, 10], "x": 10.25, "y": 3.0},
+				{"matrix": [3, 11], "x": 11.25, "y": 3.0},
+				{"matrix": [3, 12], "x": 12.25, "y": 3.0, "w": 1.75},
+				{"matrix": [3, 14], "x": 14.0, "y": 3.0},
+				{"matrix": [3, 15], "x": 15.0, "y": 3.0},
+				{"matrix": [4, 0], "x": 0, "y": 4.0, "w": 1.25},
+				{"matrix": [4, 1], "x": 1.25, "y": 4.0, "w": 1.25},
+				{"matrix": [4, 2], "x": 2.5, "y": 4.0, "w": 1.25},
+				{"matrix": [4, 6], "x": 3.75, "y": 4.0, "w": 6.25},
+				{"matrix": [4, 10], "x": 10, "y": 4.0},
+				{"matrix": [4, 11], "x": 11, "y": 4.0},
+				{"matrix": [4, 12], "x": 12, "y": 4.0},
+				{"matrix": [4, 13], "x": 13, "y": 4.0},
+				{"matrix": [4, 14], "x": 14, "y": 4.0},
+				{"matrix": [4, 15], "x": 15, "y": 4.0}
+				]
+			}
+    }
+}
\ No newline at end of file
diff --git a/keyboards/rkg68/keymaps/default/keymap.c b/keyboards/rkg68/keymaps/default/keymap.c
new file mode 100644
index 000000000000..a7f0194f6fc8
--- /dev/null
+++ b/keyboards/rkg68/keymaps/default/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2022 DeskDaily
+ *
+ * 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
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = 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_EQL , KC_BSPC, 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_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        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_PGUP,
+        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  , KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT(
+        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_PSCR,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,  KC_END, RGB_MOD, KC_INS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_BRK,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_SCRL,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD
+    ),
+
+    [_LAYER2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/rkg68/keymaps/default/rules.mk b/keyboards/rkg68/keymaps/default/rules.mk
new file mode 100644
index 000000000000..5af1ba85367f
--- /dev/null
+++ b/keyboards/rkg68/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_ENABLE = yes
diff --git a/keyboards/rkg68/keymaps/via/keymap.c b/keyboards/rkg68/keymaps/via/keymap.c
new file mode 100644
index 000000000000..28f0f3b275d2
--- /dev/null
+++ b/keyboards/rkg68/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2022 DeskDaily
+ *
+ * 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(
+        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_BSPC, 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_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        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_PGUP,
+        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,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        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_PSCR,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END,  RGB_MOD, KC_INS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_BRK,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_SCRL,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD
+    ),
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/rkg68/keymaps/via/rules.mk b/keyboards/rkg68/keymaps/via/rules.mk
new file mode 100644
index 000000000000..e0513293868c
--- /dev/null
+++ b/keyboards/rkg68/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+ENCODER_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/rkg68/readme.md b/keyboards/rkg68/readme.md
new file mode 100644
index 000000000000..bd0eb4a553c3
--- /dev/null
+++ b/keyboards/rkg68/readme.md
@@ -0,0 +1,21 @@
+# RK G68
+
+## Layouts
+
+- ANSI layout;
+
+## Availability
+
+The RKG68 is available for purchase through [AliExpress](https://www.aliexpress.com/).
+
+## How to compile
+
+After setting up your build environment, you can compile the  default keymap by using:
+
+    make rkg68:default
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the upper left key/esc) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+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/rkg68/rkg68.c b/keyboards/rkg68/rkg68.c
new file mode 100644
index 000000000000..a9e4e1829cdf
--- /dev/null
+++ b/keyboards/rkg68/rkg68.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 DeskDaily
+ *
+ * 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 "../rkg68/keymaps/default/keymap.c"
\ No newline at end of file
diff --git a/keyboards/rkg68/rules.mk b/keyboards/rkg68/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/rkg68/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From 765fe089af0e67b8010d11c128fef403cf558dd1 Mon Sep 17 00:00:00 2001
From: Thomaz <thomaz.peres21@hotmail.com>
Date: Wed, 15 Mar 2023 22:52:31 -0300
Subject: [PATCH 2/8] Fix errors

---
 keyboards/rkg68/config.h                 |  4 +-
 keyboards/rkg68/info.json                | 34 ++++++++---------
 keyboards/rkg68/keymaps/default/keymap.c | 47 ++++++------------------
 keyboards/rkg68/keymaps/default/rules.mk |  2 +-
 keyboards/rkg68/keymaps/via/keymap.c     | 23 ++----------
 keyboards/rkg68/keymaps/via/rules.mk     |  4 +-
 keyboards/rkg68/{rkg68.c => rkg68.h}     |  2 +-
 7 files changed, 36 insertions(+), 80 deletions(-)
 rename keyboards/rkg68/{rkg68.c => rkg68.h} (93%)

diff --git a/keyboards/rkg68/config.h b/keyboards/rkg68/config.h
index 0d9353a1e421..68b42ed416c0 100644
--- a/keyboards/rkg68/config.h
+++ b/keyboards/rkg68/config.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, B7  }
-#define MATRIX_COL_PINS { D0, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
+#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
+#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, F4 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
\ No newline at end of file
diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/info.json
index be5c06db5e10..ce1cc3011d85 100644
--- a/keyboards/rkg68/info.json
+++ b/keyboards/rkg68/info.json
@@ -26,9 +26,8 @@
 				{"matrix": [0, 10], "x": 10, "y": 0.0},
 				{"matrix": [0, 11], "x": 11, "y": 0.0},
 				{"matrix": [0, 12], "x": 12, "y": 0.0},
-				{"matrix": [0, 13], "x": 13, "y": 0.0},
-				{"matrix": [0, 14], "x": 14, "y": 0.0},
-				{"matrix": [0, 15], "x": 15, "y": 0.0},
+				{"matrix": [0, 13], "x": 13, "y": 0.0, "w": 2},
+				{"matrix": [0, 14], "x": 15, "y": 0.0},
 				{"matrix": [1, 0], "x": 0, "y": 1.0, "w": 1.5},
 				{"matrix": [1, 1], "x": 1.5, "y": 1.0},
 				{"matrix": [1, 2], "x": 2.5, "y": 1.0},
@@ -43,8 +42,8 @@
 				{"matrix": [1, 11], "x": 11.5, "y": 1.0},
 				{"matrix": [1, 12], "x": 12.5, "y": 1.0},
 				{"matrix": [1, 13], "x": 13.5, "y": 1.0, "w": 1.5},
-				{"matrix": [1, 15], "x": 15, "y": 1.0},
-				{"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+				{"matrix": [1, 14], "x": 15, "y": 1.0},
+				{"matrix": [2, 0], "x": 0, "y": 2.0, "w": 1.75},
 				{"matrix": [2, 1], "x": 1.75, "y": 2.0},
 				{"matrix": [2, 2], "x": 2.75, "y": 2.0},
 				{"matrix": [2, 3], "x": 3.75, "y": 2.0},
@@ -57,9 +56,8 @@
 				{"matrix": [2, 10], "x": 10.75, "y": 2.0},
 				{"matrix": [2, 11], "x": 11.75, "y": 2.0},
 				{"matrix": [2, 13], "x": 12.75, "y": 2.0, "w": 2.25},
-				{"matrix": [2, 15], "x": 15, "y": 2.0},
-				{"matrix": [3, 0], "x": 0, "y": 3.0, "w": 2.25},
-				{"matrix": [3, 1], "x": 1.25, "y": 3.0},
+				{"matrix": [2, 14], "x": 15, "y": 2.0},
+				{"matrix": [3, 1], "x": 0, "y": 3.0, "w": 2.25},
 				{"matrix": [3, 2], "x": 2.25, "y": 3.0},
 				{"matrix": [3, 3], "x": 3.25, "y": 3.0},
 				{"matrix": [3, 4], "x": 4.25, "y": 3.0},
@@ -71,19 +69,19 @@
 				{"matrix": [3, 10], "x": 10.25, "y": 3.0},
 				{"matrix": [3, 11], "x": 11.25, "y": 3.0},
 				{"matrix": [3, 12], "x": 12.25, "y": 3.0, "w": 1.75},
-				{"matrix": [3, 14], "x": 14.0, "y": 3.0},
-				{"matrix": [3, 15], "x": 15.0, "y": 3.0},
+				{"matrix": [3, 13], "x": 14.0, "y": 3.0},
+				{"matrix": [3, 14], "x": 15.0, "y": 3.0},
 				{"matrix": [4, 0], "x": 0, "y": 4.0, "w": 1.25},
 				{"matrix": [4, 1], "x": 1.25, "y": 4.0, "w": 1.25},
 				{"matrix": [4, 2], "x": 2.5, "y": 4.0, "w": 1.25},
 				{"matrix": [4, 6], "x": 3.75, "y": 4.0, "w": 6.25},
-				{"matrix": [4, 10], "x": 10, "y": 4.0},
-				{"matrix": [4, 11], "x": 11, "y": 4.0},
-				{"matrix": [4, 12], "x": 12, "y": 4.0},
-				{"matrix": [4, 13], "x": 13, "y": 4.0},
-				{"matrix": [4, 14], "x": 14, "y": 4.0},
-				{"matrix": [4, 15], "x": 15, "y": 4.0}
-				]
-			}
+				{"matrix": [4, 9], "x": 10, "y": 4.0},
+				{"matrix": [4, 10], "x": 11, "y": 4.0},
+				{"matrix": [4, 11], "x": 12, "y": 4.0},
+				{"matrix": [4, 12], "x": 13, "y": 4.0},
+				{"matrix": [4, 13], "x": 14, "y": 4.0},
+				{"matrix": [4, 14], "x": 15, "y": 4.0}
+			]
+		}
     }
 }
\ No newline at end of file
diff --git a/keyboards/rkg68/keymaps/default/keymap.c b/keyboards/rkg68/keymaps/default/keymap.c
index a7f0194f6fc8..2631452b5ba6 100644
--- a/keyboards/rkg68/keymaps/default/keymap.c
+++ b/keyboards/rkg68/keymaps/default/keymap.c
@@ -16,44 +16,19 @@
 
 #include QMK_KEYBOARD_H
 
-enum layers {
-    _LAYER0,
-    _LAYER1,
-    _LAYER2,
-    _LAYER3
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_LAYER0] = 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_EQL , KC_BSPC, 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_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        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_PGUP,
-        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  , KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    [0] = 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_EQL,  KC_BSPC, 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_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        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_PGUP,
+        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,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
-
-    [_LAYER1] = LAYOUT(
-        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_PSCR,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,  KC_END, RGB_MOD, KC_INS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_BRK,
+    [1] = LAYOUT(
+        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_PSCR,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END,  RGB_MOD, KC_INS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_BRK,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_SCRL,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD
-    ),
-
-    [_LAYER2] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-    [_LAYER3] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        QK_BOOT,   KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD
     )
 };
\ No newline at end of file
diff --git a/keyboards/rkg68/keymaps/default/rules.mk b/keyboards/rkg68/keymaps/default/rules.mk
index 5af1ba85367f..433146d8d0c6 100644
--- a/keyboards/rkg68/keymaps/default/rules.mk
+++ b/keyboards/rkg68/keymaps/default/rules.mk
@@ -1 +1 @@
-ENCODER_ENABLE = yes
+ENCODER_ENABLE = no
diff --git a/keyboards/rkg68/keymaps/via/keymap.c b/keyboards/rkg68/keymaps/via/keymap.c
index 28f0f3b275d2..2631452b5ba6 100644
--- a/keyboards/rkg68/keymaps/via/keymap.c
+++ b/keyboards/rkg68/keymaps/via/keymap.c
@@ -14,36 +14,21 @@
  * 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(
         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_BSPC, 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_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        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_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_PGUP,
         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,   KC_PGDN,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT(
         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_PSCR,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END,  RGB_MOD, KC_INS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_BRK,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_BRK,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_SCRL,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD
-    ),
-    [2] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [3] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        QK_BOOT,   KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD
     )
-};
+};
\ No newline at end of file
diff --git a/keyboards/rkg68/keymaps/via/rules.mk b/keyboards/rkg68/keymaps/via/rules.mk
index e0513293868c..14b4d1fb4482 100644
--- a/keyboards/rkg68/keymaps/via/rules.mk
+++ b/keyboards/rkg68/keymaps/via/rules.mk
@@ -1,4 +1,2 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
-ENCODER_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
\ No newline at end of file
+ENCODER_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/rkg68/rkg68.c b/keyboards/rkg68/rkg68.h
similarity index 93%
rename from keyboards/rkg68/rkg68.c
rename to keyboards/rkg68/rkg68.h
index a9e4e1829cdf..f644fc88c520 100644
--- a/keyboards/rkg68/rkg68.c
+++ b/keyboards/rkg68/rkg68.h
@@ -14,4 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../rkg68/keymaps/default/keymap.c"
\ No newline at end of file
+// #include "rkg68.h"

From 804e1f77cd2cd7858f7e12e9ae40085a8473dccc Mon Sep 17 00:00:00 2001
From: Thomaz <thomaz.peres21@hotmail.com>
Date: Wed, 15 Mar 2023 22:58:13 -0300
Subject: [PATCH 3/8] Update readme

---
 keyboards/rkg68/readme.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/keyboards/rkg68/readme.md b/keyboards/rkg68/readme.md
index bd0eb4a553c3..b84a19f6d0df 100644
--- a/keyboards/rkg68/readme.md
+++ b/keyboards/rkg68/readme.md
@@ -4,6 +4,8 @@
 
 - ANSI layout;
 
+![image](https://user-images.githubusercontent.com/58439854/225489922-a6a4df65-aff7-4835-a452-3b1afdb6fc15.png)
+
 ## Availability
 
 The RKG68 is available for purchase through [AliExpress](https://www.aliexpress.com/).
@@ -14,8 +16,4 @@ After setting up your build environment, you can compile the  default keymap by
 
     make rkg68:default
 
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the upper left key/esc) and plug in the keyboard
-* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
-
 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).

From 3dca7d4a13b305f29189992001ad8ca38ddbed81 Mon Sep 17 00:00:00 2001
From: Thomaz <thomaz.peres21@hotmail.com>
Date: Wed, 15 Mar 2023 23:58:34 -0300
Subject: [PATCH 4/8] improving info json and removing config file

---
 keyboards/rkg68/config.h  |  23 -----
 keyboards/rkg68/info.json | 198 ++++++++++++++++++++++----------------
 keyboards/rkg68/rkg68.h   |  17 ----
 3 files changed, 113 insertions(+), 125 deletions(-)
 delete mode 100644 keyboards/rkg68/config.h
 delete mode 100644 keyboards/rkg68/rkg68.h

diff --git a/keyboards/rkg68/config.h b/keyboards/rkg68/config.h
deleted file mode 100644
index 68b42ed416c0..000000000000
--- a/keyboards/rkg68/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 DeskDaily
- *
- * 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 MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
\ No newline at end of file
diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/info.json
index ce1cc3011d85..f88de7b2eb6b 100644
--- a/keyboards/rkg68/info.json
+++ b/keyboards/rkg68/info.json
@@ -1,87 +1,115 @@
 {
-    "keyboard_name": "rkg68",
-    "manufacturer": "Royal Kludge",
-    "url": "https://bit.ly/3JI7KUg",
-    "maintainer": "Thomaz-Peres",
-    "usb": {
-        "vid": "0x05C4",
-        "pid": "0x05C4",
-        "device_version": "1.0.0"
-    },
-	"processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-		"LAYOUT": {
-			"layout": [
-				{"matrix": [0, 0], "x": 0, "y": 0.0},
-				{"matrix": [0, 1], "x": 1, "y": 0.0},
-				{"matrix": [0, 2], "x": 2, "y": 0.0},
-				{"matrix": [0, 3], "x": 3, "y": 0.0},
-				{"matrix": [0, 4], "x": 4, "y": 0.0},
-				{"matrix": [0, 5], "x": 5, "y": 0.0},
-				{"matrix": [0, 6], "x": 6, "y": 0.0},
-				{"matrix": [0, 7], "x": 7, "y": 0.0},
-				{"matrix": [0, 8], "x": 8, "y": 0.0},
-				{"matrix": [0, 9], "x": 9, "y": 0.0},
-				{"matrix": [0, 10], "x": 10, "y": 0.0},
-				{"matrix": [0, 11], "x": 11, "y": 0.0},
-				{"matrix": [0, 12], "x": 12, "y": 0.0},
-				{"matrix": [0, 13], "x": 13, "y": 0.0, "w": 2},
-				{"matrix": [0, 14], "x": 15, "y": 0.0},
-				{"matrix": [1, 0], "x": 0, "y": 1.0, "w": 1.5},
-				{"matrix": [1, 1], "x": 1.5, "y": 1.0},
-				{"matrix": [1, 2], "x": 2.5, "y": 1.0},
-				{"matrix": [1, 3], "x": 3.5, "y": 1.0},
-				{"matrix": [1, 4], "x": 4.5, "y": 1.0},
-				{"matrix": [1, 5], "x": 5.5, "y": 1.0},
-				{"matrix": [1, 6], "x": 6.5, "y": 1.0},
-				{"matrix": [1, 7], "x": 7.5, "y": 1.0},
-				{"matrix": [1, 8], "x": 8.5, "y": 1.0},
-				{"matrix": [1, 9], "x": 9.5, "y": 1.0},
-				{"matrix": [1, 10], "x": 10.5, "y": 1.0},
-				{"matrix": [1, 11], "x": 11.5, "y": 1.0},
-				{"matrix": [1, 12], "x": 12.5, "y": 1.0},
-				{"matrix": [1, 13], "x": 13.5, "y": 1.0, "w": 1.5},
-				{"matrix": [1, 14], "x": 15, "y": 1.0},
-				{"matrix": [2, 0], "x": 0, "y": 2.0, "w": 1.75},
-				{"matrix": [2, 1], "x": 1.75, "y": 2.0},
-				{"matrix": [2, 2], "x": 2.75, "y": 2.0},
-				{"matrix": [2, 3], "x": 3.75, "y": 2.0},
-				{"matrix": [2, 4], "x": 4.75, "y": 2.0},
-				{"matrix": [2, 5], "x": 5.75, "y": 2.0},
-				{"matrix": [2, 6], "x": 6.75, "y": 2.0},
-				{"matrix": [2, 7], "x": 7.75, "y": 2.0},
-				{"matrix": [2, 8], "x": 8.75, "y": 2.0},
-				{"matrix": [2, 9], "x": 9.75, "y": 2.0},
-				{"matrix": [2, 10], "x": 10.75, "y": 2.0},
-				{"matrix": [2, 11], "x": 11.75, "y": 2.0},
-				{"matrix": [2, 13], "x": 12.75, "y": 2.0, "w": 2.25},
-				{"matrix": [2, 14], "x": 15, "y": 2.0},
-				{"matrix": [3, 1], "x": 0, "y": 3.0, "w": 2.25},
-				{"matrix": [3, 2], "x": 2.25, "y": 3.0},
-				{"matrix": [3, 3], "x": 3.25, "y": 3.0},
-				{"matrix": [3, 4], "x": 4.25, "y": 3.0},
-				{"matrix": [3, 5], "x": 5.25, "y": 3.0},
-				{"matrix": [3, 6], "x": 6.25, "y": 3.0},
-				{"matrix": [3, 7], "x": 7.25, "y": 3.0},
-				{"matrix": [3, 8], "x": 8.25, "y": 3.0},
-				{"matrix": [3, 9], "x": 9.25, "y": 3.0},
-				{"matrix": [3, 10], "x": 10.25, "y": 3.0},
-				{"matrix": [3, 11], "x": 11.25, "y": 3.0},
-				{"matrix": [3, 12], "x": 12.25, "y": 3.0, "w": 1.75},
-				{"matrix": [3, 13], "x": 14.0, "y": 3.0},
-				{"matrix": [3, 14], "x": 15.0, "y": 3.0},
-				{"matrix": [4, 0], "x": 0, "y": 4.0, "w": 1.25},
-				{"matrix": [4, 1], "x": 1.25, "y": 4.0, "w": 1.25},
-				{"matrix": [4, 2], "x": 2.5, "y": 4.0, "w": 1.25},
-				{"matrix": [4, 6], "x": 3.75, "y": 4.0, "w": 6.25},
-				{"matrix": [4, 9], "x": 10, "y": 4.0},
-				{"matrix": [4, 10], "x": 11, "y": 4.0},
-				{"matrix": [4, 11], "x": 12, "y": 4.0},
-				{"matrix": [4, 12], "x": 13, "y": 4.0},
-				{"matrix": [4, 13], "x": 14, "y": 4.0},
-				{"matrix": [4, 14], "x": 15, "y": 4.0}
-			]
+	"manufacturer": "Royal Kludge",
+	"keyboard_name": "rkg68",
+	"maintainer": "Thomaz-Peres",
+	"bootloader": "atmel-dfu",
+	"config_h_features": {
+		"encoder": false
+	},
+	"diode_direction": "COL2ROW",
+	"encoder": {
+		"enabled": false
+	},
+	"features": {
+		"encoder": false
+	},
+	"keyboard_folder": "rkg68",
+	"matrix_pins": {
+		"cols": [ "F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F4" ],
+		"rows": [ "D0", "D1", "D2", "D3", "D5" ]
+		},
+		"platform_key": "avr",
+		"processor": "atmega32u4",
+		"processor_type": "avr",
+		"rgblight": {
+			"animations": {
+				"knight": true,
+				"rainbow_swirl": true
+			},
+			"brightness_steps": 17,
+			"hue_steps": 10,
+			"led_count": 4,
+			"pin": "B3",
+			"saturation_steps": 17
+		},
+		"url": "https://bit.ly/3JI7KUg",
+		"usb": {
+			"device_version": "1.0.0",
+			"pid": "0x05C4",
+			"vid": "0x05C4"
+		},
+		"layouts": {
+			"LAYOUT": {
+				"layout": [
+					{"matrix": [0, 0], "x": 0, "y": 0.0},
+					{"matrix": [0, 1], "x": 1, "y": 0.0},
+					{"matrix": [0, 2], "x": 2, "y": 0.0},
+					{"matrix": [0, 3], "x": 3, "y": 0.0},
+					{"matrix": [0, 4], "x": 4, "y": 0.0},
+					{"matrix": [0, 5], "x": 5, "y": 0.0},
+					{"matrix": [0, 6], "x": 6, "y": 0.0},
+					{"matrix": [0, 7], "x": 7, "y": 0.0},
+					{"matrix": [0, 8], "x": 8, "y": 0.0},
+					{"matrix": [0, 9], "x": 9, "y": 0.0},
+					{"matrix": [0, 10], "x": 10, "y": 0.0},
+					{"matrix": [0, 11], "x": 11, "y": 0.0},
+					{"matrix": [0, 12], "x": 12, "y": 0.0},
+					{"matrix": [0, 13], "x": 13, "y": 0.0, "w": 2},
+					{"matrix": [0, 14], "x": 15, "y": 0.0},
+					{"matrix": [1, 0], "x": 0, "y": 1.0, "w": 1.5},
+					{"matrix": [1, 1], "x": 1.5, "y": 1.0},
+					{"matrix": [1, 2], "x": 2.5, "y": 1.0},
+					{"matrix": [1, 3], "x": 3.5, "y": 1.0},
+					{"matrix": [1, 4], "x": 4.5, "y": 1.0},
+					{"matrix": [1, 5], "x": 5.5, "y": 1.0},
+					{"matrix": [1, 6], "x": 6.5, "y": 1.0},
+					{"matrix": [1, 7], "x": 7.5, "y": 1.0},
+					{"matrix": [1, 8], "x": 8.5, "y": 1.0},
+					{"matrix": [1, 9], "x": 9.5, "y": 1.0},
+					{"matrix": [1, 10], "x": 10.5, "y": 1.0},
+					{"matrix": [1, 11], "x": 11.5, "y": 1.0},
+					{"matrix": [1, 12], "x": 12.5, "y": 1.0},
+					{"matrix": [1, 13], "x": 13.5, "y": 1.0, "w": 1.5},
+					{"matrix": [1, 14], "x": 15, "y": 1.0},
+					{"matrix": [2, 0], "x": 0, "y": 2.0, "w": 1.75},
+					{"matrix": [2, 1], "x": 1.75, "y": 2.0},
+					{"matrix": [2, 2], "x": 2.75, "y": 2.0},
+					{"matrix": [2, 3], "x": 3.75, "y": 2.0},
+					{"matrix": [2, 4], "x": 4.75, "y": 2.0},
+					{"matrix": [2, 5], "x": 5.75, "y": 2.0},
+					{"matrix": [2, 6], "x": 6.75, "y": 2.0},
+					{"matrix": [2, 7], "x": 7.75, "y": 2.0},
+					{"matrix": [2, 8], "x": 8.75, "y": 2.0},
+					{"matrix": [2, 9], "x": 9.75, "y": 2.0},
+					{"matrix": [2, 10], "x": 10.75, "y": 2.0},
+					{"matrix": [2, 11], "x": 11.75, "y": 2.0},
+					{"matrix": [2, 13], "x": 12.75, "y": 2.0, "w": 2.25},
+					{"matrix": [2, 14], "x": 15, "y": 2.0},
+					{"matrix": [3, 1], "x": 0, "y": 3.0, "w": 2.25},
+					{"matrix": [3, 2], "x": 2.25, "y": 3.0},
+					{"matrix": [3, 3], "x": 3.25, "y": 3.0},
+					{"matrix": [3, 4], "x": 4.25, "y": 3.0},
+					{"matrix": [3, 5], "x": 5.25, "y": 3.0},
+					{"matrix": [3, 6], "x": 6.25, "y": 3.0},
+					{"matrix": [3, 7], "x": 7.25, "y": 3.0},
+					{"matrix": [3, 8], "x": 8.25, "y": 3.0},
+					{"matrix": [3, 9], "x": 9.25, "y": 3.0},
+					{"matrix": [3, 10], "x": 10.25, "y": 3.0},
+					{"matrix": [3, 11], "x": 11.25, "y": 3.0},
+					{"matrix": [3, 12], "x": 12.25, "y": 3.0, "w": 1.75},
+					{"matrix": [3, 13], "x": 14.0, "y": 3.0},
+					{"matrix": [3, 14], "x": 15.0, "y": 3.0},
+					{"matrix": [4, 0], "x": 0, "y": 4.0, "w": 1.25},
+					{"matrix": [4, 1], "x": 1.25, "y": 4.0, "w": 1.25},
+					{"matrix": [4, 2], "x": 2.5, "y": 4.0, "w": 1.25},
+					{"matrix": [4, 6], "x": 3.75, "y": 4.0, "w": 6.25},
+					{"matrix": [4, 9], "x": 10, "y": 4.0},
+					{"matrix": [4, 10], "x": 11, "y": 4.0},
+					{"matrix": [4, 11], "x": 12, "y": 4.0},
+					{"matrix": [4, 12], "x": 13, "y": 4.0},
+					{"matrix": [4, 13], "x": 14, "y": 4.0},
+					{"matrix": [4, 14], "x": 15, "y": 4.0}
+				]
+			}
 		}
-    }
-}
\ No newline at end of file
+	}
\ No newline at end of file
diff --git a/keyboards/rkg68/rkg68.h b/keyboards/rkg68/rkg68.h
deleted file mode 100644
index f644fc88c520..000000000000
--- a/keyboards/rkg68/rkg68.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DeskDaily
- *
- * 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 "rkg68.h"

From 9d3dd14e9dbf9c106a9614ec517e100fafbbf5a8 Mon Sep 17 00:00:00 2001
From: Thomaz <thomaz.peres21@hotmail.com>
Date: Thu, 16 Mar 2023 17:37:08 -0300
Subject: [PATCH 5/8] update changes suggestions

---
 keyboards/rkg68/info.json                | 190 +++++++++++------------
 keyboards/rkg68/keymaps/default/rules.mk |   1 -
 keyboards/rkg68/keymaps/via/rules.mk     |   3 +-
 keyboards/rkg68/readme.md                |  27 +++-
 keyboards/rkg68/rules.mk                 |   2 +-
 5 files changed, 117 insertions(+), 106 deletions(-)
 delete mode 100644 keyboards/rkg68/keymaps/default/rules.mk

diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/info.json
index f88de7b2eb6b..c798575bbe88 100644
--- a/keyboards/rkg68/info.json
+++ b/keyboards/rkg68/info.json
@@ -3,9 +3,7 @@
 	"keyboard_name": "rkg68",
 	"maintainer": "Thomaz-Peres",
 	"bootloader": "atmel-dfu",
-	"config_h_features": {
-		"encoder": false
-	},
+	"processor": "atmega32u4",
 	"diode_direction": "COL2ROW",
 	"encoder": {
 		"enabled": false
@@ -13,103 +11,99 @@
 	"features": {
 		"encoder": false
 	},
-	"keyboard_folder": "rkg68",
 	"matrix_pins": {
 		"cols": [ "F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F4" ],
 		"rows": [ "D0", "D1", "D2", "D3", "D5" ]
+	},
+	"rgblight": {
+		"animations": {
+			"knight": true,
+			"rainbow_swirl": true
 		},
-		"platform_key": "avr",
-		"processor": "atmega32u4",
-		"processor_type": "avr",
-		"rgblight": {
-			"animations": {
-				"knight": true,
-				"rainbow_swirl": true
-			},
-			"brightness_steps": 17,
-			"hue_steps": 10,
-			"led_count": 4,
-			"pin": "B3",
-			"saturation_steps": 17
-		},
-		"url": "https://bit.ly/3JI7KUg",
-		"usb": {
-			"device_version": "1.0.0",
-			"pid": "0x05C4",
-			"vid": "0x05C4"
-		},
-		"layouts": {
-			"LAYOUT": {
-				"layout": [
-					{"matrix": [0, 0], "x": 0, "y": 0.0},
-					{"matrix": [0, 1], "x": 1, "y": 0.0},
-					{"matrix": [0, 2], "x": 2, "y": 0.0},
-					{"matrix": [0, 3], "x": 3, "y": 0.0},
-					{"matrix": [0, 4], "x": 4, "y": 0.0},
-					{"matrix": [0, 5], "x": 5, "y": 0.0},
-					{"matrix": [0, 6], "x": 6, "y": 0.0},
-					{"matrix": [0, 7], "x": 7, "y": 0.0},
-					{"matrix": [0, 8], "x": 8, "y": 0.0},
-					{"matrix": [0, 9], "x": 9, "y": 0.0},
-					{"matrix": [0, 10], "x": 10, "y": 0.0},
-					{"matrix": [0, 11], "x": 11, "y": 0.0},
-					{"matrix": [0, 12], "x": 12, "y": 0.0},
-					{"matrix": [0, 13], "x": 13, "y": 0.0, "w": 2},
-					{"matrix": [0, 14], "x": 15, "y": 0.0},
-					{"matrix": [1, 0], "x": 0, "y": 1.0, "w": 1.5},
-					{"matrix": [1, 1], "x": 1.5, "y": 1.0},
-					{"matrix": [1, 2], "x": 2.5, "y": 1.0},
-					{"matrix": [1, 3], "x": 3.5, "y": 1.0},
-					{"matrix": [1, 4], "x": 4.5, "y": 1.0},
-					{"matrix": [1, 5], "x": 5.5, "y": 1.0},
-					{"matrix": [1, 6], "x": 6.5, "y": 1.0},
-					{"matrix": [1, 7], "x": 7.5, "y": 1.0},
-					{"matrix": [1, 8], "x": 8.5, "y": 1.0},
-					{"matrix": [1, 9], "x": 9.5, "y": 1.0},
-					{"matrix": [1, 10], "x": 10.5, "y": 1.0},
-					{"matrix": [1, 11], "x": 11.5, "y": 1.0},
-					{"matrix": [1, 12], "x": 12.5, "y": 1.0},
-					{"matrix": [1, 13], "x": 13.5, "y": 1.0, "w": 1.5},
-					{"matrix": [1, 14], "x": 15, "y": 1.0},
-					{"matrix": [2, 0], "x": 0, "y": 2.0, "w": 1.75},
-					{"matrix": [2, 1], "x": 1.75, "y": 2.0},
-					{"matrix": [2, 2], "x": 2.75, "y": 2.0},
-					{"matrix": [2, 3], "x": 3.75, "y": 2.0},
-					{"matrix": [2, 4], "x": 4.75, "y": 2.0},
-					{"matrix": [2, 5], "x": 5.75, "y": 2.0},
-					{"matrix": [2, 6], "x": 6.75, "y": 2.0},
-					{"matrix": [2, 7], "x": 7.75, "y": 2.0},
-					{"matrix": [2, 8], "x": 8.75, "y": 2.0},
-					{"matrix": [2, 9], "x": 9.75, "y": 2.0},
-					{"matrix": [2, 10], "x": 10.75, "y": 2.0},
-					{"matrix": [2, 11], "x": 11.75, "y": 2.0},
-					{"matrix": [2, 13], "x": 12.75, "y": 2.0, "w": 2.25},
-					{"matrix": [2, 14], "x": 15, "y": 2.0},
-					{"matrix": [3, 1], "x": 0, "y": 3.0, "w": 2.25},
-					{"matrix": [3, 2], "x": 2.25, "y": 3.0},
-					{"matrix": [3, 3], "x": 3.25, "y": 3.0},
-					{"matrix": [3, 4], "x": 4.25, "y": 3.0},
-					{"matrix": [3, 5], "x": 5.25, "y": 3.0},
-					{"matrix": [3, 6], "x": 6.25, "y": 3.0},
-					{"matrix": [3, 7], "x": 7.25, "y": 3.0},
-					{"matrix": [3, 8], "x": 8.25, "y": 3.0},
-					{"matrix": [3, 9], "x": 9.25, "y": 3.0},
-					{"matrix": [3, 10], "x": 10.25, "y": 3.0},
-					{"matrix": [3, 11], "x": 11.25, "y": 3.0},
-					{"matrix": [3, 12], "x": 12.25, "y": 3.0, "w": 1.75},
-					{"matrix": [3, 13], "x": 14.0, "y": 3.0},
-					{"matrix": [3, 14], "x": 15.0, "y": 3.0},
-					{"matrix": [4, 0], "x": 0, "y": 4.0, "w": 1.25},
-					{"matrix": [4, 1], "x": 1.25, "y": 4.0, "w": 1.25},
-					{"matrix": [4, 2], "x": 2.5, "y": 4.0, "w": 1.25},
-					{"matrix": [4, 6], "x": 3.75, "y": 4.0, "w": 6.25},
-					{"matrix": [4, 9], "x": 10, "y": 4.0},
-					{"matrix": [4, 10], "x": 11, "y": 4.0},
-					{"matrix": [4, 11], "x": 12, "y": 4.0},
-					{"matrix": [4, 12], "x": 13, "y": 4.0},
-					{"matrix": [4, 13], "x": 14, "y": 4.0},
-					{"matrix": [4, 14], "x": 15, "y": 4.0}
-				]
-			}
+		"brightness_steps": 17,
+		"hue_steps": 10,
+		"led_count": 4,
+		"pin": "B3",
+		"saturation_steps": 17
+	},
+	"url": "http://en.rkgaming.com/",
+	"usb": {
+		"device_version": "1.0.0",
+		"pid": "0x0049",
+		"vid": "0x0049"
+	},
+	"layouts": {
+		"LAYOUT": {
+			"layout": [
+				{"matrix": [0, 0], "x": 0, "y": 0.0},
+				{"matrix": [0, 1], "x": 1, "y": 0.0},
+				{"matrix": [0, 2], "x": 2, "y": 0.0},
+				{"matrix": [0, 3], "x": 3, "y": 0.0},
+				{"matrix": [0, 4], "x": 4, "y": 0.0},
+				{"matrix": [0, 5], "x": 5, "y": 0.0},
+				{"matrix": [0, 6], "x": 6, "y": 0.0},
+				{"matrix": [0, 7], "x": 7, "y": 0.0},
+				{"matrix": [0, 8], "x": 8, "y": 0.0},
+				{"matrix": [0, 9], "x": 9, "y": 0.0},
+				{"matrix": [0, 10], "x": 10, "y": 0.0},
+				{"matrix": [0, 11], "x": 11, "y": 0.0},
+				{"matrix": [0, 12], "x": 12, "y": 0.0},
+				{"matrix": [0, 13], "x": 13, "y": 0.0, "w": 2},
+				{"matrix": [0, 14], "x": 15, "y": 0.0},
+				{"matrix": [1, 0], "x": 0, "y": 1.0, "w": 1.5},
+				{"matrix": [1, 1], "x": 1.5, "y": 1.0},
+				{"matrix": [1, 2], "x": 2.5, "y": 1.0},
+				{"matrix": [1, 3], "x": 3.5, "y": 1.0},
+				{"matrix": [1, 4], "x": 4.5, "y": 1.0},
+				{"matrix": [1, 5], "x": 5.5, "y": 1.0},
+				{"matrix": [1, 6], "x": 6.5, "y": 1.0},
+				{"matrix": [1, 7], "x": 7.5, "y": 1.0},
+				{"matrix": [1, 8], "x": 8.5, "y": 1.0},
+				{"matrix": [1, 9], "x": 9.5, "y": 1.0},
+				{"matrix": [1, 10], "x": 10.5, "y": 1.0},
+				{"matrix": [1, 11], "x": 11.5, "y": 1.0},
+				{"matrix": [1, 12], "x": 12.5, "y": 1.0},
+				{"matrix": [1, 13], "x": 13.5, "y": 1.0, "w": 1.5},
+				{"matrix": [1, 14], "x": 15, "y": 1.0},
+				{"matrix": [2, 0], "x": 0, "y": 2.0, "w": 1.75},
+				{"matrix": [2, 1], "x": 1.75, "y": 2.0},
+				{"matrix": [2, 2], "x": 2.75, "y": 2.0},
+				{"matrix": [2, 3], "x": 3.75, "y": 2.0},
+				{"matrix": [2, 4], "x": 4.75, "y": 2.0},
+				{"matrix": [2, 5], "x": 5.75, "y": 2.0},
+				{"matrix": [2, 6], "x": 6.75, "y": 2.0},
+				{"matrix": [2, 7], "x": 7.75, "y": 2.0},
+				{"matrix": [2, 8], "x": 8.75, "y": 2.0},
+				{"matrix": [2, 9], "x": 9.75, "y": 2.0},
+				{"matrix": [2, 10], "x": 10.75, "y": 2.0},
+				{"matrix": [2, 11], "x": 11.75, "y": 2.0},
+				{"matrix": [2, 13], "x": 12.75, "y": 2.0, "w": 2.25},
+				{"matrix": [2, 14], "x": 15, "y": 2.0},
+				{"matrix": [3, 1], "x": 0, "y": 3.0, "w": 2.25},
+				{"matrix": [3, 2], "x": 2.25, "y": 3.0},
+				{"matrix": [3, 3], "x": 3.25, "y": 3.0},
+				{"matrix": [3, 4], "x": 4.25, "y": 3.0},
+				{"matrix": [3, 5], "x": 5.25, "y": 3.0},
+				{"matrix": [3, 6], "x": 6.25, "y": 3.0},
+				{"matrix": [3, 7], "x": 7.25, "y": 3.0},
+				{"matrix": [3, 8], "x": 8.25, "y": 3.0},
+				{"matrix": [3, 9], "x": 9.25, "y": 3.0},
+				{"matrix": [3, 10], "x": 10.25, "y": 3.0},
+				{"matrix": [3, 11], "x": 11.25, "y": 3.0},
+				{"matrix": [3, 12], "x": 12.25, "y": 3.0, "w": 1.75},
+				{"matrix": [3, 13], "x": 14.0, "y": 3.0},
+				{"matrix": [3, 14], "x": 15.0, "y": 3.0},
+				{"matrix": [4, 0], "x": 0, "y": 4.0, "w": 1.25},
+				{"matrix": [4, 1], "x": 1.25, "y": 4.0, "w": 1.25},
+				{"matrix": [4, 2], "x": 2.5, "y": 4.0, "w": 1.25},
+				{"matrix": [4, 6], "x": 3.75, "y": 4.0, "w": 6.25},
+				{"matrix": [4, 9], "x": 10, "y": 4.0},
+				{"matrix": [4, 10], "x": 11, "y": 4.0},
+				{"matrix": [4, 11], "x": 12, "y": 4.0},
+				{"matrix": [4, 12], "x": 13, "y": 4.0},
+				{"matrix": [4, 13], "x": 14, "y": 4.0},
+				{"matrix": [4, 14], "x": 15, "y": 4.0}
+			]
 		}
-	}
\ No newline at end of file
+	}
+}
\ No newline at end of file
diff --git a/keyboards/rkg68/keymaps/default/rules.mk b/keyboards/rkg68/keymaps/default/rules.mk
deleted file mode 100644
index 433146d8d0c6..000000000000
--- a/keyboards/rkg68/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = no
diff --git a/keyboards/rkg68/keymaps/via/rules.mk b/keyboards/rkg68/keymaps/via/rules.mk
index 14b4d1fb4482..036bd6d1c3ec 100644
--- a/keyboards/rkg68/keymaps/via/rules.mk
+++ b/keyboards/rkg68/keymaps/via/rules.mk
@@ -1,2 +1 @@
-VIA_ENABLE = yes
-ENCODER_ENABLE = no
\ No newline at end of file
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/rkg68/readme.md b/keyboards/rkg68/readme.md
index b84a19f6d0df..ae053a099d7f 100644
--- a/keyboards/rkg68/readme.md
+++ b/keyboards/rkg68/readme.md
@@ -1,10 +1,10 @@
 # RK G68
 
-## Layouts
-
-- ANSI layout;
+![Keyboard picture](https://imgur.com/UnOJPZr.jpg)
 
-![image](https://user-images.githubusercontent.com/58439854/225489922-a6a4df65-aff7-4835-a452-3b1afdb6fc15.png)
+* Keyboard Maintainer: [Royal Kludge](https://rkgamingstore.com/)
+* Hardware Supported: Royal Kludge RK G68
+* Hardware Availability: [RKG 68](http://en.rkgaming.com/download/1/)
 
 ## Availability
 
@@ -16,4 +16,23 @@ After setting up your build environment, you can compile the  default keymap by
 
     make rkg68:default
 
+Flashing example for this keyboard:
+
+    make rkg68: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
+- **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+- **Keycode in layout**: Press the key `FN` and `Left CTRL`.
+
+## Layouts
+
+- ANSI layout;
+
+![image](https://user-images.githubusercontent.com/58439854/225489922-a6a4df65-aff7-4835-a452-3b1afdb6fc15.png)
diff --git a/keyboards/rkg68/rules.mk b/keyboards/rkg68/rules.mk
index 6e7633bfe015..7ff128fa692e 100644
--- a/keyboards/rkg68/rules.mk
+++ b/keyboards/rkg68/rules.mk
@@ -1 +1 @@
-# This file intentionally left blank
+# This file intentionally left blank
\ No newline at end of file

From e3ab26182487df8a3423183b0fd955bf1d8443bf Mon Sep 17 00:00:00 2001
From: Thomaz <thomaz.peres21@hotmail.com>
Date: Tue, 21 Mar 2023 13:15:10 -0300
Subject: [PATCH 6/8] Update image to imgur

---
 keyboards/rkg68/readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/rkg68/readme.md b/keyboards/rkg68/readme.md
index ae053a099d7f..c4d1b867a05e 100644
--- a/keyboards/rkg68/readme.md
+++ b/keyboards/rkg68/readme.md
@@ -1,6 +1,6 @@
 # RK G68
 
-![Keyboard picture](https://imgur.com/UnOJPZr.jpg)
+![Keyboard picture](https://imgur.com/UnOJPZrh.jpg)
 
 * Keyboard Maintainer: [Royal Kludge](https://rkgamingstore.com/)
 * Hardware Supported: Royal Kludge RK G68
@@ -35,4 +35,4 @@ Enter the bootloader in 3 ways:
 
 - ANSI layout;
 
-![image](https://user-images.githubusercontent.com/58439854/225489922-a6a4df65-aff7-4835-a452-3b1afdb6fc15.png)
+![Imgur](https://i.imgur.com/l7ka1gkh.png)

From 31e332e2ff6f40de2b13975fc96b7129b31bffa1 Mon Sep 17 00:00:00 2001
From: Thomaz <thomaz.peres21@hotmail.com>
Date: Fri, 24 Mar 2023 08:50:25 -0300
Subject: [PATCH 7/8] Resolving reviews - readme and info json

---
 keyboards/rkg68/info.json | 12 ++++--------
 keyboards/rkg68/readme.md |  7 -------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/info.json
index c798575bbe88..43e45abbfcd8 100644
--- a/keyboards/rkg68/info.json
+++ b/keyboards/rkg68/info.json
@@ -5,11 +5,10 @@
 	"bootloader": "atmel-dfu",
 	"processor": "atmega32u4",
 	"diode_direction": "COL2ROW",
-	"encoder": {
-		"enabled": false
-	},
 	"features": {
-		"encoder": false
+		"bootmagic": true,
+		"extrakey": true,
+		"mousekey": true
 	},
 	"matrix_pins": {
 		"cols": [ "F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F4" ],
@@ -20,11 +19,8 @@
 			"knight": true,
 			"rainbow_swirl": true
 		},
-		"brightness_steps": 17,
-		"hue_steps": 10,
 		"led_count": 4,
-		"pin": "B3",
-		"saturation_steps": 17
+		"pin": "B3"
 	},
 	"url": "http://en.rkgaming.com/",
 	"usb": {
diff --git a/keyboards/rkg68/readme.md b/keyboards/rkg68/readme.md
index c4d1b867a05e..8069a53169eb 100644
--- a/keyboards/rkg68/readme.md
+++ b/keyboards/rkg68/readme.md
@@ -6,12 +6,6 @@
 * Hardware Supported: Royal Kludge RK G68
 * Hardware Availability: [RKG 68](http://en.rkgaming.com/download/1/)
 
-## Availability
-
-The RKG68 is available for purchase through [AliExpress](https://www.aliexpress.com/).
-
-## How to compile
-
 After setting up your build environment, you can compile the  default keymap by using:
 
     make rkg68:default
@@ -23,7 +17,6 @@ Flashing example for this keyboard:
 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:
 

From 5b9c4c16c936ce6a5d301b07ccbf5f85d203ea57 Mon Sep 17 00:00:00 2001
From: Thomaz <thomaz.peres21@hotmail.com>
Date: Fri, 24 Mar 2023 23:04:33 -0300
Subject: [PATCH 8/8] Review update

---
 keyboards/rkg68/info.json | 136 +++++++++++++++++++-------------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/info.json
index 43e45abbfcd8..f318019dd6ec 100644
--- a/keyboards/rkg68/info.json
+++ b/keyboards/rkg68/info.json
@@ -31,74 +31,74 @@
 	"layouts": {
 		"LAYOUT": {
 			"layout": [
-				{"matrix": [0, 0], "x": 0, "y": 0.0},
-				{"matrix": [0, 1], "x": 1, "y": 0.0},
-				{"matrix": [0, 2], "x": 2, "y": 0.0},
-				{"matrix": [0, 3], "x": 3, "y": 0.0},
-				{"matrix": [0, 4], "x": 4, "y": 0.0},
-				{"matrix": [0, 5], "x": 5, "y": 0.0},
-				{"matrix": [0, 6], "x": 6, "y": 0.0},
-				{"matrix": [0, 7], "x": 7, "y": 0.0},
-				{"matrix": [0, 8], "x": 8, "y": 0.0},
-				{"matrix": [0, 9], "x": 9, "y": 0.0},
-				{"matrix": [0, 10], "x": 10, "y": 0.0},
-				{"matrix": [0, 11], "x": 11, "y": 0.0},
-				{"matrix": [0, 12], "x": 12, "y": 0.0},
-				{"matrix": [0, 13], "x": 13, "y": 0.0, "w": 2},
-				{"matrix": [0, 14], "x": 15, "y": 0.0},
-				{"matrix": [1, 0], "x": 0, "y": 1.0, "w": 1.5},
-				{"matrix": [1, 1], "x": 1.5, "y": 1.0},
-				{"matrix": [1, 2], "x": 2.5, "y": 1.0},
-				{"matrix": [1, 3], "x": 3.5, "y": 1.0},
-				{"matrix": [1, 4], "x": 4.5, "y": 1.0},
-				{"matrix": [1, 5], "x": 5.5, "y": 1.0},
-				{"matrix": [1, 6], "x": 6.5, "y": 1.0},
-				{"matrix": [1, 7], "x": 7.5, "y": 1.0},
-				{"matrix": [1, 8], "x": 8.5, "y": 1.0},
-				{"matrix": [1, 9], "x": 9.5, "y": 1.0},
-				{"matrix": [1, 10], "x": 10.5, "y": 1.0},
-				{"matrix": [1, 11], "x": 11.5, "y": 1.0},
-				{"matrix": [1, 12], "x": 12.5, "y": 1.0},
-				{"matrix": [1, 13], "x": 13.5, "y": 1.0, "w": 1.5},
-				{"matrix": [1, 14], "x": 15, "y": 1.0},
-				{"matrix": [2, 0], "x": 0, "y": 2.0, "w": 1.75},
-				{"matrix": [2, 1], "x": 1.75, "y": 2.0},
-				{"matrix": [2, 2], "x": 2.75, "y": 2.0},
-				{"matrix": [2, 3], "x": 3.75, "y": 2.0},
-				{"matrix": [2, 4], "x": 4.75, "y": 2.0},
-				{"matrix": [2, 5], "x": 5.75, "y": 2.0},
-				{"matrix": [2, 6], "x": 6.75, "y": 2.0},
-				{"matrix": [2, 7], "x": 7.75, "y": 2.0},
-				{"matrix": [2, 8], "x": 8.75, "y": 2.0},
-				{"matrix": [2, 9], "x": 9.75, "y": 2.0},
-				{"matrix": [2, 10], "x": 10.75, "y": 2.0},
-				{"matrix": [2, 11], "x": 11.75, "y": 2.0},
-				{"matrix": [2, 13], "x": 12.75, "y": 2.0, "w": 2.25},
-				{"matrix": [2, 14], "x": 15, "y": 2.0},
-				{"matrix": [3, 1], "x": 0, "y": 3.0, "w": 2.25},
-				{"matrix": [3, 2], "x": 2.25, "y": 3.0},
-				{"matrix": [3, 3], "x": 3.25, "y": 3.0},
-				{"matrix": [3, 4], "x": 4.25, "y": 3.0},
-				{"matrix": [3, 5], "x": 5.25, "y": 3.0},
-				{"matrix": [3, 6], "x": 6.25, "y": 3.0},
-				{"matrix": [3, 7], "x": 7.25, "y": 3.0},
-				{"matrix": [3, 8], "x": 8.25, "y": 3.0},
-				{"matrix": [3, 9], "x": 9.25, "y": 3.0},
-				{"matrix": [3, 10], "x": 10.25, "y": 3.0},
-				{"matrix": [3, 11], "x": 11.25, "y": 3.0},
-				{"matrix": [3, 12], "x": 12.25, "y": 3.0, "w": 1.75},
-				{"matrix": [3, 13], "x": 14.0, "y": 3.0},
-				{"matrix": [3, 14], "x": 15.0, "y": 3.0},
-				{"matrix": [4, 0], "x": 0, "y": 4.0, "w": 1.25},
-				{"matrix": [4, 1], "x": 1.25, "y": 4.0, "w": 1.25},
-				{"matrix": [4, 2], "x": 2.5, "y": 4.0, "w": 1.25},
-				{"matrix": [4, 6], "x": 3.75, "y": 4.0, "w": 6.25},
-				{"matrix": [4, 9], "x": 10, "y": 4.0},
-				{"matrix": [4, 10], "x": 11, "y": 4.0},
-				{"matrix": [4, 11], "x": 12, "y": 4.0},
-				{"matrix": [4, 12], "x": 13, "y": 4.0},
-				{"matrix": [4, 13], "x": 14, "y": 4.0},
-				{"matrix": [4, 14], "x": 15, "y": 4.0}
+				{"matrix": [0, 0], "x": 0, "y": 0},
+				{"matrix": [0, 1], "x": 1, "y": 0},
+				{"matrix": [0, 2], "x": 2, "y": 0},
+				{"matrix": [0, 3], "x": 3, "y": 0},
+				{"matrix": [0, 4], "x": 4, "y": 0},
+				{"matrix": [0, 5], "x": 5, "y": 0},
+				{"matrix": [0, 6], "x": 6, "y": 0},
+				{"matrix": [0, 7], "x": 7, "y": 0},
+				{"matrix": [0, 8], "x": 8, "y": 0},
+				{"matrix": [0, 9], "x": 9, "y": 0},
+				{"matrix": [0, 10], "x": 10, "y": 0},
+				{"matrix": [0, 11], "x": 11, "y": 0},
+				{"matrix": [0, 12], "x": 12, "y": 0},
+				{"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+				{"matrix": [0, 14], "x": 15, "y": 0},
+				{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+				{"matrix": [1, 1], "x": 1.5, "y": 1},
+				{"matrix": [1, 2], "x": 2.5, "y": 1},
+				{"matrix": [1, 3], "x": 3.5, "y": 1},
+				{"matrix": [1, 4], "x": 4.5, "y": 1},
+				{"matrix": [1, 5], "x": 5.5, "y": 1},
+				{"matrix": [1, 6], "x": 6.5, "y": 1},
+				{"matrix": [1, 7], "x": 7.5, "y": 1},
+				{"matrix": [1, 8], "x": 8.5, "y": 1},
+				{"matrix": [1, 9], "x": 9.5, "y": 1},
+				{"matrix": [1, 10], "x": 10.5, "y": 1},
+				{"matrix": [1, 11], "x": 11.5, "y": 1},
+				{"matrix": [1, 12], "x": 12.5, "y": 1},
+				{"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+				{"matrix": [1, 14], "x": 15, "y": 1},
+				{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+				{"matrix": [2, 1], "x": 1.75, "y": 2},
+				{"matrix": [2, 2], "x": 2.75, "y": 2},
+				{"matrix": [2, 3], "x": 3.75, "y": 2},
+				{"matrix": [2, 4], "x": 4.75, "y": 2},
+				{"matrix": [2, 5], "x": 5.75, "y": 2},
+				{"matrix": [2, 6], "x": 6.75, "y": 2},
+				{"matrix": [2, 7], "x": 7.75, "y": 2},
+				{"matrix": [2, 8], "x": 8.75, "y": 2},
+				{"matrix": [2, 9], "x": 9.75, "y": 2},
+				{"matrix": [2, 10], "x": 10.75, "y": 2},
+				{"matrix": [2, 11], "x": 11.75, "y": 2},
+				{"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+				{"matrix": [2, 14], "x": 15, "y": 2},
+				{"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+				{"matrix": [3, 2], "x": 2.25, "y": 3},
+				{"matrix": [3, 3], "x": 3.25, "y": 3},
+				{"matrix": [3, 4], "x": 4.25, "y": 3},
+				{"matrix": [3, 5], "x": 5.25, "y": 3},
+				{"matrix": [3, 6], "x": 6.25, "y": 3},
+				{"matrix": [3, 7], "x": 7.25, "y": 3},
+				{"matrix": [3, 8], "x": 8.25, "y": 3},
+				{"matrix": [3, 9], "x": 9.25, "y": 3},
+				{"matrix": [3, 10], "x": 10.25, "y": 3},
+				{"matrix": [3, 11], "x": 11.25, "y": 3},
+				{"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+				{"matrix": [3, 13], "x": 14, "y": 3},
+				{"matrix": [3, 14], "x": 15, "y": 3},
+				{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+				{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+				{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+				{"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+				{"matrix": [4, 9], "x": 10, "y": 4},
+				{"matrix": [4, 10], "x": 11, "y": 4},
+				{"matrix": [4, 11], "x": 12, "y": 4},
+				{"matrix": [4, 12], "x": 13, "y": 4},
+				{"matrix": [4, 13], "x": 14, "y": 4},
+				{"matrix": [4, 14], "x": 15, "y": 4}
 			]
 		}
 	}