video jam

11 files changed, 334 insertions, 296 deletions

diff --git a/album/chaotix.yaml b/album/chaotix.yaml
new file mode 100644
index 00000000..99f7c69c
--- /dev/null
+++ b/album/chaotix.yaml
@@ -0,0 +1,18 @@
+Album: Knuckles' Chaotix
+Directory: chaotix-vgm
+Style: in-game vgm
+Date: April 21, 1995
+Color: '#17FF17'
+Has Cover Art: true
+Cover Art File Extension: png
+Groups:
+- Sonic the Hedgehog
+---
+Track: Evening Star
+# No official release of the in-game track, name is from in-game sound test feature
+# This song was present in the "Sonic Crackers" prototype build, the specific build of this prototype that's out there on the internet was built on the same date as the other composer who'd end up working on Chaotix joined SEGA, implying this song must have been my Junko Shiratsu.
+##todo: get duration from Sonic Origins museum?
+Artists:
+- Junko Shiratsu
+URLs:
+- https://www.youtube.com/watch?v=O9XLWW39F08
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index a33c0a0a..ed29fd00 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -4309,18 +4309,6 @@ Referenced Tracks:
 Lyrics: |-
     (Danganronpa!)
 ---
-Track: Danger on the Dance Floor - Mid-Boss
-# Official release:
-#   Sonic Mania Original Soundtrack (Selected Edition)
-# Reference
-#   https://vgmdb.net/album/74207
-Artists:
-- Sonic the Hedgehog
-- Tee Lopes
-Duration: 2:07
-URLs:
-- https://www.youtube.com/watch?v=wCf3dCnWmTg
----
 Track: "Dan's Theme (Street Fighter Alpha: Warriors' Dreams)"
 # Official release:
 #   STREET FIGHTER ZERO
@@ -4909,20 +4897,6 @@ Lyrics: |-
     夜明けの手を取り高く羽ばたく日まで (<i>Yoake no te wo tori takaku habataku hi made</i>)
     安らぎのよすがに身を預けて震えている (<i>Yasuragi no yosuga ni mi wo azukete furueteru </i>)
 ---
-Track: Egg Reverie - Egg Reverie Zone
-# Official release:
-#   Sonic Mania (Original Soundtrack) [Selected Edition]
-# Reference
-#   https://vgmdb.net/album/74207
-Artists:
-- Sonic the Hedgehog
-- Tee Lopes
-Duration: 3:07
-URLs:
-- https://www.youtube.com/watch?v=z4jFUSxcpys
-Referenced Tracks:
-- Fist Bump
----
 Track: Eight Melodies
 Name Detail: EarthBound
 # no official standalone release
@@ -5010,15 +4984,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=0ler6IQYfTs
 ---
-Track: Evening Star
-# No official release of the in-game track, name is from in-game sound test feature
-# No concrete proof for which of the two composers for Knuckles' Chaotix made this particular track, but it's widely accepted as only Junko Shiratsu
-Artists:
-- Sonic the Hedgehog
-- Junko Shiratsu
-URLs:
-- https://www.youtube.com/watch?v=O9XLWW39F08
----
 Track: Everlasting Hymn (Cathedral)
 # Original release:
 #   The Binding Of Isaac - Rebirth: OST
@@ -5277,27 +5242,6 @@ URLs:
 - https://www.youtube.com/watch?v=DTpksvCC-hg
 - https://m.nintendo.com/shared/en-US/US/tracks/b2cb2d99-5b44-4dc5-8e4f-0b7b8042f375
 ---
