diff --git a/config/keyboard/laptop.conf b/config/keyboard/laptop.conf
index 55146731..5c1fa2dd 100644
--- a/config/keyboard/laptop.conf
+++ b/config/keyboard/laptop.conf
@@ -13,42 +13,42 @@ KEY_FENRIR,KEY_m=prev_char
 KEY_FENRIR,KEY_DOT=next_char
 2,KEY_FENRIR,KEY_COMMA=curr_char_phonetic
 KEY_FENRIR,KEY_SLASH=exit_review
-#=cursor_position
-#=curr_screen
-#=curr_screen_before_cursor
-#=curr_screen_after_cursor
+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
 2,KEY_FENRIR,KEY_I=indent_curr_line
-#=last_incomming
+KEY_FENRIR,KEY_SEMICOLON=last_incomming
 KEY_FENRIR,KEY_F2=toggle_braille
 KEY_FENRIR,KEY_F3=toggle_sound
 KEY_FENRIR,KEY_F4=toggle_speech
-#=toggle_auto_spell_check
-#=toggle_output
-#=toggle_auto_read
+KEY_FENRIR,KEY_RIGHTBRACE=toggle_auto_spell_check
+KEY_FENRIR,KEY_SHIFT,KEY_ENTER=toggle_output
+KEY_FENRIR,KEY_ENTER=toggle_auto_read
 KEY_FENRIR,KEY_Q=quit_fenrir
 KEY_FENRIR,KEY_T=time
 2,KEY_FENRIR,KEY_T=date
-#=spell_check
-#=add_word_to_spell_check
-#=remove_word_from_spell_check
+KEY_FENRIR,KEY_S=spell_check
+2,KEY_FENRIR,KEY_S=add_word_to_spell_check
+KEY_FENRIR,KEY_SHIFT,KEY_S=remove_word_from_spell_check
 KEY_FENRIR,KEY_BACKSPACE=forward_keypress
-#=inc_speech_volume
-#=dec_speech_volume
-#=inc_speech_rate
-#=dec_speech_rate
-#=inc_speech_pitch
-#=dec_speech_pitch
-#=inc_sound_volume
-#=dec_sound_volume
+KEY_FENRIR,KEY_UP=inc_speech_volume
+KEY_FENRIR,KEY_DOWN=dec_speech_volume
+KEY_FENRIR,KEY_RIGHT=inc_speech_rate
+KEY_FENRIR,KEY_LEFT=dec_speech_rate
+KEY_FENRIR,KEY_ALT,KEY_RIGHT=inc_speech_pitch
+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_SHIFT,KEY_C=clear_clipboard
-KEY_FENRIR,KEY_SHIFT,KEY_X=remove_marks
-#=first_clipboard
-#=last_clipboard
-#=prev_clipboard
-#=next_clipboard
-#=curr_clipboard
+KEY_FENRIR<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
-#=marked_text
+KEY_FENRIR,KEY_SHIFT,KEY_X=marked_text
 KEY_FENRIR,KEY_C=copy_marked_to_clipboard
 # linux only
 KEY_FENRIR,KEY_V=linux_paste_clipboard