diff --git a/src/client/theme.ts b/src/client/theme.ts
index 2f4920e3af..07981c36ff 100644
--- a/src/client/theme.ts
+++ b/src/client/theme.ts
@@ -17,16 +17,14 @@ export const builtinThemes = [
 	require('./themes/black.json5'),
 	require('./themes/lavender.json5'),
 	require('./themes/halloween.json5'),
-	require('./themes/garden.json5'),
-	require('./themes/mauve.json5'),
-	require('./themes/elegant.json5'),
+	require('./themes/city.json5'),
 	require('./themes/rainy.json5'),
 	require('./themes/urban.json5'),
 	require('./themes/cafe.json5'),
 	require('./themes/chocolate.json5'),
 	require('./themes/danboard.json5'),
 	require('./themes/olive.json5'),
-	require('./themes/tweetdeck.json5'),
+	require('./themes/ocean.json5'),
 ] as Theme[];
 
 let timeout = null;
diff --git a/src/client/themes/city.json5 b/src/client/themes/city.json5
new file mode 100644
index 0000000000..3c5b5fa678
--- /dev/null
+++ b/src/client/themes/city.json5
@@ -0,0 +1,22 @@
+{
+	id: '8e4aa0ab-a439-43c8-b67d-16d5c03936de',
+
+	name: 'City',
+	author: 'Zheneha',
+
+	base: 'dark',
+
+	props: {
+		accent: 'rgb(255, 153, 0)',
+		panel: 'rgb(22, 22, 22)',
+		bg: 'rgb(0, 0, 0)',
+		fg: 'rgb(240, 240, 240)',
+		infoFg: '@accent',
+		infoBg: 'rgb(0, 0, 0)',
+		header: 'rgb(27, 27, 27)',
+		mention: '@accent',
+		hashtag: '@accent',
+		link: '@accent',
+		renote: 'rgb(118, 179, 40)',
+	},
+}
diff --git a/src/client/themes/elegant.json5 b/src/client/themes/elegant.json5
deleted file mode 100644
index 52ae4cbfa0..0000000000
--- a/src/client/themes/elegant.json5
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	id: 'de465368-9dd1-4bba-b1b9-69f312fcf6e7',
-
-	name: 'Elegant',
-	author: 'syuilo',
-	desc: 'Inspired by meimei\'s theme',
-
-	base: 'dark',
-
-	props: {
-		accent: 'rgb(187, 146, 45)',
-		panel: 'rgb(76, 33, 33)',
-		bg: 'rgb(53, 21, 21)',
-		fg: 'rgb(216, 210, 199)',
-		header: 'rgba(76, 45, 33, 0.75)',
-		renote: '@accent',
-	},
-}
diff --git a/src/client/themes/garden.json5 b/src/client/themes/garden.json5
deleted file mode 100644
index ae12fb3e78..0000000000
--- a/src/client/themes/garden.json5
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	id: '45b13782-9143-4dd8-ac0c-4a872321fc63',
-
-	name: 'Garden',
-	author: 'syuilo',
-
-	base: 'light',
-
-	props: {
-		accent: 'rgb(147, 206, 188)',
-		bg: 'rgb(253, 245, 242)',
-		fg: 'rgb(161, 147, 139)',
-		renote: '@accent',
-		hashtag: 'rgb(226, 152, 48)',
-		link: '#aac12c',
-	},
-}
diff --git a/src/client/themes/mauve.json5 b/src/client/themes/mauve.json5
deleted file mode 100644
index 47304c922f..0000000000
--- a/src/client/themes/mauve.json5
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	id: '6846bcbe-afbe-487c-bece-77e8cfc4ab8a',
-
-	name: 'Mauve',
-	author: 'syuilo',
-
-	base: 'dark',
-
-	props: {
-		accent: 'rgb(133, 88, 150)',
-		panel: 'rgb(54, 43, 59)',
-		bg: '#201A23',
-		fg: 'rgb(229, 223, 231)',
-		shadow: 'rgba(0, 0, 0, 0.2)',
-		header: 'rgba(87, 70, 97, 0.5)',
-		renote: '@accent',
-	},
-}
diff --git a/src/client/themes/tweetdeck.json5 b/src/client/themes/ocean.json5
similarity index 85%
rename from src/client/themes/tweetdeck.json5
rename to src/client/themes/ocean.json5
index a991fa1b4f..84c9d403c5 100644
--- a/src/client/themes/tweetdeck.json5
+++ b/src/client/themes/ocean.json5
@@ -1,9 +1,8 @@
 {
 	id: '7e5e263e-c6c1-44e4-a3d2-39198e3cddb8',
 
-	name: 'Tweet Deck',
+	name: 'Ocean',
 	author: 'simirall',
-	desc: 'Tweet like a pro.',
 
 	base: 'dark',