-Track: Flying Battery Zone Act 1
-# Official release (as Flying Battery)
-#    HISTORY OF SONIC MUSIC 20th Anniversary Edition
-# Reference:
-#    https://vgmdb.net/album/29437
-# sorry if the duration of the video doesn't match the listed duration, the ones I found that were 1:31 in length but the echo went gradually out of sync after the first loop so I had to find this one
-Artists:
-- Sonic the Hedgehog
-Duration: 1:47
-URLs:
-- https://www.youtube.com/watch?v=_T7hdIh-gtw
----
-Track: Flying Battery Zone Act 2
-# No official release of the in-game track (or Sonic the Hedgehog 3 & Knuckles' in-game soundtrack at all)
-Referenced Tracks:
-- Flying Battery Zone Act 1
-Artists:
-- Sonic the Hedgehog
-URLs:
-- https://www.youtube.com/watch?v=qXchxWqLqyc
----
 Track: Focus
 # Official releases:
 #  Super Hexagon EP (September 6, 2012)
@@ -6267,29 +6211,6 @@ URLs:
 - https://m.nintendo.com/shared/en-US/US/tracks/06077d24-6b2a-4a4f-802d-8818725f387a
 - https://www.youtube.com/watch?v=N7OlOrJHLm4
 ---
-Track: Hydro City Zone Act 1
-# Track name is official, from the Museum in Sonic Origins.
-# Reference:
-#   https://sonic.fandom.com/wiki/Sonic_Origins/Museum
-#   https://info.sonicretro.org/Sonic_the_Hedgehog_3/Development/Music
-Artists:
-- Sonic the Hedgehog
-URLs:
-- https://www.youtube.com/watch?v=CrWepCaCJ7c
----
-Track: Hydro City Zone Act 2
-# Track name is official, from the Museum in Sonic Origins.
-# Reference:
-#   https://sonic.fandom.com/wiki/Sonic_Origins/Museum
-#   https://info.sonicretro.org/Sonic_the_Hedgehog_3/Development/Music
-Artists:
-- Sonic the Hedgehog
-- Masayuki Nagao
-URLs:
-- https://www.youtube.com/watch?v=PNYL4w-qxcE
-Referenced Tracks:
-- Hydro City Zone Act 1
----
 Track: Ice Man Stage
 # Reference:
 #   https://vgmdb.net/album/33749
@@ -6742,23 +6663,6 @@ Duration: 3:23
 URLs:
 - https://www.youtube.com/watch?v=weBdLPLaON0
 ---
-Track: Kingdom Valley -Wind-The Castle-Lakeside-Water-
-# Reference
-#   https://vgmdb.net/album/4227
-Artists:
-- Sonic the Hedgehog
-- Mariko Nanba
-Contributors:
-- Takeshi Taneda (bass)
-- Hiroyuki Koike (1stVI)
-- Rei Koike (2ndVI)
-- Tomoko Fukuhara (Vla)
-- Tomio Yajima (Vc)
-- Shinji Tanaka (Cb)
-Duration: 6:50
-URLs:
-- https://www.youtube.com/watch?v=YBDuguqHECQ
----
 Track: Knight Artorias
 # Official release: CD (2012)
 #   DARK SOULS with ARTORIAS OF THE ABYSS EDITION Original Soundtrack
@@ -6954,21 +6858,6 @@ URLs:
 - https://m.nintendo.com/shared/en-US/US/tracks/3dc60965-31c5-4b92-9c81-a2b12ba2fdb4
 - https://www.youtube.com/watch?v=LBnHnog1TwI
 ---
-Track: Lights, Camera, Action! - Studiopolis Zone Act 1
-# Official release:
-#   Sonic Mania (Original Soundtrack) [Selected Edition]
-# Reference
-#   https://vgmdb.net/album/74207
-#   https://sonic.sega.jp/SonicChannel/topics/sound/20180117_001527/
-Artists:
-- Sonic the Hedgehog
-- Tee Lopes
-Duration: 3:07
-URLs:
-- https://www.youtube.com/watch?v=NIWyZmFSep0
-Lyrics: |-
-    Lights, camera, action!
----
 Track: The Little Sprite
 # JP: 妖精族のこども
 # Official release:
@@ -7921,76 +7810,6 @@ URLs:
 Referenced Tracks:
 - Opelucid City (Pokémon Black)
 ---
