diff --git a/config/keyboard/desktop.conf b/config/keyboard/desktop.conf
index 5ce3c80a..dba9ad49 100644
--- a/config/keyboard/desktop.conf
+++ b/config/keyboard/desktop.conf
@@ -15,16 +15,16 @@ KEY_KP5=review_curr_word
 KEY_KP4=review_prev_word
 KEY_KP6=review_next_word
 KEY_SHIFT,KEY_KP5=review_curr_word_phonetic
-#=review_prev_word_phonetic
-#=review_next_word_phonetic
+KEY_SHIFT,KEY_KP4=review_prev_word_phonetic
+KEY_SHIFT,KEY_KP6=review_next_word_phonetic
 KEY_KP2=review_curr_char
 KEY_KP1=review_prev_char
 KEY_KP3=review_next_char
 KEY_SHIFT,KEY_KP2=review_curr_char_phonetic
-#=review_prev_char_phonetic
-#=review_next_char_phonetic
-#=review_up
-#=review_down
+KEY_SHIFT,KEY_KP1=review_prev_char_phonetic
+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_KPDOT=cursor_position
 KEY_FENRIR,KEY_I=indent_curr_line
 KEY_FENRIR,KEY_KPDOT=exit_review
@@ -70,7 +70,7 @@ KEY_FENRIR,KEY_F4=toggle_speech
 KEY_FENRIR,KEY_CTRL,KEY_P=toggle_punctuation_level
 KEY_FENRIR,KEY_RIGHTBRACE=toggle_auto_spell_check
 KEY_FENRIR,KEY_BACKSLASH=toggle_output
-#=toggle_emoticons
+KEY_FENRIR,KEY_CTRL,KEY_E=toggle_emoticons
 key_FENRIR,KEY_KPENTER=toggle_auto_read
 KEY_FENRIR,KEY_Q=quit_fenrir
 KEY_FENRIR,KEY_T=time
diff --git a/config/keyboard/laptop.conf b/config/keyboard/laptop.conf
index 69a96998..54d9ba3d 100644
--- a/config/keyboard/laptop.conf
+++ b/config/keyboard/laptop.conf
@@ -15,14 +15,16 @@ KEY_FENRIR,KEY_K=review_curr_word
 KEY_FENRIR,KEY_J=review_prev_word
 KEY_FENRIR,KEY_L=review_next_word
 2,KEY_FENRIR,KEY_K=review_curr_word_phonetic
-#=review_prev_word_phonetic
-#=review_next_word_phonetic
+2,KEY_FENRIR,KEY_J=review_prev_word_phonetic
+2,KEY_FENRIR,KEY_L=review_next_word_phonetic
 KEY_FENRIR,KEY_COMMA=review_curr_char
 KEY_FENRIR,KEY_M=review_prev_char
 KEY_FENRIR,KEY_DOT=review_next_char
 2,KEY_FENRIR,KEY_COMMA=curr_char_phonetic
-#=review_up
-#=review_down
+2,KEY_FENRIR,KEY_M=prev_char_phonetic
+2,KEY_FENRIR,KEY_DOT=prev_char_phonetic
+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
 KEY_FENRIR,KEY_SHIFT,KEY_K=curr_screen
@@ -68,7 +70,7 @@ KEY_FENRIR,KEY_F4=toggle_speech
 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
-#=toggle_emoticons
+KEY_FENRIR,KEY_SHIFT,KEY_E=toggle_emoticons
 KEY_FENRIR,KEY_ENTER=toggle_auto_read
 KEY_FENRIR,KEY_Q=quit_fenrir
 KEY_FENRIR,KEY_T=time