diff --git a/config/keyboard/test.conf b/config/keyboard/test.conf
index 4c04afdb..e92b385c 100644
--- a/config/keyboard/test.conf
+++ b/config/keyboard/test.conf
@@ -22,13 +22,13 @@
 1-FENRIR,1-KEY_F2=toggle_braille
 #1-FENRIR,1-KEY_F3=toggle_sound
 1-FENRIR,1-KEY_F4=toggle_speech
-#=toggle_auto_spell_check
+1-FENRIR,1-KEY_M=toggle_auto_spell_check
 #=toggle_output
 #=toggle_auto_read
 #=quit_fenrir
 1-FENRIR,1-KEY_T=time
 1-FENRIR,1-KEY_R=date
-1-FENRIR,1-KEY_M=spell_check
+#=spell_check
 1-FENRIR,1-KEY_A=foreward_keypress
 #1-FENRIR,1-KEY_F2=inc_speech_volume
 #1-FENRIR,1-KEY_F3=dec_sound_volume
diff --git a/config/settings/settings.conf b/config/settings/settings.conf
index b4c37a8d..93e83f44 100644
--- a/config/settings/settings.conf
+++ b/config/settings/settings.conf
@@ -1,21 +1,54 @@
 [sound]
+# Turn sound on or off:
 enabled=True
+
+# Select the driver used to play sounds, choices are sox and gstreamer.
+# Sox is the default.
 driver=sox
+
+# Sound themes. This is the pack of sounds used for sound alerts.
+# Sound packs may be located at /usr/share/sounds
+# For system wide availability, or ~/.local/share/fenrir/sounds
+# For the current user.
 theme=default
+
+# Sound volume controls how loud the sounds for your chosen soundpack are.
+# 0 is quietest, 1.0 is loudest.
 volume=1.0
 
 [speech]
+# Turn speech on or off:
 enabled=True
+
+# Select speech driver, options are speechd (default) or espeak:
 driver=speechd
-rate=0.75
+
+# The rate selects how fast fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
+rate=0.45
+
+# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
 pitch=0.5
+
+# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
+volume=1.0
+
+# Module is used for speech-dispatcher, to select the speech module you want to use.
+# Consult speech-dispatcher's configuration and help ti find out which modules are available.
+# The default is espeak.
 module=espeak
-voice=de
-language=de
-volume=0.8
+
+# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in espeak,
+# or if using the espeak module in speech-dispatcher. To find out which voices are available, consult the documentation provided with your chosen synthesizer.
+voice=
+
+# Select the language you want fenrir to use.
+language=english-us
+
+# Read new text as it happens?
 autoReadIncomming=True
 
 [braille]
+#braille is not implemented yet
 enabled=False
 layout=en
 
@@ -28,25 +61,33 @@ autodetectSuspendingScreen=False
 
 [keyboard]
 device=all
+# gives fenrir exclusive access to the keyboard and let consume keystrokes. just disable on problems.
 grabDevices=True
 ignoreShortcuts=False
-keyboardLayout=test
-charEcho=True
+# the current shortcut layout located in /etc/fenrir/keyboard
+keyboardLayout=desktop
+# echo chars while typing.
+charEcho=False
+# echo deleted chars
 charDeleteEcho=True
-wordEcho=True
+# echo word after pressing space
+wordEcho=False
+# interrupt speech on any keypress
 interruptOnKeyPress=False
 
 [general]
-debugLevel=1
+debugLevel=0
 punctuationLevel=1
 numberOfClipboards=10
+# define the current fenrir key
 fenrirKeys=KEY_KP0
 timeFormat=%H:%M:%P
-dateFormat="%A, %B %d, %Y"
 autoSpellCheck=True
 spellCheckLanguage=en_US
 
 [promote]
 enabled=True
 inactiveTimeoutSec=120
-list=chrys,test
+list=
+
+