diff --git a/config/settings/espeak.settings.conf b/config/settings/espeak.settings.conf
index 8cfa2338..82e1557e 100644
--- a/config/settings/espeak.settings.conf
+++ b/config/settings/espeak.settings.conf
@@ -10,7 +10,7 @@ driver=genericDriver
 # Sound packs may be located at /usr/share/sounds
 # For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
 # For the current user.
-theme=default-wav
+theme=default
 
 # Sound volume controls how loud the sounds for your chosen soundpack are.
 # 0 is quietest, 1.0 is loudest.
diff --git a/config/settings/settings.conf b/config/settings/settings.conf
index c484ea86..573e2f4e 100644
--- a/config/settings/settings.conf
+++ b/config/settings/settings.conf
@@ -11,7 +11,7 @@ driver=genericDriver
 # Sound packs may be located at /usr/share/sounds
 # For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
 # For the current user.
-theme=default-wav
+theme=default
 
 # Sound volume controls how loud the sounds for your selected soundpack are.
 # 0 is quietest, 1.0 is loudest.
diff --git a/config/settings/settings.conf.example b/config/settings/settings.conf.example
index b4dc7ee4..ac0a327e 100644
--- a/config/settings/settings.conf.example
+++ b/config/settings/settings.conf.example
@@ -11,7 +11,7 @@ driver=genericDriver
 # Sound packs may be located at /usr/share/sounds
 # For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
 # For the current user.
-theme=default-wav
+theme=default
 
 # Sound volume controls how loud the sounds for your selected soundpack are.
 # 0 is quietest, 1.0 is loudest.
diff --git a/config/settings/speech-dispatcher.settings.conf b/config/settings/speech-dispatcher.settings.conf
index e3cf0a44..b2874e8c 100644
--- a/config/settings/speech-dispatcher.settings.conf
+++ b/config/settings/speech-dispatcher.settings.conf
@@ -11,7 +11,7 @@ driver=genericDriver
 # Sound packs may be located at /usr/share/sounds
 # For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
 # For the current user.
-theme=default-wav
+theme=default
 
 # Sound volume controls how loud the sounds for your selected soundpack are.
 # 0 is quietest, 1.0 is loudest.
