diff --git a/configuration/sample.engine.ini b/configuration/sample.engine.ini
index 4d9415914fb3f4c5b147529ec79a9f39421b4f92..979a5d6393d3c2bda2b98d5b26d4b29bf18c62ea 100644
--- a/configuration/sample.engine.ini
+++ b/configuration/sample.engine.ini
@@ -1,12 +1,28 @@
+
 ###################
 # engine Settings #
 ###################
 
+[station]
+station_name="Radio Aura"
+station_logo_url=https://o94.at/themes/custom/radio_orange/logo1.png
+station_logo_size=180px
+
+
 [database]
-db_user="aura_engine"
+db_user="aura"
 db_name="aura_engine"
-db_pass="***change-me***"
+db_pass=""
 db_host="localhost"
+db_charset="utf8"
+
+[redis]
+redis_host="localhost"
+redis_port=6379
+redis_db=0
+
+#[development]
+#use_test_data=False
 
 [monitoring]
 # how often should i check the diskspace. defaults to 600s = 10m
@@ -16,25 +32,33 @@ diskspace_warning_value=1G
 # under which value should i stop recording. defaults to 200M
 diskspace_critical_value=100M
 
+#[web-ui]
+#web_port=5005
+
 [mail]
 mail_server=""
-mail_server_port=""
-mail_user=""
+mail_server_port="587"
+mail_user="aura@subsquare.at"
 mail_pass=""
 # if you want to send multiple adminmails, make them space separated
-admin_mail="david@subsquare.at gogo@servus.at"
+admin_mail="david@subsquare.at"
 # with from mailadress should be used
 from_mail="monitor@aura.py"
-# The beginning of the subject. With that you can easily apply filter rules with any mail client
-mailsubject_prefix="[AURA Engine]"
+# The beginning of the subject. With that you can easily apply filter rules using a mail client
+mailsubject_prefix="[Aura Engine]"
 
 [dataurls]
 # The URL to get the Calendar via PV/Steering
-calendarurl="http://localhost:8000/api/v1/playout"
+api_calendar_url="http://localhost:8000/api/v1/playout"
 # The URL to get show details via PV/Steering
 api_show_url="http://localhost:8000/api/v1/shows/${ID}/"
 # The URL to get playlist details via Tank
-importerurl="http://localhost:8040/api/v1/shows/${SLUG}/playlists"
+api_playlist_url="http://localhost:8040/api/v1/shows/${SLUG}/playlists"
+
+# URL and Port of the API endpoints exposed by engine
+exposed_api_url=http://localhost:3333/api/v1/
+api_port=3333
+
 # how often should the calendar be fetched in seconds (This determines the time of the last change before a specific show)
 fetching_frequency=3600
 
@@ -57,20 +81,34 @@ daemongroup="david"
 daemonuser="david"
 
 [socket]
-socketdir="/home/david/code/aura/aura-engine/modules/liquidsoap"
+socketdir="/home/david/Code/aura/engine/modules/liquidsoap"
 
 [logging]
-logdir="/var/log/aura"
+logdir="/home/david/Code/aura/engine/logs"
+#logdir="/var/log/aura"
 # possible values: debug, info, warning, error, critical
 loglevel="info"
 
+[audiofolder]
+; audiofolder="/var/audio"
+audiofolder="/home/david/Code/aura/tank-store"
+
+[fallback]
 # track_sensitive => fallback_folder track sensitivity
-# max_blank => maximum time of blank from source (float)
-# min_noise => minimum duration of noise on source to switch back over (float)
-# threshold => power in dB under which the stream is considered silent (float)
-fallback_max_blank="10."
-fallback_min_noise="1."
-fallback_threshold="-60."
+# max_blank => maximum time of blank from source (defaults to 20., seconds, float)
+# min_noise => minimum duration of noise on source to switch back over (defaults to 0, seconds, float)
+# threshold => power in dB under which the stream is considered silent (defaults to -40., float)
+fallback_max_blank="20."
+fallback_min_noise="0."
+fallback_threshold="-50."
+
+# a folder holding music for station-fallbacks
+fallback_music_folder="/home/david/Music/Genres/beats-breaks-dub-down-hiphop"
+fallback_show_name="Random Music"
+fallback_show_type="Unmoderated Music"
+fallback_show_host="Magic Shuffle"
+fallback_title_not_available="Title not available"
+
 
 [soundcard]
 # choose your weapon
