diff --git a/keyboards/georgi/keymaps/template/keymap.c b/keyboards/georgi/keymaps/template/keymap.c
deleted file mode 100644
index b17d7ed9f7e4..000000000000
--- a/keyboards/georgi/keymaps/template/keymap.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* 
- * Good on you for modifying your layout, this is the most nonQMK layout you will come across
- * There are three modes, Steno (the default), QWERTY (Toggleable) and a Momentary symbol layer
- *
- * Don't modify the steno layer directly, instead add chords using the keycodes and macros
- * from sten.h to the layout you want to modify.
- *
- * Observe the comment above processQWERTY!
- *
- * http://docs.gboards.ca
- */
-
-#include QMK_KEYBOARD_H
-#include "sten.h"
-#include "keymap_steno.h"
-#define IGNORE_MOD_TAP_INTERRUPT
-
-int getKeymapCount(void);
-
-// Proper Layers
-#define FUNCT   (LSD | LK | LP | LH)
-#define MEDIA   (LSD | LK | LW | LR)
-#define MOVE    (ST1 | ST2)
-
-/* Keyboard Layout
- * ,---------------------------------.    ,------------------------------.
- * | FN  | LSU | LFT | LP | LH | ST1 |    | ST3 | RF | RP | RL | RT | RD |
- * |-----+-----+-----+----+----|-----|    |-----|----+----+----+----+----|
- * | PWR | LSD | LK  | LW | LR | ST2 |    | ST4 | RR | RG | RB | RS | RZ |
- * `---------------------------------'    `------------------------------'
- *                   ,---------------,    .---------------.
- *                   | NUM | LA | LO |    | RE | RU | NUM |
- *                   `---------------'    `---------------'
- */
-
-// YOU MUST ORDER THIS!
-// P   Will return from processing on the first match it finds. Therefore
-// PJ  Will run the requested action, remove the matched chord and continue 
-//
-// First any chords that would conflict with PJs need to be checked, then PJs, lastly Ps.
-// For all chords should be ordered by length in their section!
-//
-// http://docs.gboards.ca
-bool processQwerty(void) {
-	// Place P's that would be trashed by PJ's here
-	P( RT  | RS  | RD  | RZ | NUM,		SEND_STRING(VERSION); SEND_STRING(__DATE__));
-	P( NUM | LA  | LO  | RE | RU,		SEND(KC_MPLY));
-	P( ST1 | ST2 | ST3 | ST4,			SEND(KC_BSPC));
-
-	// Thumb Chords
-	P(  LA  | LO  | RE  | RU,			SEND(KC_CAPS));
-	P(  LA  | RU,						SEND(KC_ESC));
-	PJ( LO  | RE,						SEND(KC_LCTL));
-	PJ( NUM | LA | RU,					SEND(KC_LCTL); SEND(KC_LSFT));
-	PJ( NUM | LA | RE,					SEND(KC_LCTL); SEND(KC_LSFT); SEND(KC_LALT));
-	
-	// Mods 
-	PJ( RT | RD | RS | RZ,				SEND(KC_LGUI));
-	PJ( RT | RD,						SEND(KC_LCTL));
-	PJ( RS | RZ,						SEND(KC_LALT));
-	PJ( LA | NUM,						SEND(KC_LCTL));
-	PJ( LA | LO,						SEND(KC_LALT));
-	PJ( LO,								SEND(KC_LSFT));
-
-	// Function Layer 
-	P( FUNCT | RF | RR,					SEND(KC_F5));
-	P( FUNCT | RP | RB,					SEND(KC_F6));
-	P( FUNCT | RL | RG,					SEND(KC_F7));
-	P( FUNCT | RT | RS,					SEND(KC_F8));
-	P( FUNCT | RF,						SEND(KC_F1));
-	P( FUNCT | RP,						SEND(KC_F2));
-	P( FUNCT | RL,						SEND(KC_F3));
-	P( FUNCT | RT,						SEND(KC_F4));
-	P( FUNCT | RR,						SEND(KC_F9));
-	P( FUNCT | RG,						SEND(KC_F10));
-	P( FUNCT | RB,						SEND(KC_F11));
-	P( FUNCT | RS,						SEND(KC_F12));
-
-	// Movement Layer
-	P( MOVE | RF,						SEND(KC_LEFT));
-	P( MOVE | RP,						SEND(KC_DOWN));
-	P( MOVE | RL,						SEND(KC_UP));
-	P( MOVE | RT,						SEND(KC_RIGHT));
-	P( MOVE | ST3,						SEND(KC_PGUP));
-	P( MOVE | ST4,						SEND(KC_PGDN));
-
-	// Media Layer
-	P( MEDIA | RF,						SEND(KC_MPRV));
-	P( MEDIA | RP,						SEND(KC_MPLY));
-	P( MEDIA | RL,						SEND(KC_MPLY));
-	P( MEDIA | RT,						SEND(KC_MNXT));
-	P( MEDIA | RD,						SEND(KC_VOLU));
-	P( MEDIA | RZ,						SEND(KC_VOLD));
-	P( MEDIA | RS,						SEND(KC_MUTE));
-
-	// Mouse Keys
-	P( LP | LH,							clickMouse(KC_MS_BTN1));
-	P( LW | LR,							clickMouse(KC_MS_BTN2));
-	
-	// Number Row
-	P( NUM | LSU,						SEND(KC_1));
-	P( NUM | LFT,						SEND(KC_2));
-	P( NUM | LP,						SEND(KC_3));
-	P( NUM | LH,						SEND(KC_4));
-	P( NUM | ST1,						SEND(KC_5));
-	P( NUM | ST3,						SEND(KC_6));
-	P( NUM | RF,						SEND(KC_7));
-	P( NUM | RP,						SEND(KC_8));
-	P( NUM | RL,						SEND(KC_9));
-	P( NUM | RT,						SEND(KC_0));
-	P( NUM | LA,						SEND(KC_5));
-	P( NUM | RT,						SEND(KC_0));
-	
-	// Specials
-	P( LA | NUM,						SEND(KC_ESC));
-	P( RU | NUM,						SEND(KC_TAB));
-	P( RE | RU,							SEND(KC_BSPC));
-	P( RD | RZ,							SEND(KC_ENT));
-	P( RE,								SEND(KC_ENT));
-	P( RD,								SEND(KC_BSPC));	
-	P( NUM,								SEND(KC_BSPC));
-	P( LA,								SEND(KC_SPC));
-	P( RU,								SEND(KC_SPC));
-	P( RZ,								SEND(KC_ESC));
-
-	// Letters
-	P( LSU | LSD,						SEND(KC_A));
-	P( LFT | LK,						SEND(KC_S));
-	P( LP  | LW,						SEND(KC_D));
-	P( LH  | LR,						SEND(KC_F));
-	P( ST1 | ST2,						SEND(KC_G));
-	P( ST3 | ST4,						SEND(KC_H));
-	P( RF  | RR,						SEND(KC_J));
-	P( RT  | RS,						SEND(KC_SCLN))
-	P( RG  | RL,						SEND(KC_L));
-	P( RP  | RB,						SEND(KC_K));
-	P( LSU,								SEND(KC_Q));
-	P( LSD,								SEND(KC_Z));
-	P( LFT,								SEND(KC_W));
-	P( LK,								SEND(KC_X));
-	P( LP,								SEND(KC_E));
-	P( LW,								SEND(KC_C));
-	P( LH,								SEND(KC_R));
-	P( LR,								SEND(KC_V));
-	P( ST1,								SEND(KC_T));
-	P( ST2,								SEND(KC_B));
-	P( ST3,								SEND(KC_Y));
-	P( ST4,								SEND(KC_N));
-	P( RF,								SEND(KC_U));
-	P( RR,								SEND(KC_M));
-	P( RP,								SEND(KC_I));
-	P( RB,								SEND(KC_COMM));
-	P( RL,								SEND(KC_O));
-	P( RG,								SEND(KC_DOT));
-	P( RT,								SEND(KC_P));
-	P( RS,								SEND(KC_SLSH));
-
-	// Symbols and Numbers
-	P( PWR | RE | RU,					SEND(KC_ENT));
-	P( PWR | LA | LO,					SEND(KC_SPC));
-	P( PWR | LP | LW,					SEND(KC_LSFT); SEND(KC_9));			// (
-	P( PWR | LH | LR,					SEND(KC_LSFT); SEND(KC_0));			// )
-	P( PWR | ST1 | ST2,					SEND(KC_GRV));						// `
-	P( PWR | RD | RZ,					SEND(KC_ESC));							
-	P( PWR | LSU | LSD,					SEND(KC_LSFT); SEND(KC_3));			// #
-	P( PWR | LFT | LK,					SEND(KC_LSFT); SEND(KC_4));			// $
-	P( PWR | LSU,						SEND(KC_LSFT); SEND(KC_1));			// !
-	P( PWR | LSD,						SEND(KC_LSFT); SEND(KC_5));			// %
-	P( PWR | LFT,						SEND(KC_LSFT); SEND(KC_2));			// @
-	P( PWR | LK,						SEND(KC_LSFT); SEND(KC_6));			// ^
-	P( PWR | LP,						SEND(KC_LSFT); SEND(KC_LBRC));		// {
-	P( PWR | LW,						SEND(KC_LBRC));
-	P( PWR | LH,						SEND(KC_LSFT); SEND(KC_RBRC));		// }
-	P( PWR | LR,						SEND(KC_RBRC));
-	P( PWR | ST1,						SEND(KC_LSFT); SEND(KC_BSLS));		// |
-	P( PWR | ST2,						SEND(KC_LSFT); SEND(KC_GRV));		// ~
-	P( PWR | ST3,						SEND(KC_QUOT));
-	P( PWR | ST4,						SEND(KC_LSFT); SEND(KC_QUOT));		// "
-	P( PWR | RF,						SEND(KC_KP_PLUS));
-	P( PWR | RR,						SEND(KC_LSFT); SEND(KC_7));			// &
-	P( PWR | RP,						SEND(KC_MINS));
-	P( PWR | RB,						SEND(KC_EQL));
-	P( PWR | RL,						SEND(KC_SLSH));
-	P( PWR | RG,						SEND(KC_COMM));
-	P( PWR | RT,						SEND(KC_PAST));
-	P( PWR | RS,						SEND(KC_DOT));
-	P( PWR | RD,						SEND(KC_TAB));
-	P( PWR | LA,						SEND(KC_SCLN));
-	P( PWR | LO,						SEND(KC_SLSH));
-	P( PWR | RE,						SEND(KC_SCLN));
-	P( PWR | RU,						SEND(KC_SLSH));
-
-
-	// If we make here, send as a steno chord
-	// If plover is running we can hook that host side
-	return false;
-}
-
-#define STENO_LAYER  	0
-
-// "Layers"
-// Steno layer should be first in your map.
-// When PWR | FN | RR | RG | RB | RS is pressed, the layer is increased to the next map. You must return to STENO_LAYER at the end.
-// If you have only a single layer, you must set SINGLELAYER = yes in your rules.mk, otherwise you may experince undefined behaviour
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-// Main layer, everything goes through here
-[STENO_LAYER] = LAYOUT_georgi(  
-STN_FN,  STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1,       STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR,
-STN_PWR, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2,       STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR,
-						 STN_N1, STN_A,  STN_O,			STN_E,   STN_U,  STN_N1)
-}; 
-
-int getKeymapCount(void) {
-	return sizeof(keymaps)/sizeof(keymaps[0]);
-}
diff --git a/keyboards/georgi/keymaps/template/readme.md b/keyboards/georgi/keymaps/template/readme.md
deleted file mode 100644
index 7c6fc3512322..000000000000
--- a/keyboards/georgi/keymaps/template/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Georgi QWERTY/Steno firmware
-
-This is a blank template configured with 5K of free space for your onboard dictionary!  
-Read the docs over at [gBoards](http://docs.gboards.ca)
-
-Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/georgi/keymaps/template/rules.mk b/keyboards/georgi/keymaps/template/rules.mk
deleted file mode 100644
index 1178fd80db12..000000000000
--- a/keyboards/georgi/keymaps/template/rules.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#----------------------------------------------------------------------------
-# make georgi:extrakey:dfu
-# Make sure you have dfu-programmer installed!
-#----------------------------------------------------------------------------
-
-#Debug options
-VERBOSE					 = yes
-CONSOLE_ENABLE			 = yes
-DEBUG_MATRIX_SCAN_RATE   = no
-DEBUG_MATRIX			 = no
-KEYBOARD_SHARED_EP       = yes
-CUSTOM_MATRIX			 = yes
-MOUSEKEY_ENABLE			 = no
-SINGLE_LAYER			 = no
-
-
-# A bunch of stuff that you shouldn't touch unless you
-# know what you're doing.
-#
-# No touchy, capiche?
-SRC += matrix.c i2c_master.c
-ifeq ($(strip $(DEBUG_MATRIX)), yes)
-    OPT_DEFS += -DDEBUG_MATRIX
-endif
-ifeq ($(strip $(SINGLE_LAYER)), yes)
-    OPT_DEFS += -DSINGLE_LAYER
-endif
diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json
index f9952e790311..28883b265a0d 100644
--- a/keyboards/kbdfans/kbd4x/info.json
+++ b/keyboards/kbdfans/kbd4x/info.json
@@ -2,7 +2,7 @@
     "keyboard_name": "kbd4x",
     "url": "",
     "maintainer": "qmk",
-    "width": 14,
+    "width": 12,
     "height": 4,
     "layouts": {
         "LAYOUT_planck_mit": {
diff --git a/keyboards/keebio/iris/info.json b/keyboards/keebio/iris/info.json
index f7b017b97acc..37806975f8ec 100644
--- a/keyboards/keebio/iris/info.json
+++ b/keyboards/keebio/iris/info.json
@@ -2,8 +2,8 @@
     "keyboard_name": "Iris",
     "url": "https://keeb.io",
     "maintainer": "Keebio",
-    "width": 14.5,
-    "height": 5,
+    "width": 15,
+    "height": 5.75,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json
index 8f85bece2125..ec529fa01df9 100644
--- a/keyboards/massdrop/alt/info.json
+++ b/keyboards/massdrop/alt/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "ALT",
-    "url": "https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard",
+    "url": "https://drop.com/buy/massdrop-alt-mechanical-keyboard",
     "maintainer": "Massdrop",
     "width": 16,
     "height": 5,
diff --git a/keyboards/massdrop/alt/keymaps/default/keymap.c b/keyboards/massdrop/alt/keymaps/default/keymap.c
index 39cd97eb0839..38fc672fee00 100644
--- a/keyboards/massdrop/alt/keymaps/default/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/default/keymap.c
@@ -119,7 +119,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return true; //Process all other keycodes normally
     }
 }
-
-led_instruction_t led_instructions[] = {
-    { .end = 1 }
-};
diff --git a/keyboards/massdrop/alt/keymaps/mac/keymap.c b/keyboards/massdrop/alt/keymaps/mac/keymap.c
index 9ea817e260e5..1b5eddffb474 100644
--- a/keyboards/massdrop/alt/keymaps/mac/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/mac/keymap.c
@@ -119,7 +119,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return true; //Process all other keycodes normally
     }
 }