diff --git a/config/sound/default-wav/soundicons.conf b/config/sound/default-wav/soundicons.conf
deleted file mode 100644
index 4fc0f767..00000000
--- a/config/sound/default-wav/soundicons.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-# Screen Reader Turned On or Off
-ScreenReaderOn='ScreenReaderOn.wav'
-ScreenReaderOff='ScreenReaderOff.wav'
-# PTY bypass
-PTYBypass='PTYBypass.wav'
-# Cancel the current command
-Cancel='Cancel.wav'
-# Accept command
-Accept='Accept.wav'
-# Bell a sound if the TTY is changed (ctrl + alt +FX)
-ChangeTTY='ChangeTTY.wav'
-# Is the first Position on the line
-StartOfLine='StartOfLine.wav'
-# Is the last position of the Line
-EndOfLine='EndOfLine.wav'
-# the Line is empty
-EmptyLine='EmptyLine.wav'
-# Is the first line on the screen.
-StartOfScreen='StartOfScreen.wav'
-# Is the last line on the screen
-EndOfScreen='EndOfScreen.wav'
-# The content has changed
-ContentChanged='ContentChanged.wav'
-# Speech has turned On or Off
-SpeechOn='SpeechOn.wav'
-SpeechOff='SpeechOff.wav'
-# Braille has turned On or Off
-BrailleOn='BrailleOn.wav'
-BrailleOff='BrailleOff.wav'
-# SoundIcons has turned On or Off
-SoundOn='SoundOn.wav'
-SoundOff='SoundOff.wav'
-# Set beginnig mark
-PlaceStartMark='PlaceStartMark.wav'
-# Set end mark
-PlaceEndMark='PlaceEndMark.wav'
-# Copied to clipboard
-CopyToClipboard='CopyToClipboard.wav'
-# Pasted on the screen
-PasteClipboardOnScreen='PasteClipboardOnScreen.wav'
-# An error accoured while speech or braille output or reading the screen
-ErrorSpeech='ErrorSpeech.wav'
-ErrorBraille='ErrorBraille.wav'
-ErrorScreen='ErrorScreen.wav'
-# If you cursor over an text that has attributs (like color)
-HasAttributes='HasAttributes.wav'
-# fenrir can promote strings if they appear on the screen.
-PromotedText='PromotedText.wav'
-# missspelled indicator
-mispell='mispell.wav'
-# the for capital letter
-capital='Caps.wav'
-# general announcement
-announce="Announce.wav"
diff --git a/config/sound/default/Accept.opus b/config/sound/default/Accept.opus
deleted file mode 100644
index 8b1cd4e4..00000000
Binary files a/config/sound/default/Accept.opus and /dev/null differ
diff --git a/config/sound/default-wav/Accept.wav b/config/sound/default/Accept.wav
similarity index 100%
rename from config/sound/default-wav/Accept.wav
rename to config/sound/default/Accept.wav
diff --git a/config/sound/default/Announce.opus b/config/sound/default/Announce.opus
deleted file mode 100644
index 0eea2d5f..00000000
Binary files a/config/sound/default/Announce.opus and /dev/null differ
diff --git a/config/sound/default-wav/Announce.wav b/config/sound/default/Announce.wav
similarity index 100%
rename from config/sound/default-wav/Announce.wav
rename to config/sound/default/Announce.wav
diff --git a/config/sound/default/BrailleOff.opus b/config/sound/default/BrailleOff.opus
deleted file mode 100644
index e1e67309..00000000
Binary files a/config/sound/default/BrailleOff.opus and /dev/null differ
diff --git a/config/sound/default-wav/BrailleOff.wav b/config/sound/default/BrailleOff.wav
similarity index 100%
rename from config/sound/default-wav/BrailleOff.wav
rename to config/sound/default/BrailleOff.wav
diff --git a/config/sound/default/BrailleOn.opus b/config/sound/default/BrailleOn.opus
deleted file mode 100644
index 4d130803..00000000
Binary files a/config/sound/default/BrailleOn.opus and /dev/null differ
diff --git a/config/sound/default-wav/BrailleOn.wav b/config/sound/default/BrailleOn.wav
similarity index 100%
rename from config/sound/default-wav/BrailleOn.wav
rename to config/sound/default/BrailleOn.wav
diff --git a/config/sound/default/Cancel.opus b/config/sound/default/Cancel.opus
deleted file mode 100644
index 03dd35b1..00000000
Binary files a/config/sound/default/Cancel.opus and /dev/null differ
diff --git a/config/sound/default-wav/Cancel.wav b/config/sound/default/Cancel.wav
similarity index 100%
rename from config/sound/default-wav/Cancel.wav
rename to config/sound/default/Cancel.wav
diff --git a/config/sound/default/Caps.opus b/config/sound/default/Caps.opus
deleted file mode 100644
index 2e5d92e6..00000000
Binary files a/config/sound/default/Caps.opus and /dev/null differ
diff --git a/config/sound/default-wav/Caps.wav b/config/sound/default/Caps.wav
similarity index 100%
rename from config/sound/default-wav/Caps.wav
rename to config/sound/default/Caps.wav
diff --git a/config/sound/default/ChangeTTY.opus b/config/sound/default/ChangeTTY.opus
deleted file mode 100644
index e147023b..00000000
Binary files a/config/sound/default/ChangeTTY.opus and /dev/null differ
diff --git a/config/sound/default-wav/ChangeTTY.wav b/config/sound/default/ChangeTTY.wav
similarity index 100%
rename from config/sound/default-wav/ChangeTTY.wav
rename to config/sound/default/ChangeTTY.wav
diff --git a/config/sound/default/ContentChanged.opus b/config/sound/default/ContentChanged.opus
deleted file mode 100644
index 06570aac..00000000
Binary files a/config/sound/default/ContentChanged.opus and /dev/null differ
diff --git a/config/sound/default-wav/ContentChanged.wav b/config/sound/default/ContentChanged.wav
similarity index 100%
rename from config/sound/default-wav/ContentChanged.wav
rename to config/sound/default/ContentChanged.wav
diff --git a/config/sound/default/CopyToClipboard.opus b/config/sound/default/CopyToClipboard.opus
deleted file mode 100644
index 420dc4bd..00000000
Binary files a/config/sound/default/CopyToClipboard.opus and /dev/null differ
diff --git a/config/sound/default-wav/CopyToClipboard.wav b/config/sound/default/CopyToClipboard.wav
similarity index 100%
rename from config/sound/default-wav/CopyToClipboard.wav
rename to config/sound/default/CopyToClipboard.wav
diff --git a/config/sound/default/EmptyLine.opus b/config/sound/default/EmptyLine.opus
deleted file mode 100644
index 10bb7faa..00000000
Binary files a/config/sound/default/EmptyLine.opus and /dev/null differ
diff --git a/config/sound/default-wav/EmptyLine.wav b/config/sound/default/EmptyLine.wav
similarity index 100%
rename from config/sound/default-wav/EmptyLine.wav
rename to config/sound/default/EmptyLine.wav
diff --git a/config/sound/default/EndOfLine.opus b/config/sound/default/EndOfLine.opus
deleted file mode 100644
index 2bfa35c1..00000000
Binary files a/config/sound/default/EndOfLine.opus and /dev/null differ
diff --git a/config/sound/default-wav/EndOfLine.wav b/config/sound/default/EndOfLine.wav
similarity index 100%
rename from config/sound/default-wav/EndOfLine.wav
rename to config/sound/default/EndOfLine.wav
diff --git a/config/sound/default/EndOfScreen.opus b/config/sound/default/EndOfScreen.opus
deleted file mode 100644
index 4206a0cb..00000000
Binary files a/config/sound/default/EndOfScreen.opus and /dev/null differ
diff --git a/config/sound/default-wav/EndOfScreen.wav b/config/sound/default/EndOfScreen.wav
similarity index 100%
rename from config/sound/default-wav/EndOfScreen.wav
rename to config/sound/default/EndOfScreen.wav
diff --git a/config/sound/default/ErrorBraille.opus b/config/sound/default/ErrorBraille.opus
deleted file mode 100644
index 1374c3ec..00000000
Binary files a/config/sound/default/ErrorBraille.opus and /dev/null differ
diff --git a/config/sound/default-wav/ErrorBraille.wav b/config/sound/default/ErrorBraille.wav
similarity index 100%
rename from config/sound/default-wav/ErrorBraille.wav
rename to config/sound/default/ErrorBraille.wav
diff --git a/config/sound/default/ErrorScreen.opus b/config/sound/default/ErrorScreen.opus
deleted file mode 100644
index 40e94fc2..00000000
Binary files a/config/sound/default/ErrorScreen.opus and /dev/null differ
diff --git a/config/sound/default-wav/ErrorScreen.wav b/config/sound/default/ErrorScreen.wav
similarity index 100%
rename from config/sound/default-wav/ErrorScreen.wav
rename to config/sound/default/ErrorScreen.wav
diff --git a/config/sound/default/ErrorSpeech.opus b/config/sound/default/ErrorSpeech.opus
deleted file mode 100644
index be975329..00000000
Binary files a/config/sound/default/ErrorSpeech.opus and /dev/null differ
diff --git a/config/sound/default-wav/ErrorSpeech.wav b/config/sound/default/ErrorSpeech.wav
similarity index 100%
rename from config/sound/default-wav/ErrorSpeech.wav
rename to config/sound/default/ErrorSpeech.wav
diff --git a/config/sound/default/HasAtributes.opus b/config/sound/default/HasAtributes.opus
deleted file mode 100644
index 18558892..00000000
Binary files a/config/sound/default/HasAtributes.opus and /dev/null differ
diff --git a/config/sound/default-wav/HasAtributes.wav b/config/sound/default/HasAtributes.wav
similarity index 100%
rename from config/sound/default-wav/HasAtributes.wav
rename to config/sound/default/HasAtributes.wav
diff --git a/config/sound/default-wav/PTYBypass.wav b/config/sound/default/PTYBypass.wav
similarity index 100%
rename from config/sound/default-wav/PTYBypass.wav
rename to config/sound/default/PTYBypass.wav
diff --git a/config/sound/default/PasteClipboardOnScreen.opus b/config/sound/default/PasteClipboardOnScreen.opus
deleted file mode 100644
index cd71fef2..00000000
Binary files a/config/sound/default/PasteClipboardOnScreen.opus and /dev/null differ
diff --git a/config/sound/default-wav/PasteClipboardOnScreen.wav b/config/sound/default/PasteClipboardOnScreen.wav
similarity index 100%
rename from config/sound/default-wav/PasteClipboardOnScreen.wav
rename to config/sound/default/PasteClipboardOnScreen.wav
diff --git a/config/sound/default/PlaceEndMark.opus b/config/sound/default/PlaceEndMark.opus
deleted file mode 100644
index 06decdb4..00000000
Binary files a/config/sound/default/PlaceEndMark.opus and /dev/null differ
diff --git a/config/sound/default-wav/PlaceEndMark.wav b/config/sound/default/PlaceEndMark.wav
similarity index 100%
rename from config/sound/default-wav/PlaceEndMark.wav
rename to config/sound/default/PlaceEndMark.wav
diff --git a/config/sound/default/PlaceStartMark.opus b/config/sound/default/PlaceStartMark.opus
deleted file mode 100644
index 7f7fac93..00000000
Binary files a/config/sound/default/PlaceStartMark.opus and /dev/null differ
diff --git a/config/sound/default-wav/PlaceStartMark.wav b/config/sound/default/PlaceStartMark.wav
similarity index 100%
rename from config/sound/default-wav/PlaceStartMark.wav
rename to config/sound/default/PlaceStartMark.wav
diff --git a/config/sound/default/PromotedText.opus b/config/sound/default/PromotedText.opus
deleted file mode 100644
index d4b4b34f..00000000
Binary files a/config/sound/default/PromotedText.opus and /dev/null differ
diff --git a/config/sound/default-wav/PromotedText.wav b/config/sound/default/PromotedText.wav
similarity index 100%
rename from config/sound/default-wav/PromotedText.wav
rename to config/sound/default/PromotedText.wav
diff --git a/config/sound/default/ScreenReaderOff.opus b/config/sound/default/ScreenReaderOff.opus
deleted file mode 100644
index f29e49f2..00000000
Binary files a/config/sound/default/ScreenReaderOff.opus and /dev/null differ
diff --git a/config/sound/default-wav/ScreenReaderOff.wav b/config/sound/default/ScreenReaderOff.wav
similarity index 100%
rename from config/sound/default-wav/ScreenReaderOff.wav
rename to config/sound/default/ScreenReaderOff.wav
diff --git a/config/sound/default/ScreenReaderOn.opus b/config/sound/default/ScreenReaderOn.opus
deleted file mode 100644
index 8bdd974b..00000000
Binary files a/config/sound/default/ScreenReaderOn.opus and /dev/null differ
diff --git a/config/sound/default-wav/ScreenReaderOn.wav b/config/sound/default/ScreenReaderOn.wav
similarity index 100%
rename from config/sound/default-wav/ScreenReaderOn.wav
rename to config/sound/default/ScreenReaderOn.wav
diff --git a/config/sound/default/SoundOff.opus b/config/sound/default/SoundOff.opus
deleted file mode 100644
index 06fdfceb..00000000
Binary files a/config/sound/default/SoundOff.opus and /dev/null differ
diff --git a/config/sound/default-wav/SoundOff.wav b/config/sound/default/SoundOff.wav
similarity index 100%
rename from config/sound/default-wav/SoundOff.wav
rename to config/sound/default/SoundOff.wav
diff --git a/config/sound/default/SoundOn.opus b/config/sound/default/SoundOn.opus
deleted file mode 100644
index 80162dea..00000000
Binary files a/config/sound/default/SoundOn.opus and /dev/null differ
diff --git a/config/sound/default-wav/SoundOn.wav b/config/sound/default/SoundOn.wav
similarity index 100%
rename from config/sound/default-wav/SoundOn.wav
rename to config/sound/default/SoundOn.wav
diff --git a/config/sound/default/SpeechOff.opus b/config/sound/default/SpeechOff.opus
deleted file mode 100644
index d0ed221c..00000000
Binary files a/config/sound/default/SpeechOff.opus and /dev/null differ
diff --git a/config/sound/default-wav/SpeechOff.wav b/config/sound/default/SpeechOff.wav
similarity index 100%
rename from config/sound/default-wav/SpeechOff.wav
rename to config/sound/default/SpeechOff.wav
diff --git a/config/sound/default/SpeechOn.opus b/config/sound/default/SpeechOn.opus
deleted file mode 100644
index cb0723a9..00000000
Binary files a/config/sound/default/SpeechOn.opus and /dev/null differ
diff --git a/config/sound/default-wav/SpeechOn.wav b/config/sound/default/SpeechOn.wav
similarity index 100%
rename from config/sound/default-wav/SpeechOn.wav
rename to config/sound/default/SpeechOn.wav
diff --git a/config/sound/default/StartOfLine.opus b/config/sound/default/StartOfLine.opus
deleted file mode 100644
index bf368879..00000000
Binary files a/config/sound/default/StartOfLine.opus and /dev/null differ
diff --git a/config/sound/default-wav/StartOfLine.wav b/config/sound/default/StartOfLine.wav
similarity index 100%
rename from config/sound/default-wav/StartOfLine.wav
rename to config/sound/default/StartOfLine.wav
diff --git a/config/sound/default/StartOfScreen.opus b/config/sound/default/StartOfScreen.opus
deleted file mode 100644
index c85a213f..00000000
Binary files a/config/sound/default/StartOfScreen.opus and /dev/null differ
diff --git a/config/sound/default-wav/StartOfScreen.wav b/config/sound/default/StartOfScreen.wav
similarity index 100%
rename from config/sound/default-wav/StartOfScreen.wav
rename to config/sound/default/StartOfScreen.wav
diff --git a/config/sound/default/mispell.opus b/config/sound/default/mispell.opus
deleted file mode 100644
index a4839140..00000000
Binary files a/config/sound/default/mispell.opus and /dev/null differ
diff --git a/config/sound/default-wav/mispell.wav b/config/sound/default/mispell.wav
similarity index 100%
rename from config/sound/default-wav/mispell.wav
rename to config/sound/default/mispell.wav
diff --git a/config/sound/default/soundicons.conf b/config/sound/default/soundicons.conf
index 3b11a371..4fc0f767 100644
--- a/config/sound/default/soundicons.conf
+++ b/config/sound/default/soundicons.conf
@@ -1,52 +1,54 @@
 # Screen Reader Turned On or Off
