diff --git a/config/settings/settings.conf b/config/settings/settings.conf
index ed0365ec..9c2a8a2d 100644
--- a/config/settings/settings.conf
+++ b/config/settings/settings.conf
@@ -98,6 +98,7 @@ numberOfClipboards=10
 # define the current fenrir key
 fenrirKeys=KEY_KP0
 timeFormat=%H:%M:%P
+dateFormat=%A, %B %d, %Y
 autoSpellCheck=True
 spellCheckLanguage=en_US
 
diff --git a/src/fenrir-package/core/inputEvent.py b/src/fenrir-package/core/inputEvent.py
index 239f4209..0b75c0b0 100644
--- a/src/fenrir-package/core/inputEvent.py
+++ b/src/fenrir-package/core/inputEvent.py
@@ -6,9 +6,9 @@ input = {
 'prevInput': [], 
 'prevDeepestInput': [], 
 'currEvent': None, 
-'eventBuffer': None,
+'eventBuffer': [],
 'shortcutRepeat': 0,
-'fenrirKey': ['82'],
+'fenrirKey': ['KEY_FENRIR'],
 'keyForeward': False,
 'lastInputTime':time.time(),
 'oldNumLock': True,
diff --git a/src/fenrir-package/core/settings.py b/src/fenrir-package/core/settings.py
index e5d2c7b3..95c8e0b0 100644
--- a/src/fenrir-package/core/settings.py
+++ b/src/fenrir-package/core/settings.py
@@ -4,21 +4,23 @@ from utils import debug
 
 settings = {
 'sound': {
-    'enabled': False,
-    'driver': 'sox', 
+    'enabled': True,
+    'driver': 'generic', 
     'theme': 'default',
-    'volume':1.0,
+    'volume': 1.0,
+    'genericPlayFileCommand': 'play -q -v fenrirVolume fenrirSoundFile',
+    'genericFrequencyCommand': 'play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence'
 },
 'speech':{
     'enabled': True,
-    'driver':'speechd',
+    'driver': 'speechd',
     'rate': 0.75,
     'pitch': 0.5,
+    'volume': 1.0,    
     'module': '',
     'voice': 'de',
     'language': 'de',
-    'volume': 1.0,
-    'autoReadIncomming':True,
+    'autoReadIncomming': True,
 },
 'braille':{
     'enabled': False, 
@@ -27,32 +29,35 @@ settings = {
 'screen':{
     'driver': 'linux',
     'encoding': 'cp850',
-    'screenUpdateDelay':0.4,
-    'suspendingScreen':'',
-    'autodetectSuspendingScreen':False,
+    'screenUpdateDelay': 0.4,
+    'suspendingScreen': '',
+    'autodetectSuspendingScreen': False,
 },
 'general':{
-  'keyboardLayout': "desktop",
   'debugLevel': debug.debugLevel.DEACTIVE,
   'punctuationLevel': 1,
   'numberOfClipboards': 10,
-  'fenrirKeys':['82'],
-  'timeFormat':'%I:%M%P',
-  'dateFormat':'%A, %B %d, %Y',
+  'fenrirKeys': ['KEY_KP0'],
+  'timeFormat': '%I:%M%P',
+  'dateFormat': '%A, %B %d, %Y',
+  'autoSpellCheck': False,
+  'spellCheckLanguage': 'en_US',
 },
 'promote':{
   'enabled': True,
-  'inactiveTimeoutSec':120,
-  'list':'',
+  'inactiveTimeoutSec': 120,
+  'list': '',
 },
 'keyboard':{
-  'device':"all",
-  'grabDevices':True,
-  'ignoreShortcuts':False,  
+  'driver': 'evdev',
+  'device': 'all',
+  'grabDevices': True,
+  'ignoreShortcuts': False,  
   'keyboardLayout': "desktop",
-  'charEcho':False,
-  'charDeleteEcho':True,
-  'wordEcho':True,
+  'charEcho': False,
+  'charDeleteEcho': True,
+  'wordEcho': True,
   'interruptOnKeyPress': True,
+  'doubleTapDelay': 0.2,
 }
 }