diff --git a/build.gradle b/build.gradle
index e31d3462f3..1a4ba5978e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ allprojects {
         appName = "Mindustry"
         gdxVersion = '1.9.8'
         aiVersion = '1.8.1'
-        uCoreVersion = '2650ef8';
+        uCoreVersion = 'e78aec7';
     }
 
     repositories {
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index e257ed64d7..d1aa09cfaf 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index e6e4979f77..09dcec134a 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -546,7 +546,7 @@ public class Control extends Module{
 		
 		Entities.initPhysics();
 		
-		Entities.setCollider(tilesize, world::solid);
+		Entities.collisions().setCollider(tilesize, world::solid);
 
 		Mindustry.platforms.updateRPC();
 	}
diff --git a/core/src/io/anuke/mindustry/entities/enemies/EnemyType.java b/core/src/io/anuke/mindustry/entities/enemies/EnemyType.java
index 9192b915c5..7f5c58b384 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/EnemyType.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/EnemyType.java
@@ -31,8 +31,7 @@ public class EnemyType {
 
     public final static Color[] tierColors = {
             Color.valueOf("ffe451"), Color.valueOf("f48e20"), Color.valueOf("ff6757"),
-            Color.valueOf("ff2d86"), Color.valueOf("cb2dff"), Color.valueOf("c83333"),
-            Color.valueOf("251616") };
+            Color.valueOf("ff2d86"), Color.valueOf("cb2dff"), Color.valueOf("362020") };
     public final static int maxtier = tierColors.length;
     public final static float maxIdleLife = 60f*2f; //2 seconds idle = death
     public final static float hitDuration = 5f;
@@ -106,7 +105,7 @@ public class EnemyType {
 
         float minv = 0.07f;
 
-        if(enemy.timer.get(timerReset, 60)){
+        if(enemy.timer.get(timerReset, 80)){
             enemy.totalMove.setZero();
         }
 
@@ -116,7 +115,7 @@ public class EnemyType {
             enemy.idletime = 0;
         }
 
-        if(enemy.timer.getTime(timerReset) > 40 && enemy.totalMove.len() < 0.3f && enemy.node > 0 && enemy.target == null){
+        if(enemy.timer.getTime(timerReset) > 50 && enemy.totalMove.len() < 0.2f && enemy.node > 0 && enemy.target == null){
             enemy.idletime = 999999f;
         }
 
diff --git a/core/src/io/anuke/mindustry/game/EnemySpawn.java b/core/src/io/anuke/mindustry/game/EnemySpawn.java
index 2fe632c019..632f027a61 100644
--- a/core/src/io/anuke/mindustry/game/EnemySpawn.java
+++ b/core/src/io/anuke/mindustry/game/EnemySpawn.java
@@ -14,7 +14,7 @@ public class EnemySpawn{
 	/**The spacing, in waves, of spawns. 2 = spawns every other wave*/
 	protected int spacing = 1;
 	/**How many waves need to pass after the start of this spawn for the tier to increase by one*/
-	protected int tierscale = 14;
+	protected int tierscale = 17;
 	/**How many more enemies there are, every time the tier increases*/
 	protected int tierscaleback = 0;
 	/**The tier this spawn starts at.*/
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
index ee50f559fb..f73a876715 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
@@ -142,7 +142,7 @@ public class JoinDialog extends FloatingDialog {
         if(!Vars.gwt) {
             local.clear();
             local.background("button");
-            local.label(() -> "[accent]" + Bundles.get("text.hosts.discovering") + new String(new char[(int) (Timers.time() / 10) % 4]).replace("\0", ".")).pad(10f);
+            local.label(() -> "[accent]" + Bundles.get("text.hosts.discovering") + Strings.animated(4, 10f, ".")).pad(10f);
             Net.discoverServers(this::addLocalHosts);
         }
     }