rearrange some flash acts

1 files changed, 204 insertions, 204 deletions

diff --git a/flashes.yaml b/flashes.yaml
index a4a63a7..c735dc1 100644
--- a/flashes.yaml
+++ b/flashes.yaml
@@ -1604,11 +1604,13 @@ Page: '8130'
 Act: Hiveswap
 Directory: hiveswap
 Color: '#33cc77'
+List Terminology: Games in this series
 Jump: Additional Canon
 Jump Color: '#f2a400'
-List Terminology: Games in this series
 ---
+Flash: Hiveswap Act 1
 Directory: hiveswap-act1
+Color: '#33cc77'
 Contributors:
 - Adrienne Garcia (lead animator, animation, animation cleanup, cutscene illustration)
 - Alex Krokus (animation)
@@ -1694,8 +1696,9 @@ Featured Tracks:
 - We Shall Go Together
 - Wish You Were Here
 - Intermission 1
-Flash: Hiveswap Act 1
 ---
+Flash: Hiveswap Act 2
+Color: '#f8f0cb'
 Directory: hiveswap-act2
 Contributors:
 - Adelaide Killigan (scripting, QA)
@@ -1788,7 +1791,6 @@ Featured Tracks:
 - track:old-secret-act2
 - Ghost Train
 - Fight of the Bumblebee
-Flash: Hiveswap Act 2
 ---
 Act: Hiveswap Friendsim
 Directory: friendsim
@@ -3343,7 +3345,7 @@ URLs:
 - https://www.youtube.com/watch?v=cs64HZTw_K0
 ---
 Act: Mr. Tambourine Man
-Color: '#2838ef'
+Color: '#4453fc'
 Directory: mr-tambourine-man
 List Terminology: Flashes in this story
 ---
@@ -3675,169 +3677,8 @@ Featured Tracks:
 URLs:
 - https://www.youtube.com/watch?v=oeLyu-Ae6a4
 ---
-Act: Psycholonials
-Directory: psycholonials
-Color: '#f51806'
-List Terminology: Volumes in this game
-Jump: Fan Animations
-Jump Color: '#32c7fe'
----
-Directory: psycholonials
-Contributors:
-- Andrew Hussie (author)
-- Clark Powell (musician)
-- Adelaide Killigan (lead engineer)
-- Andrew D. (additional engineering)
-- Aysha U. Farah (editing)
-- Yitong Zhu (language proofreading)
-- Raissa Castro (language proofreading)
-- SK (language proofreading)
-- James Roach (language proofreading)
-Date: February 3, 2021
-Flash: Psycholonials
----
-Directory: psych-ch1
-Date: February 3, 2021
-Cover Art File Extension: png
-Featured Tracks:
-- track:love-song
-- track:summer-that-never-was
-- track:morning-ritual
-- track:ephemeral-muse
-- track:whats-wasting-me
-- track:the-successor
-Flash: Summer That Never Was
----
-Directory: psych-ch2
-Date: February 17, 2021
-Cover Art File Extension: png
-Featured Tracks:
-- track:edge-of-dawn
-- track:love-song
-- track:the-cold-hand
-- track:together
-- track:summer-that-never-was
-- track:the-influencer
-- track:just-dreams
-- track:i-have-some-ideas
-- track:the-successor
-Flash: Pranxis
----
-Directory: psych-ch3
-Date: February 24, 2021
-Cover Art File Extension: png
-Featured Tracks:
-- track:love-song
-- track:morning-ritual
-- track:time-is-helpless
-- track:whats-wasting-me
-- track:through-the-play
-- track:just-almost
-- track:the-successor
-Flash: Wildcard
----
-Directory: psych-ch4
-Date: March 3, 2021
-Cover Art File Extension: png
-Featured Tracks:
-- track:edge-of-dawn
-- track:love-song
-- track:outlaw
-- track:a-screaming-inside
-- track:just-dreams
-- track:breakthroughs
-- track:ephemeral-muse
-- track:nervous-energy
-- track:now-and-forever
-- track:the-successor
-Flash: A Symbol Of Strength
----
-Directory: psych-ch5
-Date: March 10, 2021
-Featured Tracks:
-- track:love-song
-- track:through-the-play
-- track:whats-wasting-me
-- track:in-the-works
-- track:i-have-some-ideas
-- track:ephemeral-muse
-- track:blood-on-their-hands
-- track:the-cold-hand
-- track:the-successor
-Flash: Stuck Pig
----
-Directory: psych-ch6
-Date: March 24, 2021
-Featured Tracks:
-- track:love-song
-- track:outlaw
-- track:the-influencer
-- track:the-administrator
-- track:time-is-helpless
-- track:means-of-conquest
-- track:twelve-clown-salute
-- track:together
-- track:now-and-forever
-- track:the-successor
-Flash: The Practice of Delegation
----
-Directory: psych-ch7
-Date: March 31, 2021
-Featured Tracks:
-- track:love-song
-- track:the-march
-- track:the-administrator
-- track:such-a-shame
-- track:nervous-energy
-- track:a-screaming-inside
-- track:break-this
-- track:just-almost
-- track:means-of-conquest
-- track:now-and-forever
-- track:the-successor
-Flash: It Never Even Stood A Chance
----
-Directory: psych-ch8
-Date: April 13, 2021
-Featured Tracks:
-- track:edge-of-dawn
-- track:love-song
-- track:nervous-energy
-- track:in-the-works
-- track:in-the-loop
-- track:breakthroughs
-- track:whats-wasting-me
-- track:twelve-clown-salute
-- track:such-a-shame
-- track:flare-insurrection-remix
-- track:the-cold-hand
-- track:through-the-play
-- track:summer-that-never-was
-- track:summer-that-never-was-firebrand-remix
-- track:just-almost
-- track:the-successor
-Flash: Grinch Heart
----
-Directory: psych-ch9
-Date: April 20, 2021
-Featured Tracks:
-- track:ephemeral-muse-final-remix
-- track:fix-this
-- track:edge-of-dawn
-- track:threshold
-- track:in-the-loop
-- track:we-were-right-about-everything
-- track:feeling-i-cant-shake
-- track:zhen
-- track:just-almost
-- track:the-successor
-- track:love-song
-- track:the-march
-- track:together-vocal-remix
-Flash: A Sword And A Crown
----
 Act: More fan adventures