-Track: Open Your Heart
-# From SONIC THE HEDGEHOG 10th Anniversary
-# Reference:
-#   https://vgmdb.net/album/2072
-Artists:
-- Sonic the Hedgehog
-- Crush 40
-Contributors:
-- Jun Senoue (composer & arranger, Japanese lyrics, guitars)
-- Kenichi Tokoi (composer)
-- Takahiro Fukada (English lyrics)
-- Johnny Gioeli (vocals)
-- Naoto Shibata (bass)
-- Hirotsugu Homma (drums)
-Duration: 5:11
-URLs:
-- https://www.youtube.com/watch?v=OrblPxDdUWg
-Lyrics: |-
-    Thunder, rain, and lightning
-    Danger, water rising
-    Clamour, sirens wailing
-    It's such a bad sign
-    Shadows of dark creatures
-    Steel clouds floating in the air
-    People run for shelter
-    What's gonna happen to us?
-
-    All the steps we take, all the moves we make, all the pain at stake
-    I see the chaos for everyone - Who are we? What can we do?
-    You and I are same in the way that we have our own styles that we won't change
-    Yours is filled with evil and mine is not, there is no way I can lose!
-
-    Can't hold on much longer - But I will never let go
-    I know it's a one way track - Tell me now how long this will last
-    I'm not gonna think this way - Nor will I count on others
-    Close my eyes and feel it burn - Now I see what I've gotta do
-    Open your heart, it's gonna be alright
-
-    Ancient city blazing
-    Shadows keep attacking
-    Little children crying
-    Confusion, hopeless anger
-
-    I don't know what it can be but you drive me crazy
-    All your cunning tricks make me sick
-    You won't have it your own way
-
-    Can't hold on much longer - But I will never let go
-    I know it's a one way track - Tell me now how long this will last
-    I'm not gonna think this way - Nor will I count on others
-    Close my eyes and feel it burn - Now I see what I've gotta do
-    Open your heart, and you will see
-
-    If it won't stop, there will be no future for us
-    Its heart is tied down by all the hate, gotta set him free
-
-    I know it's a one way track - Tell me now how long this will last
-    Close my eyes and feel it burn - Now I see what I gotta do
-    Gotta open your heart, dude
-
-    Can't hold on much longer - But I will never let go
-    I know it's a one way track - Tell me now how long this will last
-    I'm not gonna think this way - Nor will I count on others
-    Close my eyes and feel it burn - Now I see what I've gotta do
-    Open your heart, it's gonna be alright, yeah
-
-    Open your heart
-    Open your heart
-    Yeah
----
 Track: Opening Animation Music (Mappy)
 # Reference:
 #   https://vgmdb.net/album/16431
@@ -10713,110 +10532,6 @@ URLs:
 - https://disasterpeace.bandcamp.com/track/the-universe-is-before-you
 - https://www.youtube.com/watch?v=ypzIiZAmghg
 ---