-
-led_instruction_t led_instructions[] = {
-    { .end = 1 }
-};
diff --git a/keyboards/massdrop/alt/keymaps/reywood/keymap.c b/keyboards/massdrop/alt/keymaps/reywood/keymap.c
index da0c3cf53664..2546f3e01dc8 100644
--- a/keyboards/massdrop/alt/keymaps/reywood/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/reywood/keymap.c
@@ -114,20 +114,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return false;
     case L_T_ONF:
       if (record->event.pressed) {
-        led_enabled = !led_enabled;
-        I2C3733_Control_Set(led_enabled);
+        I2C3733_Control_Set(!I2C3733_Control_Get());
       }
       return false;
     case L_ON:
       if (record->event.pressed) {
-        led_enabled = 1;
-        I2C3733_Control_Set(led_enabled);
+        I2C3733_Control_Set(1);
       }
       return false;
     case L_OFF:
       if (record->event.pressed) {
-        led_enabled = 0;
-        I2C3733_Control_Set(led_enabled);
+        I2C3733_Control_Set(0);
       }
       return false;
     case L_T_BR:
diff --git a/keyboards/massdrop/alt/readme.md b/keyboards/massdrop/alt/readme.md
index 57e2e5f17481..da055229ae0b 100644
--- a/keyboards/massdrop/alt/readme.md
+++ b/keyboards/massdrop/alt/readme.md
@@ -1,12 +1,12 @@
 # ALT
 
