diff --git a/CALCKEY.md b/CALCKEY.md
index 12723ddc0..4eb418b20 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -10,7 +10,6 @@
- Better intro/onboarding
- Fully revamp non-logged-in screen
- Personal notes for all accounts
-- Admin custom CSS
- Non-nyaify cat mode
- Timeline filters
- "Bubble" timeline
@@ -28,6 +27,7 @@
- Less cluttered notification summary
- Better timeline top bar
+- Admin custom CSS
## Implemented
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 7a507d27d..0088af46d 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -900,6 +900,7 @@ account: "Account"
move: "Move"
showAds: "Show ads"
enterSendsMessage: "Press Return in Messaging to send message (off is Ctrl + Return)"
+adminCustomCssWarn: "This setting should only be used if you know what it does. Entering improper values may cause EVERYONE'S clients to stop functioning normally. Please ensure your CSS works properly by testing it in your user settings."
_sensitiveMediaDetection:
description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 4ac0f509c..1c832e1f7 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -900,6 +900,7 @@ navbar: "ナビゲーションバー"
shuffle: "シャッフル"
account: "アカウント"
move: "移動"
+adminCustomCssWarn: "この設定は、それが何をするものであるかを知っている場合のみ使用してください。不適切な値を入力すると、クライアントが正常に動作しなくなる可能性があります。ユーザー設定でCSSをテストし、正しく動作することを確認してください。"
_sensitiveMediaDetection:
description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。"
diff --git a/packages/client/src/pages/admin/custom-css.vue b/packages/client/src/pages/admin/custom-css.vue
new file mode 100644
index 000000000..65c70dda7
--- /dev/null
+++ b/packages/client/src/pages/admin/custom-css.vue
@@ -0,0 +1,48 @@
+
+