diff --git a/core/assets/shaders/planet.vertex.glsl b/core/assets/shaders/planet.vertex.glsl
index f78ad41b94..ca58a98367 100755
--- a/core/assets/shaders/planet.vertex.glsl
+++ b/core/assets/shaders/planet.vertex.glsl
@@ -1,7 +1,10 @@
 attribute vec4 a_position;
 attribute vec3 a_normal;
 attribute vec4 a_color;
+
 uniform mat4 u_projModelView;
+uniform vec3 u_lightdir;
+
 varying vec4 v_col;
 
 const vec3 ambientColor = vec3(1.0);
@@ -11,7 +14,7 @@ const vec3 v1 = vec3(1.0, 0.0, 1.0);
 const vec3 v2 = vec3(1.0, 0.5, 0.0);
 
 void main(){
-	vec3 norc = ambientColor * (diffuse + vec3(clamp((dot(a_normal, ambientDir) + 1.0) / 2.0, 0.0, 1.0)));
+	vec3 norc = ambientColor * (diffuse + vec3(clamp((dot(a_normal, u_lightdir) + 1.0) / 2.0, 0.0, 1.0)));
 
 	v_col = a_color * vec4(norc, 1.0);
     gl_Position = u_projModelView * a_position;
diff --git a/core/assets/shaders/sun.fragment.glsl b/core/assets/shaders/sun.fragment.glsl
new file mode 100755
index 0000000000..5ad91f3878
--- /dev/null
+++ b/core/assets/shaders/sun.fragment.glsl
@@ -0,0 +1,25 @@
+#ifdef GL_ES
+precision mediump float;
+#endif
+
+#define gradients false
+
+const int MAX_COLORS = 10;
+
+uniform int u_colornum;
+uniform vec4 u_colors[MAX_COLORS];
+
+varying float v_height;
+
+void main() {
+    if(gradients){
+        int from = int(v_height * float(u_colornum));
+        int to = int(clamp(float(int(v_height * float(u_colornum) + 1.0)), 0.0, float(u_colornum)-1.0));
+        float alpha = fract(v_height * float(u_colornum));
+
+        gl_FragColor = vec4(mix(u_colors[from], u_colors[to], alpha));
+    }else{
+        int from = int(v_height * float(u_colornum));
+        gl_FragColor = u_colors[from];
+    }
+}
\ No newline at end of file
diff --git a/core/assets/shaders/sun.vertex.glsl b/core/assets/shaders/sun.vertex.glsl
new file mode 100755
index 0000000000..e4866a3308
--- /dev/null
+++ b/core/assets/shaders/sun.vertex.glsl
@@ -0,0 +1,117 @@
+attribute vec4 a_position;
+attribute vec3 a_normal;
+
+uniform mat4 u_projModelView;
+
+uniform vec3 u_center;
+uniform float u_time;
+uniform int u_octaves;
+uniform float u_falloff;
+uniform float u_scale;
+uniform float u_power;
+uniform float u_spread;
+
+uniform float u_magnitude;
+uniform float u_seed;
+
+uniform int u_colornum;
+
+varying float v_height;
+
+float rand(vec2 co){
+    return fract(sin(dot(co.xy, vec2(12.9898, 78.233))) * 43758.5453);
+}
+
+vec4 permute(vec4 x){ return mod(((x*34.0)+1.0)*x, 289.0); }
+float permute(float x){ return floor(mod(((x*34.0)+1.0)*x, 289.0)); }
+vec4 taylorInvSqrt(vec4 r){ return 1.79284291400159 - 0.85373472095314 * r; }
+float taylorInvSqrt(float r){ return 1.79284291400159 - 0.85373472095314 * r; }
+
+vec4 grad4(float j, vec4 ip){
+    const vec4 ones = vec4(1.0, 1.0, 1.0, -1.0);
+    vec4 p, s;
+    p.xyz = floor(fract (vec3(j) * ip.xyz) * 7.0) * ip.z - 1.0;
+    p.w = 1.5 - dot(abs(p.xyz), ones.xyz);
+    s = vec4(lessThan(p, vec4(0.0)));
+    p.xyz = p.xyz + (s.xyz*2.0 - 1.0) * s.www;
+    return p;
+}
+
+float snoise(vec4 v){
+    const vec2 C = vec2(0.138196601125010504, 0.309016994374947451);
+    vec4 i = floor(v + dot(v, C.yyyy));
+    vec4 x0 = v - i + dot(i, C.xxxx);
+    vec4 i0;
+    vec3 isX = step(x0.yzw, x0.xxx);
+    vec3 isYZ = step(x0.zww, x0.yyz);
+    i0.x = isX.x + isX.y + isX.z;
+    i0.yzw = 1.0 - isX;
+    i0.y += isYZ.x + isYZ.y;
+    i0.zw += 1.0 - isYZ.xy;
+    i0.z += isYZ.z;
+    i0.w += 1.0 - isYZ.z;
+    vec4 i3 = clamp(i0, 0.0, 1.0);
+    vec4 i2 = clamp(i0-1.0, 0.0, 1.0);
+    vec4 i1 = clamp(i0-2.0, 0.0, 1.0);
+    vec4 x1 = x0 - i1 + 1.0 * C.xxxx;
+    vec4 x2 = x0 - i2 + 2.0 * C.xxxx;
+    vec4 x3 = x0 - i3 + 3.0 * C.xxxx;
+    vec4 x4 = x0 - 1.0 + 4.0 * C.xxxx;
+    i = mod(i, 289.0);
+    float j0 = permute(permute(permute(permute(i.w) + i.z) + i.y) + i.x);
+    vec4 j1 = permute(permute(permute(permute (
+    i.w + vec4(i1.w, i2.w, i3.w, 1.0))
+    + i.z + vec4(i1.z, i2.z, i3.z, 1.0))
+    + i.y + vec4(i1.y, i2.y, i3.y, 1.0))
+    + i.x + vec4(i1.x, i2.x, i3.x, 1.0));
+    vec4 ip = vec4(1.0/294.0, 1.0/49.0, 1.0/7.0, 0.0);
+    vec4 p0 = grad4(j0, ip);
+    vec4 p1 = grad4(j1.x, ip);
+    vec4 p2 = grad4(j1.y, ip);
+    vec4 p3 = grad4(j1.z, ip);
+    vec4 p4 = grad4(j1.w, ip);
+    vec4 norm = taylorInvSqrt(vec4(dot(p0, p0), dot(p1, p1), dot(p2, p2), dot(p3, p3)));
+    p0 *= norm.x;
+    p1 *= norm.y;
+    p2 *= norm.z;
+    p3 *= norm.w;
+    p4 *= taylorInvSqrt(dot(p4, p4));
+    vec3 m0 = max(0.6 - vec3(dot(x0, x0), dot(x1, x1), dot(x2, x2)), 0.0);
+    vec2 m1 = max(0.6 - vec2(dot(x3, x3), dot(x4, x4)), 0.0);
+    m0 = m0 * m0;
+    m1 = m1 * m1;
+    return 49.0 * (dot(m0*m0, vec3(dot(p0, x0), dot(p1, x1), dot(p2, x2)))+ dot(m1*m1, vec2(dot(p3, x3), dot(p4, x4))));
+}
+
+float onoise(vec4 pos, int octaves, float falloff, float scl, float po){
+    float sum = 0.0;
+    float samp = 0.0;
+    float amp = 1.0;
+    float cscl = scl;
+
+    for (int i = 0; i < octaves; i ++){
+        sum += (snoise(pos / vec4(cscl, cscl, cscl, 1.0)) + 1.0) / 2.0 * amp;
+        cscl /= 2.0;
+        samp += amp;
+        amp *= falloff;
+    }
+
+    return pow(sum / samp, po);
+}
+
+void main(){
+    vec3 center = u_center;
+    vec4 pos = u_projModelView * (a_position);
+
+    float height = onoise(vec4(a_position.xyz, u_time + u_seed), u_octaves, u_falloff, u_scale, u_power);
+
+    int cindex = int(height * float(u_colornum));
+
+    float dst = 1.0 - (u_magnitude/2.0) + height*u_magnitude;
+
+    v_height = (height + (onoise(vec4(a_position.xyz, u_time + u_seed*2.0), u_octaves, u_falloff, u_scale, u_power) - 0.5) / 6.0 - 0.5) * u_spread + 0.5;
+
+    vec3 rel = (-vec3(pos) + ((vec3(pos) - center) * dst + center));
+
+    gl_Position = u_projModelView * (a_position + vec4(center.xyz, 0.0)) + vec4(rel, 0.0);
+}
\ No newline at end of file
diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java
index adc80ea0b4..8baae23442 100644
--- a/core/src/mindustry/graphics/Shaders.java
+++ b/core/src/mindustry/graphics/Shaders.java
@@ -1,13 +1,14 @@
 package mindustry.graphics;
 
-import arc.Core;
-import arc.graphics.Color;
-import arc.graphics.g2d.TextureRegion;
-import arc.graphics.gl.Shader;
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.graphics.gl.*;
+import arc.math.*;
 import arc.math.geom.*;
-import arc.scene.ui.layout.Scl;
+import arc.scene.ui.layout.*;
 import arc.util.ArcAnnotate.*;
-import arc.util.Time;
+import arc.util.*;
 
 public class Shaders{
     public static Shadow shadow;
@@ -18,8 +19,9 @@ public class Shaders{
     public static MenuShader menu;
     public static LightShader light;
     public static SurfaceShader water, tar, slag;
-    public static Shader planet;
+    public static PlanetShader planet;
     public static PlanetGridShader planetGrid;
+    public static SunShader sun;
 
     public static void init(){
         shadow = new Shadow();
@@ -38,8 +40,63 @@ public class Shaders{
         water = new SurfaceShader("water");
         tar = new SurfaceShader("tar");
         slag = new SurfaceShader("slag");
-        planet = new LoadShader("planet", "planet");
+        planet = new PlanetShader();
         planetGrid = new PlanetGridShader();
+        sun = new SunShader();
+    }
+
+    public static class PlanetShader extends LoadShader{
+        public Vec3 lightDir = new Vec3(1, 1, 1).nor();
+
+        public PlanetShader(){
+            super("planet", "planet");
+        }
+
+        @Override
+        public void apply(){
+            setUniformf("u_lightdir", lightDir);
+        }
+    }
+
+    public static class SunShader extends LoadShader{
+        public int octaves = 5;
+        public float falloff = 0.5f, scale = 1f, power = 1.3f, magnitude = 0.6f, speed = 99999999999f, spread = 1.3f, seed = Mathf.random(9999f);
+
+        public Color[] colors;
+        public float[] colorValues;
+
+        public Vec3 center = new Vec3();
+
+        public SunShader(){
+            super("sun", "sun");
+        }
+
+        @Override
+        public void apply(){
+            setUniformi("u_octaves", octaves);
+            setUniformf("u_falloff", falloff);
+            setUniformf("u_scale", scale);
+            setUniformf("u_power", power);
+            setUniformf("u_magnitude", magnitude);
+            setUniformf("u_time", Time.globalTime() / speed);
+            setUniformf("u_seed", seed);
+            setUniformf("u_spread", spread);
+            setUniformf("u_center", center);
+
+            setUniformi("u_colornum", colors.length);
+            setUniform4fv("u_colors[0]", colorValues, 0, colorValues.length);
+        }
+
+        public void updateColors(){
+            colorValues = new float[colors.length*4];
+
+            for(int i = 0; i < colors.length; i ++){
+                colorValues[i*4] = colors[i].r;
+                colorValues[i*4 + 1] = colors[i].g;
+                colorValues[i*4 + 2] = colors[i].b;
+                colorValues[i*4 + 3] = colors[i].a;
+            }
+        }
     }
 
     public static class PlanetGridShader extends LoadShader{
diff --git a/core/src/mindustry/graphics/g3d/GenericMesh.java b/core/src/mindustry/graphics/g3d/GenericMesh.java
new file mode 100644
index 0000000000..854d3810c8
--- /dev/null
+++ b/core/src/mindustry/graphics/g3d/GenericMesh.java
@@ -0,0 +1,61 @@
+package mindustry.graphics.g3d;
+
+import arc.graphics.*;
+import arc.graphics.VertexAttributes.*;
+import arc.graphics.gl.*;
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.graphics.*;
+
+public class GenericMesh{
+    protected final float[] floats = new float[3 + 3 + 1];
+    protected final int primitiveType;
+    protected final Mesh mesh;
+
+    public GenericMesh(int vertices, int primitiveType){
+        this.primitiveType = primitiveType;
+        mesh = new Mesh(true, vertices, 0,
+            new VertexAttribute(Usage.position, 3, Shader.positionAttribute),
+            new VertexAttribute(Usage.normal, 3, Shader.normalAttribute),
+            new VertexAttribute(Usage.colorPacked, 4, Shader.colorAttribute)
+        );
+
+        mesh.getVerticesBuffer().limit(mesh.getMaxVertices());
+        mesh.getVerticesBuffer().position(0);
+    }
+
+    public void render(Mat3D mat){
+        render(mat, Shaders.planet);
+    }
+
+    public void render(Mat3D mat, Shader shader){
+        shader.begin();
+        shader.setUniformMatrix4("u_projModelView", mat.val);
+        shader.apply();
+        mesh.render(shader, primitiveType);
+        shader.end();
+    }
+
+    protected Vec3 normal(Vec3 v1, Vec3 v2, Vec3 v3){
+        return Tmp.v32.set(v2).sub(v1).crs(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z).nor();
+    }
+
+    protected void verts(Vec3 a, Vec3 b, Vec3 c, Vec3 normal, Color color){
+        vert(a, normal, color);
+        vert(b, normal, color);
+        vert(c, normal, color);
+    }
+
+    protected void vert(Vec3 a, Vec3 normal, Color color){
+        floats[0] = a.x;
+        floats[1] = a.y;
+        floats[2] = a.z;
+
+        floats[3] = normal.x;
+        floats[4] = normal.y;
+        floats[5] = normal.z;
+
+        floats[6] = color.toFloatBits();
+        mesh.getVerticesBuffer().put(floats);
+    }
+}
diff --git a/core/src/mindustry/graphics/PlanetGrid.java b/core/src/mindustry/graphics/g3d/PlanetGrid.java
similarity index 98%
rename from core/src/mindustry/graphics/PlanetGrid.java
rename to core/src/mindustry/graphics/g3d/PlanetGrid.java
index 9328b4e8f8..3758ec61ab 100644
--- a/core/src/mindustry/graphics/PlanetGrid.java
+++ b/core/src/mindustry/graphics/g3d/PlanetGrid.java
@@ -1,4 +1,4 @@
-package mindustry.graphics;
+package mindustry.graphics.g3d;
 
 import arc.math.*;
 import arc.math.geom.*;
@@ -47,7 +47,7 @@ public class PlanetGrid{
         }
     }
 
-    public static PlanetGrid newGrid(int size){
+    public static PlanetGrid create(int size){
         //cache grids between calls, since only ~5 different grids total are needed
         if(size < cache.length && cache[size] != null){
             return cache[size];
@@ -57,7 +57,7 @@ public class PlanetGrid{
         if(size == 0){
             result = initialGrid();
         }else{
-            result = subdividedGrid(newGrid(size - 1));
+            result = subdividedGrid(create(size - 1));
         }
 
         //store grid in cache
diff --git a/core/src/mindustry/graphics/PlanetMesh.java b/core/src/mindustry/graphics/g3d/PlanetMesh.java
similarity index 50%
rename from core/src/mindustry/graphics/PlanetMesh.java
rename to core/src/mindustry/graphics/g3d/PlanetMesh.java
index c5b3e97799..976806de3f 100644
--- a/core/src/mindustry/graphics/PlanetMesh.java
+++ b/core/src/mindustry/graphics/g3d/PlanetMesh.java
@@ -1,19 +1,13 @@
-package mindustry.graphics;
+package mindustry.graphics.g3d;
 
 import arc.graphics.*;
-import arc.graphics.VertexAttributes.*;
-import arc.graphics.gl.*;
 import arc.math.geom.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
-import mindustry.graphics.PlanetGrid.*;
+import mindustry.graphics.g3d.PlanetGrid.*;
 
-public class PlanetMesh{
-    private static final Vec3 v1 = new Vec3(), v2 = new Vec3(), v3 = new Vec3(), v4 = new Vec3();
-
-    private float[] floats = new float[3 + 3 + 1];
+public class PlanetMesh extends GenericMesh{
     private Vec3 vec = new Vec3();
-    private Mesh mesh;
     private PlanetGrid grid;
     private Vec3 center = new Vec3();
 
@@ -27,21 +21,13 @@ public class PlanetMesh{
     }
 
     public PlanetMesh(int divisions, PlanetMesher gen, float radius, boolean lines){
+        super(PlanetGrid.create(divisions).tiles.length * 12 * (3 + 3 + 1), lines ? Gl.lines : Gl.triangles);
+
         this.gen = gen;
         this.radius = radius;
-        this.grid = PlanetGrid.newGrid(divisions);
+        this.grid = PlanetGrid.create(divisions);
         this.lines = lines;
 
-        int vertices = grid.tiles.length * 12 * (3 + 3 + 1);
-
-        mesh = new Mesh(true, vertices, 0,
-            new VertexAttribute(Usage.position, 3, Shader.positionAttribute),
-            new VertexAttribute(Usage.normal, 3, Shader.normalAttribute),
-            new VertexAttribute(Usage.colorPacked, 4, Shader.colorAttribute));
-
-        mesh.getVerticesBuffer().limit(mesh.getMaxVertices());
-        mesh.getVerticesBuffer().position(0);
-
         generateMesh();
     }
 
@@ -58,23 +44,10 @@ public class PlanetMesh{
         return Structs.findMin(grid.tiles, t -> t.v.dst(Tmp.v33));
     }
 
-    public void render(Mat3D mat){
-        render(mat, Shaders.planet);
-    }
-
-    public void render(Mat3D mat, Shader shader){
-        shader.begin();
-        shader.setUniformMatrix4("u_projModelView", mat.val);
-        shader.apply();
-        mesh.render(shader, lines ? Gl.lines : Gl.triangles);
-        shader.end();
-    }
-
-
     private void generateMesh(){
         for(Ptile tile : grid.tiles){
 
-            Vec3 nor = v1.setZero();
+            Vec3 nor = Tmp.v31.setZero();
             Corner[] c = tile.corners;
 
             for(Corner corner : c){
@@ -119,25 +92,6 @@ public class PlanetMesh{
         }
     }
 
-    //unused, but functional
-    private void createIcosphere(){
-        MeshResult result = Icosphere.create(5);
-        for(int i = 0; i < result.indices.size; i+= 3){
-            v1.set(result.vertices.items, result.indices.items[i] * 3).setLength(radius).setLength(radius + elevation(v1)*intensity);
-            v2.set(result.vertices.items, result.indices.items[i + 1] * 3).setLength(radius).setLength(radius + elevation(v2)*intensity);
-            v3.set(result.vertices.items, result.indices.items[i + 2] * 3).setLength(radius).setLength(radius + elevation(v3)*intensity);
-
-            verts(v1, v3, v2,
-                normal(v1, v2, v3).scl(-1f),
-                color(v4.set(v1).add(v2).add(v3).scl(1f / 3f))
-            );
-        }
-    }
-
-    private Vec3 normal(Vec3 v1, Vec3 v2, Vec3 v3){
-        return Tmp.v32.set(v2).sub(v1).crs(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z).nor();
-    }
-
     private float elevation(Vec3 v){
         return gen.getHeight(vec.set(v).scl(1f / radius));
     }
@@ -145,23 +99,4 @@ public class PlanetMesh{
     private Color color(Vec3 v){
         return gen.getColor(vec.set(v).scl(1f / radius));
     }
-
-    private void verts(Vec3 a, Vec3 b, Vec3 c, Vec3 normal, Color color){
-        vert(a, normal, color);
-        vert(b, normal, color);
-        vert(c, normal, color);
-    }
-
-    private void vert(Vec3 a, Vec3 normal, Color color){
-        floats[0] = a.x;
-        floats[1] = a.y;
-        floats[2] = a.z;
-
-        floats[3] = normal.x;
-        floats[4] = normal.y;
-        floats[5] = normal.z;
-
-        floats[6] = color.toFloatBits();
-        mesh.getVerticesBuffer().put(floats);
-    }
 }
diff --git a/core/src/mindustry/graphics/PlanetMesher.java b/core/src/mindustry/graphics/g3d/PlanetMesher.java
similarity index 86%
rename from core/src/mindustry/graphics/PlanetMesher.java
rename to core/src/mindustry/graphics/g3d/PlanetMesher.java
index 3de9765943..39543c72a0 100644
--- a/core/src/mindustry/graphics/PlanetMesher.java
+++ b/core/src/mindustry/graphics/g3d/PlanetMesher.java
@@ -1,4 +1,4 @@
-package mindustry.graphics;
+package mindustry.graphics.g3d;
 
 import arc.graphics.*;
 import arc.math.geom.*;
diff --git a/core/src/mindustry/graphics/g3d/SphereMesh.java b/core/src/mindustry/graphics/g3d/SphereMesh.java
new file mode 100644
index 0000000000..af2e285ed5
--- /dev/null
+++ b/core/src/mindustry/graphics/g3d/SphereMesh.java
@@ -0,0 +1,24 @@
+package mindustry.graphics.g3d;
+
+import arc.graphics.*;
+import arc.math.geom.*;
+
+public class SphereMesh extends GenericMesh{
+    private static final Vec3 v1 = new Vec3(), v2 = new Vec3(), v3 = new Vec3(), v4 = new Vec3();
+
+    protected final float radius;
+
+    public SphereMesh(int divisions, float radius){
+        super(20 * (2 << (2 * divisions - 1)) * 7 * 3, Gl.triangles);
+        this.radius = radius;
+
+        MeshResult result = Icosphere.create(divisions);
+        for(int i = 0; i < result.indices.size; i+= 3){
+            v1.set(result.vertices.items, result.indices.items[i] * 3).setLength(radius);
+            v2.set(result.vertices.items, result.indices.items[i + 1] * 3).setLength(radius);
+            v3.set(result.vertices.items, result.indices.items[i + 2] * 3).setLength(radius);
+
+            verts(v1, v3, v2, normal(v1, v2, v3).scl(-1f), Color.white);
+        }
+    }
+}
diff --git a/core/src/mindustry/maps/generators/PlanetGenerator.java b/core/src/mindustry/maps/generators/PlanetGenerator.java
index 4212f98f69..e2a624da50 100644
--- a/core/src/mindustry/maps/generators/PlanetGenerator.java
+++ b/core/src/mindustry/maps/generators/PlanetGenerator.java
@@ -1,7 +1,7 @@
 package mindustry.maps.generators;
 
 import arc.math.geom.*;
-import mindustry.graphics.*;
+import mindustry.graphics.g3d.PlanetMesher;
 import mindustry.type.*;
 import mindustry.world.*;
 
diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java
index 04062478a8..e030b85ec0 100644
--- a/core/src/mindustry/type/Planet.java
+++ b/core/src/mindustry/type/Planet.java
@@ -9,8 +9,8 @@ import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
 import mindustry.ctype.*;
-import mindustry.graphics.*;
-import mindustry.graphics.PlanetGrid.*;
+import mindustry.graphics.g3d.*;
+import mindustry.graphics.g3d.PlanetGrid.*;
 import mindustry.maps.generators.*;
 import mindustry.type.Sector.*;
 
@@ -35,7 +35,7 @@ public class Planet extends UnlockableContent{
 
         this.size = 3;
 
-        grid = PlanetGrid.newGrid(size);
+        grid = PlanetGrid.create(size);
 
         sectors = new Array<>(grid.tiles.length);
         for(int i = 0; i < grid.tiles.length; i++){
diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java
index 33625dd614..ded308c0e8 100644
--- a/core/src/mindustry/type/Sector.java
+++ b/core/src/mindustry/type/Sector.java
@@ -7,7 +7,7 @@ import arc.util.io.*;
 import mindustry.*;
 import mindustry.ctype.*;
 import mindustry.game.Saves.*;
-import mindustry.graphics.PlanetGrid.*;
+import mindustry.graphics.g3d.PlanetGrid.*;
 import mindustry.world.*;
 
 /** A small section of a planet. */
diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index daa2070371..1610cdb818 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -15,7 +15,8 @@ import mindustry.content.*;
 import mindustry.ctype.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.graphics.PlanetGrid.*;
+import mindustry.graphics.g3d.*;
+import mindustry.graphics.g3d.PlanetGrid.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 
@@ -35,6 +36,11 @@ public class PlanetDialog extends FloatingDialog{
     private final VertexBatch3D batch = new VertexBatch3D(false, true, 0);
     private final PlaneBatch3D projector = new PlaneBatch3D();
 
+    private final SphereMesh sun = new SphereMesh(3, 1.2f);
+    private final Bloom bloom = new Bloom(false){{
+        setClearColor(0, 0, 0, 0);
+    }};
+
     private Planet planet = Planets.starter;
     private float lastX, lastY;
     private @Nullable Sector selected, hovered;
@@ -99,6 +105,23 @@ public class PlanetDialog extends FloatingDialog{
         stable.pack();
         stable.setPosition(0, 0, Align.center);
 
+        Shaders.sun.colors = new Color[]{
+            Color.valueOf("ff7a38"),
+            Color.valueOf("ff9638"),
+            Color.valueOf("ffc64c"),
+            Color.valueOf("ffc64c"),
+            Color.valueOf("ffe371"),
+            Color.valueOf("f4ee8e"),
+        };
+
+        Shaders.sun.updateColors();
+        Shaders.sun.scale = 1f;
+        Shaders.sun.speed = 1000f;
+        Shaders.sun.falloff = 0.3f;
+        Shaders.sun.octaves = 4;
+        Shaders.sun.spread = 1.2f;
+        Shaders.sun.magnitude = 0f;
+
         shown(this::setup);
     }
 
@@ -127,12 +150,9 @@ public class PlanetDialog extends FloatingDialog{
         projector.proj(cam.combined());
         batch.proj(cam.combined());
 
-        PlanetMesh outline = outline(planet.size);
-        Vec3 tile = outline.intersect(cam.getPickRay(Core.input.mouseX(), Core.input.mouseY()));
-        Shaders.planetGrid.mouse.lerp(tile == null ? Vec3.Zero : tile, 0.2f);
+        renderSun();
+        renderPlanet();
 
-        planet.mesh.render(cam.combined());
-        outline.render(cam.combined(), Shaders.planetGrid);
 
         for(Sector sec : planet.sectors){
             if(sec.save == null){
@@ -178,6 +198,27 @@ public class PlanetDialog extends FloatingDialog{
         }
     }
 
+    private void renderPlanet(){
+        PlanetMesh outline = outline(planet.size);
+        Vec3 tile = outline.intersect(cam.getPickRay(Core.input.mouseX(), Core.input.mouseY()));
+        Shaders.planetGrid.mouse.lerp(tile == null ? Vec3.Zero : tile, 0.2f);
+
+        Shaders.planet.lightDir.set(Shaders.sun.center).nor();
+
+        planet.mesh.render(cam.combined());
+        outline.render(cam.combined(), Shaders.planetGrid);
+    }
+
+    private void renderSun(){
+        bloom.capture();
+        Shaders.sun.center.set(-3f, 0f, 0).rotate(Vec3.Y, Time.time() / 3f);
+        sun.render(cam.combined(), Shaders.sun);
+        bloom.render();
+
+        Gl.enable(Gl.depthTest);
+        Gl.enable(Gl.blend);
+    }
+
     private void drawBorders(Sector sector, Color base){
         Color color = Tmp.c1.set(base).a(base.a + 0.3f + Mathf.absin(Time.globalTime(), 5f, 0.3f));
 
diff --git a/gradle.properties b/gradle.properties
index 2b37ed7cd1..2b800f4165 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=f2bb11a4dbb6febed118a772ce61a253e1d863c5
+archash=7b20f312c317d571738e8f2e53501ae00d48f0d0