diff --git a/keyboards/viktus/osav2/keymaps/default/keymap.c b/keyboards/viktus/osav2/keymaps/default/keymap.c
index 41533f136ca..9efc093864a 100644
--- a/keyboards/viktus/osav2/keymaps/default/keymap.c
+++ b/keyboards/viktus/osav2/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_normal_split(
-        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6,       KC_7,   KC_8, KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_TILD,
+        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6,       KC_7,   KC_8, KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
         KC_PGUP, KC_TAB,  KC_Q, KC_W,    KC_E, KC_R,   KC_T,    	 KC_Y, KC_U,   KC_I, KC_O, KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_PGDN, KC_LCTL, KC_A, KC_S,    KC_D, KC_F,   KC_G,    	 KC_H, KC_J,   KC_K, KC_L, KC_SCLN, KC_QUOT,          KC_ENT,
                  KC_LSFT, KC_Z, KC_X,    KC_C, KC_V,   KC_B,	           KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/viktus/osav2/keymaps/via/keymap.c b/keyboards/viktus/osav2/keymaps/via/keymap.c
index 41533f136ca..9efc093864a 100644
--- a/keyboards/viktus/osav2/keymaps/via/keymap.c
+++ b/keyboards/viktus/osav2/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_normal_split(
-        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6,       KC_7,   KC_8, KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_TILD,
+        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6,       KC_7,   KC_8, KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
         KC_PGUP, KC_TAB,  KC_Q, KC_W,    KC_E, KC_R,   KC_T,    	 KC_Y, KC_U,   KC_I, KC_O, KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_PGDN, KC_LCTL, KC_A, KC_S,    KC_D, KC_F,   KC_G,    	 KC_H, KC_J,   KC_K, KC_L, KC_SCLN, KC_QUOT,          KC_ENT,
                  KC_LSFT, KC_Z, KC_X,    KC_C, KC_V,   KC_B,	           KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/viktus/osav2_topre/ec.c b/keyboards/viktus/osav2_topre/ec.c
index fd2e8fa0ec5..076ffc0ba86 100644
--- a/keyboards/viktus/osav2_topre/ec.c
+++ b/keyboards/viktus/osav2_topre/ec.c
@@ -151,16 +151,16 @@ bool ec_matrix_scan(matrix_row_t current_matrix[]) {
             switch(row) {
                 case 0:
                     switch(col) {
-                        case 14: // lower threshold for split backspace: left 1U( rest,  btm)
-                        case 15: // lower threshold for 2U backspace: 2U(38 rest, 60 btm)
-                            reset_pt = 44;
-                            actuation_pt = 48;
+                        case 14: // lower threshold for split backspace: left 1U
+                        case 15: // lower threshold for 2U backspace: 2U
+                            reset_pt = 48;
+                            actuation_pt = 53;
                             break;
                     }
                     break;
                 case 3:
                     switch(col) {
-                        case 14: // Lower threshold for right shift: 1.75U(40 rest, 70 btm)
+                        case 14: // Lower threshold for right shift: 1.75U
                             reset_pt = 48;
                             actuation_pt = 53;
                             break;
@@ -168,17 +168,17 @@ bool ec_matrix_scan(matrix_row_t current_matrix[]) {
                     break;
                 case 4:
                     switch(col) {
-                        case 3: // Lower threshold for left space: col3( rest,  btm)
-                        case 4: // Lower threshold for left space: col4(38 rest, 88 btm)
+                        case 3: // Lower threshold for left space: col3
+                        case 4: // Lower threshold for left space: col4
                             reset_pt = 50;
                             actuation_pt = 60;
                             break;
-                        case 5: // Lower threshold for left space: col5( rest,  btm)
-                        case 6: // Lower threshold for left space: col6(40 rest, 80 btm)
+                        case 5: // Lower threshold for left space: col5
+                        case 6: // Lower threshold for left space: col6
                             reset_pt = 48;
                             actuation_pt = 58;
                             break;
-                        case 14: // Lower threshold for right shift: 2.75U( rest,  btm)
+                        case 14: // Lower threshold for right shift: 2.75U
                             reset_pt = 48;
                             actuation_pt = 53;
                             break;
diff --git a/keyboards/viktus/osav2_topre/keymaps/default/keymap.c b/keyboards/viktus/osav2_topre/keymaps/default/keymap.c
index b9561c9b325..bb7bc014744 100644
--- a/keyboards/viktus/osav2_topre/keymaps/default/keymap.c
+++ b/keyboards/viktus/osav2_topre/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_back_175u_shift(
-        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6, KC_7, KC_8,   KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_TILDE,
+        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6, KC_7, KC_8,   KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
         KC_PGUP, KC_TAB,  KC_Q, KC_W,    KC_E, KC_R,   KC_T,       KC_Y, KC_U,   KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_PGDN, KC_CAPS, KC_A, KC_S,    KC_D, KC_F,   KC_G,       KC_H, KC_J,   KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
                  KC_LSFT, KC_Z, KC_X,    KC_C, KC_V,   KC_B,       KC_B, KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/viktus/osav2_topre/keymaps/via/keymap.c b/keyboards/viktus/osav2_topre/keymaps/via/keymap.c
index b9561c9b325..bb7bc014744 100644
--- a/keyboards/viktus/osav2_topre/keymaps/via/keymap.c
+++ b/keyboards/viktus/osav2_topre/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_back_175u_shift(
-        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6, KC_7, KC_8,   KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_TILDE,
+        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6, KC_7, KC_8,   KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
         KC_PGUP, KC_TAB,  KC_Q, KC_W,    KC_E, KC_R,   KC_T,       KC_Y, KC_U,   KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_PGDN, KC_CAPS, KC_A, KC_S,    KC_D, KC_F,   KC_G,       KC_H, KC_J,   KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
                  KC_LSFT, KC_Z, KC_X,    KC_C, KC_V,   KC_B,       KC_B, KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),