diff --git a/config/keyboard/desktop.conf b/config/keyboard/desktop.conf
index 2b7d2a29..0b9178a2 100644
--- a/config/keyboard/desktop.conf
+++ b/config/keyboard/desktop.conf
@@ -5,10 +5,10 @@ KEY_FENRIR,KEY_KP7=review_top
 KEY_KP8=review_curr_line
 KEY_KP7=review_prev_line
 KEY_KP9=review_next_line
-#=review_line_end
-#=review_line_begin
-#=present_first_line
-#=present_last_line
+KEY_FENRIR,KEY_KP4=review_begin_of_line
+KEY_FENRIR,KEY_KP6=review_end_of_line
+KEY_FENRIR,KEY_ALT,KEY_1=present_first_line
+KEY_FENRIR,KEY_ALT,KEY_2=present_last_line
 KEY_KP5=review_curr_word
 KEY_KP4=review_prev_word
 KEY_KP6=review_next_word
@@ -23,11 +23,38 @@ 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
-#=clear_bookmark_1
-#=set_bookmark_1
-#=bookmark_1
-#=set_window_application
-#=clear_window_application
+KEY_FENRIR,KEY_CTRL,KEY_1=clear_bookmark_1
+KEY_FENRIR,KEY_SHIFT,KEY_1=set_bookmark_1
+KEY_FENRIR,KEY_1=bookmark_1
+KEY_FENRIR,KEY_CTRL,KEY_2=clear_bookmark_2
+KEY_FENRIR,KEY_SHIFT,KEY_2=set_bookmark_2
+KEY_FENRIR,KEY_2=bookmark_2
+KEY_FENRIR,KEY_CTRL,KEY_3=clear_bookmark_3
+KEY_FENRIR,KEY_SHIFT,KEY_3=set_bookmark_3
+KEY_FENRIR,KEY_3=bookmark_3
+KEY_FENRIR,KEY_CTRL,KEY_4=clear_bookmark_4
+KEY_FENRIR,KEY_SHIFT,KEY_4=set_bookmark_4
+KEY_FENRIR,KEY_4=bookmark_4
+KEY_FENRIR,KEY_CTRL,KEY_5=clear_bookmark_5
+KEY_FENRIR,KEY_SHIFT,KEY_5=set_bookmark_5
+KEY_FENRIR,KEY_5=bookmark_5
+KEY_FENRIR,KEY_CTRL,KEY_6=clear_bookmark_6
+KEY_FENRIR,KEY_SHIFT,KEY_6=set_bookmark_6
+KEY_FENRIR,KEY_6=bookmark_6
+KEY_FENRIR,KEY_CTRL,KEY_7=clear_bookmark_7
+KEY_FENRIR,KEY_SHIFT,KEY_7=set_bookmark_7
+KEY_FENRIR,KEY_7=bookmark_7
+KEY_FENRIR,KEY_CTRL,KEY_8=clear_bookmark_8
+KEY_FENRIR,KEY_SHIFT,KEY_8=set_bookmark_8
+KEY_FENRIR,KEY_8=bookmark_8
+KEY_FENRIR,KEY_CTRL,KEY_9=clear_bookmark_9
+KEY_FENRIR,KEY_SHIFT,KEY_9=set_bookmark_9
+KEY_FENRIR,KEY_9=bookmark_9
+KEY_FENRIR,KEY_CTRL,KEY_0=clear_bookmark_10
+KEY_FENRIR,KEY_SHIFT,KEY_0=set_bookmark_10
+KEY_FENRIR,KEY_0=bookmark_10
+KP_FENRIR,KP_SLASH=set_window_application
+2,KEY_FENRIR,KP_SLASH=clear_window_application
 KEY_KPPLUS=last_incoming
 KEY_FENRIR,KEY_F2=toggle_braille
 KEY_FENRIR,KEY_F3=toggle_sound
diff --git a/config/keyboard/laptop.conf b/config/keyboard/laptop.conf
index 68c7fb66..1d4806b6 100644
--- a/config/keyboard/laptop.conf
+++ b/config/keyboard/laptop.conf
@@ -5,10 +5,10 @@ KEY_FENRIR,KEY_SHIFT,KEY_U=review_top
 KEY_FENRIR,KEY_I=review_curr_line
 KEY_FENRIR,KEY_U=review_prev_line
 KEY_FENRIR,KEY_O=review_next_line
-#=review_line_end
-#=review_line_begin
-#=present_first_line
-#=present_last_line
+KEY_FENRIR,KEY_KP4=review_begin_of_line
+KEY_FENRIR,KEY_KP6=review_end_of_line
+KEY_FENRIR,KEY_ALT,KEY_1=present_first_line
+KEY_FENRIR,KEY_ALT,KEY_2=present_last_line
 KEY_FENRIR,KEY_K=review_curr_word
 KEY_FENRIR,KEY_J=review_prev_word
 KEY_FENRIR,KEY_L=review_next_word
@@ -22,9 +22,36 @@ KEY_FENRIR,KEY_SHIFT,KEY_DOT=cursor_position
 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
-#=clear_bookmark_1
-#=set_bookmark_1
-#=bookmark_1
+KEY_FENRIR,KEY_CTRL,KEY_1=clear_bookmark_1
+KEY_FENRIR,KEY_SHIFT,KEY_1=set_bookmark_1
+KEY_FENRIR,KEY_1=bookmark_1
+KEY_FENRIR,KEY_CTRL,KEY_2=clear_bookmark_2
+KEY_FENRIR,KEY_SHIFT,KEY_2=set_bookmark_2
+KEY_FENRIR,KEY_2=bookmark_2
+KEY_FENRIR,KEY_CTRL,KEY_3=clear_bookmark_3
+KEY_FENRIR,KEY_SHIFT,KEY_3=set_bookmark_3
+KEY_FENRIR,KEY_3=bookmark_3
+KEY_FENRIR,KEY_CTRL,KEY_4=clear_bookmark_4
+KEY_FENRIR,KEY_SHIFT,KEY_4=set_bookmark_4
+KEY_FENRIR,KEY_4=bookmark_4
+KEY_FENRIR,KEY_CTRL,KEY_5=clear_bookmark_5
+KEY_FENRIR,KEY_SHIFT,KEY_5=set_bookmark_5
+KEY_FENRIR,KEY_5=bookmark_5
+KEY_FENRIR,KEY_CTRL,KEY_6=clear_bookmark_6
+KEY_FENRIR,KEY_SHIFT,KEY_6=set_bookmark_6
+KEY_FENRIR,KEY_6=bookmark_6
+KEY_FENRIR,KEY_CTRL,KEY_7=clear_bookmark_7
+KEY_FENRIR,KEY_SHIFT,KEY_7=set_bookmark_7
+KEY_FENRIR,KEY_7=bookmark_7
+KEY_FENRIR,KEY_CTRL,KEY_8=clear_bookmark_8
+KEY_FENRIR,KEY_SHIFT,KEY_8=set_bookmark_8
+KEY_FENRIR,KEY_8=bookmark_8
+KEY_FENRIR,KEY_CTRL,KEY_9=clear_bookmark_9
+KEY_FENRIR,KEY_SHIFT,KEY_9=set_bookmark_9
+KEY_FENRIR,KEY_9=bookmark_9
+KEY_FENRIR,KEY_CTRL,KEY_0=clear_bookmark_10
+KEY_FENRIR,KEY_SHIFT,KEY_0=set_bookmark_10
+KEY_FENRIR,KEY_0=bookmark_10
 #=set_window_application
 #=clear_window_application
 2,KEY_FENRIR,KEY_I=indent_curr_line