diff --git a/src/main/java/com/minelittlepony/unicopia/model/ModelCloud.java b/src/main/java/com/minelittlepony/unicopia/model/ModelCloud.java
index 3b74cd1c..c6e6dc62 100644
--- a/src/main/java/com/minelittlepony/unicopia/model/ModelCloud.java
+++ b/src/main/java/com/minelittlepony/unicopia/model/ModelCloud.java
@@ -5,25 +5,32 @@ import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
 public class ModelCloud extends ModelBase {
-	ModelRenderer body;
 
-	public ModelCloud() {
-		init();
-	}
+    ModelRenderer body;
 
-	private void init() {
-		body = new ModelRenderer(this, 0, 0);
+    public ModelCloud() {
+        init();
+    }
 
-		body.addBox(-24, 5, -24, 48, 10, 48);
+    private void init() {
+        boxList.clear();
 
-		body.addBox(-10, 14.999F, -10, 30, 2, 30);
-		body.addBox(-19.999F, 14.999F, -15, 15, 3, 25);
+        body = new ModelRenderer(this, 0, 0);
+        body.setTextureSize(250, 90);
 
-		body.addBox(-10, 3.001F, -10, 30, 2, 30);
-		body.rotationPointY += 4.2;
-	}
+        body.setTextureOffset(0, 0);
+        body.addBox(-24, 5, -24, 48, 10, 48);
 
-	public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
+        body.setTextureOffset(0, 58);
+        body.addBox(-10, 14.999F, -10, 30, 2, 30);
+
+        body.setTextureOffset(120, 58);
+        body.addBox(-10, 3.001F, -10, 30, 2, 30);
+
+        body.rotationPointY += 4.2;
+    }
+
+    public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
         body.render(scale);
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/render/RenderCloud.java b/src/main/java/com/minelittlepony/unicopia/render/RenderCloud.java
index 629b7126..75432857 100644
--- a/src/main/java/com/minelittlepony/unicopia/render/RenderCloud.java
+++ b/src/main/java/com/minelittlepony/unicopia/render/RenderCloud.java
@@ -18,6 +18,7 @@ public class RenderCloud extends RenderLiving<EntityCloud> {
         super(rendermanagerIn, new ModelCloud(), 1f);
     }
 
+    @Override
     public float prepareScale(EntityCloud entity, float par2) {
     	float scale = entity.getCloudSize();
 
@@ -25,6 +26,7 @@ public class RenderCloud extends RenderLiving<EntityCloud> {
     	return 0.0625F;
     }
 
+    @Override
     protected void renderModel(EntityCloud entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor) {
 
         if (!entity.isDead) {
@@ -48,6 +50,7 @@ public class RenderCloud extends RenderLiving<EntityCloud> {
         }
     }
 
+    @Override
     protected ResourceLocation getEntityTexture(EntityCloud entity) {
     	if (entity.getIsRaining() && entity.getIsThundering()) {
     		return rainCloud;
@@ -55,10 +58,12 @@ public class RenderCloud extends RenderLiving<EntityCloud> {
         return cloud;
     }
 
+    @Override
     protected int getColorMultiplier(EntityCloud par1EntityLivingBase, float yaw, float pitch) {
         return 0;
     }
 
+    @Override
     protected float getDeathMaxRotation(EntityCloud par1EntityLivingBase) {
         return 0;
     }
diff --git a/src/main/resources/assets/unicopia/textures/entity/clouds.png b/src/main/resources/assets/unicopia/textures/entity/clouds.png
index da1c3877..8c1a2a53 100644
Binary files a/src/main/resources/assets/unicopia/textures/entity/clouds.png and b/src/main/resources/assets/unicopia/textures/entity/clouds.png differ
diff --git a/src/main/resources/assets/unicopia/textures/entity/clouds_storm.png b/src/main/resources/assets/unicopia/textures/entity/clouds_storm.png
index f83d16cf..63de0e63 100644
Binary files a/src/main/resources/assets/unicopia/textures/entity/clouds_storm.png and b/src/main/resources/assets/unicopia/textures/entity/clouds_storm.png differ