diff --git a/.gitignore b/.gitignore
index 1de8ef9..727a1c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,18 @@
 /images/chocobo_2.tga
 /music/*
 !/music/chocobo.ogg
+!/music/chocobo_ffii.ogg
+!/music/chocobo_ffiii.ogg
 !/music/chocobo_ffiv.ogg
+!/music/chocobo_ffv.ogg
+!/music/chocobo_ffvi.ogg
+!/music/chocobo_ffvii.ogg
+!/music/chocobo_ffviii.ogg
+!/music/chocobo_ffix.ogg
+!/music/chocobo_ffx.ogg
 !/music/chocobo_ffxii.ogg
 !/music/chocobo_ffxiii.ogg
+!/music/chocobo_ffxiv.ogg
 /cfapikey
 /wowisetup
 /WoWIUploader.class
diff --git a/Chocobo.lua b/Chocobo.lua
index f8e470c..82cdbc7 100644
--- a/Chocobo.lua
+++ b/Chocobo.lua
@@ -35,9 +35,18 @@ Chocobo = {
         -- Please note that you can't add custom songs here,
         -- this is only used when restoring default settings or on initial setup
         "chocobo.ogg",
+        "chocobo_ffii.ogg",
+        "chocobo_ffiii.ogg",
         "chocobo_ffiv.ogg",
+        "chocobo_ffv.ogg",
+        "chocobo_ffvi.ogg",
+        "chocobo_ffvii.ogg",
+        "chocobo_ffviii.ogg",
+        "chocobo_ffix.ogg",
+        "chocobo_ffx.ogg",
         "chocobo_ffxii.ogg",
-        "chocobo_ffxiii.ogg"
+        "chocobo_ffxiii.ogg",
+        "chocobo_ffxiv.ogg"
     },
 
     -- Values are overridden later with the return from GetSpellInfo
diff --git a/music/chocobo_ffii.ogg b/music/chocobo_ffii.ogg
new file mode 100644
index 0000000..2faa1cf
Binary files /dev/null and b/music/chocobo_ffii.ogg differ
diff --git a/music/chocobo_ffiii.ogg b/music/chocobo_ffiii.ogg
new file mode 100644
index 0000000..a44f3f8
Binary files /dev/null and b/music/chocobo_ffiii.ogg differ
diff --git a/music/chocobo_ffix.ogg b/music/chocobo_ffix.ogg
new file mode 100644
index 0000000..857140f
Binary files /dev/null and b/music/chocobo_ffix.ogg differ
diff --git a/music/chocobo_ffv.ogg b/music/chocobo_ffv.ogg
new file mode 100644
index 0000000..5a15f69
Binary files /dev/null and b/music/chocobo_ffv.ogg differ
diff --git a/music/chocobo_ffvi.ogg b/music/chocobo_ffvi.ogg
new file mode 100644
index 0000000..b695805
Binary files /dev/null and b/music/chocobo_ffvi.ogg differ
diff --git a/music/chocobo_ffvii.ogg b/music/chocobo_ffvii.ogg
new file mode 100644
index 0000000..5cbc442
Binary files /dev/null and b/music/chocobo_ffvii.ogg differ
diff --git a/music/chocobo_ffviii.ogg b/music/chocobo_ffviii.ogg
new file mode 100644
index 0000000..a692930
Binary files /dev/null and b/music/chocobo_ffviii.ogg differ
diff --git a/music/chocobo_ffx.ogg b/music/chocobo_ffx.ogg
new file mode 100644
index 0000000..4d352ef
Binary files /dev/null and b/music/chocobo_ffx.ogg differ
diff --git a/music/chocobo_ffxiv.ogg b/music/chocobo_ffxiv.ogg
new file mode 100644
index 0000000..6573ca4
Binary files /dev/null and b/music/chocobo_ffxiv.ogg differ