15 files changed, 90 insertions, 74 deletions
diff --git a/album/dialed-to-11.yaml b/album/dialed-to-11.yaml
index 793e3192..1b86b391 100644
--- a/album/dialed-to-11.yaml
+++ b/album/dialed-to-11.yaml
@@ -245,6 +245,6 @@ Referenced Tracks:
 - track:darude-sandstorm
 - track:MeGaLoVania
 - Meow, Meow, Meow, Meow
-- At Doom's Gate [E1M1]
+- At Doom's Gate
 # Sampled Tracks:
 # - bruh https://www.youtube.com/watch?v=2ZIpFytCSVc
diff --git a/album/hivebreak-vol-1.yaml b/album/hivebreak-vol-1.yaml
index e3edc041..08d32a3a 100644
--- a/album/hivebreak-vol-1.yaml
+++ b/album/hivebreak-vol-1.yaml
@@ -491,7 +491,7 @@ Duration: 1:36
 Artists:
 - Not Eno
 Referenced Tracks:
-- At Doom's Gate [E1M1]
+- At Doom's Gate
 URLs:
 - https://eighteenelbows.bandcamp.com/track/prince-of-pirates
 Crediting Sources: |-
@@ -501,7 +501,7 @@ Crediting Sources: |-
 Referencing Sources: |-
     @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/prince-of-pirates)
 
