diff --git a/public/sounds/airport.mp3 b/public/sounds/airport.mp3
deleted file mode 100644
index 0b4498a..0000000
Binary files a/public/sounds/airport.mp3 and /dev/null differ
diff --git a/public/sounds/animals/birds.mp3 b/public/sounds/animals/birds.mp3
new file mode 100644
index 0000000..1f21ed6
Binary files /dev/null and b/public/sounds/animals/birds.mp3 differ
diff --git a/public/sounds/animals/crickets.mp3 b/public/sounds/animals/crickets.mp3
new file mode 100644
index 0000000..3a704cb
Binary files /dev/null and b/public/sounds/animals/crickets.mp3 differ
diff --git a/public/sounds/animals/frog.mp3 b/public/sounds/animals/frog.mp3
new file mode 100644
index 0000000..fb8a273
Binary files /dev/null and b/public/sounds/animals/frog.mp3 differ
diff --git a/public/sounds/animals/owl.mp3 b/public/sounds/animals/owl.mp3
new file mode 100644
index 0000000..175ffd9
Binary files /dev/null and b/public/sounds/animals/owl.mp3 differ
diff --git a/public/sounds/animals/seagulls.mp3 b/public/sounds/animals/seagulls.mp3
new file mode 100644
index 0000000..f8a92f5
Binary files /dev/null and b/public/sounds/animals/seagulls.mp3 differ
diff --git a/public/sounds/animals/wolf.mp3 b/public/sounds/animals/wolf.mp3
new file mode 100644
index 0000000..00f4a91
Binary files /dev/null and b/public/sounds/animals/wolf.mp3 differ
diff --git a/public/sounds/birds.mp3 b/public/sounds/birds.mp3
deleted file mode 100644
index 9f1d54a..0000000
Binary files a/public/sounds/birds.mp3 and /dev/null differ
diff --git a/public/sounds/cafe.mp3 b/public/sounds/cafe.mp3
deleted file mode 100644
index 0015c7e..0000000
Binary files a/public/sounds/cafe.mp3 and /dev/null differ
diff --git a/public/sounds/campfire.mp3 b/public/sounds/campfire.mp3
deleted file mode 100644
index 724a7ed..0000000
Binary files a/public/sounds/campfire.mp3 and /dev/null differ
diff --git a/public/sounds/crickets.mp3 b/public/sounds/crickets.mp3
deleted file mode 100644
index aa941d9..0000000
Binary files a/public/sounds/crickets.mp3 and /dev/null differ
diff --git a/public/sounds/nature/campfire.mp3 b/public/sounds/nature/campfire.mp3
new file mode 100644
index 0000000..4cb1731
Binary files /dev/null and b/public/sounds/nature/campfire.mp3 differ
diff --git a/public/sounds/nature/river.mp3 b/public/sounds/nature/river.mp3
new file mode 100644
index 0000000..31513b5
Binary files /dev/null and b/public/sounds/nature/river.mp3 differ
diff --git a/public/sounds/nature/underwater.mp3 b/public/sounds/nature/underwater.mp3
new file mode 100644
index 0000000..90c8297
Binary files /dev/null and b/public/sounds/nature/underwater.mp3 differ
diff --git a/public/sounds/nature/waterfall.mp3 b/public/sounds/nature/waterfall.mp3
new file mode 100644
index 0000000..ac14211
Binary files /dev/null and b/public/sounds/nature/waterfall.mp3 differ
diff --git a/public/sounds/nature/waves.mp3 b/public/sounds/nature/waves.mp3
new file mode 100644
index 0000000..831997f
Binary files /dev/null and b/public/sounds/nature/waves.mp3 differ
diff --git a/public/sounds/nature/wind-in-trees.mp3 b/public/sounds/nature/wind-in-trees.mp3
new file mode 100644
index 0000000..b813c63
Binary files /dev/null and b/public/sounds/nature/wind-in-trees.mp3 differ
diff --git a/public/sounds/nature/wind.mp3 b/public/sounds/nature/wind.mp3
new file mode 100644
index 0000000..572ef55
Binary files /dev/null and b/public/sounds/nature/wind.mp3 differ
diff --git a/public/sounds/rain-on-window.mp3 b/public/sounds/rain-on-window.mp3
deleted file mode 100644
index e98e9d4..0000000
Binary files a/public/sounds/rain-on-window.mp3 and /dev/null differ
diff --git a/public/sounds/rain.mp3 b/public/sounds/rain.mp3
deleted file mode 100644
index d50f8bb..0000000
Binary files a/public/sounds/rain.mp3 and /dev/null differ
diff --git a/public/sounds/rain/heavy-rain.mp3 b/public/sounds/rain/heavy-rain.mp3
new file mode 100644
index 0000000..d9cfb1f
Binary files /dev/null and b/public/sounds/rain/heavy-rain.mp3 differ
diff --git a/public/sounds/rain/light-rain.mp3 b/public/sounds/rain/light-rain.mp3
new file mode 100644
index 0000000..91f6cc3
Binary files /dev/null and b/public/sounds/rain/light-rain.mp3 differ
diff --git a/public/sounds/rain/rain-on-leaves.mp3 b/public/sounds/rain/rain-on-leaves.mp3
new file mode 100644
index 0000000..8318cae
Binary files /dev/null and b/public/sounds/rain/rain-on-leaves.mp3 differ
diff --git a/public/sounds/rain/rain-on-tent.mp3 b/public/sounds/rain/rain-on-tent.mp3
new file mode 100644
index 0000000..c6ca1a4
Binary files /dev/null and b/public/sounds/rain/rain-on-tent.mp3 differ
diff --git a/public/sounds/rain/rain-on-umbrella.mp3 b/public/sounds/rain/rain-on-umbrella.mp3
new file mode 100644
index 0000000..d847ccb
Binary files /dev/null and b/public/sounds/rain/rain-on-umbrella.mp3 differ
diff --git a/public/sounds/rain/rain-on-window.mp3 b/public/sounds/rain/rain-on-window.mp3
new file mode 100644
index 0000000..babb947
Binary files /dev/null and b/public/sounds/rain/rain-on-window.mp3 differ
diff --git a/public/sounds/thunder.mp3 b/public/sounds/rain/thunder.mp3
similarity index 100%
rename from public/sounds/thunder.mp3
rename to public/sounds/rain/thunder.mp3
diff --git a/public/sounds/river.mp3 b/public/sounds/river.mp3
deleted file mode 100644
index 6f6853e..0000000
Binary files a/public/sounds/river.mp3 and /dev/null differ
diff --git a/public/sounds/seagulls.mp3 b/public/sounds/seagulls.mp3
deleted file mode 100644
index 5718669..0000000
Binary files a/public/sounds/seagulls.mp3 and /dev/null differ
diff --git a/public/sounds/waves.mp3 b/public/sounds/waves.mp3
deleted file mode 100644
index a005906..0000000
Binary files a/public/sounds/waves.mp3 and /dev/null differ
diff --git a/src/data/sounds.tsx b/src/data/sounds.tsx
index 6fc2626..15da025 100644
--- a/src/data/sounds.tsx
+++ b/src/data/sounds.tsx
@@ -1,10 +1,23 @@
-import { BiSolidTree, BiWater, BiSolidCoffeeAlt } from 'react-icons/bi/index';
-import { FaCity, FaCloudShowersHeavy, FaWater } from 'react-icons/fa/index';
-import { PiBirdFill } from 'react-icons/pi/index';
+import {
+  GiCricket,
+  GiSeagull,
+  GiWindow,
+  GiWaterfall,
+  GiWolfHead,
+  GiOwl,
+} from 'react-icons/gi/index';
+import {
+  BsFire,
+  // BsSoundwave,
+  BsFillCloudRainFill,
+  BsFillCloudRainHeavyFill,
+  BsUmbrellaFill,
+} from 'react-icons/bs/index';
+import { BiSolidTree, BiWater } from 'react-icons/bi/index';
+import { FaWater, FaWind, FaLeaf, FaDog, FaFrog } from 'react-icons/fa/index';
+import { PiBirdFill, PiTentFill } from 'react-icons/pi/index';
 import { MdOutlineThunderstorm } from 'react-icons/md/index';
