diff --git a/src/main/java/com/minelittlepony/unicopia/USounds.java b/src/main/java/com/minelittlepony/unicopia/USounds.java
index c1022fd7..60774fcc 100644
--- a/src/main/java/com/minelittlepony/unicopia/USounds.java
+++ b/src/main/java/com/minelittlepony/unicopia/USounds.java
@@ -56,6 +56,10 @@ public interface USounds {
     SoundEvent ENTITY_SOMBRA_AMBIENT = register("entity.sombra.ambient");
     SoundEvent ENTITY_SOMBRA_LAUGH = register("entity.sombra.laugh");
     SoundEvent ENTITY_SOMBRA_SNICKER = register("entity.sombra.snicker");
+    SoundEvent ENTITY_SOMBRA_SCARY = USounds.Vanilla.ENTITY_GHAST_AMBIENT;
+
+    SoundEvent ENTITY_CRYSTAL_SHARDS_AMBIENT = BLOCK_AMETHYST_BLOCK_HIT;
+    SoundEvent ENTITY_CRYSTAL_SHARDS_JOSTLE = BLOCK_AMETHYST_BLOCK_BREAK;
 
     SoundEvent ITEM_AMULET_CHARGING = register("item.amulet.charging");
     SoundEvent ITEM_AMULET_RECHARGE = register("item.amulet.recharge");
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/CrystalShardsEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/CrystalShardsEntity.java
index 7f989046..3645df37 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/CrystalShardsEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/CrystalShardsEntity.java
@@ -165,7 +165,7 @@ public class CrystalShardsEntity extends StationaryObjectEntity {
 
         if (ticksShaking > 0 || getGrowth() < FULL_GROWTH_AGE) {
             if (age % random.nextBetween(2, 5) == 0) {
-                playSound(USounds.Vanilla.BLOCK_AMETHYST_BLOCK_HIT, 1,
+                playSound(USounds.ENTITY_CRYSTAL_SHARDS_AMBIENT, 1,
                         1 - MathHelper.clamp(getGrowth(1), 0, 1) * 0.5F);
             }
         }
@@ -184,7 +184,7 @@ public class CrystalShardsEntity extends StationaryObjectEntity {
     @Override
     public void remove(RemovalReason reason) {
         if (reason == RemovalReason.KILLED) {
-            playSound(USounds.Vanilla.BLOCK_AMETHYST_BLOCK_BREAK, 1, 1);
+            playSound(USounds.ENTITY_CRYSTAL_SHARDS_JOSTLE, 1, 1);
             dropStack(new ItemStack(UItems.CRYSTAL_SHARD, 6));
         }
         super.remove(reason);
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java
index f023adc1..2e924249 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java
@@ -338,7 +338,7 @@ public class SombraEntity extends HostileEntity implements ArenaCombatant, Parti
         if (this.age % 150 == 0) {
             target.playSound(
                     random.nextInt(30) == 0 ? USounds.ENTITY_SOMBRA_AMBIENT
-                            : random.nextInt(10) == 0 ? USounds.Vanilla.ENTITY_GHAST_AMBIENT
+                            : random.nextInt(10) == 0 ? USounds.ENTITY_SOMBRA_SCARY
                             : USounds.Vanilla.AMBIENT_CAVE.value(),
                     (float)random.nextTriangular(1, 0.2F),
                     (float)random.nextTriangular(0.3F, 0.2F)