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

14 files changed, 505 insertions, 0 deletions

diff --git a/keyboards/ghs/jem/hotswap_ansi/info.json b/keyboards/ghs/jem/hotswap_ansi/info.json
new file mode 100644
index 0000000000..a52e7e1608
--- /dev/null
+++ b/keyboards/ghs/jem/hotswap_ansi/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0x2003"
+    }
+}
diff --git a/keyboards/ghs/jem/hotswap_ansi/keymaps/default/keymap.c b/keyboards/ghs/jem/hotswap_ansi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4433d46a34
--- /dev/null
+++ b/keyboards/ghs/jem/hotswap_ansi/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 Ramon Imbao
+ *
+ * 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_ansi(
+        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_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_BSLS, 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_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,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ansi(
+        KC_GRV,  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_DEL,  _______,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
+    )
+};
diff --git a/keyboards/ghs/jem/hotswap_ansi/keymaps/via/keymap.c b/keyboards/ghs/jem/hotswap_ansi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b46a48cdb4
--- /dev/null
+++ b/keyboards/ghs/jem/hotswap_ansi/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2021 Ramon Imbao
+ *
+ * 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_BSPC, KC_BSPC, 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_BSLS,          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_PGDN,
+        KC_LSFT, KC_NO,   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_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_GRV,  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_DEL,  KC_DEL,  _______,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______
+    )
+};
diff --git a/keyboards/ghs/jem/hotswap_ansi/keymaps/via/rules.mk b/keyboards/ghs/jem/hotswap_ansi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/ghs/jem/hotswap_ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/ghs/jem/hotswap_ansi/rules.mk b/keyboards/ghs/jem/hotswap_ansi/rules.mk
new file mode 100644
index 0000000000..17f0d87b7f
--- /dev/null
+++ b/keyboards/ghs/jem/hotswap_ansi/rules.mk
@@ -0,0 +1 @@
+# This file left intentionally blank
diff --git a/keyboards/ghs/jem/info.json b/keyboards/ghs/jem/info.json
new file mode 100644
index 0000000000..d35f86c4da
--- /dev/null
+++ b/keyboards/ghs/jem/info.json
@@ -0,0 +1,276 @@
+{
+    "keyboard_name": "GHS.JEM",
+    "manufacturer": "Gone Hacking Studio",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0x0645",
+        "device_version": "1.0.0"
+    },
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true,
+        "nkro": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": [ "E6", "B0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": [ "F1", "F0", "F7", "F6", "F5" ]
+    },
+    "indicators": {
+        "caps_lock": "B7"
+    },
+    "rgblight": {
+        "led_count": 22,
+        "pin": "F4",
+        "hue_steps": 10,
+        "saturation_steps": 17,
+        "brightness_steps": 17,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true
+        }
+    },
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                { "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": [1,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": [2,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": [3,14], "x":15, "y":2 },
+
+                { "matrix": [3,0], "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": [4,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,7], "x":3.75, "y":4, "w":6.25 },
+                { "matrix": [4,9], "x":10, "y":4, "w":1.25 },
+                { "matrix": [4,10], "x":11.25, "y":4, "w":1.25 },
+                { "matrix": [4,11], "x":13, "y":4 },
+                { "matrix": [4,12], "x":14, "y":4 },
+                { "matrix": [4,13], "x":15, "y":4 }
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                { "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": [1,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": [2,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 },
+                { "matrix": [1,13], "x":13.75, "y":1, "w":1.25, "h":2 },
+                { "matrix": [3,14], "x":15, "y":2 },
+
+                { "matrix": [3,0], "x":0, "y":3, "w":1.25 },
+                { "matrix": [3,1], "x":1.25, "y":3 },
+                { "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": [4,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,7], "x":3.75, "y":4, "w":6.25 },
+                { "matrix": [4,9], "x":10, "y":4, "w":1.25 },
+                { "matrix": [4,10], "x":11.25, "y":4, "w":1.25 },
+                { "matrix": [4,11], "x":13, "y":4 },
+                { "matrix": [4,12], "x":14, "y":4 },
+                { "matrix": [4,13], "x":15, "y":4 }
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                { "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 },
+                { "matrix": [0,14], "x":14, "y":0 },
+                { "matrix": [1,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": [2,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": [3,14], "x":15, "y":2 },
+
+                { "matrix": [3,0], "x":0, "y":3, "w":1.25 },
+                { "matrix": [3,1], "x":1.25, "y":3 },
+                { "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": [4,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,7], "x":3.75, "y":4, "w":6.25 },
+                { "matrix": [4,9], "x":10, "y":4, "w":1.25 },
+                { "matrix": [4,10], "x":11.25, "y":4, "w":1.25 },
+                { "matrix": [4,11], "x":13, "y":4 },
+                { "matrix": [4,12], "x":14, "y":4 },
+                { "matrix": [4,13], "x":15, "y":4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/ghs/jem/readme.md b/keyboards/ghs/jem/readme.md
new file mode 100644
index 0000000000..1d76f959dd
--- /dev/null
+++ b/keyboards/ghs/jem/readme.md
@@ -0,0 +1,21 @@
+# GHS.JEM
+
+![GHS.JEM](https://i.imgur.com/whcvQ01l.jpg)
+
+A 65% screwless seamless keyboard.
+
+* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao)
+* Hardware Supported: ATmega32u4
+* Hardware Availability: [Gone Hacking Studio][https://gonehacking.studio/]
+
+To access the bootloader, press the reset button located under the spacebar. You can then flash new firmware:
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ghs/jem:default
+
+Flashing example for this keyboard:
+
+    make ghs/jem: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).
diff --git a/keyboards/ghs/jem/rules.mk b/keyboards/ghs/jem/rules.mk
new file mode 100644
index 0000000000..e96c00e5c0
--- /dev/null
+++ b/keyboards/ghs/jem/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = ghs/jem/soldered
diff --git a/keyboards/ghs/jem/soldered/info.json b/keyboards/ghs/jem/soldered/info.json
new file mode 100644
index 0000000000..e393236059
--- /dev/null
+++ b/keyboards/ghs/jem/soldered/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0x1003"
+    }
+}
diff --git a/keyboards/ghs/jem/soldered/keymaps/default/keymap.c b/keyboards/ghs/jem/soldered/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4433d46a34
--- /dev/null
+++ b/keyboards/ghs/jem/soldered/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 Ramon Imbao
+ *
+ * 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_ansi(
+        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_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_BSLS, 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_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,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ansi(
+        KC_GRV,  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_DEL,  _______,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
+    )
+};
diff --git a/keyboards/ghs/jem/soldered/keymaps/iso/keymap.c b/keyboards/ghs/jem/soldered/keymaps/iso/keymap.c
new file mode 100644
index 0000000000..de792b561f
--- /dev/null
+++ b/keyboards/ghs/jem/soldered/keymaps/iso/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 Ramon Imbao
+ *
+ * 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_iso(
+        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_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_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_NUHS, KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_NUBS, 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_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_iso(
+        KC_GRV,  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_DEL,  _______,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
+    )
+};
diff --git a/keyboards/ghs/jem/soldered/keymaps/via/keymap.c b/keyboards/ghs/jem/soldered/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b46a48cdb4
--- /dev/null
+++ b/keyboards/ghs/jem/soldered/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2021 Ramon Imbao
+ *
+ * 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_BSPC, KC_BSPC, 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_BSLS,          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_PGDN,
+        KC_LSFT, KC_NO,   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_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_GRV,  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_DEL,  KC_DEL,  _______,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______
+    )
+};
diff --git a/keyboards/ghs/jem/soldered/keymaps/via/rules.mk b/keyboards/ghs/jem/soldered/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/ghs/jem/soldered/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/ghs/jem/soldered/rules.mk b/keyboards/ghs/jem/soldered/rules.mk
new file mode 100644
index 0000000000..218d8921e5
--- /dev/null
+++ b/keyboards/ghs/jem/soldered/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank.