diff --git a/plugins/Kaleidoscope-Colormap/README.md b/plugins/Kaleidoscope-Colormap/README.md
index 930aa430..f5a438f9 100644
--- a/plugins/Kaleidoscope-Colormap/README.md
+++ b/plugins/Kaleidoscope-Colormap/README.md
@@ -28,7 +28,7 @@ KALEIDOSCOPE_INIT_PLUGINS(EEPROMSettings,
                           ColormapEffect,
                           Focus);
 
-void setup(void) {
+void setup() {
   Kaleidoscope.setup();
 
   ColormapEffect.max_layers(1);
diff --git a/plugins/Kaleidoscope-Colormap/src/kaleidoscope/plugin/Colormap.cpp b/plugins/Kaleidoscope-Colormap/src/kaleidoscope/plugin/Colormap.cpp
index 1af6f7a9..371614d7 100644
--- a/plugins/Kaleidoscope-Colormap/src/kaleidoscope/plugin/Colormap.cpp
+++ b/plugins/Kaleidoscope-Colormap/src/kaleidoscope/plugin/Colormap.cpp
@@ -47,7 +47,7 @@ EventHandlerResult ColormapEffect::onNameQuery() {
   return ::Focus.sendName(F("ColormapEffect"));
 }
 
-void ColormapEffect::TransientLEDMode::onActivate(void) {
+void ColormapEffect::TransientLEDMode::onActivate() {
   if (!Runtime.has_leds)
     return;
 
diff --git a/plugins/Kaleidoscope-Colormap/src/kaleidoscope/plugin/Colormap.h b/plugins/Kaleidoscope-Colormap/src/kaleidoscope/plugin/Colormap.h
index e51b1ecd..76583519 100644
--- a/plugins/Kaleidoscope-Colormap/src/kaleidoscope/plugin/Colormap.h
+++ b/plugins/Kaleidoscope-Colormap/src/kaleidoscope/plugin/Colormap.h
@@ -52,7 +52,7 @@ class ColormapEffect : public Plugin,
    protected:
     friend class ColormapEffect;
 
-    void onActivate(void) final;
+    void onActivate() final;
     void refreshAt(KeyAddr key_addr) final;
 
    private:
diff --git a/plugins/Kaleidoscope-Cycle/README.md b/plugins/Kaleidoscope-Cycle/README.md
index ef99614d..53411b47 100644
--- a/plugins/Kaleidoscope-Cycle/README.md
+++ b/plugins/Kaleidoscope-Cycle/README.md
@@ -34,7 +34,7 @@ void cycleAction(Key previous_key, uint8_t cycle_count) {
 
 KALEIDOSCOPE_INIT_PLUGINS(Cycle);
 
-void setup(void) {
+void setup() {
   Kaleidoscope.setup();
 }
 ```
diff --git a/plugins/Kaleidoscope-Devel-ArduinoTrace/README.md b/plugins/Kaleidoscope-Devel-ArduinoTrace/README.md
index 27f3b344..e0d4a182 100644
--- a/plugins/Kaleidoscope-Devel-ArduinoTrace/README.md
+++ b/plugins/Kaleidoscope-Devel-ArduinoTrace/README.md
@@ -15,7 +15,7 @@ the box, without any further configuration:
 
 /* ... */
 
-void setup (void) {
+void setup () {
   Kaleidoscope.setup ();
   TRACE()
 }
diff --git a/plugins/Kaleidoscope-EEPROM-Keymap-Programmer/src/kaleidoscope/plugin/EEPROM-Keymap-Programmer.cpp b/plugins/Kaleidoscope-EEPROM-Keymap-Programmer/src/kaleidoscope/plugin/EEPROM-Keymap-Programmer.cpp
index 67504976..3f9793af 100644
--- a/plugins/Kaleidoscope-EEPROM-Keymap-Programmer/src/kaleidoscope/plugin/EEPROM-Keymap-Programmer.cpp
+++ b/plugins/Kaleidoscope-EEPROM-Keymap-Programmer/src/kaleidoscope/plugin/EEPROM-Keymap-Programmer.cpp
@@ -34,7 +34,7 @@
 namespace kaleidoscope {
 namespace plugin {
 
-void EEPROMKeymapProgrammer::nextState(void) {
+void EEPROMKeymapProgrammer::nextState() {
   switch (state_) {
   case INACTIVE:
     state_ = WAIT_FOR_KEY;
@@ -54,7 +54,7 @@ void EEPROMKeymapProgrammer::nextState(void) {
   }
 }
 
-void EEPROMKeymapProgrammer::cancel(void) {
+void EEPROMKeymapProgrammer::cancel() {
   update_position_ = 0;
   new_key_         = Key_NoKey;
   state_           = INACTIVE;
diff --git a/plugins/Kaleidoscope-EEPROM-Keymap-Programmer/src/kaleidoscope/plugin/EEPROM-Keymap-Programmer.h b/plugins/Kaleidoscope-EEPROM-Keymap-Programmer/src/kaleidoscope/plugin/EEPROM-Keymap-Programmer.h
index 7d7035ef..479381c6 100644
--- a/plugins/Kaleidoscope-EEPROM-Keymap-Programmer/src/kaleidoscope/plugin/EEPROM-Keymap-Programmer.h
+++ b/plugins/Kaleidoscope-EEPROM-Keymap-Programmer/src/kaleidoscope/plugin/EEPROM-Keymap-Programmer.h
@@ -34,11 +34,11 @@ class EEPROMKeymapProgrammer : public kaleidoscope::Plugin {
   } mode_t;
   mode_t mode;
 
-  void activate(void) {
+  void activate() {
     nextState();
   }
-  void nextState(void);
-  void cancel(void);
+  void nextState();
+  void cancel();
 
   EventHandlerResult onKeyEvent(KeyEvent &event);
   EventHandlerResult onFocusEvent(const char *command);
diff --git a/plugins/Kaleidoscope-EEPROM-Keymap/src/kaleidoscope/plugin/EEPROM-Keymap.cpp b/plugins/Kaleidoscope-EEPROM-Keymap/src/kaleidoscope/plugin/EEPROM-Keymap.cpp
index be12dab7..fae574b6 100644
--- a/plugins/Kaleidoscope-EEPROM-Keymap/src/kaleidoscope/plugin/EEPROM-Keymap.cpp
+++ b/plugins/Kaleidoscope-EEPROM-Keymap/src/kaleidoscope/plugin/EEPROM-Keymap.cpp
@@ -82,7 +82,7 @@ Key EEPROMKeymap::getKeyExtended(uint8_t layer, KeyAddr key_addr) {
   return getKey(layer - progmem_layers_, key_addr);
 }
 
-uint16_t EEPROMKeymap::keymap_base(void) {
+uint16_t EEPROMKeymap::keymap_base() {
   return keymap_base_;
 }
 
diff --git a/plugins/Kaleidoscope-EEPROM-Keymap/src/kaleidoscope/plugin/EEPROM-Keymap.h b/plugins/Kaleidoscope-EEPROM-Keymap/src/kaleidoscope/plugin/EEPROM-Keymap.h
index 3138f075..3f68c100 100644
--- a/plugins/Kaleidoscope-EEPROM-Keymap/src/kaleidoscope/plugin/EEPROM-Keymap.h
+++ b/plugins/Kaleidoscope-EEPROM-Keymap/src/kaleidoscope/plugin/EEPROM-Keymap.h
@@ -41,7 +41,7 @@ class EEPROMKeymap : public kaleidoscope::Plugin {
 
   static void max_layers(uint8_t max);
 
-  static uint16_t keymap_base(void);
+  static uint16_t keymap_base();
 
   static Key getKey(uint8_t layer, KeyAddr key_addr);
   static Key getKeyExtended(uint8_t layer, KeyAddr key_addr);
@@ -53,7 +53,7 @@ class EEPROMKeymap : public kaleidoscope::Plugin {
   static uint8_t max_layers_;
   static uint8_t progmem_layers_;
 
-  static Key parseKey(void);
+  static Key parseKey();
   static void printKey(Key key);
   static void dumpKeymap(uint8_t layers, Key (*getkey)(uint8_t, KeyAddr));
 };
diff --git a/plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings.cpp b/plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings.cpp
index 88684d96..5a21ee90 100644
--- a/plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings.cpp
+++ b/plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings.cpp
@@ -65,11 +65,11 @@ EventHandlerResult EEPROMSettings::beforeEachCycle() {
   return EventHandlerResult::OK;
 }
 
-bool EEPROMSettings::isValid(void) {
+bool EEPROMSettings::isValid() {
   return is_valid_;
 }
 
-uint16_t EEPROMSettings::crc(void) {
+uint16_t EEPROMSettings::crc() {
   if (sealed_)
     return settings_.crc;
   return 0;
@@ -100,7 +100,7 @@ void EEPROMSettings::ignoreHardcodedLayers(bool value) {
   update();
 }
 
-void EEPROMSettings::seal(void) {
+void EEPROMSettings::seal() {
   sealed_ = true;
 
   CRCCalculator.finalize();
@@ -141,15 +141,15 @@ uint16_t EEPROMSettings::requestSlice(uint16_t size) {
   return start;
 }
 
-void EEPROMSettings::invalidate(void) {
+void EEPROMSettings::invalidate() {
   is_valid_ = false;
 }
 
-uint16_t EEPROMSettings::used(void) {
+uint16_t EEPROMSettings::used() {
   return next_start_;
 }
 
-void EEPROMSettings::update(void) {
+void EEPROMSettings::update() {
   Runtime.storage().put(0, settings_);
   Runtime.storage().commit();
   is_valid_ = true;
diff --git a/plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings.h b/plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings.h
index 5c83940c..32bb5363 100644
--- a/plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings.h
+++ b/plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings.h
@@ -44,17 +44,17 @@ class EEPROMSettings : public kaleidoscope::Plugin {
    * fall back to not using it. */
   static constexpr uint8_t VERSION_CURRENT = 0x01;
 
-  void update(void);
-  bool isValid(void);
-  void invalidate(void);
-  uint8_t version(void) {
+  void update();
+  bool isValid();
+  void invalidate();
+  uint8_t version() {
     return settings_.version;
   }
 
   uint16_t requestSlice(uint16_t size);
-  void seal(void);
-  uint16_t crc(void);
-  uint16_t used(void);
+  void seal();
+  uint16_t crc();
+  uint16_t used();
 
   uint8_t default_layer(uint8_t layer);
   uint8_t default_layer() {
diff --git a/plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings/crc.h b/plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings/crc.h
index cfbdfa93..578313b7 100644
--- a/plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings/crc.h
+++ b/plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings/crc.h
@@ -35,7 +35,7 @@ class CRC_ {
   uint16_t crc = 0;
 
   void update(const void *data, uint8_t len);
-  void finalize(void) {
+  void finalize() {
     reflect(16);
   }
   void reflect(uint8_t len);
diff --git a/plugins/Kaleidoscope-FingerPainter/src/kaleidoscope/plugin/FingerPainter.cpp b/plugins/Kaleidoscope-FingerPainter/src/kaleidoscope/plugin/FingerPainter.cpp
index b652872c..2ed60776 100644
--- a/plugins/Kaleidoscope-FingerPainter/src/kaleidoscope/plugin/FingerPainter.cpp
+++ b/plugins/Kaleidoscope-FingerPainter/src/kaleidoscope/plugin/FingerPainter.cpp
@@ -42,7 +42,7 @@ EventHandlerResult FingerPainter::onSetup() {
   return EventHandlerResult::OK;
 }
 
-void FingerPainter::update(void) {
+void FingerPainter::update() {
   ::LEDPaletteTheme.updateHandler(color_base_, 0);
 }
 
@@ -50,7 +50,7 @@ void FingerPainter::refreshAt(KeyAddr key_addr) {
   ::LEDPaletteTheme.refreshAt(color_base_, 0, key_addr);
 }
 
-void FingerPainter::toggle(void) {
+void FingerPainter::toggle() {
   edit_mode_ = !edit_mode_;
 }
 
diff --git a/plugins/Kaleidoscope-FingerPainter/src/kaleidoscope/plugin/FingerPainter.h b/plugins/Kaleidoscope-FingerPainter/src/kaleidoscope/plugin/FingerPainter.h
index 65418544..709e8eaf 100644
--- a/plugins/Kaleidoscope-FingerPainter/src/kaleidoscope/plugin/FingerPainter.h
+++ b/plugins/Kaleidoscope-FingerPainter/src/kaleidoscope/plugin/FingerPainter.h
@@ -33,7 +33,7 @@ namespace plugin {
 //
 class FingerPainter : public LEDMode {
  public:
-  void toggle(void);
+  void toggle();
 
   EventHandlerResult onKeyEvent(KeyEvent &event);
   EventHandlerResult onFocusEvent(const char *command);
@@ -41,7 +41,7 @@ class FingerPainter : public LEDMode {
   EventHandlerResult onNameQuery();
 
  protected:
-  void update(void) final;
+  void update() final;
   void refreshAt(KeyAddr key_addr) final;
 
  private:
diff --git a/plugins/Kaleidoscope-GhostInTheFirmware/src/kaleidoscope/plugin/GhostInTheFirmware.cpp b/plugins/Kaleidoscope-GhostInTheFirmware/src/kaleidoscope/plugin/GhostInTheFirmware.cpp
index 8b8d1cd8..7af0253a 100644
--- a/plugins/Kaleidoscope-GhostInTheFirmware/src/kaleidoscope/plugin/GhostInTheFirmware.cpp
+++ b/plugins/Kaleidoscope-GhostInTheFirmware/src/kaleidoscope/plugin/GhostInTheFirmware.cpp
@@ -29,7 +29,7 @@
 namespace kaleidoscope {
 namespace plugin {
 
-void GhostInTheFirmware::activate(void) {
+void GhostInTheFirmware::activate() {
   is_active_ = true;
 }
 
diff --git a/plugins/Kaleidoscope-GhostInTheFirmware/src/kaleidoscope/plugin/GhostInTheFirmware.h b/plugins/Kaleidoscope-GhostInTheFirmware/src/kaleidoscope/plugin/GhostInTheFirmware.h
index f060933c..08c3e0b6 100644
--- a/plugins/Kaleidoscope-GhostInTheFirmware/src/kaleidoscope/plugin/GhostInTheFirmware.h
+++ b/plugins/Kaleidoscope-GhostInTheFirmware/src/kaleidoscope/plugin/GhostInTheFirmware.h
@@ -34,7 +34,7 @@ class GhostInTheFirmware : public kaleidoscope::Plugin {
   };
   const GhostKey *ghost_keys;
 
-  void activate(void);
+  void activate();
 
   EventHandlerResult afterEachCycle();
 
diff --git a/plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox.cpp b/plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox.cpp
index 77c49e59..2868fc63 100644
--- a/plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox.cpp
+++ b/plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox.cpp
@@ -40,7 +40,7 @@ namespace ez {
 
 static bool do_scan_ = 1;
 
-void ErgoDox::setup(void) {
+void ErgoDox::setup() {
   wdt_disable();
   delay(100);
 
diff --git a/plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox.h b/plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox.h
index 6b2a64ae..692b4bc9 100644
--- a/plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox.h
+++ b/plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox.h
@@ -60,9 +60,9 @@ struct ErgoDoxProps : public kaleidoscope::device::ATmega32U4KeyboardProps {
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 class ErgoDox : public kaleidoscope::device::ATmega32U4Keyboard<ErgoDoxProps> {
  public:
-  void scanMatrix(void);
-  void readMatrix(void);
-  void actOnMatrixScan(void);
+  void scanMatrix();
+  void readMatrix();
+  void actOnMatrixScan();
   void setup();
 
   bool isKeyswitchPressed(KeyAddr key_addr);
diff --git a/plugins/Kaleidoscope-Hardware-Keyboardio-Imago/src/kaleidoscope/device/keyboardio/Imago.cpp b/plugins/Kaleidoscope-Hardware-Keyboardio-Imago/src/kaleidoscope/device/keyboardio/Imago.cpp
index db419ecd..46a74d5d 100644
--- a/plugins/Kaleidoscope-Hardware-Keyboardio-Imago/src/kaleidoscope/device/keyboardio/Imago.cpp
+++ b/plugins/Kaleidoscope-Hardware-Keyboardio-Imago/src/kaleidoscope/device/keyboardio/Imago.cpp
@@ -102,7 +102,7 @@ void ImagoLEDDriver::twiSend(uint8_t addr, uint8_t Reg_Add, uint8_t Reg_Dat) {
   uint8_t result = twi_writeTo(addr, data, ELEMENTS(data), 1, 0);
 }
 
-void ImagoLEDDriver::unlockRegister(void) {
+void ImagoLEDDriver::unlockRegister() {
   twiSend(LED_DRIVER_ADDR, CMD_WRITE_ENABLE, WRITE_ENABLE_ONCE);  //unlock
 }
 
diff --git a/plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/device/keyboardio/Model01.cpp b/plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/device/keyboardio/Model01.cpp
index 7e24ed43..2db43054 100644
--- a/plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/device/keyboardio/Model01.cpp
+++ b/plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/device/keyboardio/Model01.cpp
@@ -56,7 +56,7 @@ struct Model01Hands {
 driver::keyboardio::Model01Side Model01Hands::leftHand(0);
 driver::keyboardio::Model01Side Model01Hands::rightHand(3);
 
-void Model01Hands::setup(void) {
+void Model01Hands::setup() {
   // This lets the keyboard pull up to 1.6 amps from the host.
   // That violates the USB spec. But it sure is pretty looking
   DDRE |= _BV(6);
@@ -149,7 +149,7 @@ driver::keyboardio::keydata_t Model01KeyScanner::rightHandState;
 driver::keyboardio::keydata_t Model01KeyScanner::previousLeftHandState;
 driver::keyboardio::keydata_t Model01KeyScanner::previousRightHandState;
 
-void Model01KeyScanner::enableScannerPower(void) {
+void Model01KeyScanner::enableScannerPower() {
   // Turn on power to the LED net
   DDRC |= _BV(7);
   PORTC |= _BV(7);
diff --git a/plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.cpp b/plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.cpp
index daecda98..5fb1ae25 100644
--- a/plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.cpp
+++ b/plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.cpp
@@ -44,7 +44,7 @@ struct Model100Hands {
 driver::keyboardio::Model100Side Model100Hands::leftHand(0);
 driver::keyboardio::Model100Side Model100Hands::rightHand(3);
 
-void Model100Hands::setup(void) {
+void Model100Hands::setup() {
   Model100KeyScanner::enableScannerPower();
   Wire.begin();
   Wire.setClock(400000);
@@ -123,7 +123,7 @@ driver::keyboardio::keydata_t Model100KeyScanner::rightHandState;
 driver::keyboardio::keydata_t Model100KeyScanner::previousLeftHandState;
 driver::keyboardio::keydata_t Model100KeyScanner::previousRightHandState;
 
-void Model100KeyScanner::enableScannerPower(void) {
+void Model100KeyScanner::enableScannerPower() {
   // Turn on the switched 5V network.
   //  make sure this happens at least 100ms after USB connect
   // to satisfy inrush limits
@@ -137,7 +137,7 @@ void Model100KeyScanner::enableScannerPower(void) {
   digitalWrite(PB15, LOW);
 }
 
-void Model100KeyScanner::disableScannerPower(void) {
+void Model100KeyScanner::disableScannerPower() {
   // Turn on power to the 5V net
   //
   pinMode(PB9, OUTPUT_OPEN_DRAIN);
diff --git a/plugins/Kaleidoscope-HardwareTestMode/src/kaleidoscope/plugin/HardwareTestMode.cpp b/plugins/Kaleidoscope-HardwareTestMode/src/kaleidoscope/plugin/HardwareTestMode.cpp
index a3f25ccb..48186cac 100644
--- a/plugins/Kaleidoscope-HardwareTestMode/src/kaleidoscope/plugin/HardwareTestMode.cpp
+++ b/plugins/Kaleidoscope-HardwareTestMode/src/kaleidoscope/plugin/HardwareTestMode.cpp
@@ -53,7 +53,7 @@ void HardwareTestMode::setLeds(cRGB color) {
   waitForKeypress();
 }
 
-void HardwareTestMode::testLeds(void) {
+void HardwareTestMode::testLeds() {
   constexpr cRGB red         = CRGB(255, 0, 0);
   constexpr cRGB blue        = CRGB(0, 0, 255);
   constexpr cRGB green       = CRGB(0, 255, 0);
diff --git a/plugins/Kaleidoscope-Heatmap/src/kaleidoscope/plugin/Heatmap.cpp b/plugins/Kaleidoscope-Heatmap/src/kaleidoscope/plugin/Heatmap.cpp
index 2f31cb90..1aed3a3b 100644
--- a/plugins/Kaleidoscope-Heatmap/src/kaleidoscope/plugin/Heatmap.cpp
+++ b/plugins/Kaleidoscope-Heatmap/src/kaleidoscope/plugin/Heatmap.cpp
@@ -107,7 +107,7 @@ cRGB Heatmap::TransientLEDMode::computeColor(float v) {
   return {b, g, r};
 }
 
-void Heatmap::TransientLEDMode::shiftStats(void) {
+void Heatmap::TransientLEDMode::shiftStats() {
   // this method is called when:
   // 1. a value in heatmap_ reach INT8_MAX
   // 2. highest_ reach heat_colors_length*512 (see Heatmap::loopHook)
@@ -121,7 +121,7 @@ void Heatmap::TransientLEDMode::shiftStats(void) {
   highest_ = highest_ >> 1;
 }
 
-void Heatmap::resetMap(void) {
+void Heatmap::resetMap() {
 
   if (::LEDControl.get_mode_index() != led_mode_id_)
     return;
@@ -210,7 +210,7 @@ EventHandlerResult Heatmap::TransientLEDMode::beforeEachCycle() {
   return EventHandlerResult::OK;
 }
 
-void Heatmap::TransientLEDMode::update(void) {
+void Heatmap::TransientLEDMode::update() {
   if (!Runtime.has_leds)
     return;
 
diff --git a/plugins/Kaleidoscope-Heatmap/src/kaleidoscope/plugin/Heatmap.h b/plugins/Kaleidoscope-Heatmap/src/kaleidoscope/plugin/Heatmap.h
index 37a65d0b..618021ed 100644
--- a/plugins/Kaleidoscope-Heatmap/src/kaleidoscope/plugin/Heatmap.h
+++ b/plugins/Kaleidoscope-Heatmap/src/kaleidoscope/plugin/Heatmap.h
@@ -37,7 +37,7 @@ class Heatmap : public Plugin,
   static uint16_t update_delay;
   static const cRGB *heat_colors;
   static uint8_t heat_colors_length;
-  void resetMap(void);
+  void resetMap();
 
   EventHandlerResult onKeyEvent(KeyEvent &event);
   EventHandlerResult beforeEachCycle();
@@ -64,7 +64,7 @@ class Heatmap : public Plugin,
     uint16_t highest_;
     uint16_t last_heatmap_comp_time_;
 
-    void shiftStats(void);
+    void shiftStats();
     cRGB computeColor(float v);
 
     friend class Heatmap;
diff --git a/plugins/Kaleidoscope-HostOS/README.md b/plugins/Kaleidoscope-HostOS/README.md
index 77fca3be..9cf97844 100644
--- a/plugins/Kaleidoscope-HostOS/README.md
+++ b/plugins/Kaleidoscope-HostOS/README.md
@@ -21,7 +21,7 @@ The extension provides a `HostOS` singleton object.
 #include <Kaleidoscope.h>
 #include <Kaleidoscope-HostOS.h>
 
-void someFunction(void) {
+void someFunction() {
   if (HostOS.os() == kaleidoscope::hostos::LINUX) {
     // do something linux-y
   }
@@ -32,7 +32,7 @@ void someFunction(void) {
 
 KALEIDOSCOPE_INIT_PLUGINS(HostOS)
 
-void setup(void) {
+void setup() {
   Kaleidoscope.setup ();
 }
 ```
diff --git a/plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.cpp b/plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.cpp
index 52dd0f2d..2a2fb7e6 100644
--- a/plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.cpp
+++ b/plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.cpp
@@ -26,7 +26,7 @@
 namespace kaleidoscope {
 namespace plugin {
 
-EventHandlerResult HostOS::onSetup(void) {
+EventHandlerResult HostOS::onSetup() {
   if (is_configured_)
     return EventHandlerResult::OK;
 
diff --git a/plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.h b/plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.h
index 7485f018..68f1a045 100644
--- a/plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.h
+++ b/plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.h
@@ -43,7 +43,7 @@ class HostOS : public kaleidoscope::Plugin {
  public:
   EventHandlerResult onSetup();
 
-  hostos::Type os(void) {
+  hostos::Type os() {
     return os_;
   }
   void os(hostos::Type new_os);
diff --git a/plugins/Kaleidoscope-IdleLEDs/README.md b/plugins/Kaleidoscope-IdleLEDs/README.md
index d2ab5ad8..853c6b38 100644
--- a/plugins/Kaleidoscope-IdleLEDs/README.md
+++ b/plugins/Kaleidoscope-IdleLEDs/README.md
@@ -25,7 +25,7 @@ the box, without any further configuration:
 
 KALEIDOSCOPE_INIT_PLUGINS(LEDControl, IdleLEDs, LEDEffectRainbowWave);
 
-void setup (void) {
+void setup () {
   Kaleidoscope.setup ();
 }
 ```
@@ -54,7 +54,7 @@ KALEIDOSCOPE_INIT_PLUGINS(
   LEDEffectRainbowWave
 );
 
-void setup (void) {
+void setup () {
   Kaleidoscope.setup ();
 }
 ```
diff --git a/plugins/Kaleidoscope-LED-ActiveLayerColor/src/kaleidoscope/plugin/LED-ActiveLayerColor.cpp b/plugins/Kaleidoscope-LED-ActiveLayerColor/src/kaleidoscope/plugin/LED-ActiveLayerColor.cpp
index 691b3018..b97b4ad7 100644
--- a/plugins/Kaleidoscope-LED-ActiveLayerColor/src/kaleidoscope/plugin/LED-ActiveLayerColor.cpp
+++ b/plugins/Kaleidoscope-LED-ActiveLayerColor/src/kaleidoscope/plugin/LED-ActiveLayerColor.cpp
@@ -52,7 +52,7 @@ cRGB LEDActiveLayerColorEffect::TransientLEDMode::getActiveColor() {
   return color;
 }
 
-void LEDActiveLayerColorEffect::TransientLEDMode::onActivate(void) {
+void LEDActiveLayerColorEffect::TransientLEDMode::onActivate() {
   if (!Runtime.has_leds)
     return;
 
diff --git a/plugins/Kaleidoscope-LED-ActiveLayerColor/src/kaleidoscope/plugin/LED-ActiveLayerColor.h b/plugins/Kaleidoscope-LED-ActiveLayerColor/src/kaleidoscope/plugin/LED-ActiveLayerColor.h
index 2f8b6f72..9ef51cbc 100644
--- a/plugins/Kaleidoscope-LED-ActiveLayerColor/src/kaleidoscope/plugin/LED-ActiveLayerColor.h
+++ b/plugins/Kaleidoscope-LED-ActiveLayerColor/src/kaleidoscope/plugin/LED-ActiveLayerColor.h
@@ -45,7 +45,7 @@ class LEDActiveLayerColorEffect : public Plugin,
     explicit TransientLEDMode(const LEDActiveLayerColorEffect *parent);
 
    protected:
-    void onActivate(void) final;
+    void onActivate() final;
     void refreshAt(KeyAddr key_addr) final;
 
    private:
diff --git a/plugins/Kaleidoscope-LED-AlphaSquare/src/kaleidoscope/plugin/LED-AlphaSquare/Effect.cpp b/plugins/Kaleidoscope-LED-AlphaSquare/src/kaleidoscope/plugin/LED-AlphaSquare/Effect.cpp
index 3d2f6e6a..e773f6ff 100644
--- a/plugins/Kaleidoscope-LED-AlphaSquare/src/kaleidoscope/plugin/LED-AlphaSquare/Effect.cpp
+++ b/plugins/Kaleidoscope-LED-AlphaSquare/src/kaleidoscope/plugin/LED-AlphaSquare/Effect.cpp
@@ -38,7 +38,7 @@ AlphaSquareEffect::TransientLEDMode::TransientLEDMode(AlphaSquareEffect * /*pare
   : last_key_left_(Key_NoKey),
     last_key_right_(Key_NoKey) {}
 
-void AlphaSquareEffect::TransientLEDMode::update(void) {
+void AlphaSquareEffect::TransientLEDMode::update() {
   if (!Runtime.has_leds)
     return;
 
diff --git a/plugins/Kaleidoscope-LED-AlphaSquare/src/kaleidoscope/plugin/LED-AlphaSquare/Effect.h b/plugins/Kaleidoscope-LED-AlphaSquare/src/kaleidoscope/plugin/LED-AlphaSquare/Effect.h
index 4bfd4017..0857a976 100644
--- a/plugins/Kaleidoscope-LED-AlphaSquare/src/kaleidoscope/plugin/LED-AlphaSquare/Effect.h
+++ b/plugins/Kaleidoscope-LED-AlphaSquare/src/kaleidoscope/plugin/LED-AlphaSquare/Effect.h
@@ -45,7 +45,7 @@ class AlphaSquareEffect : public Plugin,
     explicit TransientLEDMode(AlphaSquareEffect *parent);
 
    protected:
-    void update(void) final;
+    void update() final;
     void refreshAt(KeyAddr key_addr) final;
 
    private:
diff --git a/plugins/Kaleidoscope-LED-Palette-Theme/README.md b/plugins/Kaleidoscope-LED-Palette-Theme/README.md
index ffe5c00d..12ade2a5 100644
--- a/plugins/Kaleidoscope-LED-Palette-Theme/README.md
+++ b/plugins/Kaleidoscope-LED-Palette-Theme/README.md
@@ -21,8 +21,8 @@ namespace example {
 
 class TestLEDMode : public LEDMode {
  protected:
-  void setup(void) final;
-  void update(void) final;
+  void setup() final;
+  void update() final;
 
   kaleidoscope::EventHandlerResult onFocusEvent(const char *command);
 
@@ -32,11 +32,11 @@ class TestLEDMode : public LEDMode {
 
 uint16_t TestLEDMode::map_base_;
 
-void TestLEDMode::setup(void) {
+void TestLEDMode::setup() {
   map_base_ = LEDPaletteTheme.reserveThemes(1);
 }
 
-void TestLEDMode::update(void) {
+void TestLEDMode::update() {
   LEDPaletteTheme.updateHandler(map_base_, 0);
 }
 
diff --git a/plugins/Kaleidoscope-LED-Stalker/src/kaleidoscope/plugin/LED-Stalker.cpp b/plugins/Kaleidoscope-LED-Stalker/src/kaleidoscope/plugin/LED-Stalker.cpp
index 4cbad4d0..5dd56185 100644
--- a/plugins/Kaleidoscope-LED-Stalker/src/kaleidoscope/plugin/LED-Stalker.cpp
+++ b/plugins/Kaleidoscope-LED-Stalker/src/kaleidoscope/plugin/LED-Stalker.cpp
@@ -59,7 +59,7 @@ EventHandlerResult StalkerEffect::onKeyEvent(KeyEvent &event) {
   return EventHandlerResult::OK;
 }
 
-void StalkerEffect::TransientLEDMode::update(void) {
+void StalkerEffect::TransientLEDMode::update() {
   if (!Runtime.has_leds)
     return;
 
@@ -111,7 +111,7 @@ cRGB Haunt::compute(uint8_t *step) {
 }
 
 // BlazingTrail
-BlazingTrail::BlazingTrail(void) {
+BlazingTrail::BlazingTrail() {
 }
 constexpr uint8_t hue_start = 50.0 / 360 * 0xff;
 constexpr uint8_t hue_end   = 0;
@@ -144,7 +144,7 @@ cRGB BlazingTrail::compute(uint8_t *step) {
 }
 
 // Rainbow
-Rainbow::Rainbow(void) {
+Rainbow::Rainbow() {
 }
 
 cRGB Rainbow::compute(uint8_t *step) {
diff --git a/plugins/Kaleidoscope-LED-Stalker/src/kaleidoscope/plugin/LED-Stalker.h b/plugins/Kaleidoscope-LED-Stalker/src/kaleidoscope/plugin/LED-Stalker.h
index fdea4136..77d1d9f9 100644
--- a/plugins/Kaleidoscope-LED-Stalker/src/kaleidoscope/plugin/LED-Stalker.h
+++ b/plugins/Kaleidoscope-LED-Stalker/src/kaleidoscope/plugin/LED-Stalker.h
@@ -75,7 +75,7 @@ namespace stalker {
 class Haunt : public StalkerEffect::ColorComputer {
  public:
   explicit Haunt(const cRGB highlight_color);
-  Haunt(void)
+  Haunt()
     : Haunt(CRGB(0x40, 0x80, 0x80)) {}
 
   cRGB compute(uint8_t *step) final;
@@ -86,14 +86,14 @@ class Haunt : public StalkerEffect::ColorComputer {
 
 class BlazingTrail : public StalkerEffect::ColorComputer {
  public:
-  BlazingTrail(void);
+  BlazingTrail();
 
   cRGB compute(uint8_t *step) final;
 };
 
 class Rainbow : public StalkerEffect::ColorComputer {
  public:
-  Rainbow(void);
+  Rainbow();
 
   cRGB compute(uint8_t *step) final;
 };
diff --git a/plugins/Kaleidoscope-LED-Wavepool/src/kaleidoscope/plugin/LED-Wavepool.cpp b/plugins/Kaleidoscope-LED-Wavepool/src/kaleidoscope/plugin/LED-Wavepool.cpp
index 25ba2625..1b55ed43 100644
--- a/plugins/Kaleidoscope-LED-Wavepool/src/kaleidoscope/plugin/LED-Wavepool.cpp
+++ b/plugins/Kaleidoscope-LED-Wavepool/src/kaleidoscope/plugin/LED-Wavepool.cpp
@@ -96,7 +96,7 @@ uint8_t WavepoolEffect::TransientLEDMode::wp_rand() {
   return (Runtime.millisAtCycleStart() / MS_PER_FRAME) + pgm_read_byte((const uint8_t *)offset);
 }
 
-void WavepoolEffect::TransientLEDMode::update(void) {
+void WavepoolEffect::TransientLEDMode::update() {
 
   // limit the frame rate; one frame every 64 ms
   static uint8_t prev_time = 0;
diff --git a/plugins/Kaleidoscope-LEDEffect-BootGreeting/src/kaleidoscope/plugin/LEDEffect-BootGreeting.cpp b/plugins/Kaleidoscope-LEDEffect-BootGreeting/src/kaleidoscope/plugin/LEDEffect-BootGreeting.cpp
index 2efe3c23..e9355082 100644
--- a/plugins/Kaleidoscope-LEDEffect-BootGreeting/src/kaleidoscope/plugin/LEDEffect-BootGreeting.cpp
+++ b/plugins/Kaleidoscope-LEDEffect-BootGreeting/src/kaleidoscope/plugin/LEDEffect-BootGreeting.cpp
@@ -43,7 +43,7 @@ BootGreetingEffect::BootGreetingEffect(KeyAddr key_addr) {
   user_key_addr = key_addr;
 }
 
-void BootGreetingEffect::findLed(void) {
+void BootGreetingEffect::findLed() {
   if (user_key_addr.isValid()) {
     key_addr_ = user_key_addr;
     done_     = true;
diff --git a/plugins/Kaleidoscope-LEDEffect-BootGreeting/src/kaleidoscope/plugin/LEDEffect-BootGreeting.h b/plugins/Kaleidoscope-LEDEffect-BootGreeting/src/kaleidoscope/plugin/LEDEffect-BootGreeting.h
index 68646f5d..6a73d77b 100644
--- a/plugins/Kaleidoscope-LEDEffect-BootGreeting/src/kaleidoscope/plugin/LEDEffect-BootGreeting.h
+++ b/plugins/Kaleidoscope-LEDEffect-BootGreeting/src/kaleidoscope/plugin/LEDEffect-BootGreeting.h
@@ -40,7 +40,7 @@ class BootGreetingEffect : public kaleidoscope::Plugin {
   EventHandlerResult afterEachCycle();
 
  private:
-  static void findLed(void);
+  static void findLed();
   static bool done_;
   static KeyAddr key_addr_;
   static uint16_t start_time;
diff --git a/plugins/Kaleidoscope-LEDEffect-Breathe/src/kaleidoscope/plugin/LEDEffect-Breathe.cpp b/plugins/Kaleidoscope-LEDEffect-Breathe/src/kaleidoscope/plugin/LEDEffect-Breathe.cpp
index 73f3517f..0cbaf3d8 100644
--- a/plugins/Kaleidoscope-LEDEffect-Breathe/src/kaleidoscope/plugin/LEDEffect-Breathe.cpp
+++ b/plugins/Kaleidoscope-LEDEffect-Breathe/src/kaleidoscope/plugin/LEDEffect-Breathe.cpp
@@ -25,7 +25,7 @@
 
 namespace kaleidoscope {
 namespace plugin {
-void LEDBreatheEffect::TransientLEDMode::update(void) {
+void LEDBreatheEffect::TransientLEDMode::update() {
   if (!Runtime.has_leds)
     return;
 
diff --git a/plugins/Kaleidoscope-LEDEffect-Breathe/src/kaleidoscope/plugin/LEDEffect-Breathe.h b/plugins/Kaleidoscope-LEDEffect-Breathe/src/kaleidoscope/plugin/LEDEffect-Breathe.h
index 2473404a..fee01ced 100644
--- a/plugins/Kaleidoscope-LEDEffect-Breathe/src/kaleidoscope/plugin/LEDEffect-Breathe.h
+++ b/plugins/Kaleidoscope-LEDEffect-Breathe/src/kaleidoscope/plugin/LEDEffect-Breathe.h
@@ -42,7 +42,7 @@ class LEDBreatheEffect : public Plugin,
       : parent_(parent) {}
 
    protected:
-    void update(void) final;
+    void update() final;
 
    private:
     const LEDBreatheEffect *parent_;
diff --git a/plugins/Kaleidoscope-LEDEffect-Chase/src/kaleidoscope/plugin/LEDEffect-Chase.cpp b/plugins/Kaleidoscope-LEDEffect-Chase/src/kaleidoscope/plugin/LEDEffect-Chase.cpp
index 877e622a..f071fbe8 100644
--- a/plugins/Kaleidoscope-LEDEffect-Chase/src/kaleidoscope/plugin/LEDEffect-Chase.cpp
+++ b/plugins/Kaleidoscope-LEDEffect-Chase/src/kaleidoscope/plugin/LEDEffect-Chase.cpp
@@ -25,7 +25,7 @@
 namespace kaleidoscope {
 namespace plugin {
 
-void LEDChaseEffect::TransientLEDMode::update(void) {
+void LEDChaseEffect::TransientLEDMode::update() {
   if (!Runtime.has_leds)
     return;
 
diff --git a/plugins/Kaleidoscope-LEDEffect-Rainbow/src/kaleidoscope/plugin/LEDEffect-Rainbow.cpp b/plugins/Kaleidoscope-LEDEffect-Rainbow/src/kaleidoscope/plugin/LEDEffect-Rainbow.cpp
index a5b60aab..af07d9a7 100644
--- a/plugins/Kaleidoscope-LEDEffect-Rainbow/src/kaleidoscope/plugin/LEDEffect-Rainbow.cpp
+++ b/plugins/Kaleidoscope-LEDEffect-Rainbow/src/kaleidoscope/plugin/LEDEffect-Rainbow.cpp
@@ -27,7 +27,7 @@
 namespace kaleidoscope {
 namespace plugin {
 
-void LEDRainbowEffect::TransientLEDMode::update(void) {
+void LEDRainbowEffect::TransientLEDMode::update() {
   if (!Runtime.has_leds)
     return;
 
@@ -58,7 +58,7 @@ void LEDRainbowEffect::update_delay(byte delay) {
 
 // ---------
 
-void LEDRainbowWaveEffect::TransientLEDMode::update(void) {
+void LEDRainbowWaveEffect::TransientLEDMode::update() {
   if (!Runtime.has_leds)
     return;
 
diff --git a/plugins/Kaleidoscope-LEDEffect-Rainbow/src/kaleidoscope/plugin/LEDEffect-Rainbow.h b/plugins/Kaleidoscope-LEDEffect-Rainbow/src/kaleidoscope/plugin/LEDEffect-Rainbow.h
index 36d1cba6..b2495b59 100644
--- a/plugins/Kaleidoscope-LEDEffect-Rainbow/src/kaleidoscope/plugin/LEDEffect-Rainbow.h
+++ b/plugins/Kaleidoscope-LEDEffect-Rainbow/src/kaleidoscope/plugin/LEDEffect-Rainbow.h
@@ -28,11 +28,11 @@ class LEDRainbowEffect : public Plugin,
                          public LEDModeInterface {
  public:
   void brightness(uint8_t);
-  uint8_t brightness(void) {
+  uint8_t brightness() {
     return rainbow_value;
   }
   void update_delay(uint8_t);
-  uint8_t update_delay(void) {
+  uint8_t update_delay() {
     return rainbow_update_delay;
   }
 
@@ -69,11 +69,11 @@ class LEDRainbowEffect : public Plugin,
 class LEDRainbowWaveEffect : public Plugin, public LEDModeInterface {
  public:
   void brightness(uint8_t);
-  uint8_t brightness(void) {
+  uint8_t brightness() {
     return rainbow_value;
   }
   void update_delay(uint8_t);
-  uint8_t update_delay(void) {
+  uint8_t update_delay() {
     return rainbow_update_delay;
   }
 
diff --git a/plugins/Kaleidoscope-LEDEffect-SolidColor/src/kaleidoscope/plugin/LEDEffect-SolidColor.cpp b/plugins/Kaleidoscope-LEDEffect-SolidColor/src/kaleidoscope/plugin/LEDEffect-SolidColor.cpp
index c9c53f75..7107bfcd 100644
--- a/plugins/Kaleidoscope-LEDEffect-SolidColor/src/kaleidoscope/plugin/LEDEffect-SolidColor.cpp
+++ b/plugins/Kaleidoscope-LEDEffect-SolidColor/src/kaleidoscope/plugin/LEDEffect-SolidColor.cpp
@@ -23,7 +23,7 @@
 namespace kaleidoscope {
 namespace plugin {
 
-void LEDSolidColor::TransientLEDMode::onActivate(void) {
+void LEDSolidColor::TransientLEDMode::onActivate() {
   ::LEDControl.set_all_leds_to(parent_->r_,
                                parent_->g_,
                                parent_->b_);
diff --git a/plugins/Kaleidoscope-LEDEffect-SolidColor/src/kaleidoscope/plugin/LEDEffect-SolidColor.h b/plugins/Kaleidoscope-LEDEffect-SolidColor/src/kaleidoscope/plugin/LEDEffect-SolidColor.h
index 61bf95dd..7ac5c392 100644
--- a/plugins/Kaleidoscope-LEDEffect-SolidColor/src/kaleidoscope/plugin/LEDEffect-SolidColor.h
+++ b/plugins/Kaleidoscope-LEDEffect-SolidColor/src/kaleidoscope/plugin/LEDEffect-SolidColor.h
@@ -43,7 +43,7 @@ class LEDSolidColor : public Plugin,
       : parent_(parent) {}
 
    protected:
-    void onActivate(void) final;
+    void onActivate() final;
     void refreshAt(KeyAddr key_addr) final;
 
    private:
diff --git a/plugins/Kaleidoscope-LEDEffects/README.md b/plugins/Kaleidoscope-LEDEffects/README.md
index 8adea278..c5d29d86 100644
--- a/plugins/Kaleidoscope-LEDEffects/README.md
+++ b/plugins/Kaleidoscope-LEDEffects/README.md
@@ -15,7 +15,7 @@ them.
 
 KALEIDOSCOPE_INIT_PLUGINS(LEDControl, JukeBoxEffect);
 
-void setup(void) {
+void setup() {
   Kaleidoscope.setup();
 }
 ```
diff --git a/plugins/Kaleidoscope-LEDEffects/src/kaleidoscope/plugin/TriColor.cpp b/plugins/Kaleidoscope-LEDEffects/src/kaleidoscope/plugin/TriColor.cpp
index 09a3842d..324361bf 100644
--- a/plugins/Kaleidoscope-LEDEffects/src/kaleidoscope/plugin/TriColor.cpp
+++ b/plugins/Kaleidoscope-LEDEffects/src/kaleidoscope/plugin/TriColor.cpp
@@ -32,7 +32,7 @@ TriColor::TriColor(cRGB base_color, cRGB mod_color, cRGB esc_color) {
   esc_color_  = esc_color;
 }
 
-void TriColor::TransientLEDMode::update(void) {
+void TriColor::TransientLEDMode::update() {
   for (auto key_addr : KeyAddr::all()) {
     Key k = Layer.lookupOnActiveLayer(key_addr);
 
diff --git a/plugins/Kaleidoscope-LEDEffects/src/kaleidoscope/plugin/TriColor.h b/plugins/Kaleidoscope-LEDEffects/src/kaleidoscope/plugin/TriColor.h
index 02b74318..70da4c39 100644
--- a/plugins/Kaleidoscope-LEDEffects/src/kaleidoscope/plugin/TriColor.h
+++ b/plugins/Kaleidoscope-LEDEffects/src/kaleidoscope/plugin/TriColor.h
@@ -43,7 +43,7 @@ class TriColor : public Plugin,
       : parent_(parent) {}
 
    protected:
-    void update(void) final;
+    void update() final;
 
    private:
     const TriColor *parent_;
diff --git a/plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.cpp b/plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.cpp
index 7f885f69..6438be2d 100644
--- a/plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.cpp
+++ b/plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.cpp
@@ -47,7 +47,7 @@ uint16_t Leader::time_out = 1000;
 #define isActive()    (sequence_[0] != Key_NoKey)
 
 // --- actions ---
-int8_t Leader::lookup(void) {
+int8_t Leader::lookup() {
   bool match;
 
   for (uint8_t seq_index = 0;; seq_index++) {
@@ -82,7 +82,7 @@ int8_t Leader::lookup(void) {
 
 // --- api ---
 
-void Leader::reset(void) {
+void Leader::reset() {
   sequence_pos_ = 0;
   sequence_[0]  = Key_NoKey;
 }
diff --git a/plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.h b/plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.h
index b1ff9e03..d4de0447 100644
--- a/plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.h
+++ b/plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.h
@@ -69,7 +69,7 @@ class Leader : public kaleidoscope::Plugin {
 
   const dictionary_t *dictionary;
 
-  void reset(void);
+  void reset();
 
 #ifndef NDEPRECATED
   DEPRECATED(LEADER_TIME_OUT)
@@ -100,7 +100,7 @@ class Leader : public kaleidoscope::Plugin {
   uint16_t start_time_ = 0;
   uint16_t timeout_    = 1000;
 
-  int8_t lookup(void);
+  int8_t lookup();
 };
 
 }  // namespace plugin
diff --git a/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.cpp b/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.cpp
index 551e3b61..ab8c291e 100644
--- a/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.cpp
+++ b/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.cpp
@@ -91,7 +91,7 @@ EventHandlerResult MouseKeys::onNameQuery() {
 }
 
 // -----------------------------------------------------------------------------
-EventHandlerResult MouseKeys::onSetup(void) {
+EventHandlerResult MouseKeys::onSetup() {
   kaleidoscope::Runtime.hid().mouse().setup();
   kaleidoscope::Runtime.hid().absoluteMouse().setup();
 
diff --git a/plugins/Kaleidoscope-NumPad/src/kaleidoscope/plugin/NumPad.cpp b/plugins/Kaleidoscope-NumPad/src/kaleidoscope/plugin/NumPad.cpp
index 93fc335a..793f88e5 100644
--- a/plugins/Kaleidoscope-NumPad/src/kaleidoscope/plugin/NumPad.cpp
+++ b/plugins/Kaleidoscope-NumPad/src/kaleidoscope/plugin/NumPad.cpp
@@ -38,11 +38,11 @@ uint8_t NumPad::lock_hue = 170;
 KeyAddr NumPad::numpadLayerToggleKeyAddr;
 bool NumPad::numpadActive = false;
 
-EventHandlerResult NumPad::onSetup(void) {
+EventHandlerResult NumPad::onSetup() {
   return EventHandlerResult::OK;
 }
 
-void NumPad::setKeyboardLEDColors(void) {
+void NumPad::setKeyboardLEDColors() {
   ::LEDControl.set_mode(::LEDControl.get_mode_index());
 
   for (auto key_addr : KeyAddr::all()) {
diff --git a/plugins/Kaleidoscope-NumPad/src/kaleidoscope/plugin/NumPad.h b/plugins/Kaleidoscope-NumPad/src/kaleidoscope/plugin/NumPad.h
index b4792200..1c594a75 100644
--- a/plugins/Kaleidoscope-NumPad/src/kaleidoscope/plugin/NumPad.h
+++ b/plugins/Kaleidoscope-NumPad/src/kaleidoscope/plugin/NumPad.h
@@ -32,11 +32,11 @@ class NumPad : public kaleidoscope::Plugin {
   static cRGB color;
   static uint8_t lock_hue;
 
-  EventHandlerResult onSetup(void);
+  EventHandlerResult onSetup();
   EventHandlerResult afterEachCycle();
 
  private:
-  void setKeyboardLEDColors(void);
+  void setKeyboardLEDColors();
 
   static KeyAddr numpadLayerToggleKeyAddr;
   static bool numpadActive;
diff --git a/plugins/Kaleidoscope-SpaceCadet/src/kaleidoscope/plugin/SpaceCadet.h b/plugins/Kaleidoscope-SpaceCadet/src/kaleidoscope/plugin/SpaceCadet.h
index 4ed35a64..224c1240 100644
--- a/plugins/Kaleidoscope-SpaceCadet/src/kaleidoscope/plugin/SpaceCadet.h
+++ b/plugins/Kaleidoscope-SpaceCadet/src/kaleidoscope/plugin/SpaceCadet.h
@@ -72,7 +72,7 @@ class SpaceCadet : public kaleidoscope::Plugin {
     }
   };
 
-  SpaceCadet(void);
+  SpaceCadet();
 
   // Methods
   void enable() {
diff --git a/plugins/Kaleidoscope-Syster/src/kaleidoscope/plugin/Syster.cpp b/plugins/Kaleidoscope-Syster/src/kaleidoscope/plugin/Syster.cpp
index 8b0bcdec..149d1b9e 100644
--- a/plugins/Kaleidoscope-Syster/src/kaleidoscope/plugin/Syster.cpp
+++ b/plugins/Kaleidoscope-Syster/src/kaleidoscope/plugin/Syster.cpp
@@ -32,13 +32,13 @@ namespace kaleidoscope {
 namespace plugin {
 
 // --- api ---
-void Syster::reset(void) {
+void Syster::reset() {
   symbol_pos_ = 0;
   symbol_[0]  = 0;
   is_active_  = false;
 }
 
-bool Syster::is_active(void) {
+bool Syster::is_active() {
   return is_active_;
 }
 
diff --git a/plugins/Kaleidoscope-TypingBreaks/README.md b/plugins/Kaleidoscope-TypingBreaks/README.md
index 8a5ed733..10a73841 100644
--- a/plugins/Kaleidoscope-TypingBreaks/README.md
+++ b/plugins/Kaleidoscope-TypingBreaks/README.md
@@ -24,7 +24,7 @@ the box, without any further configuration:
 
 KALEIDOSCOPE_INIT_PLUGINS(EEPROMSettings, TypingBreaks);
 
-void setup (void) {
+void setup () {
   Kaleidoscope.setup ();
 
   TypingBreaks.settings.idle_time_limit = 60;
diff --git a/plugins/Kaleidoscope-Unicode/src/kaleidoscope/plugin/Unicode.cpp b/plugins/Kaleidoscope-Unicode/src/kaleidoscope/plugin/Unicode.cpp
index 5feaa72e..bcb78bd7 100644
--- a/plugins/Kaleidoscope-Unicode/src/kaleidoscope/plugin/Unicode.cpp
+++ b/plugins/Kaleidoscope-Unicode/src/kaleidoscope/plugin/Unicode.cpp
@@ -32,7 +32,7 @@ namespace plugin {
 uint8_t Unicode::input_delay_;
 Key Unicode::linux_key_ = Key_U;
 
-void Unicode::start(void) {
+void Unicode::start() {
   switch (::HostOS.os()) {
   case hostos::LINUX:
     kaleidoscope::Runtime.hid().keyboard().pressRawKey(Key_LeftControl);
@@ -61,7 +61,7 @@ void Unicode::start(void) {
   }
 }
 
-void Unicode::input(void) {
+void Unicode::input() {
   switch (::HostOS.os()) {
   case hostos::LINUX:
     break;
@@ -76,7 +76,7 @@ void Unicode::input(void) {
   delay(input_delay_);
 }
 
-void Unicode::end(void) {
+void Unicode::end() {
   switch (::HostOS.os()) {
   case hostos::LINUX:
     kaleidoscope::Runtime.hid().keyboard().pressRawKey(Key_Spacebar);
@@ -193,13 +193,13 @@ __attribute__((weak)) Key hexToKeysWithNumpad(uint8_t hex) {
   return {m, KEY_FLAGS};
 }
 
-__attribute__((weak)) void unicodeCustomStart(void) {
+__attribute__((weak)) void unicodeCustomStart() {
 }
 
-__attribute__((weak)) void unicodeCustomEnd(void) {
+__attribute__((weak)) void unicodeCustomEnd() {
 }
 
-__attribute__((weak)) void unicodeCustomInput(void) {
+__attribute__((weak)) void unicodeCustomInput() {
 }
 
 kaleidoscope::plugin::Unicode Unicode;
diff --git a/plugins/Kaleidoscope-Unicode/src/kaleidoscope/plugin/Unicode.h b/plugins/Kaleidoscope-Unicode/src/kaleidoscope/plugin/Unicode.h
index a68849a7..e0a1b600 100644
--- a/plugins/Kaleidoscope-Unicode/src/kaleidoscope/plugin/Unicode.h
+++ b/plugins/Kaleidoscope-Unicode/src/kaleidoscope/plugin/Unicode.h
@@ -26,9 +26,9 @@ namespace kaleidoscope {
 namespace plugin {
 class Unicode : public kaleidoscope::Plugin {
  public:
-  static void start(void);
-  static void input(void);
-  static void end(void);
+  static void start();
+  static void input();
+  static void end();
 
   static void type(uint32_t unicode);
   static void typeCode(uint32_t unicode);
@@ -58,8 +58,8 @@ class Unicode : public kaleidoscope::Plugin {
 Key hexToKey(uint8_t hex);
 Key hexToKeysWithNumpad(uint8_t hex);
 
-void unicodeCustomStart(void);
-void unicodeCustomEnd(void);
-void unicodeCustomInput(void);
+void unicodeCustomStart();
+void unicodeCustomEnd();
+void unicodeCustomInput();
 
 extern kaleidoscope::plugin::Unicode Unicode;