-ScreenReaderOn='ScreenReaderOn.opus'
-ScreenReaderOff='ScreenReaderOff.opus'
+ScreenReaderOn='ScreenReaderOn.wav'
+ScreenReaderOff='ScreenReaderOff.wav'
+# PTY bypass
+PTYBypass='PTYBypass.wav'
 # Cancel the current command
-Cancel='Cancel.opus'
+Cancel='Cancel.wav'
 # Accept command
-Accept='Accept.opus'
+Accept='Accept.wav'
 # Bell a sound if the TTY is changed (ctrl + alt +FX)
-ChangeTTY='ChangeTTY.opus'
+ChangeTTY='ChangeTTY.wav'
 # Is the first Position on the line
-StartOfLine='StartOfLine.opus'
+StartOfLine='StartOfLine.wav'
 # Is the last position of the Line
-EndOfLine='EndOfLine.opus'
+EndOfLine='EndOfLine.wav'
 # the Line is empty
-EmptyLine='EmptyLine.opus'
+EmptyLine='EmptyLine.wav'
 # Is the first line on the screen.
-StartOfScreen='StartOfScreen.opus'
+StartOfScreen='StartOfScreen.wav'
 # Is the last line on the screen
-EndOfScreen='EndOfScreen.opus'
+EndOfScreen='EndOfScreen.wav'
 # The content has changed
