diff --git a/assets/ambient_1.ogg b/assets/ambient_1.ogg
deleted file mode 100644
index 7c97dd1..0000000
Binary files a/assets/ambient_1.ogg and /dev/null differ
diff --git a/assets/config.json b/assets/config.json
index 00cd639..8580e88 100644
--- a/assets/config.json
+++ b/assets/config.json
@@ -1,12 +1,22 @@
 {
   "sounds": {
-    "sword_1": "assets/sword.1.ogg",
-    "monster_16": "assets/monster-16.ogg",
-    "monster_1": "assets/monster-1.ogg",
-    "walk": "assets/blank.ogg",
-    "blank": "assets/blank.ogg",
-    "pickup": "assets/pickup.ogg",
-    "ambient_1": "assets/ambient_1.ogg"
+    "Sword_Hit_1": "assets/sounds/Creature_Sounds-Sword_Hit_1.ogg",
+    "Evil_Eye_Sound_1": "assets/sounds/Creature_Sounds-Evil_Eye_Sound_1.ogg",
+    "Evil_Eye_Sound_2": "assets/sounds/Creature_Sounds-Evil_Eye_Sound_2.ogg",
+    "Giant_Voice_1": "assets/sounds/Creature_Sounds-Giant_Voice_1.ogg",
+    "Medium_Rat": "assets/sounds/Creature_Sounds-Medium_Rat.ogg",
+    "Ranger_1": "assets/sounds/Creature_Sounds-Ranger_1.ogg",
+    "Small_Rat": "assets/sounds/Creature_Sounds-Small_Rat.ogg",
+    "Spider_1": "assets/sounds/Creature_Sounds-Spider_1-001.ogg",
+    "Spider_2": "assets/sounds/Creature_Sounds-Spider_1-002.ogg",
+    "Sword_Hit_1": "assets/sounds/Creature_Sounds-Sword_Hit_1.ogg",
+    "Sword_Hit_2": "assets/sounds/Creature_Sounds-Sword_Hit_2.ogg",
+    "walk": "assets/sounds/Creature_Sounds-Walk.ogg",
+    "Creature_Death_1": "assets/sounds/Creature_Sounds-Creature_Death_1.ogg",
+    "Humanoid_Death_1": "assets/sounds/Creature_Sounds-Humanoid_Death_1.ogg",
+    "blank": "assets/sounds/blank.ogg",
+    "pickup": "assets/sounds/pickup.ogg",
+    "ambient_1": "assets/sounds/ambient_1.ogg"
   },
   "sprites": {
     "armored_knight": "assets/armored_knight_1-256.png",
diff --git a/assets/enemies.json b/assets/enemies.json
index 6561f4d..296dd06 100644
--- a/assets/enemies.json
+++ b/assets/enemies.json
@@ -6,11 +6,9 @@
         "foreground": [255, 200, 125],
         "background": [30, 20, 75]
       },
-      {"_type": "Combat", "hp": 200, "max_hp": 200, "damage": 50, "dead": false},
+      {"_type": "Combat", "hp": 200, "max_hp": 200, "damage": 10, "dead": false},
       {"_type": "Motion", "dx": 0, "dy": 0, "random": false},
-      {"_type": "LightSource", "strength": 45, "radius": 2.0},
-      {"_type": "EnemyConfig", "hearing_distance": 5},
-      {"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 1.0}
+      {"_type": "LightSource", "strength": 45, "radius": 2.0}
     ]
   },
   "KNIGHT": {
@@ -24,7 +22,7 @@
       {"_type": "EnemyConfig", "hearing_distance": 5},
       {"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 0.3},
       {"_type": "Sprite", "name": "armored_knight"},
-      {"_type": "Sound", "attack": "monster_1", "death": "monster_16"}
+      {"_type": "Sound", "attack": "Sword_Hit_2", "death": "Humanoid_Death_1"}
     ]
   },
   "AXE_RANGER": {
@@ -38,7 +36,7 @@
       {"_type": "EnemyConfig", "hearing_distance": 5},
       {"_type": "Sprite", "name": "axe_ranger"},
       {"_type": "Animation", "scale": 0.1, "simple": false, "frames": 10, "speed": 0.6},
-      {"_type": "Sound", "attack": "sword_1", "death": "monster_16"}
+      {"_type": "Sound", "attack": "Sword_Hit_1", "death": "Humanoid_Death_1"}
     ]
   },
   "EVIL_EYE": {
@@ -52,7 +50,7 @@
       {"_type": "EnemyConfig", "hearing_distance": 5},
       {"_type": "Sprite", "name": "evil_eye"},
       {"_type": "Animation", "scale": 0.1, "simple": false, "frames": 10, "speed": 0.3},
-      {"_type": "Sound", "attack": "monster_1", "death": "monster_16"}
+      {"_type": "Sound", "attack": "Evil_Eye_Sound_2", "death": "Evil_Eye_Sound_1"}
     ]
   },
   "RAT_GIANT": {
@@ -66,7 +64,7 @@
       {"_type": "EnemyConfig", "hearing_distance": 10},
       {"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 1.0},
       {"_type": "Sprite", "name": "rat_with_sword"},
-      {"_type": "Sound", "attack": "sword_1", "death": "monster_16"}
+      {"_type": "Sound", "attack": "Small_Rat", "death": "Creature_Death_1"}
     ]
   },
   "RAT_KING": {
@@ -80,7 +78,7 @@
       {"_type": "EnemyConfig", "hearing_distance": 3},
       {"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 1.0},
       {"_type": "Sprite", "name": "rat_king"},
-      {"_type": "Sound", "attack": "sword_1", "death": "monster_16"}
+      {"_type": "Sound", "attack": "Medium_Rat", "death": "Creature_Death_1"}
     ]
   },
   "SPIDER_GIANT_HAIRY": {
@@ -94,7 +92,7 @@
       {"_type": "EnemyConfig", "hearing_distance": 10},
       {"_type": "Animation", "scale": 0.1, "simple": true, "frames": 10, "speed": 1.0},
       {"_type": "Sprite", "name": "hairy_spider"},
-      {"_type": "Sound", "attack": "sword_1", "death": "monster_16"}
+      {"_type": "Sound", "attack": "Spider_1", "death": "Spider_2"}
     ]
   }
 }
