diff --git a/config/keyboard/desktop.conf b/config/keyboard/desktop.conf
index 11702199..66057832 100644
--- a/config/keyboard/desktop.conf
+++ b/config/keyboard/desktop.conf
@@ -7,7 +7,8 @@ KEY_KP7=review_prev_line
 KEY_KP9=review_next_line
 KEY_FENRIR,KEY_KP4=review_line_begin
 KEY_FENRIR,KEY_KP6=review_line_end
-#=review_line_last_char
+KEY_FENRIR,KEY_KP1=review_line_first_char
+KEY_FENRIR,KEY_KP3=review_line_last_char
 KEY_FENRIR,KEY_ALT,KEY_1=present_first_line
 KEY_FENRIR,KEY_ALT,KEY_2=present_last_line
 KEY_KP5=review_curr_word
@@ -62,7 +63,7 @@ KEY_KPPLUS=last_incoming
 KEY_FENRIR,KEY_F2=toggle_braille
 KEY_FENRIR,KEY_F3=toggle_sound
 KEY_FENRIR,KEY_F4=toggle_speech
-#=toggle_punctuation_level
+KEY_FENRIR,KEY_CTRL,KEY_P=toggle_punctuation_level
 KEY_FENRIR,KEY_RIGHTBRACE=toggle_auto_spell_check
 KEY_FENRIR,KEY_BACKSLASH=toggle_output
 key_FENRIR,KEY_KPENTER=toggle_auto_read
diff --git a/config/keyboard/laptop.conf b/config/keyboard/laptop.conf
index 75734061..d85e04f7 100644
--- a/config/keyboard/laptop.conf
+++ b/config/keyboard/laptop.conf
@@ -7,7 +7,8 @@ KEY_FENRIR,KEY_U=review_prev_line
 KEY_FENRIR,KEY_O=review_next_line
 KEY_FENRIR,KEY_SHIFT,KEY_J=review_line_begin
 KEY_FENRIR,KEY_SHFIT,KEY_L=review_line_end
-#=review_line_last_char
+KEY_FENRIR,KEY_CTRL,KEY_J=review_line_first_char
+KEY_FENRIR,KEY_CTRL,KEY_L=review_line_last_char
 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
@@ -55,14 +56,14 @@ 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
+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
 KEY_FENRIR,KEY_F4=toggle_speech
-#=toggle_punctuation_level
+KEY_FENRIR,KEY_SHIFT,KEY_CTRL,KEY_P=toggle_punctuation_level
 KEY_FENRIR,KEY_RIGHTBRACE=toggle_auto_spell_check
 KEY_FENRIR,KEY_SHIFT,KEY_ENTER=toggle_output
 KEY_FENRIR,KEY_ENTER=toggle_auto_read