diff --git a/core/assets/music/1.mp3 b/core/assets/music/1.mp3
new file mode 100644
index 0000000000..642338935e
Binary files /dev/null and b/core/assets/music/1.mp3 differ
diff --git a/core/assets/music/1.ogg b/core/assets/music/1.ogg
deleted file mode 100644
index bb92288e32..0000000000
Binary files a/core/assets/music/1.ogg and /dev/null differ
diff --git a/core/assets/music/2.mp3 b/core/assets/music/2.mp3
new file mode 100644
index 0000000000..8a40164ad5
Binary files /dev/null and b/core/assets/music/2.mp3 differ
diff --git a/core/assets/music/2.ogg b/core/assets/music/2.ogg
deleted file mode 100644
index a41c41249d..0000000000
Binary files a/core/assets/music/2.ogg and /dev/null differ
diff --git a/core/assets/music/3.mp3 b/core/assets/music/3.mp3
new file mode 100644
index 0000000000..1586984c2d
Binary files /dev/null and b/core/assets/music/3.mp3 differ
diff --git a/core/assets/music/3.ogg b/core/assets/music/3.ogg
deleted file mode 100644
index e19290f0e9..0000000000
Binary files a/core/assets/music/3.ogg and /dev/null differ
diff --git a/core/assets/music/4.mp3 b/core/assets/music/4.mp3
new file mode 100644
index 0000000000..8f1998b9c8
Binary files /dev/null and b/core/assets/music/4.mp3 differ
diff --git a/core/assets/music/4.ogg b/core/assets/music/4.ogg
deleted file mode 100644
index 0a5bff409e..0000000000
Binary files a/core/assets/music/4.ogg and /dev/null differ
diff --git a/core/assets/sounds/bang.mp3 b/core/assets/sounds/bang.mp3
new file mode 100644
index 0000000000..d859b89aab
Binary files /dev/null and b/core/assets/sounds/bang.mp3 differ
diff --git a/core/assets/sounds/bang.ogg b/core/assets/sounds/bang.ogg
deleted file mode 100644
index 9f8de5b434..0000000000
Binary files a/core/assets/sounds/bang.ogg and /dev/null differ
diff --git a/core/assets/sounds/bang2.mp3 b/core/assets/sounds/bang2.mp3
new file mode 100644
index 0000000000..71e3deffa4
Binary files /dev/null and b/core/assets/sounds/bang2.mp3 differ
diff --git a/core/assets/sounds/bang2.ogg b/core/assets/sounds/bang2.ogg
deleted file mode 100644
index 6e744bbacf..0000000000
Binary files a/core/assets/sounds/bang2.ogg and /dev/null differ
diff --git a/core/assets/sounds/bigshot.mp3 b/core/assets/sounds/bigshot.mp3
new file mode 100644
index 0000000000..2139d15232
Binary files /dev/null and b/core/assets/sounds/bigshot.mp3 differ
diff --git a/core/assets/sounds/bigshot.ogg b/core/assets/sounds/bigshot.ogg
deleted file mode 100644
index 764d0ff910..0000000000
Binary files a/core/assets/sounds/bigshot.ogg and /dev/null differ
diff --git a/core/assets/sounds/blast.mp3 b/core/assets/sounds/blast.mp3
new file mode 100644
index 0000000000..f05f080eae
Binary files /dev/null and b/core/assets/sounds/blast.mp3 differ
diff --git a/core/assets/sounds/blast.ogg b/core/assets/sounds/blast.ogg
deleted file mode 100644
index c772039289..0000000000
Binary files a/core/assets/sounds/blast.ogg and /dev/null differ
diff --git a/core/assets/sounds/bloop.mp3 b/core/assets/sounds/bloop.mp3
new file mode 100644
index 0000000000..c77f53d7fe
Binary files /dev/null and b/core/assets/sounds/bloop.mp3 differ
diff --git a/core/assets/sounds/bloop.ogg b/core/assets/sounds/bloop.ogg
deleted file mode 100644
index d07415f877..0000000000
Binary files a/core/assets/sounds/bloop.ogg and /dev/null differ
diff --git a/core/assets/sounds/break.mp3 b/core/assets/sounds/break.mp3
new file mode 100644
index 0000000000..56487e4af1
Binary files /dev/null and b/core/assets/sounds/break.mp3 differ
diff --git a/core/assets/sounds/break.ogg b/core/assets/sounds/break.ogg
deleted file mode 100644
index 96e51cfefe..0000000000
Binary files a/core/assets/sounds/break.ogg and /dev/null differ
diff --git a/core/assets/sounds/corexplode.mp3 b/core/assets/sounds/corexplode.mp3
new file mode 100644
index 0000000000..2ee50fb405
Binary files /dev/null and b/core/assets/sounds/corexplode.mp3 differ
diff --git a/core/assets/sounds/corexplode.ogg b/core/assets/sounds/corexplode.ogg
deleted file mode 100644
index 94babbb4e8..0000000000
Binary files a/core/assets/sounds/corexplode.ogg and /dev/null differ
diff --git a/core/assets/sounds/die.mp3 b/core/assets/sounds/die.mp3
new file mode 100644
index 0000000000..ae87ef7aa9
Binary files /dev/null and b/core/assets/sounds/die.mp3 differ
diff --git a/core/assets/sounds/die.ogg b/core/assets/sounds/die.ogg
deleted file mode 100644
index d4520c4f11..0000000000
Binary files a/core/assets/sounds/die.ogg and /dev/null differ
diff --git a/core/assets/sounds/enemyshoot.mp3 b/core/assets/sounds/enemyshoot.mp3
new file mode 100644
index 0000000000..7deb792726
Binary files /dev/null and b/core/assets/sounds/enemyshoot.mp3 differ
diff --git a/core/assets/sounds/enemyshoot.ogg b/core/assets/sounds/enemyshoot.ogg
deleted file mode 100644
index 7b8911baef..0000000000
Binary files a/core/assets/sounds/enemyshoot.ogg and /dev/null differ
diff --git a/core/assets/sounds/explosion.mp3 b/core/assets/sounds/explosion.mp3
new file mode 100644
index 0000000000..f5f6e08fa7
Binary files /dev/null and b/core/assets/sounds/explosion.mp3 differ
diff --git a/core/assets/sounds/explosion.ogg b/core/assets/sounds/explosion.ogg
deleted file mode 100644
index e0992f0555..0000000000
Binary files a/core/assets/sounds/explosion.ogg and /dev/null differ
diff --git a/core/assets/sounds/flame.mp3 b/core/assets/sounds/flame.mp3
new file mode 100644
index 0000000000..a49ae44245
Binary files /dev/null and b/core/assets/sounds/flame.mp3 differ
diff --git a/core/assets/sounds/flame.ogg b/core/assets/sounds/flame.ogg
deleted file mode 100644
index 35aa016ef5..0000000000
Binary files a/core/assets/sounds/flame.ogg and /dev/null differ
diff --git a/core/assets/sounds/flame2.mp3 b/core/assets/sounds/flame2.mp3
new file mode 100644
index 0000000000..c0d71a7b1d
Binary files /dev/null and b/core/assets/sounds/flame2.mp3 differ
diff --git a/core/assets/sounds/flame2.ogg b/core/assets/sounds/flame2.ogg
deleted file mode 100644
index b0343457e5..0000000000
Binary files a/core/assets/sounds/flame2.ogg and /dev/null differ
diff --git a/core/assets/sounds/laser.mp3 b/core/assets/sounds/laser.mp3
new file mode 100644
index 0000000000..f0b2398aef
Binary files /dev/null and b/core/assets/sounds/laser.mp3 differ
diff --git a/core/assets/sounds/laser.ogg b/core/assets/sounds/laser.ogg
deleted file mode 100644
index 8b0d5ccdcf..0000000000
Binary files a/core/assets/sounds/laser.ogg and /dev/null differ
diff --git a/core/assets/sounds/lasershot.mp3 b/core/assets/sounds/lasershot.mp3
new file mode 100644
index 0000000000..1db62aa08a
Binary files /dev/null and b/core/assets/sounds/lasershot.mp3 differ
diff --git a/core/assets/sounds/lasershot.ogg b/core/assets/sounds/lasershot.ogg
deleted file mode 100644
index f22a189e27..0000000000
Binary files a/core/assets/sounds/lasershot.ogg and /dev/null differ
diff --git a/core/assets/sounds/missile.mp3 b/core/assets/sounds/missile.mp3
new file mode 100644
index 0000000000..89af9f5157
Binary files /dev/null and b/core/assets/sounds/missile.mp3 differ
diff --git a/core/assets/sounds/missile.ogg b/core/assets/sounds/missile.ogg
deleted file mode 100644
index 8c35b516cd..0000000000
Binary files a/core/assets/sounds/missile.ogg and /dev/null differ
diff --git a/core/assets/sounds/ping.mp3 b/core/assets/sounds/ping.mp3
new file mode 100644
index 0000000000..b9692a37fc
Binary files /dev/null and b/core/assets/sounds/ping.mp3 differ
diff --git a/core/assets/sounds/ping.ogg b/core/assets/sounds/ping.ogg
deleted file mode 100644
index c3e797cebb..0000000000
Binary files a/core/assets/sounds/ping.ogg and /dev/null differ
diff --git a/core/assets/sounds/place.mp3 b/core/assets/sounds/place.mp3
new file mode 100644
index 0000000000..3f5369e4fa
Binary files /dev/null and b/core/assets/sounds/place.mp3 differ
diff --git a/core/assets/sounds/place.ogg b/core/assets/sounds/place.ogg
deleted file mode 100644
index cb7d26844b..0000000000
Binary files a/core/assets/sounds/place.ogg and /dev/null differ
diff --git a/core/assets/sounds/purchase.mp3 b/core/assets/sounds/purchase.mp3
new file mode 100644
index 0000000000..6edc48eebd
Binary files /dev/null and b/core/assets/sounds/purchase.mp3 differ
diff --git a/core/assets/sounds/purchase.ogg b/core/assets/sounds/purchase.ogg
deleted file mode 100644
index fe43a21926..0000000000
Binary files a/core/assets/sounds/purchase.ogg and /dev/null differ
diff --git a/core/assets/sounds/railgun.mp3 b/core/assets/sounds/railgun.mp3
new file mode 100644
index 0000000000..a9bb203a7c
Binary files /dev/null and b/core/assets/sounds/railgun.mp3 differ
diff --git a/core/assets/sounds/railgun.ogg b/core/assets/sounds/railgun.ogg
deleted file mode 100644
index 75a4ea886b..0000000000
Binary files a/core/assets/sounds/railgun.ogg and /dev/null differ
diff --git a/core/assets/sounds/resonate.mp3 b/core/assets/sounds/resonate.mp3
new file mode 100644
index 0000000000..ea456660de
Binary files /dev/null and b/core/assets/sounds/resonate.mp3 differ
diff --git a/core/assets/sounds/resonate.ogg b/core/assets/sounds/resonate.ogg
deleted file mode 100644
index 4ba46f9fb7..0000000000
Binary files a/core/assets/sounds/resonate.ogg and /dev/null differ
diff --git a/core/assets/sounds/respawn.mp3 b/core/assets/sounds/respawn.mp3
new file mode 100644
index 0000000000..56e6fff2fc
Binary files /dev/null and b/core/assets/sounds/respawn.mp3 differ
diff --git a/core/assets/sounds/respawn.ogg b/core/assets/sounds/respawn.ogg
deleted file mode 100644
index bba099421c..0000000000
Binary files a/core/assets/sounds/respawn.ogg and /dev/null differ
diff --git a/core/assets/sounds/shoot.mp3 b/core/assets/sounds/shoot.mp3
new file mode 100644
index 0000000000..4a826fdfdd
Binary files /dev/null and b/core/assets/sounds/shoot.mp3 differ
diff --git a/core/assets/sounds/shoot.ogg b/core/assets/sounds/shoot.ogg
deleted file mode 100644
index bd1986d256..0000000000
Binary files a/core/assets/sounds/shoot.ogg and /dev/null differ
diff --git a/core/assets/sounds/shoot_old.mp3 b/core/assets/sounds/shoot_old.mp3
new file mode 100644
index 0000000000..bfe18e8806
Binary files /dev/null and b/core/assets/sounds/shoot_old.mp3 differ
diff --git a/core/assets/sounds/shoot_old.ogg b/core/assets/sounds/shoot_old.ogg
deleted file mode 100644
index cdd2363d23..0000000000
Binary files a/core/assets/sounds/shoot_old.ogg and /dev/null differ
diff --git a/core/assets/sounds/spawn.mp3 b/core/assets/sounds/spawn.mp3
new file mode 100644
index 0000000000..c0235b640c
Binary files /dev/null and b/core/assets/sounds/spawn.mp3 differ
diff --git a/core/assets/sounds/spawn.ogg b/core/assets/sounds/spawn.ogg
deleted file mode 100644
index 0f62d2655a..0000000000
Binary files a/core/assets/sounds/spawn.ogg and /dev/null differ
diff --git a/core/assets/sounds/tesla.mp3 b/core/assets/sounds/tesla.mp3
new file mode 100644
index 0000000000..c8f053fbd3
Binary files /dev/null and b/core/assets/sounds/tesla.mp3 differ
diff --git a/core/assets/sounds/tesla.ogg b/core/assets/sounds/tesla.ogg
deleted file mode 100644
index f6da103775..0000000000
Binary files a/core/assets/sounds/tesla.ogg and /dev/null differ
diff --git a/core/assets/sounds/waveend.mp3 b/core/assets/sounds/waveend.mp3
new file mode 100644
index 0000000000..60a48c0ba4
Binary files /dev/null and b/core/assets/sounds/waveend.mp3 differ
diff --git a/core/assets/sounds/waveend.ogg b/core/assets/sounds/waveend.ogg
deleted file mode 100644
index 6c20f4eed3..0000000000
Binary files a/core/assets/sounds/waveend.ogg and /dev/null differ
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 3958a0d4d9..4fb9e19c0e 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -95,14 +95,14 @@ public class Control extends Module{
 			item.init();
 		}
 