-![ALT](https://massdrop-s3.imgix.net/product-images/alt-keyboard/FP/WNxwR19gTua3nxiiQWP3_AI7B3311%20copy%20page.jpg?auto=format&fm=jpg&fit=max&w=700&h=467&dpr=1&q=80)
+![ALT](https://massdrop-s3.imgix.net/product-images/massdrop-alt-mechanical-keyboard/FP/wRxrw2oVQfu6KCnN4OOC_WNxwR19gTua3nxiiQWP3_AI7B3311%20copy%20page.png?auto=format&fm=png&fit=fill&w=700&h=467)
 
 The Massdrop ALT is a 65% mechanical keyboard featuring dual USB-C connectors, an integrated Hi-Speed USB 2.0 hub, and fully customizable RGB backlighting and underlighting.
 
-Keyboard Maintainer: [Massdrop](https://github.com/massdrop)  
+Keyboard Maintainer: [Drop / Massdrop](https://github.com/Massdrop/qmk_firmware)  
 Hardware Supported: Massdrop, Inc. ALT PCBs utilizing Microchip's ATSAMD51J18A MCU and USB2422 2-Port USB 2.0 Hi-Speed Hub Controller, and ISSI's IS31FL3733 LED Drivers.  
-Hardware Availability: [Massdrop ALT Mechanical Keyboard](https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard)
+Hardware Availability: [Massdrop ALT Mechanical Keyboard](https://drop.com/buy/massdrop-alt-mechanical-keyboard)
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -14,7 +14,7 @@ Make example for this keyboard (after setting up your build environment):
 
 For information on flashing this keyboard, visit the following links:
 
-[Massdrop Loader Releases](https://github.com/Massdrop/mdloader/releases/tag/0.0.1)  
+[Massdrop Loader Releases](https://github.com/Massdrop/mdloader/releases/tag/1.0.3)  
 [Massdrop Loader Repository and Instructions](https://github.com/Massdrop/mdloader)
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json
index 2212540e5255..1b96749f8437 100644
--- a/keyboards/massdrop/ctrl/info.json
+++ b/keyboards/massdrop/ctrl/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "CTRL",
-    "url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard",
+    "url": "https://drop.com/buy/massdrop-ctrl-mechanical-keyboard",
     "maintainer": "Massdrop",
     "width": 18.5,
     "height": 6.5,
diff --git a/keyboards/massdrop/ctrl/keymaps/default/keymap.c b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
index cb57794fbe9b..aba9b83ca241 100644
--- a/keyboards/massdrop/ctrl/keymaps/default/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
@@ -122,15 +122,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return true; //Process all other keycodes normally
     }
 }
-
-led_instruction_t led_instructions[] = {
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 10, .id1 = 9, .r = 255, .g = 0, .b = 0 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_PATTERN, .id0 = 4, .id1 = 0, .pattern_id = 8 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 8, .id1 = 0, .r = 0, .g = 255, .b = 0 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_PATTERN, .id = 16, .id1 = 0, .pattern_id = 9 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 32, .id1 = 0, .r = 0, .g = 0, .b = 255 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_ROTATE_PATTERN, .id0 = 64, .id1 = 0},
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_ROTATE_PATTERN, .id0 = 262144, .id1 = 0, .layer = 0 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_ROTATE_PATTERN, .id = 16777216, .id1 = 0, .layer = 1 },
-    { .end = 1 }
-};
diff --git a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c b/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
index 20cd74b5d8a1..62e308e0bb12 100644
--- a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
@@ -122,7 +122,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return true; //Process all other keycodes normally
     }
 }
-
-led_instruction_t led_instructions[] = {
-    { .end = 1 }
-};
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
index 447b0aca1a24..519641b8dd11 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
@@ -7,8 +7,7 @@ enum ctrl_layers {
 };
 
 enum ctrl_keycodes {
-	U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
-	U_T_AGCR,              //USB Toggle Automatic GCR control
+	U_T_AGCR = SAFE_RANGE, //USB Toggle Automatic GCR control
 	DBG_TOG,               //DEBUG Toggle On / Off
 	DBG_MTRX,              //DEBUG Toggle Matrix Prints
 	DBG_KBD,               //DEBUG Toggle Keyboard Prints
@@ -236,12 +235,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record)
 	static uint32_t key_timer;
 
 	switch (keycode) {
-	case U_T_AUTO:
-		if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-			TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-		}
-
-		return false;
 
 	case U_T_AGCR:
 		if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
diff --git a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
index ccbd377dfd00..5f65b891b6ca 100644
--- a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
@@ -199,7 +199,6 @@ void matrix_init_user(void) {
 };
 
 // /tmk_core/protocol/arm_atsam/led_matrix.c: line 244
-uint8_t led_enabled;
 float led_animation_speed;
 uint8_t led_animation_direction;
 uint8_t led_animation_orientation;
@@ -310,7 +309,7 @@ void led_matrix_run(void)
                 }
 
                 float pomod;
-                pomod = (float)(g_tick % (uint32_t)(1000.0f / led_animation_speed)) / 10.0f * led_animation_speed;
+                pomod = (float)(led_matrix_get_tick() % (uint32_t)(1000.0f / led_animation_speed)) / 10.0f * led_animation_speed;
 
                 //Add in any moving effects
                 if ((!led_animation_direction && f[fcur].ef & EF_SCR_R) || (led_animation_direction && (f[fcur].ef & EF_SCR_L)))
@@ -745,20 +744,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case L_T_ONF:
             if (record->event.pressed) {
-                led_enabled = !led_enabled;
-                I2C3733_Control_Set(led_enabled);
+                I2C3733_Control_Set(!I2C3733_Control_Get());
             }
             return false;
         case L_ON:
             if (record->event.pressed) {
-                led_enabled = 1;
-                I2C3733_Control_Set(led_enabled);
+                I2C3733_Control_Set(1);
             }
             return false;
         case L_OFF:
             if (record->event.pressed) {
-                led_enabled = 0;
-                I2C3733_Control_Set(led_enabled);
+                I2C3733_Control_Set(0);
             }
             return false;
         case L_T_BR:
diff --git a/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c b/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
index debfa3b478b2..9e3ee64679b1 100644
--- a/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
@@ -2,8 +2,7 @@
 #include "xulkal.h"
 
 enum ctrl_keycodes {
-    U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              //USB Toggle Automatic GCR control
+    U_T_AGCR = SAFE_RANGE, //USB Toggle Automatic GCR control
     DBG_TOG,               //DEBUG Toggle On / Off
     DBG_MTRX,              //DEBUG Toggle Matrix Prints
     DBG_KBD,               //DEBUG Toggle Keyboard Prints
@@ -38,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LOWER] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_MUTE, _______, _______, \
         _______, RGB_RMOD,RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MPLY, KC_MSTP, KC_VOLU, \
-        RGB_SPI, RGB_SAI, RGB_VAI, RGB_HUI, RESET,   QWERTY,  _______, U_T_AUTO,U_T_AGCR,_______, _______, _______, _______, _______,   KC_MPRV, KC_MNXT, KC_VOLD, \
+        RGB_SPI, RGB_SAI, RGB_VAI, RGB_HUI, RESET,   QWERTY,  _______, _______,U_T_AGCR,_______, _______, _______, _______, _______,   KC_MPRV, KC_MNXT, KC_VOLD, \
         RGB_SPD, RGB_SAD, RGB_VAD, RGB_HUD, RGBRST,  GAME,    _______, _______, _______, _______, _______, _______, _______, \
         _______, _______, _______, _______, _______, _______, TG_NKRO, _______, _______, _______, _______, _______,                              _______, \
         _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______ \
@@ -62,10 +61,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record)
 {
     switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL)
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            return false;
         case U_T_AGCR:
             if (record->event.pressed && MODS_SHIFT && MODS_CTRL)
                 TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
