diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 57c9a5c..8d705dd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,5 +1,5 @@
 name: build
-on: [pull_request]
+on: [push, pull_request]
 
 jobs:
   linux-build:
diff --git a/game/color_theme.lua b/game/color_theme.lua
index f81c5e2..71fbda1 100644
--- a/game/color_theme.lua
+++ b/game/color_theme.lua
@@ -4,7 +4,7 @@
 
 local color = require("color")
 local ColorTheme = {
-	[1] = {
+	[1] = {	-- µ's
 		-- ff4fae
 		currentColor = {0xff, 0x4f, 0xae, color.hexFF4FAE},
 		-- ef46a1
@@ -12,7 +12,7 @@ local ColorTheme = {
 		-- c31c76
 		currentColorDarker = {0xc3, 0x1c, 0x76, color.hexC31C76}
 	},
-	[2] = {
+	[2] = {	-- Aqours
 		-- 46baff
 		currentColor = {0x46, 0xba, 0xff, color.hex46BAFF},
 		-- 3bacf0
@@ -20,7 +20,7 @@ local ColorTheme = {
 		-- 007ec6
 		currentColorDarker = {0x00, 0x7e, 0xc6, color.hex007EC6}
 	},
-	[3] = {
+	[3] = { -- NijiGaku
 		-- ffc22e
 		currentColor = {0xff, 0xc2, 0x2e, color.hexFFC22E},
 		-- e8b126
@@ -28,7 +28,7 @@ local ColorTheme = {
 		-- ac7b0a
 		currentColorDarker = {0xac, 0x7b, 0x0a, color.hexAC7B0A}
 	},
-	[4] = {
+	[4] = { -- Liella
 		-- d991d8
 		currentColor = {0xd9, 0x91, 0xd8, color.hexD991D8},
 		-- cc6bcb
@@ -36,19 +36,36 @@ local ColorTheme = {
 		-- bf45bd
 		currentColorDarker = {0xbf, 0x45, 0xbd, color.hexBF45BD}
 	},
-	[5] = {
+	[5] = {	-- Hasunosora
 		-- fb9ba9
 		currentColor = {0xfb, 0x9b, 0xa9, color.hexFB9BA9},
 		-- fb8a9b
 		currentColorDark = {0xfb, 0x8a, 0x9b, color.hexFB8A9B},
 		-- fb7085
 		currentColorDarker = {0xfb, 0x70, 0x85, color.hexFB7085}
+	},
+	[6] = {	-- (School Idol) Musical
+		-- f70042
+		currentColor = {0xf7, 0x09, 0x42, color.hexF70042},
+		-- de003b
+		currentColorDark = {0xde, 0x00, 0x3b, color.hexDE003B},
+		-- c40035
+		currentColorDarker = {0xc4, 0x00, 0x35, color.hexC40035}
+	},
+	[7] = {	-- Yohane (the Parhelion)
+		-- 23a2b0
+		currentColor = {0x23, 0xa2, 0xb0, color.hex23A2B0},
+		-- 1e8a96
+		currentColorDark = {0x1e, 0x8a, 0x96, color.hex1E8A96},
+		-- 19737d
+		currentColorDarker = {0x19, 0x73, 0x7d, color.hex19737D}
 	}
 }
 
 local currentColor, currentColorDark, currentColorDarker
 
 -- colid: 1 = μ's, 2 = Aqours, 3 = NijiGaku, 4 = Liella, 5 = Hasunosora
+-- 6 = Musical, 7 = Yohane
 function ColorTheme.init(colid)
 	if currentColor then return end
 	return ColorTheme.set(colid)
diff --git a/game/states/beatmap_select.lua b/game/states/beatmap_select.lua
index 152a591..1b65188 100644
--- a/game/states/beatmap_select.lua
+++ b/game/states/beatmap_select.lua
@@ -87,7 +87,7 @@ do
 		love.graphics.setColor(self.selected and ColorTheme.get() or color.hex434242)
 		love.graphics.rectangle("fill", x, y, self.width, self.height)
 		love.graphics.setShader(Util.drawText.workaroundShader)
-		love.graphics.setColor(color.black)
+		love.graphics.setColor(color.white)
 		love.graphics.draw(self.name, x + 110, y + 20)
 		love.graphics.draw(self.format, x + 110, y + 60)
 
@@ -226,7 +226,7 @@ do
 		love.graphics.setColor(color.hexFFDF35)
 		love.graphics.rectangle("fill", x, y, self.width, self.height, 20, 20)
 		love.graphics.rectangle("line", x, y, self.width, self.height, 20, 20)
-		love.graphics.setColor(color.white)
+		love.graphics.setColor(color.black)
 		love.graphics.draw(self.image, x + 12, y + 7, 0, 0.32)
 		Util.drawText(self.text, x + 37, y + 12)
 
diff --git a/game/states/gamesetting.lua b/game/states/gamesetting.lua
index 0ed0ad4..66f2630 100644
--- a/game/states/gamesetting.lua
+++ b/game/states/gamesetting.lua
@@ -297,7 +297,7 @@ function gameSetting:load()
 	-- General settings
 	if self.persist.generalSetting == nil then
 		local frame = newSettingFrame()
-		local themeDisplay = {"μ's", "Aqours", "NijiGaku", "Liella", "Hasunosora"}
+		local themeDisplay = {"μ's", "Aqours", "NijiGaku", "Liella", "Hasunosora", "Musical", "Yohane"}
 		local tapSoundDisplay = {}
 		for i = 1, #tapSound do
 			tapSoundDisplay[i] = tapSound[i].name