diff --git a/keyboards/dmqdesign/spin/keymaps/gorbachev/config.h b/keyboards/dmqdesign/spin/keymaps/gorbachev/config.h
new file mode 100644
index 00000000000..10201015ee6
--- /dev/null
+++ b/keyboards/dmqdesign/spin/keymaps/gorbachev/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2019-2020 DMQ Design
+ *
+ * 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 RGBLIGHT_ANIMATIONS 
+#define RGBLIGHT_HUE_STEP 8
+
+// Use one or the other, determines the orientation of
+// the OLED display
+// #define RIGHT_HAND
+#define LEFT_HAND
diff --git a/keyboards/dmqdesign/spin/keymaps/gorbachev/keymap.c b/keyboards/dmqdesign/spin/keymaps/gorbachev/keymap.c
new file mode 100644
index 00000000000..b9ad17386c2
--- /dev/null
+++ b/keyboards/dmqdesign/spin/keymaps/gorbachev/keymap.c
@@ -0,0 +1,247 @@
+/* Copyright 2019-2020 DMQ Design
+ *
+ * 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 {
+    _NUMPAD,
+    _RGB,
+    _MACRO
+};
+
+enum custom_keycodes {
+    HELLO_WORLD = SAFE_RANGE,
+};
+
+//The below layers are intentionally empty in order to give a good starting point for how to configure multiple layers.
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_NUMPAD] = LAYOUT(/* Base */
+                KC_7, KC_8, KC_9, TO(_NUMPAD),
+                KC_4, KC_5, KC_6, TO(_RGB),
+                KC_1, KC_2, KC_3, TO(_MACRO),
+                KC_0, KC_DOT, KC_ENTER
+                ),
+
+    [_RGB] = LAYOUT(/* Base */
+                RGB_HUI,  RGB_SAI, RGB_VAI, KC_TRNS,
+                RGB_HUD,  RGB_SAD, RGB_VAD, KC_TRNS,
+                KC_NO,    KC_NO,   KC_NO,   KC_TRNS,
+                RGB_RMOD, RGB_TOG, RGB_MOD
+                ),
+
+    [_MACRO] = LAYOUT(/* Base */
+                HELLO_WORLD, KC_NO, KC_NO, KC_TRNS,
+                KC_NO, KC_NO, KC_NO, KC_TRNS,
+                KC_NO, KC_NO, KC_NO, KC_TRNS,
+                KC_NO, KC_NO, KC_NO
+                )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case HELLO_WORLD:
+            if (record->event.pressed) {
+                SEND_STRING("Hello, world!");
+            }
+            break;
+    }
+
+    return true;
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder */
+        switch (get_highest_layer(layer_state)) {     //break each encoder update into a switch statement for the current layer
+            case _NUMPAD:
+                if (clockwise) {
+                    tap_code(KC_DOWN);
+                } else {
+                    tap_code(KC_UP);
+                }
+                break;
+            case _RGB:
+                if (clockwise) {
+                    rgblight_increase_hue();
+                } else {
+                    rgblight_decrease_hue();
+                }
+                break;
+            case _MACRO:
+                if (clockwise) {
+                    break;
+                } else {
+                    break;
+                }
+                break;
+        }
+    } else if (index == 1) { /* Second encoder */
+        switch (get_highest_layer(layer_state)) {
+            case _NUMPAD:
+                if (clockwise) {
+                    tap_code(KC_PGDN);
+                } else {
+                    tap_code(KC_PGUP);
+                }
+                break;
+            case _RGB:
+                if (clockwise) {
+                    rgblight_increase_sat();
+                } else {
+                    rgblight_decrease_sat();
+                }
+                break;
+            case _MACRO:
+                if (clockwise) {
+                    break;
+                } else {
+                    break;
+                }
+                break;
+        }
+    } else if (index == 2) { /* Third encoder */
+        switch (get_highest_layer(layer_state)) {
+            case _NUMPAD:
+                if (clockwise) {
+                    tap_code(KC_VOLU);
+                } else {
+                    tap_code(KC_VOLD);
+                }
+                break;
+            case _RGB:
+                if (clockwise) {
+                    rgblight_increase_val();
+                } else {
+                    rgblight_decrease_val();
+                }
+                break;
+            case _MACRO:
+                if (clockwise) {
+                    break;
+                } else {
+                    break;
+                }
+                break;
+        }
+    }
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) { //This will run every time the layer is updated
+    switch (get_highest_layer(state)) {
+        case _NUMPAD:
+            setrgb(RGB_WHITE, &led[0]); //Set the top LED to white for the bottom layer
+            setrgb(0, 0, 0, &led[1]);
+            setrgb(0, 0, 0, &led[2]);
+            break;
+        case _RGB:
+            setrgb(0, 0, 0, &led[0]); //Set the middle LED to white for the middle layer
+            setrgb(RGB_WHITE, &led[1]);
+            setrgb(0, 0, 0, &led[2]);
+            break;
+        case _MACRO:
+            setrgb(0, 0, 0, &led[0]);
+            setrgb(0, 0, 0, &led[1]);
+            setrgb(RGB_WHITE, &led[2]); //Set the bottom LED to white for the top layer
+            break;
+    }
+    rgblight_set();
+    return state;
+}
+
+#ifdef OLED_DRIVER_ENABLE
+
+static const char *ANIMATION_NAMES[] = {
+	"unknown",
+	"static",
+	"breathing I",
+	"breathing II",
+	"breathing III",
+	"breathing IV",
+	"rainbow mood I",
+	"rainbow mood II",
+	"rainbow mood III",
+	"rainbow swirl I",
+	"rainbow swirl II",
+	"rainbow swirl III",
+	"rainbow swirl IV",
+	"rainbow swirl V",
+	"rainbow swirl VI",
+	"snake I",
+	"snake II",
+	"snake III",
+	"snake IV",
+	"snake V",
+	"snake VI",
+	"knight I",
+	"knight II",
+	"knight III",
+	"christmas",
+	"static gradient I",
+	"static gradient II",
+	"static gradient III",
+	"static gradient IV",
+	"static gradient V",
+	"static gradient VI",
+	"static gradient VII",
+	"static gradient VIII",
+	"static gradient IX",
+	"static gradient X",
+	"rgb test",
+	"alternating",
+	"twinkle I",
+	"twinkle II",
+	"twinkle III",
+	"twinkle IV",
+	"twinkle V",
+	"twinkle VI"
+};
+
+void rgblight_get_mode_name(uint8_t mode, size_t bufsize, char *buf) {
+    snprintf(buf, bufsize, "%-25s", ANIMATION_NAMES[mode]);
+}
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+#ifdef LEFT_HAND
+    return OLED_ROTATION_180;
+#else
+    return OLED_ROTATION_0;
+#endif
+}
+
+void oled_task_user(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case _NUMPAD:
+            oled_write_P(PSTR("Numpad\n"), false);
+            break;
+        case _RGB:
+            oled_write_P(PSTR("RGB\n"), false);
+            break;
+        case _MACRO:
+            oled_write_P(PSTR("Macro\n"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
+
+    static char rgb_mode_name[30];
+    rgblight_get_mode_name(rgblight_get_mode(), sizeof(rgb_mode_name), rgb_mode_name);
+
+    oled_write_P(PSTR("Mode: "), false);
+    oled_write_ln(rgb_mode_name, false);
+}
+#endif
diff --git a/keyboards/dmqdesign/spin/keymaps/gorbachev/readme.md b/keyboards/dmqdesign/spin/keymaps/gorbachev/readme.md
new file mode 100644
index 00000000000..451dae7ef77
--- /dev/null
+++ b/keyboards/dmqdesign/spin/keymaps/gorbachev/readme.md
@@ -0,0 +1,7 @@
+# Keymap for Spin
+
+* Encoder button push changes layers
+* First layer is a number pad
+* Second layer is RGB control layer
+* Third layer is macro layer
+* OLED support
diff --git a/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk b/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk
new file mode 100644
index 00000000000..553adac1932
--- /dev/null
+++ b/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk
@@ -0,0 +1,3 @@
+OLED_DRIVER_ENABLE = yes
+MOUSEKEY_ENABLE    = no
+MIDI_ENABLE        = no
diff --git a/keyboards/mechlovin/delphine/config.h b/keyboards/mechlovin/delphine/config.h
new file mode 100644
index 00000000000..b3a084f67e7
--- /dev/null
+++ b/keyboards/mechlovin/delphine/config.h
@@ -0,0 +1,44 @@
+/*
+Copyright 2020 Team Mechlovin'
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4D4C
+#define MANUFACTURER    Mechlovin
+#define PRODUCT         Mechlovin Delphine
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 4
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, D3 }
+#define MATRIX_COL_PINS { F7, D7, D6, D2 }
+
+#define DIODE_DIRECTION COL2ROW
\ No newline at end of file
diff --git a/keyboards/mechlovin/delphine/delphine.c b/keyboards/mechlovin/delphine/delphine.c
new file mode 100644
index 00000000000..52292b3c922
--- /dev/null
+++ b/keyboards/mechlovin/delphine/delphine.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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 "delphine.h"
+
+void matrix_init_kb(void) {
+    matrix_init_user();
+    led_init_ports();
+}
+
+void led_init_ports(void) {
+    setPinOutput(B5);
+    writePinLow(B5);
+}
+
+bool led_update_kb(led_t led_state) {
+    if(led_update_user(led_state)) {
+        writePin(B5, led_state.num_lock);
+    }
+
+    return true;
+}
diff --git a/keyboards/mechlovin/delphine/delphine.h b/keyboards/mechlovin/delphine/delphine.h
new file mode 100644
index 00000000000..1112fc27ffd
--- /dev/null
+++ b/keyboards/mechlovin/delphine/delphine.h
@@ -0,0 +1,35 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_ortho_6x4( \
+    K00, K01, K02, K03,   \
+    K10, K11, K12, K13,   \
+    K20, K21, K22, K23,   \
+    K30, K31, K32, K33,   \
+    K40, K41, K42, K43,   \
+    K50, K51, K52, K53    \
+) { \
+    { K00,   K01,   K02,   K03   }, \
+    { K10,   K11,   K12,   K13   }, \
+    { K20,   K21,   K22,   K23   }, \
+    { K30,   K31,   K32,   K33   }, \
+    { K40,   K41,   K42,   K43   }, \
+    { K50,   K51,   K52,   K53   }, \
+}
diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json
new file mode 100644
index 00000000000..6356f4a3d60
--- /dev/null
+++ b/keyboards/mechlovin/delphine/info.json
@@ -0,0 +1,38 @@
+{
+    "keyboard_name": "Delphine",
+    "url": "",
+    "maintainer": "Team Mechlovin'",
+    "width": 4,
+    "height": 6.25,
+    "layouts": {
+        "LAYOUT_ortho_6x4": {
+            "layout": [
+                {"label":"K00 (F0,F7)", "x":0, "y":0},
+                {"label":"K01 (F0,D7)", "x":1, "y":0},
+                {"label":"K02 (F0,D6)", "x":2, "y":0},
+                {"label":"K03 (F0,D2)", "x":3, "y":0},
+                {"label":"K10 (F1,F7)", "x":0, "y":1.25},
+                {"label":"K11 (F1,D7)", "x":1, "y":1.25},
+                {"label":"K12 (F1,D6)", "x":2, "y":1.25},
+                {"label":"K13 (F1,D2)", "x":3, "y":1.25},
+                {"label":"K20 (F4,F7)", "x":0, "y":2.25},
+                {"label":"K21 (F4,D7)", "x":1, "y":2.25},
+                {"label":"K22 (F4,D6)", "x":2, "y":2.25},
+                {"label":"K23 (F4,D2)", "x":3, "y":2.25},
+                {"label":"K30 (F5,F7)", "x":0, "y":3.25},
+                {"label":"K31 (F5,D7)", "x":1, "y":3.25},
+                {"label":"K32 (F5,D6)", "x":2, "y":3.25},
+                {"label":"K33 (F5,D2)", "x":3, "y":3.25},
+                {"label":"K40 (F6,F7)", "x":0, "y":4.25},
+                {"label":"K41 (F6,D7)", "x":1, "y":4.25},
+                {"label":"K42 (F6,D6)", "x":2, "y":4.25},
+                {"label":"K43 (F6,D2)", "x":3, "y":4.25},
+                {"label":"K50 (D3,F7)", "x":0, "y":5.25},
+                {"label":"K51 (D3,D7)", "x":1, "y":5.25},
+                {"label":"K52 (D3,D6)", "x":2, "y":5.25},
+                {"label":"K53 (D3,D2)", "x":3, "y":5.25}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/mechlovin/delphine/keymaps/default/keymap.c b/keyboards/mechlovin/delphine/keymaps/default/keymap.c
new file mode 100644
index 00000000000..584d0b223ad
--- /dev/null
+++ b/keyboards/mechlovin/delphine/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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_ortho_6x4(
+        KC_ESC,  BL_STEP, RGB_TOG, RGB_MOD,
+        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
+        KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_P0,   KC_P0,   KC_PDOT, KC_BSPC
+    ),
+
+};
\ No newline at end of file
diff --git a/keyboards/mechlovin/delphine/keymaps/default/readme.md b/keyboards/mechlovin/delphine/keymaps/default/readme.md
new file mode 100644
index 00000000000..67504a70dd4
--- /dev/null
+++ b/keyboards/mechlovin/delphine/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for delphine
diff --git a/keyboards/mechlovin/delphine/keymaps/via/keymap.c b/keyboards/mechlovin/delphine/keymaps/via/keymap.c
new file mode 100644
index 00000000000..18c30fdba09
--- /dev/null
+++ b/keyboards/mechlovin/delphine/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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_ortho_6x4(
+        KC_ESC,  BL_STEP, RGB_TOG, RGB_MOD,
+        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
+        KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_P0,   KC_P0,   KC_PDOT, KC_BSPC
+    ),
+    [1] = LAYOUT_ortho_6x4(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_ortho_6x4(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        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_ortho_6x4(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        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/mechlovin/delphine/keymaps/via/readme.md b/keyboards/mechlovin/delphine/keymaps/via/readme.md
new file mode 100644
index 00000000000..b97ae1f2627
--- /dev/null
+++ b/keyboards/mechlovin/delphine/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The via keymap for delphine
diff --git a/keyboards/mechlovin/delphine/keymaps/via/rules.mk b/keyboards/mechlovin/delphine/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/mechlovin/delphine/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/delphine/mono_led/config.h b/keyboards/mechlovin/delphine/mono_led/config.h
new file mode 100644
index 00000000000..ead627937c8
--- /dev/null
+++ b/keyboards/mechlovin/delphine/mono_led/config.h
@@ -0,0 +1,34 @@
+
+#pragma once
+
+#define PRODUCT_ID      0xDEF1
+#define DEVICE_VER      0x0001
+
+
+#ifdef BACKLIGHT_ENABLE
+#define BACKLIGHT_PIN B6
+// #define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
+#endif
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN E2
+#define RGBLED_NUM 13
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+#define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//     #define RGBLIGHT_EFFECT_BREATHING
+//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//     #define RGBLIGHT_EFFECT_SNAKE
+//     #define RGBLIGHT_EFFECT_KNIGHT
+//     #define RGBLIGHT_EFFECT_CHRISTMAS
+//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//     #define RGBLIGHT_EFFECT_RGB_TEST
+//     #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
\ No newline at end of file
diff --git a/keyboards/mechlovin/delphine/mono_led/rules.mk b/keyboards/mechlovin/delphine/mono_led/rules.mk
new file mode 100644
index 00000000000..ed572b0bbfc
--- /dev/null
+++ b/keyboards/mechlovin/delphine/mono_led/rules.mk
@@ -0,0 +1,2 @@
+BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
\ No newline at end of file
diff --git a/keyboards/mechlovin/delphine/readme.md b/keyboards/mechlovin/delphine/readme.md
new file mode 100644
index 00000000000..9a5389a5f33
--- /dev/null
+++ b/keyboards/mechlovin/delphine/readme.md
@@ -0,0 +1,15 @@
+# delphine
+
+![delphine](imgur.com image replace me!)
+
+A Number-Pad PCB, Mono backlight and RGB backlight version, Dolpad compatible.
+
+* Keyboard Maintainer: [Mechlovin'](https://github.com/mechlovin)
+* Hardware Supported: Delphine PCB
+* Hardware Availability: [Team Mechlovin'](https://mechlove.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/delphine:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h
new file mode 100644
index 00000000000..4d5c853d0c1
--- /dev/null
+++ b/keyboards/mechlovin/delphine/rgb_led/config.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#define PRODUCT_ID      0xDEF2
+#define DEVICE_VER      0x0001
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN E2
+#define RGBLED_NUM 13
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+#define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//     #define RGBLIGHT_EFFECT_BREATHING
+//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//     #define RGBLIGHT_EFFECT_SNAKE
+//     #define RGBLIGHT_EFFECT_KNIGHT
+//     #define RGBLIGHT_EFFECT_CHRISTMAS
+//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//     #define RGBLIGHT_EFFECT_RGB_TEST
+//     #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
+ 
+//rgb matrix setting// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 0b1110100 AD <-> GND
+// 0b1110111 AD <-> VCC
+// 0b1110101 AD <-> SCL
+// 0b1110110 AD <-> SDA
+#define DRIVER_ADDR_1 0b1110110
+#define DRIVER_ADDR_2 0b1110100
+#define DRIVER_COUNT 1
+#define DRIVER_1_LED_TOTAL 25
+#define DRIVER_2_LED_TOTAL 0
+#define DRIVER_LED_TOTAL 25
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
+#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
new file mode 100644
index 00000000000..6f3e3ec731e
--- /dev/null
+++ b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
@@ -0,0 +1,160 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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 "rgb_led.h"
+
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+// left CA
+    {0, C5_2,   C6_2,   C7_2}, //D2-0
+    {0, C1_1,   C3_2,   C4_2}, //D20-1
+    {0, C5_1,   C6_1,   C7_1}, //D36-2
+    {0, C2_1,   C3_1,   C4_1}, //D46-3
+    {0, C5_4,   C6_4,   C7_4}, //D65-4
+    {0, C1_3,   C2_3,   C3_3}, //D26-5
+    {0, C5_3,   C6_3,   C7_3}, //D37-6
+    {0, C1_2,   C2_2,   C4_3}, //D47-7
+    {0, C4_5,   C5_5,   C7_6}, //D11-8
+    {0, C1_5,   C2_5,   C3_5}, //D27-9
+    {0, C4_4,   C6_5,   C7_5}, //D38-10
+    {0, C1_4,   C2_4,   C3_4}, //D48-11
+
+// left CB
+    {0, C2_9,   C3_9,   C4_9},  //D17-12
+    {0, C5_9,   C6_9,   C7_9},  //D28-13
+    {0, C1_9,   C3_10,  C4_10}, //D39-14
+    {0, C5_10,  C6_10,  C7_10}, //D49-15
+    {0, C1_10,  C2_10,  C4_11}, //D18-16
+    {0, C5_11,  C6_11,  C7_11}, //D29-17
+    {0, C1_11,  C2_11,  C3_11}, //D40-18
+    {0, C5_12,  C6_12,  C7_12}, //D50-19
+    {0, C1_12,  C2_12,  C3_12}, //D19-20
+    {0, C1_13,  C2_13,  C3_13}, //D61-21
+    {0, C4_13,  C5_13,  C7_14}, //D35-22
+    {0, C1_14,  C2_14,  C3_14}, //D41-23
+    {0, C4_14,  C5_14,  C6_14}, //D51-24
+};
+
+led_config_t g_led_config = { {
+  // Key Matrix to LED Index
+  {0,           1,         2,           3},
+  {4,           5,         6,           7},
+  {8,           9,        10,          11},
+  {12,         13,        14,          15},
+  {16,         17,        18,          19},
+  {20,         22,        23,          24}
+    },
+    {
+  //LED Index to Physical Positon
+  {  0,  0},  { 75,  0},  {149,  0},  {224,  0},     
+  {  0, 13},  { 75, 13},  {149, 13},  {224, 13},     
+  {  0, 25},  { 75, 25},  {149, 25},  {224, 25},     
+  {  0, 38},  { 75, 38},  {149, 38},  {224, 38},     
+  {  0, 51},  { 75, 51},  {149, 51},  {224, 51},     
+  {  0, 64},  { 37, 64},  { 75, 64},  {149, 64},  {224, 64},               
+}, {
+  4,          4,          4,          4,
+  4,          1,          1,          4,
+  4,          1,          1,          4,
+  4,          1,          1,          4,
+  4,          1,          1,          4,
+  4,          0,          1,          1,          4,
+} };
+
+void rgb_matrix_indicators_kb(void) {
+        if (host_keyboard_led_state().num_lock) {
+            rgb_matrix_set_color(4, 255, 255, 255);
+        }
+}
+
+__attribute__((weak))
+layer_state_t layer_state_set_user(layer_state_t state) {
+  // if on layer 1, turn on L1 LED, otherwise off.
+    if (get_highest_layer(state) == 0) {
+        rgb_matrix_set_color(1, 255, 0, 0);
+    } else {
+        rgb_matrix_set_color(1, 0, 0, 0);
+    }
+  // if on layer 2, turn on L2 LED, otherwise off.
+    if (get_highest_layer(state) == 1) {
+        rgb_matrix_set_color(0, 255, 0, 0);
+    } else {
+        rgb_matrix_set_color(0, 0, 0, 0);
+    }
+
+  // if on layer 3, turn on L3 LED, otherwise off.
+    if (get_highest_layer(state) == 2) {
+        rgb_matrix_set_color(3, 255, 0, 0);
+    } else {
+        rgb_matrix_set_color(3, 0, 0, 0);
+    }
+
+  // if on layer 4, turn on L4 LED, otherwise off.
+    if (get_highest_layer(state) == 3) {
+        rgb_matrix_set_color(2, 255, 0, 0);
+    } else {
+        rgb_matrix_set_color(2, 0, 0, 0);
+    }
+
+    return state;
+}
+
+#endif
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) { return false; }
+    
+  if (record->event.pressed) {
+    switch(keycode) {
+        #ifdef RGB_MATRIX_ENABLE
+        case KC_F13: // toggle rgb matrix
+            rgb_matrix_toggle();
+            return false;
+        case KC_F14:
+            rgb_matrix_step();
+            return false;
+        case KC_F15:
+            rgb_matrix_increase_speed();
+            return false;
+        case KC_F16:
+            rgb_matrix_decrease_speed();
+            return false;
+        case KC_F17:
+            rgb_matrix_increase_hue();
+            return false;
+        case KC_F18:
+            rgb_matrix_decrease_hue();
+            return false;
+        case KC_F19:
+            rgb_matrix_increase_sat();
+            return false;
+        case KC_F20:
+            rgb_matrix_decrease_sat();
+            return false;
+        case KC_F21:
+            rgb_matrix_increase_val();
+            return false;
+        case KC_F22:
+            rgb_matrix_decrease_val();
+            return false;
+        #endif
+        default:
+        break;
+    }
+  }
+  return true;
+}
diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.h b/keyboards/mechlovin/delphine/rgb_led/rgb_led.h
new file mode 100644
index 00000000000..60d58173447
--- /dev/null
+++ b/keyboards/mechlovin/delphine/rgb_led/rgb_led.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/mechlovin/delphine/rgb_led/rules.mk b/keyboards/mechlovin/delphine/rgb_led/rules.mk
new file mode 100644
index 00000000000..853f740ce9a
--- /dev/null
+++ b/keyboards/mechlovin/delphine/rgb_led/rules.mk
@@ -0,0 +1,2 @@
+RGBLIGHT_ENABLE = no               # Enable keyboard RGB underglow
+RGB_MATRIX_ENABLE = IS31FL3731     # Use RGB matrix
diff --git a/keyboards/mechlovin/delphine/rules.mk b/keyboards/mechlovin/delphine/rules.mk
new file mode 100644
index 00000000000..217bb758b25
--- /dev/null
+++ b/keyboards/mechlovin/delphine/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = ortho_6x4
+DEFAULT_FOLDER = mechlovin/delphine/mono_led
\ No newline at end of file
diff --git a/layouts/community/ortho_4x12/ddeklerk/keymap.c b/layouts/community/ortho_4x12/ddeklerk/keymap.c
new file mode 100644
index 00000000000..ec36a50616b
--- /dev/null
+++ b/layouts/community/ortho_4x12/ddeklerk/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2015-2017 Jack Humbert
+ *
+ * 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 {
+    _BASE,
+    _GAME,
+    _FN1,
+    _FN2,
+    _FN3,
+    _ADJUST
+};
+
+#define BASE DF(_BASE)
+#define GAME DF(_GAME)
+#define FN1 LT(_FN1, KC_BSPC)
+#define FN2 LT(_FN2, KC_ENT)
+#define FN3SPC LT(_FN3, KC_SPC)
+
+#define CTRLESC MT(MOD_LCTL, KC_ESC)
+#define CTRLMIN MT(MOD_RCTL, KC_MINS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_ortho_4x12(
+        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    XXXXXXX,
+        CTRLESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    CTRLMIN,
+        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
+        XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, FN1,     FN3SPC,  FN3SPC,  FN2,     KC_RALT, XXXXXXX, XXXXXXX, XXXXXXX
+    ),
+    [_GAME] = LAYOUT_ortho_4x12(
+        KC_3,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        KC_2,    CTRLESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_BSPC,
+        KC_1,    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_UP,   KC_ENT,
+        XXXXXXX, KC_LALT, XXXXXXX, XXXXXXX, _______, KC_SPC,  XXXXXXX, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN1] = LAYOUT_ortho_4x12(
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+        KC_DEL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PIPE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [_FN2] = LAYOUT_ortho_4x12(
+        KC_GRV,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_LCBR, KC_RCBR, KC_QUES, KC_PLUS, _______,
+        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_LBRC, KC_RBRC, KC_SLSH, KC_EQL,  KC_BSLS,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [_FN3] = LAYOUT_ortho_4x12(
+        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_BSPC, _______,
+        _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
+        _______, KC_APP,  _______, _______, _______, _______, KC_PGDN, KC_DEL,  _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [_ADJUST] = LAYOUT_ortho_4x12(
+        XXXXXXX, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, GAME,    BASE,    XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+    )
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, _FN1, _FN2, _ADJUST);
+};
diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h
index 26725a0c93d..1465ecc81b2 100644
--- a/quantum/keymap_extras/keymap_spanish.h
+++ b/quantum/keymap_extras/keymap_spanish.h
@@ -117,7 +117,7 @@
 #define ES_CIRC S(ES_GRV)  // ^ (dead)
 #define ES_ASTR S(ES_PLUS) // *
 // Row 3
-#define ES_DIAE S(ES_GRV)  // ¨ (dead)
+#define ES_DIAE S(ES_ACUT) // ¨ (dead)
 // Row 4
 #define ES_RABK S(ES_LABK) // >
 #define ES_SCLN S(KC_COMM) // ;