diff --git a/behaviors/canadian-multilingual-standard.dtsi b/behaviors/canadian-multilingual-standard.dtsi
index 9b5a17f..98890de 100644
--- a/behaviors/canadian-multilingual-standard.dtsi
+++ b/behaviors/canadian-multilingual-standard.dtsi
@@ -3,24 +3,38 @@
 #include "../zmk-nodefree-config/helper.h"
 
 /* Canadian Multilingual Standard Mappings */
-ZMK_BEHAVIOR(A_G,   macro, bindings = <&kp BACKSLASH>;)     // À
-ZMK_BEHAVIOR(E_C,   macro, bindings = <&kp SLASH>;)         // É
-ZMK_BEHAVIOR(E_G,   macro, bindings = <&kp APOS>;)          // È
-ZMK_BEHAVIOR(CEDIL, macro, bindings = <&kp RBKT>;)          // Ç
-ZMK_BEHAVIOR(CIRC,  macro, bindings = <&kp LBKT>;)          // ^)
-ZMK_BEHAVIOR(SLSH,  macro, bindings = <&kp GRAVE>;)          // |)
-ZMK_BEHAVIOR(GRA,   macro, bindings = // `
+ZMK_BEHAVIOR(A_GR,   macro, bindings = <&kp BACKSLASH>;) // À
+ZMK_BEHAVIOR(E_CU,   macro, bindings = <&kp SLASH>;)     // É
+ZMK_BEHAVIOR(E_GR,   macro, bindings = <&kp APOS>;)      // È
+ZMK_BEHAVIOR(CEDIL, macro, bindings = <&kp RBKT>;)       // Ç
+ZMK_BEHAVIOR(CAR,  macro, bindings = <&kp LBKT>;)        // ^
+ZMK_BEHAVIOR(SLSH,  macro, bindings = <&kp GRAVE>;)      // |
+ZMK_BEHAVIOR(GRA,  macro, bindings = // `
     <&macro_press &kp RALT>,
     <&macro_tap &kp LBKT>,
     <&macro_release &kp RALT>;)
-ZMK_BEHAVIOR(AIGU,  macro, bindings =  // ´
+ZMK_BEHAVIOR(TREMA, macro, bindings = // ¨
+    <&macro_press &kp LSHFT>,
+    <&macro_tap &kp LBKT>,
+    <&macro_release &kp LSHFT>;)
+ZMK_BEHAVIOR(GRAV,  macro, bindings = // ` to input
+    <&macro_param_1to1>,
+    <&macro_press &kp RALT>,
+    <&macro_tap &kp LBKT>,
+    <&macro_release &kp RALT>,
+    <&macro_tap &kp MACRO_PLACEHOLDER>;)
+ZMK_BEHAVIOR(AIGU,  macro, bindings =  // ´ to input
+    <&macro_param_1to1>,
     <&macro_press &kp RALT>,
     <&macro_tap &kp SLASH>,
-    <&macro_release &kp RALT>;)
-ZMK_BEHAVIOR(TREMA, macro, bindings =
+    <&macro_release &kp RALT>,
+    <&macro_tap &kp MACRO_PLACEHOLDER>;)
+ZMK_BEHAVIOR(TREM, macro, bindings = // ¨ to input
+    <&macro_param_1to1>,
     <&macro_press &kp LSHFT>,
     <&macro_tap &kp LBKT>,
-    <&macro_release &kp LSHFT>;)
+    <&macro_release &kp LSHFT>,
+    <&macro_tap &kp MACRO_PLACEHOLDER>;)
 ZMK_BEHAVIOR(DEG,   macro, bindings = // °
     <&macro_press &kp RALT>,
     <&macro_tap &kp SEMI>,
diff --git a/config/corne.keymap b/config/corne.keymap
index a880457..7fbc7ed 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -53,11 +53,11 @@ ZMK_LAYER(ergol,
 
 ZMK_LAYER(accent,
 // ╭─────┬─────────────┬─────────────┬─────────────┬──────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬──────────────┬───────╮
-     ___   &fr_ae        &math_micro   &fr_u_gr      ___            ___            ___         ___           &fr_e_cf      &fr_o_cf     ___            ___
+     XXX   XXX           XXX           &TREM E       XXX            XXX            XXX         &TREM I       &TREM O       &TREM U      &TREMA         XXX
 // ├─────┼─────────────┼─────────────┼─────────────┼──────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼──────────────┼───────┤
-     ___   &fr_a_gr      &sk LALT      &fr_u_cf      &fr_e_ac       ___            ___         &sk RSHFT     &sk LCTRL     &fr_e_gr     &fr_oe         ___
+     XXX   &GRAV A       &GRAV E       &CIRC E       &AIGU E        XXX            XXX         &CIRC I       &CIRC O       &CIRC U      &GRA           XXX
 // ├─────┼─────────────┼─────────────┼─────────────┼──────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼──────────────┼───────┤
-     ___   &fr_a_cf      ___           &fr_c_cd      ___            ___            ___         &kp GRAVE     &kp DOT       ___          ___            ___
+     XXX   &CIRC A       XXX           &CEDIL        XXX            XXX            XXX         XXX           XXX           &kp GRAVE    &CAR           XXX
 // ╰─────┴─────────────┴─────────────┼─────────────┼──────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┴──────────────┴───────╯
                                        ___           ___            ___            ___         ___           ___
 //                                   ╰─────────────┴──────────────┴────────────╯ ╰───────────┴─────────────┴─────────────╯