diff --git a/.vscode/settings.json b/.vscode/settings.json
index 48ce34c..12c73c8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -14,7 +14,12 @@
         "xstddef": "c",
         "type_traits": "c",
         "utility": "c",
-        "ranges": "c"
+        "ranges": "c",
+        "compare": "c",
+        "cstdint": "c",
+        "chrono": "c",
+        "typeindex": "c",
+        "typeinfo": "c"
     },
     "C_Cpp.errorSquiggles": "disabled",
 }
diff --git a/Makefile b/Makefile
index 8e10230..2e11530 100755
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,13 @@
-default:
+voyager:
+	@mkdir -p "$$(pwd)/output"
+	docker run -it --rm \
+		--user $$(id -u):$$(id -g) \
+		-v "$$(pwd)/output:/build_output" \
+		-v "$$(pwd)/keyboards:/qmk_firmware/keyboards:ro" \
+		-e QMK_TARGET="betalupi_voyager:default" \
+		git.betalupi.com/mark/qmk
+
+ergodox:
 	@mkdir -p "$$(pwd)/output"
 	docker run -it --rm \
 		--user $$(id -u):$$(id -g) \
@@ -7,11 +16,11 @@ default:
 		-e QMK_TARGET="betalupi_ergodox:default" \
 		git.betalupi.com/mark/qmk
 
-upload:
+ergodox_upload:
 	wally-cli output/betalupi_ergodox_default.hex
 
 docker:
 	docker build docker -t git.betalupi.com/mark/qmk
 
 
-.PHONY: docker upload default
\ No newline at end of file
+.PHONY: voyager ergodox ergodox_upload docker
\ No newline at end of file
diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/layers.inc b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/layers.inc
index 2d6addd..f26610f 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/layers.inc
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/layers.inc
@@ -1,9 +1,3 @@
-// ORDER MATTERS!
-// Don't forget how QMK layers work...
-//
-// Learned that the hard way.
-
-
 // First layer will be "default" layer in QMK.
 // Second will have index 1, etc. See layers.h
 
diff --git a/keyboards/betalupi_ergodox/rules.mk b/keyboards/betalupi_ergodox/rules.mk
index 5ab4030..181b122 100644
--- a/keyboards/betalupi_ergodox/rules.mk
+++ b/keyboards/betalupi_ergodox/rules.mk
@@ -1,38 +1,25 @@
-# MCU name
 MCU = atmega32u4
+BOOTLOADER = halfkay
 
 # Enable raw HID for bi-directional communication
 RAW_ENABLE = yes
 
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
-BOOTLOADER = halfkay
-
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = no   # Virtual DIP switch configuration
-MOUSEKEY_ENABLE  = no  # Mouse keys
-EXTRAKEY_ENABLE  = yes  # Audio control and System control
-CONSOLE_ENABLE   = no   # Console for debug
-COMMAND_ENABLE   = no   # Commands for debug and configuration
-CUSTOM_MATRIX    = lite # Custom matrix file for the ErgoDox EZ
-NKRO_ENABLE      = yes  # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-UNICODE_ENABLE   = no  # Unicode
-SWAP_HANDS_ENABLE= no  # Allow swapping hands of keyboard
-SLEEP_LED_ENABLE = no
-API_SYSEX_ENABLE = no
-MOUSE_SHARED_EP = no
-MAGIC_ENABLE = no
-LEADER_ENABLE = no
-TAP_DANCE_ENABLE = yes
-AUDIO_SUPPORTED = no
+BOOTMAGIC_ENABLE  = no
+MOUSEKEY_ENABLE   = no
+EXTRAKEY_ENABLE   = yes
+CONSOLE_ENABLE    = no
+COMMAND_ENABLE    = no
+CUSTOM_MATRIX     = lite
+NKRO_ENABLE       = yes
+UNICODE_ENABLE    = no
+SWAP_HANDS_ENABLE = no
+SLEEP_LED_ENABLE  = no
+API_SYSEX_ENABLE  = no
+MOUSE_SHARED_EP   = no
+MAGIC_ENABLE      = no
+LEADER_ENABLE     = no
+TAP_DANCE_ENABLE  = yes
+AUDIO_SUPPORTED   = no
 BACKLIGHT_SUPPORTED = no
 
 DEBOUNCE_TYPE = sym_eager_pr
@@ -59,8 +46,7 @@ LTO_ENABLE = yes
 # Enable keyboard-specific effects
 RGB_MATRIX_CUSTOM_KB = yes
 
-
-# FROM glow dir
+# From glow dir
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = is31fl3731
 RGBLIGHT_ENABLE = yes