remove all keyboards but ergodox and planck

41 files changed, 0 insertions, 3347 deletions

diff --git a/keyboards/jj40/README.md b/keyboards/jj40/README.md
deleted file mode 100644
index 7d3612554b..0000000000
--- a/keyboards/jj40/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# jj40
-
-![jj40](https://ae01.alicdn.com/kf/HTB18bq6bOERMeJjSspiq6zZLFXar.jpg?size=359506&height=562&width=750&hash=663a22d0109e2416ec8f54a7658686da)
-
-A compact 40% (12x4) ortholinear keyboard kit made and KPRepublic on AliExpress.
-
-Keyboard Maintainer: [QMK Community](https://github.com/qmk)  
-Hardware Supported: Atmega32A  
-Hardware Availability: [AliExpress](https://www.aliexpress.com/store/product/jj40-Custom-Mechanical-Keyboard-40-PCB-programmed-40-planck-layouts-bface-firmware-gh40/3034003_32828781103.html)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make jj40:default:program
-
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
-
-Note that this is a complete replacement for the firmware, so you won't be
-using Bootmapper Client to change any keyboard settings, since not all the
-USB report options are supported.
-
-In addition you may need the AVR toolchain and `bootloadHID` ([GitHub repo](https://github.com/whiteneon/bootloadHID)) for flashing:
-
-For macOS:
-```
-$ brew cask install crosspack-avr
-$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
-```
-
-For Linux:
-```
-$ sudo apt install libusb-dev
-$ wget https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.tar.gz
-$ tar -xzf bootloadHID.2012-12-08.tar.gz
-$ cd bootloadHID.2012-12-08/commandline
-$ make
-$ sudo cp bootloadHID /usr/bin
-```
-
-In order to use the `././util/atmega32a_program.py` script, which can reboot the board into
-the bootloader, you'll need Python 2 with PyUSB installed:
-
-```
-$ pip install pyusb
-```
-
-If you prefer (or are having issues with a `program` flash), you can just build it (`make jj40:<keymap-name>` and flash the firmware (`.hex` file) directly with
-`bootloadHID` if you boot the board while holding down `Backspace` (`Top Right Key`) to keep it
-in the bootloader:
-
-```
-$ make jj40
-$ bootloadHID -r jj40_default.hex
-```
-
-For Windows 10:
-Windows sometimes doesn't recognize the jj40. The easiest way of flashing a new layout is probably using [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash).
-1. Go to Windows Device Manager and find the keyboard (plug it in while holding down `Backspace` (`Top Right Key`)). It can be found under Human Interface Devices or under Keyboards.
-2. Go to properties and the Details tab to find the hardware ID. You want the VID and the PID (code after the underscore). Plug them into HIDBootFlash and hit Find Device.
-3. Use `make jj40:<keymap-name>` to generate the .hex file in the qmk basis folder. Select the .hex file in HIDBootFlash and press Flash Device.
-
-
-## Troubleshooting
-
-1. Try plugging the board in while pressing `Backspace` (`Top Right Key`). This will force it
-   to boot only the bootloader without loading the firmware. Once this is
-   done, just reflash the board with the original firmware.
-2. Sometimes USB hubs can act weird, so try connecting the board directly
-   to your computer or plugging/unplugging the USB hub.
-3. If you get an error such as "Resource Unavailable" when attemting to flash
-   on Linux, you may want to compile and run `tools/usb_detach.c`. See `tools/README.md`
-   for more info.
-
-## Recovery 
-If you flash a bad hex (e.g. you have a V1 board without RGB and compile/flash blindly without editing your rules.mk), your jj40 is now semi-bricked and you're stuck unless you have access to an ISP. The [ISP Flashing Guide](https://docs.qmk.fm/#/isp_flashing_guide) contains very good (but somewhat generalized) information. However, the instructions below should get you up and running provided you have an Arduino or clone.
-
-### Arduino Setup 
-1. Upload the ArduinoISP sketch onto your Arduino board (https://www.arduino.cc/en/Tutorial/ArduinoISP).  
-2. Wire the Arduino to the jj40. Match the data pins on the Arduino to those on the jj40. "RST" usually goes to D10 on the Arduino. I didn't need a capacitor when using my Uno. 
-![Imgur](https://i.imgur.com/oLWJOkQ.jpg)
-3. Get a working bootloader from https://blog.winkeyless.kr/m/152. The file is called "main.hex" from the archive called "ps2avrGB_bootloader_161215.zip"  Copy "main.hex" to your qmk folder.  
-4. Burn the bootloader with the following command  
-` avrdude -b 19200 -c avrisp -p atmega32 -v -e -U hfuse:w:0xD0:m -U lfuse:w:0x0F:m -U flash:w:main.hex:i -P comPORT`  
-Change `comPORT` to whatever port is used by the Arduino (e.g. `com11` in Windows or `/dev/ttyACM0` in Linux). Use Device Manager in Windows to find the port being used. Use `ls /dev/tty*` in Linux.
-5. If this process is successful, you should now be able to upload normally.
diff --git a/keyboards/jj40/backlight.c b/keyboards/jj40/backlight.c
deleted file mode 100644
index fbd241fa9d..0000000000
--- a/keyboards/jj40/backlight.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Backlighting code for PS2AVRGB boards (ATMEGA32A)
- * Kenneth A. (github.com/krusli | krusli.me)
- */
-
-#include "backlight.h"
-#include "quantum.h"
-
-#include <avr/pgmspace.h>
-#include <avr/interrupt.h>
-
-#include "backlight_custom.h"
-#include "breathing_custom.h"
-
-// DEBUG
-#include <stdlib.h>
-#include <stdio.h>
-
-// Port D: digital pins of the AVR chipset
-#define NUMLOCK_PORT    (1 << 0)  // D0
-#define CAPSLOCK_PORT   (1 << 1)  // D1
-#define BACKLIGHT_PORT  (1 << 4)  // D4
-#define SCROLLLOCK_PORT (1 << 6)  // D6
-
-#define TIMER_CLK_DIV64			  0x03	///< Timer clocked at F_CPU/64
-#define TIMER1PRESCALE	TIMER_CLK_DIV64 ///< timer 1 prescaler default
-
-#define TIMER_PRESCALE_MASK		0x07	///< Timer Prescaler Bit-Mask
-
-#define PWM_MAX 0xFF
-#define TIMER_TOP 255 // 8 bit PWM
-
-extern backlight_config_t backlight_config;
-
-/**
- * References
- * Port Registers: https://www.arduino.cc/en/Reference/PortManipulation
- * TCCR1A: https://electronics.stackexchange.com/questions/92350/what-is-the-difference-between-tccr1a-and-tccr1b
- * Timers: http://www.avrbeginners.net/architecture/timers/timers.html
- * 16-bit timer setup: http://sculland.com/ATmega168/Interrupts-And-Timers/16-Bit-Timer-Setup/
- * PS2AVRGB firmware: https://github.com/showjean/ps2avrU/tree/master/firmware
- */
-
-// @Override
-// turn LEDs on and off depending on USB caps/num/scroll lock states.
-__attribute__ ((weak))
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-      // turn on
-      DDRD  |= NUMLOCK_PORT;
-      PORTD |= NUMLOCK_PORT;
-    } else {
-      // turn off
-      DDRD  &= ~NUMLOCK_PORT;
-      PORTD &= ~NUMLOCK_PORT;
-    }
-
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-      DDRD  |= CAPSLOCK_PORT;
-      PORTD |= CAPSLOCK_PORT;
-    } else {
-      DDRD  &= ~CAPSLOCK_PORT;
-      PORTD &= ~CAPSLOCK_PORT;
-    }
-
-    if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-      DDRD  |= SCROLLLOCK_PORT;
-      PORTD |= SCROLLLOCK_PORT;
-    } else {
-      DDRD  &= ~SCROLLLOCK_PORT;
-      PORTD &= ~SCROLLLOCK_PORT;
-    }
-}
-
-#ifdef BACKLIGHT_ENABLE
-
-// sets up Timer 1 for 8-bit PWM
-void timer1PWMSetup(void) { // NOTE ONLY CALL THIS ONCE
-  // default 8 bit mode
-  TCCR1A &= ~(1 << 1); // cbi(TCCR1A,PWM11); <- set PWM11 bit to HIGH
-  TCCR1A |= (1 << 0);  // sbi(TCCR1A,PWM10); <- set PWM10 bit to LOW
-
-  // clear output compare value A
-  // outb(OCR1AH, 0);
-  // outb(OCR1AL, 0);
-
-  // clear output comparator registers for B
-	OCR1BH = 0; // outb(OCR1BH, 0);
-	OCR1BL = 0; // outb(OCR1BL, 0);
-}
-
-bool is_init = false;
-void timer1Init(void) {
-  // timer1SetPrescaler(TIMER1PRESCALE)
-  // set to DIV/64
-  (TCCR1B) = ((TCCR1B) & ~TIMER_PRESCALE_MASK) | TIMER1PRESCALE;
-
-  // reset TCNT1
-  TCNT1H = 0;  // outb(TCNT1H, 0);
-	TCNT1L = 0;  // outb(TCNT1L, 0);
-
-  // TOIE1: Timer Overflow Interrupt Enable (Timer 1);
-	TIMSK |= _BV(TOIE1); // sbi(TIMSK, TOIE1);
-
-  is_init = true;
-}
-
-void timer1UnInit(void) {
-  // set prescaler back to NONE
-  (TCCR1B) = ((TCCR1B) & ~TIMER_PRESCALE_MASK) | 0x00;  // TIMERRTC_CLK_STOP
-
-  // disable timer overflow interrupt
-  TIMSK &= ~_BV(TOIE1); // overflow bit?
-
-  setPWM(0);
-
-  is_init = false;
-}
-
-
-// handle TCNT1 overflow
-//! Interrupt handler for tcnt1 overflow interrupt
-ISR(TIMER1_OVF_vect, ISR_NOBLOCK)
-{
-	// sei();
-  // handle breathing here
-  #ifdef BACKLIGHT_BREATHING
-  if (is_breathing()) {
-    custom_breathing_handler();
-  }
-  #endif
-
-  // TODO call user defined function
-}
-
-// enable timer 1 PWM
-// timer1PWMBOn()
-void timer1PWMBEnable(void) {
-  // turn on channel B (OC1B) PWM output
-  // set OC1B as non-inverted PWM
-  TCCR1A |= _BV(COM1B1);
-  TCCR1A &= ~_BV(COM1B0);
-}
-
-// disable timer 1 PWM
-// timer1PWMBOff()
-void timer1PWMBDisable(void) {
-  TCCR1A &= ~_BV(COM1B1);
-  TCCR1A &= ~_BV(COM1B0);
-}
-
-void enableBacklight(void) {
-  DDRD  |= BACKLIGHT_PORT;  // set digital pin 4 as output
-  PORTD |= BACKLIGHT_PORT;  // set digital pin 4 to high
-}
-
-void disableBacklight(void) {
-  // DDRD  &= ~BACKLIGHT_PORT;  // set digital pin 4 as input
-  PORTD &= ~BACKLIGHT_PORT;  // set digital pin 4 to low
-}
-
-void startPWM(void) {
-  timer1Init();
-  timer1PWMBEnable();
-  enableBacklight();
-}
-
-void stopPWM(void) {
-  timer1UnInit();
-  disableBacklight();
-  timer1PWMBDisable();
-}
-
-void b_led_init_ports(void) {
-  /* turn backlight on/off depending on user preference */
-  #if BACKLIGHT_ON_STATE == 0
-    // DDRx register: sets the direction of Port D
-    // DDRD  &= ~BACKLIGHT_PORT;  // set digital pin 4 as input
-    PORTD &= ~BACKLIGHT_PORT;  // set digital pin 4 to low
-  #else
-    DDRD  |= BACKLIGHT_PORT;  // set digital pin 4 as output
-    PORTD |= BACKLIGHT_PORT;  // set digital pin 4 to high
-  #endif
-
-  timer1PWMSetup();
-  startPWM();
-
-  #ifdef BACKLIGHT_BREATHING
-  breathing_enable();
-  #endif
-}
-
-void b_led_set(uint8_t level) {
-  if (level > BACKLIGHT_LEVELS) {
-    level = BACKLIGHT_LEVELS;
-  }
-
-  setPWM((int)(TIMER_TOP * (float) level / BACKLIGHT_LEVELS));
-}
-
-// called every matrix scan
-void b_led_task(void) {
-  // do nothing for now
-}
-
-void setPWM(uint16_t xValue) {
-  if (xValue > TIMER_TOP) {
-    xValue = TIMER_TOP;
-  }
-  OCR1B = xValue; // timer1PWMBSet(xValue);
-}
-
-#endif  // BACKLIGHT_ENABLE
diff --git a/keyboards/jj40/backlight_custom.h b/keyboards/jj40/backlight_custom.h
deleted file mode 100644
index 7210be840e..0000000000
--- a/keyboards/jj40/backlight_custom.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Backlighting code for PS2AVRGB boards (ATMEGA32A)
- * Kenneth A. (github.com/krusli | krusli.me)
- */
-
-#ifndef BACKLIGHT_CUSTOM_H
-#define BACKLIGHT_CUSTOM_H
-
-#include <avr/pgmspace.h>
-void b_led_init_ports(void);
-void b_led_set(uint8_t level);
-void b_led_task(void);
-void setPWM(uint16_t xValue);
-
-#endif  // BACKLIGHT_CUSTOM_H
diff --git a/keyboards/jj40/breathing_custom.h b/keyboards/jj40/breathing_custom.h
deleted file mode 100644
index 71416b1b45..0000000000
--- a/keyboards/jj40/breathing_custom.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Breathing effect code for PS2AVRGB boards (ATMEGA32A)
- * Works in conjunction with `backlight.c`.
- *
- * Code adapted from `quantum.c` to register with the existing TIMER1 overflow
- * handler in `backlight.c` instead of setting up its own timer.
- * Kenneth A. (github.com/krusli | krusli.me)
- */
-
-#ifdef BACKLIGHT_ENABLE
-#ifdef BACKLIGHT_BREATHING
-
-#include "backlight_custom.h"
-
-#ifndef BREATHING_PERIOD
-#define BREATHING_PERIOD 6
-#endif
-
-#define breathing_min() do {breathing_counter = 0;} while (0)
-#define breathing_max() do {breathing_counter = breathing_period * 244 / 2;} while (0)
-
-// TODO make this share code with quantum.c
-
-#define BREATHING_NO_HALT  0
-#define BREATHING_HALT_OFF 1
-#define BREATHING_HALT_ON  2
-#define BREATHING_STEPS 128
-
-static uint8_t breathing_period = BREATHING_PERIOD;
-static uint8_t breathing_halt = BREATHING_NO_HALT;
-static uint16_t breathing_counter = 0;
-
-static bool breathing = false;
-
-bool is_breathing(void) {
-  return breathing;
-}
-
-// See http://jared.geek.nz/2013/feb/linear-led-pwm
-static uint16_t cie_lightness(uint16_t v) {
-  if (v <= 5243) // if below 8% of max
-    return v / 9; // same as dividing by 900%
-  else {
-    uint32_t y = (((uint32_t) v + 10486) << 8) / (10486 + 0xFFFFUL); // add 16% of max and compare
-    // to get a useful result with integer division, we shift left in the expression above
-    // and revert what we've done again after squaring.
-    y = y * y * y >> 8;
-    if (y > 0xFFFFUL) // prevent overflow
-      return 0xFFFFU;
-    else
-      return (uint16_t) y;
-  }
-}
-
-void breathing_enable(void) {
-  breathing = true;
-  breathing_counter = 0;
-  breathing_halt = BREATHING_NO_HALT;
-  // interrupt already registered
-}
-
-void breathing_pulse(void) {
-  if (get_backlight_level() == 0)
-    breathing_min();
-  else
-    breathing_max();
-  breathing_halt = BREATHING_HALT_ON;
-  // breathing_interrupt_enable();
-  breathing = true;
-}
-
-void breathing_disable(void) {
-  breathing = false;
-  // backlight_set(get_backlight_level());
-  b_led_set(get_backlight_level()); // custom implementation of backlight_set()
-}
-
-void breathing_self_disable(void)
-{
-  if (get_backlight_level() == 0)
-    breathing_halt = BREATHING_HALT_OFF;
-  else
-    breathing_halt = BREATHING_HALT_ON;
-}
-
-void breathing_toggle(void) {
-  if (is_breathing())
-    breathing_disable();
-  else
-    breathing_enable();
-}
-
-void breathing_period_set(uint8_t value)
-{
-  if (!value)
-    value = 1;
-  breathing_period = value;
-}
-
-void breathing_period_default(void) {
-  breathing_period_set(BREATHING_PERIOD);
-}
-
-void breathing_period_inc(void)
-{
-  breathing_period_set(breathing_period+1);
-}
-
-void breathing_period_dec(void)
-{
-  breathing_period_set(breathing_period-1);
-}
-
-/* To generate breathing curve in python:
- * from math import sin, pi; [int(sin(x/128.0*pi)**4*255) for x in range(128)]
- */
-static const uint8_t breathing_table[BREATHING_STEPS] PROGMEM = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 17, 20, 24, 28, 32, 36, 41, 46, 51, 57, 63, 70, 76, 83, 91, 98, 106, 113, 121, 129, 138, 146, 154, 162, 170, 178, 185, 193, 200, 207, 213, 220, 225, 231, 235, 240, 244, 247, 250, 252, 253, 254, 255, 254, 253, 252, 250, 247, 244, 240, 235, 231, 225, 220, 213, 207, 200, 193, 185, 178, 170, 162, 154, 146, 138, 129, 121, 113, 106, 98, 91, 83, 76, 70, 63, 57, 51, 46, 41, 36, 32, 28, 24, 20, 17, 15, 12, 10, 8, 6, 5, 4, 3, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-
-// Use this before the cie_lightness function.
-static inline uint16_t scale_backlight(uint16_t v) {
-  return v / BACKLIGHT_LEVELS * get_backlight_level();
-}
-
-void custom_breathing_handler(void) {
-  uint16_t interval = (uint16_t) breathing_period * 244 / BREATHING_STEPS;
-  // resetting after one period to prevent ugly reset at overflow.
-  breathing_counter = (breathing_counter + 1) % (breathing_period * 244);
-  uint8_t index = breathing_counter / interval % BREATHING_STEPS;
-
-  if (((breathing_halt == BREATHING_HALT_ON) && (index == BREATHING_STEPS / 2)) ||
-      ((breathing_halt == BREATHING_HALT_OFF) && (index == BREATHING_STEPS - 1)))
-  {
-      // breathing_interrupt_disable();
-  }
-
-  setPWM(cie_lightness(scale_backlight((uint16_t) pgm_read_byte(&breathing_table[index]) * 0x0101U)));
-}
-
-#endif // BACKLIGHT_BREATHING
-#endif  // BACKLIGHT_ENABLE
diff --git a/keyboards/jj40/config.h b/keyboards/jj40/config.h
deleted file mode 100644
index 67561b0b28..0000000000
--- a/keyboards/jj40/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-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 "config_common.h"
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#define VENDOR_ID       0x20A0
-#define PRODUCT_ID      0x422D
-// TODO: share these strings with usbconfig.h
-// Edit usbconfig.h to change these.
-#define MANUFACTURER    winkeyless.kr
-#define PRODUCT         jj40
-
-/* matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 15
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define BACKLIGHT_LEVELS 12
-// #define BACKLIGHT_BREATHING  // works, but BL_TOGG might not work
-
-#define TAPPING_TOGGLE 3
-
-#define NO_UART 1
-
-/* RGB underglow */
-// The RGB_DI_PIN value seems to be shared between all PS2AVRGB boards.
-// The same pin is used on the JJ40, at least.
-#define RGBLED_NUM 5
-#define RGB_DI_PIN E2 // NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0.
-#define RGBLIGHT_ANIMATIONS
-
-#endif
diff --git a/keyboards/jj40/i2c.c b/keyboards/jj40/i2c.c
deleted file mode 100644
index c27f3e3d17..0000000000
--- a/keyboards/jj40/i2c.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-Copyright 2016 Luiz Ribeiro <luizribeiro@gmail.com>
-
-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 <avr/io.h>
-#include <util/twi.h>
-
-#include "i2c.h"
-
-void i2c_set_bitrate(uint16_t bitrate_khz) {
-    uint8_t bitrate_div = ((F_CPU / 1000l) / bitrate_khz);
-    if (bitrate_div >= 16) {
-        bitrate_div = (bitrate_div - 16) / 2;
-    }
-    TWBR = bitrate_div;
-}
-
-void i2c_init(void) {
-    // set pull-up resistors on I2C bus pins
-    PORTC |= 0b11;
-
-    i2c_set_bitrate(400);
-
-    // enable TWI (two-wire interface)
-    TWCR |= (1 << TWEN);
-
-    // enable TWI interrupt and slave address ACK
-    TWCR |= (1 << TWIE);
-    TWCR |= (1 << TWEA);
-}
-
-uint8_t i2c_start(uint8_t address) {
-    // reset TWI control register
-    TWCR = 0;
-
-    // begin transmission and wait for it to end
-    TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN);
-    while (!(TWCR & (1<<TWINT)));
-
-    // check if the start condition was successfully transmitted
-    if ((TWSR & 0xF8) != TW_START) {
-        return 1;
-    }
-
-    // transmit address and wait
-    TWDR = address;
-    TWCR = (1<<TWINT) | (1<<TWEN);
-    while (!(TWCR & (1<<TWINT)));
-
-    // check if the device has acknowledged the READ / WRITE mode
-    uint8_t twst = TW_STATUS & 0xF8;
-    if ((twst != TW_MT_SLA_ACK) && (twst != TW_MR_SLA_ACK)) {
-        return 1;
-    }
-
-    return 0;
-}
-
-void i2c_stop(void) {
-    TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
-}
-
-uint8_t i2c_write(uint8_t data) {
-    TWDR = data;
-
-    // transmit data and wait
-    TWCR = (1<<TWINT) | (1<<TWEN);
-    while (!(TWCR & (1<<TWINT)));
-
-    if ((TWSR & 0xF8) != TW_MT_DATA_ACK) {
-        return 1;
-    }
-
-    return 0;
-}
-
-uint8_t i2c_send(uint8_t address, uint8_t *data, uint16_t length) {
-    if (i2c_start(address)) {
-        return 1;
-    }
-
-    for (uint16_t i = 0; i < length; i++) {
-        if (i2c_write(data[i])) {
-            return 1;
-        }
-    }
-
-    i2c_stop();
-
-    return 0;
-}
diff --git a/keyboards/jj40/i2c.h b/keyboards/jj40/i2c.h
deleted file mode 100644
index 27c9d3d050..0000000000
--- a/keyboards/jj40/i2c.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2016 Luiz Ribeiro <luizribeiro@gmail.com>
-
-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/>.
-*/
-
-#ifndef __I2C_H__
-#define __I2C_H__
-
-void i2c_init(void);
-void i2c_set_bitrate(uint16_t bitrate_khz);
-uint8_t i2c_send(uint8_t address, uint8_t *data, uint16_t length);
-
-#endif
diff --git a/keyboards/jj40/info.json b/keyboards/jj40/info.json
deleted file mode 100644
index c6416ce168..0000000000
--- a/keyboards/jj40/info.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "keyboard_name": "jj40",
-  "url": "",
-  "maintainer": "qmk",
-  "width": 12,
-  "height": 4,
-  "layouts": {
-    "LAYOUT_planck_mit": {
-      "key_count": 47,
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
-    },
-
-    "LAYOUT_ortho_4x12": {
-      "key_count": 48,
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
-    },
-
-    "LAYOUT_planck_1x2uR": {
-      "key_count": 47,
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3, "w":2}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
-    }
-  }
-}
diff --git a/keyboards/jj40/jj40.c b/keyboards/jj40/jj40.c
deleted file mode 100644
index 51f5295f46..0000000000
--- a/keyboards/jj40/jj40.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2018 Kenneth A. <github.com/krusli>
-
-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 "jj40.h"
-
-#include <avr/pgmspace.h>
-
-#include "action_layer.h"
-#include "quantum.h"
-
-#include "i2c.h"
-
-#include "backlight.h"
-#include "backlight_custom.h"
-
-// for keyboard subdirectory level init functions
-// @Override
-void matrix_init_kb(void) {
-  // call user level keymaps, if any
-  matrix_init_user();
-}
-
-#ifdef BACKLIGHT_ENABLE
-/// Overrides functions in `quantum.c`
-void backlight_init_ports(void) {
-  b_led_init_ports();
-}
-
-void backlight_task(void) {
-  b_led_task();
-}
-
-void backlight_set(uint8_t level) {
-  b_led_set(level);
-}
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-extern rgblight_config_t rgblight_config;
-
-// custom RGB driver
-void rgblight_set(void) {
-  if (!rgblight_config.enable) {
-    for (uint8_t i=0; i<RGBLED_NUM; i++) {
-      led[i].r = 0;
-      led[i].g = 0;
-      led[i].b = 0;
-    }
-  }
-
-  i2c_init();
-  i2c_send(0xb0, (uint8_t*)led, 3 * RGBLED_NUM);
-}
-
-bool rgb_init = false;
-
-void matrix_scan_kb(void) {
-  // if LEDs were previously on before poweroff, turn them back on
-  if (rgb_init == false && rgblight_config.enable) {
-    i2c_init();
-    i2c_send(0xb0, (uint8_t*)led, 3 * RGBLED_NUM);
-    rgb_init = true;
-  }
-
-  rgblight_task();
-#else
-void matrix_scan_kb(void) {
-#endif
-  matrix_scan_user();
-  /* Nothing else for now. */
-}
-
-__attribute__((weak)) // overridable
-void matrix_init_user(void) {
-
-}
-
-
-__attribute__((weak)) // overridable
-void matrix_scan_user(void) {
-
-}
diff --git a/keyboards/jj40/jj40.h b/keyboards/jj40/jj40.h
deleted file mode 100644
index 731f2ff455..0000000000
--- a/keyboards/jj40/jj40.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-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/>.
-*/
-
-#ifndef KEYMAP_COMMON_H
-#define KEYMAP_COMMON_H
-
-#include "quantum.h"
-#include "quantum_keycodes.h"
-#include "keycode.h"
-#include "action.h"
-
-void matrix_init_user(void);  // TODO port this to other PS2AVRGB boards
-
-#define XXX KC_NO
-
-
-#define LAYOUT_ortho_4x12( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \
-    K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312  \
-) \
-{ \
-  { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \
-  { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \
-  { XXX,  XXX,  XXX,  XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-  { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \
-  { K312, K311, K310, K39, K35, K36, K37, K38, K34, K33, K32, K31 }  \
-}
-
-
-#define LAYOUT_planck_mit( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \
-    K31, K32, K33, K34, K35,    K3X,   K38, K39, K310, K311, K312  \
-) \
-{ \
-  { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \
-  { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \
-  { XXX,  XXX,  XXX,  XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-  { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \
-  { K312, K311, K310, K39, K35, K3X, XXX, K38, K34, K33, K32, K31 }  \
-}
-
-
-#define LAYOUT_planck_1x2uR( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \
-    K31, K32, K33, K34, K35, K36,    K3X,   K39, K310, K311, K312  \
-) \
-{ \
-  { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \
-  { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \
-  { XXX,  XXX,  XXX,  XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-  { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \
-  { K312, K311, K310, K39, K35, K36, K3X, XXX, K34, K33, K32, K31 }  \
-}
-
-
-#define LAYOUT_kc( \
-	  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
-	) \
-	LAYOUT_ortho_4x12( \
-		KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-		KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-		KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-		KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b  \
-)
-
-
-#define LAYOUT LAYOUT_planck_mit
-
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
-
-#endif
diff --git a/keyboards/jj40/keymaps/ajp10304/keymap.c b/keyboards/jj40/keymaps/ajp10304/keymap.c
deleted file mode 100644
index c34a7c2929..0000000000
--- a/keyboards/jj40/keymaps/ajp10304/keymap.c
+++ /dev/null
@@ -1,342 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_uk.h"
-
-extern keymap_config_t keymap_config;
-
-enum jj40_layers {
-  _QWERTY,
-  _MAC,
-  _LOWER,
-  _MLWR,
-  _RAISE,
-  _MRSE,
-  _FUNC,
-  _MFNC,
-  _FUNC2,
-  _MFNC2,
-  _ADJUST,
-  _MOUSE
-};
-
-enum jj40_keycodes {
-  QWERTY = SAFE_RANGE,
-  MAC,
-  FUNC,
-  MFNC,
-  FUNC2,
-  MFNC2,
-  LOWER,
-  MLWR,
-  RAISE,
-  MRSE,
-  MOUSE,
-  DYNAMIC_MACRO_RANGE
-};
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  ;:  | Enter|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shft |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  | Shft |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Fn   | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(\
-  KC_ESC,                KC_Q,       KC_W,        KC_E,      KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,      KC_P,       KC_BSPC                 ,\
-  MT(MOD_LSFT, KC_TAB),  KC_A,       KC_S,        KC_D,      KC_F,    KC_G,    KC_H,    KC_J,    KC_K,      KC_L,      KC_SCLN,    MT(MOD_RSFT, KC_ENT)    ,\
-  KC_LSHIFT,             KC_Z,       KC_X,        KC_C,      KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,   KC_DOT,    KC_SLSH,    KC_RSHIFT               ,\
-  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,    MO(_FUNC2)              \
-),
-
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  1!  |  2"  |  3£  |  4$  |  5%  |  6^  |  7&  |  8*  |  9(  |  0)  |  ~   |INSERT|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|  \|  |  `¬  |  #~  |   *  |  -_  |  =+  |  \|  |  [{  |  ]}  |  '@  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Fn   | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Mouse | MENU | Alt  | Ctrl | Fn   |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] = LAYOUT_ortho_4x12(\
-  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_1,      KC_2,            KC_3,     KC_4,          KC_5,    KC_6,    KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT              ,\
-  KC_LSHIFT, KC_NONUS_BSLASH, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLASH,  KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,\
-  _______,   _______,         _______,  _______,       _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______                \
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  1!  |  2"  |  3£  |  4$  |  5%  |  6^  |  7&  |  8*  |  9(  |  0)  | DEL  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  !   |   "  |   £  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |WrdDel|WrdBks|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|  \|  |  `¬  |  #~  |  '@  |  -_  |  =+  |  #~  |  [{  |  ]}  |  '@  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower | Del  |Space |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(\
-  KC_1,        KC_2,            KC_3,           KC_4,           KC_5,          KC_6,          KC_7,           KC_8,            KC_9,           KC_0,          KC_DEL,          KC_BSPC                ,\
-  LSFT(KC_1),  LSFT(KC_2),      LSFT(KC_3),     LSFT(KC_4),     LSFT(KC_5),    LSFT(KC_6),    LSFT(KC_7),     LSFT(KC_8),      LSFT(KC_9),     LSFT(KC_0),    LCTL(KC_DEL),    LCTL(KC_BSPC)          ,\
-  KC_LSPO,     KC_NONUS_BSLASH, KC_GRAVE,       KC_NONUS_HASH,  KC_QUOT,       KC_MINS,       KC_EQL,         KC_NONUS_HASH,   KC_LBRC,        KC_RBRC,       KC_QUOT,         MT(MOD_RSFT, KC_ENT)   ,\
-  _______,     _______,         _______,        _______,        _______,       KC_DEL,        _______,        _______,         KC_MNXT,        KC_VOLD,       KC_VOLU,         KC_MPLY                \
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |      |WRDSEL|  [   |   ]  |      |      | PGUP | HOME |PGDOWN|      |PRNTSC|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   `  |      |      |  (   |   )  |      |      | HOME |  UP  | END  |      |ZOOM +|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |  {   |   }  |      |  |<  | LEFT | DOWN |RIGHT |  >|  |ZOOM -|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Mouse|      |      |      |      |  Alt | Enter|Raise |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(\
-  KC_GRV,     XXXXXXX, M(1),    KC_LBRC,       KC_RBRC,       XXXXXXX,   XXXXXXX,       KC_PGUP,  KC_HOME,  KC_PGDOWN,  XXXXXXX,        KC_PSCREEN            ,\
-  KC_GRV,     XXXXXXX, XXXXXXX, LSFT(KC_9),    LSFT(KC_0),    XXXXXXX,   XXXXXXX,       KC_HOME,  KC_UP,    KC_END,     XXXXXXX,        LCTL(LSFT(KC_EQL))    ,\
-  _______,    XXXXXXX, XXXXXXX, LSFT(KC_LBRC), LSFT(KC_RBRC), XXXXXXX,   LCTL(KC_LEFT), KC_LEFT,  KC_DOWN,  KC_RIGHT,   LCTL(KC_RIGHT), LCTL(KC_MINS)         ,\
-  MO(_MOUSE), _______, _______, _______,       _______,       KC_LALT,   KC_ENT,        _______,  XXXXXXX,  _______,    _______,        _______               \
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | ???? | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | CAPS |      |      |      |      | PLAY1| PLAY2| Mute | Vol+ | Play |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | PC/MC|      |      |      |      | STOP | STOP | Prev | Vol- | Next |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_4x12(\
-  M(0),     RESET,   QWERTY,  BL_ON,   BL_OFF,  DYN_REC_START1,  DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,\
-  KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  _______ ,\
-  TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DYN_REC_STOP,    DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  _______ ,\
-  _______,  _______, _______, _______, _______, _______,         _______,         _______,             _______,           _______,              _______,  _______ \
-),
-
-/* Mouse
- * ,-----------------------------------------------------------------------------------.
- * | ESC  |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ACC0 | ACC1 | ACC2 |      |      |      |      | BTN1 |  UP  | BTN2 |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | ACC0 | ACC1 | ACC2 |      |      |      |      | LEFT | DOWN |RIGHT |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_MOUSE] = LAYOUT_ortho_4x12(\
-    KC_ESC ,      _______,      _______,      _______, _______, _______,   _______, _______,     _______,     _______,     _______, _______,\
-    KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______,   _______, KC_MS_BTN1,  KC_MS_UP,   KC_MS_BTN2,   _______, _______,\
-    KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______,   _______, KC_MS_LEFT,  KC_MS_DOWN, KC_MS_RIGHT,  _______, _______,\
-    _______,      _______,      _______,      _______, _______, _______,   _______, _______,     _______,    _______,      _______, _______\
-),
-
-/* Function 2 (Right hand side)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |WRDSEL|      |      |      | LNDEL|      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      | LNSEL| DUP  |      |      |      |      |LNJOIN|      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | UNDO | CUT  | COPY | PASTE|      |      |      |      |      |      | MODE |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC2] = LAYOUT_ortho_4x12(\
-    _______,  _______,    M(1),       _______,    _______,    _______, M(5),    _______, _______, _______, _______, _______,\
-    _______,  _______,    M(3),       M(7),       _______,    _______, _______, M(10),   _______, _______, _______, _______,\
-    _______,  LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), _______, _______, _______, _______, _______, _______, M(98),  \
-    _______,  _______,    _______,    _______,    _______,    _______, _______, _______, _______, _______, _______, _______ \
-),
-
-[_MAC]= LAYOUT_ortho_4x12(\
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
-    MFNC,     _______, _______, _______, MLWR,    _______, _______, MRSE,    _______, _______, _______, MFNC2   \
-),
-
-[_MLWR] = LAYOUT_ortho_4x12(\
-    _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
-    _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
-    _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
-    _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
-),
-
-[_MRSE] = LAYOUT_ortho_4x12(\
-    _______,  _______,  M(2),    _______, _______, _______, _______,       _______,    _______, _______,    _______,        _______       ,\
-    _______,  _______,  _______, _______, _______, _______, _______,       LCTL(KC_A), _______, LCTL(KC_E), _______,        LGUI(KC_EQL)  ,\
-    _______,  _______,  _______, _______, _______, _______, LALT(KC_LEFT), _______,    _______, _______,    LALT(KC_RIGHT), LGUI(KC_MINS) ,\
-    _______,  _______,  _______, _______, _______, _______, _______,       _______,    _______, _______,    _______,        _______        \
-),
-
-[_MFNC]= LAYOUT_ortho_4x12(\
-    _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______       ,\
-    _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, LGUI(KC_PENT) ,\
-    _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______       ,\
-    _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______        \
-),
-
-[_MFNC2] = LAYOUT_ortho_4x12(\
-    _______,  _______,    M(2),       _______,    _______,    _______, M(6),    _______, _______, _______, _______, _______,\
-    _______,  _______,    M(4),       M(8),       _______,    _______, _______, M(10),   _______, _______, _______, _______,\
-    _______,  LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), _______, _______, _______, _______, _______, _______, M(99),  \
-    _______,  _______,    _______,    _______,    _______,    _______, _______, _______, _______, _______, _______, _______ \
-)
-
-};
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  if (!process_record_dynamic_macro(keycode, record)) {
-      return false;
-  }
-
-   switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case MLWR:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        layer_on(_MLWR);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        layer_off(_MLWR);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case MRSE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        layer_on(_MRSE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        layer_off(_MRSE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case MFNC:
-      if (record->event.pressed) {
-        layer_on(_FUNC);
-        layer_on(_MFNC);
-      } else {
-        layer_off(_FUNC);
-        layer_off(_MFNC);
-      }
-      return false;
-    case MFNC2:
-      if (record->event.pressed) {
-        layer_on(_FUNC2);
-        layer_on(_MFNC2);
-      } else {
-        layer_off(_FUNC2);
-        layer_off(_MFNC2);
-      }
-      return false;
-    }
-  return true;
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t keycode, uint8_t opt) {
-  // These would trigger when you hit a key mapped as M(0)
-  if (record->event.pressed) {
-    switch(keycode) {
-      case 0: // Some custom string here
-        SEND_STRING("");
-        return false;
-
-      case 1: // Word Select
-        SEND_STRING(SS_DOWN(X_LCTRL) SS_TAP(X_RIGHT) SS_DOWN(X_LSHIFT) SS_TAP(X_LEFT) SS_UP(X_LSHIFT) SS_UP(X_LCTRL));
-        return false;
-
-      case 2: // Word Select Mac
-        SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_RIGHT) SS_DOWN(X_LSHIFT) SS_TAP(X_LEFT) SS_UP(X_LSHIFT) SS_UP(X_LALT));
-        return false;
-
-      case 3: // Line Select
-        SEND_STRING(SS_TAP(X_HOME) SS_DOWN(X_LSHIFT) SS_TAP(X_END) SS_UP(X_LSHIFT));
-        return false;
-
-      case 4: // Line Select Mac
-        SEND_STRING(SS_LCTRL("a") SS_DOWN(X_LSHIFT) SS_LCTRL("e") SS_UP(X_LSHIFT));
-        return false;
-
-      case 5: // Line Delete
-        SEND_STRING(SS_TAP(X_HOME) SS_DOWN(X_LSHIFT) SS_TAP(X_END) SS_UP(X_LSHIFT));
-        SEND_STRING(SS_TAP(X_BSPACE));
-        return false;
-
-      case 6: // Line Delete Mac
-        SEND_STRING(SS_LCTRL("a") SS_DOWN(X_LSHIFT) SS_LCTRL("e") SS_UP(X_LSHIFT));
-        SEND_STRING(SS_TAP(X_BSPACE));
-        return false;
-
-      case 7: // Duplicate Selection
-        SEND_STRING(SS_LCTRL("c") SS_TAP(X_RIGHT) SS_LCTRL("v"));
-        return false;
-
-      case 8: // Duplicate Selection Mac
-        SEND_STRING(SS_LGUI("c") SS_TAP(X_RIGHT) SS_LGUI("v"));
-        return false;
-
-      case 9: // Join line
-        SEND_STRING(SS_TAP(X_END) SS_TAP(X_DELETE));
-        return false;
-
-      case 10: // Join line Mac
-        SEND_STRING(SS_LCTRL("e") SS_TAP(X_DELETE));
-        return false;
-
-      case 98: // Print mode
-        SEND_STRING("PC");
-        return false;
-
-      case 99: // Print mode
-        SEND_STRING("OSX");
-        return false;
-    }
-  }
-  return MACRO_NONE;
-};
diff --git a/keyboards/jj40/keymaps/ajp10304/readme.md b/keyboards/jj40/keymaps/ajp10304/readme.md
deleted file mode 100644
index 86286d1118..0000000000
--- a/keyboards/jj40/keymaps/ajp10304/readme.md
+++ /dev/null
@@ -1,108 +0,0 @@
-# AJP10304 Custom JJ40 Layout
-# Also available for the Atreus50 and Planck
-
-**Note:** In the tables below where there are two characters on a key,
-the second is the output when shift is applied.
-
-**Note:** The below tables assume a UK layout.
-
-##### Main Qwerty Layer
-
-* Tab: when held, operates as shift.
-* Enter: when held, operates as shift.
-* MENU: perform right-click
-
-|      |      |      |      |      |      |      |      |      |      |      |      |
-| ---- |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| ----:|
-| Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-| Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  ;:  | Enter|
-| Shft |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  | Shft |
-| Fn   | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2  |
-
-##### Function Layer
-Activated when `fn` held in the above `qwerty` layer.
-
-|       |      |      |      |      |      |      |      |      |      |      |      |
-| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-|  F1   |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-|  1!   |  2"  |  3£  |  4$  |  5%  |  6^  |  7&  |  8*  |  9(  |  0)  |  ~   |INSERT|
-| Shift |  \|  |  `¬  |  #~  |   *  |  -_  |  =+  |  \|  |  [{  |  ]}  |  '@  |Shift |
-| Fn    | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Mouse | MENU | Alt  | Ctrl | Fn2  |
-
-##### Lower Layer
-Activated when `Lower` is held in the above `qwerty` layer.
-
-* Numbers are along the top row, their shifted counterparts are on row 2.
-* WrdBks: `backspace` with `ctrl` applied. I.e. delete a word.
-* WrdDel: `delete` with `ctrl` applied. I.e. forward delete a word.
-
-|       |      |      |      |      |      |      |      |      |      |      |      |
-| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-|  1!   |  2"  |  3£  |  4$  |  5%  |  6^  |  7&  |  8*  |  9(  |  0)  | DEL  | Bksp |
-|  !    |   "  |   £  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |WrdDel|WrdBks|
-| Shift |  \|  |  `¬  |  #~  |  '@  |  -_  |  =+  |  #~  |  [{  |  ]}  |  '@  |Shift |
-|       |      |      |      |Lower | Del  |Space |      | Next | Vol- | Vol+ | Play |
-
- ##### Raise Layer
- Activated when `Raise` is held in the above `qwerty` layer.
-
- * Preferred layer for typing brackets.
- * Allows for cursor navigation to be used solely with the right hand.
- * WRDSEL: Select the word where the cursor is.
- * |< and >|: Apply `ctrl` to `left` and `right` respectively for word jumping.
-
-|       |      |      |      |      |      |       |      |      |      |       |      |
-| :---: |:----:| :---:| :---:| :---:| :---:| :---: | :---:| :---:| :---:| :---: | :---:|
-|   `   |      |WRDSEL|  [   |   ]  |      |       | PGUP | HOME |PGDOWN|       |PRNTSC|
-|   `   |      |      |  (   |   )  |      |       | HOME |  UP  | END  |       |ZOOM +|
-|       |      |      |  {   |   }  |      |&#124;<| LEFT | DOWN |RIGHT |>&#124;|ZOOM -|
-| Mouse |      |      |      |      |  Alt | Enter |Raise |      |      |       |      |
-
-##### Lower + Raise
-Activated when `Lower` and `Raise` are held together in the above `qwerty` layer.
-
-* Audio controls in the same position as cursor keys from the `Raise` layer.
-* ????: Runs a macro for outputting a text string.  Do not use this store passwords.
-* Reset: Enter bootloader for flashing firmware to the keyboard.
-* CAPS: Toggle caps lock.
-* Macro functions: Allows recording of macros.  To start recording the macro, press either REC1 or REC2. 
-To finish the recording, press STOP. To replay the macro, press either PLAY1 or PLAY2.
-* MAC: Toggle MAC OS extensions to layers. This allows MLWR to be enabled with LOWER,
-MRSE with RAISE, MFNC with FUNC and MFNC2 with FUNC2 respectively.
-
-|       |      |      |      |      |      |      |      |      |      |      |      |
-| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |  Del |
-| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      |      |
-| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      |      |
-|       |      |      |      |      |      |      |      | DYN  |      |      |      |
-
-##### Function 2 Layer
-Activated when `fn` held in the above `qwerty` layer.
-* WRDSEL: Select the word where the cursor is.
-* LNDEL: Delete the line where the cursor is.
-* LNSEL: Select the line where the cursor is.
-* DUP: Duplicate the selected text.
-* LNJOIN: Join the line where the cursor is with the following line.
-* MODE: Print either `PC` or `OSX` depending on what layer mode is active.
-
-|       |      |      |      |      |      |      |      |      |      |      |      |
-| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-|       |      |WRDSEL|      |      |      | LNDEL|      |      |      |      |      |
-|       |      | LNSEL| DUP  |      |      |      |      |LNJOIN|      |      |      |
-|       | UNDO | CUT  | COPY | PASTE|      |      |      |      |      |      | MODE |
-|       |      |      |      |      |      |      |      |      |      |      |      |
-
-##### Mouse Layer
-Activated when `fn` and `raise` held together.
-
-|       |      |      |      |      |      |      |      |      |      |      |      |
-| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ESC   |      |      |      |      |      |      |      |      |      |      |      |
-| ACC0  | ACC1 | ACC2 |      |      |      |      | BTN1 |  UP  | BTN2 |      |      |
-| ACC0  | ACC1 | ACC2 |      |      |      |      | LEFT | DOWN | RIGHT|      |      |
-|       |      |      |      |      |      |      |      |      |      |      |      |
-
-####Manual Flashing of hex file
-Use sleep to get a chance to get into boot mode.
-`sleep 5; bootloadHID -r .build/jj40_ajp10304.hex`
diff --git a/keyboards/jj40/keymaps/ajp10304/rules.mk b/keyboards/jj40/keymaps/ajp10304/rules.mk
deleted file mode 100644
index 4dee01cd5b..0000000000
--- a/keyboards/jj40/keymaps/ajp10304/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_ENABLE = no
-MOUSEKEY_ENABLE = yes
-
diff --git a/keyboards/jj40/keymaps/cockpit/keymap.c b/keyboards/jj40/keymaps/cockpit/keymap.c
deleted file mode 100644
index 12ed62b6b5..0000000000
--- a/keyboards/jj40/keymaps/cockpit/keymap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define LT_1 RALT(KC_1)
-#define LT_2 RALT(KC_2)
-#define LT_3 RALT(KC_3)
-#define LT_4 RALT(KC_4)
-#define LT_5 RALT(KC_5)
-#define LT_6 RALT(KC_6)
-#define LT_7 RALT(KC_7)
-#define LT_8 RALT(KC_8)
-#define LT_9 RALT(KC_9)
-#define LT_0 RALT(KC_0)
-#define LT_EXLM RALT(KC_EXLM)
-#define LT_AT RALT(KC_AT)
-#define LT_HASH RALT(KC_HASH)
-#define LT_DLR RALT(KC_DLR)
-#define LT_PERC RALT(KC_PERC)
-#define LT_CIRC RALT(KC_CIRC)
-#define LT_AMPR RALT(KC_AMPR)
-#define LT_ASTR RALT(KC_ASTR)
-
-// Naming according to Unicode specifications
-#define LT_A_OG KC_1
-#define LT_C_CA KC_2
-#define LT_E_OG KC_3
-#define LT_E_DO KC_4
-#define LT_I_OG KC_5
-#define LT_S_CA KC_6
-#define LT_U_OG KC_7
-#define LT_U_MA KC_8
-#define LT_Z_CA KC_EQL
-
-// Cockpit bindings
-#define CP_LOCK LGUI(KC_L)
-
-enum jj40_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _FUNC
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  FUNC
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |      |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |      |
- * | Esc  |   q  |   w  |   e  |   r  |   t  |   y  |   u  |   i  |   o  |   p  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   :  |   "  |
- * | Tab  |   a  |   s  |   d  |   f  |   g  |   h  |   j  |   k  |   l  |   ;  |   '  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   <  |   >  |   ?  |      |
- * |Shift |   z  |   x  |   c  |   v  |   b  |   n  |   m  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * | Ctrl |  Fn  | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_mit( \
-  KC_GESC, KC_Q,      KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
-  KC_TAB,  KC_A,      KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,      KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-  KC_LCTL, MO(_FUNC), KC_LGUI, KC_LALT, MO(_LOWER),  KC_SPC,  MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
-),
-
- /* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   Ą  |   Č  |   Ę  |   Ė  |   Į  |   Š  |   Ų  |   Ū  |   Ž  |   _  |      |
- * |   `  |   ą  |   č  |   ę  |   ė  |   į  |   š  |   ų  |   ū  |   ž  |   -  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * | Tab  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |   {  |   }  |      |      |      |      |      |
- * |Shift |   =  |   +  |   -  |   |  |   [  |   ]  |   <  |   >  |   {  |   }  | Ins  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      ||||||||             |      |      |      |      |      |
- * | Ctrl |      |      | Alt  |Lower||    Space    |      | Home | PgDn | PgUp | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_mit( \
-  KC_GRV,  LT_A_OG, LT_C_CA, LT_E_OG, LT_E_DO, LT_I_OG, LT_S_CA, LT_U_OG, LT_U_MA, LT_Z_CA, KC_MINS, KC_BSPC, \
-  KC_TAB,  LT_EXLM, LT_AT,   LT_HASH, LT_DLR,  LT_PERC, LT_CIRC, LT_AMPR, LT_ASTR, KC_LPRN, KC_RPRN, KC_DEL , \
-  KC_LSFT, KC_PEQL, KC_PPLS, KC_PMNS, KC_PIPE, KC_LBRC, KC_RBRC, KC_LABK, KC_RABK, KC_LCBR, KC_RCBR, KC_INS , \
-  KC_LCTL, _______, _______, KC_LALT, _______,      KC_SPC,      _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END   \
-),
-
- /* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   $  |   %  |   ^  |      |      |      |      |      |      |      |   |  |
- * | Tab  |   4  |   5  |   6  |      |      |      |      |      |      |      |   \  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   &  |   *  |   (  |   )  |      |      |      |   <  |   >  |   ?  |      |
- * |Shift |   7  |   8  |   9  |   0  |      |      |      |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             ||||||||      |      |      |      |
- * | Ctrl |      |      | Alt  |      |    Space    |Raise|| Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_mit( \
-  KC_GRV,  LT_1,    LT_2,    LT_3,    LT_4,    LT_5,    LT_6,    LT_7,    LT_8,    LT_9,    LT_0,    KC_BSPC, \
-  KC_TAB,  LT_4,    LT_5,    LT_6,    _______, _______, _______, _______, _______, _______, _______, KC_BSLS, \
-  KC_LSFT, LT_7,    LT_8,    LT_9,    LT_0,    _______, _______, _______, KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-  KC_LCTL, _______, _______, KC_LALT, _______,      KC_SPC,      _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
-),
-
- /* Functions
- *  Note: Terminal uses Calculator shortcut, change your OS keyboard shortcut appropriately.
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | RGB  | RGB  | RGB  | RGB  |  BL  |  BL  |  BL  |      |      |      |      |
- * | Caps | Togl | Hue+ | Sat+ | Brt+ | Togl |Breath| Brt+ |      |      |      | Vol+ |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      | RGB  | RGB  | RGB  | WWW  | WWW  |  BL  |      |      |      |      |
- * |Shift | Term | Hue- | Sat- | Brt- |  <   |  >   | Brt- |      |      |PrScr | Vol- |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |||||||| RGB  |      |      |             |      |      |      |      |      |
- * | Ctrl |||Fn||| Mode | Alt  |      |    Space    |MPrev |MStop |MNext |MPlay | Lock |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] = LAYOUT_planck_mit( \
-  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_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_BRTG, BL_INC,  _______, _______, _______, KC_VOLU, \
-  KC_LSFT, KC_CALC, RGB_HUD, RGB_SAD, RGB_VAD, KC_WBAK, KC_WFWD, BL_DEC,  _______, _______, KC_PSCR, KC_VOLD, \
-  KC_LCTL, _______, RGB_MOD, KC_LALT, _______,      KC_SPC,      KC_MPRV, KC_MSTP, KC_MNXT, KC_MPLY, CP_LOCK  \
-)
-};
-
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/jj40/keymaps/cockpit/readme.md b/keyboards/jj40/keymaps/cockpit/readme.md
deleted file mode 100644
index 37bd47b1d9..0000000000
--- a/keyboards/jj40/keymaps/cockpit/readme.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Cockpit custom layout
-
-> This configuration is built around Lithuanian keyboard layout, but you can easily modify it to fit your needs
-
-## Layers
-
-### Default QWERTY
-
-|           |        |        |        |        |        |        |        |        |        |        |           |
-| :-------: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :-------: |
-|  <br>Esc  | Q<br>q | W<br>w | E<br>e | R<br>r | T<br>t | Y<br>y | U<br>u | I<br>i | O<br>o | P<br>p | <br>Bksp  |
-|  <br>Tab  | A<br>a | S<br>s | D<br>d | F<br>f | G<br>g | H<br>h | J<br>j | K<br>k | L<br>l | :<br>; |  "<br>'   |
-| <br>Shift | Z<br>z | X<br>x | C<br>c | V<br>v | B<br>b | N<br>n | M<br>m | <<br>, | ><br>. | ?<br>/ | <br>Enter |
-|   Ctrl    |   Fn   |  GUI   |  Alt   | Lower  |   Sp   |  ace   | Raise  |  Left  |  Down  |   Up   |   Right   |
-
-### Lower
-
-|           |        |        |        |           |        |        |        |        |        |         |          |
-| :-------: | :----: | :----: | :----: | :-------: | :----: | :----: | :----: | :----: | :----: | :-----: | :------: |
-|  ~<br>\`  | Ą<br>ą | Č<br>č | Ę<br>ę |  Ė<br>ė   | Į<br>į | Š<br>š | Ų<br>ų | Ū<br>ū | Ž<br>ž | \_<br>- | <br>Bksp |
-|  <br>Tab  | <br>!  | <br>@  | <br>#  |   <br>$   | <br>%  | <br>^  | <br>&  | <br>\* | <br>(  |  <br>)  | <br>Del  |
-| <br>Shift | <br>=  | <br>+  | <br>-  |  <br>\|   | {<br>[ | }<br>] | <br><  | <br>>  | <br>{  |  <br>}  | <br>Ins  |
-|   Ctrl    |        |        |  Alt   | **Lower** |   Sp   |  ace   |        |  Home  |  PgDn  |  PgUp   |   End    |
-
-### Raise
-
-|           |        |         |        |        |        |        |           |         |        |        |           |
-| :-------: | :----: | :-----: | :----: | :----: | :----: | :----: | :-------: | :-----: | :----: | :----: | :-------: |
-|  ~<br>\`  | !<br>1 | @<br>2  | #<br>3 | $<br>4 | %<br>5 | ^<br>6 |  &<br>7   | \*<br>8 | (<br>9 | )<br>0 | <br>Bksp  |
-|  <br>Tab  | $<br>4 | %<br>5  | ^<br>6 |        |        |        |           |         |        |        | \|<br>\   |
-| <br>Shift | &<br>7 | \*<br>8 | (<br>9 | )<br>0 |        |        |           | <<br>,  | ><br>. | ?<br>/ | <br>Enter |
-|   Ctrl    |        |         |  Alt   |        |   Sp   |  ace   | **Raise** |  Left   |  Down  |   Up   |   Right   |
-
-### Function
-
-*   Caps does not work. Might be an issue with my laptop, not JJ40 specific.
-*   Backlight breathing does not work.
-*   **Term** button is bound to `Calculator`. I have set this button as a shortcut to open a terminal.
-*   **Lock** is a shortcut for `Alt + L`
-
-|           |             |             |             |             |            |              |            |        |         |         |          |
-| :-------: | :---------: | :---------: | :---------: | :---------: | :--------: | :----------: | :--------: | :----: | :-----: | :-----: | :------: |
-|  <br>F1   |   <br>F2    |   <br>F3    |   <br>F4    |   <br>F5    |   <br>F6   |    <br>F7    |   <br>F8   | <br>F9 | <br>F10 | <br>F11 | <br>F12  |
-| <br>Caps  | RGB<br>Togl | RGB<br>Hue+ | RGB<br>Sat+ | RGB<br>Brt+ | BL<br>Togl | BL<br>Breath | BL<br>Brt+ |        |         |         | <br>Vol+ |
-| <br>Shift |  <br>Term   | RGB<br>Hue- | RGB<br>Sat- | RGB<br>Brt- |  WWW<br><  |   WWW<br>>   | BL<br>Brt- |        |         |  PrScr  | <br>Vol- |
-|   Ctrl    |   **Fn**    | RGB<br>Mode |     Alt     |             |     Sp     |     ace      |   MPrev    | MStop  |  MNext  |  MPlay  |   Lock   |
-
-## Usage
-
-```bash
-cd qmk_firmware
-make jj40:cockpit
-bootloadHID .build/jj40_cockpit.hex
-```
-
-_if you're getting permission errors use sudo_
diff --git a/keyboards/jj40/keymaps/default/keymap.c b/keyboards/jj40/keymaps/default/keymap.c
deleted file mode 100644
index d84b01b15a..0000000000
--- a/keyboards/jj40/keymaps/default/keymap.c
+++ /dev/null
@@ -1,73 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-#define _QWERTY 0
-#define _LOWER  1
-#define _RAISE  2
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_mit( \
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-  _______, KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER),  KC_SPC,  MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_mit( \
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_mit( \
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-)
-};
-
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/jj40/keymaps/fun40/config.h b/keyboards/jj40/keymaps/fun40/config.h
deleted file mode 100644
index f2b5d264e7..0000000000
--- a/keyboards/jj40/keymaps/fun40/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define FORCE_NKRO
-
-#endif
diff --git a/keyboards/jj40/keymaps/fun40/keymap.c b/keyboards/jj40/keymaps/fun40/keymap.c
deleted file mode 100644
index bbe6279e3e..0000000000
--- a/keyboards/jj40/keymaps/fun40/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _LOWER  1
-#define _RAISE  2
-#define _BL 4 // Backlight
-// #define _ADJUST 3
-#define TG_NKRO MAGIC_TOGGLE_NKRO
-
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  Del | Alt  | GUI  |Lower | Space|Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12( \
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT, \
-  KC_LCTL, KC_DEL, KC_LALT, KC_LGUI, MO(_LOWER),KC_SPC,KC_SPC,  MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Shift|PrScr |ISO ~ |ISO | |      |      |      |      |      |bl_on |bl_stp| Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | nkro | Alt  | NKRO |Lower | PgDn | PgUp |Raise | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12( \
-  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_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, \
-  KC_LSFT, KC_PSCR, S(KC_NUHS), S(KC_NUBS), _______, _______, _______, _______, _______, BL_ON, BL_STEP, KC_ENT, \
-  KC_LCTL, MAGIC_TOGGLE_NKRO, KC_LALT, TG_NKRO, _______, KC_PGDN, KC_PGUP, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | Caps |  +   |  -   |  =   |   (  |   )  |      |   7  |   8  |   9  | Bksp | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Lock |  ~   |  _   |      |   [  |   ]  |      |   4  |   5  |   6  |      |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Ins  |  `   |   \  |   |  |   {  |   }  |      |   1  |   2  |   3  |   .  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      | Alt  |      |Lower |      |      |Raise |   0  |      | Home | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12( \
-  KC_CAPS, KC_MINS, KC_PLUS, KC_EQL,  KC_LPRN, KC_RPRN, _______, KC_7,  KC_8,    KC_9, KC_BSPC, KC_DEL, \
-  KC_LOCK,  KC_TILD, KC_UNDS, _______,KC_LBRC, KC_RBRC, _______, KC_4,  KC_5,    KC_6, _______, _______, \
-  KC_INS, KC_GRV, KC_BSLS, KC_PIPE,  KC_LCBR, KC_RCBR, _______, KC_1,  KC_2,    KC_3, KC_DOT, _______, \
-  KC_LCTL, _______, KC_LALT, _______, _______, _______, _______, _______, KC_0, _______, KC_HOME, KC_END \
-)
-
-/* Adjust
- G = git
- M = mail
- * ,-----------------------------------------------------------------------------------.
- * | gAdd |gStash|      | const|      | Clog |      |      | Mstk | Mrad |Mgmail|      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | gPush|      |      | if() |      | Clog2|      |      |      |      |Mcity |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | gPull|      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower |      |      |Raise |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-
-/* Empty
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower |      |      |Raise |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-};
-
-// Macro actions for each corresponding ID.
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-  switch (id) {
-  case 0:
-    if (record->event.pressed) {
-      register_code(KC_RSFT);
-#ifdef BACKLIGHT_ENABLE
-      backlight_step();
-#endif
-    }
-    else {
-      unregister_code(KC_RSFT);
-    }
-    break;
-  }
-  return MACRO_NONE;
-};
-
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/jj40/keymaps/fun40/readme.md b/keyboards/jj40/keymaps/fun40/readme.md
deleted file mode 100644
index f4036fa0e0..0000000000
--- a/keyboards/jj40/keymaps/fun40/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Fun 40%.
-
-* backlighting on flash  
-  * backlight fails on reboot
\ No newline at end of file
diff --git a/keyboards/jj40/keymaps/fun40/rules.mk b/keyboards/jj40/keymaps/fun40/rules.mk
deleted file mode 100644
index 92f168a16d..0000000000
--- a/keyboards/jj40/keymaps/fun40/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-BOOTMAGIC_ENABLE = yes       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no          # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes          # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-
-RGBLIGHT_ENABLE = yes
-RGBLIGHT_CUSTOM_DRIVER = yes
-DISABLE_WS2812 = yes
-
-
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/jj40/keymaps/krusli/config.h b/keyboards/jj40/keymaps/krusli/config.h
deleted file mode 100644
index e710dbbb60..0000000000
--- a/keyboards/jj40/keymaps/krusli/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// #define TAPPING_TERM 300
-
-#endif
diff --git a/keyboards/jj40/keymaps/krusli/keymap.c b/keyboards/jj40/keymaps/krusli/keymap.c
deleted file mode 100644
index f996fbf35b..0000000000
--- a/keyboards/jj40/keymaps/krusli/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _LOWER  1
-#define _RAISE  2
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-};
-
-void matrix_scan_user(void) {
-  // runs at every matrix scan.
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | Ctrl | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-
-  [_QWERTY] = LAYOUT_planck_mit( \
-    KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
-    KC_ESC,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-    KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-    TO(_NUMPAD),KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER),  KC_SPC,  MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-  ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | RGB  | RGB  | RGB  | RGB  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | RGB  | RGB  | RGB  |      |             | Next | Vol- | Vol+ | Play |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT_planck_mit( \
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, _______, \
-    _______, RGB_SAD, RGB_SAI, RGB_HUI, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-  ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | Home | End  | PgUp | PgDn |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | Prev | Play | Next |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT_planck_mit( \
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME, KC_END,  KC_PGUP, KC_PGDN, _______, \
-    _______, KC_MRWD, KC_MPLY, KC_MNXT, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-  ),
-
-  /* Numpad
-   * ,-----------------------------------------------------------------------------------.
-   * | Esc  |  7   |  8   |  9   |  *   |  /   |      |      |      |      |      |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | <--  |  4   |  5   |  6   |  +   |  -   |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  1   |  2   |  3   |Enter |Enter |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Qwerty|  0   |  .   |  .   |Enter |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_NUMPAD] = LAYOUT_planck_mit( \
-    KC_ESC,     KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \
-    KC_BSPC,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \
-    _______,    KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \
-    TO(_QWERTY),KC_P0,   KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______ \
-  )
-};
diff --git a/keyboards/jj40/keymaps/krusli/numpad.txt b/keyboards/jj40/keymaps/krusli/numpad.txt
deleted file mode 100644
index 8fbdc1829e..0000000000
--- a/keyboards/jj40/keymaps/krusli/numpad.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Numpad
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |  7   |  8   |  9   |  *   |  /   |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | <--  |  4   |  5   |  6   |  +   |  -   |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  1   |  2   |  3   |Enter |Enter |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Qwerty|  0   |  .   |  .   |Enter |Enter        |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_2U_space( \
-  KC_ESC,     KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \
-  KC_BSPC,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \
-  _______,    KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \
-  TO(_QWERTY),KC_P0,   KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______ \
-)
diff --git a/keyboards/jj40/keymaps/krusli/readme.md b/keyboards/jj40/keymaps/krusli/readme.md
deleted file mode 100644
index ed760e8a61..0000000000
--- a/keyboards/jj40/keymaps/krusli/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# krusli
-JJ40 keymap based off the default Planck layout with a numpad layer and with RGB underglow controls.
-
-GUI and LAlt is also swapped to their standard positions.
diff --git a/keyboards/jj40/keymaps/krusli/rules.mk b/keyboards/jj40/keymaps/krusli/rules.mk
deleted file mode 100644
index 5c6bb684e5..0000000000
--- a/keyboards/jj40/keymaps/krusli/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# TAP_DANCE_ENABLE = yes
diff --git a/keyboards/jj40/keymaps/like_jis/config.h b/keyboards/jj40/keymaps/like_jis/config.h
deleted file mode 100644
index cd9709272c..0000000000
--- a/keyboards/jj40/keymaps/like_jis/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#pragma once
-
-// place overrides here
-
-#define TAPPING_TERM 200
-
-#ifdef MOUSEKEY_ENABLE
-  #undef MOUSEKEY_INTERVAL
-  #define MOUSEKEY_INTERVAL 5
-
-  #undef MOUSEKEY_TIME_TO_MAX
-  #define MOUSEKEY_TIME_TO_MAX 150
-
-  #undef MOUSEKEY_MAX_SPEED
-  #define MOUSEKEY_MAX_SPEED 3
-
-  #undef MOUSEKEY_MOVE_DELTA
-  #define MOUSEKEY_MOVE_DELTA 3
-
-  #undef MOUSEKEY_DELAY
-  #define MOUSEKEY_DELAY 0
-#endif
-
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 15
-// #undef BACKLIGHT_LEVELS
-// #define BACKLIGHT_BREATHING
-// #undef BREATHING_PERIOD
-// #define BREATHING_PERIOD 4
diff --git a/keyboards/jj40/keymaps/like_jis/keymap.c b/keyboards/jj40/keymaps/like_jis/keymap.c
deleted file mode 100644
index 24db919472..0000000000
--- a/keyboards/jj40/keymaps/like_jis/keymap.c
+++ /dev/null
@@ -1,200 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum custom_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-  ADJUST,
-  RGBRST
-};
-
-#define KC______ KC_TRNS
-#define KC_XXXXX KC_NO
-#define KC_KANJI KC_GRV
-
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-#define KC_ADJST ADJUST
-
-#define KC_RST   RESET
-
-#define KC_LRST  RGBRST
-#define KC_LTOG  RGB_TOG
-#define KC_LHUI  RGB_HUI
-#define KC_LHUD  RGB_HUD
-#define KC_LSAI  RGB_SAI
-#define KC_LSAD  RGB_SAD
-#define KC_LVAI  RGB_VAI
-#define KC_LVAD  RGB_VAD
-#define KC_LMOD  RGB_MOD
-#define KC_BTOG  BL_TOGG
-#define KC_BINC  BL_INC
-#define KC_BDEC  BL_DEC
-// #define KC_BRTG  BL_BRTG
-
-#define KC_KNRM  AG_NORM
-#define KC_KSWP  AG_SWAP
-
-// Layer Mode aliases
-// #define KC_L_LO  MO(_LOWER)
-// #define KC_L_RA  MO(_RAISE)
-// #define KC_L_AD  MO(_ADJUST)
-#define KC_TBSF  LSFT_T(KC_TAB)
-// #define KC_SPSF  LSFT_T(KC_SPC)
-// #define KC_GUAP  LALT_T(KC_APP)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = KC_LAYOUT_ortho_4x12( \
-  //,-----------------------------------------------------------------------------------.
-        ESC,     Q,     W,     E,     R,     T,     Y,     U,     I,     O,     P,  MINS,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-       TBSF,     A,     S,     D,     F,     G,     H,     J,     K,     L,  SCLN,   ENT,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-       LSFT,     Z,     X,     C,     V,     B,     N,     M,  COMM,   DOT,    UP,  RSFT,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      LCTRL,  LALT,  LGUI, ADJST, LOWER,  BSPC,   SPC, RAISE,   APP,  LEFT,  DOWN,  RGHT \
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-  ),
-
-  [_LOWER] = KC_LAYOUT_ortho_4x12( \
-  //,-----------------------------------------------------------------------------------.
-        TAB,    F1,    F2,    F3,    F4,    F5, XXXXX,  MINS,   EQL,  JYEN,  LBRC,  RBRC,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      _____,    F6,    F7,    F8,    F9,   F10, XXXXX, XXXXX, XXXXX,  SCLN,  QUOT,  BSLS,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      _____,   F11,   F12, XXXXX, KANJI,   ENT, XXXXX, XXXXX,  COMM,   DOT,  SLSH,    RO,\
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-      _____, _____, _____, _____, _____,   DEL, _____, _____, _____, _____, _____, _____ \
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-  ),
-
-  [_RAISE] = KC_LAYOUT_ortho_4x12( \
-  //,-----------------------------------------------------------------------------------.
-      _____,     1,     2,     3,     4,     5,     6,     7,     8,     9,     0,  MINS,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      _____, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,     4,     5,     6,  QUOT,  PLUS,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      _____, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,     0,     1,     2,     3,   DOT,  SLSH,\
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-      _____, _____, _____, _____, _____,  BSPC, _____, _____, _____, _____, _____, _____ \
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-  ),
-
-  [_ADJUST] = KC_LAYOUT_ortho_4x12( \
-  //,-----------------------------------------------------------------------------------.
-      XXXXX,   RST,  LRST,  KNRM,  KSWP, XXXXX, XXXXX,  WH_L,  WH_U,  HOME,  PGUP, XXXXX,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      XXXXX,  LTOG,  LHUI,  LSAI,  LVAI,  BTOG,  BINC,  WH_R,  WH_D,   END,  PGDN, XXXXX,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      XXXXX,  LMOD,  LHUD,  LSAD,  LVAD, XXXXX,  BDEC, XXXXX,  BTN1,  BTN2,  MS_U, XXXXX,\
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-      _____, _____, _____, _____, _____, XXXXX, XXXXX, _____, _____,  MS_L,  MS_D,  MS_R \
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-  )
-};
-
-
-#ifdef BACKLIGHT_ENABLE
-  extern backlight_config_t backlight_config;
-
-  inline void enable_backright(bool on) {
-      backlight_config.enable = on;
-      if (backlight_config.raw == 1) // enabled but level = 0
-          backlight_config.level = 1;
-      eeconfig_update_backlight(backlight_config.raw);
-      // dprintf("backlight toggle: %u\n", backlight_config.enable);
-      backlight_set(backlight_config.enable ? backlight_config.level : 0);
-  }
-
-  uint8_t bl_breath_count;
-  uint8_t bl_breath_speed = 10;
-  int8_t bl_breath_updown = 1;
-  bool bl_breath_on;
-  backlight_config_t bl_breath_backup;
-
-  void bl_breath_start(uint8_t speed) {
-
-    bl_breath_on = true;
-    bl_breath_speed = speed;
-    bl_breath_backup = backlight_config;
-  }
-
-  void bl_breath_end(void) {
-
-    bl_breath_on = false;
-    backlight_config = bl_breath_backup;
-    eeconfig_update_backlight(backlight_config.raw);
-    backlight_set(backlight_config.enable ? backlight_config.level : 0);
-  }
-
-  void bl_breath_update(void) {
-
-    if (bl_breath_on) {
-      ++bl_breath_count;
-      if (bl_breath_count > bl_breath_speed) {
-        bl_breath_count = 0;
-
-        backlight_config.level += bl_breath_updown;
-        bl_breath_updown = (backlight_config.level > BACKLIGHT_LEVELS) ? -1 :
-                          (backlight_config.level <= 0) ? 1 :
-                          bl_breath_updown;
-        enable_backright(true);
-      }
-    }
-  }
-
-  #define BL_BREATH_START bl_breath_start
-  #define BL_BREATH_END bl_breath_end
-  #define BL_BREATH_UPDATE bl_breath_update
-
-#else
-
-  #define BL_BREATH_START(a)
-  #define BL_BREATH_END()
-  #define BL_BREATH_UPDATE()
-#endif
-
-// Loop
-void matrix_scan_user(void) {
-
-  BL_BREATH_UPDATE();
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        BL_BREATH_START(50);
-        layer_on(_LOWER);
-      } else {
-        BL_BREATH_END();
-        layer_off(_LOWER);
-      }
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        BL_BREATH_START(100);
-        layer_on(_RAISE);
-      } else {
-        BL_BREATH_END();
-        layer_off(_RAISE);
-      }
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      break;
-    default:
-      return true;
-  }
-
-  return false;
-}
diff --git a/keyboards/jj40/keymaps/like_jis/rules.mk b/keyboards/jj40/keymaps/like_jis/rules.mk
deleted file mode 100644
index 0103be5f4a..0000000000
--- a/keyboards/jj40/keymaps/like_jis/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUSEKEY_ENABLE = yes
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/jj40/keymaps/oscillope/config.h b/keyboards/jj40/keymaps/oscillope/config.h
deleted file mode 100644
index e812903de9..0000000000
--- a/keyboards/jj40/keymaps/oscillope/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 200
-
-#endif
diff --git a/keyboards/jj40/keymaps/oscillope/keymap.c b/keyboards/jj40/keymaps/oscillope/keymap.c
deleted file mode 100644
index 1a42261940..0000000000
--- a/keyboards/jj40/keymaps/oscillope/keymap.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-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
-
-#define _QWERTY 0
-#define _LOWER  1
-#define _RAISE  2
-#define _NAV    3
-
-#define NAV_TAP LT(_NAV, KC_SPC)
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  CC_ARRW,
-  CC_PRN,
-  CC_BRC,
-  CC_CBR,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   `  |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  OS  | Alt  |Lower |Shift |Raise |    Space    | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_1x2uR( \
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT, \
-  KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT, \
-  KC_LCTL, KC_LGUI, KC_LALT, TT(_LOWER), KC_LSFT, TT(_RAISE), NAV_TAP,    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ins  |      |      |  ()  |  []  |  {}  | Home | PgDn | PgUp | End  |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |RESET | Back | Fwd  |      |      |      |      |      | Mute | Vol- | Vol+ |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | Lock |      |             | Prev | Stop | Play | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_1x2uR( \
-  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_INS,  _______, _______, CC_PRN,  CC_BRC,  CC_CBR,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, \
-  RESET,   KC_WBAK, KC_WFWD, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, \
-  _______, _______, _______, _______, KC_LOCK, _______, _______,          KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT \
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | Caps |   &  |   *  |   _  |   (  |   )  |   7  |   8  |   9  |   =  | Bksp | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   $  |   %  |   ^  |   [  |   ]  |   4  |   5  |   6  |   -  |   +  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |  ->  |   !  |   @  |   #  |   {  |   }  |   1  |   2  |   3  |   .  |   \  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  OS  | Alt  |      |Shift |      |      0      | Home | PgDn | PgUp | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_1x2uR( \
-  KC_CAPS, KC_AMPR, KC_ASTR, KC_UNDS, KC_LPRN, KC_RPRN, KC_7,    KC_8,    KC_9,    KC_EQL,  KC_BSPC, KC_DEL, \
-  KC_TAB,  KC_DLR,  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_4,    KC_5,    KC_6,    KC_MINS, KC_PLUS, _______, \
-  CC_ARRW, KC_EXLM, KC_AT,   KC_HASH, KC_LCBR, KC_RCBR, KC_1,    KC_2,    KC_3,    _______, KC_BSLS, KC_PIPE, \
-  _______, _______, _______, _______, _______, _______, KC_0,             KC_HOME, KC_PGDN, KC_PGUP, KC_END \
-),
-
-[_NAV] = LAYOUT_planck_1x2uR( \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______ \
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-      case CC_ARRW:
-        SEND_STRING("->");
-        return false;
-      case CC_PRN:
-        SEND_STRING("()"SS_TAP(X_LEFT));
-        return false;
-      case CC_BRC:
-        SEND_STRING("[]"SS_TAP(X_LEFT));
-        return false;
-      case CC_CBR:
-        SEND_STRING("{}"SS_TAP(X_LEFT));
-        return false;
-    }
-  }
-  return true;
-}
-
-
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/jj40/keymaps/oscillope/rules.mk b/keyboards/jj40/keymaps/oscillope/rules.mk
deleted file mode 100644
index a121bbc770..0000000000
--- a/keyboards/jj40/keymaps/oscillope/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# build options
-BOOTMAGIC_ENABLE = no
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = yes
-
-BACKLIGHT_ENABLE = no
-BACKLIGHT_CUSTOM_DRIVER = no
-
-RGBLIGHT_ENABLE = no
-RGBLIGHT_CUSTOM_DRIVER = no
-
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/jj40/keymaps/skewwhiffy/keymap.c b/keyboards/jj40/keymaps/skewwhiffy/keymap.c
deleted file mode 100644
index 6b193a15cb..0000000000
--- a/keyboards/jj40/keymaps/skewwhiffy/keymap.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* Copyright 2017 Kenny Hung
- *
- * 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
-#include "keymap_uk.h"
-
-// Layer shorthand
-enum Layers {
-  cm, // colemak
-  dv, // dvorak
-  qw, // qwerty
-  nbl, // numbers left
-  nbr, // numbers right
-  syl, // symbols left
-  syr, // symbols right
-  nal, // navigation left
-  nar // navigation right
-};
-
-// Layer buttons
-#define _Z_SFT SFT_T(UK_Z)
-#define _SCLSH SFT_T(UK_SCLN)
-#define _SLSH SFT_T(UK_SLSH)
-
-#define _X_NB LT(nbl, UK_X)
-#define _Q_NB LT(nbl, UK_Q)
-#define _DOT_NB LT(nbr, UK_DOT)
-#define _V_NB LT(nbr, UK_V)
-#define __NBL LT(nbl, _______)
-#define __NBR LT(nbr, _______)
-
-#define _C_SY LT(syl, UK_C)
-#define _J_SY LT(syl, UK_J)
-#define _W_SY LT(syr, UK_W)
-#define _COM_SY LT(syr, UK_COMM)
-#define __SYL LT(syl, _______)
-#define __SYR LT(syr, _______)
-
-#define _V_NAL LT(nal, UK_V)
-#define _K_NAL LT(nal, UK_K)
-#define _M_NAR LT(nar, UK_M)
-#define __NAL LT(nal, _______)
-#define __NAR LT(nar, _______)
-
-// Custom hotkeys
-#define _TERM LCTL(UK_QUOT) // Hotkey for terminal
-#define _S_TAB S(UK_TAB)
-#define _C_LEFT LCTL(UK_LEFT)
-#define _C_RGHT LCTL(UK_RGHT)
-#define _A_LEFT LALT(UK_LEFT)
-#define _A_RGHT LALT(UK_RGHT)
-
-// Custom hotkeys
-#define _TERM LCTL(UK_QUOT) // Hotkey for terminal
-#define _S_TAB S(UK_TAB)
-#define _C_LEFT LCTL(UK_LEFT)
-#define _C_RGHT LCTL(UK_RGHT)
-#define _A_LEFT LALT(UK_LEFT)
-#define _A_RGHT LALT(UK_RGHT)
-
-enum custom_keycodes {
-  IJ_OMN = SAFE_RANGE // IntelliJ Omnibox
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * .-----------------------------------------------------------------------------------------------------------.
- * | Q      | W      | F      | P      | G      |        |        | J      | L      | U      | Y      | ;      |
- * |-----------------------------------------------------------------------------------------------------------|
- * | A      | R      | S      | T      | D      |        |        | H      | N      | E      | I      | O      |
- * |-----------------------------------------------------------------------------------------------------------|
- * | Z      | X      | C      | V      | B      |        |        | K      | M      | ,      | .      | /      |
- * | SHIFT  | NUMBER | SYMBOL | NAV    |        |        |        |        | NAV    | SYMBOL | FUNC   | SHIFT  |
- * |-----------------------------------------------------------------------------------------------------------|
- * | LSHIFT | LCTRL  | LALT   | LGUI   | SPACE  | ENT    | DEL    | BKSPC  | RGUI   | RALT   | RCTRL  | RSHIFT |
- * .-----------------------------------------------------------------------------------------------------------.
- */
- [cm] = LAYOUT_ortho_4x12( \
-   UK_Q,    UK_W,    UK_F,    UK_P,    UK_G,    _______, _______, UK_J,    UK_L,    UK_U,    UK_Y,    UK_SCLN, \
-   UK_A,    UK_R,    UK_S,    UK_T,    UK_D,    _______, _______, UK_H,    UK_N,    UK_E,    UK_I,    UK_O, \
-   _Z_SFT,  _X_NB,   _C_SY,   _V_NAL,  UK_B,    _______, _______, UK_K,    _M_NAR,  _COM_SY, _DOT_NB, _SLSH, \
-   UK_LSFT, UK_LCTL, UK_LALT, UK_LGUI, UK_SPC,  UK_ENT,  UK_DEL,  UK_BSPC, UK_RGUI, UK_RALT, UK_RCTL, UK_RSFT \
- ),
-
-/* Dvorak
- * .-----------------------------------------------------------------------------------------------------------.
- * | '      | ,      | .      | P      | Y      |        |        | F      | G      | C      | R      | L      |
- * |-----------------------------------------------------------------------------------------------------------|
- * | A      | O      | E      | U      | I      |        |        | D      | H      | T      | N      | S      |
- * |-----------------------------------------------------------------------------------------------------------|
- * | ;      | Q      | J      | K      | X      |        |        | B      | M      | W      | V      | Z      |
- * | SHIFT  | NUMBER | SYMBOL | NAV    |        |        |        |        | NAV    | SYMBOL | FUNC   | SHIFT  |
- * |-----------------------------------------------------------------------------------------------------------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |-----------------------------------------------------------------------------------------------------------|
- */
- [dv] = LAYOUT_ortho_4x12( \
-   UK_QUOT, UK_COMM, UK_DOT,  UK_P,    UK_Y,    _______, _______, UK_F,    UK_G,    UK_C,    UK_R,    UK_L, \
-   UK_A,    UK_O,    UK_E,    UK_U,    UK_I,    _______, _______, UK_D,    UK_H,    UK_T,    UK_N,    UK_S, \
-   _SCLSH,  _Q_NB,   _J_SY,   _K_NAL,  UK_X,    _______, _______, UK_B,    _M_NAR,  _W_SY,   _V_NB,   _Z_SFT, \
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
- ),
-
-/* QWERTY
- * .-----------------------------------------------------------------------------------------------------------.
- * | Q      | W      | E      | R      | T      |        |        | Y      | U      | I      | O      | P      |
- * |-----------------------------------------------------------------------------------------------------------|
- * | A      | S      | D      | F      | G      |        |        | H      | J      | K      | L      | ;      |
- * |-----------------------------------------------------------------------------------------------------------|
- * | Z      | X      | C      | V      | B      |        |        | N      | M      | ,      | .      | /      |
- * | SHIFT  | NUMBER | SYMBOL | NAV    |        |        |        |        | NAV    | SYMBOL | FUNC   | SHIFT  |
- * |-----------------------------------------------------------------------------------------------------------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * .-----------------------------------------------------------------------------------------------------------.
- */
- [qw] = LAYOUT_ortho_4x12( \
-   UK_Q,    UK_W,    UK_E,    UK_R,    UK_T,    _______, _______, UK_Y,    UK_U,    UK_I,    UK_O,    UK_P, \
-   UK_A,    UK_S,    UK_D,    UK_F,    UK_G,    _______, _______, UK_H,    UK_J,    UK_K,    UK_L,    UK_SCLN, \
-   _Z_SFT,  _X_NB,   _C_SY,   _V_NAL,  UK_B,    _______, _______, UK_N,    _M_NAR,  _COM_SY, _DOT_NB, _SLSH, \
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
- ),
-
-/* Numbers _NB
- * .-----------------------------------------------------------------------------------------------------------.
- * |        | F7     | F8     | F9     | F10    |        |        |        | 7      | 8      | 9      |        |
- * |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | F4     | F5     | F6     | F11    |        |        |        | 4      | 5      | 6      |        |
- * |-----------------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        | F1     | F2     | F3     | F12    |        |        | 0      | 1      | 2      | 3      | .      |
- * |-----------------+--------+--------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------'
- */
- [nbl] = LAYOUT_ortho_4x12( \
-   _______, UK_F7,   UK_F8,   UK_F9,   UK_F10,  _______, _______, _______, UK_7,    UK_8,    UK_9,    _______, \
-   _______, UK_F4,   UK_F5,   UK_F6,   UK_F11,  _______, _______, _______, UK_4,    UK_5,    UK_6,    _______, \
-   _______, __NBL,   UK_F2,   UK_F3,   UK_F12,  _______, _______, UK_0,    UK_1,    UK_2,    UK_3,    UK_DOT, \
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
- ),
- [nbr] = LAYOUT_ortho_4x12( \
-   _______, UK_F7,   UK_F8,   UK_F9,   UK_F10,  _______, _______, _______, UK_7,    UK_8,    UK_9,    _______, \
-   _______, UK_F4,   UK_F5,   UK_F6,   UK_F11,  _______, _______, _______, UK_4,    UK_5,    UK_6,    _______, \
-   _______, UK_F1,   UK_F2,   UK_F3,   UK_F12,  _______, _______, UK_0,    UK_1,    UK_2,    __NBR,   UK_DOT, \
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
- ),
-
-/* Symbols _SY
- * .-----------------------------------------------------------------------------------------------------------.
- * | !      | £      | _      | -      | ~      |        |        | \      | {      | }      | /      | #      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | $      | %      | +      | =      |        |        |        | "      | (      | )      | '      | @      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | ^      | &      | *      | |      |        |        |        | <      | [      | ]      | >      | `      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------'
- */
- [syl] = LAYOUT_ortho_4x12( \
-   UK_EXLM, UK_PND,  UK_UNDS, UK_MINS, UK_TILD, _______, _______, UK_BSLS, UK_LCBR, UK_RCBR, UK_SLSH, UK_HASH, \
-   UK_DLR,  UK_PERC, UK_PLUS, UK_EQL,  _______, _______, _______, UK_DQUO, UK_LPRN, UK_RPRN, UK_QUOT, UK_AT, \
-   UK_CIRC, UK_AMPR, __SYL,   UK_PIPE, _______, _______, _______, UK_LABK, UK_LBRC, UK_RBRC, UK_RABK, UK_GRV, \
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
- ),
- [syr] = LAYOUT_ortho_4x12( \
-   UK_EXLM, UK_PND,  UK_UNDS, UK_MINS, UK_TILD, _______, _______, UK_BSLS, UK_LCBR, UK_RCBR, UK_SLSH, UK_HASH, \
-   UK_DLR,  UK_PERC, UK_PLUS, UK_EQL,  _______, _______, _______, UK_DQUO, UK_LPRN, UK_RPRN, UK_QUOT, UK_AT, \
-   UK_CIRC, UK_AMPR, UK_ASTR, UK_PIPE, _______, _______, _______, UK_LABK, UK_LBRC, __SYR,   UK_RABK, UK_GRV, \
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
- ),
-
-/*
- * Navigation
- * .-----------------------------------------------------------------------------------------------------------.
- * | Esc    | Ctrl L | Up     | Ctrl R | RGB RMD| RGB HD | RGB HI | RGB_TG | PtSn   | ScLk   | Pause  | DVORAK |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Tab    | Left   | Down   | Right  | RGB MD | RGB SD | RGB SI | COLEMAK| Insert | Home   | PgUp   | Term   |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | ShTab  | Alt L  | IJ Omni| Alt R  |        | RGB VD | RGB VI |        | ScLk   | End    | PgDn   | QWERTY |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------'
- */
- [nal] = LAYOUT_ortho_4x12( \
-   UK_ESC,  _C_LEFT, UK_UP,   _C_RGHT, RGB_RMOD,RGB_HUD, RGB_HUI, RGB_TOG, UK_PSCR, UK_SLCK, UK_PAUS, DF(dv), \
-   UK_TAB,  UK_LEFT, UK_DOWN, UK_RGHT, RGB_MOD, RGB_SAD, RGB_SAI, DF(cm),  UK_INS,  UK_HOME, UK_PGUP, _TERM, \
-   _S_TAB,  _A_LEFT, IJ_OMN,  __NAL,   _______, RGB_VAD, RGB_VAI, _______, UK_SLCK, UK_END,  UK_PGDN, DF(qw), \
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
- ),
- [nar] = LAYOUT_ortho_4x12( \
-   UK_ESC,  _C_LEFT, UK_UP,   _C_RGHT, RGB_RMOD,RGB_HUD, RGB_HUI, RGB_TOG, UK_PSCR, UK_SLCK, UK_PAUS, DF(dv), \
-   UK_TAB,  UK_LEFT, UK_DOWN, UK_RGHT, RGB_MOD, RGB_SAD, RGB_SAI, DF(cm),  UK_INS,  UK_HOME, UK_PGUP, _TERM, \
-   _S_TAB,  _A_LEFT, IJ_OMN,  _A_RGHT, _______, RGB_VAD, RGB_VAI, _______, __NAR,   UK_END,  UK_PGDN, DF(qw), \
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
- ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-      case IJ_OMN:
-        SEND_STRING(SS_TAP(X_LSHIFT)SS_TAP(X_LSHIFT));
-        return false;
-    }
-  }
-  return true;
-}
diff --git a/keyboards/jj40/keymaps/suzuken/config.h b/keyboards/jj40/keymaps/suzuken/config.h
deleted file mode 100644
index b1d74e1e69..0000000000
--- a/keyboards/jj40/keymaps/suzuken/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 300
-
-#endif
diff --git a/keyboards/jj40/keymaps/suzuken/keymap.c b/keyboards/jj40/keymaps/suzuken/keymap.c
deleted file mode 100644
index 269e26cd76..0000000000
--- a/keyboards/jj40/keymaps/suzuken/keymap.c
+++ /dev/null
@@ -1,99 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum jj40_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _FUNC
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  FUNC
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  ;:  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  |  '"  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Fn  | Ctrl | Alt  | GUI  |Space |Lower |Raise |Space | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12( \
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT, \
-  MO(_FUNC), KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,  MO(_LOWER),  MO(_RAISE),  KC_SPC,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = 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_BSPC, \
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_ENT, \
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______, _______, _______, KC_PIPE, \
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12( \
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_ENT, \
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, KC_BSLS, \
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-),
-
-/* Functions
- *  Note: Terminal uses Calculator shortcut, change your OS keyboard shortcut appropriately.
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | RGB  | RGB  | RGB  | RGB  |  BL  |  BL  |  BL  |      |      |      |      |
- * |      | Togl | Hue+ | Sat+ | Brt+ | Togl |Breath| Brt+ |      |      |      |VolUp |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      | RGB  | RGB  | RGB  | WWW  | WWW  |  BL  |      |      |      |      |
- * |      | Term | Hue- | Sat- | Brt- | Back | Fwd  | Brt- |      |      |PrScr |VolDn |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |||||||| RGB  |      |      |      |      |      |      |      |      |      |
- * |      |||Fn||| Mode |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] = LAYOUT_ortho_4x12( \
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-    _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_BRTG, BL_INC,  _______, _______, _______, KC_VOLU, \
-    _______, KC_CALC, RGB_HUD, RGB_SAD, RGB_VAD, KC_WBAK, KC_WFWD, BL_DEC,  _______, _______, KC_PSCR, KC_VOLD, \
-    _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
-)
-};
-
-// Loop
-void matrix_scan_user(void) {
-    // Empty
-};
diff --git a/keyboards/jj40/keymaps/waples/README.md b/keyboards/jj40/keymaps/waples/README.md
deleted file mode 100644
index 3394971b96..0000000000
--- a/keyboards/jj40/keymaps/waples/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Waples jj40 keymap
-> based heavily on my lets split
-[Waples](https://www.github.com/Waples)
-
-### Layers
-I currently have the following layers in my keymap:
-* Qwerty 	(as default)
-* Dvorak	(still learning this type of layout, so not really used much)
-* Gaming	(WIP! I tried some I found, but didn't like them, so I'm in the progress of making my own)
-* Lefty		(lower)
-* Righty	(raise)
-* Dual		(adjust)
-
-#### QWERTY
-	| Tab |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | Bsp |
-	|C_Esc|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |S_Ent|
-	| Sft |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  "  |
-	|P_SCR| GUI | Alt | Cps | ^L^ | Bsp | Spc | ^R^ | Lft | Dwn | Up! | Rgt |
-
-
-#### DVORAK
-	| Tab |  "  |  ,  |  .  |  P  |  Y  |  F  |  G  |  C  |  R  |  L  | Bsp |
- 	|C_Esc|  A  |  O  |  E  |  U  |  I  |  D  |  H  |  T  |  N  |  S  |S_Ent|
-	| Sft |  ;  |  Q  |  J  |  K  |  X  |  B  |  M  |  W  |  V  |  Z  |  /  |
-	|P_SCR| GUI | Alt | Cps | ^L^ | Bsp | Spc | ^R^ | Lft | Dwn | Up! | Rgt |
-
-
-#### GAMING
-	| Tab |  Q  |  W  |  E  |  R  |  T  |     |     |     |     |     |QWERT|
-	| Esc |  A  |  S  |  D  |  F  |  G  |     |     |     |     |     |     |
-	| Sft |  Z  |  X  |  C  |  V  |  B  |     |     |     |     |     |     |
-	| Ctl |  1  |  2  |  3  | ^L^ | Spc | Bsp | ^R^ | Lft | Dwn | Up  | Rgt |
-
-
-#### LEFTY	(lower)
-	|  ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  | Bsp |
-	| Del |     |     |     |     |     |     |  (  |  )  |  [  |  ]  |     |
-	|     |     |     |     |     |     |     |     |     |     |     |     |
-	|     |     |     |     |     |     | Ins |     | Hme | PgD | PgU | End |
-
-
-#### RIGHTY	(raise)
-	|  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | Bsp |
-	| Del | F1  | F2  | F3  | F4  |     |  =  |  -  |  \  |  /  |     |     |
-	|     | F5  | F6  | F7  | F8  |     |     |     |     |     |     |     |
- 	|     | F9  | F10 | F11 |     |     |     |     |     |     |     |     |
-
-
-#### DUAL
-	|Reset|     |     |     |     |QWERT| GAME|     |     |     |     |Reset|
-	|     | Prv | Stp | Tog | Nxt | Nrm | Swp |     |     |     |     |     |
-	|     |     | Mte | Vol-| Vol+|     | NKRO|     |     |     |     |     |
-	|     |     |     |     |     |     |DVORK|     |     |     |     |     |
-
-
diff --git a/keyboards/jj40/keymaps/waples/config.h b/keyboards/jj40/keymaps/waples/config.h
deleted file mode 100644
index b1d74e1e69..0000000000
--- a/keyboards/jj40/keymaps/waples/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 300
-
-#endif
diff --git a/keyboards/jj40/keymaps/waples/keymap.c b/keyboards/jj40/keymaps/waples/keymap.c
deleted file mode 100644
index 79acada28c..0000000000
--- a/keyboards/jj40/keymaps/waples/keymap.c
+++ /dev/null
@@ -1,130 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _DVORAK 1
-#define _GAME 2
-#define _LEFTY 3
-#define _RIGHTY 4
-#define _DUAL 5
-
-enum jj40_keycodes {
-  QWERTY = SAFE_RANGE,
-  DVORAK,
-  GAME,
-  LEFTY,
-  RIGHTY,
-  DUAL,
-};
-
-#define TG_NKRO MAGIC_TOGGLE_NKRO     // Toggle NKRO
-#define CTLESC MT(MOD_LCTL, KC_ESC)    // Hold for left Ctrl, tap for Esc
-#define SHFTENT MT(MOD_RSFT, KC_ENT)    // Hold for right Shift, tap for Enter
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT_ortho_4x12( \
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_BSPC, \
-  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,  KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, SHFTENT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,    KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT, \
-  KC_PSCR, KC_BSPC, KC_LALT, _______, LEFTY, KC_LGUI, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-),
-
-[_DVORAK] = 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,  KC_BSPC, \
-  CTLESC,  KC_A,    KC_O,    KC_E,    KC_U,  KC_I,    KC_D,   KC_H,   KC_T,    KC_N,    KC_S,  SHFTENT, \
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,  KC_X,    KC_B,   KC_M,   KC_W,    KC_V,    KC_Z,  KC_SLSH, \
-  KC_PSCR, KC_LGUI, KC_LALT, KC_CAPS, LEFTY, KC_BSPC, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
-),
-
-[_GAME] = LAYOUT_ortho_4x12( \
-  KC_TAB,  KC_Q, KC_W, KC_E, KC_R,  KC_T,   _______, _______, _______, _______, _______, QWERTY, \
-  CTLESC,  KC_A, KC_S, KC_D, KC_F,  KC_G,   _______, _______, _______, _______, _______, _______, \
-  KC_LSFT, KC_Z, KC_X, KC_C, KC_V,  KC_B,   _______, _______, _______, _______, _______, _______, \
-  KC_LCTL, KC_1, KC_2, KC_3, LEFTY, KC_SPC, KC_BSPC, RIGHTY,   KC_LEFT, KC_DOWN,   KC_UP, KC_RIGHT \
-),
-
-[_LEFTY] = 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_BSPC, \
-  KC_DEL,  _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, KC_INS,  _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END \
-),
-
-[_RIGHTY] = LAYOUT_ortho_4x12( \
-  KC_GRV,  KC_1,  KC_2,   KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-  KC_DEL,  KC_F1, KC_F2,  KC_F3,  KC_F4,   _______, KC_EQL,  KC_MINS, KC_BSLS, KC_SLSH, _______, _______, \
-  _______, KC_F5, KC_F6,  KC_F7,  KC_F8,   _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, _______, _______ \
-),
-
-[_DUAL] =  LAYOUT_ortho_4x12( \
-  RESET,   _______, _______, _______, _______, QWERTY,  GAME,    _______, _______, _______, BL_BRTG, RESET, \
-  _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, AG_NORM, AG_SWAP, _______, _______, _______, BL_TOGG, _______, \
-  _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, TG_NKRO, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, DVORAK,  _______, _______, _______, _______, _______ \
-)
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case GAME:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_GAME);
-      }
-      return false;
-      break;
-    case LEFTY:
-      if (record->event.pressed) {
-        layer_on(_LEFTY);
-        update_tri_layer(_LEFTY, _RIGHTY, _DUAL);
-      } else {
-        layer_off(_LEFTY);
-        update_tri_layer(_LEFTY, _RIGHTY, _DUAL);
-      }
-      return false;
-      break;
-    case RIGHTY:
-      if (record->event.pressed) {
-        layer_on(_RIGHTY);
-        update_tri_layer(_LEFTY, _RIGHTY, _DUAL);
-      } else {
-        layer_off(_RIGHTY);
-        update_tri_layer(_LEFTY, _RIGHTY, _DUAL);
-      }
-      return false;
-      break;
-    case DUAL:
-      if (record->event.pressed) {
-        layer_on(_DUAL);
-      } else {
-        layer_off(_DUAL);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/jj40/keymaps/waples/rules.mk b/keyboards/jj40/keymaps/waples/rules.mk
deleted file mode 100644
index 18c5638d00..0000000000
--- a/keyboards/jj40/keymaps/waples/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# build options
-BOOTMAGIC_ENABLE = yes
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-BACKLIGHT_CUSTOM_DRIVER = yes
-RGBLIGHT_ENABLE = yes
-RGBLIGHT_CUSTOM_DRIVER = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/jj40/matrix.c b/keyboards/jj40/matrix.c
deleted file mode 100644
index 245813dfd2..0000000000
--- a/keyboards/jj40/matrix.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-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 <avr/io.h>
-#include <util/delay.h>
-
-#include "matrix.h"
-
-#ifndef DEBOUNCE
-#   define DEBOUNCE	5
-#endif
-
-static uint8_t debouncing = DEBOUNCE;
-
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-
-void matrix_set_row_status(uint8_t row);
-uint8_t bit_reverse(uint8_t x);
-
-void matrix_init(void) {
-    // all outputs for rows high
-    DDRB = 0xFF;
-    PORTB = 0xFF;
-    // all inputs for columns
-    DDRA = 0x00;
-    DDRC &= ~(0x111111<<2);
-    DDRD &= ~(1<<PIND7);
-    // all columns are pulled-up
-    PORTA = 0xFF;
-    PORTC |= (0b111111<<2);
-    PORTD |= (1<<PIND7);
-
-    // initialize matrix state: all keys off
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        matrix[row] = 0x00;
-        matrix_debouncing[row] = 0x00;
-    }
-
-    matrix_init_quantum();
-}
-
-uint8_t matrix_scan(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        matrix_set_row_status(row);
-        _delay_us(5);
-
-        matrix_row_t cols = (
-            // cols 0..7, PORTA 0 -> 7
-            (~PINA) & 0xFF
-        ) | (
-            // cols 8..13, PORTC 7 -> 0
-            bit_reverse((~PINC) & 0xFF) << 8
-        ) | (
-            // col 14, PORTD 7
-            ((~PIND) & (1 << PIND7)) << 7
-        );
-
-        if (matrix_debouncing[row] != cols) {
-            matrix_debouncing[row] = cols;
-            debouncing = DEBOUNCE;
-        }
-    }
-
-    if (debouncing) {
-        if (--debouncing) {
-            _delay_ms(1);
-        } else {
-            for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-                matrix[i] = matrix_debouncing[i];
-            }
-        }
-    }
-
-    matrix_scan_quantum();
-
-    return 1;
-}
-
-// declarations
-void matrix_set_row_status(uint8_t row) {
-    DDRB = (1 << row);
-    PORTB = ~(1 << row);
-}
-
-uint8_t bit_reverse(uint8_t x) {
-    x = ((x >> 1) & 0x55) | ((x << 1) & 0xaa);
-    x = ((x >> 2) & 0x33) | ((x << 2) & 0xcc);
-    x = ((x >> 4) & 0x0f) | ((x << 4) & 0xf0);
-    return x;
-}
-
-inline matrix_row_t matrix_get_row(uint8_t row) {
-    return matrix[row];
-}
-
-void matrix_print(void) {
-}
diff --git a/keyboards/jj40/rules.mk b/keyboards/jj40/rules.mk
deleted file mode 100644
index 697e17a014..0000000000
--- a/keyboards/jj40/rules.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-#
-# 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/>.
-
-# MCU name
-MCU = atmega32a
-PROTOCOL = VUSB
-
-# unsupported features for now
-NO_UART = yes
-NO_SUSPEND_POWER_DOWN = yes
-
-# processor frequency
-F_CPU = 12000000
-
-# Bootloader
-#     This definition is optional, and if your keyboard supports multiple bootloaders of
-#     different sizes, comment this out, and the correct address will be loaded
-#     automatically (+60). See bootloader.mk for all options.
-BOOTLOADER = bootloadHID
-
-# build options
-BOOTMAGIC_ENABLE = no
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = yes
-
-BACKLIGHT_ENABLE = yes
-BACKLIGHT_CUSTOM_DRIVER = yes
-
-RGBLIGHT_ENABLE = yes
-RGBLIGHT_CUSTOM_DRIVER = yes
-
-KEY_LOCK_ENABLE = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-OPT_DEFS = -DDEBUG_LEVEL=0
-
-# custom matrix setup
-CUSTOM_MATRIX = yes
-SRC = matrix.c i2c.c backlight.c
-
-# programming options
-PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
-
-LAYOUTS = ortho_4x12 planck_mit
diff --git a/keyboards/jj40/usbconfig.h b/keyboards/jj40/usbconfig.h
deleted file mode 100644
index ad97e7f0a3..0000000000
--- a/keyboards/jj40/usbconfig.h
+++ /dev/null
@@ -1,397 +0,0 @@
-/* Name: usbconfig.h
- * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
- * Author: Christian Starkjohann
- * Creation Date: 2005-04-01
- * Tabsize: 4
- * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
- * This Revision: $Id: usbconfig-prototype.h 785 2010-05-30 17:57:07Z cs $
- */
-
-#ifndef __usbconfig_h_included__
-#define __usbconfig_h_included__
-
-#include "config.h"
-
-/*
-General Description:
-This file is an example configuration (with inline documentation) for the USB
-driver. It configures V-USB for USB D+ connected to Port D bit 2 (which is
-also hardware interrupt 0 on many devices) and USB D- to Port D bit 4. You may
-wire the lines to any other port, as long as D+ is also wired to INT0 (or any
-other hardware interrupt, as long as it is the highest level interrupt, see
-section at the end of this file).
-*/
-
-/* ---------------------------- Hardware Config ---------------------------- */
-
-#define USB_CFG_IOPORTNAME      D
-/* This is the port where the USB bus is connected. When you configure it to
- * "B", the registers PORTB, PINB and DDRB will be used.
- */
-#define USB_CFG_DMINUS_BIT      3
-/* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected.
- * This may be any bit in the port.
- */
-#define USB_CFG_DPLUS_BIT       2
-/* This is the bit number in USB_CFG_IOPORT where the USB D+ line is connected.
- * This may be any bit in the port. Please note that D+ must also be connected
- * to interrupt pin INT0! [You can also use other interrupts, see section
- * "Optional MCU Description" below, or you can connect D- to the interrupt, as
- * it is required if you use the USB_COUNT_SOF feature. If you use D- for the
- * interrupt, the USB interrupt will also be triggered at Start-Of-Frame
- * markers every millisecond.]
- */
-#define USB_CFG_CLOCK_KHZ       (F_CPU/1000)
-/* Clock rate of the AVR in kHz. Legal values are 12000, 12800, 15000, 16000,
- * 16500, 18000 and 20000. The 12.8 MHz and 16.5 MHz versions of the code
- * require no crystal, they tolerate +/- 1% deviation from the nominal
- * frequency. All other rates require a precision of 2000 ppm and thus a
- * crystal!
- * Since F_CPU should be defined to your actual clock rate anyway, you should
- * not need to modify this setting.
- */
-#define USB_CFG_CHECK_CRC       0
-/* Define this to 1 if you want that the driver checks integrity of incoming
- * data packets (CRC checks). CRC checks cost quite a bit of code size and are
- * currently only available for 18 MHz crystal clock. You must choose
- * USB_CFG_CLOCK_KHZ = 18000 if you enable this option.
- */
-
-/* ----------------------- Optional Hardware Config ------------------------ */
-
-/* #define USB_CFG_PULLUP_IOPORTNAME   D */
-/* If you connect the 1.5k pullup resistor from D- to a port pin instead of
- * V+, you can connect and disconnect the device from firmware by calling
- * the macros usbDeviceConnect() and usbDeviceDisconnect() (see usbdrv.h).
- * This constant defines the port on which the pullup resistor is connected.
- */
-/* #define USB_CFG_PULLUP_BIT          4 */
-/* This constant defines the bit number in USB_CFG_PULLUP_IOPORT (defined
- * above) where the 1.5k pullup resistor is connected. See description
- * above for details.
- */
-
-/* --------------------------- Functional Range ---------------------------- */
-
-#define USB_CFG_HAVE_INTRIN_ENDPOINT    1
-/* Define this to 1 if you want to compile a version with two endpoints: The
- * default control endpoint 0 and an interrupt-in endpoint (any other endpoint
- * number).
- */
-#define USB_CFG_HAVE_INTRIN_ENDPOINT3   1
-/* Define this to 1 if you want to compile a version with three endpoints: The
- * default control endpoint 0, an interrupt-in endpoint 3 (or the number
- * configured below) and a catch-all default interrupt-in endpoint as above.
- * You must also define USB_CFG_HAVE_INTRIN_ENDPOINT to 1 for this feature.
- */
-#define USB_CFG_EP3_NUMBER              3
-/* If the so-called endpoint 3 is used, it can now be configured to any other
- * endpoint number (except 0) with this macro. Default if undefined is 3.
- */
-/* #define USB_INITIAL_DATATOKEN           USBPID_DATA1 */
-/* The above macro defines the startup condition for data toggling on the
- * interrupt/bulk endpoints 1 and 3. Defaults to USBPID_DATA1.
- * Since the token is toggled BEFORE sending any data, the first packet is
- * sent with the oposite value of this configuration!
- */
-#define USB_CFG_IMPLEMENT_HALT          0
-/* Define this to 1 if you also want to implement the ENDPOINT_HALT feature
- * for endpoint 1 (interrupt endpoint). Although you may not need this feature,
- * it is required by the standard. We have made it a config option because it
- * bloats the code considerably.
- */
-#define USB_CFG_SUPPRESS_INTR_CODE      0
-/* Define this to 1 if you want to declare interrupt-in endpoints, but don't
- * want to send any data over them. If this macro is defined to 1, functions
- * usbSetInterrupt() and usbSetInterrupt3() are omitted. This is useful if
- * you need the interrupt-in endpoints in order to comply to an interface
- * (e.g. HID), but never want to send any data. This option saves a couple
- * of bytes in flash memory and the transmit buffers in RAM.
- */
-#define USB_CFG_INTR_POLL_INTERVAL      1
-/* If you compile a version with endpoint 1 (interrupt-in), this is the poll
- * interval. The value is in milliseconds and must not be less than 10 ms for
- * low speed devices.
- */
-#define USB_CFG_IS_SELF_POWERED         0
-/* Define this to 1 if the device has its own power supply. Set it to 0 if the
- * device is powered from the USB bus.
- */
-// max power draw with maxed white underglow measured at 120 mA (peaks)
-#define USB_CFG_MAX_BUS_POWER           100
-/* Set this variable to the maximum USB bus power consumption of your device.
- * The value is in milliamperes. [It will be divided by two since USB
- * communicates power requirements in units of 2 mA.]
- */
-#define USB_CFG_IMPLEMENT_FN_WRITE      1
-/* Set this to 1 if you want usbFunctionWrite() to be called for control-out
- * transfers. Set it to 0 if you don't need it and want to save a couple of
- * bytes.
- */
-#define USB_CFG_IMPLEMENT_FN_READ       0
-/* Set this to 1 if you need to send control replies which are generated
- * "on the fly" when usbFunctionRead() is called. If you only want to send
- * data from a static buffer, set it to 0 and return the data from
- * usbFunctionSetup(). This saves a couple of bytes.
- */
-#define USB_CFG_IMPLEMENT_FN_WRITEOUT   0
-/* Define this to 1 if you want to use interrupt-out (or bulk out) endpoints.
- * You must implement the function usbFunctionWriteOut() which receives all
- * interrupt/bulk data sent to any endpoint other than 0. The endpoint number
- * can be found in 'usbRxToken'.
- */
-#define USB_CFG_HAVE_FLOWCONTROL        0
-/* Define this to 1 if you want flowcontrol over USB data. See the definition
- * of the macros usbDisableAllRequests() and usbEnableAllRequests() in
- * usbdrv.h.
- */
-#define USB_CFG_DRIVER_FLASH_PAGE       0
-/* If the device has more than 64 kBytes of flash, define this to the 64 k page
- * where the driver's constants (descriptors) are located. Or in other words:
- * Define this to 1 for boot loaders on the ATMega128.
- */
-#define USB_CFG_LONG_TRANSFERS          0
-/* Define this to 1 if you want to send/receive blocks of more than 254 bytes
- * in a single control-in or control-out transfer. Note that the capability
- * for long transfers increases the driver size.
- */
-/* #define USB_RX_USER_HOOK(data, len)     if(usbRxToken == (uchar)USBPID_SETUP) blinkLED(); */
-/* This macro is a hook if you want to do unconventional things. If it is
- * defined, it's inserted at the beginning of received message processing.
- * If you eat the received message and don't want default processing to
- * proceed, do a return after doing your things. One possible application
- * (besides debugging) is to flash a status LED on each packet.
- */
-/* #define USB_RESET_HOOK(resetStarts)     if(!resetStarts){hadUsbReset();} */
-/* This macro is a hook if you need to know when an USB RESET occurs. It has
- * one parameter which distinguishes between the start of RESET state and its
- * end.
- */
-/* #define USB_SET_ADDRESS_HOOK()              hadAddressAssigned(); */
-/* This macro (if defined) is executed when a USB SET_ADDRESS request was
- * received.
- */
-#define USB_COUNT_SOF                   1
-/* define this macro to 1 if you need the global variable "usbSofCount" which
- * counts SOF packets. This feature requires that the hardware interrupt is
- * connected to D- instead of D+.
- */
-/* #ifdef __ASSEMBLER__
- * macro myAssemblerMacro
- *     in      YL, TCNT0
- *     sts     timer0Snapshot, YL
- *     endm
- * #endif
- * #define USB_SOF_HOOK                    myAssemblerMacro
- * This macro (if defined) is executed in the assembler module when a
- * Start Of Frame condition is detected. It is recommended to define it to
- * the name of an assembler macro which is defined here as well so that more
- * than one assembler instruction can be used. The macro may use the register
- * YL and modify SREG. If it lasts longer than a couple of cycles, USB messages
- * immediately after an SOF pulse may be lost and must be retried by the host.
- * What can you do with this hook? Since the SOF signal occurs exactly every
- * 1 ms (unless the host is in sleep mode), you can use it to tune OSCCAL in
- * designs running on the internal RC oscillator.
- * Please note that Start Of Frame detection works only if D- is wired to the
- * interrupt, not D+. THIS IS DIFFERENT THAN MOST EXAMPLES!
- */
-#define USB_CFG_CHECK_DATA_TOGGLING     0
-/* define this macro to 1 if you want to filter out duplicate data packets
- * sent by the host. Duplicates occur only as a consequence of communication
- * errors, when the host does not receive an ACK. Please note that you need to
- * implement the filtering yourself in usbFunctionWriteOut() and
- * usbFunctionWrite(). Use the global usbCurrentDataToken and a static variable
- * for each control- and out-endpoint to check for duplicate packets.
- */
-#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH   0
-/* define this macro to 1 if you want the function usbMeasureFrameLength()
- * compiled in. This function can be used to calibrate the AVR's RC oscillator.
- */
-#define USB_USE_FAST_CRC                0
-/* The assembler module has two implementations for the CRC algorithm. One is
- * faster, the other is smaller. This CRC routine is only used for transmitted
- * messages where timing is not critical. The faster routine needs 31 cycles
- * per byte while the smaller one needs 61 to 69 cycles. The faster routine
- * may be worth the 32 bytes bigger code size if you transmit lots of data and
- * run the AVR close to its limit.
- */
-
-/* -------------------------- Device Description --------------------------- */
-
-#define USB_CFG_VENDOR_ID       (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF)
-/* USB vendor ID for the device, low byte first. If you have registered your
- * own Vendor ID, define it here. Otherwise you may use one of obdev's free
- * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
- * *** IMPORTANT NOTE ***
- * This template uses obdev's shared VID/PID pair for Vendor Class devices
- * with libusb: 0x16c0/0x5dc.  Use this VID/PID pair ONLY if you understand
- * the implications!
- */
-#define USB_CFG_DEVICE_ID       (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF)
-/* This is the ID of the product, low byte first. It is interpreted in the
- * scope of the vendor ID. If you have registered your own VID with usb.org
- * or if you have licensed a PID from somebody else, define it here. Otherwise
- * you may use one of obdev's free shared VID/PID pairs. See the file
- * USB-IDs-for-free.txt for details!
- * *** IMPORTANT NOTE ***
- * This template uses obdev's shared VID/PID pair for Vendor Class devices
- * with libusb: 0x16c0/0x5dc.  Use this VID/PID pair ONLY if you understand
- * the implications!
- */
-#define USB_CFG_DEVICE_VERSION  0x00, 0x02
-/* Version number of the device: Minor number first, then major number.
- */
-#define USB_CFG_VENDOR_NAME     'w', 'i', 'n', 'k', 'e', 'y', 'l', 'e', 's', 's', '.', 'k', 'r'
-#define USB_CFG_VENDOR_NAME_LEN 13
-/* These two values define the vendor name returned by the USB device. The name
- * must be given as a list of characters under single quotes. The characters
- * are interpreted as Unicode (UTF-16) entities.
- * If you don't want a vendor name string, undefine these macros.
- * ALWAYS define a vendor name containing your Internet domain name if you use
- * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for
- * details.
- */
-#define USB_CFG_DEVICE_NAME     'j', 'j', '4', '0'
-#define USB_CFG_DEVICE_NAME_LEN 4
-/* Same as above for the device name. If you don't want a device name, undefine
- * the macros. See the file USB-IDs-for-free.txt before you assign a name if
- * you use a shared VID/PID.
- */
-/*#define USB_CFG_SERIAL_NUMBER   'N', 'o', 'n', 'e' */
-/*#define USB_CFG_SERIAL_NUMBER_LEN   0 */
-/* Same as above for the serial number. If you don't want a serial number,
- * undefine the macros.
- * It may be useful to provide the serial number through other means than at
- * compile time. See the section about descriptor properties below for how
- * to fine tune control over USB descriptors such as the string descriptor
- * for the serial number.
- */
-#define USB_CFG_DEVICE_CLASS        0
-#define USB_CFG_DEVICE_SUBCLASS     0
-/* See USB specification if you want to conform to an existing device class.
- * Class 0xff is "vendor specific".
- */
-#define USB_CFG_INTERFACE_CLASS     3   /* HID */
-#define USB_CFG_INTERFACE_SUBCLASS  1   /* Boot */
-#define USB_CFG_INTERFACE_PROTOCOL  1   /* Keyboard */
-/* See USB specification if you want to conform to an existing device class or
- * protocol. The following classes must be set at interface level:
- * HID class is 3, no subclass and protocol required (but may be useful!)
- * CDC class is 2, use subclass 2 and protocol 1 for ACM
- */
-#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH    0
-/* Define this to the length of the HID report descriptor, if you implement
- * an HID device. Otherwise don't define it or define it to 0.
- * If you use this define, you must add a PROGMEM character array named
- * "usbHidReportDescriptor" to your code which contains the report descriptor.
- * Don't forget to keep the array and this define in sync!
- */
-
-/* #define USB_PUBLIC static */
-/* Use the define above if you #include usbdrv.c instead of linking against it.
- * This technique saves a couple of bytes in flash memory.
- */
-
-/* ------------------- Fine Control over USB Descriptors ------------------- */
-/* If you don't want to use the driver's default USB descriptors, you can
- * provide our own. These can be provided as (1) fixed length static data in
- * flash memory, (2) fixed length static data in RAM or (3) dynamically at
- * runtime in the function usbFunctionDescriptor(). See usbdrv.h for more
- * information about this function.
- * Descriptor handling is configured through the descriptor's properties. If
- * no properties are defined or if they are 0, the default descriptor is used.
- * Possible properties are:
- *   + USB_PROP_IS_DYNAMIC: The data for the descriptor should be fetched
- *     at runtime via usbFunctionDescriptor(). If the usbMsgPtr mechanism is
- *     used, the data is in FLASH by default. Add property USB_PROP_IS_RAM if
- *     you want RAM pointers.
- *   + USB_PROP_IS_RAM: The data returned by usbFunctionDescriptor() or found
- *     in static memory is in RAM, not in flash memory.
- *   + USB_PROP_LENGTH(len): If the data is in static memory (RAM or flash),
- *     the driver must know the descriptor's length. The descriptor itself is
- *     found at the address of a well known identifier (see below).
- * List of static descriptor names (must be declared PROGMEM if in flash):
- *   char usbDescriptorDevice[];
- *   char usbDescriptorConfiguration[];
- *   char usbDescriptorHidReport[];
- *   char usbDescriptorString0[];
- *   int usbDescriptorStringVendor[];
- *   int usbDescriptorStringDevice[];
- *   int usbDescriptorStringSerialNumber[];
- * Other descriptors can't be provided statically, they must be provided
- * dynamically at runtime.
- *
- * Descriptor properties are or-ed or added together, e.g.:
- * #define USB_CFG_DESCR_PROPS_DEVICE   (USB_PROP_IS_RAM | USB_PROP_LENGTH(18))
- *
- * The following descriptors are defined:
- *   USB_CFG_DESCR_PROPS_DEVICE
- *   USB_CFG_DESCR_PROPS_CONFIGURATION
- *   USB_CFG_DESCR_PROPS_STRINGS
- *   USB_CFG_DESCR_PROPS_STRING_0
- *   USB_CFG_DESCR_PROPS_STRING_VENDOR
- *   USB_CFG_DESCR_PROPS_STRING_PRODUCT
- *   USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER
- *   USB_CFG_DESCR_PROPS_HID
- *   USB_CFG_DESCR_PROPS_HID_REPORT
- *   USB_CFG_DESCR_PROPS_UNKNOWN (for all descriptors not handled by the driver)
- *
- * Note about string descriptors: String descriptors are not just strings, they
- * are Unicode strings prefixed with a 2 byte header. Example:
- * int  serialNumberDescriptor[] = {
- *     USB_STRING_DESCRIPTOR_HEADER(6),
- *     'S', 'e', 'r', 'i', 'a', 'l'
- * };
- */
-
-#define USB_CFG_DESCR_PROPS_DEVICE                  0
-#define USB_CFG_DESCR_PROPS_CONFIGURATION           USB_PROP_IS_DYNAMIC
-//#define USB_CFG_DESCR_PROPS_CONFIGURATION           0
-#define USB_CFG_DESCR_PROPS_STRINGS                 0
-#define USB_CFG_DESCR_PROPS_STRING_0                0
-#define USB_CFG_DESCR_PROPS_STRING_VENDOR           0
-#define USB_CFG_DESCR_PROPS_STRING_PRODUCT          0
-#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER    0
-#define USB_CFG_DESCR_PROPS_HID                     USB_PROP_IS_DYNAMIC
-//#define USB_CFG_DESCR_PROPS_HID                     0
-#define USB_CFG_DESCR_PROPS_HID_REPORT              USB_PROP_IS_DYNAMIC
-//#define USB_CFG_DESCR_PROPS_HID_REPORT              0
-#define USB_CFG_DESCR_PROPS_UNKNOWN                 0
-
-#define usbMsgPtr_t unsigned short
-/* If usbMsgPtr_t is not defined, it defaults to 'uchar *'. We define it to
- * a scalar type here because gcc generates slightly shorter code for scalar
- * arithmetics than for pointer arithmetics. Remove this define for backward
- * type compatibility or define it to an 8 bit type if you use data in RAM only
- * and all RAM is below 256 bytes (tiny memory model in IAR CC).
- */
-
-/* ----------------------- Optional MCU Description ------------------------ */
-
-/* The following configurations have working defaults in usbdrv.h. You
- * usually don't need to set them explicitly. Only if you want to run
- * the driver on a device which is not yet supported or with a compiler
- * which is not fully supported (such as IAR C) or if you use a differnt
- * interrupt than INT0, you may have to define some of these.
- */
-/* #define USB_INTR_CFG            MCUCR */
-/* #define USB_INTR_CFG_SET        ((1 << ISC00) | (1 << ISC01)) */
-/* #define USB_INTR_CFG_CLR        0 */
-/* #define USB_INTR_ENABLE         GIMSK */
-/* #define USB_INTR_ENABLE_BIT     INT0 */
-/* #define USB_INTR_PENDING        GIFR */
-/* #define USB_INTR_PENDING_BIT    INTF0 */
-/* #define USB_INTR_VECTOR         INT0_vect */
-
-/* Set INT1 for D- falling edge to count SOF */
-/* #define USB_INTR_CFG            EICRA */
-#define USB_INTR_CFG_SET        ((1 << ISC11) | (0 << ISC10))
-/* #define USB_INTR_CFG_CLR        0 */
-/* #define USB_INTR_ENABLE         EIMSK */
-#define USB_INTR_ENABLE_BIT     INT1
-/* #define USB_INTR_PENDING        EIFR */
-#define USB_INTR_PENDING_BIT    INTF1
-#define USB_INTR_VECTOR         INT1_vect
-
-#endif /* __usbconfig_h_included__ */