-ContentChanged='ContentChanged.opus'
+ContentChanged='ContentChanged.wav'
 # Speech has turned On or Off
-SpeechOn='SpeechOn.opus'
-SpeechOff='SpeechOff.opus'
+SpeechOn='SpeechOn.wav'
+SpeechOff='SpeechOff.wav'
 # Braille has turned On or Off
-BrailleOn='BrailleOn.opus'
-BrailleOff='BrailleOff.opus'
+BrailleOn='BrailleOn.wav'
+BrailleOff='BrailleOff.wav'
 # SoundIcons has turned On or Off
-SoundOn='SoundOn.opus'
-SoundOff='SoundOff.opus'
-# Set beginnig mark for copy to clipboard
-PlaceStartMark='PlaceStartMark.opus'
-# Set end mark for copy to clipboard
-PlaceEndMark='PlaceEndMark.opus'
+SoundOn='SoundOn.wav'
+SoundOff='SoundOff.wav'
+# Set beginnig mark
+PlaceStartMark='PlaceStartMark.wav'
+# Set end mark
+PlaceEndMark='PlaceEndMark.wav'
 # Copied to clipboard
-CopyToClipboard='CopyToClipboard.opus'
+CopyToClipboard='CopyToClipboard.wav'
 # Pasted on the screen
