diff --git a/config/keyboard/desktop.conf b/config/keyboard/desktop.conf
index 23901fc5..c0bd40b7 100644
--- a/config/keyboard/desktop.conf
+++ b/config/keyboard/desktop.conf
@@ -25,9 +25,9 @@ KEY_FENRIR,KEY_SHIFT,KEY_KP1=review_prev_char_phonetic
 KEY_FENRIR,KEY_SHIFT,KEY_KP3=review_next_char_phonetic
 KEY_FENRIR,KEY_CTRL,KEY_KP8=review_up
 KEY_FENRIR,KEY_CTRL,KEY_KP2=review_down
+KEY_FENRIR,KEY_KPDOT=exit_review
 KEY_KPDOT=cursor_position
 KEY_FENRIR,KEY_I=indent_curr_line
-KEY_FENRIR,KEY_KPDOT=exit_review
 KEY_FENRIR,KEY_KP5=curr_screen
 KEY_FENRIR,KEY_KP8=curr_screen_before_cursor
 KEY_FENRIR,KEY_KP2=curr_screen_after_cursor
@@ -98,17 +98,16 @@ KEY_FENRIR,KEY_ALT,KEY_LEFT=dec_speech_pitch
 KEY_FENRIR,KEY_ALT,KEY_UP=inc_sound_volume
 KEY_FENRIR,KEY_ALT,KEY_DOWN=dec_sound_volume
 KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_C=clear_clipboard
-KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
 KEY_FENRIR,KEY_HOME=first_clipboard
 KEY_FENRIR,KEY_END=last_clipboard
 KEY_FENRIR,KEY_PAGEUP=prev_clipboard
 KEY_FENRIR,KEY_PAGEDOWN=next_clipboard
 KEY_FENRIR,KEY_SHIFT,KEY_C=curr_clipboard
-KEY_FENRIR,KEY_X=set_mark
-KEY_FENRIR,KEY_SHIFT,KEY_X=marked_text
 KEY_FENRIR,KEY_C=copy_marked_to_clipboard
 KEY_FENRIR,KEY_V=paste_clipboard
-
+KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
+KEY_FENRIR,KEY_X=set_mark
+KEY_FENRIR,KEY_SHIFT,KEY_X=marked_text
 # linux specific
 KEY_FENRIR,KEY_SHIFT,KEY_R=export_clipboard_to_x
 KEY_FENRIR,KEY_CTRL,KEY_UP=inc_alsa_volume
diff --git a/config/keyboard/laptop.conf b/config/keyboard/laptop.conf
index 12589b1b..ea6592d2 100644
--- a/config/keyboard/laptop.conf
+++ b/config/keyboard/laptop.conf
@@ -27,6 +27,7 @@ KEY_FENRIR,KEY_CTRL,KEY_I=review_up
 KEY_FENRIR,KEY_CTRL,KEY_COMMA=review_down
 KEY_FENRIR,KEY_SLASH=exit_review
 KEY_FENRIR,KEY_SHIFT,KEY_DOT=cursor_position
+2,KEY_FENRIR,KEY_I=indent_curr_line
 KEY_FENRIR,KEY_SHIFT,KEY_K=curr_screen
 KEY_FENRIR,KEY_SHIFT,KEY_I=curr_screen_before_cursor
 KEY_FENRIR,KEY_SHIFT,KEY_COMMA=curr_screen_after_cursor
@@ -69,7 +70,6 @@ KEY_FENRIR,KEY_SHIFT,KEY_0=set_bookmark_10
 KEY_FENRIR,KEY_0=bookmark_10
 KEY_FENRIR,KEY_CTRL,KEY_8=set_window_application
 2,KEY_FENRIR,KEY_CTRL,KEY_8=clear_window_application
-2,KEY_FENRIR,KEY_I=indent_curr_line
 KEY_FENRIR,KEY_SEMICOLON=last_incoming
 KEY_FENRIR,KEY_F2=toggle_braille
 KEY_FENRIR,KEY_F3=toggle_sound
@@ -98,16 +98,16 @@ KEY_FENRIR,KEY_ALT,KEY_LEFT=dec_speech_pitch
 KEY_FENRIR,KEY_ALT,KEY_UP=inc_sound_volume
 KEY_FENRIR,KEY_ALT,KEY_DOWN=dec_sound_volume
 KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_C=clear_clipboard
-KEY_FENRIR,KEY_CTRL,KEY_SHIFT<KEY_X=remove_marks
 KEY_FENRIR,KEY_HOME=first_clipboard
 KEY_FENRIR,KEY_END=last_clipboard
 KEY_FENRIR,KEY_PAGEUP=prev_clipboard
 KEY_FENRIR,KEY_PAGEDOWN=next_clipboard
 KEY_FENRIR,KEY_SHIFT,KEY_C=curr_clipboard
-KEY_FENRIR,KEY_X=set_mark
-KEY_FENRIR,KEY_SHIFT,KEY_X=marked_text
 KEY_FENRIR,KEY_C=copy_marked_to_clipboard
 KEY_FENRIR,KEY_V=paste_clipboard
+KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
+KEY_FENRIR,KEY_X=set_mark
+KEY_FENRIR,KEY_SHIFT,KEY_X=marked_text
 # linux specific
 #=export_clipboard_to_x
 KEY_FENRIR,KEY_CTRL,KEY_UP=inc_alsa_volume