-    Original song is [[track:at-dooms-gate-e1m1|At Doom's Gate]] from Doom by [[artist:bobby-prince]]
+    Original song is [[track:at-dooms-gate|At Doom's Gate]] from Doom by [[artist:bobby-prince]]
 ---
 Track: Feferi's Absolutely Fucked Up Adventure!!! 38D
 Duration: 1:34
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 55686459..d19590ea 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -2205,17 +2205,6 @@ Duration: 4:19
 URLs:
 - https://www.youtube.com/watch?v=FipchRsSO68
 ---
-Track: At Doom's Gate [E1M1]
-# Only released as an arranged version. Original MS-DOS release of game uses MIDI files with playback varying based on user hardware but contains specific additional sound information for OPL and GUS synthesizers. URL is to OPL recording.
-# Sources:
-# https://doomwiki.org/wiki/MIDI
-# https://vgmdb.net/album/2950
-Artists:
-- Doom
-- Bobby Prince
-URLs:
-- https://www.youtube.com/watch?v=18TTxhoF_EI
----
 Track: "Athletic BGM (Super Mario World 2: Yoshi's Island)"
 Directory: athletic-bgm-yoshis-island
 Artists:
@@ -3774,19 +3763,6 @@ Lyrics: |-
     Ahrk fin norok paal graan fod nust hon zindro zaan
     Dovahkiin, fah hin kogaan mu draal!
 ---
-Track: Dramatic Fanatic
-# Official release:
-#   Cuphead Original Soundtrack
-# Reference:
-#   https://vgmdb.net/album/71570
-Artists:
-- Cuphead
-- Kristofer Maddigan
-Duration: 4:57
-URLs:
-- https://studiomdhr.bandcamp.com/track/dramatic-fanatic
-- https://www.youtube.com/watch?v=Q0TIFoZjSIk
----
 Track: Dream Maze
 # Most often known as "Deeper into Ness's Subconscious" but for some reason in the official release it's titled differently.
 # JP: 夢の迷路
@@ -4034,21 +4010,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=0ler6IQYfTs
 ---
-Track: Everlasting Hymn (Cathedral)
-# Original release:
-#   The Binding Of Isaac - Rebirth: OST
-# Reference:
-#   https://vgmdb.net/album/48127
-#   https://ridiculon.bandcamp.com/track/everlasting-hymn-cathedral
-Duration: 2:52
-Artists:
-- The Binding of Isaac
-- Ridiculon
-URLs:
-- https://www.youtube.com/watch?v=42IDlO_qAfA
-Lyrics: |-
-    Dei, quod reliquum est, nolite metuere, et ossa tua liberabit, exspectans
----
 Track: Extend Music (Mappy)
 # Reference:
 #   https://vgmdb.net/album/16431
@@ -6469,19 +6430,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=bQzYJBTBVEc
 ---
-Track: One Hell of a Time
-# Official release:
-#   Cuphead Original Soundtrack
-# Reference:
-#   https://vgmdb.net/album/71570
-Artists:
-- Cuphead
-- Kristofer Maddigan
-Duration: 3:02
-URLs:
-- https://studiomdhr.bandcamp.com/track/one-hell-of-a-time
-- https://www.youtube.com/watch?v=pOqsFMNFdDo
----
 Track: Onett
 # JP: オネットのテーマ
 # Official release:
@@ -7624,20 +7572,6 @@ URLs:
 - https://m.nintendo.com/shared/en-US/US/tracks/7e1af7a5-cca1-4f71-85cf-08d7da1a356f
 - https://www.youtube.com/watch?v=lc9B5GkWw94
 ---
-Track: Slinger's Song
-# Official release:
-#   Bastion Original Soundtrack
-# Reference:
-#   https://vgmdb.net/album/27893
-#   https://supergiantgames.bandcamp.com/album/bastion-original-soundtrack
-Duration: 4:06
-Artists:
-- Bastion
-- Darren Korb
-URLs:
-- https://supergiantgames.bandcamp.com/track/slingers-song
-- https://www.youtube.com/watch?v=kxJb-mOnLQM
----
 Track: Slums of Basset
 # JP: 戦艦スラム・バセット
 # Official release:
diff --git a/album/sunday-night-strifin-act-1-plus-2-ost.yaml b/album/sunday-night-strifin-act-1-plus-2-ost.yaml
index a2a795ed..5e87d770 100644
--- a/album/sunday-night-strifin-act-1-plus-2-ost.yaml
+++ b/album/sunday-night-strifin-act-1-plus-2-ost.yaml
@@ -523,7 +523,7 @@ Referenced Tracks:
 - Beatdown (Strider Style)
 - chop suey but everything is a table
 - Is this a chord progression?
-- One Hell of a Time
+- One Hell Of A Time
 - Idle Playthings (Mimis Music)
 - Oh Whoa, What's This
 - Elevatorstuck
diff --git a/album/unbeatable-off-beats.yaml b/album/unbeatable-off-beats.yaml
index 14005105..ba6c1dcc 100644
--- a/album/unbeatable-off-beats.yaml
+++ b/album/unbeatable-off-beats.yaml
@@ -30,7 +30,7 @@ Commentary: |-
     the first track is completely hidden, only accesible by rewinding before the first track on the disc. its title has been confirmed by [[artist:rj-lake|rj]], artist is unknown.
     the last two tracks are not listed on the tracklist on the back, their titles and artists come from the CD-Text.
 ---
-Section: Hidden pregap track
+Aside Section: Hidden pregap track
 Start Counting From: 0
 ---
 Track: Empty Diary (Schizoatypical)
@@ -42,7 +42,7 @@ Sampled Tracks:
 - EMPTY DIARY
 - EMPTY DIARY [acoustic]
 ---
-Section: Main album
+Close Aside Section: Hidden pregap track
 ---
 Track: FAMILIAR (original demo)
 Artists:
@@ -211,7 +211,7 @@ Duration: 1:58
 Referenced Tracks:
 - EMPTY DIARY
 ---
-Section: Hidden tracks
+Aside Section: Hidden tracks
 ---
 Track: Loner (original demo)
 Artists:
diff --git a/album/vgm/bastion.yaml b/album/vgm/bastion.yaml
new file mode 100644
index 00000000..cf7a7164
--- /dev/null
+++ b/album/vgm/bastion.yaml
@@ -0,0 +1,17 @@
+Album: Bastion
+Directory: bastion
+Style: in-game vgm
+Date: July 20, 2011
+Color: '#a48410'
+Track Artists:
+- Darren Korb
+Groups:
+- group:more-vgm
+---
+Track: Slinger's Song
+Duration: 4:06
+URLs:
+- https://supergiantgames.bandcamp.com/track/slingers-song
+- https://www.youtube.com/watch?v=s-zGL3TtNvs
+- https://open.spotify.com/track/3e4yV4ULWEYuXuDHurgq2W
+- https://music.apple.com/song/slingers-song/459457472
diff --git a/album/vgm/binding-of-isaac-rebirth.yaml b/album/vgm/binding-of-isaac-rebirth.yaml
new file mode 100644
index 00000000..18a5418f
--- /dev/null
+++ b/album/vgm/binding-of-isaac-rebirth.yaml
@@ -0,0 +1,23 @@
+Album: The Binding Of Isaac - Rebirth
+Directory: binding-of-isaac-rebirth
+Style: in-game vgm
+Date: November 4, 2014
+Color: '#b18a77'
+Cover Art File Extension: png
+Track Artists:
+- Ridiculon
+Groups:
+- group:more-vgm
+---
+Track: Everlasting Hymn (Cathedral)
+Duration: 2:52
+URLs:
+- https://ridiculon.bandcamp.com/track/everlasting-hymn-cathedral
+- https://www.youtube.com/watch?v=42IDlO_qAfA
+- https://open.spotify.com/track/2Ppvr0MiLdxYyqAlLSNDuj
+- https://music.apple.com/song/everlasting-hymn-cathedral/1018098795
+Lyrics: |-
+    Dei, quod reliquum est
+    Nolite metuere
+    Et ossa tua liberabit
+    Exspectans
diff --git a/album/vgm/celeste.yaml b/album/vgm/celeste.yaml
index b8710942..cc5fa1bb 100644
--- a/album/vgm/celeste.yaml
+++ b/album/vgm/celeste.yaml
@@ -7,7 +7,7 @@ Cover Art File Extension: png
 Track Artists:
 - Lena Raine
 Groups:
-- Celeste
+- group:more-vgm
 ---
 Track: Confronting Myself
 Duration: 4:09
diff --git a/album/vgm/cuphead.yaml b/album/vgm/cuphead.yaml
new file mode 100644
index 00000000..8ad65c2b
--- /dev/null
+++ b/album/vgm/cuphead.yaml
@@ -0,0 +1,26 @@
+Album: Cuphead
+Directory: cuphead
+Style: in-game vgm
+Date: September 29, 2017
+Color: '#db411a'
+Track Artists:
+- Kristofer Maddigan
+# There is a complete list of Kristopher's band members on the Bandcamp description but no thanks. No thanks at all. - Cello
+Groups:
+- group:more-vgm
+---
+Track: Dramatic Fanatic
+Duration: 4:57
+URLs:
+- https://studiomdhr.bandcamp.com/track/dramatic-fanatic
+- https://www.youtube.com/watch?v=Q0TIFoZjSIk
+- https://open.spotify.com/track/7Hd76FhngTrK6KK8TNVnFb
+- https://music.apple.com/song/dramatic-fanatic/1305353641
+---
+Track: One Hell Of A Time
+Duration: 3:02
+URLs:
+- https://studiomdhr.bandcamp.com/track/one-hell-of-a-time
+- https://www.youtube.com/watch?v=pOqsFMNFdDo
+- https://open.spotify.com/track/2PMX8sBBrT0q7B4sQkBR7a
+- https://music.apple.com/song/one-hell-of-a-time/1305353657
diff --git a/album/vgm/doom-1993.yaml b/album/vgm/doom-1993.yaml
new file mode 100644
index 00000000..b2da9cd3
--- /dev/null
+++ b/album/vgm/doom-1993.yaml
@@ -0,0 +1,16 @@
+Album: DOOM
+Name Detail: '1993'
+Style: in-game vgm
+Date: December 10, 1993
+Color: '#f8d981'
+Track Artists:
+- Bobby Prince
+Groups:
+- group:more-vgm
+---
+Track: At Doom's Gate
+Duration: 1:39
+URLs:
+- https://www.youtube.com/watch?v=PEm7uWjXw_Q
+- https://open.spotify.com/track/7wS7Y4pCfwTRT3Wh0mbiNt
+- https://music.apple.com/song/at-dooms-gate/6762835997
diff --git a/album/final-fantasy-ix.yaml b/album/vgm/final-fantasy-ix.yaml
index bda50830..bda50830 100644
--- a/album/final-fantasy-ix.yaml
+++ b/album/vgm/final-fantasy-ix.yaml
diff --git a/album/final-fantasy-legend-iii.yaml b/album/vgm/final-fantasy-legend-iii.yaml
index 50b057ae..50b057ae 100644
--- a/album/final-fantasy-legend-iii.yaml
+++ b/album/vgm/final-fantasy-legend-iii.yaml
diff --git a/album/final-fantasy-vi.yaml b/album/vgm/final-fantasy-vi.yaml
index 68453cb9..68453cb9 100644
--- a/album/final-fantasy-vi.yaml
+++ b/album/vgm/final-fantasy-vi.yaml
diff --git a/album/final-fantasy-viii.yaml b/album/vgm/final-fantasy-viii.yaml
index 8062a70e..8062a70e 100644
--- a/album/final-fantasy-viii.yaml
+++ b/album/vgm/final-fantasy-viii.yaml
diff --git a/album/final-fantasy.yaml b/album/vgm/final-fantasy.yaml
index c0fe2044..c0fe2044 100644
--- a/album/final-fantasy.yaml
+++ b/album/vgm/final-fantasy.yaml