-		Sounds.load("shoot.ogg", "place.ogg", "explosion.ogg", "enemyshoot.ogg",
-				"corexplode.ogg", "break.ogg", "spawn.ogg", "flame.ogg", "die.ogg",
-				"respawn.ogg", "purchase.ogg", "flame2.ogg", "bigshot.ogg", "laser.ogg", "lasershot.ogg",
-				"ping.ogg", "tesla.ogg", "waveend.ogg", "railgun.ogg", "blast.ogg", "bang2.ogg");
+		Sounds.load("shoot.mp3", "place.mp3", "explosion.mp3", "enemyshoot.mp3",
+				"corexplode.mp3", "break.mp3", "spawn.mp3", "flame.mp3", "die.mp3",
+				"respawn.mp3", "purchase.mp3", "flame2.mp3", "bigshot.mp3", "laser.mp3", "lasershot.mp3",
+				"ping.mp3", "tesla.mp3", "waveend.mp3", "railgun.mp3", "blast.mp3", "bang2.mp3");
 
 		Sounds.setFalloff(9000f);
 
-		Musics.load("1.ogg", "2.ogg", "3.ogg", "4.ogg");
+		Musics.load("1.mp3", "2.mp3", "3.mp3", "4.mp3");
 
         DefaultKeybinds.load();
 
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 618235efb0..2dcc0cf38d 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -56,7 +56,9 @@ task run(dependsOn: classes, type: JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     standardInput = System.in
     workingDir = project.assetsDir
-    jvmArgs "-XstartOnFirstThread"
+    if(System.getProperty("os.name").toLowerCase().contains("mac")){
+        jvmArgs "-XstartOnFirstThread"
+    }
     ignoreExitValue = true
     if (project.hasProperty("appArgs")) {
         args Eval.me(appArgs)