-Track: Unknown from M.E.
-# From SONIC ADVENTURE Songs With Attitude ~Vocal mini-Album~
-# Reference:
-#   https://vgmdb.net/album/1644
-Artists:
-- Kenichi Tokoi (composition, Japanese lyrics)
-- Takahiro Fukada (lyrics translation)
-- Atsushi Kosugi (sound production) ##credited as Atsushi "SUSHI" Kosugi (Beat On Beat, inc.)
-- Tony Kadleck (brass arrangement)
-Contributors:
-- Marlon Saunders (vocals)
-- Dred Foxx (rap vocals)
-- Rohn Lawrence (guitars)
-- Philippe Saisse (fender rhodes)
-- Will Lee (bass)
-- Ricky Wellman (drums)
-- East 4th Horns (horn section)
-- John Wheeler (trombone) ##part of Easth 4th Horns
-- Tony Kadleck (trumpet) ##part of Easth 4th Horns
-- Craig Johnson (trumpet) ##part of Easth 4th Horns
-- John Scarpulla (soprano, tenor & baritone sax) ##part of Easth 4th Horns
-Duration: 4:31
-URLs:
-- https://www.youtube.com/watch?v=2RhMYI0hVSI
-Lyrics: |-
-    Here I come, rougher than the rest of them
-    The best of them, tougher than leather
-    You can call me Knuckles, unlike Sonic I don't chuckle
-    I'd rather flex my muscles
-    I'm hard as nails, it ain't hard to tell
-    I break 'em down whether they solid or frail
-    Unlike the rest I'm independent
-    It's my first breath, first test
-    Feel the right then the worst's left
-
-    Born on an island in the heavens
-    The blood of my ancestors flows inside me
-    My duty is to save the flower from evil deterioration (Yeah)
-
-    I will be the one to set your heart free true
-    Cleanse yourself of that evil spirit that's in you
-
-    Streaking lights, loud sounds, and instinct
-    Are the elements that keep me going
-    I am fighting my own mission
-    Nothing's gonna stand in my way (No, no)
-
-    I will be the one to set your heart free true
-    Cleanse yourself of that evil spirit that's in you
-
-    Won't be frightened, I'll stand up to all the pain and turmoil
-    Just believe in myself won't rely on others
-    Get this power to wipe out the havoc and anarchy
-    This is my planet, gonna fight for my destiny
-
-    Here I come, rougher than the rest of them
-    The best of them, tougher than leather
-    You can call me Knuckles, unlike Sonic I don't chuckle
-    I'd rather flex my muscles
-    I'm hard as nails, it ain't hard to tell
-    I break 'em down whether they solid or frail
-    Unlike the rest I'm independent
-    It's my first breath, first test
-    Feel the right then the worst's left
-
-    I have no such things as weak spots
-    Don't approve of him but got to trust him
-    This alliance has a purpose
-    This partnership is only temporary
-
-    I will be the one to set your heart free true
-    Cleanse yourself of evil spirits that got in you
-
-    Won't be frightened, I'll stand up to all the pain and turmoil
-    Just believe in myself won't rely on others
-    Freedom will be waiting when serenity is restored
-    This is my planet, I shall not surrender
-
-    Won't be frightened, I'll stand up to all the pain and turmoil
-    Just believe in myself won't rely on others
-    Get this power to wipe out the havoc and anarchy
-    This is my planet, gonna fight (I! Oh!)
-
-    Won't be frightened, I'll stand up to all the pain and turmoil
-    Just believe in myself won't rely on others (Oh!)
-    Freedom will be waiting when serenity is restored
-    This is my planet, I shall not surrender
-
-    (Shall surrender, no)
-    (Yeah, woo, woo)
-
-    The new porcupine on the block with the puff chest
-    Out the wilderness with the ruggedness
-    Knock, knock, it's Knuckles, the bloat thrower
-    Independent flower, magical emerald holder
-    Give you the cold shoulder
-    My spike goes through boulders
-    That's why I stay a loner
-    I was born by myself
-    I don't need a posse, I get it on by myself
-    Advisories get shelfed
-
-    Right on
----
 Track: Vagrant Counting Song of Retrospection
 # JP: この一撃に桃球レボリューション
 # Official release:
