diff --git a/.github/workflows/outboards/hummingbird.outboard b/.github/workflows/outboards/hummingbird.outboard
new file mode 100644
index 0000000..361ae04
--- /dev/null
+++ b/.github/workflows/outboards/hummingbird.outboard
@@ -0,0 +1,7 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+outboard_repository=jcmkk3/hummingbird-zmk-config
+outboard_ref=main
+outboard_from=config/boards/shields/hummingbird
+outboard_to=boards/shields/hummingbird
diff --git a/.github/workflows/test-all-seeeduino_xiao-shields.yml b/.github/workflows/test-all-seeeduino_xiao-shields.yml
new file mode 100644
index 0000000..12e2ee1
--- /dev/null
+++ b/.github/workflows/test-all-seeeduino_xiao-shields.yml
@@ -0,0 +1,13 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+name: 'Test All Seeeduino Xiao Shields
+on:
+  - workflow_dispatch
+jobs:
+  build:
+    if: github.repository_owner == 'manna-harbour'
+    uses: manna-harbour/zmk-config/.github/workflows/main.yml@ce28dc6609bff042dfcf68e03c9a0c201129cbce
+    with:
+      board: '["seeeduino_xiao"]'
+      shield: '["hummingbird"]'
diff --git a/config/hummingbird.conf b/config/hummingbird.conf
new file mode 100644
index 0000000..d29a372
--- /dev/null
+++ b/config/hummingbird.conf
@@ -0,0 +1,4 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=16
diff --git a/config/hummingbird.keymap b/config/hummingbird.keymap
new file mode 100644
index 0000000..3fabb7a
--- /dev/null
+++ b/config/hummingbird.keymap
@@ -0,0 +1,6 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#include "../miryoku/config.h"
+#include "../miryoku/mapping/32-hummingbird.h"
+#include "../miryoku/miryoku.dtsi"
diff --git a/miryoku/mapping/32-hummingbird.h b/miryoku/mapping/32-hummingbird.h
new file mode 100644
index 0000000..bf1a050
--- /dev/null
+++ b/miryoku/mapping/32-hummingbird.h
@@ -0,0 +1,28 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#define MIRYOKU_MAPPING( \
+K00, K01, K02, K03, K04,      K05, K06, K07, K08, K09, \
+K10, K11, K12, K13, K14,      K15, K16, K17, K18, K19, \
+K20, K21, K22, K23, K24,      K25, K26, K27, K28, K29, \
+N30, N31, K32, K33, K34,      K35, K36, K37, N38, N39 \
+) \
+K00  K01  K02  K03  K04       K05  K06  K07  K08  K09 \
+K10  K11  K12  K13  K14       K15  K16  K17  K18  K19 \
+     K21  K22  K23                 K26  K27  K28 \
+               K33  K34       K35  K36
+
+#define MIRYOKU_KLUDGE_TOPROWCOMBOS_LEFTPINKIE 1 2
+#define MIRYOKU_KLUDGE_TOPROWCOMBOS_LEFTINNERINDEX 2 3
+#define MIRYOKU_KLUDGE_TOPROWCOMBOS_RIGHTINNERINDEX 6 7
+#define MIRYOKU_KLUDGE_TOPROWCOMBOS_RIGHTPINKIE 7 8
+
+#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_LEFTPINKIE 20 21
+#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_LEFTINNERINDEX 21 22
+#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_RIGHTINNERINDEX 23 24
+#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_RIGHTPINKIE 24 25
+#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS
+
+#define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 26 27
+#define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 28 29
+#define MIRYOKU_KLUDGE_THUMBCOMBOS
diff --git a/readme.org b/readme.org
index 297d3f7..8e41be2 100644
--- a/readme.org
+++ b/readme.org
@@ -159,6 +159,11 @@ On each hand, only the main alpha block of 3 rows by 5 columns and the 3 most ap
 Notes or diagrams are provided below where the selection of keys is not obvious or where alternatives are provided via mapping configuration options.
 
 
+**** 32-hummingbird
+
+[[#bottom-row-combos][Bottom row combos]] and [[#thumb-combos][thumb combos]] are enabled.
+
+
 **** 34-ferris
 
 [[#thumb-combos][Thumb combos]] are enabled.