14 files changed, 365 insertions, 22 deletions
diff --git a/album/candles-potency.yaml b/album/candles-potency.yaml
index f9a60c15..eb20d6b8 100644
--- a/album/candles-potency.yaml
+++ b/album/candles-potency.yaml
@@ -12,7 +12,8 @@ Cover Art File Extension: png
 Track Art File Extension: png
 Color: '#bdeed9'
 Groups:
-- group:fandom
+- Solatrus
+- Fandom
 Art Tags:
 - Dave
 Commentary: |-
diff --git a/album/endless.yaml b/album/endless.yaml
new file mode 100644
index 00000000..0505d506
--- /dev/null
+++ b/album/endless.yaml
@@ -0,0 +1,34 @@
+Album: Endless
+Artists:
+- Solatrus
+Date: January 1, 2010
+Date Added: December 15, 2023
+URLs:
+- https://solatrus.bandcamp.com/album/endless
+Cover Artists:
+- Solatrus
+Cover Art File Extension: jpg
+Color: '#3737fc'
+Groups:
+- Solatrus
+- Beyond
+Commentary: |-
+    <i>Solatrus:</i>
+    Endless is an 18-minute trance set comprised of three tracks: Skies, Ocean, and Sands. Each track is related to each other in tempo and in key, but they each follow a different "scene," if you will, reminiscent of their track names.
+
+    By downloading Endless, you'll be supporting me and my music, and directly encouraging me to get some more tracks out. :D
+---
+Track: Endless Skies
+Duration: '5:51'
+URLs:
+- https://solatrus.bandcamp.com/track/endless-skies
+---
+Track: Endless Ocean
+Duration: '5:43'
+URLs:
+- https://solatrus.bandcamp.com/track/endless-ocean
+---
+Track: Endless Sands
+Duration: '6:25'
+URLs:
+- https://solatrus.bandcamp.com/track/endless-sands
diff --git a/album/homestuck-vol-6.yaml b/album/homestuck-vol-6.yaml
index 5ac3f585..789915ec 100644
--- a/album/homestuck-vol-6.yaml
+++ b/album/homestuck-vol-6.yaml
@@ -85,6 +85,7 @@ URLs:
 - https://youtu.be/57FwbcQ4LIA
 Referenced Tracks:
 - track:flow-solatrus
+- Vertigo
 Sheet Music Files:
 - Title: Piano score by almostsix
   Files:
diff --git a/album/libre-feat-robert-j-lake.yaml b/album/libre-feat-robert-j-lake.yaml
new file mode 100644
index 00000000..8a8c62fb
--- /dev/null
+++ b/album/libre-feat-robert-j-lake.yaml
@@ -0,0 +1,23 @@
+Album: Libre (feat. Robert J! Lake)
+Artists:
+- Solatrus
+- Robert J! Lake
+Date: April 11, 2011
+Date Added: December 15, 2023
+URLs:
+- https://solatrus.bandcamp.com/track/libre-feat-robert-j-lake
+Cover Artists:
+- Zilleniose
+Cover Art File Extension: jpg
+Color: '#E8E1DB'
+Groups:
+- Solatrus
+- Beyond
+Commentary: |-
+    <i>Solatrus:</i>
+    A happy little song that I was requested to do by a friend of a friend. I realized about an hour into it that it reminded me of a lot of my friend and fellow MSPA music team member, Robert J! Lake. So, I asked him to join in on it!
+---
+Track: Libre
+Duration: '6:07'
+URLs:
+- https://solatrus.bandcamp.com/track/libre-feat-robert-j-lake
\ No newline at end of file
diff --git a/album/prospit-and-derse.yaml b/album/prospit-and-derse.yaml
index 272e0d4e..c9e7fc60 100644
--- a/album/prospit-and-derse.yaml
+++ b/album/prospit-and-derse.yaml
@@ -12,6 +12,7 @@ Cover Artists:
 Track Art File Extension: png
 Color: '#cc44cc'
 Groups:
+- Solatrus
 - group:official
 Art Tags:
 - John
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 96bf0a76..681e355c 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -754,13 +754,6 @@ Lyrics: |-
     William Henry Harrison
     My name is William Henry— [coughs]
 ---
-Track: Heart of the Forest
-Artists:
-- Solatrus
-Duration: '3:07'
-URLs:
-- https://music.solatrus.com/track/heart-of-the-forest
----
 Track: Kid Radd (Final)
 Artists:
 - Mark J. Hadley
@@ -1217,19 +1210,6 @@ Duration: '3:04'
 URLs:
 - https://www.youtube.com/watch?v=EOA5M74kv5k
 ---