diff --git a/album/sonic-adventure-vgm.yaml b/album/sonic-adventure-vgm.yaml
new file mode 100644
index 00000000..5e353872
--- /dev/null
+++ b/album/sonic-adventure-vgm.yaml
@@ -0,0 +1,184 @@
+Album: Sonic Adventure
+Directory: sonic-adventure-vgm
+Style: in-game vgm
+Date: December 23, 1998
+Color: '#0A8CFE'
+Has Cover Art: true
+Groups:
+- Sonic the Hedgehog
+---
+Track: Open Your Heart
+# From SONIC THE HEDGEHOG 10th Anniversary
+# Reference:
+#   https://vgmdb.net/album/2072
+Artists:
+- Crush 40
+Contributors:
+- Jun Senoue (composer & arranger, Japanese lyrics, guitars)
+- Kenichi Tokoi (composer)
+- Takahiro Fukada (English lyrics)
+- Johnny Gioeli (vocals)
+- Naoto Shibata (bass)
+- Hirotsugu Homma (drums)
+Duration: 5:11
+URLs:
+- https://www.youtube.com/watch?v=OrblPxDdUWg
+Lyrics: |-
+    Thunder, rain, and lightning
+    Danger, water rising
+    Clamour, sirens wailing
+    It's such a bad sign
+    Shadows of dark creatures
+    Steel clouds floating in the air
+    People run for shelter
+    What's gonna happen to us?
+
+    All the steps we take, all the moves we make, all the pain at stake
+    I see the chaos for everyone - Who are we? What can we do?
+    You and I are same in the way that we have our own styles that we won't change
+    Yours is filled with evil and mine is not, there is no way I can lose!
+
+    Can't hold on much longer - But I will never let go
+    I know it's a one way track - Tell me now how long this will last
+    I'm not gonna think this way - Nor will I count on others
+    Close my eyes and feel it burn - Now I see what I've gotta do
+    Open your heart, it's gonna be alright
+
+    Ancient city blazing
+    Shadows keep attacking
+    Little children crying
+    Confusion, hopeless anger
+
+    I don't know what it can be but you drive me crazy
+    All your cunning tricks make me sick
+    You won't have it your own way
+
+    Can't hold on much longer - But I will never let go
+    I know it's a one way track - Tell me now how long this will last
+    I'm not gonna think this way - Nor will I count on others
+    Close my eyes and feel it burn - Now I see what I've gotta do
+    Open your heart, and you will see
+
+    If it won't stop, there will be no future for us
+    Its heart is tied down by all the hate, gotta set him free
+
+    I know it's a one way track - Tell me now how long this will last
+    Close my eyes and feel it burn - Now I see what I gotta do
+    Gotta open your heart, dude
+
+    Can't hold on much longer - But I will never let go
+    I know it's a one way track - Tell me now how long this will last
+    I'm not gonna think this way - Nor will I count on others
+    Close my eyes and feel it burn - Now I see what I've gotta do
+    Open your heart, it's gonna be alright, yeah
+
+    Open your heart
+    Open your heart
+    Yeah
+---
+Track: Unknown from M.E.
+# From SONIC ADVENTURE Songs With Attitude ~Vocal mini-Album~
+# Reference:
+#   https://vgmdb.net/album/1644
+Artists:
+- Marlon Saunders
+- Dred Foxx
+- Kenichi Tokoi
+Contributors:
+- Kenichi Tokoi (composition, Japanese lyrics)
+- Takahiro Fukada (lyrics translation)
+- Marlon Saunders (vocals)
+- Dred Foxx (rap vocals)
+- Rohn Lawrence (guitars)
+- Philippe Saisse (fender rhodes)
+- Will Lee (bass)
+- Ricky Wellman (drums)
+- East 4th Horns (horn section)
+- John Wheeler (trombone) ##part of Easth 4th Horns
+- Tony Kadleck (trumpet) ##part of Easth 4th Horns
+- Craig Johnson (trumpet) ##part of Easth 4th Horns
+- John Scarpulla (soprano, tenor & baritone sax) ##part of Easth 4th Horns
+- Tony Kadleck (brass arrangement)
+- Atsushi Kosugi (sound production) ##credited as Atsushi "SUSHI" Kosugi (Beat On Beat, inc.)
+Duration: 4:31
+URLs:
+- https://www.youtube.com/watch?v=2RhMYI0hVSI
+Lyrics: |-
+    Here I come, rougher than the rest of them
+    The best of them, tougher than leather
+    You can call me Knuckles, unlike Sonic I don't chuckle
+    I'd rather flex my muscles
+    I'm hard as nails, it ain't hard to tell
+    I break 'em down whether they solid or frail
+    Unlike the rest I'm independent
+    It's my first breath, first test
+    Feel the right then the worst's left
+
+    Born on an island in the heavens
+    The blood of my ancestors flows inside me
+    My duty is to save the flower from evil deterioration (Yeah)
+
+    I will be the one to set your heart free true
+    Cleanse yourself of that evil spirit that's in you
+
+    Streaking lights, loud sounds, and instinct
+    Are the elements that keep me going
+    I am fighting my own mission
+    Nothing's gonna stand in my way (No, no)
+
+    I will be the one to set your heart free true
+    Cleanse yourself of that evil spirit that's in you
+
+    Won't be frightened, I'll stand up to all the pain and turmoil
+    Just believe in myself won't rely on others
+    Get this power to wipe out the havoc and anarchy
+    This is my planet, gonna fight for my destiny
+
+    Here I come, rougher than the rest of them
+    The best of them, tougher than leather
+    You can call me Knuckles, unlike Sonic I don't chuckle
+    I'd rather flex my muscles
+    I'm hard as nails, it ain't hard to tell
+    I break 'em down whether they solid or frail
+    Unlike the rest I'm independent
+    It's my first breath, first test
+    Feel the right then the worst's left
+
+    I have no such things as weak spots
+    Don't approve of him but got to trust him
+    This alliance has a purpose
+    This partnership is only temporary
+
+    I will be the one to set your heart free true
+    Cleanse yourself of evil spirits that got in you
+
+    Won't be frightened, I'll stand up to all the pain and turmoil
+    Just believe in myself won't rely on others
+    Freedom will be waiting when serenity is restored
+    This is my planet, I shall not surrender
+
+    Won't be frightened, I'll stand up to all the pain and turmoil
+    Just believe in myself won't rely on others
+    Get this power to wipe out the havoc and anarchy
+    This is my planet, gonna fight (I! Oh!)
+
+    Won't be frightened, I'll stand up to all the pain and turmoil
+    Just believe in myself won't rely on others (Oh!)
+    Freedom will be waiting when serenity is restored
+    This is my planet, I shall not surrender
+
+    (Shall surrender, no)
+    (Yeah, woo, woo)
+
+    The new porcupine on the block with the puff chest
+    Out the wilderness with the ruggedness
+    Knock, knock, it's Knuckles, the bloat thrower
+    Independent flower, magical emerald holder
+    Give you the cold shoulder
+    My spike goes through boulders
+    That's why I stay a loner
+    I was born by myself
+    I don't need a posse, I get it on by myself
+    Advisories get shelfed
+
+    Right on
diff --git a/album/sonic-and-knuckles-vgm.yaml b/album/sonic-and-knuckles-vgm.yaml
new file mode 100644
index 00000000..2906e1c4
--- /dev/null
+++ b/album/sonic-and-knuckles-vgm.yaml
@@ -0,0 +1,26 @@
+Album: Sonic & Knuckles
+Directory: sonic-and-knuckles-vgm
+Style: in-game vgm
+Date: October 18, 1994
+Color: '#FF0000'
+Cover Art File Extension: png
+Has Cover Art: true
+Groups:
+- Sonic the Hedgehog
+---
+Track: Flying Battery Zone Act 1
+# Official release (as Flying Battery)
+#    HISTORY OF SONIC MUSIC 20th Anniversary Edition
+# Reference:
+#    https://vgmdb.net/album/29437
+# sorry if the duration of the video doesn't match the listed duration, the ones I found that were 1:31 in length but the echo went gradually out of sync after the first loop so I had to find this one
+Duration: 1:47
+URLs:
+- https://www.youtube.com/watch?v=_T7hdIh-gtw
+---
+Track: Flying Battery Zone Act 2
+# No official release of the in-game track (or Sonic the Hedgehog 3 & Knuckles' in-game soundtrack at all)
+Referenced Tracks:
+- Flying Battery Zone Act 1
+URLs:
+- https://www.youtube.com/watch?v=qXchxWqLqyc
diff --git a/album/sonic-cd-vgm.yaml b/album/sonic-cd-vgm.yaml
index edf6a312..c84b1c92 100644
--- a/album/sonic-cd-vgm.yaml
+++ b/album/sonic-cd-vgm.yaml
@@ -3,9 +3,8 @@ Directory: sonic-cd-vgm
 Style: in-game vgm
 Date: September 23, 1993
 Color: '#4CEB0D'