-PasteClipboardOnScreen='PasteClipboardOnScreen.opus'
+PasteClipboardOnScreen='PasteClipboardOnScreen.wav'
 # An error accoured while speech or braille output or reading the screen
-ErrorSpeech='ErrorSpeech.opus'
-ErrorBraille='ErrorBraille.opus'
-ErrorScreen='ErrorScreen.opus'
+ErrorSpeech='ErrorSpeech.wav'
+ErrorBraille='ErrorBraille.wav'
+ErrorScreen='ErrorScreen.wav'
 # If you cursor over an text that has attributs (like color)
-HasAttributes='HasAttributes.opus'
+HasAttributes='HasAttributes.wav'
 # fenrir can promote strings if they appear on the screen.
-PromotedText='PromotedText.opus'
+PromotedText='PromotedText.wav'
 # missspelled indicator
-mispell='mispell.opus'
+mispell='mispell.wav'
 # the for capital letter
-capital='Caps.opus'
+capital='Caps.wav'
 # general announcement
-announce="Announce.opus"
+announce="Announce.wav"
diff --git a/install.sh b/install.sh
index 38b6e3a9..17b7e080 100755
--- a/install.sh
+++ b/install.sh
@@ -27,7 +27,6 @@ cp -af config/punctuation/* /etc/fenrirscreenreader/punctuation
 # sound
 install -d /usr/share/sounds/fenrirscreenreader
 cp -af config/sound/default /usr/share/sounds/fenrirscreenreader/default
-cp -af config/sound/default-wav /usr/share/sounds/fenrirscreenreader/default-wav
 cp -af config/sound/template /usr/share/sounds/fenrirscreenreader/template
 
 # config
diff --git a/setup.py b/setup.py
index eb07d454..0671ca11 100755
--- a/setup.py
+++ b/setup.py
@@ -36,9 +36,6 @@ for directory in directories:
     if destDir != '':
         data_files.append((destDir, files))
 
-files = glob.glob('config/sound/default-wav/*')         
-destDir = '/usr/share/sounds/fenrirscreenreader/default-wav'
-data_files.append((destDir, files))        
 files = glob.glob('config/sound/default/*')                 
 destDir = '/usr/share/sounds/fenrirscreenreader/default'            
 data_files.append((destDir, files))
diff --git a/src/fenrirscreenreader/core/settingsManager.py b/src/fenrirscreenreader/core/settingsManager.py
index f141641f..06d39eb0 100644
--- a/src/fenrirscreenreader/core/settingsManager.py
+++ b/src/fenrirscreenreader/core/settingsManager.py
@@ -25,7 +25,6 @@ from fenrirscreenreader.core import headLineManager
 from fenrirscreenreader.core import tableManager
 from fenrirscreenreader.core import byteManager
 from fenrirscreenreader.core import environment 
-from fenrirscreenreader.core import inputData
 from fenrirscreenreader.core.settingsData import settingsData
 from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import module_utils