diff --git a/assets/monster-1.ogg b/assets/monster-1.ogg
deleted file mode 100644
index c4a5c27..0000000
Binary files a/assets/monster-1.ogg and /dev/null differ
diff --git a/assets/monster-16.ogg b/assets/monster-16.ogg
deleted file mode 100644
index e723c3c..0000000
Binary files a/assets/monster-16.ogg and /dev/null differ
diff --git a/assets/sounds/Creature_Sounds-Creature_Death_1.ogg b/assets/sounds/Creature_Sounds-Creature_Death_1.ogg
new file mode 100644
index 0000000..99239c9
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Creature_Death_1.ogg differ
diff --git a/assets/sounds/Creature_Sounds-Evil_Eye_Sound_1.ogg b/assets/sounds/Creature_Sounds-Evil_Eye_Sound_1.ogg
new file mode 100644
index 0000000..a55ae8a
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Evil_Eye_Sound_1.ogg differ
diff --git a/assets/sounds/Creature_Sounds-Evil_Eye_Sound_2.ogg b/assets/sounds/Creature_Sounds-Evil_Eye_Sound_2.ogg
new file mode 100644
index 0000000..6f05509
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Evil_Eye_Sound_2.ogg differ
diff --git a/assets/sounds/Creature_Sounds-Giant_Voice_1.ogg b/assets/sounds/Creature_Sounds-Giant_Voice_1.ogg
new file mode 100644
index 0000000..f14f479
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Giant_Voice_1.ogg differ
diff --git a/assets/sounds/Creature_Sounds-Humanoid_Death_1.ogg b/assets/sounds/Creature_Sounds-Humanoid_Death_1.ogg
new file mode 100644
index 0000000..08760fa
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Humanoid_Death_1.ogg differ
diff --git a/assets/sounds/Creature_Sounds-Medium_Rat.ogg b/assets/sounds/Creature_Sounds-Medium_Rat.ogg
new file mode 100644
index 0000000..1136186
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Medium_Rat.ogg differ
diff --git a/assets/sounds/Creature_Sounds-Ranger_1.ogg b/assets/sounds/Creature_Sounds-Ranger_1.ogg
new file mode 100644
index 0000000..4af36f3
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Ranger_1.ogg differ
diff --git a/assets/sounds/Creature_Sounds-Small_Rat.ogg b/assets/sounds/Creature_Sounds-Small_Rat.ogg
new file mode 100644
index 0000000..08200c2
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Small_Rat.ogg differ
diff --git a/assets/sounds/Creature_Sounds-Spider_1-001.ogg b/assets/sounds/Creature_Sounds-Spider_1-001.ogg
new file mode 100644
index 0000000..ef917f6
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Spider_1-001.ogg differ
diff --git a/assets/sounds/Creature_Sounds-Spider_1-002.ogg b/assets/sounds/Creature_Sounds-Spider_1-002.ogg
new file mode 100644
index 0000000..54cc4db
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Spider_1-002.ogg differ
diff --git a/assets/sounds/Creature_Sounds-Sword_Hit_1.ogg b/assets/sounds/Creature_Sounds-Sword_Hit_1.ogg
new file mode 100644
index 0000000..fa367e6
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Sword_Hit_1.ogg differ
diff --git a/assets/sounds/Creature_Sounds-Sword_Hit_2.ogg b/assets/sounds/Creature_Sounds-Sword_Hit_2.ogg
new file mode 100644
index 0000000..fc095be
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Sword_Hit_2.ogg differ
diff --git a/assets/sounds/Creature_Sounds-Walk.ogg b/assets/sounds/Creature_Sounds-Walk.ogg
new file mode 100644
index 0000000..dfa8860
Binary files /dev/null and b/assets/sounds/Creature_Sounds-Walk.ogg differ
diff --git a/assets/sounds/ambient_1.ogg b/assets/sounds/ambient_1.ogg
new file mode 100644
index 0000000..f643926
Binary files /dev/null and b/assets/sounds/ambient_1.ogg differ
diff --git a/assets/blank.ogg b/assets/sounds/blank.ogg
similarity index 100%
rename from assets/blank.ogg
rename to assets/sounds/blank.ogg
diff --git a/assets/pickup.ogg b/assets/sounds/pickup.ogg
similarity index 100%
rename from assets/pickup.ogg
rename to assets/sounds/pickup.ogg
diff --git a/assets/sword.1.ogg b/assets/sword.1.ogg
deleted file mode 100644
index 84c5423..0000000
Binary files a/assets/sword.1.ogg and /dev/null differ
diff --git a/gui_fsm.cpp b/gui_fsm.cpp
index 3b00990..95b5e05 100644
--- a/gui_fsm.cpp
+++ b/gui_fsm.cpp
@@ -194,7 +194,7 @@ namespace gui {
     switch(ev) {
       case ATTACK:
         $main_ui.dirty();
-        $status_ui.log("You attack!");
+        sound::play("Sword_Hit_1");
         state(State::ATTACKING);
         break;
       case ROTATE_LEFT: