diff --git a/packages/frontend-embed/src/theme.ts b/packages/frontend-embed/src/theme.ts
index 4664ad4880..54f1a64f66 100644
--- a/packages/frontend-embed/src/theme.ts
+++ b/packages/frontend-embed/src/theme.ts
@@ -4,8 +4,8 @@
  */
 
 import tinycolor from 'tinycolor2';
-import lightTheme from '@@/themes/_light.json5';
-import darkTheme from '@@/themes/_dark.json5';
+import lightTheme from '@@/themes/p-light2.json5';
+import darkTheme from '@@/themes/p-dark2.json5';
 import type { BundledTheme } from 'shiki/themes';
 
 export type Theme = {
diff --git a/packages/frontend-shared/themes/p-light2.json5 b/packages/frontend-shared/themes/p-light2.json5
index bc2160f5ca..c226dd026b 100644
--- a/packages/frontend-shared/themes/p-light2.json5
+++ b/packages/frontend-shared/themes/p-light2.json5
@@ -40,7 +40,7 @@
     "renote": "#6c54f7",
     "shadow": "rgba(0, 0, 0, 0.1)",
     "divider": "rgba(164, 105, 112, 0.1)",
-    "hashtag": "#ff8fab",
+    "hashtag": "#6507b8",
     "mention": "#e84f66",
     "modalBg": "rgba(0, 0, 0, 0.25)",
     "success": "#ffa3d7",
diff --git a/packages/frontend-shared/themes/stpv-dark.json5 b/packages/frontend-shared/themes/stpv-dark.json5
index e73bc537ee..3b8440d66b 100644
--- a/packages/frontend-shared/themes/stpv-dark.json5
+++ b/packages/frontend-shared/themes/stpv-dark.json5
@@ -1,5 +1,5 @@
 {
-	id: '33684d69-94b9-4d9c-9783-e9e6b92d7a59',
+	id: 'stpv-dark',
 	base: 'dark',
 	name: 'Stpv Dark v2',
 	props: {
diff --git a/packages/frontend-shared/themes/stpv-light.json5 b/packages/frontend-shared/themes/stpv-light.json5
index 99123cb561..7a0eba4219 100644
--- a/packages/frontend-shared/themes/stpv-light.json5
+++ b/packages/frontend-shared/themes/stpv-light.json5
@@ -1,5 +1,5 @@
 {
-	id: '43eeb316-8e4f-4e45-91ad-bc794fea3ea4',
+	id: 'stpv-light',
 	base: 'light',
 	name: 'Stellacolor Transparent',
 	props: {
diff --git a/packages/frontend/.storybook/preload-theme.ts b/packages/frontend/.storybook/preload-theme.ts
index e5573f2ac3..a4e098ad4a 100644
--- a/packages/frontend/.storybook/preload-theme.ts
+++ b/packages/frontend/.storybook/preload-theme.ts
@@ -28,6 +28,8 @@ const keys = [
 	'd-cherry',
 	'd-ice',
 	'd-u0',
+	'p-light2',
+	'p-dark2'
 ]
 
 await Promise.all(keys.map((key) => readFile(new URL(`../../frontend-shared/themes/${key}.json5`, import.meta.url), 'utf8'))).then((sources) => {
diff --git a/packages/frontend/src/scripts/theme.ts b/packages/frontend/src/scripts/theme.ts
index 25c85bef47..07dae1d953 100644
--- a/packages/frontend/src/scripts/theme.ts
+++ b/packages/frontend/src/scripts/theme.ts
@@ -54,6 +54,11 @@ export const getBuiltinThemes = () => Promise.all(
 		'd-u0',
 		'p-light',
 		'p-dark',
+		'p-light2',
+		'p-dark2',
+		"shw-light",
+		"shw-light",
+		"stpv-dark"
 	].map(name => import(`@@/themes/${name}.json5`).then(({ default: _default }): Theme => _default)),
 );