-Color: '#fafafa'
+Color: '#c466ff'
 Directory: other-fan-adventures
 List Terminology: Flashes in this section
 ---
@@ -4103,47 +3944,12 @@ URLs:
 - https://mspfa.com/?s=50076&p=212
 - https://www.youtube.com/watch?v=F41HZ9ZkzMM
 ---
-Act: Fan animations
-Directory: fan-animations
-Color: '#fafafa'
-List Terminology: Animations in this section
----
-Flash: 'MOVIE #1: hooly SHIT, wear a MOVIE???????????'
-Directory: sbahj-movie-1
-Date: May 21, 2010
-Featured Tracks:
-- Sweet Bro Theme Song
----
-Flash: '[S] Rex Duodecim Angelus'
-Directory: rex-duodecim-angelus
-Date: June 13, 2014
-Featured Tracks:
-- Rex Duodecim Angelus
-URLs:
-- https://www.youtube.com/watch?v=-19Up0dLzNw
----
-Flash: Synchrostuck
-Directory: synchrostuck
-Date: August 15, 2021
-Featured Tracks:
-- A Tender Moment
-URLs:
-- https://www.youtube.com/watch?v=9uAgDA0TRlM
----
-Flash: Fan Animation - Homestuck
-Directory: fan-animation-homestuck
-Date: February 10, 2011
-Featured Tracks:
-- Irradiated
-URLs:
-- https://www.youtube.com/watch?v=hnG10rk9lqg
----
 Act: Sunday Night Strifin'
 Directory: sunday-night-strifin
 Color: '#FFFF00'
 List Terminology: Mods in this section
-Jump: Fan Games 
-Jump Color: '#0088ff'
+Jump: Fan Games & More
+Jump Color: '#32c7fe'
 ---
 Flash: 'Act 1: Beatdown, Strider Style'
 Directory: act-1-sunday-night-strifin
@@ -4222,9 +4028,203 @@ URLs:
 - https://youtu.be/qePAEz3z2B0
 - https://gamebanana.com/mods/459476
 ---
