diff --git a/.github/workflows/outboards/boards/klacker_bs b/.github/workflows/outboards/boards/klacker_bs
new file mode 100644
index 0000000..5731d3a
--- /dev/null
+++ b/.github/workflows/outboards/boards/klacker_bs
@@ -0,0 +1,7 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+outboard_repository=weteor/Klacker_BS-Config
+outboard_ref=main
+outboard_from=boards/arm/klacker_bs
+outboard_to=boards/arm/klacker_bs
diff --git a/.github/workflows/test-all-boards.yml b/.github/workflows/test-all-boards.yml
index 27be107..27dfc24 100644
--- a/.github/workflows/test-all-boards.yml
+++ b/.github/workflows/test-all-boards.yml
@@ -9,5 +9,5 @@ jobs:
     if: github.repository_owner == 'manna-harbour'
     uses: manna-harbour/zmk-config/.github/workflows/main.yml@31a649e5571b4572d7010561dd3f191922cd9410
     with:
-      board: '["ahokore","ble_chiffre","corne-ish_zen_left","corne-ish_zen_right","ferris_rev02","one42","planck_rev6","preonic_rev3","technikable","zaphod"]'
+      board: '["ahokore","ble_chiffre","corne-ish_zen_left","corne-ish_zen_right","ferris_rev02","klacker_bs","one42","planck_rev6","preonic_rev3","technikable","zaphod"]'
 
diff --git a/config/klacker_bs.keymap b/config/klacker_bs.keymap
new file mode 100644
index 0000000..ae8e9fb
--- /dev/null
+++ b/config/klacker_bs.keymap
@@ -0,0 +1,6 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#include "../miryoku/custom_config.h"
+#include "../miryoku/mapping/53-klacker_bs.h"
+#include "../miryoku/miryoku.dtsi"
diff --git a/miryoku/mapping/53-klacker_bs.h b/miryoku/mapping/53-klacker_bs.h
new file mode 100644
index 0000000..46f6f78
--- /dev/null
+++ b/miryoku/mapping/53-klacker_bs.h
@@ -0,0 +1,21 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#define XXX &none
+
+#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  XXX  XXX  XXX \
+K10  K11  K12  K13  K14             K15  K16  K17  K18  K19  XXX  XXX  XXX \
+K20  K21  K22  K23  K24     XXX     K25  K26  K27  K28  K29  XXX  XXX  XXX \
+XXX  XXX                 XXX   XXX                 XXX  XXX  XXX  XXX  XXX \
+               K33  K34             K35  K36
+
+#define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 49 50
+#define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 51 52
+
+#define MIRYOKU_KLUDGE_THUMBCOMBOS