diff --git a/keyboards/massdrop/ctrl/readme.md b/keyboards/massdrop/ctrl/readme.md
index 656ef9ac9f3f..0bb8c7349aee 100644
--- a/keyboards/massdrop/ctrl/readme.md
+++ b/keyboards/massdrop/ctrl/readme.md
@@ -1,12 +1,12 @@
 # CTRL
 
-![CTRL](https://massdrop-s3.imgix.net/product-images/massdrop-ntkl-mechanical-keyboard/FP/W6zvr0cTR4KVDY5z8rwp_AI7B6588%20copy%20page.jpg?auto=format&fm=jpg&fit=max&w=700&h=467&dpr=1&q=80)
+![CTRL](https://massdrop-s3.imgix.net/product-images/massdrop-ctrl-mechanical-keyboard/FP/KLS68Nl8QaqrLaqX4QGS_wl3xNbrbQkOgSzRByOtY_AI7B1490-copy-pc.png?auto=format&fm=png&fit=fill&w=700&h=467)
 
 The Massdrop CTRL is a TKL mechanical keyboard featuring dual USB-C connectors, an integrated Hi-Speed USB 2.0 hub, and fully customizable RGB backlighting and underlighting.
 
-Keyboard Maintainer: [Massdrop](https://github.com/massdrop)  
+Keyboard Maintainer: [Drop / Massdrop](https://github.com/Massdrop/qmk_firmware)  
 Hardware Supported: Massdrop, Inc. CTRL PCBs utilizing Microchip's ATSAMD51J18A MCU and USB2422 2-Port USB 2.0 Hi-Speed Hub Controller, and ISSI's IS31FL3733 LED Drivers.  
-Hardware Availability: [Massdrop CTRL Mechanical Keyboard](https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard)
+Hardware Availability: [Massdrop CTRL Mechanical Keyboard](https://drop.com/buy/massdrop-ctrl-mechanical-keyboard)
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -14,7 +14,7 @@ Make example for this keyboard (after setting up your build environment):
 
 For information on flashing this keyboard, visit the following links:
 
-[Massdrop Loader Releases](https://github.com/Massdrop/mdloader/releases/tag/0.0.1)  
+[Massdrop Loader Releases](https://github.com/Massdrop/mdloader/releases/tag/1.0.3)  
 [Massdrop Loader Repository and Instructions](https://github.com/Massdrop/mdloader)
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/massdrop/rocketeer/readme.md b/keyboards/massdrop/rocketeer/readme.md
new file mode 100644
index 000000000000..a2d67e118a8e
--- /dev/null
+++ b/keyboards/massdrop/rocketeer/readme.md
@@ -0,0 +1,21 @@
+# Rocketeer
+
+![Rocketeer](https://massdrop-s3.imgix.net/product-images/massdrop-x-zslane-mercury-rocketeer-mechanical-keyboard/FP/eDYjBAGCRO6WSlHu9Fj5_PC.png?auto=format&fm=png&fit=fill&w=700&h=467)
+
+The Massdrop x zslane Mercury Rocketeer Keyboard is a 60% mechanical keyboard featuring dual USB-C connectors, an integrated Hi-Speed USB 2.0 hub, and fully customizable RGB backlighting (and underlighting).
+
+Designer: zslane  
+Keyboard Maintainer: [Drop / Massdrop](https://github.com/Massdrop/qmk_firmware)  
+Hardware Supported: Massdrop, Inc. Rocketeer PCBs utilizing Microchip's ATSAMD51J18A MCU and USB2422 2-Port USB 2.0 Hi-Speed Hub Controller, and ISSI's IS31FL3733 LED Drivers.  
+Hardware Availability: [Massdrop x zslane Mercury Rocketeer Keyboard](https://drop.com/buy/massdrop-x-zslane-mercury-rocketeer-mechanical-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make massdrop/rocketeer:default
+
+For information on flashing this keyboard, visit the following links:
+
+[Massdrop Loader Releases](https://github.com/Massdrop/mdloader/releases/tag/1.0.3)  
+[Massdrop Loader Repository and Instructions](https://github.com/Massdrop/mdloader)
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/massdrop/shift/keymaps/default/keymap.c b/keyboards/massdrop/shift/keymaps/default/keymap.c
index b838483714a1..068920748a83 100644
--- a/keyboards/massdrop/shift/keymaps/default/keymap.c
+++ b/keyboards/massdrop/shift/keymaps/default/keymap.c
@@ -96,7 +96,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             if (record->event.pressed) {
                 key_timer = timer_read32();
             } else {
-                if (timer_elapsed32(key_timer) >= 500) {
+                if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) {
                     reset_keyboard();
                 }
             }
diff --git a/keyboards/massdrop/shift/keymaps/mac_md/rules.mk b/keyboards/massdrop/shift/keymaps/mac_md/rules.mk
new file mode 100644
index 000000000000..064a6f54c1fa
--- /dev/null
+++ b/keyboards/massdrop/shift/keymaps/mac_md/rules.mk
@@ -0,0 +1,2 @@
+# This keymap requires Massdrop Configurator support
+OPT_DEFS += -DUSE_MASSDROP_CONFIGURATOR
diff --git a/tmk_core/protocol/arm_atsam/led_matrix.c b/tmk_core/protocol/arm_atsam/led_matrix.c
index 7c6e56d44ad8..49ecfcda646b 100644
--- a/tmk_core/protocol/arm_atsam/led_matrix.c
+++ b/tmk_core/protocol/arm_atsam/led_matrix.c
@@ -349,16 +349,9 @@ void led_matrix_indicators(void)
             #endif //KANA
             (0))
             {
-                led_buffer[i].r = 255 - led_buffer[i].r; //TODO: Issue here with keeping the LED lit, static value works
-                led_buffer[i].g = 255 - led_buffer[i].g; //TODO: Issue here with keeping the LED lit, static value works
-                led_buffer[i].b = 255 - led_buffer[i].b; //TODO: Issue here with keeping the LED lit, static value works
-
-                //TODO: Old code, see if this hard cutoff is better// if (*led_cur->rgb.r > 127) *led_cur->rgb.r = 0;
-                //TODO: Old code, see if this hard cutoff is better// else *led_cur->rgb.r = 255;
-                //TODO: Old code, see if this hard cutoff is better// if (*led_cur->rgb.g > 127) *led_cur->rgb.g = 0;
-                //TODO: Old code, see if this hard cutoff is better// else *led_cur->rgb.g = 255;
-                //TODO: Old code, see if this hard cutoff is better// if (*led_cur->rgb.b > 127) *led_cur->rgb.b = 0;
-                //TODO: Old code, see if this hard cutoff is better// else *led_cur->rgb.b = 255;
+                led_buffer[i].r = 255 - led_buffer[i].r;
+                led_buffer[i].g = 255 - led_buffer[i].g;
+                led_buffer[i].b = 255 - led_buffer[i].b;
             }
         }
     }
@@ -397,20 +390,6 @@ static void led_run_pattern(led_setup_t *f, float* ro, float* go, float* bo, flo
 
     while (f->end != 1)
     {
-        //OLD-CODE// //TODO: Get this working again if (led_animation_circular) {
-        //OLD-CODE// //TODO: Get this working again     po = sqrtf((powf(fabsf((disp.width / 2) - (led_cur->x - disp.left)), 2) + powf(fabsf((disp.height / 2) - (led_cur->y - disp.bottom)), 2))) / disp.max_distance * 100;
-        //OLD-CODE// //TODO: Get this working again }
-        //OLD-CODE// //TODO: Get this working again else {
-        //OLD-CODE// //TODO: Get this working again     if (led_animation_orientation)
-        //OLD-CODE// //TODO: Get this working again     {
-        //OLD-CODE// //TODO: Get this working again         po = led_cur->py;
-        //OLD-CODE// //TODO: Get this working again     }
-        //OLD-CODE// //TODO: Get this working again     else
-        //OLD-CODE// //TODO: Get this working again     {
-        //OLD-CODE// //TODO: Get this working again         po = led_cur->px;
-        //OLD-CODE// //TODO: Get this working again     }
-        //OLD-CODE// //TODO: Get this working again }
-
         po = pos; //Reset po for new frame
 
         //Add in any moving effects
@@ -496,6 +475,9 @@ static void led_matrix_massdrop_config_override(int i)
     uint8_t highest_active_layer = biton32(layer_state);
 
     if (led_animation_circular) {
+        // TODO: should use min/max values from LED configuration instead of
+        // hard-coded 224, 64
+        // po = sqrtf((powf(fabsf((disp.width / 2) - (led_cur->x - disp.left)), 2) + powf(fabsf((disp.height / 2) - (led_cur->y - disp.bottom)), 2))) / disp.max_distance * 100;
         po = sqrtf((powf(fabsf((224 / 2) - (float)g_led_config.point[i].x), 2) + powf(fabsf((64 / 2) - (float)g_led_config.point[i].y), 2))) / RGB_MAX_DISTANCE * 100;
     } else {
         if (led_animation_orientation) {
diff --git a/tmk_core/protocol/arm_atsam/led_matrix.h b/tmk_core/protocol/arm_atsam/led_matrix.h
index 9fb33c520903..f708b75387da 100644
--- a/tmk_core/protocol/arm_atsam/led_matrix.h
+++ b/tmk_core/protocol/arm_atsam/led_matrix.h
@@ -150,6 +150,8 @@ extern uint8_t led_animation_circular;
 extern float led_edge_brightness;
 extern uint8_t led_edge_mode;
 
+uint32_t led_matrix_get_tick(void);
+
 #define LED_MODE_NORMAL             0                               //Must be 0
 #define LED_MODE_KEYS_ONLY          1
 #define LED_MODE_NON_KEYS_ONLY      2