-Track: Terra
-Directory: terra-solatrus
-Always Reference By Directory: true
-Artists:
-- Solatrus
-Duration: '4:05'
-URLs:
-- https://music.solatrus.com/track/terra
-Commentary: |-
-    <i>Solatrus:</i>
-    Terra is one of a few tracks I managed to finish in 2009, and is also the first track that I started using my current logo in, however in a much earlier form.
-    This song was originally intended to be used in a game, however, it never came to fruition.
----
 Track: Texas History Theme
 # The song in Texas History from when the flag of Texas shows up and stuff, unreleased
 Duration: 0:24
diff --git a/album/somnium-remastered.yaml b/album/somnium-remastered.yaml
new file mode 100644
index 00000000..4c07a18a
--- /dev/null
+++ b/album/somnium-remastered.yaml
@@ -0,0 +1,80 @@
+Album: Somnium (Remastered)
+Artists:
+- Solatrus
+Date: January 23, 2011
+Date Added: December 17, 2023
+URLs:
+- https://solatrus.bandcamp.com/album/somnium-remastered
+Cover Artists:
+- Solatrus
+Cover Art File Extension: jpg
+Color: '#80DAB7'
+Groups:
+- Solatrus
+- Beyond
+Commentary: |-
+    <i>Solatrus:</i>
+    Somnium, originally released in 2007, was the first album I ever put together.
+
+    This 11 track album, however is the remaster and reedit of the original.
+---
+Track: Soothe
+Duration: '2:40'
+URLs:
+- https://solatrus.bandcamp.com/album/somnium-remastered
+---
+Track: Shadows
+Duration: '7:06'
+URLs:
+- https://solatrus.bandcamp.com/track/shadows
+---
+Track: After the Storm
+Duration: '7:55'
+URLs:
+- https://solatrus.bandcamp.com/track/after-the-storm
+---
+Track: Below the Surface
+Duration: '4:00'
+URLs:
+- https://solatrus.bandcamp.com/track/below-the-surface
+---
+Track: Lucidity
+Duration: '6:04'
+URLs:
+- https://solatrus.bandcamp.com/track/lucidity
+---
+Track: Body
+Directory: body-somnium-remastered
+Always Reference By Directory: true
+Duration: '4:59'
+URLs:
+- https://solatrus.bandcamp.com/track/body
+---
+Track: Mind
+Duration: '6:39'
+Referenced Tracks:
+- track:body-somnium-remastered
+URLs:
+- https://solatrus.bandcamp.com/track/mind
+---
+Track: Soul
+Duration: '6:31'
+Referenced Tracks:
+- Mind
+URLs:
+- https://solatrus.bandcamp.com/track/soul
+---
+Track: Somnium
+Duration: '8:16'
+URLs:
+- https://solatrus.bandcamp.com/track/somnium
+---
+Track: Primus
+Duration: '7:32'
+URLs:
+- https://solatrus.bandcamp.com/track/primus
+---
+Track: Awaken
+Duration: '6:22'
+URLs:
+- https://solatrus.bandcamp.com/track/awaken
diff --git a/album/spiritwake.yaml b/album/spiritwake.yaml
new file mode 100644
index 00000000..bf2c97b7
--- /dev/null
+++ b/album/spiritwake.yaml
@@ -0,0 +1,89 @@
+Album: Spiritwake
+Artists:
+- Solatrus
+Date: October 29, 2012
+Date Added: December 15, 2023
+URLs:
+- https://solatrus.bandcamp.com/album/spiritwake
+Cover Artists:
+- '69'
+Cover Art File Extension: jpg
+Default Track Cover Artists:
+- '69'
+Track Art File Extension: jpg
+Color: '#8ED5EB'
+Groups:
+- Solatrus
+- Beyond
+Commentary: |-
+    <i>Solatrus:</i>
+    Spiritwake, which was written over the span of late October 2011 to late February 2012, is my second foray into trying out orchestral instruments, and shows how significantly I've improved since Prospit & Derse.
+
+    Spiritwake's setting is a post-apocalyptic world centered around spirits and magic, and takes a heavy influence from ethnic cultures, especially Native American. For this album, I chose to follow that path, but with my interpretation and interest in ethnic music infused in there, including West African influenced drums, string section melodies distantly inspired by traditional East Asian music, and an atmosphere that reminds me of both Celtic music and Native American.
+
+    <i>Jebb:</i> (Wiki editor)
+    All of the track art and commentary for this album has been taken from the SoundCloud uploads of the tracks. The commentary is talking about earlier versions of the tracks so some (Specifically [[track:distant-memories|Distant Memories]]) may be a bit outdated.
+---
+Track: The Last Seeker
+Duration: '2:24'
+URLs:
+- https://solatrus.bandcamp.com/track/the-last-seeker
+Commentary: |-
+    <i>Solatrus:</i> ([SoundCloud commentary](https://soundcloud.com/solatrus/the-last-seeker))
+    One of a set of songs I'm composing for a video game. It's turning out to be a really fun project so far!
+---
+Track: Haven
+Has Cover Art: false
+Duration: '2:40'
+URLs:
+- https://solatrus.bandcamp.com/track/haven
+---
+Track: Heart of the Forest
+Duration: '3:07'
+URLs:
+- https://solatrus.bandcamp.com/track/heart-of-the-forest
+Commentary: |-
+    <i>Solatrus:</i> ([SoundCloud commentary](https://soundcloud.com/solatrus/heart-of-the-forest))
+    Yet another song from the same game as [[track:the-last-seeker|The Last Seeker]] and [[track:frozen-souls|Frozen Souls]]. This one's got a strong string arrangement going throughout most of it. Hope you enjoy!
+---
+Track: Frozen Souls
+Duration: '3:13'
+URLs:
+- https://solatrus.bandcamp.com/track/frozen-souls
+Commentary: |-
+    <i>Solatrus:</i> ([SoundCloud commentary](https://soundcloud.com/solatrus/frozen-souls))
+    Another song from the same video game that [[track:the-last-seeker|The Last Seeker]] is also a part of. Hope you enjoy it!
+---
+Track: Distant Memories
+Duration: '3:30'
+URLs:
+- https://solatrus.bandcamp.com/track/distant-memories
+Commentary: |-
+    <i>Solatrus:</i> ([SoundCloud commentary](https://soundcloud.com/solatrus/distant-memories))
+    Another song from the upcoming iOS (and eventually Android) game, Spiritwake! This one has a bit of an electronic sound to it, reflecting a lost society.
+
+    I think I need to tweak the lead at the end of the song, though... hah.
+---
+Track: Tempest
+Has Cover Art: false
+Duration: '3:20'
+URLs:
+- https://solatrus.bandcamp.com/track/tempest
+---
+Track: The Last Seeker (Reprise)
+Has Cover Art: false
+Duration: '5:04'
+Referenced Tracks:
+- The Last Seeker
+URLs:
+- https://solatrus.bandcamp.com/track/the-last-seeker-reprise
+---
+Track: Tempest (Destroyed by Astro Kid)
+Has Cover Art: false
+Artists:
+- Astro Kid
+Duration: '5:04'
+Referenced Tracks:
+- Tempest
+URLs:
+- https://solatrus.bandcamp.com/track/tempest-destroyed-by-astro-kid
\ No newline at end of file
diff --git a/album/stratosphere.yaml b/album/stratosphere.yaml
new file mode 100644
index 00000000..3f70f0e0
--- /dev/null
+++ b/album/stratosphere.yaml
@@ -0,0 +1,22 @@
+Album: Stratosphere
+Artists:
+- Solatrus
+Date: June 3, 2008
+Date Added: December 15, 2023
+URLs:
+- https://solatrus.bandcamp.com/track/stratosphere
+Cover Artists:
+- Solatrus
+Cover Art File Extension: jpg
+Color: '#B7D7EC'
+Groups:
+- Solatrus
+- Beyond
+Commentary: |-
+    <i>Solatrus:</i>
+    Stratosphere is an old trance song I did just after finishing Dawn to Dusk (2008), but I never really promoted it!
+---
+Track: Stratosphere
+Duration: '5:19'
+URLs:
+- https://solatrus.bandcamp.com/track/stratosphere
\ No newline at end of file
diff --git a/album/terra.yaml b/album/terra.yaml
new file mode 100644
index 00000000..34f12efa
--- /dev/null
+++ b/album/terra.yaml
@@ -0,0 +1,26 @@
+Album: Terra
+Artists:
+- Solatrus
+Date: January 5, 2009
+Date Added: December 15, 2023
+URLs:
+- https://solatrus.bandcamp.com/track/terra
+Cover Artists:
+- Solatrus
+Cover Art File Extension: jpg
+Color: '#89A977'
+Groups:
+- Solatrus
+- Beyond
+Commentary: |-
+    <i>Solatrus:</i>
+    Terra is one of a few tracks I managed to finish in 2009, and is also the first track that I started using my current logo in, however in a much earlier form.
+
+    This song was originally intended to be used in a game, however, it never came to fruition.
+---
+Track: Terra
+Directory: terra-solatrus
+Always Reference By Directory: true
+Duration: '4:05'
+URLs:
+- https://solatrus.bandcamp.com/track/terra
diff --git a/album/vertigo.yaml b/album/vertigo.yaml
new file mode 100644
index 00000000..904ac816
--- /dev/null
+++ b/album/vertigo.yaml
@@ -0,0 +1,28 @@
+Album: Vertigo
+Artists:
+- Solatrus
+Date: November 3, 2011
+Date Added: December 15, 2023
+URLs:
+- https://solatrus.bandcamp.com/track/vertigo
+Cover Artists:
+- Dawn Davis
+Cover Art File Extension: jpg
+Color: '#15FFAA'
+Groups:
+- Solatrus
+- Beyond
+Commentary: |-
+    <i>Solatrus:</i>
+    This is an old song that I had completely forgotten about, started back in 2008. I did a couple tweaks to it to make it stand better with my more recent work, but it still definitely feels like my older Somnium style.
+
+    In fact, the solo in the latter half will certainly remind some of [[track:endless-ocean|Endless Ocean]] or, for those of you who read Homestuck (www.mspaintadventures.com), you may recognize some similarities to [[track:frost-vol6|Frost]]. They both have elements that originated from Vertigo.
+
+    This song was also a part of my scrapped self-titled album, but oh well. That didn't happen.
+
+    Enjoy!
+---
+Track: Vertigo
+Duration: '5:04'
+URLs:
+- https://solatrus.bandcamp.com/track/vertigo
\ No newline at end of file
diff --git a/album/vivid-spectrum.yaml b/album/vivid-spectrum.yaml
new file mode 100644
index 00000000..c8750ad0
--- /dev/null
+++ b/album/vivid-spectrum.yaml
@@ -0,0 +1,33 @@
+Album: Vivid Spectrum
+Artists:
+- Solatrus
+- Marcy Nabors
+Date: July 19, 2013
+Date Added: December 15, 2023
+URLs:
+- https://solatrus.bandcamp.com/track/vivid-spectrum
+Cover Artists:
+- Tavia Morra
+Banner Artists:
+- Tavia Morra
+Cover Art File Extension: jpg
+Banner File Extension: jpg
+Color: '#FF1BF0'
+Groups:
+- Solatrus
+- Beyond
+Commentary: |-
+    <i>Solatrus:</i>
+    Vivid Spectrum started out as two completely independent projects; Marcy's project began in June 2012 just before I even moved out to the DC area, and mine started in September.
+
+    Everything: Jeremy Iamurri (Solatrus)
+    Also everything: Marcy Nabors (Shadolith - shadolith.tumblr.com )
+
+    Yes, there is 200% song in this song.
+    Except we didn't do the art.
+    Single Cover Art: Tavia Morra (seeyoutmorra.tumblr.com)
+---
+Track: Vivid Spectrum
+Duration: '3:58'
+URLs:
+- https://solatrus.bandcamp.com/track/vivid-spectrum
diff --git a/artists.yaml b/artists.yaml
index c12ed040..3f1bc559 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -28,6 +28,8 @@ URLs:
 - https://www.youtube.com/channel/UCRPRIXyfI1LtORk6ZjfmE2A
 - https://472pis.github.io/472OC/
 ---
+Artist: '69'
+---
 Artist: 8bitkitten
 URLs:
 - https://kitten-burrito.tumblr.com/
@@ -4577,6 +4579,17 @@ Artist: Kylee Henke
 URLs:
 - https://kyleehenke.tumblr.com
 ---
+Artist: Kyle Labriola
+URLs:
+- https://twitter.com/kylelabriola
+- https://twitter.com/artofkylelab
+- https://blueberry-lemon.tumblr.com/
+- https://cohost.org/kylelabriola?page=0
+- https://bsky.app/profile/kylelabriola.bsky.social
+- https://www.patreon.com/kylelabriola
+- https://www.theartofkylelabriola.com
+- https://linktr.ee/kylelabriola
+---
 Artist: L. L. Zamenhof
 ---
 Artist: L1CH3N
@@ -7574,8 +7587,13 @@ Artist: Solatrus
 Aliases:
 - Jeremy Iamurri
 URLs:
-- https://music.solatrus.com/
+- https://solatrus.bandcamp.com
+- https://soundcloud.com/solatrus
 - https://twitter.com/Solatrus
+Dead URLs:
+- http://www.solatrus.com/
+- https://solatrus-deactivated20160601.tumblr.com/
+- https://music.solatrus.com/
 ---
 Artist: Sollay
 Aliases:
diff --git a/groups.yaml b/groups.yaml
index 9e47a605..b4db2fed 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -161,6 +161,13 @@ URLs:
 Description: |-
     Best known to Homestuck fans for creating some of its [[Skies of Skaia|foundational]] [[Aggrieve|themes]], and to the internet at large for Slender: The Eight Pages and [[album:slender-the-arrival-soundtrack|its sequel]], Mark J. Hadley is a multitalented composer and independent developer.
 ---
+Group: Solatrus
+URLs:
+- https://solatrus.bandcamp.com
+- https://soundcloud.com/solatrus
+Description: |-
+    Known primarily for [[track:frost-vol6]] and his solo album [[album:prospit-and-derse]], this artist has been making electronic and orchestral music for many years.
+---
 Group: tempest2k
 URLs:
 - https://nuclear333.bandcamp.com/