+Has Cover Art: true
 Cover Art File Extension: png
-Cover Artists:
-- SEGA
 Groups:
 - Sonic the Hedgehog
 ---
@@ -14,7 +13,6 @@ Track: Cosmic Eternity - Believe in Yourself
 # Reference:
 #   https://vgmdb.net/album/29131
 Artists:
-- Sonic the Hedgehog
 - Naofumi Hataya
 Contributors:
 - Keiko Utoku (vocals)
@@ -68,7 +66,6 @@ Track: Metallic Madness
 # Reference:
 #   https://vgmdb.net/album/29131
 Artists:
-- Sonic the Hedgehog
 - Naofumi Hataya
 Duration: 1:51
 URLs:
diff --git a/album/sonic-forces-vgm.yaml b/album/sonic-forces-vgm.yaml
index e4626f1f..5228cee7 100644
--- a/album/sonic-forces-vgm.yaml
+++ b/album/sonic-forces-vgm.yaml
@@ -3,8 +3,7 @@ Directory: sonic-forces-vgm
 Style: in-game vgm
 Date: November 7, 2017
 Color: '#C80000'
-Cover Artists:
-- SEGA
+Has Cover Art: true
 Groups:
 - Sonic the Hedgehog
 ---
diff --git a/album/sonic-mania-vgm.yaml b/album/sonic-mania-vgm.yaml
new file mode 100644
index 00000000..a767043b
--- /dev/null
+++ b/album/sonic-mania-vgm.yaml
@@ -0,0 +1,46 @@
+Album: Sonic Mania
+Directory: sonic-mania-vgm
+Style: in-game vgm
+Date: August 15, 2017
+Color: '#F7CA17'
+Has Cover Art: true
+Groups:
+- Sonic the Hedgehog
+---
+Track: Danger on the Dance Floor - Mid-Boss
+# Official release:
+#   Sonic Mania Original Soundtrack (Selected Edition)
+# Reference
+#   https://vgmdb.net/album/74207
+Artists:
+- Tee Lopes
+Duration: 2:07
+URLs:
+- https://www.youtube.com/watch?v=wCf3dCnWmTg
+---
+Track: Egg Reverie - Egg Reverie Zone
+# Official release:
+#   Sonic Mania (Original Soundtrack) [Selected Edition]
+# Reference
+#   https://vgmdb.net/album/74207
+Artists:
+- Tee Lopes
+Duration: 3:07
+URLs:
+- https://www.youtube.com/watch?v=z4jFUSxcpys
+Referenced Tracks:
+- Fist Bump
+---
+Track: Lights, Camera, Action! - Studiopolis Zone Act 1
+# Official release:
+#   Sonic Mania (Original Soundtrack) [Selected Edition]
+# Reference
+#   https://vgmdb.net/album/74207
+#   https://sonic.sega.jp/SonicChannel/topics/sound/20180117_001527/
+Artists:
+- Tee Lopes
+Duration: 3:07
+URLs:
+- https://www.youtube.com/watch?v=NIWyZmFSep0
+Lyrics: |-
+    Lights, camera, action!
diff --git a/album/sonic-rush-vgm.yaml b/album/sonic-rush-vgm.yaml
index 6109d7d6..66deab39 100644
--- a/album/sonic-rush-vgm.yaml
+++ b/album/sonic-rush-vgm.yaml
@@ -3,9 +3,8 @@ Directory: sonic-rush-vgm
 Style: in-game vgm
 Date: November 16, 2005
 Color: '#07E2FE'