-import { GiCricket, GiSeagull, GiWindow } from 'react-icons/gi/index';
-import { BsFire, BsAirplaneFill } from 'react-icons/bs/index';
-// import { BsSoundwave } from 'react-icons/bs/index';
+import { TbScubaMask } from 'react-icons/tb';
 
 // const defaultIcon = <BsSoundwave />;
 
@@ -18,81 +31,142 @@ export const sounds: {
       icon: <BiSolidTree />,
       id: 'nature',
       sounds: [
-        {
-          icon: <FaCloudShowersHeavy />,
-          id: 'rain',
-          label: 'Rain',
-          src: '/sounds/rain.mp3',
-        },
-        {
-          icon: <PiBirdFill />,
-          id: 'birds',
-          label: 'Birds',
-          src: '/sounds/birds.mp3',
-        },
         {
           icon: <BiWater />,
           id: 'river',
           label: 'River',
-          src: '/sounds/river.mp3',
-        },
-        {
-          icon: <MdOutlineThunderstorm />,
-          id: 'thunder',
-          label: 'Thunder',
-          src: '/sounds/thunder.mp3',
-        },
-        {
-          icon: <GiCricket />,
-          id: 'crickets',
-          label: 'Crickets',
-          src: '/sounds/crickets.mp3',
+          src: '/sounds/nature/river.mp3',
         },
         {
           icon: <FaWater />,
           id: 'waves',
-          label: 'Waves',
-          src: '/sounds/waves.mp3',
-        },
-        {
-          icon: <GiSeagull />,
-          id: 'seagulls',
-          label: 'Seagulls',
-          src: '/sounds/seagulls.mp3',
+          label: 'waves',
+          src: '/sounds/nature/waves.mp3',
         },
         {
           icon: <BsFire />,
           id: 'campfire',
           label: 'Campfire',
-          src: '/sounds/campfire.mp3',
+          src: '/sounds/nature/campfire.mp3',
+        },
+        {
+          icon: <FaWind />,
+          id: 'wind',
+          label: 'Wind',
+          src: '/sounds/nature/wind.mp3',
+        },
+        {
+          icon: <FaWind />,
+          id: 'wind-in-trees',
+          label: 'Wind in Trees',
+          src: '/sounds/nature/wind-in-trees.mp3',
+        },
+        {
+          icon: <GiWaterfall />,
+          id: 'waterfall',
+          label: 'Waterfall',
+          src: '/sounds/nature/waterfall.mp3',
+        },
+        {
+          icon: <TbScubaMask />,
+          id: 'underwater',
+          label: 'Underwater',
+          src: '/sounds/nature/underwater.mp3',
         },
       ],
       title: 'Nature',
     },
     {
-      icon: <FaCity />,
-      id: 'urban',
+      icon: <BsFillCloudRainFill />,
+      id: 'rain',
       sounds: [
         {
-          icon: <BsAirplaneFill />,
-          id: 'airport',
-          label: 'Airport',
-          src: '/sounds/airport.mp3',
+          icon: <BsFillCloudRainFill />,
+          id: 'light-rain',
+          label: 'Light Rain',
+          src: '/sounds/rain/light-rain.mp3',
         },
         {
-          icon: <BiSolidCoffeeAlt />,
-          id: 'cafe',
-          label: 'Cafe',
-          src: '/sounds/cafe.mp3',
+          icon: <BsFillCloudRainHeavyFill />,
+          id: 'heavy-rain',
+          label: 'Heavy Rain',
+          src: '/sounds/rain/heavy-rain.mp3',
+        },
+        {
+          icon: <MdOutlineThunderstorm />,
+          id: 'thunder',
+          label: 'Thunder',
+          src: '/sounds/rain/thunder.mp3',
         },
         {
           icon: <GiWindow />,
           id: 'rain-on-window',
           label: 'Rain on Window',
-          src: '/sounds/rain-on-window.mp3',
+          src: '/sounds/rain/rain-on-window.mp3',
+        },
+        {
+          icon: <BsUmbrellaFill />,
+          id: 'rain-on-umbrella',
+          label: 'Rain on Umbrella',
+          src: '/sounds/rain/rain-on-umbrella.mp3',
+        },
+        {
+          icon: <PiTentFill />,
+          id: 'rain-on-tent',
+          label: 'Rain on Tent',
+          src: '/sounds/rain/rain-on-tent.mp3',
+        },
+        {
+          icon: <FaLeaf />,
+          id: 'rain-on-leaves',
+          label: 'Rain on Leaves',
+          src: '/sounds/rain/rain-on-leaves.mp3',
         },
       ],
-      title: 'Urban',
+      title: 'Rain',
+    },
+    {
+      icon: <FaDog />,
+      id: 'animals',
+      sounds: [
+        {
+          icon: <PiBirdFill />,
+          id: 'birds',
+          label: 'Birds',
+          src: '/sounds/animals/birds.mp3',
+        },
+        {
+          icon: <GiSeagull />,
+          id: 'seagulls',
+          label: 'Seagulls',
+          src: '/sounds/animals/seagulls.mp3',
+        },
+        {
+          icon: <GiCricket />,
+          id: 'crickets',
+          label: 'Crickets',
+          src: '/sounds/animals/crickets.mp3',
+        },
+        {
+          icon: <GiWolfHead />,
+          id: 'wolf',
+          label: 'Wolf',
+          src: '/sounds/animals/wolf.mp3',
+        },
+        {
+          icon: <GiOwl />,
+          id: 'owl',
+          label: 'Owl',
+          src: '/sounds/animals/owl.mp3',
+        },
+        {
+          icon: <FaFrog />,
+          id: 'frog',
+          label: 'Frog',
+          src: '/sounds/animals/frog.mp3',
+        },
+      ],
+      title: 'Animals',
     },
   ],
 };