diff --git a/config/clog_v2.keymap b/config/clog_v2.keymap
index 88780e9..854cd20 100644
--- a/config/clog_v2.keymap
+++ b/config/clog_v2.keymap
@@ -1,8 +1,6 @@
 // Copyright 2022 Manna Harbour
 // https://github.com/manna-harbour/miryoku
 
-#define MIRYOKU_KLUDGE_THUMBCOMBOS
-
 #include "../miryoku/custom_config.h"
-#include "../miryoku/mapping/36/minidox.h"
+#include "../miryoku/mapping/36/clog_v2.h"
 #include "../miryoku/miryoku.dtsi"
diff --git a/miryoku/mapping/34/osprette.h b/miryoku/mapping/34/osprette.h
index 63b52f1..7605a1e 100644
--- a/miryoku/mapping/34/osprette.h
+++ b/miryoku/mapping/34/osprette.h
@@ -3,21 +3,26 @@
 
 #if !defined (MIRYOKU_LAYOUTMAPPING_OSPRETTE)
 
-#define MIRYOKU_LAYOUTMAPPING_OSPRETTE( \
-     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 \
-) \
-          K01  K02  K03  K04       K05  K06  K07  K08 \
-K00  K10  K11  K12  K13  K14       K15  K16  K17  K18  K19  K09 \
-     K20  K21  K22  K23  K24       K25  K26  K27  K28  K29 \
-                    K33  K34       K35  K36
+  #define MIRYOKU_LAYOUTMAPPING_OSPRETTE( \
+       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 \
+  ) \
+            K01  K02  K03  K04       K05  K06  K07  K08 \
+  K00  K10  K11  K12  K13  K14       K15  K16  K17  K18  K19  K09 \
+       K20  K21  K22  K23  K24       K25  K26  K27  K28  K29 \
+                      K33  K34       K35  K36
 
-#define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 30 31
-#define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 32 33
+  #define MIRYOKU_KLUDGE_TOPROWCOMBOS_LEFTPINKIE 0 1
+  #define MIRYOKU_KLUDGE_TOPROWCOMBOS_LEFTINNERINDEX 1 2
+  #define MIRYOKU_KLUDGE_TOPROWCOMBOS_RIGHTINNERINDEX 5 6
+  #define MIRYOKU_KLUDGE_TOPROWCOMBOS_RIGHTPINKIE 6 7
 
-#define MIRYOKU_KLUDGE_THUMBCOMBOS
+  #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 30 31
+  #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 32 33
+
+  #define MIRYOKU_KLUDGE_THUMBCOMBOS
 
 #endif
 
diff --git a/miryoku/mapping/36/clog_v2.h b/miryoku/mapping/36/clog_v2.h
new file mode 100644
index 0000000..87c777a
--- /dev/null
+++ b/miryoku/mapping/36/clog_v2.h
@@ -0,0 +1,29 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#if !defined (MIRYOKU_LAYOUTMAPPING_CLOG_V2)
+
+  #define MIRYOKU_LAYOUTMAPPING_CLOG_V2( \
+       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 \
+       ) \
+            K01  K02  K03  K04       K05  K06  K07  K08 \
+  K00  K10  K11  K12  K13  K14       K15  K16  K17  K18  K19  K09 \
+       K20  K21  K22  K23  K24       K25  K26  K27  K28  K29 \
+                 K32  K33  K34       K35  K36  K37
+
+  #define MIRYOKU_KLUDGE_TOPROWCOMBOS_LEFTPINKIE 0 1
+  #define MIRYOKU_KLUDGE_TOPROWCOMBOS_LEFTINNERINDEX 1 2
+  #define MIRYOKU_KLUDGE_TOPROWCOMBOS_RIGHTINNERINDEX 5 6
+  #define MIRYOKU_KLUDGE_TOPROWCOMBOS_RIGHTPINKIE 6 7
+
+  #define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 31 32
+  #define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 33 34
+
+  #define MIRYOKU_KLUDGE_THUMBCOMBOS
+
+#endif
+
+#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_CLOG_V2