diff --git a/Makefile b/Makefile
index 2b04143a..8f830f44 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,14 @@
 # This stub makefile for a Kaleidoscope plugin pulls in 
 # all targets from the Kaleidoscope-Plugin library
 
-MAKEFILE_PREFIX=keyboardio/avr/libraries/Kaleidoscope-Plugin/build
 UNAME_S := $(shell uname -s)
 
 ifeq ($(UNAME_S),Darwin)
-BOARD_HARDWARE_PATH ?= $(HOME)/Documents/Arduino/hardware
+SKETCHBOOK_DIR ?= $(HOME)/Documents/Arduino/
 else
-BOARD_HARDWARE_PATH ?= $(HOME)/Arduino/hardware
+SKETCHBOOK_DIR ?= $(HOME)/Arduino
 endif
 
-include $(BOARD_HARDWARE_PATH)/$(MAKEFILE_PREFIX)/rules.mk
+BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
+KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
diff --git a/examples/LED-Wavepool/LED-Wavepool.ino b/examples/LED-Wavepool/LED-Wavepool.ino
index 2e79039d..66a103bc 100644
--- a/examples/LED-Wavepool/LED-Wavepool.ino
+++ b/examples/LED-Wavepool/LED-Wavepool.ino
@@ -17,8 +17,8 @@
  */
 
 #include <Kaleidoscope.h>
+#include <Kaleidoscope-LEDControl.h>
 #include <Kaleidoscope-LED-Wavepool.h>
-#include "LED-Off.h"
 
 const Key keymaps[][ROWS][COLS] PROGMEM = {
   [0] = KEYMAP_STACKED
@@ -40,9 +40,13 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
     Key_NoKey),
 };
 
-void setup() {
-  Kaleidoscope.use(&LEDOff, &WavepoolEffect);
+KALEIDOSCOPE_INIT_PLUGINS(
+    LEDControl,
+    LEDOff,
+    WavepoolEffect
+);
 
+void setup() {
   Kaleidoscope.setup();
 
   WavepoolEffect.idle_timeout = 5000;  // 5 seconds
diff --git a/src/Kaleidoscope/LED-Wavepool.cpp b/src/Kaleidoscope/LED-Wavepool.cpp
index 4aa1b289..c4873c49 100644
--- a/src/Kaleidoscope/LED-Wavepool.cpp
+++ b/src/Kaleidoscope/LED-Wavepool.cpp
@@ -17,7 +17,6 @@
  */
 
 #include <Kaleidoscope-LED-Wavepool.h>
-#include <LEDUtils.h>
 
 namespace kaleidoscope {