+Act: Psycholonials
+Directory: psycholonials
+Color: '#f51806'
+List Terminology: Volumes in this game
+---
+Flash: Psycholonials
+Directory: psycholonials
+Contributors:
+- Andrew Hussie (author)
+- Clark Powell (musician)
+- Adelaide Killigan (lead engineer)
+- Andrew D. (additional engineering)
+- Aysha U. Farah (editing)
+- Yitong Zhu (language proofreading)
+- Raissa Castro (language proofreading)
+- SK (language proofreading)
+- James Roach (language proofreading)
+Date: February 3, 2021
+---
+Flash: Summer That Never Was
+Directory: psych-ch1
+Date: February 3, 2021
+Cover Art File Extension: png
+Featured Tracks:
+- track:love-song
+- track:summer-that-never-was
+- track:morning-ritual
+- track:ephemeral-muse
+- track:whats-wasting-me
+- track:the-successor
+---
+Flash: Pranxis
+Directory: psych-ch2
+Date: February 17, 2021
+Cover Art File Extension: png
+Featured Tracks:
+- track:edge-of-dawn
+- track:love-song
+- track:the-cold-hand
+- track:together
+- track:summer-that-never-was
+- track:the-influencer
+- track:just-dreams
+- track:i-have-some-ideas
+- track:the-successor
+---
+Flash: Wildcard
+Directory: psych-ch3
+Date: February 24, 2021
+Cover Art File Extension: png
+Featured Tracks:
+- track:love-song
+- track:morning-ritual
+- track:time-is-helpless
+- track:whats-wasting-me
+- track:through-the-play
+- track:just-almost
+- track:the-successor
+---
+Flash: A Symbol Of Strength
+Directory: psych-ch4
+Date: March 3, 2021
+Cover Art File Extension: png
+Featured Tracks:
+- track:edge-of-dawn
+- track:love-song
+- track:outlaw
+- track:a-screaming-inside
+- track:just-dreams
+- track:breakthroughs
+- track:ephemeral-muse
+- track:nervous-energy
+- track:now-and-forever
+- track:the-successor
+---
+Flash: Stuck Pig
+Directory: psych-ch5
+Date: March 10, 2021
+Featured Tracks:
+- track:love-song
+- track:through-the-play
+- track:whats-wasting-me
+- track:in-the-works
+- track:i-have-some-ideas
+- track:ephemeral-muse
+- track:blood-on-their-hands
+- track:the-cold-hand
+- track:the-successor
+---
+Flash: The Practice of Delegation
+Directory: psych-ch6
+Date: March 24, 2021
+Featured Tracks:
+- track:love-song
+- track:outlaw
+- track:the-influencer
+- track:the-administrator
+- track:time-is-helpless
+- track:means-of-conquest
+- track:twelve-clown-salute
+- track:together
+- track:now-and-forever
+- track:the-successor
+---
+Flash: It Never Even Stood A Chance
+Directory: psych-ch7
+Date: March 31, 2021
+Featured Tracks:
+- track:love-song
+- track:the-march
+- track:the-administrator
+- track:such-a-shame
+- track:nervous-energy
+- track:a-screaming-inside
+- track:break-this
+- track:just-almost
+- track:means-of-conquest
+- track:now-and-forever
+- track:the-successor
+---
+Flash: Grinch Heart
+Directory: psych-ch8
+Date: April 13, 2021
+Featured Tracks:
+- track:edge-of-dawn
+- track:love-song
+- track:nervous-energy
+- track:in-the-works
+- track:in-the-loop
+- track:breakthroughs
+- track:whats-wasting-me
+- track:twelve-clown-salute
+- track:such-a-shame
+- track:flare-insurrection-remix
+- track:the-cold-hand
+- track:through-the-play
+- track:summer-that-never-was
+- track:summer-that-never-was-firebrand-remix
+- track:just-almost
+- track:the-successor
+---
+Flash: A Sword And A Crown
+Directory: psych-ch9
+Date: April 20, 2021
+Featured Tracks:
+- track:ephemeral-muse-final-remix
+- track:fix-this
+- track:edge-of-dawn
+- track:threshold
+- track:in-the-loop
+- track:we-were-right-about-everything
+- track:feeling-i-cant-shake
+- track:zhen
+- track:just-almost
+- track:the-successor
+- track:love-song
+- track:the-march
+- track:together-vocal-remix
+---
+Act: Fan animations
+Directory: fan-animations
+Color: '#32c7fe'
+List Terminology: Animations in this section
+---
+Flash: 'MOVIE #1: hooly SHIT, wear a MOVIE???????????'
+Directory: sbahj-movie-1
+Date: May 21, 2010
+Featured Tracks:
+- Sweet Bro Theme Song
+---
+Flash: '[S] Rex Duodecim Angelus'
+Directory: rex-duodecim-angelus
+Date: June 13, 2014
+Featured Tracks:
+- Rex Duodecim Angelus
+URLs:
+- https://www.youtube.com/watch?v=-19Up0dLzNw
+---
+Flash: Synchrostuck
+Directory: synchrostuck
+Date: August 15, 2021
+Featured Tracks:
+- A Tender Moment
+URLs:
+- https://www.youtube.com/watch?v=9uAgDA0TRlM
+---
+Flash: Fan Animation - Homestuck
+Directory: fan-animation-homestuck
+Date: February 10, 2011
+Featured Tracks:
+- Irradiated
+URLs:
+- https://www.youtube.com/watch?v=hnG10rk9lqg
+---
 Act: More games
 Directory: more-games
-Color: '#fafafa'
+Color: '#32c7fe'
 List Terminology: Games in this section
 ---
 Flash: Namco High