@@ -91,7 +129,7 @@ soundsystem="alsa"
 # with alsa you have to write the devicenames like hw:0
 # with pulse and jack => an non empty value means it is used
 # devices with empty string are ignored and not used
-input_device_0="hw:0"
+input_device_0=""
 input_device_1=""
 input_device_2=""
 input_device_3=""
@@ -108,6 +146,7 @@ output_device_4=""
 
 # alsa_buffer => int
 alsa_buffer="8192"
+#alsa_buffer="16384"
 # alsa_buffer_length => int
 alsa_buffer_length="25"
 # alsa_periods => int
@@ -188,7 +227,7 @@ rec_4_channels="2"
 
 [stream]
 # defines enabled or not
-stream_0="y"
+stream_0="n"
 # possible values: aac, flac, mp3, ogg, opus (depending on what liquidsoap-plugins you installed)
 stream_0_encoding="aac"
 # bitrate (with encoding types without bitrate like flac or ogg it is substituted. 32 => very poor quality. 320 => very high quality)
@@ -204,7 +243,7 @@ stream_0_mountpoint="aura-test-0.aac"
 # username
 stream_0_user="source"
 # and the password
-stream_0_password="hack-me"
+stream_0_password="source"
 # stream url
 stream_0_url="http://www.fro.at"
 # the name of the stream
@@ -214,7 +253,7 @@ stream_0_genre="mixed"
 # description of the stream
 stream_0_description="Test Stream 0"
 
-stream_1="y"
+stream_1="n"
 stream_1_encoding="flac"
 stream_1_bitrate="128"
 stream_1_channels="2"
@@ -223,14 +262,14 @@ stream_1_host="localhost"
 stream_1_port="8888"
 stream_1_mountpoint="aura-test-1.flac"
 stream_1_user="source"
-stream_1_password="hack-me"
+stream_1_password="source"
 
 stream_1_url="http://www.fro.at"
 stream_1_name="AURA Test Stream 1"
 stream_1_genre="mixed"
 stream_1_description="Test Stream 1"
 
-stream_2="y"
+stream_2="n"
 stream_2_encoding="mp3"
 stream_2_bitrate="64"
 stream_2_channels="2"
@@ -239,14 +278,14 @@ stream_2_host="localhost"
 stream_2_port="8888"
 stream_2_mountpoint="aura-test-2.mp3"
 stream_2_user="source"
-stream_2_password="hack-me"
+stream_2_password="source"
 
 stream_2_url="http://www.fro.at"
 stream_2_name="AURA Test Stream 2"
 stream_2_genre="mixed"
 stream_2_description="Test Stream 2"
 
-stream_3="y"
+stream_3="n"
 stream_3_encoding="ogg"
 stream_3_bitrate="64"
 stream_3_channels="2"
@@ -255,14 +294,14 @@ stream_3_host="localhost"
 stream_3_port="8888"
 stream_3_mountpoint="aura-test-3.ogg"
 stream_3_user="source"
-stream_3_password="hack-me"
+stream_3_password="source"
 
 stream_3_url="http://www.fro.at"
 stream_3_name="AURA Test Stream 3"
 stream_3_genre="mixed"
 stream_3_description="Test Stream 3"
 
-stream_4="y"
+stream_4="n"
 stream_4_encoding="opus"
 stream_4_bitrate="64"
 stream_4_channels="2"
@@ -271,9 +310,9 @@ stream_4_host="localhost"
 stream_4_port="8888"
 stream_4_mountpoint="aura-test-4.opus"
 stream_4_user="source"
-stream_4_password="hack-me"
+stream_4_password="source"
 
 stream_4_url="http://www.fro.at"
-stream_4_name="AURA Test Stream 4"
+stream_4_name="AURA Test Stream 3"
 stream_4_genre="mixed"
-stream_4_description="Test Stream 4"
+stream_4_description="Test Stream 3"