+Has Cover Art: true
 Cover Art File Extension: png
-Cover Artists:
-- SEGA
 Groups:
 - Sonic the Hedgehog
 Commentary: |-
diff --git a/album/sonic-the-hedgehog-2006-vgm.yaml b/album/sonic-the-hedgehog-2006-vgm.yaml
new file mode 100644
index 00000000..32d29bc1
--- /dev/null
+++ b/album/sonic-the-hedgehog-2006-vgm.yaml
@@ -0,0 +1,26 @@
+Album: Sonic the Hedgehog (2006)
+#Name Detail: 2006
+Directory: sonic-the-hedgehog-2006-vgm
+Style: in-game vgm
+Date: November 14, 2006
+Color: '#2987E5'
+Has Cover Art: true
+Cover Art File Extension: png
+Groups:
+- Sonic the Hedgehog
+---
+Track: Kingdom Valley -Wind-The Castle-Lakeside-Water-
+# Reference
+#   https://vgmdb.net/album/4227
+Artists:
+- Mariko Nanba
+Contributors:
+- Takeshi Taneda (bass)
+- Hiroyuki Koike (1stVI)
+- Rei Koike (2ndVI)
+- Tomoko Fukuhara (Vla)
+- Tomio Yajima (Vc)
+- Shinji Tanaka (Cb)
+Duration: 6:50
+URLs:
+- https://www.youtube.com/watch?v=YBDuguqHECQ
diff --git a/album/sonic-the-hedgehog-3-vgm.yaml b/album/sonic-the-hedgehog-3-vgm.yaml
new file mode 100644
index 00000000..45ee828f
--- /dev/null
+++ b/album/sonic-the-hedgehog-3-vgm.yaml
@@ -0,0 +1,29 @@
+Album: Sonic the Hedgehog 3
+Directory: sonic-the-hedgehog-3-vgm
+Style: in-game vgm
+Date: February 2, 1994
+Color: '#FFB400'
+Cover Art File Extension: png
+Has Cover Art: true
+Groups:
+- Sonic the Hedgehog
+---
+Track: Hydro City Zone Act 1
+# Track name is official, from the Museum in Sonic Origins.
+# Reference:
+#   https://sonic.fandom.com/wiki/Sonic_Origins/Museum
+#   https://info.sonicretro.org/Sonic_the_Hedgehog_3/Development/Music
+URLs:
+- https://www.youtube.com/watch?v=CrWepCaCJ7c
+---
+Track: Hydro City Zone Act 2
+# Track name is official, from the Museum in Sonic Origins.
+# Reference:
+#   https://sonic.fandom.com/wiki/Sonic_Origins/Museum
+#   https://info.sonicretro.org/Sonic_the_Hedgehog_3/Development/Music
+Artists:
+- Masayuki Nagao
+URLs:
+- https://www.youtube.com/watch?v=PNYL4w-qxcE
+Referenced Tracks:
+- Hydro City Zone Act 1
diff --git a/album/sonic-the-hedgehog-md-vgm.yaml b/album/sonic-the-hedgehog-md-vgm.yaml
index 03a22898..f97bd016 100644
--- a/album/sonic-the-hedgehog-md-vgm.yaml
+++ b/album/sonic-the-hedgehog-md-vgm.yaml
@@ -1,12 +1,11 @@
 Album: Sonic the Hedgehog (1991, Mega Drive)
-#Name Detail: 1991
+#Name Detail: 1991? Mega Drive?
 Directory: sonic-the-hedgehog-md-vgm
 Style: in-game vgm
 Date: June 23, 1991
 #Color: '#2424FF'
+Has Cover Art: true
 Cover Art File Extension: png
-Cover Artists:
-- SEGA
 Groups:
 - Sonic the Hedgehog
 ---