diff --git a/music/DST-RailJet_short-cut.ogg b/music/DST-RailJet_short-cut.ogg
new file mode 100644
index 0000000..178ee5f
Binary files /dev/null and b/music/DST-RailJet_short-cut.ogg differ
diff --git a/music/Makefile b/music/Makefile
deleted file mode 100644
index 6815744..0000000
--- a/music/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-SONGS = space warm-up number2
-OGG = $(SONGS:%=%.ogg)
-WAV = $(SONGS:%=%.wav)
-MID = $(SONGS:%=%.mid)
-PDF = $(SONGS:%=%.pdf)
-
-all: $(OGG)
-
-%.ogg: %.wav
-	oggenc $<
-
-%.mid: %.abc
-	abc2midi $< -o $@
-
-%.wav: %.mid %.csd
-	csound -d -o $@ -T -F $< `basename $< .mid`.csd
-
-%.pdf: %.abc
-	abcm2ps -B 4 -O - $< | ps2pdf - $@
-
-pdf: $(PDF)
-
-clean:
-	rm -f $(OGG) $(WAV) $(MID) $(PDF)
-
-.PHONY: all clean
diff --git a/music/RE.ogg b/music/RE.ogg
new file mode 100644
index 0000000..fa26b27
Binary files /dev/null and b/music/RE.ogg differ
diff --git a/music/README b/music/README
deleted file mode 100644
index be8f211..0000000
--- a/music/README
+++ /dev/null
@@ -1,22 +0,0 @@
-In order to create the final soundtrack, you need the following packages
-installed:
-
-- csound
-- abcmidi
-- fluid-soundfont-gm
-- vorbis-tools
-
-The .abc files contain the music scores in ABC notation. These are converted to
-MIDI format with abc2midi.  For each .abc file there is a .csd file which sets
-up the instruments so csound can render the MIDI file. At the moment we are
-using only the fluid opcodes. These render notes using a General Midi
-soundfont.  After csound has rendered everything to a .wav file, oggenc is used
-to create the final .ogg file.
-
-If the abcm2ps package is installed, you can create sheet music from the .abc files.
-This can be helpful to spot mistakes.
-
-TODO:
-
-- Use ABC part notation to simulate module tracker patterns.
-- Use csound to add effects that cannot be represented by ABC (for example, filter sweeps).
diff --git a/music/death.ogg b/music/death.ogg
new file mode 100644
index 0000000..9459a0c
Binary files /dev/null and b/music/death.ogg differ
diff --git a/music/last_cyber_dance.ogg b/music/last_cyber_dance.ogg
new file mode 100644
index 0000000..46b8d4c
Binary files /dev/null and b/music/last_cyber_dance.ogg differ
diff --git a/music/space.abc b/music/space.abc
deleted file mode 100644
index 72fdac9..0000000
--- a/music/space.abc
+++ /dev/null
@@ -1,20 +0,0 @@
-X:1
-T:Space (Starfighter intro)
-C:Guus Sliepen
-M:2/2
-L:1/8
-Q:120
-K:Bb
-V:1 clef=treble
-%%MIDI channel 1
-%%MIDI gchordoff
-[| z8 | z8 | z8 | z8
-|| "Eb" e6 dc | f4 d4 | "Cm" e6 dc | f4 d4 | "Gm" B6 AG | d4 B4 | "F" A8- | "Dm" A8
-|  "Eb" e6 dc | f4 d4 | "Cm" e6 dc | g4 e4 | "Gm" d6 cB | f4 d4 | "F" c8 | "Bb" d8
-|]
-V:2 clef=treble
-%%MIDI channel 2
-[| C8- | [CF]8- | [CFB]8- | [CFBe]8
-|| [EGB]8- | [EGB]8 | [CEG]8- | [CEG]8 | [B,DG]8- | [B,DG]8 | [A,CF]8- | [A,DF]8
-|  [EGB]8- | [EGB]8 | [CEG]8- | [CEG]8 | [B,DG]8- | [B,DG]8 | [A,CF]8- | [B,DF]8
-|]
diff --git a/music/space.csd b/music/space.csd
deleted file mode 100644
index c445d8f..0000000
--- a/music/space.csd
+++ /dev/null
@@ -1,32 +0,0 @@
-<CsoundSynthesizer>
-<CsInstruments>
-sr = 48000
-ksmps = 32
-nchnls = 2
-0dbfs = 1
-
-; Use Fluidsynth to render the score using soundfonts
-
-gifluid fluidEngine; start fluidsynth engine
-ifont fluidLoad "/usr/share/sounds/sf2/FluidR3_GM.sf2", gifluid, 1
-fluidProgramSelect gifluid, 1, ifont, 0, 98 ; Crystal
-fluidProgramSelect gifluid, 2, ifont, 0, 89 ; Warm pad
-
-instr 1, 2
-	ikey	notnum
-	ivel	ampmidi 127
-		fluidNote gifluid, p1, ikey, ivel
-endin
-
-instr 99
-	iamp init 1.6
-	al, ar fluidOut gifluid
-	arl, arr freeverb al, ar, 0.9, 0.1, sr
-	outs (arl + al) * iamp, (arr + ar) * iamp
-endin
-</CsInstruments>
-<CsScore>
-i 99 0 3600
-e 1
-</CsScore>
-</CsoundSynthesizer>
diff --git a/music/space_dimensions.ogg b/music/space_dimensions.ogg
new file mode 100644
index 0000000..dcd8f8c
Binary files /dev/null and b/music/space_dimensions.ogg differ
diff --git a/music/tgfcoder-FrozenJam-SeamlessLoop.ogg b/music/tgfcoder-FrozenJam-SeamlessLoop.ogg
new file mode 100644
index 0000000..403732a
Binary files /dev/null and b/music/tgfcoder-FrozenJam-SeamlessLoop.ogg differ
diff --git a/music/through_space.ogg b/music/through_space.ogg
new file mode 100644
index 0000000..53a58e0
Binary files /dev/null and b/music/through_space.ogg differ
diff --git a/music/warm-up.abc b/music/warm-up.abc
deleted file mode 100644
index 8b15dcb..0000000
--- a/music/warm-up.abc
+++ /dev/null
@@ -1,178 +0,0 @@
-X:1
-T:Warm-up
-C:Guus Sliepen
-M:4/4
-L:1/4
-Q:150
-K:Bb
-%%MIDI drummap f 42
-%%MIDI drummap g 44
-%MIDI drummap ^A 46
-%%MIDI drummap ^c 49
-%%MIDI drummap D 40
-%%MIDI drummap C 36
-V:1 clef=treble
-%%MIDI channel 10
-%%MIDI nobeataccents
-| zzz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| CCCC | CCCC | CCCC | Czz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| CCCC | CCCC | CCCC | Czz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| CCCC | CCCC | CCCC | Czz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| z4 | z4 | z4 | zzz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| CCCC | CCCC | CCCC | Czz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| CCCC | CCCC | CCCC | Czz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| CCCC | CCCC | CCCC | Czz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| CCCC | CCCC | CCCC | Czz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| CCCC | CCCC | CCCC | Czz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| z4 | z4 | z4 | zzz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| CCCC | CCCC | CCCC | Czz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| CCCC | CCCC | CCCC | Czz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| CCCC | CCCC | CCCC | Czz/z//C//C/C/
-| CCCC | CCCC | CCCC | CCC/z//C//C/C/
-| CCCC | CCCC | CCCC | Czz/z//C//C/C/
-| CCCC | C2C2 | C4
-V:2 clef=treble
-%%MIDI channel 10
-%%MIDI nobeataccents
-| z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| !p! zDzD | zDzD | zDzD | zDzD
-| zDzD | zDzD | zDzD | z!p!^c!f!^c!fff!^c
-| !p! f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | g!p!^c!f!^c!fff!^c
-| !p! f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | g!p!^c!f!^c!fff!^c
-| !p! f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | g!p!^c!f!^c!fff!^c
-| !p! f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f//D//f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f//D//f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| !p! f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f//D//f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f//D//f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]g/
-| f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | f/f/[D/f/]f/f/f/[D/f/]f/ | g!p!^c!f!^c!fff!^c
-| ^c z3 | z4 | z4
-V:3 clef=treble transpose=-36
-%%MIDI channel 1
-%%MIDI nobeataccents
-| z4
-| z4 | z4 | z4 | z3 z/B/
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | C C C C
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | D D D D
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | B, B, B, B,
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | D D D D
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | B, B, B, B,
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | D D D D
-| z4 | z4 | z4 | z C C C
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | D D D D
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | B, B, B, B,
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | D D D D
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | B, B, B, B,
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | D D D D
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | B, B, B, B,
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | D D D D
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | B, B, B, B,
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | D D D D
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | B, B, B, B,
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | D D D D
-| z4 | z4 | z4 | z C C C
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | d/d/d/d/d/d/d/d/
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | B/B/B/B/B/B/B/B/
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | d/d/d/d/d/d/d/d/
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | B/B/B/B/B/B/B/B/
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | d/d/d/d/d/d/d/d/
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | B/B/B/B/B/B/B/B/
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | d/d/d/d/d/d/d/d/
-| c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/ | c/c/c/c/c/c/c/c/
-| C4 | z4 | z4
-V:4 clef=treble
-%%MIDI channel 2
-%%MIDI nobeataccents
-| z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[B,DF]/z/z2
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[B,DF]/z/z2
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[B,DF]/z//[B,DF]//z[B,DF]/z/
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[B,DF]/z//[B,DF]//z[B,DF]/z/
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[B,DF]/z//[B,DF]//z[B,DF]/z/
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[B,DF]/z/z2
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[B,DF]/z/z2
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[B,DF]/z//[B,DF]//z[B,DF]/z/
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[B,DF]/z//[B,DF]//z[B,DF]/z/
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[B,DF]/z//[B,DF]//z[B,DF]/z/
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[B,DF]/z//[B,DF]//z[B,DF]/z/
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[B,DF]/z//[B,DF]//z[B,DF]/z/
-| z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/ | z[CEG]/z//[CEG]//z[CEG]/z/
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4
-V:5 clef=treble
-%%MIDI channel 3
-%%MIDI nobeataccents
-| !p! [C,,E,,G,,]4- |
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [C,,E,,G,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [C,,E,,G,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [D,,F,,_A,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [G,,,B,,,D,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [D,,F,,_A,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [G,,,B,,,D,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [D,,F,,_A,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [C,,,G,,,C,,]4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [D,,F,,_A,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [G,,,B,,,D,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [D,,F,,_A,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [C,,,G,,,C,,]4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| z4 | z4 | z4 | z4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [D,,F,,_A,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [G,,,B,,,D,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [D,,F,,_A,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4 | [C,,,G,,,C,,]4
-| [C,,E,,G,,]4- | [C,,E,,G,,]4- | [C,,E,,G,,]4
diff --git a/music/warm-up.csd b/music/warm-up.csd
deleted file mode 100644
index 9fc2829..0000000
--- a/music/warm-up.csd
+++ /dev/null
@@ -1,64 +0,0 @@
-<CsoundSynthesizer>
-<CsInstruments>
-sr = 48000
-ksmps = 32
-nchnls = 2
-0dbfs = 1
-
-; Use Fluidsynth to render the score using soundfonts
-
-gifluid fluidEngine; start fluidsynth engine
-ifont fluidLoad "/usr/share/sounds/sf2/FluidR3_GM.sf2", gifluid, 1
-fluidProgramSelect gifluid, 1, ifont, 0, 38 ;Synth bass 1
-fluidProgramSelect gifluid, 2, ifont, 0, 2 ;Electric piano
-fluidProgramSelect gifluid, 3, ifont, 8, 50 ;Synth strings
-fluidProgramSelect gifluid, 10, ifont, 128, 25 ;TR-808 drums
-
-; Second engine so we can vary its volume
-
-gifluid2 fluidEngine; start fluidsynth engine
-ifont2 fluidLoad "/usr/share/sounds/sf2/FluidR3_GM.sf2", gifluid2, 1
-fluidProgramSelect gifluid2, 2, ifont2, 0, 2 ;Electric piano
-
-gkmix init 0
-
-
-instr 1, 3, 10
-	ikey	notnum
-	ivel	ampmidi 127
-		fluidNote gifluid, p1, ikey, ivel
-endin
-
-instr 2
-	ikey	notnum
-	ivel	ampmidi 127
-		fluidNote gifluid2, p1, ikey, ivel
-endin
-
-instr 98
-	gkmix line p4, p3, p5
-endin
-
-instr 99
-	iamp init 3
-	al, ar fluidOut gifluid
-	al2, ar2 fluidOut gifluid2
-	alo = al + al2 * gkmix
-	aro = ar + ar2 * gkmix
-	outs alo * iamp, aro * iamp
-endin
-</CsInstruments>
-<CsScore>
-; Tempo
-t 0 150
-
-; Final output
-i 99 0 3600
-
-; Crescendo's for the piano chords
-i 98 36 32 0 1
-i 98 196 32 0 1
-
-e 1
-</CsScore>
-</CsoundSynthesizer>
diff --git a/sources.music b/sources.music
new file mode 100644
index 0000000..e8e5320
--- /dev/null
+++ b/sources.music
@@ -0,0 +1,20 @@
+http://opengameart.org/content/through-space
+through_space.ogg
+
+http://opengameart.org/content/frozen-jam-seamless-loop
+tgfcoder-FrozenJam-SeamlessLoop.ogg
+
+http://opengameart.org/content/railjet-qubodup-short-cut-loop
+DST-RailJet_short-cut.ogg
+
+http://opengameart.org/content/space-dimensions-8bitretro-version
+space_dimensions.ogg
+
+http://opengameart.org/content/last-cyber-dance
+last_cyber_dance.ogg
+
+http://opengameart.org/content/fast-high-music
+RE.ogg
+
+http://opengameart.org/content/stereotypical-90s-space-shooter-music
+death.ogg
\ No newline at end of file
diff --git a/src/audio.cpp b/src/audio.cpp
index 0d04305..954dbbc 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -103,9 +103,9 @@ void playRandomTrack()
 
 	int tracks = 0;
 
-	char track[][30] = {
-	"music/Frantic.mod", "music/Artificial.mod", "music/Lunatic.mod", "music/ToxicFriend.mod",
-	"music/DigitalInferno.mod", "music/TempoTrance.mod", "music/IntoTheMachine.mod"
+	char track[][64] = {
+	"music/DST-RailJet_short-cut.ogg", "music/DST-RailJet_short-cut.ogg", "music/DST-RailJet_short-cut.ogg", "music/DST-RailJet_short-cut.ogg",
+	"music/DST-RailJet_short-cut.ogg", "music/DST-RailJet_short-cut.ogg", "music/tgfcoder-FrozenJam-SeamlessLoop.ogg"
 	};
 
 	switch(currentGame.system)
@@ -128,10 +128,10 @@ void playRandomTrack()
 		case 11:
 		case 18:
 		case 25:
-			loadMusic("music/HardTranceDub.mod");
+			loadMusic("music/space_dimensions.ogg");
 			break;
 		case 26:
-			loadMusic("music/LoopsAndTings.mod");
+			loadMusic("music/RE.ogg");
 			break;
 		default:
 			loadMusic(track[rand() % tracks]);
diff --git a/src/intermission.cpp b/src/intermission.cpp
index d51e21b..3192d0b 100644
--- a/src/intermission.cpp
+++ b/src/intermission.cpp
@@ -476,7 +476,7 @@ int galaxyMap()
 
 	initSaveSlots();
 
-	loadMusic("music/3DParadise.mod");
+	loadMusic("music/through_space.ogg");
 
 	loadBackground(systemBackground[currentGame.system]);
 
diff --git a/src/missions.cpp b/src/missions.cpp
index 1f80cad..56c6921 100644
--- a/src/missions.cpp
+++ b/src/missions.cpp
@@ -506,7 +506,7 @@ static char revealHiddenObjectives()
 			enemy[WC_KLINE].y = player.y;
 			enemy[WC_KLINE].flags |= FL_IMMORTAL | FL_NOFIRE;
 			setTarget(WC_KLINE);
-			loadMusic("music/TranceGeneration.mod");
+			loadMusic("music/last_cyber_dance.ogg");
 			if ((engine.useAudio) && (engine.useMusic))
 				Mix_PlayMusic(engine.music, -1);
 		}
diff --git a/src/player.cpp b/src/player.cpp
index cc3550f..1d7efe3 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -457,9 +457,9 @@ void leaveSector()
 		{
 			player.x += engine.ssx;
 			engine.ssx -= 1;
-			if (player.y > screen->h)
+			if (player.y > screen->h / 2)
 				player.y--;
-			if (player.y < screen->h)
+			if (player.y < screen->h / 2)
 				player.y++;
 		}
 
diff --git a/src/title.cpp b/src/title.cpp
index ad2d975..61a9ceb 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -601,7 +601,7 @@ void gameover()
 	engine.keyState[KEY_FIRE] = engine.keyState[KEY_ALTFIRE] = 0;
 	engine.gameSection = SECTION_INTERMISSION;
 
-	loadMusic("music/Wybierak.mod");
+	loadMusic("music/death.ogg");
 
 	SDL_Surface *gameover = loadImage("gfx/gameover.png");