12.67.0

Update deps
Resolve #7074
2021-01-13 22:04:26 +09:00 · 2021-01-13 22:02:40 +09:00 · 2021-01-13 21:43:06 +09:00 · 2021-01-11 22:31:17 +09:00 · 2021-01-11 21:01:54 +09:00 · 2021-01-11 20:57:48 +09:00
250 changed files with 11666 additions and 2512 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ executors:
  docker:
    working_directory: /tmp/workspace
    docker:
-      - image: docker:12.10.1
+      - image: docker:latest

 jobs:
  docker:
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -45,6 +45,7 @@ copyUsername: "انسخ اسم المستخدم"
 searchUser: "ابحث عن مستخدمين"
 reply: "رد"
 loadMore: "عرض المزيد"
+showMore: "عرض المزيد"
 youGotNewFollower: "يتابعك"
 receiveFollowRequest: "تلقيت طلب متابعة"
 followRequestAccepted: "قُبل طلب المتابعة"
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1,5 +1,6 @@
 ---
 _lang_: "Deutsch"
+headlineMisskey: "Durch Notizen verbundenes Netzwerk"
 introMisskey: "Willkommen! Misskey ist eine dezentralisierte Open-Source Microblogging-Platform.\nVerfasse \"Notizen\" um mitzuteilen, was gerade passiert oder um Ereignisse mit Anderen zu teilen. 📡\nMit \"Reaktionen\" kannst du außerdem schnell deine Gefühle über Notizen anderer Benutzer zum Ausdruck bringen. 👍\nLass uns eine neue Welt erforschen! 🚀"
 monthAndDay: "{day}/{month}"
 search: "Suchen"
@@ -49,6 +50,7 @@ copyUsername: "Benutzernamen kopieren"
 searchUser: "Benutzersuche"
 reply: "Antworten"
 loadMore: "Mehr anzeigen"
+showMore: "Mehr anzeigen"
 youGotNewFollower: "Du hast einen neuen Follower"
 receiveFollowRequest: "Follow-Anfrage erhalten"
 followRequestAccepted: "Follow-Anfrage akzeptiert"
@@ -182,7 +184,7 @@ clearCachedFiles: "Cache leeren"
 clearCachedFilesConfirm: "Sollen alle im Cache gespeicherten Dateien von anderen Instanzen wirklich gelöscht werden?"
 blockedInstances: "Blockierte Instanzen"
 blockedInstancesDescription: "Gib den Hostnamen der Instanz an, die blockiert werden soll. Blockierte Instanzen können nicht mehr mit dieser kommunizieren."
-muteAndBlock: "Stummgeschaltet / Blockiert"
+muteAndBlock: "Stummschaltungen / Blockierungen"
 mutedUsers: "Stummgeschaltete Benutzer"
 blockedUsers: "Blockierte Benutzer"
 noUsers: "Keine Benutzer"
@@ -243,7 +245,7 @@ nUsersRead: "Von {n} gelesen"
 agreeTo: "Ich stimme {0} zu"
 tos: "Nutzungsbedingungen"
 start: "Anfangen"
-home: "Home"
+home: "Startseite"
 remoteUserCaution: "Diese Informationen sind möglicherweise veraltet, da der Benutzer von einer anderen Instanz stammt."
 activity: "Aktivität"
 images: "Bilder"
@@ -316,7 +318,7 @@ enableRegistration: "Registration neuer Benutzer erlauben"
 invite: "Einladen"
 proxyRemoteFiles: "Dateien anderer Instanzen durch Proxy leiten"
 proxyRemoteFilesDescription: "Wenn diese Einstellung aktiviert ist, dann werden Dateien von anderen Instanzen, welche entweder nicht lokal gespeichert sind oder durch Überschreiten des Speicherlimits gelöscht wurden, durch einen Proxy geleitet. Hierbei wird auch ein Vorschaubild generiert. \n Dies hat keinen Effekt auf den Speicherplatz des Servers."
-driveCapacityPerLocalAccount: "Drivekapazität pro lokales Benutzerkonto"
+driveCapacityPerLocalAccount: "Drive-Kapazität pro lokales Benutzerkonto"
 driveCapacityPerRemoteAccount: "Drive-Kapazität pro Benutzer anderer Instanzen"
 inMb: "In Megabytes"
 iconUrl: "Icon-URL"
@@ -491,7 +493,7 @@ showFixedPostForm: "Bereich zum Schreiben neuer Notizen am Anfang der Chronik an
 newNoteRecived: "Es gibt neue Notizen"
 sounds: "Töne"
 listen: "Anhören"
-none: "Keine"
+none: "Nichts"
 showInPage: "In Seite anzeigen"
 popout: "Pop-Up"
 volume: "Lautstärke"
@@ -536,7 +538,7 @@ invisibleNote: "Private Notiz"
 enableInfiniteScroll: "Automatisch mehr Notizen laden"
 visibility: "Sichtbarkeit"
 poll: "Umfrage"
-useCw: "Inhalt verstecken"
+useCw: "Inhalt verdecken"
 enablePlayer: "Video-Player öffnen"
 disablePlayer: "Video-Player schließen"
 expandTweet: "Tweet ausklappen"
@@ -562,7 +564,7 @@ enableAll: "Alle aktivieren"
 disableAll: "Alle deaktivieren"
 tokenRequested: "Benutzerkontozugriff gewähren"
 pluginTokenRequestedDescription: "Dieses Plugin wird die hier konfigurierten Berechtigungen verwenden können."
-notificationType: "Benachrichtigungstyp"
+notificationType: "Benachrichtigungsart"
 edit: "Bearbeiten"
 useStarForReactionFallback: "Verwende ★ falls das Reaktions-Emoji unbekannt ist"
 emailConfig: "Email-Server Konfiguration"
@@ -625,7 +627,7 @@ createNew: "Neu erstellen"
 optional: "Optional"
 createNewClip: "Neuen Clip erstellen"
 public: "Öffentlich"
-i18nInfo: "Misskey wird durch freiwillige Helfer in viele verschiedene Sprachen übersetzt. Unter {link} kannst du mithelfen."
+i18nInfo: "Misskey wird durch freiwillige Helfer in viele verschiedene Sprachen übersetzt. Auf {link} kannst du mithelfen."
 manageAccessTokens: "Zugriffstoken verwalten"
 accountInfo: "Benutzerkonto-Informationen"
 notesCount: "Anzahl von Notizen"
@@ -669,7 +671,12 @@ left: "Links"
 center: "Mitte"
 wide: "Breit"
 narrow: "Schmal"
-reloadToApplySetting: "Einstellungen treten nach einer Aktualisierung der Seite in Kraft. Jetzt aktualisieren?"
+reloadToApplySetting: "Diese Einstellung tritt nach einer Aktualisierung der Seite in Kraft. Jetzt aktualisieren?"
+showTitlebar: "Titelleiste anzeigen"
+clearCache: "Cache leeren"
+onlineUsersCount: "{n} Benutzer sind online"
+nUsers: "{n} Benutzer"
+nNotes: "{n} Notizen"
 _aboutMisskey:
  about: "Misskey ist Open-Source-Software die von syuilo seit 2014 entwickelt wird."
  contributors: "Hauptmitwirkende"
@@ -692,7 +699,7 @@ _mfm:
  hashtag: "Hashtag"
  hashtagDescription: "Mit einer Raute und Text kann ein Hashtag angegeben werden."
  url: "URL"
-  urlDescription: "URLs können angezeigt werden."
+  urlDescription: "Zeigt URLs an."
  link: "Link"
  linkDescription: "Ein spezifizierter Textabschnitt kann als URL angezeigt werden."
  bold: "Fett"
@@ -731,6 +738,16 @@ _mfm:
  twitchDescription: "Verleiht eine sehr stark zuckende Animation."
  spin: "Animation (Rotieren)"
  spinDescription: "Verleiht eine rotierende Animation."
+  x2: "Groß"
+  x2Description: "Lässt Inhalte größer angezeigt werden."
+  x3: "Sehr groß"
+  x3Description: "Lässt Inhalte noch größer angezeigt werden."
+  x4: "Am größten"
+  x4Description: "Lässt Inhalte noch größer als größer als groß angezeigt werden."
+  blur: "Weichzeichner"
+  blurDescription: "Inhalte durch Weihzeichnung verschwimmen lassen. Durch das Bewegen des Mauszeigers auf den Inhalt wird er klar angezeigt."
+  font: "Schriftart"
+  fontDescription: "Setzt die Schriftart des Inhaltes fest."
 _reversi:
  reversi: "Reversi"
  gameSettings: "Spieleinstellungen"
@@ -815,7 +832,7 @@ _theme:
  refConst: "Konstante referenzieren"
  key: "Schlüssel"
  func: "Funktionen"
-  funcKind: "Funktionstyp"
+  funcKind: "Funktionsart"
  argument: "Parameter"
  basedProp: "Referenzierte Eigenschaft"
  alpha: "Transparenz"
@@ -852,9 +869,9 @@ _theme:
    infoFg: "Text von Informationen"
    infoWarnBg: "Hintergrund von Warnungen"
    infoWarnFg: "Text von Informationen"
-    cwBg: "Hintergrund von versteckten Inhalten"
-    cwFg: "Text von versteckten Inhalten"
-    cwHoverBg: "Hintergrund von versteckten Inhalten (Mouseover)"
+    cwBg: "Hintergrund von verdeckten Inhalten"
+    cwFg: "Text von verdeckten Inhalten"
+    cwHoverBg: "Hintergrund von verdeckten Inhalten (Mouseover)"
    toastBg: "Hintergrund von Benachrichtigungen"
    toastFg: "Text von Benachrichtigungen"
    buttonBg: "Hintergrund von Schaltflächen"
@@ -991,6 +1008,8 @@ _widgets:
  postForm: "Neue Notiz anfertigen"
  slideshow: "Diashow"
  button: "Knopf"
+  onlineUsers: "Benutzer die Online sind"
+  serverMetric: "Servermetriken"
 _cw:
  hide: "Ausblenden"
  show: "Mehr anzeigen"
@@ -1100,7 +1119,7 @@ _rooms:
  clearConfirm: "Möchtest du wirklich alle Möbel entfernen?"
  leaveConfirm: "Es gibt ungespeicherte Änderungen. Möchtest du wirklich gehen?"
  chooseImage: "Bild auswählen"
-  roomType: "Raumtyp"
+  roomType: "Raumart"
  carpetColor: "Teppichfarbe"
  _roomType:
    default: "Standard"
@@ -1480,7 +1499,7 @@ _deck:
  swapRight: "Nach rechts verschieben"
  swapUp: "Nach oben verschieben"
  swapDown: "Nach unten verschieben"
-  stackLeft: "Nach links stapeln"
+  stackLeft: "Auf linke Spalte stapeln"
  popRight: "Nach rechts vom Stapel nehmen"
  _columns:
    main: "Hauptspalte"
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1,5 +1,6 @@
 ---
 _lang_: "English"
+headlineMisskey: "Network connected by notes"
 introMisskey: "Welcome! Misskey is an open source, and also a decentralized microblogging service.\nCreate \"notes\" to share what is happening now, or to share it with everyone around you 📡\nWith \"reactions\", you can also quickly express your feelings about everyone's notes 👍\nLet's explore a new world 🚀"
 monthAndDay: "{month}/{day}"
 search: "Search"
@@ -49,6 +50,7 @@ copyUsername: "Copy username"
 searchUser: "User search"
 reply: "Reply"
 loadMore: "Load more"
+showMore: "Load more"
 youGotNewFollower: "Followed you"
 receiveFollowRequest: "Follow request received"
 followRequestAccepted: "Follow request accepted"
@@ -66,7 +68,7 @@ exportRequested: "You have requested an export. This may take a while. After the
 importRequested: "You requested an import. This may take a while."
 lists: "Lists"
 noLists: "You don't have any lists"
-note: "Notes"
+note: "Note"
 notes: "Notes"
 following: "Following"
 followers: "Followers"
@@ -77,7 +79,7 @@ error: "Error"
 somethingHappened: "An error occurred"
 retry: "Retry"
 pageLoadError: "Failed to load page"
-pageLoadErrorDescription: "This is normally caused by network errors or the browser's cache. Try clearung the cache and then try again after waiting a little while."
+pageLoadErrorDescription: "This is normally caused by network errors or the browser's cache. Try clearing the cache and then try again after waiting a little while."
 enterListName: "List name"
 privacy: "Privacy"
 makeFollowManuallyApprove: "Follow requests require approval"
@@ -251,7 +253,7 @@ birthday: "Birthday"
 yearsOld: "{age} years old"
 registeredDate: "Joined on"
 location: "Location"
-theme: "Theme"
+theme: "Themes"
 themeForLightMode: "Theme to use in Light Mode"
 themeForDarkMode: "Theme to use in Dark Mode"
 light: "Light"
@@ -669,7 +671,12 @@ left: "Left"
 center: "Center"
 wide: "Wide"
 narrow: "Narrow"
-reloadToApplySetting: "Settings will be applied upon page reload. Reload now?"
+reloadToApplySetting: "This setting will be applied upon page reload. Reload now?"
+showTitlebar: "Show title bar"
+clearCache: "Clear cache"
+onlineUsersCount: "{n} people are online"
+nUsers: "{n} Users"
+nNotes: "{n} Notes"
 _aboutMisskey:
  about: "Misskey is open-source software being developed by syuilo since 2014."
  contributors: "Main contributors"
@@ -731,6 +738,16 @@ _mfm:
  twitchDescription: "Infuses a strongly twitching animation."
  spin: "Animation (Spin)"
  spinDescription: "Infuses a spinning animation."
+  x2: "Big"
+  x2Description: "Displays content bigger."
+  x3: "Very big"
+  x3Description: "Displays content even bigger."
+  x4: "Extremely big"
+  x4Description: "Displays content even bigger than bigger than big."
+  blur: "Blur"
+  blurDescription: "Content can be blurred via this effect. It will be clearly displayed by hovering your cursor above it."
+  font: "Font"
+  fontDescription: "Sets the font to display contents in."
 _reversi:
  reversi: "Reversi"
  gameSettings: "Game settings"
@@ -991,6 +1008,8 @@ _widgets:
  postForm: "Compose a note"
  slideshow: "Slideshow"
  button: "Button"
+  onlineUsers: "Online users"
+  serverMetric: "Server metrics"
 _cw:
  hide: "Hide"
  show: "Load more"
@@ -1480,7 +1499,7 @@ _deck:
  swapRight: "Swap to right"
  swapUp: "Swap with above"
  swapDown: "Swap with below"
-  stackLeft: "Stack on the left"
+  stackLeft: "Stack on left column"
  popRight: "Pop to the right"
  _columns:
    main: "Main"
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -49,6 +49,7 @@ copyUsername: "Copiar nombre de usuario"
 searchUser: "Búsqueda de usuarios"
 reply: "Responder"
 loadMore: "Ver más"
+showMore: "Ver más"
 youGotNewFollower: "te ha seguido"
 receiveFollowRequest: "Recibiste una solicitud de seguimiento"
 followRequestAccepted: "La solicitud de seguimiento fue aceptada"
@@ -646,6 +647,7 @@ driveUsage: "Uso del drive"
 noCrawle: "Rechazar indexación del crawler"
 noCrawleDescription: "Pedir a los motores de búsqueda que no indexen tu perfil, notas, páginas, etc."
 clips: "Clip"
+clearCache: "Limpiar caché"
 _mfm:
  cheatSheet: "Hoja de referencia de MFM"
  intro: "MFM es un lenguaje de marcado dedicado que se puede usar en varios lugares dentro de Misskey. Aquí puede ver una lista de sintaxis disponibles en MFM."
@@ -663,6 +665,7 @@ _mfm:
  search: "Buscar"
  flip: "Echar de un capirotazo"
  flipDescription: "Voltea el contenido hacia arriba / abajo o hacia la izquierda / derecha."
+  font: "Fuente"
 _reversi:
  reversi: "Reversi"
  gameSettings: "Configuración del juego"
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -46,6 +46,7 @@ copyUsername: "Copier le nom d’utilisateur·rice"
 searchUser: "Chercher un·e utilisateur·rice"
 reply: "Répondre"
 loadMore: "Afficher plus …"
+showMore: "Afficher plus …"
 youGotNewFollower: "Vous suit"
 receiveFollowRequest: "Demande d’abonnement reçue"
 followRequestAccepted: "La demande d’abonnement a été acceptée"
@@ -577,6 +578,7 @@ fileIdOrUrl: "ID du fichier ou URL"
 chatOpenBehavior: "Comportement de la fenêtre de discussion lors de son ouverture"
 random: "Aléatoire"
 public: "Public"
+clearCache: "Vider le cache"
 _mfm:
  mention: "Mentionner"
  hashtag: "Hashtags"
@@ -585,6 +587,7 @@ _mfm:
  quote: "Citer"
  emoji: "Émojis personnalisés"
  search: "Rechercher"
+  font: "Police de caractères"
 _reversi:
  total: "Total"
 _serverDisconnectedBehavior:
--- a/locales/ht-HT.yml
+++ b/locales/ht-HT.yml
@@ -0,0 +1 @@
+---
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -0,0 +1,207 @@
+---
+_lang_: "Bahasa Jepang"
+monthAndDay: "{day} {month}"
+search: "Pencarian"
+notifications: "Notifikasi"
+username: "Nama Pengguna"
+password: "Kata sandi"
+ok: "OK"
+gotIt: "Saya mengerti"
+cancel: "Batalkan"
+enterUsername: "Masukkan nama pengguna"
+renotedBy: "direnote oleh {user}"
+noNotes: "Tidak ada notes"
+noNotifications: "Tidak ada notifikasi"
+settings: "Pengaturan"
+basicSettings: "Pengaturan umum"
+otherSettings: "Pengaturan lainnya"
+openInWindow: "Buka di jendela"
+profile: "Profil"
+timeline: "Linimasa"
+noAccountDescription: "Pengguna ini belum menulis bio"
+login: "Masuk"
+loggingIn: "Sedang masuk"
+logout: "Keluar"
+signup: "Daftar"
+uploading: "Sedang mengunggah"
+save: "Simpan"
+users: "Pengguna"
+addUser: "Tambah pengguna"
+favorite: "Favorit"
+favorites: "Favorit"
+unfavorite: "Hapus favorit"
+favorited: "Ditambahkan ke favorit"
+alreadyFavorited: "Telah ditambahkan ke favorit"
+cantFavorite: "Tidak dapat menambahkan ke favorit"
+pin: "Sematkan ke profil"
+unpin: "Lepas sematan dari profil"
+copyContent: "Salin konten"
+copyLink: "Salin tautan"
+delete: "Hapus"
+deleteAndEdit: "Hapus dan sunting"
+addToList: "Tambahkan ke daftar"
+sendMessage: "Kirim pesan"
+copyUsername: "Salin nama pengguna"
+searchUser: "Cari pengguna"
+reply: "Balas"
+cantReRenote: "Renote tidak dapat direnote"
+quote: "Kutip"
+pinnedNote: "Note yang disematkan"
+you: "Anda"
+clickToShow: "Klik untuk melihat"
+sensitive: "Konten sensitif"
+add: "Tambahkan"
+reaction: "Reaksi"
+reactionSettingDescription: "Masukkan reaksi favorit yang ingin anda sematkan pada bilah reaksi"
+reactionSettingDescription2: "Geser untuk memindah urutkan, klik untuk menghapus, tekan \"+\" untuk menambahkan"
+rememberNoteVisibility: "Ingat pengaturan visibilitas note"
+attachCancel: "Hapus lampiran"
+markAsSensitive: "Tandai sebagai konten sensitif"
+unmarkAsSensitive: "Hapus tanda konten sensitif"
+enterFileName: "Masukkan nama berkas"
+mute: "Bisukan"
+unmute: "Hapus bisukan"
+block: "Blokir"
+unblock: "Buka blokir"
+suspend: "Bekukan"
+unsuspend: "Buka pembekuan"
+blockConfirm: "Apakah anda yakin ingin memblokir akun ini?"
+unblockConfirm: "Apakah anda yakin ingin membuka blokir akun ini?"
+suspendConfirm: "Apakah anda yakin ingin membekukan akun ini?"
+unsuspendConfirm: "Apakah anda yakin ingin membuka pembekuan akun ini?"
+selectList: "Pilih daftar"
+selectAntenna: "Pilih Antena"
+selectWidget: "Pilih gawit"
+editWidgets: "Sunting gawit"
+editWidgetsExit: "Selesai"
+customEmojis: "Emoji kustom"
+emoji: "Emoji"
+emojiName: "Nama emoji"
+emojiUrl: "URL Emoji"
+addEmoji: "Tambahkan emoji"
+settingGuide: "Pengaturan rekomendasi"
+cacheRemoteFiles: "Tembolokkan berkas remote"
+flagAsBot: "Atur akun ini sebagai Bot"
+flagAsCat: "Atur akun ini sebagai kucing"
+autoAcceptFollowed: "Setujui otomatis permintaan mengikuti dari pengguna yang anda ikuti"
+addAcount: "Tambahkan akun"
+loginFailed: "Gagal untuk masuk"
+showOnRemote: "Lihat profil asli"
+general: "Umum"
+wallpaper: "Wallpaper"
+setWallpaper: "Atur wallpaper"
+removeWallpaper: "Hapus wallpaper"
+intro: "Instalasi Misskey telah selesai! Mohon untuk membuat pengguna admin."
+done: "Selesai"
+processing: "Memproses"
+preview: "Pratinjau"
+default: "Bawaan"
+noCustomEmojis: "Tidak ada emoji kustom"
+federating: "memfederasi"
+blocked: "Diblokir"
+all: "Semua"
+subscribing: "Berlangganan"
+publishing: "Sedang menyiarkan langsung"
+notResponding: "Tidak ada respon"
+instanceFollowing: "Mengikuti instance"
+instanceFollowers: "Pengikut instance"
+instanceUsers: "Pengguna pada instance ini"
+changePassword: "Ubah kata sandi"
+security: "Keamanan"
+retypedNotMatch: "Input tidak sama"
+currentPassword: "Kata sandi saat ini"
+newPassword: "Kata sandi baru"
+newPasswordRetype: "Ulangi kata sandi baru"
+attachFile: "Lampirkan berkas"
+more: "Lagi !"
+featured: "Sorotan"
+usernameOrUserId: "Nama pengguna atau User ID"
+noSuchUser: "Pengguna tidak ditemukan"
+lookup: "Mencari"
+announcements: "Pengumuman"
+imageUrl: "URL Gambar"
+remove: "Hapus"
+removed: "Telah dihapus"
+removeAreYouSure: "Apakah anda yakin ingin menghapus \"{x}\"?"
+deleteAreYouSure: "Apakah anda yakin ingin menghapus \"{x}\"?"
+saved: "Telah disimpan"
+messaging: "Pesan"
+upload: "Unggah"
+fromDrive: "Dari Drive"
+fromUrl: "Dari URL"
+uploadFromUrl: "Unggah dari URL"
+uploadFromUrlDescription: "URL berkas yang ingin anda unggah"
+uploadFromUrlRequested: "Pengunggahan telah diminta"
+uploadFromUrlMayTakeTime: "Membutuhkan beberapa waktu hingga pengunggahan selesai"
+explore: "Jelajahi"
+games: "Permainan Misskey"
+messageRead: "Telah dibaca"
+noMoreHistory: "Tidak ada sejarah lagi"
+startMessaging: "Mulai mengirim pesan"
+nUsersRead: "Dibaca oleh {n}"
+nsfw: "Konten sensitif"
+watch: "Tonton"
+unwatch: "Batal tonton"
+accept: "Terima"
+reject: "Tolak"
+normal: "Normal"
+instanceName: "Nama instance"
+instanceDescription: "Tentang instance"
+maintainerName: "Pengelola"
+maintainerEmail: "Surel pengelola"
+tosUrl: "URL Syarat dan Ketentuan"
+thisYear: "Tahun ini"
+thisMonth: "Bulan ini"
+today: "Hari ini"
+dayX: "{day}"
+monthX: "{month}"
+yearX: "{year}"
+pages: "Halaman"
+integration: "Integrasi"
+connectSerice: "Sambungkan"
+disconnectSerice: "Putuskan"
+enableLocalTimeline: "Nyalakan linimasa lokal"
+enableGlobalTimeline: "Nyalakan linimasa global"
+registration: "Pendaftaran"
+enableRegistration: "Nyalakan pendaftaran pengguna baru"
+invite: "Undang"
+proxyRemoteFiles: "Proksi berkas remote"
+driveCapacityPerLocalAccount: "Kapasitas drive per pengguna lokal"
+driveCapacityPerRemoteAccount: "Kapasitas drive per pengguna remote"
+inMb: "dalam Megabytes"
+iconUrl: "URL Gambar ikon"
+bannerUrl: "URL Banner"
+basicInfo: "Informasi Umum"
+pinnedUsers: "Pengguna yang disematkan"
+pinnedPages: "Halaman yang disematkan"
+pinnedNotes: "Note yang disematkan"
+invites: "Undang"
+invitations: "Undang"
+smtpUser: "Nama Pengguna"
+smtpPass: "Kata sandi"
+_mfm:
+  quote: "Kutip"
+  emoji: "Emoji kustom"
+  search: "Pencarian"
+_sfx:
+  notification: "Notifikasi"
+  chat: "Pesan"
+_widgets:
+  notifications: "Notifikasi"
+  timeline: "Linimasa"
+_profile:
+  username: "Nama Pengguna"
+_exportOrImport:
+  muteList: "Bisukan"
+  blockingList: "Blokir"
+_rooms:
+  _roomType:
+    default: "Bawaan"
+_notification:
+  _types:
+    quote: "Kutip"
+    reaction: "Reaksi"
+_deck:
+  _columns:
+    notifications: "Notifikasi"
+    tl: "Linimasa"
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -0,0 +1 @@
+---
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1,5 +1,6 @@
 _lang_: "日本語"

+headlineMisskey: "ノートでつながるネットワーク"
 introMisskey: "ようこそ！Misskeyは、オープンソースの分散型マイクロブログサービスです。\n「ノート」を作成して、いま起こっていることを共有したり、あなたについて皆に発信しよう📡\n「リアクション」機能で、皆のノートに素早く反応を追加することもできます👍\n新しい世界を探検しよう🚀"
 monthAndDay: "{month}月 {day}日"
 search: "検索"
@@ -49,6 +50,7 @@ copyUsername: "ユーザー名をコピー"
 searchUser: "ユーザーを検索"
 reply: "返信"
 loadMore: "もっと見る"
+showMore: "もっと見る"
 youGotNewFollower: "フォローされました"
 receiveFollowRequest: "フォローリクエストされました"
 followRequestAccepted: "フォローが承認されました"
@@ -670,6 +672,33 @@ center: "中央"
 wide: "広い"
 narrow: "狭い"
 reloadToApplySetting: "設定はページリロード後に反映されます。今すぐリロードしますか？"
+showTitlebar: "タイトルバーを表示する"
+clearCache: "キャッシュをクリア"
+onlineUsersCount: "{n}人がオンライン"
+nUsers: "{n}ユーザー"
+nNotes: "{n}ノート"
+sendErrorReports: "エラーリポートを送信"
+sendErrorReportsDescription: "オンにすると、問題が発生したときにエラーの詳細情報がMisskeyに共有され、ソフトウェアの品質向上に役立てることができます。"
+myTheme: "マイテーマ"
+backgroundColor: "背景"
+accentColor: "アクセント"
+textColor: "文字"
+saveAs: "名前を付けて保存"
+advanced: "高度"
+value: "値"
+updatedAt: "更新日時"
+saveConfirm: "保存しますか？"
+deleteConfirm: "削除しますか？"
+invalidValue: "有効な値ではありません。"
+registry: "レジストリ"
+closeAccount: "アカウントを閉鎖する"
+
+_registry:
+  scope: "スコープ"
+  key: "キー"
+  keys: "キー"
+  domain: "ドメイン"
+  createKey: "キーを作成"

 _aboutMisskey:
  about: "Misskeyはsyuiloによって2014年から開発されている、オープンソースのソフトウェアです。"
@@ -729,11 +758,21 @@ _mfm:
  bounce: "アニメーション(バウンド)"
  bounceDescription: "ぽよんぽよん弾むようなアニメーションを与えます。"
  shake: "アニメーション(ぶるぶる)"
-  shakeDescription: "ぶるぶるするアニメーションを与えます。"
+  shakeDescription: "ぶるぶる震えるアニメーションを与えます。"
  twitch: "アニメーション(ブレ)"
  twitchDescription: "激しくブレるアニメーションを与えます。"
  spin: "アニメーション(回転)"
  spinDescription: "回転するアニメーションを与えます。"
+  x2: "大きく"
+  x2Description: "内容を大きく表示します。"
+  x3: "とても大きく"
+  x3Description: "内容をとても大きく表示します。"
+  x4: "究極に大きく"
+  x4Description: "内容を究極に大きく表示します。"
+  blur: "ぼかし"
+  blurDescription: "内容をぼかすことができます。ポインターを上に乗せるとはっきり見えるようになります。"
+  font: "フォント"
+  fontDescription: "内容のフォントを指定することができます。"

 _reversi:
  reversi: "リバーシ"
@@ -1012,6 +1051,9 @@ _widgets:
  postForm: "投稿フォーム"
  slideshow: "スライドショー"
  button: "ボタン"
+  onlineUsers: "オンラインユーザー"
+  jobQueue: "ジョブキュー"
+  serverMetric: "サーバーメトリクス"

 _cw:
  hide: "隠す"
@@ -1530,6 +1572,7 @@ _deck:
  swapDown: "下に移動"
  stackLeft: "左に重ねる"
  popRight: "右に出す"
+  profile: "プロファイル"

  _columns:
    main: "メイン"
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -49,6 +49,7 @@ copyUsername: "ユーザー名をコピー"
 searchUser: "ユーザーを検索"
 reply: "返す"
 loadMore: "もっとあるやろ！"
+showMore: "もっとあるやろ！"
 youGotNewFollower: "フォローされたで"
 receiveFollowRequest: "フォローリクエストされたで"
 followRequestAccepted: "フォローが承認されたで"
@@ -454,6 +455,7 @@ remote: "リモート"
 smtpHost: "ホスト"
 smtpUser: "ユーザー名"
 smtpPass: "パスワード"
+clearCache: "キャッシュにさいなら"
 _mfm:
  mention: "メンション"
  quote: "引用"
--- a/locales/kab-KAB.yml
+++ b/locales/kab-KAB.yml
@@ -13,6 +13,7 @@ delete: "Kkes"
 addToList: "Rnu ɣer tebdart"
 reply: "Err"
 loadMore: "Wali ugar"
+showMore: "Wali ugar"
 youGotNewFollower: "Yeṭṭafaṛ-ik·em-id"
 mention: "Bder"
 import: "Kter"
@@ -38,6 +39,7 @@ smtpPass: "Awal uffir"
 _mfm:
  mention: "Bder"
  search: "Nadi"
+  font: "Tasefsit"
 _theme:
  keys:
    mention: "Bder"
--- a/locales/kn-IN.yml
+++ b/locales/kn-IN.yml
@@ -40,6 +40,7 @@ sendMessage: "ಸಂದೇಶ ಕಳುಹಿಸು"
 copyUsername: "ಬಳಕೆಹೆಸರು ನಕಲಿಸು"
 reply: "ಉತ್ತರಿಸು"
 loadMore: "ಇನ್ನಷ್ಟು ನೋಡು"
+showMore: "ಇನ್ನಷ್ಟು ನೋಡು"
 youGotNewFollower: "ಹಿಂಬಾಲಿಸಿದರು"
 receiveFollowRequest: "ಹಿಂಬಾಲನೆ ವಿನಂತಿ ಬಂದಿದೆ"
 followRequestAccepted: "ಹಿಂಬಾಲನೆ ವಿನಂತಿ ಸ್ವೀಕರಿಸಲಾಯಿತು"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -46,6 +46,7 @@ copyUsername: "유저명 복사"
 searchUser: "사용자 검색"
 reply: "답글"
 loadMore: "더 보기"
+showMore: "더 보기"
 youGotNewFollower: "새로운 팔로워가 있습니다"
 receiveFollowRequest: "새로운 팔로우 요청이 있습니다"
 followRequestAccepted: "팔로우가 수락되었습니다"
@@ -612,6 +613,7 @@ lockedAccountInfo: "팔로우를 승인으로 승인받더라도 노트의 공
 alwaysMarkSensitive: "미디어를 항상 열람 주의로 설정"
 emailVerified: "메일 주소가 확인되었습니다."
 clips: "클립"
+clearCache: "캐시 비우기"
 _nsfw:
  ignore: "열람 주의 미디어 항상 표시"
 _mfm:
@@ -642,6 +644,7 @@ _mfm:
  flip: "플립"
  flipDescription: "내용을 상하 또는 좌우로 반전시킵니다."
  jump: "애니메이션(점프)"
+  font: "폰트"
 _reversi:
  reversi: "리버시"
  gameSettings: "대국 설정"
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1,23 +1,608 @@
 ---
 _lang_: "język polski"
+headlineMisskey: "Sieć połączona wpisami"
+monthAndDay: "{month}-{day}"
 search: "Szukaj"
 notifications: "Powiadomienia"
 username: "Nazwa użytkownika"
 password: "Hasło"
+fetchingAsApObject: "Pobieranie z Fediwersum…"
 ok: "OK"
 gotIt: "Rozumiem!"
 cancel: "Anuluj"
 enterUsername: "Wprowadź nazwę użytkownika"
+renotedBy: "Udostępniono przez {user}"
+noNotes: "Brak wpisów"
+noNotifications: "Brak powiadomień"
+instance: "Instancja"
+settings: "Ustawienia"
+basicSettings: "Podstawowe ustawienia"
+otherSettings: "Pozostałe ustawienia"
+openInWindow: "Otwórz w oknie"
+profile: "Profil"
+timeline: "Oś czasu"
+noAccountDescription: "Ten użytkownik nie napisał jeszcze swojej biografii."
+login: "Zaloguj się"
+loggingIn: "Logowanie"
+logout: "Wyloguj się"
+signup: "Zarejestruj się"
+uploading: "Wysyłanie"
+save: "Zapisz"
+users: "Użytkownicy"
+addUser: "Dodaj użytkownika"
+favorite: "Dodaj do ulubionych"
+favorites: "Ulubione"
+unfavorite: "Usuń z ulubionych"
+favorited: "Dodano do ulubionych."
+alreadyFavorited: "Już jest w ulubionych."
+cantFavorite: "Nie można dodać do ulubionych."
+pin: "Przypnij do profilu"
+unpin: "Odepnij z profilu"
+copyContent: "Skopiuj zawartość"
+copyLink: "Skopiuj odnośnik"
+delete: "Usuń"
+deleteAndEdit: "Usuń i edytuj"
+deleteAndEditConfirm: "Czy na pewno chcesz usunąć ten wpis i zedytować go? Utracisz wszystkie reakcje, udostępnienia i odpowiedzi do tego wpisu."
+addToList: "Dodaj do listy"
+sendMessage: "Wyślij wiadomość"
+copyUsername: "Kopiuj nazwę użytkownika"
+searchUser: "Wyszukiwanie użytkowników"
+reply: "Odpowiedz"
+loadMore: "Załaduj więcej"
+showMore: "Załaduj więcej"
+youGotNewFollower: "Zaobserwował(a) Cię"
+receiveFollowRequest: "Otrzymano prośbę o możliwość obserwacji"
+followRequestAccepted: "Zaakceptowano prośbę o możliwość obserwacji"
+mention: "Wspomnij"
+mentions: "Wspomnienia"
+directNotes: "Bezpośrednie wpisy"
+importAndExport: "Import i eksport"
+import: "Importuj"
+export: "Eksportuj"
+files: "Pliki"
+download: "Pobierz"
+lists: "Listy"
+noLists: "Nie masz żadnych list"
+note: "Wpis"
+notes: "Wpisy"
+following: "Obserwowani"
+followers: "Obserwujący"
+followsYou: "Obserwuje Cię"
+createList: "Utwórz listę"
+manageLists: "Zarządzaj listami"
+error: "Błąd"
+somethingHappened: "Coś poszło nie tak"
+retry: "Spróbuj ponownie"
+pageLoadError: "Nie udało się załadować strony"
+pageLoadErrorDescription: "Zwykle jest to spowodowane problemem z siecią lub cache przeglądarki. Spróbuj wyczyścić cache i sprawdź jeszcze raz za chwilę."
+enterListName: "Nazwa listy"
+privacy: "Prywatność"
+makeFollowManuallyApprove: "Prośby o możliwość obserwacji wymagają zatwierdzenia"
+defaultNoteVisibility: "Domyślna widoczność"
+follow: "Obserwowani"
+followRequest: "Poproś o możliwość obserwacji"
+followRequests: "Prośby o możliwość obserwacji"
+unfollow: "Przestań obserwować"
+followRequestPending: "Oczekująca prośba o możliwość obserwacji"
+enterEmoji: "Wprowadź emoji"
+renote: "Udostępnij"
+unrenote: "Cofnij udostępnienie"
+renoted: "Udostępniono."
+cantRenote: "Ten wpis nie może zostać udostępniony."
+cantReRenote: "Udostępnienie nie może zostać udostępnione."
+quote: "Cytuj"
+pinnedNote: "Przypięty wpis"
+you: "Ty"
+clickToShow: "Kliknij, aby wyświetlić"
+sensitive: "NSFW"
+add: "Dodaj"
+reaction: "Reakcja"
+reactionSettingDescription: "Przypisz swoje ulubione reakcje, które chcesz przypiąć w wyborze reakcji."
+reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć, naciśnij „+” aby dodać"
+rememberNoteVisibility: "Zapamiętuj ustawienia widoczności wpisu"
+attachCancel: "Usuń załącznik"
+markAsSensitive: "Oznacz jako NSFW"
+unmarkAsSensitive: "Cofnij NSFW"
+enterFileName: "Wprowadź nazwę pliku"
+mute: "Wycisz"
+unmute: "Cofnij wyciszenie"
+block: "Zablokuj"
+unblock: "Odblokuj"
+suspend: "Zawieś"
+unsuspend: "Cofnij zawieszenie"
+blockConfirm: "Czy na pewno chcesz zablokować to konto?"
+unblockConfirm: "Czy na pewno chcesz odblokować to konto?"
+suspendConfirm: "Czy na pewno chcesz zawiesić to konto?"
+unsuspendConfirm: "Czy na pewno chcesz cofnąć zawieszenie tego konta?"
+selectList: "Wybierz listę"
+selectAntenna: "Wybierz Antennę"
+selectWidget: "Wybierz widżet"
+editWidgets: "Edytuj widżet"
+editWidgetsExit: "Gotowe"
+customEmojis: "Niestandardowe emoji"
+emoji: "Emoji"
+emojiName: "Nazwa emoji"
+emojiUrl: "Adres URL emoji"
+addEmoji: "Dodaj emoji"
+settingGuide: "Proponowana konfiguracja"
+cacheRemoteFiles: "Przechowuj zdalne pliki w pamięci podręcznej"
+flagAsBot: "To konto jest botem"
+flagAsCat: "To konto jest kotem"
+flagAsCatDescription: "Przełącz tę opcję, aby konto było oznaczone jako kot."
+autoAcceptFollowed: "Automatycznie przyjmuj prośby o możliwość obserwacji od użytkowników, których obserwujesz"
+addAcount: "Dodaj konto"
+loginFailed: "Nie udało się zalogować"
+showOnRemote: "Zobacz na zdalnej instancji"
+general: "Ogólne"
+wallpaper: "Tapeta"
+setWallpaper: "Ustaw tapetę"
+removeWallpaper: "Usuń tapetę"
+searchWith: "Szukaj: {q}"
+youHaveNoLists: "Nie masz żadnej listy"
+followConfirm: "Czy na pewno chcesz zaobserwować {name}?"
+proxyAccount: "Konto proxy"
+host: "Host"
+selectUser: "Wybierz użytkownika"
+recipient: "Odbiorca"
+annotation: "Komentarze"
+federation: "Federacja"
+instances: "Instancja"
+registeredAt: "Zarejestrowano"
+latestRequestSentAt: "Ostatnie żądanie wysłano o"
+latestRequestReceivedAt: "Ostatnie żądanie otrzymano o"
+latestStatus: "Najnowszy status"
+storageUsage: "Użycie pamięci"
+charts: "Wykresy"
+perHour: "co godzinę"
+perDay: "co dzień"
+stopActivityDelivery: "Przestań przesyłać aktywności"
+blockThisInstance: "Zablokuj tę instancję"
+operations: "Działania"
+software: "Oprogramowanie"
+version: "Wersja"
+metadata: "Metadane"
+withNFiles: "{n} plik(i)"
+monitor: "Monitor"
+jobQueue: "Kolejka zadań"
+cpuAndMemory: "CPU i pamięć"
+network: "Sieć"
+disk: "Dysk"
+instanceInfo: "Informacje o instancji"
+statistics: "Statystyki"
+clearQueue: "Wyczyść kolejkę"
+clearQueueConfirmTitle: "Czy na pewno chcesz wyczyścić kolejkę?"
+done: "Gotowe"
+processing: "Przetwarzanie"
+federating: "Federowanie"
+suspended: "Zawieszono"
+all: "Wszystkie"
+subscribing: "Subskrybowanie"
+publishing: "Publikowanie"
+notResponding: "Nie odpowiada"
+instanceFollowing: "Obserwowani na instancji"
+instanceFollowers: "Obserwujący na instancji"
+instanceUsers: "Użytkownicy tej instancji"
+more: "Więcej!"
+usernameOrUserId: "Nazwa lub id użytkownika"
+noSuchUser: "Nie znaleziono użytkownika"
+announcements: "Ogłoszenia"
+imageUrl: "Adres URL obrazka"
+remove: "Usuń"
+removed: "Pomyślnie usunięto"
+removeAreYouSure: "Czy na pewno chcesz usunąć „{x}”?"
+deleteAreYouSure: "Czy na pewno chcesz usunąć „{x}”?"
+resetAreYouSure: "Czy na pewno chcesz zresetować?"
+saved: "Zapisano"
+messaging: "Wiadomości"
+upload: "Wyślij"
+fromDrive: "Z dysku"
+fromUrl: "Z adresu URL"
+uploadFromUrl: "Wyślij z adresu URL"
+uploadFromUrlDescription: "Adres URL pliku, który chcesz wysłać"
+uploadFromUrlRequested: "Zażądano wysłania"
+explore: "Eksploruj"
+games: "Gry Misskey"
+messageRead: "Przeczytano"
+noMoreHistory: "Nie ma dalszej historii"
+startMessaging: "Rozpocznij czat"
+nUsersRead: "przeczytano przez {n}"
+agreeTo: "Wyrażam zgodę na {0}"
+tos: "Regulamin"
+start: "Rozpocznij"
+home: "Strona główna"
+activity: "Aktywność"
+images: "Zdjęcia"
+birthday: "Data urodzenia"
+yearsOld: "{age} lat"
+registeredDate: "Zarejestrowano"
+location: "Lokalizacja"
+theme: "Motywy"
+themeForLightMode: "Motyw używany w trybie jasnym"
+themeForDarkMode: "Motyw używany w trybie ciemnym"
+light: "Jasny"
+dark: "Ciemny"
+lightThemes: "Jasny motyw"
+darkThemes: "Ciemny motyw"
+syncDeviceDarkMode: "Synchronizuj ciemny motyw z ustawieniami urządzenia"
+drive: "Dysk"
+fileName: "Nazwa pliku"
+selectFile: "Wybierz plik"
+selectFiles: "Wybierz pliki"
+selectFolder: "Wybierz folder"
+selectFolders: "Wybierz foldery"
+renameFile: "Zmień nazwę pliku"
+avatar: "Awatar"
+banner: "Baner"
+nsfw: "NSFW"
+accept: "Akceptuj"
+reject: "Odrzuć"
+normal: "Normalny"
+thisYear: "Rok"
+thisMonth: "Miesiąc"
+today: "Dziś"
+pages: "Strony"
+integration: "Integracja"
+connectSerice: "Połącz"
+disconnectSerice: "Rozłącz"
+registration: "Zarejestruj się"
+invite: "Zaproś"
+inMb: "W megabajtach"
+iconUrl: "Adres URL ikony"
+bannerUrl: "Adres URL banera"
+basicInfo: "Podstawowe informacje"
+pinnedUsers: "Przypięty użytkownik"
+pinnedPages: "Przypięte strony"
+pinnedNotes: "Przypięty wpis"
+hcaptcha: "hCaptcha"
+enableHcaptcha: "Włącz hCaptcha"
+hcaptchaSiteKey: "Klucz strony"
+hcaptchaSecretKey: "Tajny klucz"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "Włącz reCAPTCHA"
+recaptchaSiteKey: "Klucz strony"
+recaptchaSecretKey: "Tajny klucz"
+antennas: "Anteny"
+manageAntennas: "Zarządzaj Antenami"
+name: "Nazwa"
+antennaSource: "Źródło Anteny"
+userList: "Listy"
+about: "Informacje"
+administrator: "Admin"
+token: "Token"
+share: "Udostępnij"
+help: "Pomoc"
+close: "Zamknij"
+invites: "Zaproś"
+transfer: "Transfer"
+title: "Tytuł"
+text: "Tekst"
+retype: "Wprowadź ponownie"
+invitations: "Zaproś"
+tags: "Tagi"
+regenerate: "Wygeneruj ponownie"
+local: "Lokalne"
+total: "Łącznie"
+weekOverWeekChanges: "Cotygodniowo"
+dayOverDayChanges: "Codziennie"
+numberOfDays: "Liczba dni"
+listen: "Słuchaj"
+none: "Brak"
+volume: "Głośność"
+details: "Szczegóły"
+state: "Stan"
+sort: "Sortuj"
+ascendingOrder: "Rosnąco"
+descendingOrder: "Malejąco"
+output: "Wyjście"
+divider: "Rozdzielacz"
+rooms: "Pokój"
+relays: "Przekaźniki"
+description: "Opis"
+author: "Autor"
+manage: "Zarządzanie"
+deck: "Tablica"
+height: "Wysokość"
+permission: "Uprawnienia"
+edit: "Edytuj"
+email: "Adres e-mail"
+smtpHost: "Host"
+smtpPort: "Port"
 smtpUser: "Nazwa użytkownika"
 smtpPass: "Hasło"
+display: "Wyświetlanie"
+copy: "Kopiuj"
+overview: "Przegląd"
+logs: "Dzienniki"
+delayed: "Opóźnione"
+create: "Utwórz"
+other: "Inne"
+behavior: "Zachowanie"
+abuseReports: "Zgłoszenia"
+reportAbuse: "Zgłoś"
+send: "Wyślij"
+optional: "Nieobowiązkowe"
+yes: "Tak"
+no: "Nie"
+notSet: "Nie ustawiono"
+contact: "Kontakt"
+duplicate: "Duplikuj"
+center: "Wyśsrodkuj"
+wide: "Szerokie"
+narrow: "Wąskie"
+_aboutMisskey:
+  patrons: "Wspierający"
 _mfm:
+  mention: "Wspomnij"
+  url: "Adres URL"
+  link: "Odnośnik"
+  bold: "Pogrubienie"
+  quote: "Cytuj"
+  emoji: "Niestandardowe emoji"
  search: "Szukaj"
+  flip: "Odwróć"
+  font: "Czcionka"
+_reversi:
+  rules: "Zasady"
+  surrender: "Poddaj się"
+  total: "Łącznie"
+  ended: "Zakończono"
+  playing: "W trakcie gry"
+_channel:
+  featured: "Na czasie"
+  owned: "Własny"
+_sidebar:
+  full: "Pełne"
+  icon: "Awatar"
+  hide: "Ukryj"
+_wordMute:
+  soft: "Łagodny"
+  hard: "Twardy"
+_theme:
+  base: "Podstawowy"
+  constant: "Stała"
+  key: "Klucz"
+  func: "Funkcje"
+  argument: "Argument"
+  darken: "Ściemnij"
+  lighten: "Rozjaśnij"
+  keys:
+    bg: "Tło"
+    fg: "Tekst"
+    panel: "Panel"
+    link: "Odnośnik"
+    mention: "Wspomnij"
+    renote: "Udostępnij"
+    divider: "Rozdzielacz"
+    badge: "Odznaka"
 _sfx:
+  note: "Wpisy"
  notification: "Powiadomienia"
+  chat: "Wiadomości"
+_ago:
+  unknown: "Nieznane"
+  future: "W przyszłości"
+  justNow: "Przed chwilą"
+  yearsAgo: "{n} lat temu"
+_permissions:
+  "write:votes": "Głosowanie w ankiecie"
+_weekday:
+  sunday: "Niedziela"
+  monday: "Poniedziałek"
+  tuesday: "Wtorek"
+  wednesday: "Środa"
+  thursday: "Czwartek"
+  friday: "Piątek"
+  saturday: "Sobota"
 _widgets:
+  memo: "Przypięte notatki"
  notifications: "Powiadomienia"
+  timeline: "Oś czasu"
+  trends: "Na czasie"
+  clock: "Zegar"
+  activity: "Aktywność"
+  photos: "Zdjęcia"
+  federation: "Federacja"
+  button: "Przycisk"
+_cw:
+  hide: "Ukryj"
+  show: "Załaduj więcej"
+_poll:
+  expiration: "Ankieta kończy się"
+  infinite: "Nigdy"
+  deadlineDate: "Data zakończenia"
+  duration: "Czas trwania"
+  votesCount: "{} głosów"
+  vote: "Głosowanie w ankiecie"
+  voted: "Zagłosowano"
+  closed: "Zakończono"
+_visibility:
+  home: "Strona główna"
+  followers: "Obserwujący"
 _profile:
+  name: "Nazwa"
  username: "Nazwa użytkownika"
+  description: "Biografia"
+  metadataLabel: "Etykieta"
+  metadataContent: "Treść"
+_exportOrImport:
+  followingList: "Obserwowani"
+  muteList: "Wycisz"
+  blockingList: "Zablokuj"
+  userLists: "Listy"
+_timelines:
+  home: "Strona główna"
+  local: "Lokalne"
+_rooms:
+  translate: "Przenieś"
+  rotate: "Obróć"
+  exit: "Wróć"
+  remove: "Usuń"
+  clear: "Usuń wszystkie"
+  carpetColor: "Kolor dywanu"
+  _roomType:
+    washitsu: "W japońskim stylu"
+  _furnitures:
+    bed: "Łóżko"
+    desk: "Biurko"
+    chair: "Krzesło"
+    fan: "Chłodzenie"
+    pencil: "Ołówek"
+    pudding: "Budyń"
+    book2: "Książka 2"
+    piano: "Fortepian"
+    monitor: "Monitor"
+    photoframe: "Ramka do zdjęć"
+    tv: "Telewizor"
+    sofa: "Kanapa"
+    bin: "Kosz"
+    banknote: "Banknot"
+_pages:
+  like: "Lubię"
+  featured: "Wyróżnione"
+  variables: "Zmienne"
+  title: "Tytuł"
+  font: "Czcionka"
+  fontSerif: "Szeryfowa"
+  inputBlocks: "Wejście"
+  specialBlocks: "Specjalne"
+  blocks:
+    text: "Tekst"
+    image: "Zdjęcia"
+    button: "Przycisk"
+    if: "Jeżeli"
+    _if:
+      variable: "Zmienna"
+    _post:
+      text: "Treść"
+    _textInput:
+      name: "Nazwa zmiennej"
+      text: "Tytuł"
+    _textareaInput:
+      name: "Nazwa zmiennej"
+      text: "Tytuł"
+    _numberInput:
+      name: "Nazwa zmiennej"
+      text: "Tytuł"
+    _canvas:
+      height: "Wysokość"
+    _switch:
+      name: "Nazwa zmiennej"
+      text: "Tytuł"
+    _counter:
+      name: "Nazwa zmiennej"
+      text: "Tytuł"
+      inc: "Zwiększ o"
+    _button:
+      text: "Tytuł"
+      colored: "Kolorowe"
+      _action:
+        _dialog:
+          content: "Treść"
+        _pushEvent:
+          no-variable: "Brak"
+        _callAiScript:
+          functionName: "Nazwa funkcji"
+    radioButton: "Wybór"
+    _radioButton:
+      name: "Nazwa zmiennej"
+      title: "Tytuł"
+  script:
+    categories:
+      flow: "Kontrola przepływu"
+      operation: "Obliczanie"
+      comparison: "Porównanie"
+      fn: "Funkcje"
+      convert: "Transformacja"
+      list: "Listy"
+    blocks:
+      text: "Tekst"
+      _strLen:
+        arg1: "Tekst"
+      _strPick:
+        arg1: "Tekst"
+      _strReplace:
+        arg1: "Tekst"
+      _strReverse:
+        arg1: "Tekst"
+      _join:
+        arg1: "Listy"
+        arg2: "Odstęp"
+      add: "Dodaj"
+      subtract: "Odejmij"
+      multiply: "Pomnóż"
+      divide: "Podziel"
+      _round:
+        arg1: "Liczba"
+      if: "Warunek"
+      _if:
+        arg1: "Jeżeli"
+        arg2: "Jeżeli prawda"
+      not: "NIE"
+      _not:
+        arg1: "NIE"
+      _random:
+        arg1: "Prawdopodobieństwo"
+      rannum: "Losowa liczba"
+      _rannum:
+        arg1: "Minimalna wartość"
+        arg2: "Maksymalna wartość"
+      _randomPick:
+        arg1: "Listy"
+      _dailyRandom:
+        arg1: "Prawdopodobieństwo"
+      _dailyRannum:
+        arg1: "Minimalna wartość"
+        arg2: "Maksymalna wartość"
+      _dailyRandomPick:
+        arg1: "Listy"
+      _seedRandom:
+        arg1: "Ziarno"
+        arg2: "Prawdopodobieństwo"
+      _seedRannum:
+        arg1: "Ziarno"
+        arg2: "Minimalna wartość"
+        arg3: "Maksymalna wartość"
+      _seedRandomPick:
+        arg1: "Ziarno"
+        arg2: "Listy"
+      _pick:
+        arg1: "Listy"
+        arg2: "Położenie"
+      _listLen:
+        arg1: "Listy"
+      number: "Liczba"
+      _stringToNumber:
+        arg1: "Tekst"
+      _numberToString:
+        arg1: "Liczba"
+      _splitStrByLine:
+        arg1: "Tekst"
+      ref: "Zmienne"
+      fn: "Funkcje"
+      _fn:
+        arg1: "Wyjście"
+      _for:
+        arg1: "Liczba powtórzeń"
+        arg2: "Działanie"
+    types:
+      string: "Tekst"
+      number: "Liczba"
+      boolean: "Flaguj"
+      array: "Listy"
+_notification:
+  youWereFollowed: "Zaobserwował(a) Cię"
+  _types:
+    all: "Wszystkie"
+    follow: "Obserwowani"
+    mention: "Wspomnij"
+    renote: "Udostępnij"
+    quote: "Cytuj"
+    reaction: "Reakcja"
 _deck:
  _columns:
+    main: "Główna"
    notifications: "Powiadomienia"
+    tl: "Oś czasu"
+    antenna: "Anteny"
+    list: "Listy"
+    mentions: "Wspomnienia"
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -49,6 +49,7 @@ copyUsername: "Скопировать имя пользователя"
 searchUser: "Поиск людей"
 reply: "Ответить"
 loadMore: "Показать еще"
+showMore: "Показать еще"
 youGotNewFollower: "Новый подписчик"
 receiveFollowRequest: "Получен запрос на подписку"
 followRequestAccepted: "Запрос на подписку принят"
@@ -667,6 +668,12 @@ showGapBetweenNotesInTimeline: "Показывать разделитель ме
 duplicate: "Дубликат"
 left: "Влево"
 center: "По центру"
+reloadToApplySetting: "Это настройка вступает в силу при загрузке страницы. Перезагрузить сейчас?"
+showTitlebar: "Показать заголовок"
+clearCache: "Очистить кэш"
+onlineUsersCount: "Пользователей сейчас в сети: {n}"
+nUsers: "Пользователей: {n}"
+nNotes: "Заметок: {n}"
 _aboutMisskey:
  about: "Misskey — программа с открытым исходным кодом, которую разрабатывает syuilo с 2014 года."
  contributors: "Основные соавторы"
@@ -728,6 +735,7 @@ _mfm:
  twitchDescription: "Заставляет трястись как одержимого"
  spin: "Вращение"
  spinDescription: "Так можно крутить содержимое в разных направлениях."
+  font: "Шрифт"
 _reversi:
  reversi: "Реверси"
  gameSettings: "Настройки игры"
@@ -988,6 +996,7 @@ _widgets:
  postForm: "Форма отправки"
  slideshow: "Показ слайдов"
  button: "Кнопка"
+  onlineUsers: "Пользователи сейчас с сети"
 _cw:
  hide: "Спрятать"
  show: "Показать еще"
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -0,0 +1 @@
+---
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -46,6 +46,7 @@ copyUsername: "Скопіювати ім’я користувача"
 searchUser: "Пошук користувачів"
 reply: "Відповісти"
 loadMore: "Показати більше"
+showMore: "Показати більше"
 youGotNewFollower: "Новий підписник"
 receiveFollowRequest: "Отримано запит на підписку"
 followRequestAccepted: "Підписка прийнята"
@@ -611,6 +612,7 @@ useSystemFont: "Використовувати стандартний шрифт
 clips: "Добірка"
 experimentalFeatures: "Експериментальні функції"
 developer: "Розробник"
+clearCache: "Очистити кеш"
 _aboutMisskey:
  about: "Misskey - це програмне забезпечення з відкритим кодом, яке розробляє syuilo з 2014 року."
  contributors: "Головні помічники"
@@ -664,6 +666,7 @@ _mfm:
  shake: "Анімація (Shake)"
  twitch: "Анімація (Twitch)"
  spin: "Анімація (Spin)"
+  font: "Шрифт"
 _reversi:
  reversi: "Реверсі"
  gameSettings: "Налаштування гри"
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1,5 +1,6 @@
 ---
 _lang_: "中文(简体)"
+headlineMisskey: "通过帖子连接在一起的网络"
 introMisskey: "欢迎！Misskey是一个开源的、去中心化的“微博客”服务。\n通过编写「帖文」来和大家分享你的以及你周围的事情吧！📡\n通过「回应」功能，可以让你快速地对大家的帖文表达反馈👍\n来探索新的世界吧！🚀"
 monthAndDay: "{month}月 {day}日"
 search: "搜索"
@@ -49,6 +50,7 @@ copyUsername: "复制用户名"
 searchUser: "搜索用户"
 reply: "回复"
 loadMore: "查看更多"
+showMore: "查看更多"
 youGotNewFollower: "你有新的关注者"
 receiveFollowRequest: "您收到了关注请求"
 followRequestAccepted: "您的关注请求被通过了"
@@ -109,12 +111,12 @@ unmarkAsSensitive: "取消标记为敏感内容"
 enterFileName: "请输入文件名"
 mute: "屏蔽"
 unmute: "解除屏蔽"
-block: "屏蔽"
-unblock: "取消屏蔽"
+block: "拉黑"
+unblock: "取消拉黑"
 suspend: "冻结"
 unsuspend: "解除冻结"
-blockConfirm: "确定要屏蔽吗？"
-unblockConfirm: "确定要解除屏蔽吗？"
+blockConfirm: "确定要拉黑吗？"
+unblockConfirm: "确定要解除拉黑吗？"
 suspendConfirm: "要冻结吗？"
 unsuspendConfirm: "要解除冻结吗？"
 selectList: "选择列表"
@@ -183,8 +185,8 @@ clearCachedFilesConfirm: "确定要清除缓存文件？"
 blockedInstances: "被阻拦的实例"
 blockedInstancesDescription: "设定要阻拦的实例，以换行来进行分割。被阻拦的实例将无法与本实例进行交换通讯。"
 muteAndBlock: "屏蔽/拉黑"
-mutedUsers: "禁言用户"
-blockedUsers: "已屏蔽用户"
+mutedUsers: "已屏蔽用户"
+blockedUsers: "被拉黑的用户"
 noUsers: "无用户"
 editProfile: "编辑资料"
 noteDeleteConfirm: "要删除该帖子吗？"
@@ -197,7 +199,7 @@ default: "默认"
 noCustomEmojis: "没有自定义表情符号"
 noJobs: "没有任务"
 federating: "联合中"
-blocked: "已拦截"
+blocked: "已拉黑"
 suspended: "停止推流"
 all: "全部"
 subscribing: "已订阅"
@@ -670,6 +672,11 @@ center: "中央"
 wide: "宽"
 narrow: "窄"
 reloadToApplySetting: "页面刷新后设置才会生效。是否现在刷新页面？"
+showTitlebar: "显示标题栏"
+clearCache: "清除缓存"
+onlineUsersCount: "{n}人在线"
+nUsers: "{n}用户"
+nNotes: "{n}帖子"
 _aboutMisskey:
  about: "Misskey是由syuilo于2014年开发的开源软件。"
  contributors: "主要贡献者"
@@ -731,6 +738,16 @@ _mfm:
  twitchDescription: "显示强烈颤抖的动画效果。"
  spin: "动画(回转)"
  spinDescription: "显示回转的动画效果。"
+  x2: "大"
+  x2Description: "以大尺寸显示内容。"
+  x3: "非常大"
+  x3Description: "以更大尺寸显示内容。"
+  x4: "最大"
+  x4Description: "以最大尺寸显示内容。"
+  blur: "模糊"
+  blurDescription: "产生模糊效果。将鼠标指针放在上面即可将内容显示出来。"
+  font: "字体"
+  fontDescription: "可以设置内容所使用的字体。"
 _reversi:
  reversi: "黑白棋"
  gameSettings: "对局设置"
@@ -991,6 +1008,8 @@ _widgets:
  postForm: "投稿窗口"
  slideshow: "幻灯片展示"
  button: "按钮"
+  onlineUsers: "在线用户"
+  serverMetric: "服务器指标"
 _cw:
  hide: "隐藏"
  show: "查看更多"
@@ -1056,7 +1075,7 @@ _exportOrImport:
  allNotes: "所有帖子"
  followingList: "关注中"
  muteList: "屏蔽"
-  blockingList: "屏蔽"
+  blockingList: "拉黑"
  userLists: "列表"
 _charts:
  federationInstancesIncDec: "联合：增加/减少"
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1,12 +1,12 @@
 ---
 _lang_: "繁體中文"
-introMisskey: "歡迎！ Misskey是一個開源的去中心化的社群網站。\n通過「貼文」來分享現在發生的事情吧！ 📡\n「反應」功能，可以讓你快速的對大家的「帖子」來表達感情👍\n一起來探索新的世界吧！ 🚀"
+introMisskey: "歡迎！ Misskey是一個開源且去中心化的社群網絡。\n通過「箋文」分享周邊新鮮事，並告訴其他人您的想法！📡\n透過「情感」功能，對大家的箋文表達情感！👍\n一起來探索這個新的世界吧！🚀"
 monthAndDay: "{month}月 {day}日"
 search: "搜尋"
 notifications: "通知"
 username: "使用者名稱"
 password: "密碼"
-fetchingAsApObject: "從 Fediverse 查詢中..."
+fetchingAsApObject: "從聯邦宇宙取得中..."
 ok: "OK"
 gotIt: "知道了"
 cancel: "取消"
@@ -31,38 +31,42 @@ save: "儲存"
 users: "使用者"
 addUser: "新增使用者"
 favorite: "收藏"
-favorites: "已加星號"
+favorites: "已收藏"
 unfavorite: "取消收藏"
+favorited: "已添加至收藏夾"
+alreadyFavorited: "已經有添加入收藏夾過了"
+cantFavorite: "無法添加至收藏夾"
 pin: "置頂"
 unpin: "取消置頂"
 copyContent: "複製內容"
 copyLink: "複製連結"
 delete: "刪除"
 deleteAndEdit: "刪除並編輯"
-deleteAndEditConfirm: "要刪除並再次編輯嗎？此貼文的所有反應，轉發和回覆也將會消失。"
-addToList: "添加至清單"
+deleteAndEditConfirm: "要刪除並再次編輯嗎？此箋文的所有情感、轉發和回覆也將會消失。"
+addToList: "新增至清單"
 sendMessage: "發送訊息"
 copyUsername: "複製用戶名"
 searchUser: "搜尋用戶"
 reply: "回覆"
-loadMore: "瀏覽更多"
+loadMore: "載入更多"
+showMore: "載入更多"
 youGotNewFollower: "您有新的追隨者"
-receiveFollowRequest: "收到追隨請求"
+receiveFollowRequest: "您有新的追隨請求"
 followRequestAccepted: "追隨請求已接受"
 mention: "提及"
 mentions: "提及"
-directNotes: "私信"
-importAndExport: "匯入 / 匯出"
+directNotes: "指定使用者發佈"
+importAndExport: "匯入與匯出"
 import: "匯入"
 export: "匯出"
 files: "檔案"
 download: "下載"
-driveFileDeleteConfirm: "確定要刪除檔案「{name}」嗎？使用此附件的貼文也會跟著消失。"
-unfollowConfirm: "確定要取消對{name}的追隨嗎？"
+driveFileDeleteConfirm: "確定要刪除檔案「{name}」嗎？使用此附件的箋文也會跟著消失。\n"
+unfollowConfirm: "確定要取消追隨{name}嗎？"
 exportRequested: "已請求匯出。這可能會花一點時間。結束後檔案將會被放到雲端裡。"
 importRequested: "已請求匯入。這可能會花一點時間"
 lists: "清單"
-noLists: "沒有清單"
+noLists: "你沒有任何清單"
 note: "箋文"
 notes: "箋文"
 following: "追隨中"
@@ -74,28 +78,32 @@ error: "錯誤"
 somethingHappened: "發生錯誤"
 retry: "重試"
 pageLoadError: "載入頁面失敗"
+pageLoadErrorDescription: "這通常是因為網路錯誤或是瀏覽器快取殘留的原因。請先清除瀏覽器快取，稍後再重試"
 enterListName: "輸入清單名稱"
 privacy: "隱私"
 makeFollowManuallyApprove: "手動審核追隨請求"
-defaultNoteVisibility: "預設的筆記隱私權"
+defaultNoteVisibility: "預設可見性"
 follow: "追隨"
 followRequest: "追隨請求"
 followRequests: "追隨請求"
 unfollow: "取消追隨"
 followRequestPending: "追隨許可批准中"
 enterEmoji: "輸入表情符號"
-renote: "轉發貼文"
-unrenote: "取消轉發貼文"
+renote: "轉箋"
+unrenote: "取消轉箋"
 renoted: "轉發成功"
+cantRenote: "無法轉發此箋文。"
+cantReRenote: "無法轉發之前已經轉發過的內容"
 quote: "引用"
-pinnedNote: "已置頂的貼文"
+pinnedNote: "已置頂的箋文"
 you: "您"
 clickToShow: "按一下以顯示"
 sensitive: "敏感內容"
 add: "新增"
-reaction: "反應"
+reaction: "情感"
 reactionSettingDescription: "置頂「反應」表情符號\n"
-rememberNoteVisibility: "記住筆記隱私設定"
+reactionSettingDescription2: "拖動以重新列序，點擊以刪除，按下 + 添加。"
+rememberNoteVisibility: "記住箋文可見性"
 attachCancel: "移除附件"
 markAsSensitive: "標記為敏感內容"
 unmarkAsSensitive: "取消標記為敏感內容"
@@ -105,7 +113,7 @@ unmute: "解除靜音"
 block: "封鎖"
 unblock: "解除封鎖"
 suspend: "凍結"
-unsuspend: "解凍"
+unsuspend: "解除凍結"
 blockConfirm: "確定要封鎖此用戶？"
 unblockConfirm: "確定解除封鎖此用戶？"
 suspendConfirm: "確定凍結此帳號？"
@@ -114,7 +122,7 @@ selectList: "選擇清單"
 selectAntenna: "選擇天線"
 selectWidget: "選擇小工具"
 editWidgets: "編輯小工具"
-editWidgetsExit: "停止編輯"
+editWidgetsExit: "完成"
 customEmojis: "自訂表情符號"
 emoji: "表情符號"
 emojiName: "表情符號名稱"
@@ -122,11 +130,13 @@ emojiUrl: "表情符號URL"
 addEmoji: "新增表情符號"
 settingGuide: "推薦設定"
 cacheRemoteFiles: "緩存非遠程檔案"
-cacheRemoteFilesDescription: "禁用此設定會停止遠端檔案的緩存，從而節省儲存空間。但資料會因直接連線從而產生額外連接數據。"
+cacheRemoteFilesDescription: "禁用此設定會停止遠端檔案的緩存，從而節省儲存空間，但資料會因直接連線從而產生額外連接數據。"
 flagAsBot: "此使用者是機器人"
+flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Misskey內部系統將本帳戶識別為機器人"
 flagAsCat: "此使用者是貓"
-autoAcceptFollowed: "自動許可追隨"
-addAcount: "新增帳號"
+flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示"
+autoAcceptFollowed: "自動追隨中使用者的追隨請求"
+addAcount: "新增帳戶"
 loginFailed: "登入失敗"
 showOnRemote: "轉到所在實例顯示"
 general: "一般"
@@ -134,15 +144,15 @@ wallpaper: "桌布"
 setWallpaper: "設定桌布"
 removeWallpaper: "移除桌布"
 searchWith: "搜尋: {q}"
-youHaveNoLists: "沒有任何清單"
-followConfirm: "你真的要關注{name}嗎？"
+youHaveNoLists: "你沒有任何清單"
+followConfirm: "你真的要追隨{name}嗎？"
 proxyAccount: "代理帳號"
 proxyAccountDescription: "代理帳號是在某些情況下充當其他服務器用戶的帳號。例如，當用戶將一個來自其他服務器的帳號放在列表中時，由於沒有其他用戶關注該帳號，該指令不會傳送到該服務器上，因此會由代理帳戶關注。"
 host: "主機"
 selectUser: "選取使用者"
-recipient: "發送至"
+recipient: "收件人"
 annotation: "註解"
-federation: "聯邦宇宙"
+federation: "站台聯邦"
 instances: "實例"
 registeredAt: "初次觀測"
 latestRequestSentAt: "上次發送的請求"
@@ -156,7 +166,7 @@ blockThisInstance: "封鎖此實例"
 operations: "操作"
 software: "軟體"
 version: "版本"
-metadata: "元資料（Metadata）"
+metadata: "元資料"
 withNFiles: "{n}個檔案"
 monitor: "監視器"
 jobQueue: "佇列"
@@ -172,13 +182,13 @@ clearCachedFiles: "清除快取資料"
 clearCachedFilesConfirm: "確定要清除緩存資料嗎？"
 blockedInstances: "已封鎖的實例"
 blockedInstancesDescription: "請逐行輸入需要封鎖的實例。已封鎖的實例將無法與本實例進行通訊。"
-muteAndBlock: "靜音/封鎖"
+muteAndBlock: "靜音和封鎖"
 mutedUsers: "已靜音用戶"
 blockedUsers: "已封鎖用戶"
-noUsers: "無用戶"
+noUsers: "沒有任何使用者"
 editProfile: "編輯個人檔案"
-noteDeleteConfirm: "確定刪除此貼文嗎？"
-pinLimitExceeded: "不能再置頂更多的貼文了"
+noteDeleteConfirm: "確定刪除此箋文嗎？"
+pinLimitExceeded: "不能置頂更多箋文了"
 intro: "Misskey 部署完成！請開設管理員帳號！"
 done: "完成"
 processing: "處理中"
@@ -191,30 +201,31 @@ blocked: "已封鎖"
 suspended: "已凍結"
 all: "全部"
 subscribing: "訂閱中"
-publishing: "現正直播"
+publishing: "直播中"
 notResponding: "沒有回應"
 instanceFollowing: "追蹤實例"
 instanceFollowers: "追蹤實例"
 instanceUsers: "用戶"
 changePassword: "修改密碼"
 security: "安全性"
-retypedNotMatch: "不相符的輸入內容"
-currentPassword: "現在的密碼"
-newPassword: "新的密碼"
-newPasswordRetype: "新的密碼（再輸入一次）"
+retypedNotMatch: "兩次輸入不一致。"
+currentPassword: "目前密碼"
+newPassword: "新密碼"
+newPasswordRetype: "確認密碼"
 attachFile: "添加附件"
 more: "更多！"
 featured: "精選"
-usernameOrUserId: "使用者名稱或使用者 ID"
+usernameOrUserId: "使用者名稱或用戶ID"
 noSuchUser: "使用者不存在"
 lookup: "查詢"
 announcements: "公告"
 imageUrl: "圖片URL"
 remove: "刪除"
-removed: "成功移除"
+removed: "已刪除"
 removeAreYouSure: "確定要刪掉「{x}」嗎？"
 deleteAreYouSure: "確定要刪掉「{x}」嗎？"
-saved: "已保存"
+resetAreYouSure: "確定要重設嗎？"
+saved: "已儲存"
 messaging: "傳送訊息"
 upload: "上傳"
 fromDrive: "從雲端"
@@ -259,9 +270,9 @@ folderName: "資料夾名稱"
 createFolder: "新增資料夾"
 renameFolder: "重新命名資料夾"
 deleteFolder: "刪除資料夾"
-addFile: "添加檔案"
+addFile: "添加附件"
 emptyDrive: "雲端硬碟為空"
-emptyFolder: "空的資料夾"
+emptyFolder: "資料夾為空"
 unableToDelete: "無法刪除"
 inputNewFileName: "輸入檔案名稱"
 inputNewFolderName: "輸入新資料夾的名稱"
@@ -269,7 +280,7 @@ circularReferenceFolder: "目標文件夾是您要移動的文件夾的子文件
 hasChildFilesOrFolders: "此文件夾不是空的，無法刪除。"
 copyUrl: "複製URL"
 rename: "重新命名"
-avatar: "頭像"
+avatar: "大頭貼"
 banner: "橫幅"
 nsfw: "敏感內容"
 whenServerDisconnected: "與服務器的連接中斷時"
@@ -283,11 +294,11 @@ accept: "接受"
 reject: "拒絕"
 normal: "正常"
 instanceName: "實例名稱"
-instanceDescription: "實例描述"
+instanceDescription: "實例說明"
 maintainerName: "管理員名稱"
-maintainerEmail: "管理員信箱"
+maintainerEmail: "管理員郵箱"
 tosUrl: "服務條款URL"
-thisYear: "今年"
+thisYear: "本年"
 thisMonth: "本月"
 today: "本日"
 dayX: "{day}日"
@@ -313,7 +324,9 @@ bannerUrl: "橫幅圖片URL"
 basicInfo: "基本資訊"
 pinnedUsers: "置頂用戶"
 pinnedUsersDescription: "在「發現」頁面中使用換行標記想要置頂的用戶。"
-pinnedNotes: "已置頂的貼文"
+pinnedPages: "釘選頁面"
+pinnedPagesDescription: "輸入要固定至實例首頁的頁面路徑，以換行符分隔。"
+pinnedNotes: "已置頂的箋文"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "啟用 hCaptcha"
 hcaptchaSiteKey: "網站金鑰"
@@ -330,7 +343,7 @@ antennaSource: "接收來源"
 antennaKeywords: "包含關鍵字"
 antennaExcludeKeywords: "排除關鍵字"
 antennaKeywordsDescription: "用空格分隔指定AND、用換行符分隔指定OR"
-notifyAntenna: "通知我有新的貼文"
+notifyAntenna: "通知有新箋文"
 withFileAntenna: "僅帶有附件的箋文"
 serviceworker: "ServiceWorker"
 enableServiceworker: "開啟 ServiceWorker"
@@ -338,7 +351,7 @@ antennaUsersDescription: "指定用換行符分隔的用戶名"
 caseSensitive: "區分大小寫"
 withReplies: "包含回覆"
 connectedTo: "您的帳號已連接到以下社交帳號"
-notesAndReplies: "貼文與回覆"
+notesAndReplies: "箋文與回覆"
 withFiles: "附件"
 silence: "禁言"
 silenceConfirm: "確定要禁言此用戶嗎？"
@@ -355,7 +368,7 @@ userList: "清單"
 about: "資訊"
 aboutMisskey: "關於 Misskey"
 administrator: "管理員"
-token: "令牌"
+token: "權杖"
 twoStepAuthentication: "雙重身份驗證"
 moderator: "板主"
 nUsersMentioned: "提到了{n}"
@@ -374,7 +387,7 @@ notFoundDescription: "找不到與指定URL回應的頁面"
 uploadFolder: "預設上傳資料夾"
 cacheClear: "清除快取"
 markAsReadAllNotifications: "標記所有通知為已讀"
-markAsReadAllUnreadNotes: "標記所有貼文為已讀"
+markAsReadAllUnreadNotes: "標記所有箋文為已讀"
 markAsReadAllTalkMessages: "標記所有訊息為已讀"
 help: "幫助"
 inputMessageHere: "在此輸入訊息"
@@ -397,7 +410,7 @@ next: "下一步"
 retype: "重新輸入"
 noteOf: "{user}的箋文"
 inviteToGroup: "邀請至群組"
-maxNoteTextLength: "貼文的字數限制"
+maxNoteTextLength: "箋文的字數限制"
 quoteAttached: "引用"
 quoteQuestion: "是否要引用？"
 noMessagesYet: "沒有訊息"
@@ -428,6 +441,7 @@ useOsNativeEmojis: "使用OS原生表情符號"
 youHaveNoGroups: "找不到群組"
 joinOrCreateGroup: "請加入現有群組，或創建新群組。"
 noHistory: "沒有歷史紀錄"
+signinHistory: "登錄歷史"
 disableAnimatedMfm: "禁用MFM動畫"
 doing: "正在進行"
 category: "類別"
@@ -437,7 +451,9 @@ createAccount: "建立帳戶"
 existingAcount: "現有帳戶"
 regenerate: "再生"
 fontSize: "字體大小"
+noFollowRequests: "沒有要求跟隨您的申請"
 openImageInNewTab: "於新分頁中開啟圖片"
+dashboard: "儀表板"
 local: "本地"
 remote: "遠端"
 total: "合計"
@@ -446,10 +462,10 @@ dayOverDayChanges: "與前一日相比"
 appearance: "外觀"
 clientSettings: "用戶端設定"
 accountSettings: "帳號設定"
-promotion: "推廣貼文"
+promotion: "推廣"
 promote: "推廣"
 numberOfDays: "有效天數"
-hideThisNote: "隱藏此貼文"
+hideThisNote: "隱藏此箋文"
 showFeaturedNotesInTimeline: "在時間軸上顯示熱門推薦"
 objectStorageBaseUrl: "Base URL"
 objectStorageBucket: "儲存空間（Bucket）"
@@ -459,14 +475,18 @@ objectStorageEndpointDesc: "如要使用AWS S3，請留空。否則請根據伺
 objectStorageRegion: "地域（Region）"
 objectStorageUseSSL: "使用SSL"
 objectStorageUseProxy: "使用網路代理"
+objectStorageSetPublicRead: "上載時設定為\"public-read\""
 serverLogs: "伺服器日誌"
 deleteAll: "刪除所有記錄"
-newNoteRecived: "有新的箋文"
+showFixedPostForm: "於時間軸頁頂顯示「發送箋文」方框"
+newNoteRecived: "發現新的箋文"
 sounds: "音效"
 listen: "聆聽"
 none: "無"
 showInPage: "在頁面中顯示"
+popout: "彈出型窗口"
 volume: "音量"
+masterVolume: "主音量"
 details: "詳細資訊"
 chooseEmoji: "選擇您的表情符號\n"
 unableToProcess: "操作無法完成"
@@ -484,10 +504,12 @@ descendingOrder: "降冪"
 scratchpad: "暫存記憶體"
 output: "輸出"
 script: "腳本"
+disablePagesScript: "停用頁面的AiScript腳本"
 updateRemoteUser: "更新非本地用戶資料"
 deleteAllFiles: "刪除所有檔案"
 deleteAllFilesConfirm: "要删除所有檔案吗？"
 removeAllFollowing: "解除所有追隨"
+removeAllFollowingDescription: "解除{host}所有的跟隨。在實例不再存在時執行。"
 userSuspended: "該用戶已被凍結"
 userSilenced: "該用戶已被禁言。"
 sidebar: "側邊列"
@@ -499,10 +521,10 @@ addRelay: "添加中繼"
 inboxUrl: "私信URL"
 addedRelays: "已添加的中繼"
 serviceworkerInfo: "您需要啟用推送通知"
-deletedNote: "已删除的貼文"
+deletedNote: "已删除的箋文"
 invisibleNote: "隱藏的帖子"
 enableInfiniteScroll: "啟用自動滾動頁面模式"
-visibility: "公開範圍"
+visibility: "可見性"
 poll: "投票"
 useCw: "隱藏內容"
 enablePlayer: "打開播放器"
@@ -517,6 +539,8 @@ plugins: "插件"
 pluginInstallWarn: "請不要安裝來源不明的插件。"
 deck: "多欄模式"
 undeck: "取消多欄模式"
+useBlurEffectForModal: "在模態框使用模糊效果"
+useFullReactionPicker: "使用大尺寸的情感選擇欄"
 width: "寬度"
 height: "高度"
 large: "大"
@@ -542,6 +566,8 @@ smtpPass: "密碼"
 emptyToDisableSmtpAuth: "留空使用者名稱和密碼以禁用SMTP驗證。"
 testEmail: "郵件測試發送"
 wordMute: "靜音文字"
+userSaysSomething: "{name}說了什麼"
+makeActive: "啟用"
 display: "檢視"
 copy: "複製"
 metrics: "指標"
@@ -552,42 +578,91 @@ database: "資料庫"
 channel: "頻道"
 create: "新增"
 notificationSetting: "通知設定"
+notificationSettingDesc: "選擇顯示通知的類型"
+useGlobalSetting: "使用全域設定"
 other: "其他"
 regenerateLoginTokenDescription: "再生用於登入的內部權杖。一般情況下是不需要這樣做的。一旦再生，所有裝置將會被登出。"
+fileIdOrUrl: "文檔ID或者URL"
+chatOpenBehavior: "開啟聊天窗口時的行為"
 behavior: "行為"
 sample: "範例 "
 abuseReports: "檢舉"
 reportAbuse: "檢舉"
 reportAbuseOf: "檢舉{name}"
 fillAbuseReportDescription: "請填寫檢舉的詳細理由。可以的話，請附上針對的URL網址。"
+abuseReported: "內容已經發送。感謝您的報告。"
 send: "發送"
+abuseMarkAsResolved: "處理完畢"
 openInNewTab: "在新分頁中開啟"
-instanceTicker: "箋文的實例資訊"
+openInSideView: "在側欄中開啟"
+editTheseSettingsMayBreakAccount: "修改這些設定可能會毀壞您的帳戶"
+instanceTicker: "箋文的實例來源"
+waitingFor: "等待{x}"
 random: "隨機"
 system: "系統"
 switchUi: "切換界面"
+desktop: "桌面"
+clip: "片段"
+createNew: "新建"
 optional: "可選"
 public: "公開"
+i18nInfo: "Misskey已經被志願者們翻譯成各種語言版本，如果想要幫忙的話，可以進入{link}幫助翻譯。"
+accountInfo: "帳戶資訊"
 notesCount: "箋文數量"
 repliesCount: "回覆數量\n"
 renotesCount: "轉發數量"
 repliedCount: "回覆數量"
+renotedCount: "轉發次數"
+followingCount: "正在跟隨的用戶數量"
+followersCount: "跟隨者數量"
+sentReactionsCount: "情感發送次數"
+receivedReactionsCount: "情感收到次數"
 yes: "確定"
 no: "取消"
 driveFilesCount: "雲端硬碟檔案數量"
 driveUsage: "雲端硬碟使用量"
 noCrawleDescription: "請求網路搜尋引擎不要索引你的個人資料頁、箋文及頁面等。"
-lockedAccountInfo: "即使你通過了追隨者請求，除非你將筆記的公開範圍設定為 「追隨者」，否則任何人都能看見你的箋文。"
+lockedAccountInfo: "即使你通過了追隨者請求，除非你將箋文的可見性設定為 「追隨者」，否則任何人都能看見你的箋文。"
+loadRawImages: "以原始圖像質量顯示附件圖像的縮略圖"
+disableShowingAnimatedImages: "不播放動態圖像"
+notSet: "未設定"
+emailVerified: "已成功驗證您的電郵"
 noteFavoritesCount: "收藏箋文的數目"
+pageLikesCount: "頁面被喜歡次數"
+pageLikedCount: "頁面被喜歡次數"
 contact: "聯絡人"
+useSystemFont: "使用系統默認的字型"
 clips: "標籤"
 experimentalFeatures: "測試中的功能"
 developer: "開發者"
+makeExplorable: "讓自己的帳戶能夠在“探索”版面顯示"
+makeExplorableDescription: "如果關閉，帳戶將不會被顯示在\"探索\"版面中。"
 showGapBetweenNotesInTimeline: "分開顯示時間線上的箋文。"
+duplicate: "複製"
+left: "左"
+center: "向中央"
+wide: "寬"
+narrow: "窄"
+reloadToApplySetting: "設定將會在頁面重新載入之後生效。要現在就重載頁面嗎？"
+showTitlebar: "顯示標題列"
+clearCache: "清除快取資料"
+onlineUsersCount: "{n}人正在線上"
+nUsers: "{n}用戶"
 _aboutMisskey:
  about: "Misskey是由syuilo於2014年開發的開源軟件。"
  contributors: "主要貢獻者"
+  allContributors: "全體貢獻人員"
+  source: "原始碼"
+  translation: "翻譯Misskey"
+  donate: "捐贈給Misskey"
+  morePatrons: "感謝你們的支持、 幫助。 🥰"
+  patrons: "贊助者"
+_nsfw:
+  respect: "隱藏敏感內容"
+  ignore: "不隱藏敏感內容"
+  force: "隱藏所有內容"
 _mfm:
+  cheatSheet: "MFM代碼小抄"
  mention: "提及"
  hashtag: "#tag"
  url: "URL"
@@ -597,39 +672,67 @@ _mfm:
  quote: "引用"
  emoji: "自訂表情符號"
  search: "搜尋"
+  flip: "翻轉"
+  flipDescription: "將內容上下或左右翻轉。"
+  jelly: "動畫(果凍)"
+  jellyDescription: "顯示果凍一樣的動畫效果。"
+  bounce: "動畫(反彈)"
+  shake: "動畫(搖晃)"
+  twitch: "動畫(顫抖)"
+  spin: "動畫(旋轉)"
+  spinDescription: "顯示旋轉的動畫效果。"
+  blur: "模糊"
+  font: "字型"
+  fontDescription: "可設置顯示內容所使用的字型"
 _reversi:
  reversi: "黑白棋"
  gameSettings: "對弈設定"
  chooseBoard: "選擇棋盤"
+  blackOrWhite: "黑棋/白棋"
+  blackIs: "{name}在玩黑棋"
  rules: "規則"
  botSettings: "機器人設定"
+  thisGameIsStartedSoon: "遊戲即將開始"
+  waitingForOther: "等待對手準備"
+  waitingForMe: "等待您的準備"
+  waitingBoth: "請準備"
+  ready: "已就緒"
+  cancelReady: "重新準備"
  opponentTurn: "對手回合"
  myTurn: "你的回合"
  turnOf: "{name}的回合"
  pastTurnOf: "{name}的回合"
  surrender: "認輸"
+  drawn: "平局"
+  won: "{name}獲勝"
  black: "黑"
  white: "白"
  total: "合計"
+  turnCount: "{count}回合"
+  myGames: "我的對弈"
+  allGames: "所有對弈"
  ended: "已結束"
  playing: "正在對弈"
 _instanceTicker:
+  none: "隱藏"
+  remote: "向遠端使用者顯示"
  always: "總是顯示"
 _serverDisconnectedBehavior:
  reload: "自動重載"
-  dialog: "以對話框警告"
-  quiet: "適當地警告"
+  dialog: "彈出式警告"
+  quiet: "非侵入式警告"
 _channel:
  create: "建立頻道"
  edit: "編輯頻道"
  setBanner: "設定橫幅"
  removeBanner: "移除封面圖"
-  featured: "流行"
+  featured: "發燒內容"
  owned: "管理中"
  following: "關注中"
  usersCount: "有{n}人參與"
  notesCount: "有{n}個帖子"
 _sidebar:
+  full: "全部"
  icon: "頭像"
  hide: "隱藏"
 _wordMute:
@@ -637,10 +740,22 @@ _wordMute:
  softDescription: "隱藏時間軸中指定條件的箋文。"
  mutedNotes: "已靜音的箋文"
 _theme:
+  explore: "取得佈景主題"
+  install: "安裝佈景主題"
+  manage: "佈景主題管理員"
+  code: "主題代碼"
+  installed: "{name}已安裝"
+  installedThemes: "已經安裝的主題"
+  builtinThemes: "標準主題"
+  alreadyInstalled: "此主題已經安裝"
+  invalid: "主題格式錯誤"
+  make: "製作主題"
+  base: "基於"
  constant: "常數"
  defaultValue: "預設值"
  color: "顏色"
  func: "函数"
+  funcKind: "功能類型"
  argument: "引數"
  alpha: "透明度"
  darken: "暗度"
@@ -649,21 +764,38 @@ _theme:
    bg: "背景"
    fg: "文本"
    shadow: "陰影"
+    navIndicator: "側邊欄指示符"
    link: "鏈接"
    hashtag: "#tag"
    mention: "提及"
    mentionMe: "提及我"
-    renote: "轉發貼文"
+    renote: "轉發箋文"
    divider: "分割線"
+    scrollbarHandle: "滾動條"
+    scrollbarHandleHover: "滾動條 (漂浮)"
+    dateLabelFg: "日期標籤文字"
    infoBg: "資訊背景"
    infoFg: "資訊內容"
    infoWarnBg: "警告背景"
    infoWarnFg: "警告字元"
+    cwBg: "CW 按鈕背景"
+    cwFg: "CW 按鈕文本"
+    cwHoverBg: "CW 按鈕背景 (漂浮)"
+    buttonBg: "按鈕背景"
+    buttonHoverBg: "按鈕背景 (漂浮)"
+    inputBorder: "輸入框邊框"
+    listItemHoverBg: "列表物品背景 (漂浮)"
+    driveFolderBg: "雲端硬碟文件夾背景"
+    messageBg: "私信背景"
+    accentDarken: "強調色(偏暗)"
+    accentLighten: "強調色(明亮)"
+    fgHighlighted: "高亮顯示文本"
 _sfx:
  note: "箋文"
  noteMy: "我的箋文"
  notification: "通知"
  chat: "傳送訊息"
+  antenna: "天線接收"
  channel: "頻道通知"
 _ago:
  unknown: "未知"
@@ -684,28 +816,33 @@ _time:
 _tutorial:
  title: "Misskey使用方法"
  step1_1: "歡迎！"
-  step1_2: "此為「時間軸」頁面，它會按照時間順序顯示你「追隨」的人的「貼文」"
-  step1_3: "由於你沒有發布任何筆記，也沒有追隨任何人，所以你的時間軸目前是空的。"
+  step1_2: "此為「時間軸」頁面，它會按照時間順序顯示你「追隨」的人發出的「箋文」"
+  step1_3: "由於你沒有發佈任何箋文，也沒有追隨任何人，所以你的時間軸目前是空的。"
  step2_1: "在發文或追隨其他人之前先讓我們設定一下個人資料吧。"
  step2_2: "提供一些關於自己的資訊來讓其他人更有追隨你的意願。"
  step3_1: "個人資料都打理好了嗎？"
  step3_2: "下一步讓我們來試試看發個文，按一下畫面上的鉛筆圖示來開始"
  step3_3: "輸入完內容後，按視窗右上角的按鈕來發文"
  step3_4: "不知道該寫什麼內容嗎？試試看「開始使用Misskey了」如何。"
-  step4_1: "筆記發出去了嗎？"
+  step4_1: "箋文發出去了嗎？"
  step4_2: "如果你的箋文出現在時間軸上，就代表發文成功。"
  step5_1: "現在試試看追隨其他人來讓你的時間軸變得更生動吧。"
-  step5_2: "你可以在{featured}上看到受歡迎的貼文，你也可以選擇從列表中追隨你喜歡的人，或者在{explore}上找到熱門使用者。"
+  step5_2: "你會在{featured}上看到受歡迎的箋文，你也可以從列表中追隨你喜歡的人，或者在{explore}上找到熱門使用者。"
  step5_3: "想要追隨其他人，只要點擊他們的頭像並按「追隨」即可。"
  step5_4: "如果使用者的名字旁有鎖頭的圖示，代表他們需要手動核准你的追隨請求。"
-  step6_1: "現在你可以在時間軸上看到其他用戶的貼文"
-  step6_2: "你也可以在其他人的貼文上進行「反應」來表達簡單的回覆。"
-  step6_3: "在他人的貼文按下「+」的圖示即可選擇想要的表情符號來進行「反應」。"
+  step6_1: "現在你可以在時間軸上看到其他用戶的箋文。"
+  step6_2: "你也可以對別人的箋文作出「情感」，作出簡單的回覆。"
  step7_1: "以上為Misskey的基本操作說明，教學在此告一段落。辛苦了。"
  step7_2: "歡迎到{help}來瞭解更多Misskey相關介紹。"
+  step7_3: "那麼，祝您在Misskey玩的開心~ 🚀"
 _2fa:
+  alreadyRegistered: "此設備已經被註冊過了"
  registerDevice: "註冊裝置"
+  step1: "首先，在您的設備上安裝二步驗證程式，例如{a}或{b}。"
+  step2: "然後，掃描熒幕上的QR code。"
 _permissions:
+  "read:account": "查看帳戶信息"
+  "write:account": "更改帳戶信息"
  "read:blocks": "已封鎖用戶名單"
  "write:blocks": "編輯已封鎖用戶名單"
  "read:drive": "存取雲端硬碟\n"
@@ -720,8 +857,8 @@ _permissions:
  "write:notes": "撰寫或刪除箋文"
  "read:notifications": "查看通知"
  "write:notifications": "編輯通知"
-  "read:reactions": "查看反應"
-  "write:reactions": "編輯反應"
+  "read:reactions": "查看情感"
+  "write:reactions": "編輯情感"
  "write:votes": "投票"
  "read:pages": "顯示頁面"
  "write:pages": "編輯頁面"
@@ -733,6 +870,11 @@ _permissions:
  "write:channels": "編輯頻道"
 _auth:
  shareAccess: "要授權「“{name}”」存取您的帳戶嗎？"
+  shareAccessAsk: "您確定要授權這個應用程式使用您的帳戶嗎？"
+  permissionAsk: "此應用程式需要以下權限"
+  pleaseGoBack: "請返回至應用程式"
+  callback: "回到應用程式"
+  denied: "拒絕訪問"
 _antennaSources:
  all: "全部箋文"
  homeTimeline: "來自已追隨使用者的箋文"
@@ -752,14 +894,17 @@ _widgets:
  notifications: "通知"
  timeline: "時間軸"
  calendar: "行事曆"
-  trends: "發燒貼文"
+  trends: "發燒箋文"
  clock: "時鐘"
  rss: "RSS閱讀器"
  activity: "動態"
  photos: "照片"
  digitalClock: "電子時鐘"
  federation: "聯邦宇宙"
+  postForm: "篆文窗口"
+  slideshow: "幻燈片"
  button: "按鈕"
+  onlineUsers: "在線上的用戶"
 _cw:
  hide: "隱藏"
  show: "瀏覽更多"
@@ -767,6 +912,8 @@ _cw:
  files: "{count} 個檔案"
 _poll:
  noOnlyOneChoice: "至少需要兩個選項。"
+  choiceN: "選擇{n}"
+  noMore: "沒辦法再添加選項了"
  expiration: "期限"
  infinite: "無期限"
  at: "結束時間"
@@ -780,6 +927,7 @@ _poll:
  voted: "已投票"
  closed: "已結束"
  remainingDays: "{d}天{h}小時後結束"
+  remainingHours: "{h}小時{m}分後結束"
 _visibility:
  public: "公開"
  home: "首頁"
@@ -790,7 +938,7 @@ _visibility:
  localOnlyDescription: "對遠端使用者隱藏"
 _postForm:
  replyPlaceholder: "回覆此箋文..."
-  quotePlaceholder: "引用此貼文..."
+  quotePlaceholder: "引用此箋文..."
  channelPlaceholder: "發佈到頻道"
  _placeholders:
    a: "今天過得如何?"
@@ -807,7 +955,7 @@ _profile:
  metadataLabel: "標籤"
  metadataContent: "内容"
 _exportOrImport:
-  allNotes: "全部箋文"
+  allNotes: "所有箋文"
  followingList: "追隨中"
  muteList: "靜音"
  blockingList: "封鎖"
@@ -883,6 +1031,11 @@ _rooms:
    monitor: "監視器"
    keyboard: "鍵盤"
    carpet-stripe: "條紋地毯"
+    wall-clock: "壁鐘"
+    photoframe: "相框"
+    cube: "立方體"
+    tv: "電視"
+    pinguin: "企鵝蠟像"
    bin: "垃圾箱"
    cup-noodle: "杯面"
    holo-display: "投影機"
@@ -892,9 +1045,14 @@ _rooms:
 _pages:
  newPage: "建立頁面"
  editPage: "編輯頁面"
+  readPage: "正檢視原始碼"
  created: "頁面已建立"
  updated: "頁面已更新"
  deleted: "頁面已被刪除"
+  pageSetting: "頁面設定"
+  nameAlreadyExists: "指定的頁面URL已經存在"
+  invalidNameTitle: "指定的頁面URL無效"
+  invalidNameText: "請確定是否為非空白"
  editThisPage: "編輯此頁面"
  viewSource: "檢視原始碼"
  viewPage: "顯示頁面"
@@ -902,14 +1060,28 @@ _pages:
  unlike: "收回喜歡"
  my: "我的頁面"
  liked: "已喜歡的頁面"
+  featured: "人氣"
  inspector: "面板檢查"
+  contents: "內容"
+  content: "頁面方塊"
  variables: "變數"
  title: "標題"
  url: "頁面網址"
+  summary: "頁面摘要"
+  alignCenter: "置中"
+  hideTitleWhenPinned: "被置頂於個人資料時隱藏頁面標題"
  font: "字型"
  fontSerif: "襯線體"
  fontSansSerif: "無襯線體"
+  eyeCatchingImageSet: "設定封面影像"
+  eyeCatchingImageRemove: "刪除封面影像"
+  chooseBlock: "新增方塊"
+  selectType: "選擇類型"
+  enterVariableName: "請輸入變數名稱"
+  variableNameIsAlreadyUsed: "變數名稱已被佔用"
+  contentBlocks: "內容"
  inputBlocks: "輸入"
+  specialBlocks: "特殊"
  blocks:
    text: "文本"
    textarea: "文字區域"
@@ -1002,6 +1174,7 @@ _pages:
        arg1: "本文"
      _join:
        arg1: "清單"
+        arg2: "分隔字元"
      add: "加"
      _add:
        arg1: "A"
@@ -1018,6 +1191,7 @@ _pages:
      _divide:
        arg1: "A"
        arg2: "B"
+      mod: "餘數"
      _mod:
        arg1: "A"
        arg2: "B"
@@ -1129,9 +1303,14 @@ _relayStatus:
  accepted: "已通過核准"
  rejected: "已拒絕"
 _notification:
-  youRenoted: "{name} 轉發了你的貼文"
+  youGotMention: "{name}提及到您"
+  youGotReply: "{name}回覆了您"
+  youGotQuote: "{name}引用了您"
+  youRenoted: "{name} 轉發了你的箋文"
  youGotPoll: "{name}已投票"
+  youGotMessagingMessageFromUser: "{name}發送給您的訊息"
  youWereFollowed: "您有新的追隨者"
+  youReceivedFollowRequest: "您有新的追隨請求"
  yourFollowRequestAccepted: "您的追隨請求已通過"
  youWereInvitedToGroup: "您有新的群組邀請"
  _types:
@@ -1139,15 +1318,17 @@ _notification:
    follow: "追隨中"
    mention: "提及"
    reply: "回覆"
-    renote: "轉發貼文"
+    renote: "轉發箋文"
    quote: "引用"
-    reaction: "反應"
+    reaction: "情感"
    receiveFollowRequest: "已收到追隨請求"
    followRequestAccepted: "追隨請求已接受"
+    groupInvited: "加入社群邀請"
    app: "應用程式通知"
 _deck:
  alwaysShowMainColumn: "總是顯示主欄"
  columnAlign: "對齊欄位"
+  columnMargin: "列之間的邊距"
  addColumn: "新增欄位"
  swapLeft: "向左移動"
  swapRight: "向右移動"
@@ -1156,6 +1337,7 @@ _deck:
  stackLeft: "向左折疊"
  popRight: "向右彈出"
  _columns:
+    main: "主列"
    widgets: "小工具"
    notifications: "通知"
    tl: "時間軸"
--- a/migration/1610277136869-registry.ts
+++ b/migration/1610277136869-registry.ts
@@ -0,0 +1,22 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class registry1610277136869 implements MigrationInterface {
+    name = 'registry1610277136869'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "registry_item" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "key" character varying(1024) NOT NULL, "scope" character varying(1024) array NOT NULL DEFAULT '{}'::varchar[], "domain" character varying(512), CONSTRAINT "PK_64b3f7e6008b4d89b826cd3af95" PRIMARY KEY ("id")); COMMENT ON COLUMN "registry_item"."createdAt" IS 'The created date of the RegistryItem.'; COMMENT ON COLUMN "registry_item"."updatedAt" IS 'The updated date of the RegistryItem.'; COMMENT ON COLUMN "registry_item"."userId" IS 'The owner ID.'; COMMENT ON COLUMN "registry_item"."key" IS 'The key of the RegistryItem.'`);
+        await queryRunner.query(`CREATE INDEX "IDX_fb9d21ba0abb83223263df6bcb" ON "registry_item" ("userId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_22baca135bb8a3ea1a83d13df3" ON "registry_item" ("scope") `);
+        await queryRunner.query(`CREATE INDEX "IDX_0a72bdfcdb97c0eca11fe7ecad" ON "registry_item" ("domain") `);
+        await queryRunner.query(`ALTER TABLE "registry_item" ADD CONSTRAINT "FK_fb9d21ba0abb83223263df6bcb3" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "registry_item" DROP CONSTRAINT "FK_fb9d21ba0abb83223263df6bcb3"`);
+        await queryRunner.query(`DROP INDEX "IDX_0a72bdfcdb97c0eca11fe7ecad"`);
+        await queryRunner.query(`DROP INDEX "IDX_22baca135bb8a3ea1a83d13df3"`);
+        await queryRunner.query(`DROP INDEX "IDX_fb9d21ba0abb83223263df6bcb"`);
+        await queryRunner.query(`DROP TABLE "registry_item"`);
+    }
+
+}
--- a/migration/1610277585759-registry2.ts
+++ b/migration/1610277585759-registry2.ts
@@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class registry21610277585759 implements MigrationInterface {
+    name = 'registry21610277585759'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "registry_item" ADD "value" jsonb NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`COMMENT ON COLUMN "registry_item"."value" IS 'The value of the RegistryItem.'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`COMMENT ON COLUMN "registry_item"."value" IS 'The value of the RegistryItem.'`);
+        await queryRunner.query(`ALTER TABLE "registry_item" DROP COLUMN "value"`);
+    }
+
+}
--- a/migration/1610283021566-registry3.ts
+++ b/migration/1610283021566-registry3.ts
@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class registry31610283021566 implements MigrationInterface {
+    name = 'registry31610283021566'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "registry_item" ALTER COLUMN "value" DROP NOT NULL`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "registry_item" ALTER COLUMN "value" SET NOT NULL`);
+    }
+
+}
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.64.2",
+	"version": "12.67.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -45,6 +45,8 @@
 		"@koa/cors": "3.1.0",
 		"@koa/multer": "3.0.0",
 		"@koa/router": "9.0.1",
+		"@sentry/browser": "5.29.2",
+		"@sentry/tracing": "5.29.2",
 		"@sinonjs/fake-timers": "6.0.1",
 		"@syuilo/aiscript": "0.11.1",
 		"@types/bcryptjs": "2.4.2",
@@ -87,7 +89,7 @@
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.3.5",
 		"@types/random-seed": "0.3.3",
-		"@types/ratelimiter": "3.4.0",
+		"@types/ratelimiter": "3.4.1",
 		"@types/redis": "2.8.28",
 		"@types/rename": "1.0.2",
 		"@types/request-stats": "3.0.0",
@@ -96,6 +98,7 @@
 		"@types/sharp": "0.26.1",
 		"@types/sinonjs__fake-timers": "6.0.1",
 		"@types/speakeasy": "2.0.5",
+		"@types/throttle-debounce": "2.1.0",
 		"@types/tinycolor2": "1.4.2",
 		"@types/tmp": "0.2.0",
 		"@types/uuid": "8.3.0",
@@ -105,9 +108,9 @@
 		"@types/websocket": "1.0.1",
 		"@types/ws": "7.4.0",
 		"@typescript-eslint/parser": "4.10.0",
-		"@vue/compiler-sfc": "3.0.3",
+		"@vue/compiler-sfc": "3.0.5",
 		"abort-controller": "3.0.0",
-		"apexcharts": "3.22.3",
+		"apexcharts": "3.23.1",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
@@ -131,12 +134,12 @@
 		"diskusage": "1.1.3",
 		"double-ended-queue": "2.1.0-0",
 		"escape-regexp": "0.0.1",
-		"eslint": "7.16.0",
-		"eslint-plugin-vue": "7.3.0",
+		"eslint": "7.17.0",
+		"eslint-plugin-vue": "7.4.1",
 		"eventemitter3": "4.0.7",
 		"feed": "4.2.1",
 		"fibers": "5.0.0",
-		"file-type": "16.0.1",
+		"file-type": "16.1.0",
 		"fluent-ffmpeg": "2.1.2",
 		"glob": "7.1.6",
 		"got": "11.8.1",
@@ -145,7 +148,7 @@
 		"gulp-rename": "2.0.0",
 		"gulp-replace": "1.0.0",
 		"gulp-sourcemaps": "2.6.5",
-		"gulp-terser": "2.0.0",
+		"gulp-terser": "2.0.1",
 		"gulp-tslint": "8.1.4",
 		"gulp-typescript": "6.0.0-alpha.1",
 		"hard-source-webpack-plugin": "0.13.1",
@@ -164,7 +167,7 @@
 		"jsonld": "3.2.0",
 		"jsrsasign": "8.0.20",
 		"katex": "0.12.0",
-		"koa": "2.13.0",
+		"koa": "2.13.1",
 		"koa-bodyparser": "4.3.0",
 		"koa-favicon": "2.1.0",
 		"koa-json-body": "5.3.0",
@@ -192,9 +195,9 @@
 		"parsimmon": "1.16.0",
 		"pg": "8.5.1",
 		"portscanner": "2.2.0",
-		"postcss": "8.2.1",
+		"postcss": "8.2.4",
 		"postcss-loader": "4.1.0",
-		"prismjs": "1.22.0",
+		"prismjs": "1.23.0",
 		"probe-image-size": "6.0.0",
 		"promise-limit": "2.7.0",
 		"promise-sequential": "1.1.1",
@@ -204,7 +207,7 @@
 		"qrcode": "1.4.4",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.15.8",
+		"re2": "1.15.9",
 		"recaptcha-promise": "1.0.0",
 		"reconnecting-websocket": "4.4.0",
 		"redis": "3.0.2",
@@ -217,34 +220,35 @@
 		"rimraf": "3.0.2",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sass": "1.29.0",
-		"sass-loader": "10.1.0",
+		"sass": "1.32.4",
+		"sass-loader": "10.1.1",
 		"seedrandom": "3.0.5",
-		"sharp": "0.26.2",
+		"sharp": "0.27.0",
 		"speakeasy": "2.0.0",
 		"stringz": "2.1.0",
 		"style-loader": "2.0.0",
 		"summaly": "2.4.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "4.31.1",
+		"systeminformation": "4.34.6",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"three": "0.117.1",
+		"throttle-debounce": "3.0.1",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
-		"ts-loader": "8.0.11",
-		"ts-node": "9.1.0",
+		"ts-loader": "8.0.14",
+		"ts-node": "9.1.1",
 		"tslint": "6.1.3",
 		"tslint-sonarts": "1.9.0",
-		"typeorm": "0.2.29",
-		"typescript": "4.1.2",
+		"typeorm": "0.2.30",
+		"typescript": "4.1.3",
 		"ulid": "2.3.0",
 		"url-loader": "4.1.1",
 		"uuid": "8.3.2",
 		"v-debounce": "0.1.2",
 		"vanilla-tilt": "1.7.0",
-		"vue": "3.0.3",
-		"vue-color": "2.7.1",
+		"vue": "3.0.5",
+		"vue-color": "2.8.1",
 		"vue-json-pretty": "1.7.1",
 		"vue-loader": "16.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
@@ -252,10 +256,10 @@
 		"vue-style-loader": "4.1.2",
 		"vuedraggable": "4.0.1",
 		"web-push": "3.4.4",
-		"webpack": "5.10.1",
-		"webpack-cli": "4.2.0",
+		"webpack": "5.13.0",
+		"webpack-cli": "4.3.1",
 		"websocket": "1.0.33",
-		"ws": "7.4.1",
+		"ws": "7.4.2",
 		"xev": "2.0.1"
 	},
 	"devDependencies": {
--- a/src/client/account.ts
+++ b/src/client/account.ts
@@ -7,7 +7,6 @@ import { waiting } from '@/os';
 type Account = {
 	id: string;
 	token: string;
-	clientData: Record<string, any>;
 };

 const data = localStorage.getItem('account');
--- a/src/client/assets/misskey.svg
+++ b/src/client/assets/misskey.svg
--- a/src/client/components/date-separated-list.vue
+++ b/src/client/components/date-separated-list.vue
@@ -49,7 +49,7 @@ export default defineComponent({
 			const el = this.$slots.default({
 				item: item
 			})[0];
-			el.key = item.id;
+			if (el.key == null && item.id) el.key = item.id;

 			if (
 				i != this.items.length - 1 &&
--- a/src/client/components/drive.file.vue
+++ b/src/client/components/drive.file.vue
@@ -36,7 +36,7 @@ import { faEye, faEyeSlash } from '@fortawesome/free-regular-svg-icons';
 import { faDownload, faLink, faICursor, faTrashAlt } from '@fortawesome/free-solid-svg-icons';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
 import MkDriveFileThumbnail from './drive-file-thumbnail.vue';
-import bytes from '../filters/bytes';
+import bytes from '@/filters/bytes';
 import * as os from '@/os';

 export default defineComponent({
--- a/src/client/components/drive.vue
+++ b/src/client/components/drive.vue
@@ -17,7 +17,7 @@
 		@dragenter="onDragenter"
 		@dragleave="onDragleave"
 		@drop.prevent.stop="onDrop"
-		@contextmenu="onContextmenu"
+		@contextmenu.stop="onContextmenu"
 	>
 		<div class="contents" ref="contents">
 			<div class="folders" ref="foldersContainer" v-show="folders.length > 0">
--- a/src/client/components/emoji-picker.vue
+++ b/src/client/components/emoji-picker.vue
@@ -2,7 +2,7 @@
 <MkModal ref="modal" :src="src" @click="$refs.modal.close()" @closed="$emit('closed')">
 	<div class="omfetrab _popup" :class="['w' + width, 'h' + height, { big }]">
 		<input ref="search" class="search" :class="{ filled: q != null && q != '' }" v-model.trim="q" :placeholder="$ts.search" @paste.stop="paste" @keyup.enter="done()">
-		<div class="emojis">
+		<div class="emojis" ref="emojis">
 			<section class="result">
 				<div v-if="searchResultCustom.length > 0">
 					<button v-for="emoji in searchResultCustom"
@@ -180,6 +180,8 @@ export default defineComponent({

 	watch: {
 		q() {
+			this.$refs.emojis.scrollTop = 0;
+
 			if (this.q == null || this.q === '') {
 				this.searchResultCustom = [];
 				this.searchResultUnicode = [];
--- a/src/client/components/featured-photos.vue
+++ b/src/client/components/featured-photos.vue
@@ -0,0 +1,34 @@
+<template>
+<div class="xfbouadm" v-if="meta" :style="{ backgroundImage: `url(${ meta.backgroundImageUrl })` }">
+
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+	},
+
+	data() {
+		return {
+			meta: null,
+		};
+	},
+
+	created() {
+		os.api('meta', { detail: true }).then(meta => {
+			this.meta = meta;
+		});
+	},
+});
+</script>
+
+<style lang="scss" scoped>
+.xfbouadm {
+	background-position: center;
+	background-size: cover;
+}
+</style>
--- a/src/client/components/global/i18n.ts
+++ b/src/client/components/global/i18n.ts
@@ -11,6 +11,11 @@ export default defineComponent({
 			required: false,
 			default: 'span',
 		},
+		textTag: {
+			type: String,
+			required: false,
+			default: null,
+		},
 	},
 	render() {
 		let str = this.src;
@@ -32,6 +37,6 @@ export default defineComponent({
 			str = str.substr(nextBracketClose + 1);
 		}

-		return h(this.tag, parsed.map(x => typeof x === 'string' ? x : this.$slots[x.arg]()));
+		return h(this.tag, parsed.map(x => typeof x === 'string' ? (this.textTag ? h(this.textTag, x) : x) : this.$slots[x.arg]()));
 	}
 });
--- a/src/client/components/global/misskey-flavored-markdown.vue
+++ b/src/client/components/global/misskey-flavored-markdown.vue
@@ -14,6 +14,15 @@ export default defineComponent({
 </script>

 <style lang="scss">
+._mfm_blur_ {
+	filter: blur(6px);
+	transition: filter 0.3s;
+
+	&:hover {
+		filter: blur(0px);
+	}
+}
+
@keyframes mfm-spin {
 	0% { transform: rotate(0deg); }
 	100% { transform: rotate(360deg); }
--- a/src/client/components/mfm.ts
+++ b/src/client/components/mfm.ts
@@ -48,6 +48,11 @@ export default defineComponent({

 		const ast = (this.plain ? parsePlain : parse)(this.text);

+		const validTime = (t: string | null | undefined) => {
+			if (t == null) return null;
+			return t.match(/^[0-9.]+s$/) ? t : null;
+		};
+
 		const genEl = (ast: MfmForest) => concat(ast.map((token): VNode[] => {
 			switch (token.node.type) {
 				case 'text': {
@@ -86,17 +91,17 @@ export default defineComponent({
 							break;
 						}
 						case 'jelly': {
-							const speed = token.node.props.args.speed || '1s';
+							const speed = validTime(token.node.props.args.speed) || '1s';
 							style = (this.$store.state.animatedMfm ? `animation: mfm-rubberBand ${speed} linear infinite both;` : '');
 							break;
 						}
 						case 'twitch': {
-							const speed = token.node.props.args.speed || '0.5s';
+							const speed = validTime(token.node.props.args.speed) || '0.5s';
 							style = this.$store.state.animatedMfm ? `animation: mfm-twitch ${speed} ease infinite;` : '';
 							break;
 						}
 						case 'shake': {
-							const speed = token.node.props.args.speed || '0.5s';
+							const speed = validTime(token.node.props.args.speed) || '0.5s';
 							style = this.$store.state.animatedMfm ? `animation: mfm-shake ${speed} ease infinite;` : '';
 							break;
 						}
@@ -109,7 +114,7 @@ export default defineComponent({
 								token.node.props.args.x ? 'mfm-spinX' :
 								token.node.props.args.y ? 'mfm-spinY' :
 								'mfm-spin';
-							const speed = token.node.props.args.speed || '1.5s';
+							const speed = validTime(token.node.props.args.speed) || '1.5s';
 							style = this.$store.state.animatedMfm ? `animation: ${anime} ${speed} linear infinite; animation-direction: ${direction};` : '';
 							break;
 						}
@@ -129,6 +134,35 @@ export default defineComponent({
 							style = `transform: ${transform};`;
 							break;
 						}
+						case 'x2': {
+							style = `font-size: 200%;`;
+							break;
+						}
+						case 'x3': {
+							style = `font-size: 400%;`;
+							break;
+						}
+						case 'x4': {
+							style = `font-size: 600%;`;
+							break;
+						}
+						case 'font': {
+							const family =
+								token.node.props.args.serif ? 'serif' :
+								token.node.props.args.monospace ? 'monospace' :
+								token.node.props.args.cursive ? 'cursive' :
+								token.node.props.args.fantasy ? 'fantasy' :
+								token.node.props.args.emoji ? 'emoji' :
+								token.node.props.args.math ? 'math' :
+								null;
+							if (family) style = `font-family: ${family};`;
+							break;
+						}
+						case 'blur': {
+							return h('span', {
+								class: '_mfm_blur_',
+							}, genEl(token.children));
+						}
 					}
 					if (style == null) {
 						return h('span', {}, ['[', token.node.props.name, ...genEl(token.children), ']']);
--- a/src/client/components/note-detailed.vue
+++ b/src/client/components/note-detailed.vue
--- a/src/client/components/note.vue
+++ b/src/client/components/note.vue
@@ -8,7 +8,6 @@
 	v-hotkey="keymap"
 	v-size="{ max: [500, 450, 350, 300] }"
 >
-	<XSub v-for="note in conversation" class="reply-to-more" :key="note.id" :note="note"/>
 	<XSub :note="appearNote.reply" class="reply-to" v-if="appearNote.reply"/>
 	<div class="info" v-if="pinned"><Fa :icon="faThumbtack"/> {{ $ts.pinnedNote }}</div>
 	<div class="info" v-if="appearNote._prId_"><Fa :icon="faBullhorn"/> {{ $ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ $ts.hideThisNote }} <Fa :icon="faTimes"/></button></div>
@@ -36,7 +35,7 @@
 			<span class="localOnly" v-if="note.localOnly"><Fa :icon="faBiohazard"/></span>
 		</div>
 	</div>
-	<article class="article" @contextmenu="onContextmenu">
+	<article class="article" @contextmenu.stop="onContextmenu">
 		<MkAvatar class="avatar" :user="appearNote.user"/>
 		<div class="main">
 			<XNoteHeader class="header" :note="appearNote" :mini="true"/>
@@ -46,7 +45,7 @@
 					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
 					<XCwButton v-model:value="showContent" :note="appearNote"/>
 				</p>
-				<div class="content" v-show="appearNote.cw == null || showContent">
+				<div class="content" :class="{ collapsed }" v-show="appearNote.cw == null || showContent">
 					<div class="text">
 						<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ $ts.private }})</span>
 						<MkA class="reply" v-if="appearNote.replyId" :to="`/notes/${appearNote.replyId}`"><Fa :icon="faReply"/></MkA>
@@ -57,8 +56,11 @@
 						<XMediaList :media-list="appearNote.files"/>
 					</div>
 					<XPoll v-if="appearNote.poll" :note="appearNote" ref="pollViewer" class="poll"/>
-					<MkUrlPreview v-for="url in urls" :url="url" :key="url" :compact="true" :detail="detail" class="url-preview"/>
+					<MkUrlPreview v-for="url in urls" :url="url" :key="url" :compact="true" :detail="false" class="url-preview"/>
 					<div class="renote" v-if="appearNote.renote"><XNotePreview :note="appearNote.renote"/></div>
+					<button v-if="collapsed" class="fade _button" @click="collapsed = false">
+						<span>{{ $ts.showMore }}</span>
+					</button>
 				</div>
 				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><Fa :icon="faSatelliteDish"/> {{ appearNote.channel.name }}</MkA>
 			</div>
@@ -87,7 +89,6 @@
 			</footer>
 		</div>
 	</article>
-	<XSub v-for="note in replies" :key="note.id" :note="note" class="reply" :detail="true"/>
 </div>
 <div v-else class="_panel muted" @click="muted = false">
 	<I18n :src="$ts.userSaysSomething" tag="small">
@@ -154,11 +155,6 @@ export default defineComponent({
 			type: Object,
 			required: true
 		},
-		detail: {
-			type: Boolean,
-			required: false,
-			default: false
-		},
 		pinned: {
 			type: Boolean,
 			required: false,
@@ -171,9 +167,9 @@ export default defineComponent({
 	data() {
 		return {
 			connection: null,
-			conversation: [],
 			replies: [],
 			showContent: false,
+			collapsed: false,
 			isDeleted: false,
 			muted: false,
 			faEdit, faBolt, faTimes, faBullhorn, faPlus, faMinus, faRetweet, faReply, faReplyAll, faEllipsisH, faHome, faUnlock, faEnvelope, faThumbtack, faBan, faBiohazard, faPlug, faSatelliteDish
@@ -273,6 +269,12 @@ export default defineComponent({
 			this.connection = os.stream;
 		}

+		this.collapsed = this.appearNote.cw == null && this.appearNote.text && (
+			(this.appearNote.text.split('\n').length > 9) ||
+			(this.appearNote.text.length > 500)
+		);
+		this.muted = await checkWordMute(this.appearNote, this.$i, this.$store.state.mutedWords);
+
 		// plugin
 		if (noteViewInterruptors.length > 0) {
 			let result = this.note;
@@ -281,25 +283,6 @@ export default defineComponent({
 			}
 			this.$emit('update:note', Object.freeze(result));
 		}
-
-		this.muted = await checkWordMute(this.appearNote, this.$i, this.$store.state.mutedWords);
-
-		if (this.detail) {
-			os.api('notes/children', {
-				noteId: this.appearNote.id,
-				limit: 30
-			}).then(replies => {
-				this.replies = replies;
-			});
-
-			if (this.appearNote.replyId) {
-				os.api('notes/conversation', {
-					noteId: this.appearNote.replyId
-				}).then(conversation => {
-					this.conversation = conversation.reverse();
-				});
-			}
-		}
 	},

 	mounted() {
@@ -943,10 +926,6 @@ export default defineComponent({
 		padding-bottom: 0;
 	}

-	> .reply-to-more {
-		opacity: 0.7;
-	}
-
 	> .renote {
 		display: flex;
 		align-items: center;
@@ -1038,6 +1017,37 @@ export default defineComponent({
 				}

 				> .content {
+					&.collapsed {
+						position: relative;
+						max-height: 9em;
+						overflow: hidden;
+
+						> .fade {
+							display: block;
+							position: absolute;
+							bottom: 0;
+							left: 0;
+							width: 100%;
+							height: 64px;
+							background: linear-gradient(0deg, var(--panel), var(--X15));
+
+							> span {
+								display: inline-block;
+								background: var(--panel);
+								padding: 6px 10px;
+								font-size: 0.8em;
+								border-radius: 999px;
+								box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
+							}
+
+							&:hover {
+								> span {
+									background: var(--panelHighlight);
+								}
+							}
+						}
+					}
+
 					> .text {
 						overflow-wrap: break-word;

--- a/src/client/components/notes.vue
+++ b/src/client/components/notes.vue
@@ -15,7 +15,7 @@
 	</div>

 	<XList ref="notes" :items="notes" v-slot="{ item: note }" :direction="reversed ? 'up' : 'down'" :reversed="reversed">
-		<XNote :note="note" @update:note="updated(note, $event)" :detail="detail" :key="note._featuredId_ || note._prId_ || note.id"/>
+		<XNote :note="note" @update:note="updated(note, $event)" :key="note._featuredId_ || note._prId_ || note.id"/>
 	</XList>

 	<div v-show="more && !reversed" style="margin-top: var(--margin);">
@@ -55,12 +55,6 @@ export default defineComponent({
 			required: true
 		},

-		detail: {
-			type: Boolean,
-			required: false,
-			default: false
-		},
-
 		prop: {
 			type: String,
 			required: false
--- a/src/client/components/page-window.vue
+++ b/src/client/components/page-window.vue
@@ -1,6 +1,6 @@
 <template>
 <XWindow ref="window"
-	:initial-width="700"
+	:initial-width="500"
 	:initial-height="500"
 	:can-resize="true"
 	:close-right="true"
--- a/src/client/components/post-form.vue
+++ b/src/client/components/post-form.vue
@@ -262,7 +262,7 @@ export default defineComponent({
 		}

 		// keep cw when reply
-		if (this.$store.keepCw && this.reply && this.reply.cw) {
+		if (this.$store.state.keepCw && this.reply && this.reply.cw) {
 			this.useCw = true;
 			this.cw = this.reply.cw;
 		}
--- a/src/client/components/sample.vue
+++ b/src/client/components/sample.vue
@@ -15,7 +15,7 @@
 		<MkButton inline>This is</MkButton>
 		<MkButton inline primary>the button</MkButton>
 	</div>
-	<div class="_content">
+	<div class="_content" style="pointer-events: none;">
 		<Mfm :text="mfm"/>
 	</div>
 	<div class="_content">
@@ -49,7 +49,7 @@ export default defineComponent({
 	data() {
 		return {
 			text: '',
-			flag: false,
+			flag: true,
 			radio: 'misskey',
 			mfm: `Hello world! This is an @example mention. BTW you are @${this.$i.username}.\nAlso, here is ${config.url} and [example link](${config.url}). for more details, see https://example.com.\nAs you know #misskey is open-source software.`
 		}
--- a/src/client/components/sidebar.vue
+++ b/src/client/components/sidebar.vue
@@ -59,7 +59,6 @@ export default defineComponent({
 		return {
 			host: host,
 			showing: false,
-			searching: false,
 			accounts: [],
 			connection: null,
 			menuDef: sidebarDef,
@@ -125,19 +124,7 @@ export default defineComponent({
 		},

 		search() {
-			if (this.searching) return;
-
-			os.dialog({
-				title: this.$ts.search,
-				input: true
-			}).then(async ({ canceled, result: query }) => {
-				if (canceled || query == null || query === '') return;
-
-				this.searching = true;
-				search(this, query).finally(() => {
-					this.searching = false;
-				});
-			});
+			search();
 		},

 		async openAccountMenu(ev) {
@@ -357,12 +344,6 @@ export default defineComponent({
 			top: 0;
 			left: 0;
 			z-index: 1001;
-
-			> div {
-				> .notifications {
-					display: none;
-				}
-			}
 		}

 		&:not(.hidden) {
--- a/src/client/components/timeline.vue
+++ b/src/client/components/timeline.vue
@@ -115,6 +115,22 @@ export default defineComponent({
 			endpoint = 'notes/global-timeline';
 			this.connection = os.stream.useSharedConnection('globalTimeline');
 			this.connection.on('note', prepend);
+		} else if (this.src == 'mentions') {
+			endpoint = 'notes/mentions';
+			this.connection = os.stream.useSharedConnection('main');
+			this.connection.on('mention', prepend);
+		} else if (this.src == 'directs') {
+			endpoint = 'notes/mentions';
+			this.query = {
+				visibility: 'specified'
+			};
+			const onNote = note => {
+				if (note.visibility == 'specified') {
+					prepend(note);
+				}
+			};
+			this.connection = os.stream.useSharedConnection('main');
+			this.connection.on('mention', onNote);
 		} else if (this.src == 'list') {
 			endpoint = 'notes/user-list-timeline';
 			this.query = {
--- a/src/client/components/ui/button.vue
+++ b/src/client/components/ui/button.vue
@@ -123,7 +123,7 @@ export default defineComponent({
 	box-shadow: none;
 	text-decoration: none;
 	background: var(--buttonBg);
-	border-radius: 8px;
+	border-radius: 999px;
 	overflow: hidden;

 	&:not(:disabled):hover {
--- a/src/client/components/ui/container.vue
+++ b/src/client/components/ui/container.vue
@@ -134,6 +134,8 @@ export default defineComponent({

 	> header {
 		position: relative;
+		color: var(--panelHeaderFg);
+		background: var(--panelHeaderBg);
 		box-shadow: 0 1px 0 0 var(--panelHeaderDivider);
 		z-index: 2;
 		line-height: 1.4em;
@@ -179,6 +181,7 @@ export default defineComponent({
 		> header {
 			> .title {
 				padding: 8px 10px;
+				font-size: 0.9em;
 			}
 		}

--- a/src/client/components/ui/info.vue
+++ b/src/client/components/ui/info.vue
@@ -34,7 +34,7 @@ export default defineComponent({
 	font-size: 90%;
 	background: var(--infoBg);
 	color: var(--infoFg);
-	border-radius: 5px;
+	border-radius: var(--radius);

 	&.warn {
 		background: var(--infoWarnBg);
--- a/src/client/components/url-preview.vue
+++ b/src/client/components/url-preview.vue
@@ -243,7 +243,7 @@ export default defineComponent({
 		display: block;
 		font-size: 14px;
 		box-shadow: 0 0 0 1px var(--divider);
-		border-radius: 6px;
+		border-radius: 8px;
 		overflow: hidden;

 		&:hover {
--- a/src/client/init.ts
+++ b/src/client/init.ts
@@ -36,13 +36,15 @@ if (localStorage.getItem('vuex') != null) {
 	location.reload();
 }

+import * as Sentry from '@sentry/browser';
+import { Integrations } from '@sentry/tracing';
 import { createApp, watch } from 'vue';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';

 import widgets from '@/widgets';
 import directives from '@/directives';
 import components from '@/components';
-import { version, ui, lang } from '@/config';
+import { version, ui, lang, host } from '@/config';
 import { router } from '@/router';
 import { applyTheme } from '@/scripts/theme';
 import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
@@ -54,6 +56,7 @@ import { defaultStore, ColdDeviceStorage } from '@/store';
 import { fetchInstance, instance } from '@/instance';
 import { makeHotkey } from './scripts/hotkey';
 import { search } from './scripts/search';
+import { getThemes } from './theme-store';

 console.info(`Misskey v${version}`);

@@ -88,13 +91,21 @@ if (_DEV_) {
 	});
 }

+if (defaultStore.state.reportError && !_DEV_) {
+	Sentry.init({
+		dsn: 'https://fd273254a07a4b61857607a9ea05d629@o501808.ingest.sentry.io/5583438',
+		tracesSampleRate: 1.0,
+	});
+
+	Sentry.setTag('misskey_version', version);
+	Sentry.setTag('ui', ui);
+	Sentry.setTag('lang', lang);
+	Sentry.setTag('host', host);
+}
+
 // タッチデバイスでCSSの:hoverを機能させる
 document.addEventListener('touchend', () => {}, { passive: true });

-if (localStorage.theme == null) {
-	applyTheme(require('@/themes/l-light.json5'));
-}
-
 //#region SEE: https://css-tricks.com/the-trick-to-viewport-units-on-mobile/
 // TODO: いつの日にか消したい
 const vh = window.innerHeight * 0.01;
@@ -201,10 +212,10 @@ app.mount('body');

 watch(defaultStore.reactiveState.darkMode, (darkMode) => {
 	import('@/scripts/theme').then(({ builtinThemes }) => {
-		const themes = builtinThemes.concat(ColdDeviceStorage.get('themes'));
+		const themes = builtinThemes.concat(getThemes());
 		applyTheme(themes.find(x => x.id === (darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'))));
 	});
-});
+}, { immediate: localStorage.theme == null });

 //#region Sync dark mode
 if (ColdDeviceStorage.get('syncDeviceDarkMode')) {
@@ -337,14 +348,6 @@ if ($i) {
 		updateAccount({ hasUnreadAnnouncement: false });
 	});

-	main.on('clientSettingUpdated', x => {
-		updateAccount({
-			clientData: {
-				[x.key]: x.value
-			}
-		});
-	});
-
 	// トークンが再生成されたとき
 	// このままではMisskeyが利用できないので強制的にサインアウトさせる
 	main.on('myTokenRegenerated', () => {
--- a/src/client/os.ts
+++ b/src/client/os.ts
@@ -1,11 +1,13 @@
 import { Component, defineAsyncComponent, markRaw, reactive, Ref, ref } from 'vue';
 import { EventEmitter } from 'eventemitter3';
+import * as Sentry from '@sentry/browser';
 import Stream from '@/scripts/stream';
 import { apiUrl, debug } from '@/config';
 import MkPostFormDialog from '@/components/post-form-dialog.vue';
 import MkWaitingDialog from '@/components/waiting-dialog.vue';
 import { resolve } from '@/router';
-import { $i } from './account';
+import { $i } from '@/account';
+import { defaultStore } from '@/store';

 const ua = navigator.userAgent.toLowerCase();
 export const isMobile = /mobile|iphone|ipad|android/.test(ua);
@@ -54,19 +56,32 @@ export function api(endpoint: string, data: Record<string, any> = {}, token?: st
 			if (res.status === 200) {
 				resolve(body);
 				if (debug) {
-					log.res = markRaw(body);
-					log.state = 'success';
+					log!.res = markRaw(body);
+					log!.state = 'success';
 				}
 			} else if (res.status === 204) {
 				resolve();
 				if (debug) {
-					log.state = 'success';
+					log!.state = 'success';
 				}
 			} else {
 				reject(body.error);
 				if (debug) {
-					log.res = markRaw(body.error);
-					log.state = 'failed';
+					log!.res = markRaw(body.error);
+					log!.state = 'failed';
+				}
+
+				if (defaultStore.state.reportError && !_DEV_) {
+					Sentry.withScope((scope) => {
+						scope.setTag('api_endpoint', endpoint);
+						scope.setContext('api params', data);
+						scope.setContext('api error info', body.info);
+						scope.setTag('api_error_id', body.id);
+						scope.setTag('api_error_code', body.code);
+						scope.setTag('api_error_kind', body.kind);
+						scope.setLevel(Sentry.Severity.Error);
+						Sentry.captureMessage('API error');
+					});
 				}
 			}
 		}).catch(reject);
@@ -97,8 +112,8 @@ export function apiWithDialog(

 export function promiseDialog<T extends Promise<any>>(
 	promise: T,
-	onSuccess?: (res: any) => void,
-	onFailure?: (e: Error) => void,
+	onSuccess?: ((res: any) => void) | null,
+	onFailure?: ((e: Error) => void) | null,
 	text?: string,
 ): T {
 	const showing = ref(true);
--- a/src/client/pages/about.vue
+++ b/src/client/pages/about.vue
@@ -23,6 +23,18 @@
 	</FormGroup>

 	<FormLink v-if="meta.tosUrl" :to="meta.tosUrl" external>{{ $ts.tos }}</FormLink>
+
+	<FormGroup v-if="stats">
+		<template #label>{{ $ts.statistics }}</template>
+		<FormKeyValueView>
+			<template #key>{{ $ts.users }}</template>
+			<template #value>{{ number(stats.originalUsersCount) }}</template>
+		</FormKeyValueView>
+		<FormKeyValueView>
+			<template #key>{{ $ts.notes }}</template>
+			<template #value>{{ number(stats.originalNotesCount) }}</template>
+		</FormKeyValueView>
+	</FormGroup>
 </FormBase>
 </template>

@@ -35,6 +47,7 @@ import FormBase from '@/components/form/base.vue';
 import FormGroup from '@/components/form/group.vue';
 import FormKeyValueView from '@/components/form/key-value-view.vue';
 import * as os from '@/os';
+import number from '@/filters/number';

 export default defineComponent({
 	components: {
@@ -52,7 +65,7 @@ export default defineComponent({
 			},
 			version,
 			instanceName,
-			serverInfo: null,
+			stats: null,
 			faInfoCircle
 		}
 	},
@@ -62,6 +75,16 @@ export default defineComponent({
 			return this.$instance;
 		},
 	},
+
+	created() {
+		os.api('stats').then(stats => {
+			this.stats = stats;
+		});
+	},
+
+	methods: {
+		number
+	}
 });
 </script>

--- a/src/client/pages/advanced-theme-editor.vue
+++ b/src/client/pages/advanced-theme-editor.vue
@@ -0,0 +1,353 @@
+<template>
+<div class="t9makv94">
+	<section class="_section">
+		<div class="_content">
+			<details>
+				<summary>{{ $ts.import }}</summary>
+				<MkTextarea v-model:value="themeToImport">
+					{{ $ts._theme.importInfo }}
+				</MkTextarea>
+				<MkButton :disabled="!themeToImport.trim()" @click="importTheme">{{ $ts.import }}</MkButton>
+			</details>
+		</div>
+	</section>
+	<section class="_section">
+		<div class="_content _card _vMargin">
+			<div class="_content">
+				<MkInput v-model:value="name" required><span>{{ $ts.name }}</span></MkInput>
+				<MkInput v-model:value="author" required><span>{{ $ts.author }}</span></MkInput>
+				<MkTextarea v-model:value="description"><span>{{ $ts.description }}</span></MkTextarea>
+				<div class="_inputs">
+					<div v-text="$ts._theme.base" />
+					<MkRadio v-model="baseTheme" value="light">{{ $ts.light }}</MkRadio>
+					<MkRadio v-model="baseTheme" value="dark">{{ $ts.dark }}</MkRadio>
+				</div>
+			</div>
+		</div>
+		<div class="_content _card _vMargin">
+			<div class="list-view _content">
+				<div class="item" v-for="([ k, v ], i) in theme" :key="k">
+					<div class="_inputs">
+						<div>
+							{{ k.startsWith('$') ? `${k} (${$ts._theme.constant})` : $t('_theme.keys.' + k) }}
+							<button v-if="k.startsWith('$')" class="_button _link" @click="del(i)" v-text="$ts.delete" />
+						</div>
+						<div>
+							<div class="type" @click="chooseType($event, i)">
+								{{ getTypeOf(v) }} <Fa :icon="faChevronDown"/>
+							</div>
+							<!-- default -->
+							<div v-if="v === null" v-text="baseProps[k]" class="default-value" />
+							<!-- color -->
+							<div v-else-if="typeof v === 'string'" class="color">
+								<input type="color" :value="v" @input="colorChanged($event.target.value, i)"/>
+								<MkInput class="select" :value="v" @update:value="colorChanged($event, i)"/>
+							</div>
+							<!-- ref const -->
+							<MkInput v-else-if="v.type === 'refConst'" v-model:value="v.key">
+								<template #prefix>$</template>
+								<span>{{ $ts.name }}</span>
+							</MkInput>
+							<!-- ref props -->
+							<MkSelect class="select" v-else-if="v.type === 'refProp'" v-model:value="v.key">
+								<option v-for="key in themeProps" :value="key" :key="key">{{ $t('_theme.keys.' + key) }}</option>
+							</MkSelect>
+							<!-- func -->
+							<template v-else-if="v.type === 'func'">
+								<MkSelect class="select" v-model:value="v.name">
+									<template #label>{{ $ts._theme.funcKind }}</template>
+									<option v-for="n in ['alpha', 'darken', 'lighten']" :value="n" :key="n">{{ $t('_theme.' + n) }}</option>
+								</MkSelect>
+								<MkInput type="number" v-model:value="v.arg"><span>{{ $ts._theme.argument }}</span></MkInput>
+								<MkSelect class="select" v-model:value="v.value">
+									<template #label>{{ $ts._theme.basedProp }}</template>
+									<option v-for="key in themeProps" :value="key" :key="key">{{ $t('_theme.keys.' + key) }}</option>
+								</MkSelect>
+							</template>
+							<!-- CSS -->
+							<MkInput v-else-if="v.type === 'css'" v-model:value="v.value">
+								<span>CSS</span>
+							</MkInput>
+						</div>
+					</div>
+				</div>
+				<MkButton primary @click="addConst">{{ $ts._theme.addConstant }}</MkButton>
+			</div>
+		</div>
+	</section>
+	<section class="_section">
+		<details class="_content">
+			<summary>{{ $ts.sample }}</summary>
+			<MkSample/>
+		</details>
+	</section>
+	<section class="_section">
+		<div class="_content">
+			<MkButton inline @click="preview">{{ $ts.preview }}</MkButton>
+			<MkButton inline primary :disabled="!name || !author" @click="save">{{ $ts.save }}</MkButton>
+		</div>
+	</section>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { faPalette, faChevronDown, faKeyboard } from '@fortawesome/free-solid-svg-icons';
+import * as JSON5 from 'json5';
+import { toUnicode } from 'punycode';
+
+import MkRadio from '@/components/ui/radio.vue';
+import MkButton from '@/components/ui/button.vue';
+import MkInput from '@/components/ui/input.vue';
+import MkTextarea from '@/components/ui/textarea.vue';
+import MkSelect from '@/components/ui/select.vue';
+import MkSample from '@/components/sample.vue';
+
+import { convertToMisskeyTheme, ThemeValue, convertToViewModel, ThemeViewModel } from '@/scripts/theme-editor';
+import { Theme, applyTheme, lightTheme, darkTheme, themeProps, validateTheme } from '@/scripts/theme';
+import { host } from '@/config';
+import * as os from '@/os';
+import { ColdDeviceStorage } from '@/store';
+
+export default defineComponent({
+	components: {
+		MkRadio,
+		MkButton,
+		MkInput,
+		MkTextarea,
+		MkSelect,
+		MkSample,
+	},
+
+	data() {
+		return {
+			INFO: {
+				title: this.$ts.themeEditor,
+				icon: faPalette,
+			},
+			theme: [] as ThemeViewModel,
+			name: '',
+			description: '',
+			baseTheme: 'light' as 'dark' | 'light',
+			author: `@${this.$i.username}@${toUnicode(host)}`,
+			themeToImport: '',
+			changed: false,
+			lightTheme, darkTheme, themeProps,
+			faPalette, faChevronDown, faKeyboard,
+		}
+	},
+
+	computed: {
+		baseProps() {
+			return this.baseTheme === 'light' ? this.lightTheme.props : this.darkTheme.props;
+		},
+	},
+
+	beforeUnmount() {
+		window.removeEventListener('beforeunload', this.beforeunload);
+	},
+
+	async beforeRouteLeave(to, from, next) {
+		if (this.changed && !(await this.confirm())) {
+			next(false);
+		} else {
+			next();
+		}
+	},
+
+	mounted() {
+		this.init();
+		window.addEventListener('beforeunload', this.beforeunload);
+		const changed = () => this.changed = true;
+		this.$watch('name', changed);
+		this.$watch('description', changed);
+		this.$watch('baseTheme', changed);
+		this.$watch('author', changed);
+		this.$watch('theme', changed);
+	},
+
+	methods: {
+		beforeunload(e: BeforeUnloadEvent) {
+			if (this.changed) {
+				e.preventDefault();
+				e.returnValue = '';
+			}
+		},
+
+		async confirm(): Promise<boolean> {
+			const { canceled } = await os.dialog({
+				type: 'warning',
+				text: this.$ts.leaveConfirm,
+				showCancelButton: true
+			});
+			return !canceled;
+		},
+
+		init() {
+			const t: ThemeViewModel = [];
+			for (const key of themeProps) {
+				t.push([ key, null ]);
+			}
+			this.theme = t;
+		},
+	
+		async del(i: number) {
+			const { canceled } = await os.dialog({ 
+				type: 'warning',
+				showCancelButton: true,
+				text: this.$t('_theme.deleteConstantConfirm', { const: this.theme[i][0] }),
+			});
+			if (canceled) return;
+			Vue.delete(this.theme, i);
+		},
+	
+		async addConst() {
+			const { canceled, result } = await os.dialog({
+				title: this.$ts._theme.inputConstantName,
+				input: true
+			});
+			if (canceled) return;
+			this.theme.push([ '$' + result, '#000000']);
+		},
+	
+		save() {
+			const theme = convertToMisskeyTheme(this.theme, this.name, this.description, this.author, this.baseTheme);
+			const themes = ColdDeviceStorage.get('themes').concat(theme);
+			ColdDeviceStorage.set('themes', themes);
+			os.dialog({
+				type: 'success',
+				text: this.$t('_theme.installed', { name: theme.name })
+			});
+			this.changed = false;
+		},
+	
+		preview() {
+			const theme = convertToMisskeyTheme(this.theme, this.name, this.description, this.author, this.baseTheme);
+			try {
+				applyTheme(theme, false);
+			} catch (e) {
+				os.dialog({
+					type: 'error',
+					text: e.message
+				});
+			}
+		},
+	
+		async importTheme() {
+			if (this.changed && (!await this.confirm())) return;
+
+			try {
+				const theme = JSON5.parse(this.themeToImport) as Theme;
+				if (!validateTheme(theme)) throw new Error(this.$ts._theme.invalid);
+
+				this.name = theme.name;
+				this.description = theme.desc || '';
+				this.author = theme.author;
+				this.baseTheme = theme.base || 'light';
+				this.theme = convertToViewModel(theme);
+				this.themeToImport = '';
+			} catch (e) {
+				os.dialog({
+					type: 'error',
+					text: e.message
+				});
+			}
+		},
+	
+		colorChanged(color: string, i: number) {
+			this.theme[i] = [this.theme[i][0], color];
+		},
+
+		getTypeOf(v: ThemeValue) {
+			return v === null
+				? this.$ts._theme.defaultValue
+				: typeof v === 'string'
+					? this.$ts._theme.color
+					: this.$t('_theme.' + v.type);
+		},
+	
+		async chooseType(e: MouseEvent, i: number) {
+			const newValue = await this.showTypeMenu(e);
+			this.theme[i] = [ this.theme[i][0], newValue ];
+		},
+	
+		showTypeMenu(e: MouseEvent) {
+			return new Promise<ThemeValue>((resolve) => {
+				os.modalMenu([{
+					text: this.$ts._theme.defaultValue,
+					action: () => resolve(null),
+				}, {
+					text: this.$ts._theme.color,
+					action: () => resolve('#000000'),
+				}, {
+					text: this.$ts._theme.func,
+					action: () => resolve({
+						type: 'func', name: 'alpha', arg: 1, value: 'accent'
+					}),
+				}, {
+					text: this.$ts._theme.refProp,
+					action: () => resolve({
+						type: 'refProp', key: 'accent',
+					}),
+				}, {
+					text: this.$ts._theme.refConst,
+					action: () => resolve({
+						type: 'refConst', key: '',
+					}),
+				}, {
+					text: 'CSS',
+					action: () => resolve({
+						type: 'css', value: '',
+					}),
+				}], e.currentTarget || e.target);
+			});
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.t9makv94 {
+	> ._section {
+		> ._content {
+			> .list-view {
+				> .item {
+					min-height: 48px;
+					word-break: break-all;
+
+					&:not(:last-child) {
+						margin-bottom: 8px;
+					}
+
+					.select {
+						margin: 24px 0;
+					}
+
+					.type {
+						cursor: pointer;
+					}
+
+					.default-value {
+						opacity: 0.6;
+						pointer-events: none;
+						user-select: none;
+					}
+
+					.color {
+						> input {
+							display: inline-block;
+							width: 1.5em;
+							height: 1.5em;
+						}
+
+						> div {
+							margin-left: 8px;
+							display: inline-block;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+</style>
--- a/src/client/pages/channel.vue
+++ b/src/client/pages/channel.vue
@@ -22,7 +22,7 @@

 	<XPostForm :channel="channel" class="post-form _content _panel _vMargin" fixed v-if="$i"/>

-	<XTimeline class="_content _vMargin" src="channel" :channel="channelId" @before="before" @after="after"/>
+	<XTimeline class="_content _vMargin _noGap_" src="channel" :key="channelId" :channel="channelId" @before="before" @after="after"/>
 </div>
 </template>

--- a/src/client/pages/doc.vue
+++ b/src/client/pages/doc.vue
@@ -3,7 +3,7 @@
 	<div class="title">{{ title }}</div>
 	<div class="body" v-html="body"></div>
 	<div class="footer">
-		<MkLink :url="`https://github.com/syuilo/misskey/blob/master/src/docs/${doc}.ja-JP.md`" class="at">{{ $ts.docSource }}</MkLink>
+		<MkLink :url="`https://github.com/syuilo/misskey/blob/master/src/docs/${lang}/${doc}.md`" class="at">{{ $ts.docSource }}</MkLink>
 	</div>
 </div>
 </template>
@@ -45,6 +45,7 @@ export default defineComponent({
 			title: null,
 			body: null,
 			markdown: null,
+			lang,
 		}
 	},

--- a/src/client/pages/mfm-cheat-sheet.vue
+++ b/src/client/pages/mfm-cheat-sheet.vue
@@ -145,6 +145,56 @@
 			</div>
 		</div>
 	</div>
+	<div class="_section">
+		<div class="_title">{{ $ts._mfm.font }}</div>
+		<div class="_content">
+			<p>{{ $ts._mfm.fontDescription }}</p>
+			<div class="preview _panel">
+				<Mfm :text="preview_font"/>
+				<MkTextarea v-model:value="preview_font"><span>MFM</span></MkTextarea>
+			</div>
+		</div>
+	</div>
+	<div class="_section">
+		<div class="_title">{{ $ts._mfm.x2 }}</div>
+		<div class="_content">
+			<p>{{ $ts._mfm.x2Description }}</p>
+			<div class="preview _panel">
+				<Mfm :text="preview_x2"/>
+				<MkTextarea v-model:value="preview_x2"><span>MFM</span></MkTextarea>
+			</div>
+		</div>
+	</div>
+	<div class="_section">
+		<div class="_title">{{ $ts._mfm.x3 }}</div>
+		<div class="_content">
+			<p>{{ $ts._mfm.x3Description }}</p>
+			<div class="preview _panel">
+				<Mfm :text="preview_x3"/>
+				<MkTextarea v-model:value="preview_x3"><span>MFM</span></MkTextarea>
+			</div>
+		</div>
+	</div>
+	<div class="_section">
+		<div class="_title">{{ $ts._mfm.x4 }}</div>
+		<div class="_content">
+			<p>{{ $ts._mfm.x4Description }}</p>
+			<div class="preview _panel">
+				<Mfm :text="preview_x4"/>
+				<MkTextarea v-model:value="preview_x4"><span>MFM</span></MkTextarea>
+			</div>
+		</div>
+	</div>
+	<div class="_section">
+		<div class="_title">{{ $ts._mfm.blur }}</div>
+		<div class="_content">
+			<p>{{ $ts._mfm.blurDescription }}</p>
+			<div class="preview _panel">
+				<Mfm :text="preview_blur"/>
+				<MkTextarea v-model:value="preview_blur"><span>MFM</span></MkTextarea>
+			</div>
+		</div>
+	</div>
 	<div class="_section">
 		<div class="_title">{{ $ts._mfm.jelly }}</div>
 		<div class="_content">
@@ -255,6 +305,11 @@ export default defineComponent({
 			preview_twitch: `[twitch 🍮]`,
 			preview_spin: `[spin 🍮] [spin.left 🍮] [spin.alternate 🍮]\n[spin.x 🍮] [spin.x,left 🍮] [spin.x,alternate 🍮]\n[spin.y 🍮] [spin.y,left 🍮] [spin.y,alternate 🍮]`,
 			preview_flip: `[flip ${this.$ts._mfm.dummy}]\n[flip.v ${this.$ts._mfm.dummy}]\n[flip.h,v ${this.$ts._mfm.dummy}]`,
+			preview_font: `[font.serif ${this.$ts._mfm.dummy}]\n[font.monospace ${this.$ts._mfm.dummy}]\n[font.cursive ${this.$ts._mfm.dummy}]\n[font.fantasy ${this.$ts._mfm.dummy}]`,
+			preview_x2: `[x2 🍮]`,
+			preview_x3: `[x3 🍮]`,
+			preview_x4: `[x4 🍮]`,
+			preview_blur: `[blur ${this.$ts._mfm.dummy}]`,
 		}
 	},
 });
--- a/src/client/pages/note.vue
+++ b/src/client/pages/note.vue
@@ -2,14 +2,14 @@
 <div class="fcuexfpr">
 	<div v-if="note" class="note">
 		<div class="_section" v-if="showNext">
-			<XNotes class="_content" :pagination="next"/>
+			<XNotes class="_content _noGap_" :pagination="next"/>
 		</div>

 		<div class="_section main">
 			<MkButton v-if="!showNext && hasNext" class="load next _content" @click="showNext = true"><Fa :icon="faChevronUp"/></MkButton>
 			<div class="_content _vMargin">
 				<MkRemoteCaution v-if="note.user.host != null" :href="note.url || note.uri" class="_vMargin"/>
-				<XNote v-model:note="note" :key="note.id" :detail="true" class="_vMargin"/>
+				<XNoteDetailed v-model:note="note" :key="note.id" class="_vMargin"/>
 			</div>
 			<div class="_content clips _vMargin" v-if="clips && clips.length > 0">
 				<div class="title">{{ $ts.clip }}</div>
@@ -25,7 +25,7 @@
 		</div>

 		<div class="_section" v-if="showPrev">
-			<XNotes class="_content" :pagination="prev"/>
+			<XNotes class="_content _noGap_" :pagination="prev"/>
 		</div>
 	</div>

@@ -39,6 +39,7 @@
 import { computed, defineComponent } from 'vue';
 import { faChevronUp, faChevronDown } from '@fortawesome/free-solid-svg-icons';
 import XNote from '@/components/note.vue';
+import XNoteDetailed from '@/components/note-detailed.vue';
 import XNotes from '@/components/notes.vue';
 import MkRemoteCaution from '@/components/remote-caution.vue';
 import MkButton from '@/components/ui/button.vue';
@@ -47,6 +48,7 @@ import * as os from '@/os';
 export default defineComponent({
 	components: {
 		XNote,
+		XNoteDetailed,
 		XNotes,
 		MkRemoteCaution,
 		MkButton,
--- a/src/client/pages/search.vue
+++ b/src/client/pages/search.vue
@@ -7,7 +7,7 @@
 </template>

 <script lang="ts">
-import { defineComponent } from 'vue';
+import { computed, defineComponent } from 'vue';
 import { faSearch } from '@fortawesome/free-solid-svg-icons';
 import Progress from '@/scripts/loading';
 import XNotes from '@/components/notes.vue';
@@ -20,7 +20,7 @@ export default defineComponent({
 	data() {
 		return {
 			INFO: {
-				title: this.$t('searchWith', { q: this.$route.query.q }),
+				title: computed(() => this.$t('searchWith', { q: this.$route.query.q })),
 				icon: faSearch
 			},
 			pagination: {
--- a/src/client/pages/settings/deck.vue
+++ b/src/client/pages/settings/deck.vue
@@ -24,6 +24,8 @@
 		<span>{{ $ts._deck.columnMargin }}</span>
 		<template #suffix>px</template>
 	</FormInput>
+
+	<FormLink @click="setProfile">{{ $ts._deck.profile }}<template #suffix>{{ profile }}</template></FormLink>
 </FormBase>
 </template>

@@ -31,7 +33,7 @@
 import { defineComponent } from 'vue';
 import { faImage, faCog, faColumns } from '@fortawesome/free-solid-svg-icons';
 import FormSwitch from '@/components/form/switch.vue';
-import FormSelect from '@/components/form/select.vue';
+import FormLink from '@/components/form/link.vue';
 import FormRadios from '@/components/form/radios.vue';
 import FormInput from '@/components/form/input.vue';
 import FormBase from '@/components/form/base.vue';
@@ -42,7 +44,7 @@ import * as os from '@/os';
 export default defineComponent({
 	components: {
 		FormSwitch,
-		FormSelect,
+		FormLink,
 		FormInput,
 		FormRadios,
 		FormBase,
@@ -67,6 +69,7 @@ export default defineComponent({
 		columnAlign: deckStore.makeGetterSetter('columnAlign'),
 		columnMargin: deckStore.makeGetterSetter('columnMargin'),
 		columnHeaderHeight: deckStore.makeGetterSetter('columnHeaderHeight'),
+		profile: deckStore.makeGetterSetter('profile'),
 	},

 	watch: {
@@ -85,5 +88,19 @@ export default defineComponent({
 	mounted() {
 		this.$emit('info', this.INFO);
 	},
+
+	methods: {
+		async setProfile() {
+			const { canceled, result: name } = await os.dialog({
+				title: this.$ts._deck.profile,
+				input: {
+					allowEmpty: false
+				}
+			});
+			if (canceled) return;
+			this.profile = name;
+			location.reload();
+		}
+	}
 });
 </script>
--- a/src/client/pages/settings/experimental-features.vue
+++ b/src/client/pages/settings/experimental-features.vue
@@ -1,6 +1,6 @@
 <template>
 <FormBase>
-
+	<FormButton @click="error()">error test</FormButton>
 </FormBase>
 </template>

@@ -42,5 +42,11 @@ export default defineComponent({
 	mounted() {
 		this.$emit('info', this.INFO);
 	},
+
+	methods: {
+		error() {
+			throw new Error('Test error');
+		}
+	}
 });
 </script>
--- a/src/client/pages/settings/general.vue
+++ b/src/client/pages/settings/general.vue
@@ -1,5 +1,6 @@
 <template>
 <FormBase>
+	<FormSwitch v-model:value="titlebar">{{ $ts.showTitlebar }}</FormSwitch>
 	<FormSwitch v-model:value="showFixedPostForm">{{ $ts.showFixedPostForm }}</FormSwitch>

 	<FormSelect v-model:value="lang">
@@ -133,6 +134,7 @@ export default defineComponent({
 		useOsNativeEmojis: defaultStore.makeGetterSetter('useOsNativeEmojis'),
 		disableShowingAnimatedImages: defaultStore.makeGetterSetter('disableShowingAnimatedImages'),
 		loadRawImages: defaultStore.makeGetterSetter('loadRawImages'),
+		titlebar: defaultStore.makeGetterSetter('titlebar'),
 		imageNewTab: defaultStore.makeGetterSetter('imageNewTab'),
 		nsfw: defaultStore.makeGetterSetter('nsfw'),
 		disablePagesScript: defaultStore.makeGetterSetter('disablePagesScript'),
@@ -175,6 +177,14 @@ export default defineComponent({
 		showGapBetweenNotesInTimeline() {
 			this.reloadAsk();
 		},
+
+		titlebar() {
+			this.reloadAsk();
+		},
+
+		instanceTicker() {
+			this.reloadAsk();
+		},
 	},

 	mounted() {
--- a/src/client/pages/settings/import-export.vue
+++ b/src/client/pages/settings/import-export.vue
@@ -1,49 +1,71 @@
 <template>
-<section class="_section">
-	<div class="_title"><Fa :icon="faBoxes"/> {{ $ts.importAndExport }}</div>
-	<div class="_content">
-		<MkSelect v-model:value="exportTarget">
-			<option value="notes">{{ $ts._exportOrImport.allNotes }}</option>
-			<option value="following">{{ $ts._exportOrImport.followingList }}</option>
-			<option value="user-lists">{{ $ts._exportOrImport.userLists }}</option>
-			<option value="mute">{{ $ts._exportOrImport.muteList }}</option>
-			<option value="blocking">{{ $ts._exportOrImport.blockingList }}</option>
-		</MkSelect>
-		<MkButton inline primary @click="doExport"><Fa :icon="faDownload"/> {{ $ts.export }}</MkButton>
-		<MkButton inline primary @click="doImport" :disabled="!['following', 'user-lists'].includes(exportTarget)"><Fa :icon="faUpload"/> {{ $ts.import }}</MkButton>
-	</div>
-</section>
+<FormBase>
+	<FormGroup>
+		<template #label>{{ $ts._exportOrImport.allNotes }}</template>
+		<FormButton @click="doExport('notes')"><Fa :icon="faDownload"/> {{ $ts.export }}</FormButton>
+	</FormGroup>
+	<FormGroup>
+		<template #label>{{ $ts._exportOrImport.followingList }}</template>
+		<FormButton @click="doExport('following')"><Fa :icon="faDownload"/> {{ $ts.export }}</FormButton>
+		<FormButton @click="doImport('following', $event)"><Fa :icon="faUpload"/> {{ $ts.import }}</FormButton>
+	</FormGroup>
+	<FormGroup>
+		<template #label>{{ $ts._exportOrImport.userLists }}</template>
+		<FormButton @click="doExport('user-lists')"><Fa :icon="faDownload"/> {{ $ts.export }}</FormButton>
+		<FormButton @click="doImport('user-lists', $event)"><Fa :icon="faUpload"/> {{ $ts.import }}</FormButton>
+	</FormGroup>
+	<FormGroup>
+		<template #label>{{ $ts._exportOrImport.muteList }}</template>
+		<FormButton @click="doExport('mute')"><Fa :icon="faDownload"/> {{ $ts.export }}</FormButton>
+	</FormGroup>
+	<FormGroup>
+		<template #label>{{ $ts._exportOrImport.blockingList }}</template>
+		<FormButton @click="doExport('blocking')"><Fa :icon="faDownload"/> {{ $ts.export }}</FormButton>
+	</FormGroup>
+</FormBase>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
 import { faDownload, faUpload, faBoxes } from '@fortawesome/free-solid-svg-icons';
-import MkButton from '@/components/ui/button.vue';
-import MkSelect from '@/components/ui/select.vue';
+import FormSelect from '@/components/form/select.vue';
+import FormButton from '@/components/form/button.vue';
+import FormBase from '@/components/form/base.vue';
+import FormGroup from '@/components/form/group.vue';
 import * as os from '@/os';
 import { selectFile } from '@/scripts/select-file';

 export default defineComponent({
 	components: {
-		MkButton,
-		MkSelect,
+		FormBase,
+		FormGroup,
+		FormButton,
 	},

+	emits: ['info'],
+
 	data() {
 		return {
-			exportTarget: 'notes',
+			INFO: {
+				title: this.$ts.importAndExport,
+				icon: faBoxes
+			},
 			faDownload, faUpload, faBoxes
 		}
 	},

+	mounted() {
+		this.$emit('info', this.INFO);
+	},
+
 	methods: {
-		doExport() {
+		doExport(target) {
 			os.api(
-				this.exportTarget == 'notes' ? 'i/export-notes' :
-				this.exportTarget == 'following' ? 'i/export-following' :
-				this.exportTarget == 'blocking' ? 'i/export-blocking' :
-				this.exportTarget == 'user-lists' ? 'i/export-user-lists' :
-				this.exportTarget == 'mute' ? 'i/export-mute' :
+				target == 'notes' ? 'i/export-notes' :
+				target == 'following' ? 'i/export-following' :
+				target == 'blocking' ? 'i/export-blocking' :
+				target == 'user-lists' ? 'i/export-user-lists' :
+				target == 'mute' ? 'i/export-mute' :
 				null, {})
 			.then(() => {
 				os.dialog({
@@ -58,12 +80,12 @@ export default defineComponent({
 			});
 		},

-		async doImport(e) {
+		async doImport(target, e) {
 			const file = await selectFile(e.currentTarget || e.target);
 			
 			os.api(
-				this.exportTarget == 'following' ? 'i/import-following' :
-				this.exportTarget == 'user-lists' ? 'i/import-user-lists' :
+				target == 'following' ? 'i/import-following' :
+				target == 'user-lists' ? 'i/import-user-lists' :
 				null, {
 					fileId: file.id
 			}).then(() => {
--- a/src/client/pages/settings/index.vue
+++ b/src/client/pages/settings/index.vue
@@ -27,18 +27,21 @@
 			<FormLink :active="page === 'api'" replace to="/settings/api"><template #icon><Fa :icon="faKey"/></template>API</FormLink>
 			<FormLink :active="page === 'other'" replace to="/settings/other"><template #icon><Fa :icon="faEllipsisH"/></template>{{ $ts.other }}</FormLink>
 		</FormGroup>
+		<FormGroup>
+			<FormButton @click="clear">{{ $ts.clearCache }}</FormButton>
+		</FormGroup>
 		<FormGroup>
 			<FormButton @click="logout" danger>{{ $ts.logout }}</FormButton>
 		</FormGroup>
 	</FormBase>
 	<div class="main">
-		<component :is="component" @info="onInfo"/>
+		<component :is="component" :key="page" @info="onInfo" v-bind="pageProps"/>
 	</div>
 </div>
 </template>

 <script lang="ts">
-import { computed, defineAsyncComponent, defineComponent, nextTick, onMounted, ref, watch } from 'vue';
+import { computed, defineAsyncComponent, defineComponent, nextTick, onMounted, reactive, ref, watch } from 'vue';
 import { faCog, faPalette, faPlug, faUser, faListUl, faLock, faCommentSlash, faMusic, faCogs, faEllipsisH, faBan, faShareAlt, faLockOpen, faKey, faBoxes } from '@fortawesome/free-solid-svg-icons';
 import { faLaugh, faBell, faEnvelope } from '@fortawesome/free-regular-svg-icons';
 import { i18n } from '@/i18n';
@@ -75,7 +78,9 @@ export default defineComponent({
 		const onInfo = (viewInfo) => {
 			INFO.value = viewInfo;
 		};
+		const pageProps = ref({});
 		const component = computed(() => {
+			if (props.page == null) return null;
 			switch (props.page) {
 				case 'profile': return defineAsyncComponent(() => import('./profile.vue'));
 				case 'privacy': return defineAsyncComponent(() => import('./privacy.vue'));
@@ -101,16 +106,35 @@ export default defineComponent({
 				case 'plugins': return defineAsyncComponent(() => import('./plugins.vue'));
 				case 'import-export': return defineAsyncComponent(() => import('./import-export.vue'));
 				case 'account-info': return defineAsyncComponent(() => import('./account-info.vue'));
+				case 'registry': return defineAsyncComponent(() => import('./registry.vue'));
 				case 'experimental-features': return defineAsyncComponent(() => import('./experimental-features.vue'));
-				default: return null;
+			}
+			if (props.page.startsWith('registry/keys/system/')) {
+				return defineAsyncComponent(() => import('./registry.keys.vue'));
+			}
+			if (props.page.startsWith('registry/value/system/')) {
+				return defineAsyncComponent(() => import('./registry.value.vue'));
 			}
 		});

 		watch(component, () => {
+			pageProps.value = {};
+
+			if (props.page) {
+				if (props.page.startsWith('registry/keys/system/')) {
+					pageProps.value.scope = props.page.replace('registry/keys/system/', '').split('/');
+				}
+				if (props.page.startsWith('registry/value/system/')) {
+					const path = props.page.replace('registry/value/system/', '').split('/');
+					pageProps.value.xKey = path.pop();
+					pageProps.value.scope = path;
+				}
+			}
+
 			nextTick(() => {
 				scroll(el.value, 0);
 			});
-		});
+		}, { immediate: true });

 		onMounted(() => {
 			narrow.value = el.value.offsetWidth < 1025;
@@ -122,10 +146,16 @@ export default defineComponent({
 			view,
 			el,
 			onInfo,
+			pageProps,
 			component,
 			logout: () => {
 				signout();
 			},
+			clear: () => {
+				localStorage.removeItem('locale');
+				localStorage.removeItem('theme');
+				location.reload();
+			},
 			faPalette, faPlug, faUser, faListUl, faLock, faLaugh, faCommentSlash, faMusic, faBell, faCogs, faEllipsisH, faBan, faShareAlt, faLockOpen, faKey, faBoxes, faEnvelope,
 		};
 	},
--- a/src/client/pages/settings/mute-block.vue
+++ b/src/client/pages/settings/mute-block.vue
@@ -1,34 +1,34 @@
 <template>
-<section class="rrfwjxfl _section">
+<FormBase>
 	<MkTab v-model:value="tab" style="margin-bottom: var(--margin);">
 		<option value="mute">{{ $ts.mutedUsers }}</option>
 		<option value="block">{{ $ts.blockedUsers }}</option>
 	</MkTab>
-	<div class="_content" v-if="tab === 'mute'">
+	<div v-if="tab === 'mute'">
 		<MkPagination :pagination="mutingPagination" class="muting">
 			<template #empty><MkInfo>{{ $ts.noUsers }}</MkInfo></template>
 			<template #default="{items}">
-				<div class="user" v-for="mute in items" :key="mute.id">
-					<MkA class="name" :to="userPage(mute.mutee)">
+				<FormGroup>
+					<FormLink v-for="mute in items" :key="mute.id" :to="userPage(mute.mutee)">
 						<MkAcct :user="mute.mutee"/>
-					</MkA>
-				</div>
+					</FormLink>
+				</FormGroup>
 			</template>
 		</MkPagination>
 	</div>
-	<div class="_content" v-if="tab === 'block'">
+	<div v-if="tab === 'block'">
 		<MkPagination :pagination="blockingPagination" class="blocking">
 			<template #empty><MkInfo>{{ $ts.noUsers }}</MkInfo></template>
 			<template #default="{items}">
-				<div class="user" v-for="block in items" :key="block.id">
-					<MkA class="name" :to="userPage(block.blockee)">
+				<FormGroup>
+					<FormLink v-for="block in items" :key="block.id" :to="userPage(block.blockee)">
 						<MkAcct :user="block.blockee"/>
-					</MkA>
-				</div>
+					</FormLink>
+				</FormGroup>
 			</template>
 		</MkPagination>
 	</div>
-</section>
+</FormBase>
 </template>

 <script lang="ts">
@@ -37,6 +37,9 @@ import { faBan } from '@fortawesome/free-solid-svg-icons';
 import MkPagination from '@/components/ui/pagination.vue';
 import MkTab from '@/components/tab.vue';
 import MkInfo from '@/components/ui/info.vue';
+import FormLink from '@/components/form/link.vue';
+import FormBase from '@/components/form/base.vue';
+import FormGroup from '@/components/form/group.vue';
 import { userPage } from '@/filters/user';
 import * as os from '@/os';

@@ -45,6 +48,9 @@ export default defineComponent({
 		MkPagination,
 		MkTab,
 		MkInfo,
+		FormBase,
+		FormGroup,
+		FormLink,
 	},

 	emits: ['info'],
@@ -76,19 +82,3 @@ export default defineComponent({
 	}
 });
 </script>
-
-<style lang="scss" scoped>
-.rrfwjxfl {
-	> ._content {
-		max-height: 350px;
-		overflow: auto;
-
-		> .muting,
-		> .blocking {
-			> .empty {
-				opacity: 0.5 !important;
-			}
-		}
-	}
-}
-</style>
--- a/src/client/pages/settings/other.vue
+++ b/src/client/pages/settings/other.vue
@@ -4,6 +4,8 @@
 		{{ $ts.showFeaturedNotesInTimeline }}
 	</FormSwitch>

+	<FormSwitch v-model:value="reportError">{{ $ts.sendErrorReports }}<template #desc>{{ $ts.sendErrorReportsDescription }}</template></FormSwitch>
+
 	<FormLink to="/settings/account-info">{{ $ts.accountInfo }}</FormLink>
 	<FormLink to="/settings/experimental-features">{{ $ts.experimentalFeatures }}</FormLink>

@@ -13,16 +15,19 @@
 			DEBUG MODE
 		</FormSwitch>
 		<template v-if="debug">
-			<FormLink to="/settings/regedit">RegEdit</FormLink>
 			<FormButton @click="taskmanager">Task Manager</FormButton>
 		</template>
 	</FormGroup>
+
+	<FormLink to="/settings/registry"><template #icon><Fa :icon="faCogs"/></template>{{ $ts.registry }}</FormLink>
+
+	<FormButton @click="closeAccount" danger>{{ $ts.closeAccount }}</FormButton>
 </FormBase>
 </template>

 <script lang="ts">
 import { defineAsyncComponent, defineComponent } from 'vue';
-import { faEllipsisH } from '@fortawesome/free-solid-svg-icons';
+import { faEllipsisH, faCogs } from '@fortawesome/free-solid-svg-icons';
 import FormSwitch from '@/components/form/switch.vue';
 import FormSelect from '@/components/form/select.vue';
 import FormLink from '@/components/form/link.vue';
@@ -31,6 +36,8 @@ import FormGroup from '@/components/form/group.vue';
 import FormButton from '@/components/form/button.vue';
 import * as os from '@/os';
 import { debug } from '@/config';
+import { defaultStore } from '@/store';
+import { signout } from '@/account';

 export default defineComponent({
 	components: {
@@ -50,10 +57,15 @@ export default defineComponent({
 				title: this.$ts.other,
 				icon: faEllipsisH
 			},
-			debug
+			debug,
+			faCogs
 		}
 	},

+	computed: {
+		reportError: defaultStore.makeGetterSetter('reportError'),
+	},
+
 	mounted() {
 		this.$emit('info', this.INFO);
 	},
@@ -74,6 +86,22 @@ export default defineComponent({
 		taskmanager() {
 			os.popup(import('@/components/taskmanager.vue'), {
 			}, {}, 'closed');
+		},
+
+		closeAccount() {
+			os.dialog({
+				title: this.$ts.password,
+				input: {
+					type: 'password'
+				}
+			}).then(({ canceled, result: password }) => {
+				if (canceled) return;
+				os.api('i/delete-account', {
+					password: password
+				}).then(() => {
+					signout();
+				});
+			});
 		}
 	}
 });
--- a/src/client/pages/settings/registry.keys.vue
+++ b/src/client/pages/settings/registry.keys.vue
@@ -0,0 +1,115 @@
+<template>
+<FormBase>
+	<FormGroup>
+		<FormKeyValueView>
+			<template #key>{{ $ts._registry.domain }}</template>
+			<template #value>{{ $ts.system }}</template>
+		</FormKeyValueView>
+		<FormKeyValueView>
+			<template #key>{{ $ts._registry.scope }}</template>
+			<template #value>{{ scope.join('/') }}</template>
+		</FormKeyValueView>
+	</FormGroup>
+	
+	<FormGroup v-if="keys">
+		<template #label>{{ $ts._registry.keys }}</template>
+		<FormLink v-for="key in keys" :to="`/settings/registry/value/system/${scope.join('/')}/${key[0]}`" class="_monospace">{{ key[0] }}<template #suffix>{{ key[1].toUpperCase() }}</template></FormLink>
+	</FormGroup>
+
+	<FormButton @click="createKey" primary>{{ $ts._registry.createKey }}</FormButton>
+</FormBase>
+</template>
+
+<script lang="ts">
+import { defineAsyncComponent, defineComponent } from 'vue';
+import { faCogs } from '@fortawesome/free-solid-svg-icons';
+import * as JSON5 from 'json5';
+import MkInfo from '@/components/ui/info.vue';
+import FormSwitch from '@/components/form/switch.vue';
+import FormSelect from '@/components/form/select.vue';
+import FormLink from '@/components/form/link.vue';
+import FormBase from '@/components/form/base.vue';
+import FormGroup from '@/components/form/group.vue';
+import FormButton from '@/components/form/button.vue';
+import FormKeyValueView from '@/components/form/key-value-view.vue';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+		MkInfo,
+		FormBase,
+		FormSelect,
+		FormSwitch,
+		FormButton,
+		FormLink,
+		FormGroup,
+		FormKeyValueView,
+	},
+
+	props: {
+		scope: {
+			required: true
+		}
+	},
+
+	emits: ['info'],
+	
+	data() {
+		return {
+			INFO: {
+				title: this.$ts.registry,
+				icon: faCogs
+			},
+			keys: null,
+		}
+	},
+
+	watch: {
+		scope() {
+			this.fetch();
+		}
+	},
+
+	mounted() {
+		this.$emit('info', this.INFO);
+		this.fetch();
+	},
+
+	methods: {
+		fetch() {
+			os.api('i/registry/keys-with-type', {
+				scope: this.scope
+			}).then(keys => {
+				this.keys = Object.entries(keys).sort((a, b) => a[0].localeCompare(b[0]));
+			});
+		},
+
+		async createKey() {
+			const { canceled, result } = await os.form(this.$ts._registry.createKey, {
+				key: {
+					type: 'string',
+					label: this.$ts._registry.key,
+				},
+				value: {
+					type: 'string',
+					multiline: true,
+					label: this.$ts.value,
+				},
+				scope: {
+					type: 'string',
+					label: this.$ts._registry.scope,
+					default: this.scope.join('/')
+				}
+			});
+			if (canceled) return;
+			os.apiWithDialog('i/registry/set', {
+				scope: result.scope.split('/'),
+				key: result.key,
+				value: JSON5.parse(result.value),
+			}).then(() => {
+				this.fetch();
+			});
+		}
+	}
+});
+</script>
--- a/src/client/pages/settings/registry.value.vue
+++ b/src/client/pages/settings/registry.value.vue
@@ -0,0 +1,149 @@
+<template>
+<FormBase>
+	<MkInfo warn>{{ $ts.editTheseSettingsMayBreakAccount }}</MkInfo>
+
+	<template v-if="value">
+		<FormGroup>
+			<FormKeyValueView>
+				<template #key>{{ $ts._registry.domain }}</template>
+				<template #value>{{ $ts.system }}</template>
+			</FormKeyValueView>
+			<FormKeyValueView>
+				<template #key>{{ $ts._registry.scope }}</template>
+				<template #value>{{ scope.join('/') }}</template>
+			</FormKeyValueView>
+			<FormKeyValueView>
+				<template #key>{{ $ts._registry.key }}</template>
+				<template #value>{{ xKey }}</template>
+			</FormKeyValueView>
+		</FormGroup>
+
+		<FormGroup>
+			<FormTextarea tall v-model:value="valueForEditor" class="_monospace" style="tab-size: 2;">
+				<span>{{ $ts.value }} (JSON)</span>
+			</FormTextarea>
+			<FormButton @click="save" primary><Fa :icon="faSave"/> {{ $ts.save }}</FormButton>
+		</FormGroup>
+
+		<FormKeyValueView>
+			<template #key>{{ $ts.updatedAt }}</template>
+			<template #value><MkTime :time="value.updatedAt" mode="detail"/></template>
+		</FormKeyValueView>
+
+		<FormButton danger @click="del"><Fa :icon="faTrash"/> {{ $ts.delete }}</FormButton>
+	</template>
+</FormBase>
+</template>
+
+<script lang="ts">
+import { defineAsyncComponent, defineComponent } from 'vue';
+import { faCogs, faSave, faTrash } from '@fortawesome/free-solid-svg-icons';
+import * as JSON5 from 'json5';
+import MkInfo from '@/components/ui/info.vue';
+import FormSwitch from '@/components/form/switch.vue';
+import FormSelect from '@/components/form/select.vue';
+import FormTextarea from '@/components/form/textarea.vue';
+import FormBase from '@/components/form/base.vue';
+import FormGroup from '@/components/form/group.vue';
+import FormButton from '@/components/form/button.vue';
+import FormKeyValueView from '@/components/form/key-value-view.vue';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+		MkInfo,
+		FormBase,
+		FormSelect,
+		FormSwitch,
+		FormButton,
+		FormTextarea,
+		FormGroup,
+		FormKeyValueView,
+	},
+
+	props: {
+		scope: {
+			required: true
+		},
+		xKey: {
+			required: true
+		},
+	},
+
+	emits: ['info'],
+	
+	data() {
+		return {
+			INFO: {
+				title: this.$ts.registry,
+				icon: faCogs
+			},
+			value: null,
+			valueForEditor: null,
+			faSave, faTrash,
+		}
+	},
+
+	watch: {
+		key() {
+			this.fetch();
+		},
+	},
+
+	mounted() {
+		this.$emit('info', this.INFO);
+		this.fetch();
+	},
+
+	methods: {
+		fetch() {
+			os.api('i/registry/get-detail', {
+				scope: this.scope,
+				key: this.xKey
+			}).then(value => {
+				this.value = value;
+				this.valueForEditor = JSON5.stringify(this.value.value, null, '\t');
+			});
+		},
+
+		save() {
+			try {
+				JSON5.parse(this.valueForEditor);
+			} catch (e) {
+				os.dialog({
+					type: 'error',
+					text: this.$ts.invalidValue
+				});
+				return;
+			}
+
+			os.dialog({
+				type: 'warning',
+				text: this.$ts.saveConfirm,
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (canceled) return;
+				os.apiWithDialog('i/registry/set', {
+					scope: this.scope,
+					key: this.xKey,
+					value: JSON5.parse(this.valueForEditor)
+				});
+			});
+		},
+
+		del() {
+			os.dialog({
+				type: 'warning',
+				text: this.$ts.deleteConfirm,
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (canceled) return;
+				os.apiWithDialog('i/registry/remove', {
+					scope: this.scope,
+					key: this.xKey
+				});
+			});
+		}
+	}
+});
+</script>
--- a/src/client/pages/settings/registry.vue
+++ b/src/client/pages/settings/registry.vue
@@ -0,0 +1,91 @@
+<template>
+<FormBase>
+	<FormGroup v-if="scopes">
+		<template #label>{{ $ts.system }}</template>
+		<FormLink v-for="scope in scopes" :to="`/settings/registry/keys/system/${scope.join('/')}`" class="_monospace">{{ scope.join('/') }}</FormLink>
+	</FormGroup>
+	<FormButton @click="createKey" primary>{{ $ts._registry.createKey }}</FormButton>
+</FormBase>
+</template>
+
+<script lang="ts">
+import { defineAsyncComponent, defineComponent } from 'vue';
+import { faCogs } from '@fortawesome/free-solid-svg-icons';
+import * as JSON5 from 'json5';
+import MkInfo from '@/components/ui/info.vue';
+import FormSwitch from '@/components/form/switch.vue';
+import FormSelect from '@/components/form/select.vue';
+import FormLink from '@/components/form/link.vue';
+import FormBase from '@/components/form/base.vue';
+import FormGroup from '@/components/form/group.vue';
+import FormButton from '@/components/form/button.vue';
+import FormKeyValueView from '@/components/form/key-value-view.vue';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+		MkInfo,
+		FormBase,
+		FormSelect,
+		FormSwitch,
+		FormButton,
+		FormLink,
+		FormGroup,
+		FormKeyValueView,
+	},
+
+	emits: ['info'],
+	
+	data() {
+		return {
+			INFO: {
+				title: this.$ts.registry,
+				icon: faCogs
+			},
+			scopes: null,
+		}
+	},
+
+	created() {
+		this.fetch();
+	},
+
+	mounted() {
+		this.$emit('info', this.INFO);
+	},
+
+	methods: {
+		fetch() {
+			os.api('i/registry/scopes').then(scopes => {
+				this.scopes = scopes.slice().sort((a, b) => a.join('/').localeCompare(b.join('/')));
+			});
+		},
+
+		async createKey() {
+			const { canceled, result } = await os.form(this.$ts._registry.createKey, {
+				key: {
+					type: 'string',
+					label: this.$ts._registry.key,
+				},
+				value: {
+					type: 'string',
+					multiline: true,
+					label: this.$ts.value,
+				},
+				scope: {
+					type: 'string',
+					label: this.$ts._registry.scope,
+				}
+			});
+			if (canceled) return;
+			os.apiWithDialog('i/registry/set', {
+				scope: result.scope.split('/'),
+				key: result.key,
+				value: JSON5.parse(result.value),
+			}).then(() => {
+				this.fetch();
+			});
+		}
+	}
+});
+</script>
--- a/src/client/pages/settings/sidebar.vue
+++ b/src/client/pages/settings/sidebar.vue
@@ -90,12 +90,25 @@ export default defineComponent({

 		save() {
 			this.$store.set('menu', this.splited);
+			this.reloadAsk();
 		},

 		reset() {
 			this.$store.reset('menu');
 			this.items = this.$store.state.menu.join('\n');
+			this.reloadAsk();
 		},
+
+		async reloadAsk() {
+			const { canceled } = await os.dialog({
+				type: 'info',
+				text: this.$ts.reloadToApplySetting,
+				showCancelButton: true
+			});
+			if (canceled) return;
+
+			location.reload();
+		}
 	},
 });
 </script>
--- a/src/client/pages/settings/theme.install.vue
+++ b/src/client/pages/settings/theme.install.vue
@@ -25,6 +25,7 @@ import FormButton from '@/components/form/button.vue';
 import { applyTheme, validateTheme } from '@/scripts/theme';
 import * as os from '@/os';
 import { ColdDeviceStorage } from '@/store';
+import { addTheme, getThemes } from '@/theme-store';

 export default defineComponent({
 	components: {
@@ -74,7 +75,7 @@ export default defineComponent({
 				});
 				return false;
 			}
-			if (ColdDeviceStorage.get('themes').some(t => t.id === theme.id)) {
+			if (getThemes().some(t => t.id === theme.id)) {
 				os.dialog({
 					type: 'info',
 					text: this.$ts._theme.alreadyInstalled
@@ -90,11 +91,10 @@ export default defineComponent({
 			if (theme) applyTheme(theme, false);
 		},

-		install(code) {
+		async install(code) {
 			const theme = this.parseThemeCode(code);
 			if (!theme) return;
-			const themes = ColdDeviceStorage.get('themes').concat(theme);
-			ColdDeviceStorage.set('themes', themes);
+			await addTheme(theme);
 			os.dialog({
 				type: 'success',
 				text: this.$t('_theme.installed', { name: theme.name })
--- a/src/client/pages/settings/theme.manage.vue
+++ b/src/client/pages/settings/theme.manage.vue
@@ -1,9 +1,11 @@
 <template>
 <FormBase>
 	<FormSelect v-model:value="selectedThemeId">
-		<template #label>{{ $ts.installedThemes }}</template>
-		<option v-for="x in installedThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
-		<optgroup :label="$ts.builtinThemes">
+		<template #label>{{ $ts.theme }}</template>
+		<optgroup :label="$ts._theme.installedThemes">
+			<option v-for="x in installedThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
+		</optgroup>
+		<optgroup :label="$ts._theme.builtinThemes">
 			<option v-for="x in builtinThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
 		</optgroup>
 	</FormSelect>
@@ -35,6 +37,7 @@ import { Theme, builtinThemes } from '@/scripts/theme';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
 import * as os from '@/os';
 import { ColdDeviceStorage } from '@/store';
+import { getThemes, removeTheme } from '@/theme-store';

 export default defineComponent({
 	components: {
@@ -55,7 +58,7 @@ export default defineComponent({
 				title: this.$ts._theme.manage,
 				icon: faFolderOpen
 			},
-			installedThemes: ColdDeviceStorage.ref('themes'),
+			installedThemes: getThemes(),
 			builtinThemes,
 			selectedThemeId: null,
 			faPalette, faDownload, faFolderOpen, faCheck, faTrashAlt, faEye
@@ -89,10 +92,7 @@ export default defineComponent({
 		},

 		uninstall() {
-			const theme = this.selectedTheme;
-			const themes = ColdDeviceStorage.get('themes').filter(t => t.id != theme.id);
-			ColdDeviceStorage.set('themes', themes);
-			os.success();
+			removeTheme(this.selectedTheme);
 		},
 	}
 });
--- a/src/client/pages/settings/theme.vue
+++ b/src/client/pages/settings/theme.vue
@@ -49,11 +49,14 @@
 	<FormButton primary v-else @click="wallpaper = null">{{ $ts.removeWallpaper }}</FormButton>

 	<FormGroup>
-		<FormLink to="https://assets.msky.cafe/theme/list" external>{{ $ts._theme.explore }}</FormLink>
-		<FormLink to="/theme-editor">{{ $ts._theme.make }}</FormLink>
+		<FormLink to="https://assets.msky.cafe/theme/list" external><template #icon><Fa :icon="faGlobe"/></template>{{ $ts._theme.explore }}</FormLink>
+		<FormLink to="/settings/theme/install"><template #icon><Fa :icon="faDownload"/></template>{{ $ts._theme.install }}</FormLink>
 	</FormGroup>

-	<FormLink to="/settings/theme/install"><template #icon><Fa :icon="faDownload"/></template>{{ $ts._theme.install }}</FormLink>
+	<FormGroup>
+		<FormLink to="/theme-editor"><template #icon><Fa :icon="faPaintRoller"/></template>{{ $ts._theme.make }}</FormLink>
+		<FormLink to="/advanced-theme-editor"><template #icon><Fa :icon="faPaintRoller"/></template>{{ $ts._theme.make }} ({{ $ts.advanced }})</FormLink>
+	</FormGroup>

 	<FormLink to="/settings/theme/manage"><template #icon><Fa :icon="faFolderOpen"/></template>{{ $ts._theme.manage }}</FormLink>
 </FormBase>
@@ -61,7 +64,7 @@

 <script lang="ts">
 import { computed, defineComponent, onMounted, ref, watch } from 'vue';
-import { faPalette, faDownload, faFolderOpen, faCheck, faTrashAlt, faEye } from '@fortawesome/free-solid-svg-icons';
+import { faPalette, faDownload, faFolderOpen, faCheck, faTrashAlt, faEye, faGlobe, faPaintRoller } from '@fortawesome/free-solid-svg-icons';
 import FormSwitch from '@/components/form/switch.vue';
 import FormSelect from '@/components/form/select.vue';
 import FormBase from '@/components/form/base.vue';
@@ -74,6 +77,7 @@ import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
 import { ColdDeviceStorage } from '@/store';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
+import { fetchThemes, getThemes } from '@/theme-store';

 export default defineComponent({
 	components: {
@@ -93,7 +97,7 @@ export default defineComponent({
 			icon: faPalette
 		};

-		const installedThemes = ColdDeviceStorage.ref('themes');
+		const installedThemes = ref(getThemes());
 		const themes = computed(() => builtinThemes.concat(installedThemes.value));
 		const darkThemes = computed(() => themes.value.filter(t => t.base == 'dark' || t.kind == 'dark'));
 		const lightThemes = computed(() => themes.value.filter(t => t.base == 'light' || t.kind == 'light'));
@@ -134,6 +138,10 @@ export default defineComponent({
 			emit('info', INFO);
 		});

+		fetchThemes().then(() => {
+			installedThemes.value = getThemes();
+		});
+
 		return {
 			INFO,
 			darkThemes,
@@ -148,7 +156,7 @@ export default defineComponent({
 					wallpaper.value = file.url;
 				});
 			},
-			faPalette, faDownload, faFolderOpen, faCheck, faTrashAlt, faEye
+			faPalette, faDownload, faFolderOpen, faCheck, faTrashAlt, faEye, faGlobe, faPaintRoller,
 		};
 	}
 });
--- a/src/client/pages/theme-editor.vue
+++ b/src/client/pages/theme-editor.vue
@@ -1,121 +1,70 @@
 <template>
-<div class="t9makv94">
-	<section class="_section">
-		<div class="_content">
-			<details>
-				<summary>{{ $ts.import }}</summary>
-				<MkTextarea v-model:value="themeToImport">
-					{{ $ts._theme.importInfo }}
-				</MkTextarea>
-				<MkButton :disabled="!themeToImport.trim()" @click="importTheme">{{ $ts.import }}</MkButton>
-			</details>
-		</div>
-	</section>
-	<section class="_section">
-		<div class="_content _card _vMargin">
-			<div class="_content">
-				<MkInput v-model:value="name" required><span>{{ $ts.name }}</span></MkInput>
-				<MkInput v-model:value="author" required><span>{{ $ts.author }}</span></MkInput>
-				<MkTextarea v-model:value="description"><span>{{ $ts.description }}</span></MkTextarea>
-				<div class="_inputs">
-					<div v-text="$ts._theme.base" />
-					<MkRadio v-model="baseTheme" value="light">{{ $ts.light }}</MkRadio>
-					<MkRadio v-model="baseTheme" value="dark">{{ $ts.dark }}</MkRadio>
-				</div>
+<FormBase class="cwepdizn">
+	<div class="_formItem colorPicker">
+		<div class="_formLabel">{{ $ts.backgroundColor }}</div>
+		<div class="_formPanel colors">
+			<div class="row">
+				<button v-for="color in bgColors.filter(x => x.kind === 'light')" :key="color.color" @click="bgColor = color" class="color _button" :class="{ active: bgColor?.color === color.color }">
+					<div class="preview" :style="{ background: color.forPreview }"></div>
+				</button>
+			</div>
+			<div class="row">
+				<button v-for="color in bgColors.filter(x => x.kind === 'dark')" :key="color.color" @click="bgColor = color" class="color _button" :class="{ active: bgColor?.color === color.color }">
+					<div class="preview" :style="{ background: color.forPreview }"></div>
+				</button>
 			</div>
 		</div>
-		<div class="_content _card _vMargin">
-			<div class="list-view _content">
-				<div class="item" v-for="([ k, v ], i) in theme" :key="k">
-					<div class="_inputs">
-						<div>
-							{{ k.startsWith('$') ? `${k} (${$ts._theme.constant})` : $t('_theme.keys.' + k) }}
-							<button v-if="k.startsWith('$')" class="_button _link" @click="del(i)" v-text="$ts.delete" />
-						</div>
-						<div>
-							<div class="type" @click="chooseType($event, i)">
-								{{ getTypeOf(v) }} <Fa :icon="faChevronDown"/>
-							</div>
-							<!-- default -->
-							<div v-if="v === null" v-text="baseProps[k]" class="default-value" />
-							<!-- color -->
-							<div v-else-if="typeof v === 'string'" class="color">
-								<input type="color" :value="v" @input="colorChanged($event.target.value, i)"/>
-								<MkInput class="select" :value="v" @update:value="colorChanged($event, i)"/>
-							</div>
-							<!-- ref const -->
-							<MkInput v-else-if="v.type === 'refConst'" v-model:value="v.key">
-								<template #prefix>$</template>
-								<span>{{ $ts.name }}</span>
-							</MkInput>
-							<!-- ref props -->
-							<MkSelect class="select" v-else-if="v.type === 'refProp'" v-model:value="v.key">
-								<option v-for="key in themeProps" :value="key" :key="key">{{ $t('_theme.keys.' + key) }}</option>
-							</MkSelect>
-							<!-- func -->
-							<template v-else-if="v.type === 'func'">
-								<MkSelect class="select" v-model:value="v.name">
-									<template #label>{{ $ts._theme.funcKind }}</template>
-									<option v-for="n in ['alpha', 'darken', 'lighten']" :value="n" :key="n">{{ $t('_theme.' + n) }}</option>
-								</MkSelect>
-								<MkInput type="number" v-model:value="v.arg"><span>{{ $ts._theme.argument }}</span></MkInput>
-								<MkSelect class="select" v-model:value="v.value">
-									<template #label>{{ $ts._theme.basedProp }}</template>
-									<option v-for="key in themeProps" :value="key" :key="key">{{ $t('_theme.keys.' + key) }}</option>
-								</MkSelect>
-							</template>
-							<!-- CSS -->
-							<MkInput v-else-if="v.type === 'css'" v-model:value="v.value">
-								<span>CSS</span>
-							</MkInput>
-						</div>
-					</div>
-				</div>
-				<MkButton primary @click="addConst">{{ $ts._theme.addConstant }}</MkButton>
+	</div>
+	<div class="_formItem colorPicker">
+		<div class="_formLabel">{{ $ts.accentColor }}</div>
+		<div class="_formPanel colors">
+			<div class="row">
+				<button v-for="color in accentColors" :key="color" @click="accentColor = color" class="color rounded _button" :class="{ active: accentColor === color }">
+					<div class="preview" :style="{ background: color }"></div>
+				</button>
 			</div>
 		</div>
-	</section>
-	<section class="_section">
-		<details class="_content">
-			<summary>{{ $ts.sample }}</summary>
-			<MkSample/>
-		</details>
-	</section>
-	<section class="_section">
-		<div class="_content">
-			<MkButton inline @click="preview">{{ $ts.preview }}</MkButton>
-			<MkButton inline primary :disabled="!name || !author" @click="save">{{ $ts.save }}</MkButton>
+	</div>
+	<div class="_formItem colorPicker">
+		<div class="_formLabel">{{ $ts.textColor }}</div>
+		<div class="_formPanel colors">
+			<div class="row">
+				<button v-for="color in fgColors" :key="color" @click="fgColor = color" class="color char _button" :class="{ active: fgColor === color }">
+					<div class="preview" :style="{ color: color.forPreview ? color.forPreview : bgColor?.kind === 'light' ? '#5f5f5f' : '#dadada' }">A</div>
+				</button>
+			</div>
 		</div>
-	</section>
-</div>
+	</div>
+	<div class="_formItem preview">
+		<div class="_formLabel">{{ $ts.preview }}</div>
+		<div class="_formPanel preview">
+			<MkSample class="preview"/>
+		</div>
+	</div>
+	<FormButton @click="saveAs">{{ $ts.saveAs }}</FormButton>
+</FormBase>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
 import { faPalette, faChevronDown, faKeyboard } from '@fortawesome/free-solid-svg-icons';
-import * as JSON5 from 'json5';
 import { toUnicode } from 'punycode';
+import * as tinycolor from 'tinycolor2';
+import { v4 as uuid} from 'uuid';

-import MkRadio from '@/components/ui/radio.vue';
-import MkButton from '@/components/ui/button.vue';
-import MkInput from '@/components/ui/input.vue';
-import MkTextarea from '@/components/ui/textarea.vue';
-import MkSelect from '@/components/ui/select.vue';
+import FormBase from '@/components/form/base.vue';
+import FormButton from '@/components/form/button.vue';
 import MkSample from '@/components/sample.vue';

-import { convertToMisskeyTheme, ThemeValue, convertToViewModel, ThemeViewModel } from '@/scripts/theme-editor';
-import { Theme, applyTheme, lightTheme, darkTheme, themeProps, validateTheme } from '@/scripts/theme';
+import { Theme, applyTheme, validateTheme } from '@/scripts/theme';
 import { host } from '@/config';
 import * as os from '@/os';
 import { ColdDeviceStorage } from '@/store';

 export default defineComponent({
 	components: {
-		MkRadio,
-		MkButton,
-		MkInput,
-		MkTextarea,
-		MkSelect,
+		FormBase,
+		FormButton,
 		MkSample,
 	},

@@ -125,229 +74,172 @@ export default defineComponent({
 				title: this.$ts.themeEditor,
 				icon: faPalette,
 			},
-			theme: [] as ThemeViewModel,
-			name: '',
-			description: '',
-			baseTheme: 'light' as 'dark' | 'light',
-			author: `@${this.$i.username}@${toUnicode(host)}`,
-			themeToImport: '',
-			changed: false,
-			lightTheme, darkTheme, themeProps,
-			faPalette, faChevronDown, faKeyboard,
+			bgColors: [
+				{ color: '#f5f5f5', kind: 'light', forPreview: '#f5f5f5' },
+				{ color: '#f0eee9', kind: 'light', forPreview: '#f3e2b9' },
+				{ color: '#e9eff0', kind: 'light', forPreview: '#bfe3e8' },
+				{ color: '#f0e9ee', kind: 'light', forPreview: '#f1d1e8' },
+				{ color: '#dce2e0', kind: 'light', forPreview: '#a4dccc' },
+				{ color: '#e2e0dc', kind: 'light', forPreview: '#d8c7a5' },
+				{ color: '#d5dbe0', kind: 'light', forPreview: '#b0cae0' },
+				{ color: '#dad5d5', kind: 'light', forPreview: '#d6afaf' },
+				{ color: '#2b2b2b', kind: 'dark', forPreview: '#444444' },
+				{ color: '#362e29', kind: 'dark', forPreview: '#735c4d' },
+				{ color: '#303629', kind: 'dark', forPreview: '#506d2f' },
+				{ color: '#293436', kind: 'dark', forPreview: '#258192' },
+				{ color: '#2e2936', kind: 'dark', forPreview: '#504069' },
+				{ color: '#252722', kind: 'dark', forPreview: '#3c462f' },
+				{ color: '#212525', kind: 'dark', forPreview: '#303e3e' },
+				{ color: '#191919', kind: 'dark', forPreview: '#272727' },
+			],
+			bgColor: null,
+			accentColors: ['#e36749', '#f29924', '#98c934', '#34c9a9', '#34a1c9', '#606df7', '#8d34c9', '#e84d83'],
+			accentColor: null,
+			fgColors: [
+				{ color: 'none', forLight: '#5f5f5f', forDark: '#dadada', forPreview: null },
+				{ color: 'red', forLight: '#7f6666', forDark: '#e4d1d1', forPreview: '#ca4343' },
+				{ color: 'yellow', forLight: '#736955', forDark: '#e0d5c0', forPreview: '#d49923' },
+				{ color: 'green', forLight: '#586d5b', forDark: '#d1e4d4', forPreview: '#4cbd5c' },
+				{ color: 'cyan', forLight: '#5d7475', forDark: '#d1e3e4', forPreview: '#2abdc3' },
+				{ color: 'blue', forLight: '#676880', forDark: '#d1d2e4', forPreview: '#7275d8' },
+				{ color: 'pink', forLight: '#84667d', forDark: '#e4d1e0', forPreview: '#b12390' },
+			],
+			fgColor: null,
+			faPalette,
 		}
 	},

-	computed: {
-		baseProps() {
-			return this.baseTheme === 'light' ? this.lightTheme.props : this.darkTheme.props;
-		},
-	},
+	created() {
+		const currentBgColor = getComputedStyle(document.documentElement).getPropertyValue('--bg');
+		const matchedBgColor = this.bgColors.find(x => tinycolor(x.color).toRgbString() === tinycolor(currentBgColor).toRgbString());
+		if (matchedBgColor) this.bgColor = matchedBgColor;
+		const currentAccentColor = getComputedStyle(document.documentElement).getPropertyValue('--accent');
+		const matchedAccentColor = this.accentColors.find(x => tinycolor(x).toRgbString() === tinycolor(currentAccentColor).toRgbString());
+		if (matchedAccentColor) this.accentColor = matchedAccentColor;
+		const currentFgColor = getComputedStyle(document.documentElement).getPropertyValue('--fg');
+		const matchedFgColor = this.fgColors.find(x => [tinycolor(x.forLight).toRgbString(), tinycolor(x.forDark).toRgbString()].includes(tinycolor(currentFgColor).toRgbString()));
+		if (matchedFgColor) this.fgColor = matchedFgColor;

-	beforeUnmount() {
-		window.removeEventListener('beforeunload', this.beforeunload);
-	},
-
-	async beforeRouteLeave(to, from, next) {
-		if (this.changed && !(await this.confirm())) {
-			next(false);
-		} else {
-			next();
-		}
-	},
-
-	mounted() {
-		this.init();
-		window.addEventListener('beforeunload', this.beforeunload);
-		const changed = () => this.changed = true;
-		this.$watch('name', changed);
-		this.$watch('description', changed);
-		this.$watch('baseTheme', changed);
-		this.$watch('author', changed);
-		this.$watch('theme', changed);
+		this.$watch('bgColor', this.apply);
+		this.$watch('accentColor', this.apply);
+		this.$watch('fgColor', this.apply);
 	},

 	methods: {
-		beforeunload(e: BeforeUnloadEvent) {
-			if (this.changed) {
-				e.preventDefault();
-				e.returnValue = '';
-			}
+		convert() {
+			return {
+				id: '#MY_THEME#',
+				name: this.$ts.myTheme,
+				base: this.bgColor.kind,
+				props: {
+					bg: this.bgColor.color,
+					fg: this.bgColor.kind === 'light' ? this.fgColor.forLight : this.fgColor.forDark,
+					accent: this.accentColor,
+				}
+			};
 		},

-		async confirm(): Promise<boolean> {
-			const { canceled } = await os.dialog({
-				type: 'warning',
-				text: this.$ts.leaveConfirm,
-				showCancelButton: true
-			});
-			return !canceled;
+		apply() {
+			if (this.bgColor == null) this.bgColor = this.bgColors[0];
+			if (this.accentColor == null) this.accentColor = this.accentColors[0];
+			if (this.fgColor == null) this.fgColor = this.fgColors[0];
+
+			const theme = this.convert();
+			applyTheme(theme, true);
+
+			const themes = ColdDeviceStorage.get('themes').filter(t => t.id != '#MY_THEME#').concat(theme);
+			ColdDeviceStorage.set('themes', themes);
+			ColdDeviceStorage.set('lightTheme', theme.id);
+			ColdDeviceStorage.set('darkTheme', theme.id);
 		},

-		init() {
-			const t: ThemeViewModel = [];
-			for (const key of themeProps) {
-				t.push([ key, null ]);
-			}
-			this.theme = t;
-		},
-	
-		async del(i: number) {
-			const { canceled } = await os.dialog({ 
-				type: 'warning',
-				showCancelButton: true,
-				text: this.$t('_theme.deleteConstantConfirm', { const: this.theme[i][0] }),
+		async saveAs() {
+			const { canceled, result: name } = await os.dialog({
+				title: this.$ts.name,
+				input: {
+					allowEmpty: false
+				}
 			});
 			if (canceled) return;
-			Vue.delete(this.theme, i);
-		},
-	
-		async addConst() {
-			const { canceled, result } = await os.dialog({
-				title: this.$ts._theme.inputConstantName,
-				input: true
-			});
-			if (canceled) return;
-			this.theme.push([ '$' + result, '#000000']);
-		},
-	
-		save() {
-			const theme = convertToMisskeyTheme(this.theme, this.name, this.description, this.author, this.baseTheme);
+
+			const theme = this.convert();
+			theme.id = uuid();
+			theme.name = name;
+			theme.author = `@${this.$i.username}@${toUnicode(host)}`;
 			const themes = ColdDeviceStorage.get('themes').concat(theme);
 			ColdDeviceStorage.set('themes', themes);
+			ColdDeviceStorage.set('lightTheme', theme.id);
+			ColdDeviceStorage.set('darkTheme', theme.id);
 			os.dialog({
 				type: 'success',
 				text: this.$t('_theme.installed', { name: theme.name })
 			});
-			this.changed = false;
-		},
-	
-		preview() {
-			const theme = convertToMisskeyTheme(this.theme, this.name, this.description, this.author, this.baseTheme);
-			try {
-				applyTheme(theme, false);
-			} catch (e) {
-				os.dialog({
-					type: 'error',
-					text: e.message
-				});
-			}
-		},
-	
-		async importTheme() {
-			if (this.changed && (!await this.confirm())) return;
-
-			try {
-				const theme = JSON5.parse(this.themeToImport) as Theme;
-				if (!validateTheme(theme)) throw new Error(this.$ts._theme.invalid);
-
-				this.name = theme.name;
-				this.description = theme.desc || '';
-				this.author = theme.author;
-				this.baseTheme = theme.base || 'light';
-				this.theme = convertToViewModel(theme);
-				this.themeToImport = '';
-			} catch (e) {
-				os.dialog({
-					type: 'error',
-					text: e.message
-				});
-			}
-		},
-	
-		colorChanged(color: string, i: number) {
-			this.theme[i] = [this.theme[i][0], color];
-		},
-
-		getTypeOf(v: ThemeValue) {
-			return v === null
-				? this.$ts._theme.defaultValue
-				: typeof v === 'string'
-					? this.$ts._theme.color
-					: this.$t('_theme.' + v.type);
-		},
-	
-		async chooseType(e: MouseEvent, i: number) {
-			const newValue = await this.showTypeMenu(e);
-			this.theme[i] = [ this.theme[i][0], newValue ];
-		},
-	
-		showTypeMenu(e: MouseEvent) {
-			return new Promise<ThemeValue>((resolve) => {
-				os.modalMenu([{
-					text: this.$ts._theme.defaultValue,
-					action: () => resolve(null),
-				}, {
-					text: this.$ts._theme.color,
-					action: () => resolve('#000000'),
-				}, {
-					text: this.$ts._theme.func,
-					action: () => resolve({
-						type: 'func', name: 'alpha', arg: 1, value: 'accent'
-					}),
-				}, {
-					text: this.$ts._theme.refProp,
-					action: () => resolve({
-						type: 'refProp', key: 'accent',
-					}),
-				}, {
-					text: this.$ts._theme.refConst,
-					action: () => resolve({
-						type: 'refConst', key: '',
-					}),
-				}, {
-					text: 'CSS',
-					action: () => resolve({
-						type: 'css', value: '',
-					}),
-				}], e.currentTarget || e.target);
-			});
 		}
 	}
 });
 </script>

 <style lang="scss" scoped>
-.t9makv94 {
-	> ._section {
-		> ._content {
-			> .list-view {
-				> .item {
-					min-height: 48px;
-					word-break: break-all;
+.cwepdizn {
+	max-width: 800px;
+	margin: 0 auto;

-					&:not(:last-child) {
-						margin-bottom: 8px;
+	> .colorPicker {
+		> .colors {
+			padding: 32px;
+			text-align: center;
+
+			> .row {
+				> .color {
+					display: inline-block;
+					position: relative;
+					width: 64px;
+					height: 64px;
+					border-radius: 8px;
+
+					> .preview {
+						position: absolute;
+						top: 0;
+						left: 0;
+						right: 0;
+						bottom: 0;
+						margin: auto;
+						width: 42px;
+						height: 42px;
+						border-radius: 4px;
+						box-shadow: 0 2px 4px rgb(0 0 0 / 30%);
+						transition: transform 0.15s ease;
 					}

-					.select {
-						margin: 24px 0;
-					}
-
-					.type {
-						cursor: pointer;
-					}
-
-					.default-value {
-						opacity: 0.6;
-						pointer-events: none;
-						user-select: none;
-					}
-
-					.color {
-						> input {
-							display: inline-block;
-							width: 1.5em;
-							height: 1.5em;
+					&:hover {
+						> .preview {
+							transform: scale(1.1);
 						}
+					}

-						> div {
-							margin-left: 8px;
-							display: inline-block;
+					&.active {
+						box-shadow: 0 0 0 2px var(--divider) inset;
+					}
+
+					&.rounded {
+						border-radius: 999px;
+
+						> .preview {
+							border-radius: 999px;
 						}
 					}
+
+					&.char {
+						line-height: 42px;
+					}
 				}
 			}
 		}
 	}
+
+	> .preview > .preview > .preview {
+		box-shadow: none;
+		background: transparent;
+	}
 }
 </style>
--- a/src/client/pages/timeline.vue
+++ b/src/client/pages/timeline.vue
@@ -1,10 +1,26 @@
 <template>
-<div class="mk-home" v-hotkey.global="keymap">
+<div class="cmuxhskf" v-hotkey.global="keymap">
 	<div class="new" v-if="queue > 0" :style="{ width: width + 'px' }"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div>

 	<div class="_section">
 		<XTutorial v-if="$store.reactiveState.tutorial.value != -1" class="tutorial _content _vMargin"/>
 		<XPostForm v-if="$store.reactiveState.showFixedPostForm.value" class="post-form _panel _content _vMargin" fixed/>
+		<div class="tabs _panel _vMargin">
+			<div class="left">
+				<button class="_button tab" @click="() => { src = 'home'; saveSrc(); }" :class="{ active: src === 'home' }" v-tooltip="$ts._timelines.home"><Fa :icon="faHome"/></button>
+				<button class="_button tab" @click="() => { src = 'local'; saveSrc(); }" :class="{ active: src === 'local' }" v-tooltip="$ts._timelines.local" v-if="isLocalTimelineAvailable"><Fa :icon="faComments"/></button>
+				<button class="_button tab" @click="() => { src = 'social'; saveSrc(); }" :class="{ active: src === 'social' }" v-tooltip="$ts._timelines.social" v-if="isLocalTimelineAvailable"><Fa :icon="faShareAlt"/></button>
+				<button class="_button tab" @click="() => { src = 'global'; saveSrc(); }" :class="{ active: src === 'global' }" v-tooltip="$ts._timelines.global" v-if="isGlobalTimelineAvailable"><Fa :icon="faGlobe"/></button>
+				<span class="divider"></span>
+				<button class="_button tab" @click="() => { src = 'mentions'; saveSrc(); }" :class="{ active: src === 'mentions' }" v-tooltip="$ts.mentions"><Fa :icon="faAt"/><Fa :icon="faCircle" class="i" v-if="$i.hasUnreadMentions"/></button>
+				<button class="_button tab" @click="() => { src = 'directs'; saveSrc(); }" :class="{ active: src === 'directs' }" v-tooltip="$ts.directNotes"><Fa :icon="faEnvelope"/><Fa :icon="faCircle" class="i" v-if="$i.hasUnreadSpecifiedNotes"/></button>
+			</div>
+			<div class="right">
+				<button class="_button tab" @click="chooseChannel" :class="{ active: src === 'channel' }" v-tooltip="$ts.channel"><Fa :icon="faSatelliteDish"/><Fa :icon="faCircle" class="i" v-if="$i.hasUnreadChannel"/></button>
+				<button class="_button tab" @click="chooseAntenna" :class="{ active: src === 'antenna' }" v-tooltip="$ts.antennas"><Fa :icon="faSatellite"/><Fa :icon="faCircle" class="i" v-if="$i.hasUnreadAntenna"/></button>
+				<button class="_button tab" @click="chooseList" :class="{ active: src === 'list' }" v-tooltip="$ts.lists"><Fa :icon="faListUl"/></button>
+			</div>
+		</div>
 		<XTimeline ref="tl"
 			class="_content _vMargin"
 			:key="src === 'list' ? `list:${list.id}` : src === 'antenna' ? `antenna:${antenna.id}` : src === 'channel' ? `channel:${channel.id}` : src"
@@ -23,8 +39,8 @@

 <script lang="ts">
 import { defineComponent, defineAsyncComponent, computed } from 'vue';
-import { faAngleDown, faAngleUp, faHome, faShareAlt, faGlobe, faListUl, faSatellite, faSatelliteDish, faCircle, faEllipsisH, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
-import { faComments } from '@fortawesome/free-regular-svg-icons';
+import { faAngleDown, faAngleUp, faHome, faShareAlt, faGlobe, faListUl, faSatellite, faSatelliteDish, faCircle, faEllipsisH, faPencilAlt, faAt } from '@fortawesome/free-solid-svg-icons';
+import { faComments, faEnvelope } from '@fortawesome/free-regular-svg-icons';
 import Progress from '@/scripts/loading';
 import XTimeline from '@/components/timeline.vue';
 import XPostForm from '@/components/post-form.vue';
@@ -49,64 +65,15 @@ export default defineComponent({
 			menuOpened: false,
 			queue: 0,
 			width: 0,
-			INFO: computed(() => {
-				const tabs = [{
-					id: 'home',
-					title: null,
-					tooltip: this.$ts._timelines.home,
-					icon: faHome,
-					onClick: () => { this.src = 'home'; this.saveSrc(); },
-					selected: computed(() => this.src === 'home')
-				}];
-
-				if (!this.$instance.disableLocalTimeline || this.$i.isModerator || this.$i.isAdmin) {
-					tabs.push({
-						id: 'local',
-						title: null,
-						tooltip: this.$ts._timelines.local,
-						icon: faComments,
-						onClick: () => { this.src = 'local'; this.saveSrc(); },
-						selected: computed(() => this.src === 'local')
-					});
-
-					tabs.push({
-						id: 'social',
-						title: null,
-						tooltip: this.$ts._timelines.social,
-						icon: faShareAlt,
-						onClick: () => { this.src = 'social'; this.saveSrc(); },
-						selected: computed(() => this.src === 'social')
-					});
+			INFO: computed(() => ({
+				title: this.$ts.timeline,
+				icon: this.src === 'local' ? faComments : this.src === 'social' ? faShareAlt : this.src === 'global' ? faGlobe : faHome,
+				action: {
+					icon: faPencilAlt,
+					handler: () => os.post()
 				}
-
-				if (!this.$instance.disableGlobalTimeline || this.$i.isModerator || this.$i.isAdmin) {
-					tabs.push({
-						id: 'global',
-						title: null,
-						tooltip: this.$ts._timelines.global,
-						icon: faGlobe,
-						onClick: () => { this.src = 'global'; this.saveSrc(); },
-						selected: computed(() => this.src === 'global')
-					});
-				}
-
-				tabs.push({
-					id: 'other',
-					title: null,
-					icon: faEllipsisH,
-					onClick: this.choose,
-					indicate: computed(() => this.$i.hasUnreadAntenna || this.$i.hasUnreadChannel)
-				});
-
-				return {
-					tabs,
-					action: {
-						icon: faPencilAlt,
-						handler: () => os.post()
-					}
-				};
-			}),
-			faAngleDown, faAngleUp, faHome, faShareAlt, faGlobe, faComments, faListUl, faSatellite, faSatelliteDish, faCircle
+			})),
+			faAngleDown, faAngleUp, faHome, faShareAlt, faGlobe, faComments, faListUl, faSatellite, faSatelliteDish, faCircle, faEllipsisH, faAt, faEnvelope,
 		};
 	},

@@ -117,8 +84,12 @@ export default defineComponent({
 			};
 		},

-		meta() {
-			return this.$instance;
+		isLocalTimelineAvailable(): boolean {
+			return !this.$instance.disableLocalTimeline || this.$i.isModerator || this.$i.isAdmin;
+		},
+
+		isGlobalTimelineAvailable(): boolean {
+			return !this.$instance.disableGlobalTimeline || this.$i.isModerator || this.$i.isAdmin;
 		},
 	},

@@ -176,16 +147,23 @@ export default defineComponent({
 			scroll(this.$el, 0);
 		},

-		async choose(ev) {
-			if (this.meta == null) return;
-			const [antennas, lists, channels] = await Promise.all([
-				os.api('antennas/list'),
-				os.api('users/lists/list'),
-				os.api('channels/followed'),
-			]);
-			const antennaItems = antennas.map(antenna => ({
+		async chooseList(ev) {
+			const lists = await os.api('users/lists/list');
+			const items = lists.map(list => ({
+				text: list.name,
+				action: () => {
+					this.list = list;
+					this.src = 'list';
+					this.saveSrc();
+				}
+			}));
+			os.modalMenu(items, ev.currentTarget || ev.target);
+		},
+
+		async chooseAntenna(ev) {
+			const antennas = await os.api('antennas/list');
+			const items = antennas.map(antenna => ({
 				text: antenna.name,
-				icon: faSatellite,
 				indicate: antenna.hasUnreadNote,
 				action: () => {
 					this.antenna = antenna;
@@ -193,18 +171,13 @@ export default defineComponent({
 					this.saveSrc();
 				}
 			}));
-			const listItems = lists.map(list => ({
-				text: list.name,
-				icon: faListUl,
-				action: () => {
-					this.list = list;
-					this.src = 'list';
-					this.saveSrc();
-				}
-			}));
-			const channelItems = channels.map(channel => ({
+			os.modalMenu(items, ev.currentTarget || ev.target);
+		},
+
+		async chooseChannel(ev) {
+			const channels = await os.api('channels/followed');
+			const items = channels.map(channel => ({
 				text: channel.name,
-				icon: faSatelliteDish,
 				indicate: channel.hasUnreadNote,
 				action: () => {
 					// NOTE: チャンネルタイムラインをこのコンポーネントで表示するようにすると投稿フォームはどうするかなどの問題が生じるのでとりあえずページ遷移で
@@ -214,7 +187,7 @@ export default defineComponent({
 					this.$router.push(`/channels/${channel.id}`);
 				}
 			}));
-			os.modalMenu([...antennaItems, listItems.length > 0 ? null : undefined, ...listItems, channelItems.length > 0 ? null : undefined, ...channelItems], ev.currentTarget || ev.target);
+			os.modalMenu(items, ev.currentTarget || ev.target);
 		},

 		saveSrc() {
@@ -235,7 +208,7 @@ export default defineComponent({
 </script>

 <style lang="scss" scoped>
-.mk-home {
+.cmuxhskf {
 	> .new {
 		position: fixed;
 		z-index: 1000;
@@ -249,7 +222,71 @@ export default defineComponent({
 	}

 	> ._section {
+		> .tabs {
+			display: flex;
+			box-sizing: border-box;
+			padding: 0 8px;
+			max-width: var(--baseContentWidth);
+			margin-left: auto;
+			margin-right: auto;
+			white-space: nowrap;
+			overflow: auto;

+			// 影の都合上
+			position: relative;
+
+			> .right {
+				margin-left: auto;
+			}
+
+			> .left, > .right {
+				> .tab {
+					position: relative;
+					height: 50px;
+					padding: 0 12px;
+
+					&:hover {
+						color: var(--fgHighlighted);
+					}
+
+					&.active {
+						color: var(--fgHighlighted);
+
+						&:after {
+							content: "";
+							display: block;
+							position: absolute;
+							bottom: 0;
+							left: 0;
+							right: 0;
+							margin: 0 auto;
+							width: calc(100% - 16px);
+							height: 4px;
+							background: var(--accent);
+							border-radius: 8px 8px 0 0;
+						}
+					}
+
+					> .i {
+						position: absolute;
+						top: 16px;
+						right: 8px;
+						color: var(--indicator);
+						font-size: 8px;
+						animation: blink 1s infinite;
+					}
+				}
+
+				> .divider {
+					display: inline-block;
+					width: 1px;
+					height: 28px;
+					vertical-align: middle;
+					margin: 0 8px;
+					background: var(--divider);
+				}
+			}
+		}
 	}
 }
 </style>
--- a/src/client/pages/user/index.vue
+++ b/src/client/pages/user/index.vue
@@ -80,7 +80,7 @@
 				</div>
 				<template v-if="page === 'index'">
 					<div v-if="user.pinnedNotes.length > 0" class="_vMargin">
-						<XNote v-for="note in user.pinnedNotes" class="note _vMargin" :note="note" @update:note="pinnedNoteUpdated(note, $event)" :key="note.id" :detail="true" :pinned="true"/>
+						<XNote v-for="note in user.pinnedNotes" class="note _vMargin" :note="note" @update:note="pinnedNoteUpdated(note, $event)" :key="note.id" :pinned="true"/>
 					</div>
 					<div class="_vMargin">
 						<XUserTimeline :user="user"/>
@@ -195,7 +195,7 @@
 		<template v-if="page === 'index'">
 			<div class="_content _vMargin">
 				<div v-if="user.pinnedNotes.length > 0" class="_vMargin">
-					<XNote v-for="note in user.pinnedNotes" class="note _vMargin" :note="note" @update:note="pinnedNoteUpdated(note, $event)" :key="note.id" :detail="true" :pinned="true"/>
+					<XNote v-for="note in user.pinnedNotes" class="note _vMargin" :note="note" @update:note="pinnedNoteUpdated(note, $event)" :key="note.id" :pinned="true"/>
 				</div>
 				<XPhotos :user="user" :key="user.id" class="_vMargin"/>
 				<XActivity :user="user" :key="user.id" class="_vMargin"/>
--- a/src/client/pages/welcome.entrance.a.vue
+++ b/src/client/pages/welcome.entrance.a.vue
@@ -0,0 +1,308 @@
+<template>
+<div class="rsqzvsbo" v-if="meta">
+	<div class="top">
+		<MkFeaturedPhotos class="bg"/>
+		<XTimeline class="tl"/>
+		<div class="shape"></div>
+		<img src="/assets/misskey.svg" class="misskey"/>
+		<div class="emojis">
+			<MkEmoji :normal="true" :no-style="true" emoji="👍"/>
+			<MkEmoji :normal="true" :no-style="true" emoji="❤"/>
+			<MkEmoji :normal="true" :no-style="true" emoji="😆"/>
+			<MkEmoji :normal="true" :no-style="true" emoji="🎉"/>
+			<MkEmoji :normal="true" :no-style="true" emoji="🍮"/>
+		</div>
+		<div class="main _panel">
+			<div class="bg">
+				<div class="fade"></div>
+			</div>
+			<div class="fg">
+				<h1>
+					<img class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span>
+				</h1>
+				<div class="about">
+					<div class="desc" v-html="meta.description || $ts.headlineMisskey"></div>
+				</div>
+				<div class="action">
+					<MkButton @click="signup()" inline primary>{{ $ts.signup }}</MkButton>
+					<MkButton @click="signin()" inline>{{ $ts.login }}</MkButton>
+				</div>
+				<div class="status" v-if="onlineUsersCount && stats">
+					<div>
+						<I18n :src="$ts.nUsers" text-tag="span" class="users">
+							<template #n><b>{{ number(stats.originalUsersCount) }}</b></template>
+						</I18n>
+						<I18n :src="$ts.nNotes" text-tag="span" class="notes">
+							<template #n><b>{{ number(stats.originalNotesCount) }}</b></template>
+						</I18n>
+					</div>
+					<I18n :src="$ts.onlineUsersCount" text-tag="span" class="online">
+						<template #n><b>{{ onlineUsersCount }}</b></template>
+					</I18n>
+				</div>
+				<button class="_button _acrylic menu" @click="showMenu"><Fa :icon="faEllipsisH"/></button>
+			</div>
+		</div>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { faEllipsisH, faInfoCircle, faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
+import { toUnicode } from 'punycode';
+import XSigninDialog from '@/components/signin-dialog.vue';
+import XSignupDialog from '@/components/signup-dialog.vue';
+import MkButton from '@/components/ui/button.vue';
+import XNote from '@/components/note.vue';
+import MkFeaturedPhotos from '@/components/featured-photos.vue';
+import XTimeline from './welcome.timeline.vue';
+import { host, instanceName } from '@/config';
+import * as os from '@/os';
+import number from '@/filters/number';
+
+export default defineComponent({
+	components: {
+		MkButton,
+		XNote,
+		MkFeaturedPhotos,
+		XTimeline,
+	},
+
+	data() {
+		return {
+			host: toUnicode(host),
+			instanceName,
+			meta: null,
+			stats: null,
+			tags: [],
+			onlineUsersCount: null,
+			faEllipsisH
+		};
+	},
+
+	created() {
+		os.api('meta', { detail: true }).then(meta => {
+			this.meta = meta;
+		});
+
+		os.api('stats').then(stats => {
+			this.stats = stats;
+		});
+
+		os.api('get-online-users-count').then(res => {
+			this.onlineUsersCount = res.count;
+		});
+
+		os.api('hashtags/list', {
+			sort: '+mentionedLocalUsers',
+			limit: 8
+		}).then(tags => {
+			this.tags = tags;
+		});
+	},
+
+	methods: {
+		signin() {
+			os.popup(XSigninDialog, {
+				autoSet: true
+			}, {}, 'closed');
+		},
+
+		signup() {
+			os.popup(XSignupDialog, {
+				autoSet: true
+			}, {}, 'closed');
+		},
+
+		showMenu(ev) {
+			os.modalMenu([{
+				text: this.$t('aboutX', { x: instanceName }),
+				icon: faInfoCircle,
+				action: () => {
+					os.pageWindow('/about');
+				}
+			}, {
+				text: this.$ts.aboutMisskey,
+				icon: faInfoCircle,
+				action: () => {
+					os.pageWindow('/about-misskey');
+				}
+			}, null, {
+				text: this.$ts.help,
+				icon: faQuestionCircle,
+				action: () => {
+					os.pageWindow('/docs');
+				}
+			}], ev.currentTarget || ev.target);
+		},
+
+		number
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.rsqzvsbo {
+	> .top {
+		display: flex;
+		text-align: center;
+		min-height: 100vh;
+		box-sizing: border-box;
+		padding: 16px;
+
+		> .bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+		}
+
+		> .tl {
+			position: absolute;
+			top: 0;
+			bottom: 0;
+			right: 64px;
+			margin: auto;
+			width: 500px;
+			height: calc(100% - 128px);
+			overflow: hidden;
+			-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%);
+			mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%);
+
+			@media (max-width: 1200px) {
+				display: none;
+			}
+		}
+
+		> .shape {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			background: var(--accent);
+			clip-path: polygon(0% 0%, 50% 0%, 15% 100%, 0% 100%);
+		}
+
+		> .misskey {
+			position: absolute;
+			top: 42px;
+			left: 42px;
+			width: 160px;
+
+			@media (max-width: 450px) {
+				width: 130px;
+			}
+		}
+
+		> .emojis {
+			position: absolute;
+			bottom: 32px;
+			left: 35px;
+
+			> * {
+				margin-right: 8px;
+			}
+
+			@media (max-width: 1200px) {
+				display: none;
+			}
+		}
+
+		> .main {
+			position: relative;
+			width: min(480px, 100%);
+			margin: auto auto auto 128px;
+			box-shadow: 0 12px 32px rgb(0 0 0 / 25%);
+
+			@media (max-width: 1200px) {
+				margin: auto;
+			}
+
+			> .bg {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 128px;
+				background-position: center;
+				background-size: cover;
+				opacity: 0.75;
+
+				> .fade {
+					position: absolute;
+					bottom: 0;
+					left: 0;
+					width: 100%;
+					height: 128px;
+					background: linear-gradient(0deg, var(--panel), var(--X15));
+				}
+			}
+
+			> .fg {
+				position: relative;
+				z-index: 1;
+
+				> h1 {
+					display: block;
+					margin: 0;
+					padding: 32px 32px 24px 32px;
+
+					> .logo {
+						vertical-align: bottom;
+						max-height: 120px;
+						max-width: min(100%, 300px);
+					}
+				}
+
+				> .about {
+					padding: 0 32px;
+				}
+
+				> .action {
+					padding: 32px;
+
+					> * {
+						line-height: 28px;
+					}
+				}
+
+				> .status {
+					border-top: solid 1px var(--divider);
+					padding: 32px;
+					font-size: 90%;
+
+					> div {
+						> span:not(:last-child) {
+							padding-right: 1em;
+							margin-right: 1em;
+							border-right: solid 1px var(--divider);
+						}
+					}
+
+					> .online {
+						::v-deep(b) {
+							color: #41b781;
+						}
+
+						::v-deep(span) {
+							opacity: 0.7;
+						}
+					}
+				}
+
+				> .menu {
+					position: absolute;
+					top: 16px;
+					right: 16px;
+					width: 32px;
+					height: 32px;
+					border-radius: 8px;
+				}
+			}
+		}
+	}
+}
+</style>
--- a/src/client/pages/welcome.entrance.b.vue
+++ b/src/client/pages/welcome.entrance.b.vue
@@ -0,0 +1,238 @@
+<template>
+<div class="rsqzvsbo" v-if="meta">
+	<div class="top">
+		<MkFeaturedPhotos class="bg"/>
+		<XTimeline class="tl"/>
+		<div class="shape"></div>
+		<div class="main">
+			<h1>
+				<img class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span>
+			</h1>
+			<div class="about">
+				<div class="desc" v-html="meta.description || $ts.headlineMisskey"></div>
+			</div>
+			<div class="action">
+				<MkButton class="signup" @click="signup()" inline primary>{{ $ts.signup }}</MkButton>
+				<MkButton class="signin" @click="signin()" inline>{{ $ts.login }}</MkButton>
+			</div>
+			<div class="status" v-if="onlineUsersCount && stats">
+				<div>
+					<I18n :src="$ts.nUsers" text-tag="span" class="users">
+						<template #n><b>{{ number(stats.originalUsersCount) }}</b></template>
+					</I18n>
+					<I18n :src="$ts.nNotes" text-tag="span" class="notes">
+						<template #n><b>{{ number(stats.originalNotesCount) }}</b></template>
+					</I18n>
+				</div>
+				<I18n :src="$ts.onlineUsersCount" text-tag="span" class="online">
+					<template #n><b>{{ onlineUsersCount }}</b></template>
+				</I18n>
+			</div>
+		</div>
+		<img src="/assets/misskey.svg" class="misskey"/>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { faEllipsisH, faInfoCircle, faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
+import { toUnicode } from 'punycode';
+import XSigninDialog from '@/components/signin-dialog.vue';
+import XSignupDialog from '@/components/signup-dialog.vue';
+import MkButton from '@/components/ui/button.vue';
+import XNote from '@/components/note.vue';
+import MkFeaturedPhotos from '@/components/featured-photos.vue';
+import XTimeline from './welcome.timeline.vue';
+import { host, instanceName } from '@/config';
+import * as os from '@/os';
+import number from '@/filters/number';
+
+export default defineComponent({
+	components: {
+		MkButton,
+		XNote,
+		XTimeline,
+		MkFeaturedPhotos,
+	},
+
+	data() {
+		return {
+			host: toUnicode(host),
+			instanceName,
+			meta: null,
+			stats: null,
+			tags: [],
+			onlineUsersCount: null,
+			faEllipsisH
+		};
+	},
+
+	created() {
+		os.api('meta', { detail: true }).then(meta => {
+			this.meta = meta;
+		});
+
+		os.api('stats').then(stats => {
+			this.stats = stats;
+		});
+
+		os.api('get-online-users-count').then(res => {
+			this.onlineUsersCount = res.count;
+		});
+
+		os.api('hashtags/list', {
+			sort: '+mentionedLocalUsers',
+			limit: 8
+		}).then(tags => {
+			this.tags = tags;
+		});
+	},
+
+	methods: {
+		signin() {
+			os.popup(XSigninDialog, {
+				autoSet: true
+			}, {}, 'closed');
+		},
+
+		signup() {
+			os.popup(XSignupDialog, {
+				autoSet: true
+			}, {}, 'closed');
+		},
+
+		showMenu(ev) {
+			os.modalMenu([{
+				text: this.$t('aboutX', { x: instanceName }),
+				icon: faInfoCircle,
+				action: () => {
+					os.pageWindow('/about');
+				}
+			}, {
+				text: this.$ts.aboutMisskey,
+				icon: faInfoCircle,
+				action: () => {
+					os.pageWindow('/about-misskey');
+				}
+			}, null, {
+				text: this.$ts.help,
+				icon: faQuestionCircle,
+				action: () => {
+					os.pageWindow('/docs');
+				}
+			}], ev.currentTarget || ev.target);
+		},
+
+		number
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.rsqzvsbo {
+	> .top {
+		min-height: 100vh;
+		box-sizing: border-box;
+
+		> .bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+		}
+
+		> .tl {
+			position: absolute;
+			top: 0;
+			bottom: 0;
+			right: 64px;
+			margin: auto;
+			width: 500px;
+			height: calc(100% - 128px);
+			overflow: hidden;
+			-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%);
+			mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%);
+		}
+
+		> .shape {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			background: var(--accent);
+			clip-path: polygon(0% 0%, 40% 0%, 22% 100%, 0% 100%);
+		}
+
+		> .misskey {
+			position: absolute;
+			bottom: 64px;
+			left: 64px;
+			width: 160px;
+		}
+
+		> .main {
+			position: relative;
+			width: min(450px, 100%);
+			padding: 64px;
+			color: #fff;
+			font-size: 1.1em;
+
+			@media (max-width: 1200px) {
+				margin: auto;
+			}
+
+			> h1 {
+				display: block;
+				margin: 0 0 32px 0;
+				padding: 0;
+
+				> .logo {
+					vertical-align: bottom;
+					max-height: 100px;
+				}
+			}
+
+			> .about {
+				padding: 0;
+			}
+
+			> .action {
+				margin: 32px 0;
+
+				> * {
+					line-height: 32px;
+				}
+
+				> .signup {
+					background: var(--panel);
+					color: var(--fg);
+				}
+
+				> .signin {
+					background: var(--accent);
+					color: inherit;
+				}
+			}
+
+			> .status {
+				margin: 32px 0;
+				border-top: solid 1px rgba(255, 255, 255, 0.5);
+				font-size: 90%;
+
+				> div {
+					padding: 16px 0;
+
+					> span:not(:last-child) {
+						padding-right: 1em;
+						margin-right: 1em;
+						border-right: solid 1px rgba(255, 255, 255, 0.5);
+					}
+				}
+			}
+		}
+	}
+}
+</style>
--- a/src/client/pages/welcome.entrance.c.vue
+++ b/src/client/pages/welcome.entrance.c.vue
@@ -0,0 +1,307 @@
+<template>
+<div class="rsqzvsbo" v-if="meta">
+	<div class="top">
+		<MkFeaturedPhotos class="bg"/>
+		<div class="fade"></div>
+		<div class="emojis">
+			<MkEmoji :normal="true" :no-style="true" emoji="👍"/>
+			<MkEmoji :normal="true" :no-style="true" emoji="❤"/>
+			<MkEmoji :normal="true" :no-style="true" emoji="😆"/>
+			<MkEmoji :normal="true" :no-style="true" emoji="🎉"/>
+			<MkEmoji :normal="true" :no-style="true" emoji="🍮"/>
+		</div>
+		<div class="main">
+			<img src="/assets/misskey.svg" class="misskey"/>
+			<div class="form _panel">
+				<div class="bg">
+					<div class="fade"></div>
+				</div>
+				<div class="fg">
+					<h1>
+						<img class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span>
+					</h1>
+					<div class="about">
+						<div class="desc" v-html="meta.description || $ts.headlineMisskey"></div>
+					</div>
+					<div class="action">
+						<MkButton @click="signup()" inline primary>{{ $ts.signup }}</MkButton>
+						<MkButton @click="signin()" inline>{{ $ts.login }}</MkButton>
+					</div>
+					<div class="status" v-if="onlineUsersCount && stats">
+						<div>
+							<I18n :src="$ts.nUsers" text-tag="span" class="users">
+								<template #n><b>{{ number(stats.originalUsersCount) }}</b></template>
+							</I18n>
+							<I18n :src="$ts.nNotes" text-tag="span" class="notes">
+								<template #n><b>{{ number(stats.originalNotesCount) }}</b></template>
+							</I18n>
+						</div>
+						<I18n :src="$ts.onlineUsersCount" text-tag="span" class="online">
+							<template #n><b>{{ onlineUsersCount }}</b></template>
+						</I18n>
+					</div>
+					<button class="_button _acrylic menu" @click="showMenu"><Fa :icon="faEllipsisH"/></button>
+				</div>
+			</div>
+			<nav class="nav">
+				<MkA to="/announcements">{{ $ts.announcements }}</MkA>
+				<MkA to="/explore">{{ $ts.explore }}</MkA>
+				<MkA to="/channels">{{ $ts.channel }}</MkA>
+				<MkA to="/featured">{{ $ts.featured }}</MkA>
+			</nav>
+		</div>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { faEllipsisH, faInfoCircle, faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
+import { toUnicode } from 'punycode';
+import XSigninDialog from '@/components/signin-dialog.vue';
+import XSignupDialog from '@/components/signup-dialog.vue';
+import MkButton from '@/components/ui/button.vue';
+import XNote from '@/components/note.vue';
+import MkFeaturedPhotos from '@/components/featured-photos.vue';
+import XTimeline from './welcome.timeline.vue';
+import { host, instanceName } from '@/config';
+import * as os from '@/os';
+import number from '@/filters/number';
+
+export default defineComponent({
+	components: {
+		MkButton,
+		XNote,
+		MkFeaturedPhotos,
+		XTimeline,
+	},
+
+	data() {
+		return {
+			host: toUnicode(host),
+			instanceName,
+			meta: null,
+			stats: null,
+			tags: [],
+			onlineUsersCount: null,
+			faEllipsisH
+		};
+	},
+
+	created() {
+		os.api('meta', { detail: true }).then(meta => {
+			this.meta = meta;
+		});
+
+		os.api('stats').then(stats => {
+			this.stats = stats;
+		});
+
+		os.api('get-online-users-count').then(res => {
+			this.onlineUsersCount = res.count;
+		});
+
+		os.api('hashtags/list', {
+			sort: '+mentionedLocalUsers',
+			limit: 8
+		}).then(tags => {
+			this.tags = tags;
+		});
+	},
+
+	methods: {
+		signin() {
+			os.popup(XSigninDialog, {
+				autoSet: true
+			}, {}, 'closed');
+		},
+
+		signup() {
+			os.popup(XSignupDialog, {
+				autoSet: true
+			}, {}, 'closed');
+		},
+
+		showMenu(ev) {
+			os.modalMenu([{
+				text: this.$t('aboutX', { x: instanceName }),
+				icon: faInfoCircle,
+				action: () => {
+					os.pageWindow('/about');
+				}
+			}, {
+				text: this.$ts.aboutMisskey,
+				icon: faInfoCircle,
+				action: () => {
+					os.pageWindow('/about-misskey');
+				}
+			}, null, {
+				text: this.$ts.help,
+				icon: faQuestionCircle,
+				action: () => {
+					os.pageWindow('/docs');
+				}
+			}], ev.currentTarget || ev.target);
+		},
+
+		number
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.rsqzvsbo {
+	> .top {
+		display: flex;
+		text-align: center;
+		min-height: 100vh;
+		box-sizing: border-box;
+		padding: 16px;
+
+		> .bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+		}
+
+		> .fade {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			background: rgba(0, 0, 0, 0.25);
+		}
+
+		> .emojis {
+			position: absolute;
+			bottom: 32px;
+			left: 35px;
+
+			> * {
+				margin-right: 8px;
+			}
+
+			@media (max-width: 1200px) {
+				display: none;
+			}
+		}
+
+		> .main {
+			position: relative;
+			width: min(460px, 100%);
+			margin: auto;
+
+			> .misskey {
+				width: 150px;
+				margin-bottom: 16px;
+
+				@media (max-width: 450px) {
+					width: 130px;
+				}
+			}
+
+			> .form {
+				position: relative;
+				box-shadow: 0 12px 32px rgb(0 0 0 / 25%);
+
+				> .bg {
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 100%;
+					height: 128px;
+					background-position: center;
+					background-size: cover;
+					opacity: 0.75;
+
+					> .fade {
+						position: absolute;
+						bottom: 0;
+						left: 0;
+						width: 100%;
+						height: 128px;
+						background: linear-gradient(0deg, var(--panel), var(--X15));
+					}
+				}
+
+				> .fg {
+					position: relative;
+					z-index: 1;
+
+					> h1 {
+						display: block;
+						margin: 0;
+						padding: 32px 32px 24px 32px;
+
+						> .logo {
+							vertical-align: bottom;
+							max-height: 120px;
+						}
+					}
+
+					> .about {
+						padding: 0 32px;
+					}
+
+					> .action {
+						padding: 32px;
+
+						> * {
+							line-height: 28px;
+						}
+					}
+
+					> .status {
+						border-top: solid 1px var(--divider);
+						padding: 32px;
+						font-size: 90%;
+
+						> div {
+							> span:not(:last-child) {
+								padding-right: 1em;
+								margin-right: 1em;
+								border-right: solid 1px var(--divider);
+							}
+						}
+
+						> .online {
+							::v-deep(b) {
+								color: #41b781;
+							}
+
+							::v-deep(span) {
+								opacity: 0.7;
+							}
+						}
+					}
+
+					> .menu {
+						position: absolute;
+						top: 16px;
+						right: 16px;
+						width: 32px;
+						height: 32px;
+						border-radius: 8px;
+					}
+				}
+			}
+
+			> .nav {
+				position: relative;
+				z-index: 2;
+				margin-top: 20px;
+				color: #fff;
+				text-shadow: 0 0 8px black;
+				font-size: 0.9em;
+
+				> *:not(:last-child) {
+					margin-right: 1.5em;
+				}
+			}
+		}
+	}
+}
+</style>
--- a/src/client/pages/welcome.entrance.vue
+++ b/src/client/pages/welcome.entrance.vue
@@ -1,181 +0,0 @@
-<template>
-<div class="rsqzvsbo _section" v-if="meta">
-	<div class="overview _monospace" v-if="stats">
-		<div class="stats">
-			<div><span>Users</span><span>{{ number(stats.originalUsersCount) }}</span></div>
-			<div><span>Notes</span><span>{{ number(stats.originalNotesCount) }}</span></div>
-			<div><span>Reactions</span><span>{{ number(stats.reactionsCount) }}</span></div>
-		</div>
-		<div class="tags">
-			<MkA class="tag" v-for="tag in tags" :to="`/tags/${encodeURIComponent(tag.tag)}`">#{{ tag.tag }}</MkA>
-		</div>
-	</div>
-	<template v-if="meta.pinnedClipId">
-		<h2># {{ $ts.pinnedNotes }}</h2>
-		<MkPagination :pagination="clipPagination" #default="{items}">
-			<XNote class="kmkqjgkl" v-for="note in items" :note="note" :key="note.id"/>
-		</MkPagination>
-	</template>
-	<template v-else>
-		<h2># {{ $ts.featured }}</h2>
-		<MkPagination :pagination="featuredPagination" #default="{items}">
-			<XNote class="kmkqjgkl" v-for="note in items" :note="note" :key="note.id"/>
-		</MkPagination>
-	</template>
-</div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { toUnicode } from 'punycode';
-import XSigninDialog from '@/components/signin-dialog.vue';
-import XSignupDialog from '@/components/signup-dialog.vue';
-import MkButton from '@/components/ui/button.vue';
-import XNote from '@/components/note.vue';
-import MkPagination from '@/components/ui/pagination.vue';
-import { host, instanceName } from '@/config';
-import * as os from '@/os';
-import number from '@/filters/number';
-
-export default defineComponent({
-	components: {
-		MkButton,
-		XNote,
-		MkPagination,
-	},
-
-	data() {
-		return {
-			host: toUnicode(host),
-			instanceName,
-			meta: null,
-			stats: null,
-			tags: [],
-			clipPagination: {
-				endpoint: 'clips/notes',
-				limit: 10,
-				params: () => ({
-					clipId: this.meta.pinnedClipId,
-				})
-			},
-			featuredPagination: {
-				endpoint: 'notes/featured',
-				limit: 10,
-				offsetMode: true
-			},
-		};
-	},
-
-	created() {
-		os.api('meta', { detail: true }).then(meta => {
-			this.meta = meta;
-		});
-
-		os.api('stats').then(stats => {
-			this.stats = stats;
-		});
-
-		os.api('hashtags/list', {
-			sort: '+mentionedLocalUsers',
-			limit: 8
-		}).then(tags => {
-			this.tags = tags;
-		});
-	},
-
-	methods: {
-		signin() {
-			os.popup(XSigninDialog, {
-				autoSet: true
-			}, {}, 'closed');
-		},
-
-		signup() {
-			os.popup(XSignupDialog, {
-				autoSet: true
-			}, {}, 'closed');
-		},
-
-		number
-	}
-});
-</script>
-
-<style lang="scss" scoped>
-.rsqzvsbo {
-	text-align: center;
-
-	> h2 {
-		display: inline-block;
-		color: #fff;
-		margin: 16px;
-		padding: 8px 12px;
-		background: rgba(0, 0, 0, 0.5);
-	}
-
-	> .overview {
-		> .stats, > .tags {
-			display: inline-block;
-			vertical-align: top;
-			width: 530px;
-			padding: 32px;
-			margin: 16px;
-			box-sizing: border-box;
-
-			@media (max-width: 800px) {
-				display: block;
-				width: 100%;
-				margin: 12px 0;
-			}
-		}
-
-		> .stats {
-			background: var(--accent);
-			border-radius: 12px;
-			color: #fff;
-			font-size: 1.5em;
-
-			> div {
-				display: flex;
-
-				> span:first-child {
-					opacity: 0.7;
-					font-weight: bold;
-				}
-
-				> span:last-child {
-					margin-left: auto;
-				}
-			}
-		}
-
-		> .tags {
-			background: var(--panel);
-			border-radius: 12px;
-			color: var(--fg);
-			font-size: 1.5em;
-
-			> .tag {
-				margin-right: 1em;
-			}
-		}
-	}
-}
-
-.kmkqjgkl {
-	display: inline-block;
-	vertical-align: middle;
-	width: 530px;
-	margin: 16px;
-	box-sizing: border-box;
-	text-align: left;
-	box-shadow: 0 6px 46px rgb(0 0 0 / 25%);
-	border-radius: 12px;
-
-	@media (max-width: 800px) {
-		display: block;
-		width: 100%;
-		margin: 12px 0;
-	}
-}
-</style>
--- a/src/client/pages/welcome.timeline.vue
+++ b/src/client/pages/welcome.timeline.vue
@@ -0,0 +1,51 @@
+<template>
+<div class="civpbkhh">
+	<div v-for="note in notes" class="note">
+		<div class="content _panel">
+			{{ note.text }}
+		</div>
+		<XReactionsViewer :note="note" ref="reactionsViewer"/>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import XReactionsViewer from '@/components/reactions-viewer.vue';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+		XReactionsViewer
+	},
+
+	data() {
+		return {
+			notes: [],
+		}
+	},
+
+	created() {
+		os.api('notes/featured').then(notes => {
+			this.notes = notes;
+		});
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.civpbkhh {
+	text-align: right;
+
+	> .note {
+		margin: 16px 0 16px auto;
+
+		> .content {
+			padding: 16px;
+			margin: 0 0 0 auto;
+			max-width: max-content;
+			border-radius: 16px;
+		}
+	}
+}
+</style>
--- a/src/client/pages/welcome.vue
+++ b/src/client/pages/welcome.vue
@@ -8,7 +8,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import XSetup from './welcome.setup.vue';
-import XEntrance from './welcome.entrance.vue';
+import XEntrance from './welcome.entrance.a.vue';
 import { instanceName } from '@/config';
 import * as os from '@/os';

--- a/src/client/pizzax.ts
+++ b/src/client/pizzax.ts
@@ -11,6 +11,7 @@ type ArrayElement<A> = A extends readonly (infer T)[] ? T : never;

 export class Storage<T extends StateDef> {
 	public readonly key: string;
+	public readonly keyForLocalStorage: string;

 	public readonly def: T;

@@ -19,20 +20,22 @@ export class Storage<T extends StateDef> {
 	public readonly reactiveState: { [K in keyof T]: Ref<T[K]['default']> };

 	constructor(key: string, def: T) {
-		this.key = 'pizzax::' + key;
+		this.key = key;
+		this.keyForLocalStorage = 'pizzax::' + key;
 		this.def = def;

 		// TODO: indexedDBにする
-		const deviceState = JSON.parse(localStorage.getItem(this.key) || '{}');
-		const deviceAccountState = $i ? JSON.parse(localStorage.getItem(this.key + '::' + $i.id) || '{}') : {};
+		const deviceState = JSON.parse(localStorage.getItem(this.keyForLocalStorage) || '{}');
+		const deviceAccountState = $i ? JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::' + $i.id) || '{}') : {};
+		const registryCache = $i ? JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}') : {};

 		const state = {};
 		const reactiveState = {};
 		for (const [k, v] of Object.entries(def)) {
 			if (v.where === 'device' && Object.prototype.hasOwnProperty.call(deviceState, k)) {
 				state[k] = deviceState[k];
-			} else if (v.where === 'account' && $i && Object.prototype.hasOwnProperty.call($i.clientData, k)) {
-				state[k] = $i.clientData[k];
+			} else if (v.where === 'account' && $i && Object.prototype.hasOwnProperty.call(registryCache, k)) {
+				state[k] = registryCache[k];
 			} else if (v.where === 'deviceAccount' && Object.prototype.hasOwnProperty.call(deviceAccountState, k)) {
 				state[k] = deviceAccountState[k];
 			} else {
@@ -47,16 +50,24 @@ export class Storage<T extends StateDef> {
 		this.reactiveState = reactiveState as any;

 		if ($i) {
-			watch($i, () => {
-				if (_DEV_) console.log('$i updated');
-
-				for (const [k, v] of Object.entries(def)) {
-					if (v.where === 'account' && Object.prototype.hasOwnProperty.call($i!.clientData, k)) {
-						state[k] = $i!.clientData[k];
-						reactiveState[k].value = $i!.clientData[k];
+			// なぜかsetTimeoutしないとapi関数内でエラーになる(おそらく循環参照してることに原因がありそう)
+			setTimeout(() => {
+				api('i/registry/get-all', { scope: ['client', this.key] }).then(kvs => {
+					for (const [k, v] of Object.entries(def)) {
+						if (v.where === 'account') {
+							if (Object.prototype.hasOwnProperty.call(kvs, k)) {
+								state[k] = kvs[k];
+								reactiveState[k].value = kvs[k];
+							} else {
+								state[k] = v.default;
+								reactiveState[k].value = v.default;
+							}
+						}
 					}
-				}
-			});
+				});
+			}, 1);
+
+			// TODO: streamingのuser storage updateイベントを監視して更新
 		}
 	}

@@ -68,21 +79,26 @@ export class Storage<T extends StateDef> {

 		switch (this.def[key].where) {
 			case 'device': {
-				const deviceState = JSON.parse(localStorage.getItem(this.key) || '{}');
+				const deviceState = JSON.parse(localStorage.getItem(this.keyForLocalStorage) || '{}');
 				deviceState[key] = value;
-				localStorage.setItem(this.key, JSON.stringify(deviceState));
+				localStorage.setItem(this.keyForLocalStorage, JSON.stringify(deviceState));
 				break;
 			}
 			case 'deviceAccount': {
 				if ($i == null) break;
-				const deviceAccountState = JSON.parse(localStorage.getItem(this.key + '::' + $i.id) || '{}');
+				const deviceAccountState = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::' + $i.id) || '{}');
 				deviceAccountState[key] = value;
-				localStorage.setItem(this.key + '::' + $i.id, JSON.stringify(deviceAccountState));
+				localStorage.setItem(this.keyForLocalStorage + '::' + $i.id, JSON.stringify(deviceAccountState));
 				break;
 			}
 			case 'account': {
-				api('i/update-client-setting', {
-					name: key,
+				if ($i == null) break;
+				const cache = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}');
+				cache[key] = value;
+				localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache));
+				api('i/registry/set', {
+					scope: ['client', this.key],
+					key: key,
 					value: value
 				});
 				break;
--- a/src/client/router.ts
+++ b/src/client/router.ts
@@ -29,6 +29,7 @@ export const router = createRouter({
 		{ path: '/featured', component: page('featured') },
 		{ path: '/docs', component: page('docs') },
 		{ path: '/theme-editor', component: page('theme-editor') },
+		{ path: '/advanced-theme-editor', component: page('advanced-theme-editor') },
 		{ path: '/docs/:doc', component: page('doc'), props: route => ({ doc: route.params.doc }) },
 		{ path: '/explore', component: page('explore') },
 		{ path: '/explore/tags/:tag', props: true, component: page('explore') },
@@ -80,7 +81,6 @@ export const router = createRouter({
 		{ path: '/miauth/:session', component: page('miauth') },
 		{ path: '/authorize-follow', component: page('follow') },
 		{ path: '/share', component: page('share') },
-		{ path: '/test', component: page('test') },
 		{ path: '/:catchAll(.*)', component: page('not-found') }
 	],
 	// なんかHacky
--- a/src/client/scripts/hpml/evaluator.ts
+++ b/src/client/scripts/hpml/evaluator.ts
@@ -1,19 +1,13 @@
 import autobind from 'autobind-decorator';
-import * as seedrandom from 'seedrandom';
-import { Variable, PageVar, envVarsDef, funcDefs, Block, isFnBlock } from '.';
+import { Variable, PageVar, envVarsDef, Block, isFnBlock, Fn, HpmlScope, HpmlError } from '.';
 import { version } from '@/config';
 import { AiScript, utils, values } from '@syuilo/aiscript';
 import { createAiScriptEnv } from '../aiscript/api';
 import { collectPageVars } from '../collect-page-vars';
-import { initLib } from './lib';
+import { initHpmlLib, initAiLib } from './lib';
 import * as os from '@/os';
 import { markRaw, ref, Ref } from 'vue';

-type Fn = {
-	slots: string[];
-	exec: (args: Record<string, any>) => ReturnType<Hpml['evaluate']>;
-};
-
 /**
 * Hpml evaluator
 */
@@ -41,7 +35,7 @@ export class Hpml {
 		if (this.opts.enableAiScript) {
 			this.aiscript = markRaw(new AiScript({ ...createAiScriptEnv({
 				storageKey: 'pages:' + this.page.id
-			}), ...initLib(this)}, {
+			}), ...initAiLib(this)}, {
 				in: (q) => {
 					return new Promise(ok => {
 						os.dialog({
@@ -137,7 +131,7 @@ export class Hpml {
 	}

 	@autobind
-	private _interpolate(str: string, scope: Scope) {
+	private _interpolateScope(str: string, scope: HpmlScope) {
 		return str.replace(/{(.+?)}/g, match => {
 			const v = scope.getState(match.slice(1, -1).trim());
 			return v == null ? 'NULL' : v.toString();
@@ -157,14 +151,14 @@ export class Hpml {
 		}

 		for (const v of this.variables) {
-			values[v.name] = this.evaluate(v, new Scope([values]));
+			values[v.name] = this.evaluate(v, new HpmlScope([values]));
 		}

 		return values;
 	}

 	@autobind
-	private evaluate(block: Block, scope: Scope): any {
+	private evaluate(block: Block, scope: HpmlScope): any {
 		if (block.type === null) {
 			return null;
 		}
@@ -174,11 +168,11 @@ export class Hpml {
 		}

 		if (block.type === 'text' || block.type === 'multiLineText') {
-			return this._interpolate(block.value || '', scope);
+			return this._interpolateScope(block.value || '', scope);
 		}

 		if (block.type === 'textList') {
-			return this._interpolate(block.value || '', scope).trim().split('\n');
+			return this._interpolateScope(block.value || '', scope).trim().split('\n');
 		}

 		if (block.type === 'ref') {
@@ -197,7 +191,8 @@ export class Hpml {
 			}
 		}

-		if (isFnBlock(block)) { // ユーザー関数定義
+		// Define user function
+		if (isFnBlock(block)) {
 			return {
 				slots: block.value.slots.map(x => x.name),
 				exec: (slotArg: Record<string, any>) => {
@@ -206,7 +201,8 @@ export class Hpml {
 			} as Fn;
 		}

-		if (block.type.startsWith('fn:')) { // ユーザー関数呼び出し
+		// Call user function
+		if (block.type.startsWith('fn:')) {
 			const fnName = block.type.split(':')[1];
 			const fn = scope.getState(fnName);
 			const args = {} as Record<string, any>;
@@ -219,77 +215,9 @@ export class Hpml {

 		if (block.args === undefined) return null;

-		const date = new Date();
-		const day = `${this.opts.visitor ? this.opts.visitor.id : ''} ${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
-
-		const funcs: { [p in keyof typeof funcDefs]: Function } = {
-			not: (a: boolean) => !a,
-			or: (a: boolean, b: boolean) => a || b,
-			and: (a: boolean, b: boolean) => a && b,
-			eq: (a: any, b: any) => a === b,
-			notEq: (a: any, b: any) => a !== b,
-			gt: (a: number, b: number) => a > b,
-			lt: (a: number, b: number) => a < b,
-			gtEq: (a: number, b: number) => a >= b,
-			ltEq: (a: number, b: number) => a <= b,
-			if: (bool: boolean, a: any, b: any) => bool ? a : b,
-			for: (times: number, fn: Fn) => {
-				const result = [];
-				for (let i = 0; i < times; i++) {
-					result.push(fn.exec({
-						[fn.slots[0]]: i + 1
-					}));
-				}
-				return result;
-			},
-			add: (a: number, b: number) => a + b,
-			subtract: (a: number, b: number) => a - b,
-			multiply: (a: number, b: number) => a * b,
-			divide: (a: number, b: number) => a / b,
-			mod: (a: number, b: number) => a % b,
-			round: (a: number) => Math.round(a),
-			strLen: (a: string) => a.length,
-			strPick: (a: string, b: number) => a[b - 1],
-			strReplace: (a: string, b: string, c: string) => a.split(b).join(c),
-			strReverse: (a: string) => a.split('').reverse().join(''),
-			join: (texts: string[], separator: string) => texts.join(separator || ''),
-			stringToNumber: (a: string) => parseInt(a),
-			numberToString: (a: number) => a.toString(),
-			splitStrByLine: (a: string) => a.split('\n'),
-			pick: (list: any[], i: number) => list[i - 1],
-			listLen: (list: any[]) => list.length,
-			random: (probability: number) => Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * 100) < probability,
-			rannum: (min: number, max: number) => min + Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * (max - min + 1)),
-			randomPick: (list: any[]) => list[Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * list.length)],
-			dailyRandom: (probability: number) => Math.floor(seedrandom(`${day}:${block.id}`)() * 100) < probability,
-			dailyRannum: (min: number, max: number) => min + Math.floor(seedrandom(`${day}:${block.id}`)() * (max - min + 1)),
-			dailyRandomPick: (list: any[]) => list[Math.floor(seedrandom(`${day}:${block.id}`)() * list.length)],
-			seedRandom: (seed: any, probability: number) => Math.floor(seedrandom(seed)() * 100) < probability,
-			seedRannum: (seed: any, min: number, max: number) => min + Math.floor(seedrandom(seed)() * (max - min + 1)),
-			seedRandomPick: (seed: any, list: any[]) => list[Math.floor(seedrandom(seed)() * list.length)],
-			DRPWPM: (list: string[]) => {
-				const xs = [];
-				let totalFactor = 0;
-				for (const x of list) {
-					const parts = x.split(' ');
-					const factor = parseInt(parts.pop()!, 10);
-					const text = parts.join(' ');
-					totalFactor += factor;
-					xs.push({ factor, text });
-				}
-				const r = seedrandom(`${day}:${block.id}`)() * totalFactor;
-				let stackedFactor = 0;
-				for (const x of xs) {
-					if (r >= stackedFactor && r <= stackedFactor + x.factor) {
-						return x.text;
-					} else {
-						stackedFactor += x.factor;
-					}
-				}
-				return xs[0].text;
-			},
-		};
+		const funcs = initHpmlLib(block, scope, this.opts.randomSeed, this.opts.visitor);

+		// Call function
 		const fnName = block.type;
 		const fn = (funcs as any)[fnName];
 		if (fn == null) {
@@ -299,53 +227,3 @@ export class Hpml {
 		}
 	}
 }
-
-class HpmlError extends Error {
-	public info?: any;
-
-	constructor(message: string, info?: any) {
-		super(message);
-
-		this.info = info;
-
-		// Maintains proper stack trace for where our error was thrown (only available on V8)
-		if (Error.captureStackTrace) {
-			Error.captureStackTrace(this, HpmlError);
-		}
-	}
-}
-
-class Scope {
-	private layerdStates: Record<string, any>[];
-	public name: string;
-
-	constructor(layerdStates: Scope['layerdStates'], name?: Scope['name']) {
-		this.layerdStates = layerdStates;
-		this.name = name || 'anonymous';
-	}
-
-	@autobind
-	public createChildScope(states: Record<string, any>, name?: Scope['name']): Scope {
-		const layer = [states, ...this.layerdStates];
-		return new Scope(layer, name);
-	}
-
-	/**
-	 * 指定した名前の変数の値を取得します
-	 * @param name 変数名
-	 */
-	@autobind
-	public getState(name: string): any {
-		for (const later of this.layerdStates) {
-			const state = later[name];
-			if (state !== undefined) {
-				return state;
-			}
-		}
-
-		throw new HpmlError(
-			`No such variable '${name}' in scope '${this.name}'`, {
-				scope: this.layerdStates
-			});
-	}
-}
--- a/src/client/scripts/hpml/index.ts
+++ b/src/client/scripts/hpml/index.ts
@@ -2,6 +2,8 @@
 * Hpml
 */

+import autobind from 'autobind-decorator';
+
 import {
 	faMagic,
 	faSquareRootAlt,
@@ -27,6 +29,7 @@ import {
 	faCalculator,
 } from '@fortawesome/free-solid-svg-icons';
 import { faFlag } from '@fortawesome/free-regular-svg-icons';
+import { Hpml } from './evaluator';

 export type Block<V = any> = {
 	id: string;
@@ -47,6 +50,11 @@ export type Variable = Block & {
 	name: string;
 };

+export type Fn = {
+	slots: string[];
+	exec: (args: Record<string, any>) => ReturnType<Hpml['evaluate']>;
+};
+
 export type Type = 'string' | 'number' | 'boolean' | 'stringArray' | null;

 export const funcDefs: Record<string, { in: any[]; out: any; category: string; icon: any; }> = {
@@ -137,3 +145,53 @@ export function isLiteralBlock(v: Block) {
 	if (literalDefs[v.type]) return true;
 	return false;
 }
+
+export class HpmlScope {
+	private layerdStates: Record<string, any>[];
+	public name: string;
+
+	constructor(layerdStates: HpmlScope['layerdStates'], name?: HpmlScope['name']) {
+		this.layerdStates = layerdStates;
+		this.name = name || 'anonymous';
+	}
+
+	@autobind
+	public createChildScope(states: Record<string, any>, name?: HpmlScope['name']): HpmlScope {
+		const layer = [states, ...this.layerdStates];
+		return new HpmlScope(layer, name);
+	}
+
+	/**
+	 * 指定した名前の変数の値を取得します
+	 * @param name 変数名
+	 */
+	@autobind
+	public getState(name: string): any {
+		for (const later of this.layerdStates) {
+			const state = later[name];
+			if (state !== undefined) {
+				return state;
+			}
+		}
+
+		throw new HpmlError(
+			`No such variable '${name}' in scope '${this.name}'`, {
+				scope: this.layerdStates
+			});
+	}
+}
+
+export class HpmlError extends Error {
+	public info?: any;
+
+	constructor(message: string, info?: any) {
+		super(message);
+
+		this.info = info;
+
+		// Maintains proper stack trace for where our error was thrown (only available on V8)
+		if (Error.captureStackTrace) {
+			Error.captureStackTrace(this, HpmlError);
+		}
+	}
+}
--- a/src/client/scripts/hpml/lib.ts
+++ b/src/client/scripts/hpml/lib.ts
@@ -2,6 +2,8 @@ import * as tinycolor from 'tinycolor2';
 import Chart from 'chart.js';
 import { Hpml } from './evaluator';
 import { values, utils } from '@syuilo/aiscript';
+import { Block, Fn, HpmlScope } from '.';
+import * as seedrandom from 'seedrandom';

 // https://stackoverflow.com/questions/38493564/chart-area-background-color-chartjs
 Chart.pluginService.register({
@@ -16,7 +18,7 @@ Chart.pluginService.register({
 	}
 });

-export function initLib(hpml: Hpml) {
+export function initAiLib(hpml: Hpml) {
 	return {
 		'MkPages:updated': values.FN_NATIVE(([callback]) => {
 			hpml.pageVarUpdatedCallback = (callback as values.VFn);
@@ -122,3 +124,79 @@ export function initLib(hpml: Hpml) {
 		})
 	};
 }
+
+export function initHpmlLib(block: Block, scope: HpmlScope, randomSeed: string, visitor?: any) {
+
+	const date = new Date();
+	const day = `${visitor ? visitor.id : ''} ${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
+
+	const funcs: Record<string, Function> = {
+		not: (a: boolean) => !a,
+		or: (a: boolean, b: boolean) => a || b,
+		and: (a: boolean, b: boolean) => a && b,
+		eq: (a: any, b: any) => a === b,
+		notEq: (a: any, b: any) => a !== b,
+		gt: (a: number, b: number) => a > b,
+		lt: (a: number, b: number) => a < b,
+		gtEq: (a: number, b: number) => a >= b,
+		ltEq: (a: number, b: number) => a <= b,
+		if: (bool: boolean, a: any, b: any) => bool ? a : b,
+		for: (times: number, fn: Fn) => {
+			const result: any[] = [];
+			for (let i = 0; i < times; i++) {
+				result.push(fn.exec({
+					[fn.slots[0]]: i + 1
+				}));
+			}
+			return result;
+		},
+		add: (a: number, b: number) => a + b,
+		subtract: (a: number, b: number) => a - b,
+		multiply: (a: number, b: number) => a * b,
+		divide: (a: number, b: number) => a / b,
+		mod: (a: number, b: number) => a % b,
+		round: (a: number) => Math.round(a),
+		strLen: (a: string) => a.length,
+		strPick: (a: string, b: number) => a[b - 1],
+		strReplace: (a: string, b: string, c: string) => a.split(b).join(c),
+		strReverse: (a: string) => a.split('').reverse().join(''),
+		join: (texts: string[], separator: string) => texts.join(separator || ''),
+		stringToNumber: (a: string) => parseInt(a),
+		numberToString: (a: number) => a.toString(),
+		splitStrByLine: (a: string) => a.split('\n'),
+		pick: (list: any[], i: number) => list[i - 1],
+		listLen: (list: any[]) => list.length,
+		random: (probability: number) => Math.floor(seedrandom(`${randomSeed}:${block.id}`)() * 100) < probability,
+		rannum: (min: number, max: number) => min + Math.floor(seedrandom(`${randomSeed}:${block.id}`)() * (max - min + 1)),
+		randomPick: (list: any[]) => list[Math.floor(seedrandom(`${randomSeed}:${block.id}`)() * list.length)],
+		dailyRandom: (probability: number) => Math.floor(seedrandom(`${day}:${block.id}`)() * 100) < probability,
+		dailyRannum: (min: number, max: number) => min + Math.floor(seedrandom(`${day}:${block.id}`)() * (max - min + 1)),
+		dailyRandomPick: (list: any[]) => list[Math.floor(seedrandom(`${day}:${block.id}`)() * list.length)],
+		seedRandom: (seed: any, probability: number) => Math.floor(seedrandom(seed)() * 100) < probability,
+		seedRannum: (seed: any, min: number, max: number) => min + Math.floor(seedrandom(seed)() * (max - min + 1)),
+		seedRandomPick: (seed: any, list: any[]) => list[Math.floor(seedrandom(seed)() * list.length)],
+		DRPWPM: (list: string[]) => {
+			const xs: any[] = [];
+			let totalFactor = 0;
+			for (const x of list) {
+				const parts = x.split(' ');
+				const factor = parseInt(parts.pop()!, 10);
+				const text = parts.join(' ');
+				totalFactor += factor;
+				xs.push({ factor, text });
+			}
+			const r = seedrandom(`${day}:${block.id}`)() * totalFactor;
+			let stackedFactor = 0;
+			for (const x of xs) {
+				if (r >= stackedFactor && r <= stackedFactor + x.factor) {
+					return x.text;
+				} else {
+					stackedFactor += x.factor;
+				}
+			}
+			return xs[0].text;
+		},
+	};
+
+	return funcs;
+}
--- a/src/client/scripts/search.ts
+++ b/src/client/scripts/search.ts
@@ -3,19 +3,14 @@ import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { router } from '@/router';

-export async function search(q?: string | null | undefined) {
-	if (q == null) {
-		const { canceled, result: query } = await os.dialog({
-			title: i18n.locale.search,
-			input: true
-		});
+export async function search() {
+	const { canceled, result: query } = await os.dialog({
+		title: i18n.locale.search,
+		input: true
+	});
+	if (canceled || query == null || query === '') return;

-		if (canceled || query == null || query === '') return;
-
-		q = query;
-	}
-
-	q = q.trim();
+	const q = query.trim();

 	if (q.startsWith('@') && !q.includes(' ')) {
 		router.push(`/${q}`);
@@ -39,7 +34,8 @@ export async function search(q?: string | null | undefined) {
 			date.setHours(23, 59, 59, 999);
 		}

-		v.$root.$emit('warp', date);
+		// TODO
+		//v.$root.$emit('warp', date);
 		os.dialog({
 			icon: faHistory,
 			iconOnly: true, autoClose: true
--- a/src/client/store.ts
+++ b/src/client/store.ts
@@ -180,6 +180,14 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: 'full' as 'full' | 'icon'
 	},
+	titlebar: {
+		where: 'device',
+		default: true
+	},
+	reportError: {
+		where: 'device',
+		default: false
+	},
 }));

 // TODO: 他のタブと永続化されたstateを同期
@@ -200,7 +208,7 @@ type Plugin = {
 */
 export class ColdDeviceStorage {
 	public static default = {
-		themes: [] as Theme[],
+		themes: [] as Theme[], // TODO: そのうち消す
 		darkTheme: '8050783a-7f63-445a-b270-36d0f6ba1677',
 		lightTheme: '4eea646f-7afa-4645-83e9-83af0333cd37',
 		syncDeviceDarkMode: true,
--- a/src/client/style.scss
+++ b/src/client/style.scss
@@ -29,6 +29,7 @@ html {
 	font-family: "BIZ UDGothic", Roboto, HelveticaNeue, Arial, sans-serif;
 	line-height: 1.35;
 	text-size-adjust: 100%;
+	tab-size: 2;

 	&, * {
 		scrollbar-color: var(--scrollbarHandle) inherit;
--- a/src/client/theme-store.ts
+++ b/src/client/theme-store.ts
@@ -0,0 +1,62 @@
+import { api } from '@/os';
+import { $i } from '@/account';
+import { ColdDeviceStorage } from './store';
+import { Theme } from './scripts/theme';
+
+const lsCacheKey = $i ? `themes:${$i.id}` : '';
+
+export function getThemes(): Theme[] {
+	return JSON.parse(localStorage.getItem(lsCacheKey) || '[]');
+}
+
+export async function fetchThemes(): Promise<void> {
+	if ($i == null) return;
+
+	try {
+		const themes = await api('i/registry/get', { scope: ['client'], key: 'themes' });
+		localStorage.setItem(lsCacheKey, JSON.stringify(themes));
+	} catch (e) {
+		if (e.code === 'NO_SUCH_KEY') return;
+		throw e;
+	}
+}
+
+export async function addTheme(theme: Theme): Promise<void> {
+	await fetchThemes();
+	const themes = getThemes().concat(theme);
+	await api('i/registry/set', { scope: ['client'], key: 'themes', value: themes });
+	localStorage.setItem(lsCacheKey, JSON.stringify(themes));
+}
+
+export async function removeTheme(theme: Theme): Promise<void> {
+	const themes = getThemes().filter(t => t.id != theme.id);
+	await api('i/registry/set', { scope: ['client'], key: 'themes', value: themes });
+	localStorage.setItem(lsCacheKey, JSON.stringify(themes));
+}
+
+// TODO: そのうち消す
+if (ColdDeviceStorage.get('themes').length > 0) {
+	const lsThemes = ColdDeviceStorage.get('themes');
+	let registryThemes;
+	try {
+		registryThemes = await api('i/registry/get', { scope: ['client'], key: 'themes' });
+	} catch (e) {
+		if (e.code === 'NO_SUCH_KEY') {
+			registryThemes = [];
+		} else {
+			throw e;
+		}
+	}
+	const themes = [] as Theme[];
+	for (const theme of lsThemes) {
+		if (themes.some(x => x.id === theme.id)) continue;
+		themes.push(theme);
+	}
+	for (const theme of registryThemes) {
+		if (themes.some(x => x.id === theme.id)) continue;
+		themes.push(theme);
+	}
+	await api('i/registry/set', { scope: ['client'], key: 'themes', value: themes });
+	localStorage.setItem(lsCacheKey, JSON.stringify(themes));
+	ColdDeviceStorage.set('themes', []);
+}
--- a/src/client/themes/_dark.json5
+++ b/src/client/themes/_dark.json5
@@ -15,11 +15,11 @@
 		focus: ':alpha<0.3<@accent',
 		bg: '#000',
 		acrylicBg: ':alpha<0.5<@bg',
-		fg: '#c7d1d8',
+		fg: '#dadada',
 		fgHighlighted: ':lighten<3<@fg',
 		divider: 'rgba(255, 255, 255, 0.1)',
 		indicator: '@accent',
-		panel: '#000',
+		panel: ':lighten<3<@bg',
 		panelHighlight: ':lighten<3<@panel',
 		panelHeaderBg: ':lighten<3<@panel',
 		panelHeaderFg: '@fg',
@@ -62,7 +62,6 @@
 		error: '#ec4137',
 		warn: '#ecb637',
 		htmlThemeColor: '@bg',
-		X1: ':alpha<0<@bg',
 		X2: ':darken<2<@panel',
 		X3: 'rgba(255, 255, 255, 0.05)',
 		X4: 'rgba(255, 255, 255, 0.1)',
--- a/src/client/themes/_light.json5
+++ b/src/client/themes/_light.json5
@@ -15,11 +15,11 @@
 		focus: ':alpha<0.3<@accent',
 		bg: '#fff',
 		acrylicBg: ':alpha<0.5<@bg',
-		fg: '#5c6a73',
+		fg: '#5f5f5f',
 		fgHighlighted: ':darken<3<@fg',
 		divider: 'rgba(0, 0, 0, 0.1)',
 		indicator: '@accent',
-		panel: '#fff',
+		panel: ':lighten<3<@bg',
 		panelHighlight: ':darken<3<@panel',
 		panelHeaderBg: ':lighten<3<@panel',
 		panelHeaderFg: '@fg',
@@ -62,7 +62,6 @@
 		error: '#ec4137',
 		warn: '#ecb637',
 		htmlThemeColor: '@bg',
-		X1: ':alpha<0<@bg',
 		X2: ':darken<2<@panel',
 		X3: 'rgba(0, 0, 0, 0.05)',
 		X4: 'rgba(0, 0, 0, 0.1)',
--- a/src/client/themes/d-persimmon.json5
+++ b/src/client/themes/d-persimmon.json5
@@ -14,8 +14,6 @@
 		divider: 'rgba(255, 255, 255, 0.14)',
 		panel: 'rgb(41, 43, 41)',
 		panelShadow: '" 0 8px 24px rgb(0 0 0 / 25%)',
-		panelHeaderBg: '@panel',
-		panelHeaderDivider: '@divider',
 		infoFg: '@fg',
 		infoBg: '#333c3b',
 		header: ':alpha<0.7<@bg',
--- a/src/client/ui/_common_/header.vue
+++ b/src/client/ui/_common_/header.vue
@@ -5,21 +5,12 @@
 	</transition>
 	<template v-if="info">
 		<div class="titleContainer">
-			<template v-if="info.tabs">
-				<div class="title" v-for="tab in info.tabs" :key="tab.id" :class="{ _button: tab.onClick, selected: tab.selected }" @click.stop="tab.onClick" v-tooltip="tab.tooltip">
-					<Fa v-if="tab.icon" :icon="tab.icon" :key="tab.icon" class="icon"/>
-					<span v-if="tab.title" class="text">{{ tab.title }}</span>
-					<Fa class="indicator" v-if="tab.indicate" :icon="faCircle"/>
-				</div>
-			</template>
-			<template v-else>
-				<div class="title">
-					<Fa v-if="info.icon" :icon="info.icon" :key="info.icon" class="icon"/>
-					<MkAvatar v-else-if="info.avatar" class="avatar" :user="info.avatar" :disable-preview="true"/>
-					<span v-if="info.title" class="text">{{ info.title }}</span>
-					<MkUserName v-else-if="info.userName" :user="info.userName" :nowrap="false" class="text"/>
-				</div>
-			</template>
+			<div class="title">
+				<Fa v-if="info.icon" :icon="info.icon" :key="info.icon" class="icon"/>
+				<MkAvatar v-else-if="info.avatar" class="avatar" :user="info.avatar" :disable-preview="true"/>
+				<span v-if="info.title" class="text">{{ info.title }}</span>
+				<MkUserName v-else-if="info.userName" :user="info.userName" :nowrap="false" class="text"/>
+			</div>
 		</div>
 		<button class="_button action" v-if="info.action" @click.stop="info.action.handler"><Fa :icon="info.action.icon" :key="info.action.icon"/></button>
 	</template>
@@ -155,17 +146,6 @@ export default defineComponent({
 				height: $size;
 				vertical-align: bottom;
 			}
-
-			&._button {
-				&:hover {
-					color: var(--fgHighlighted);
-				}
-			}
-
-			&.selected {
-				box-shadow: 0 -2px 0 0 var(--accent) inset;
-				color: var(--fgHighlighted);
-			}
 		}
 	}
 }
--- a/src/client/ui/deck.vue
+++ b/src/client/ui/deck.vue
@@ -8,7 +8,7 @@
 		<!-- sectionを利用しているのは、deck.vue側でcolumnに対してfirst-of-typeを効かせるため -->
 		<section v-if="ids.length > 1"
 			class="folder column"
-			:style="{ width: Math.max(...columns.filter(c => ids.includes(c.id)).map(c => c.width)) + 'px' }"
+			:style="columns.filter(c => ids.includes(c.id)).some(c => c.flexible) ? { flex: 1, minWidth: '350px' } : { width: Math.max(...columns.filter(c => ids.includes(c.id)).map(c => c.width)) + 'px' }"
 		>
 			<DeckColumnCore v-for="id in ids" :ref="id" :key="id" :column="columns.find(c => c.id === id)" :is-stacked="true" @parent-focus="moveFocus(id, $event)"/>
 		</section>
@@ -41,7 +41,7 @@ import { getScrollContainer } from '@/scripts/scroll';
 import * as os from '@/os';
 import { sidebarDef } from '@/sidebar';
 import XCommon from './_common_/common.vue';
-import { deckStore, addColumn } from './deck/deck-store';
+import { deckStore, addColumn, loadDeck } from './deck/deck-store';

 export default defineComponent({
 	components: {
@@ -88,6 +88,7 @@ export default defineComponent({
 		document.documentElement.style.overflowY = 'hidden';
 		document.documentElement.style.scrollBehavior = 'auto';
 		window.addEventListener('wheel', this.onWheel);
+		loadDeck();
 	},

 	mounted() {
--- a/src/client/ui/deck/column.vue
+++ b/src/client/ui/deck/column.vue
@@ -70,7 +70,6 @@ export default defineComponent({
 	data() {
 		return {
 			deckStore,
-			active: true,
 			dragging: false,
 			draghover: false,
 			dropready: false,
@@ -83,6 +82,10 @@ export default defineComponent({
 			return this.column.type === 'main';
 		},

+		active(): boolean {
+			return this.column.active !== false;
+		},
+
 		keymap(): any {
 			return {
 				'shift+up': () => this.$parent.$emit('parent-focus', 'up'),
@@ -124,7 +127,9 @@ export default defineComponent({

 		toggleActive() {
 			if (!this.isStacked) return;
-			this.active = !this.active;
+			updateColumn(this.column.id, {
+				active: !this.column.active
+			});
 		},

 		getMenu() {
@@ -191,6 +196,7 @@ export default defineComponent({
 			} : undefined, null, {
 				icon: faTrashAlt,
 				text: this.$ts.remove,
+				danger: true,
 				action: () => {
 					removeColumn(this.column.id);
 				}
--- a/src/client/ui/deck/deck-store.ts
+++ b/src/client/ui/deck/deck-store.ts
@@ -1,5 +1,7 @@
+import { throttle } from 'throttle-debounce';
 import { i18n } from '@/i18n';
-import { markRaw } from 'vue';
+import { api } from '@/os';
+import { markRaw, watch } from 'vue';
 import { Storage } from '../../pizzax';

 type ColumnWidget = {
@@ -14,6 +16,7 @@ type Column = {
 	name: string | null;
 	width: number;
 	widgets?: ColumnWidget[];
+	active?: boolean;
 };

 function copy<T>(x: T): T {
@@ -21,23 +24,17 @@ function copy<T>(x: T): T {
 }

 export const deckStore = markRaw(new Storage('deck', {
+	profile: {
+		where: 'deviceAccount',
+		default: 'default'
+	},
 	columns: {
 		where: 'deviceAccount',
-		default: [{
-			id: 'a',
-			type: 'main',
-			name: i18n.locale._deck._columns.main,
-			width: 350,
-		}, {
-			id: 'b',
-			type: 'notifications',
-			name: i18n.locale._deck._columns.notifications,
-			width: 330,
-		}] as Column[]
+		default: [] as Column[]
 	},
 	layout: {
 		where: 'deviceAccount',
-		default: [['a'], ['b']] as Column['id'][][]
+		default: [] as Column['id'][][]
 	},
 	columnAlign: {
 		where: 'deviceAccount',
@@ -61,10 +58,60 @@ export const deckStore = markRaw(new Storage('deck', {
 	},
 }));

+export const loadDeck = async () => {
+	let deck;
+
+	try {
+		deck = await api('i/registry/get', {
+			scope: ['client', 'deck', 'profiles'],
+			key: deckStore.state.profile,
+		});
+	} catch (e) {
+		if (e.code === 'NO_SUCH_KEY') {
+			// 後方互換性のため
+			if (deckStore.state.profile === 'default') {
+				saveDeck();
+				return;
+			}
+
+			deckStore.set('columns', [{
+				id: 'a',
+				type: 'main',
+				name: i18n.locale._deck._columns.main,
+				width: 350,
+			}, {
+				id: 'b',
+				type: 'notifications',
+				name: i18n.locale._deck._columns.notifications,
+				width: 330,
+			}]);
+			deckStore.set('layout', [['a'], ['b']]);
+			return;
+		}
+		throw e;
+	}
+
+	deckStore.set('columns', deck.columns);
+	deckStore.set('layout', deck.layout);
+};
+
+// TODO: deckがloadされていない状態でsaveすると意図せず上書きが発生するので対策する
+export const saveDeck = throttle(1000, () => {
+	api('i/registry/set', {
+		scope: ['client', 'deck', 'profiles'],
+		key: deckStore.state.profile,
+		value: {
+			columns: deckStore.reactiveState.columns.value,
+			layout: deckStore.reactiveState.layout.value,
+		}
+	});
+});
+
 export function addColumn(column: Column) {
 	if (column.name == undefined) column.name = null;
 	deckStore.push('columns', column);
 	deckStore.push('layout', [column.id]);
+	saveDeck();
 }

 export function removeColumn(id: Column['id']) {
@@ -72,6 +119,7 @@ export function removeColumn(id: Column['id']) {
 	deckStore.set('layout', deckStore.state.layout
 		.map(ids => ids.filter(_id => _id !== id))
 		.filter(ids => ids.length > 0));
+	saveDeck();
 }

 export function swapColumn(a: Column['id'], b: Column['id']) {
@@ -83,6 +131,7 @@ export function swapColumn(a: Column['id'], b: Column['id']) {
 	layout[aX][aY] = b;
 	layout[bX][bY] = a;
 	deckStore.set('layout', layout);
+	saveDeck();
 }

 export function swapLeftColumn(id: Column['id']) {
@@ -98,6 +147,7 @@ export function swapLeftColumn(id: Column['id']) {
 			return true;
 		}
 	});
+	saveDeck();
 }

 export function swapRightColumn(id: Column['id']) {
@@ -113,6 +163,7 @@ export function swapRightColumn(id: Column['id']) {
 			return true;
 		}
 	});
+	saveDeck();
 }

 export function swapUpColumn(id: Column['id']) {
@@ -132,6 +183,7 @@ export function swapUpColumn(id: Column['id']) {
 			return true;
 		}
 	});
+	saveDeck();
 }

 export function swapDownColumn(id: Column['id']) {
@@ -151,6 +203,7 @@ export function swapDownColumn(id: Column['id']) {
 			return true;
 		}
 	});
+	saveDeck();
 }

 export function stackLeftColumn(id: Column['id']) {
@@ -160,6 +213,7 @@ export function stackLeftColumn(id: Column['id']) {
 	layout[i - 1].push(id);
 	layout = layout.filter(ids => ids.length > 0);
 	deckStore.set('layout', layout);
+	saveDeck();
 }

 export function popRightColumn(id: Column['id']) {
@@ -169,6 +223,7 @@ export function popRightColumn(id: Column['id']) {
 	layout.splice(i + 1, 0, [id]);
 	layout = layout.filter(ids => ids.length > 0);
 	deckStore.set('layout', layout);
+	saveDeck();
 }

 export function addColumnWidget(id: Column['id'], widget: ColumnWidget) {
@@ -180,6 +235,7 @@ export function addColumnWidget(id: Column['id'], widget: ColumnWidget) {
 	column.widgets.unshift(widget);
 	columns[columnIndex] = column;
 	deckStore.set('columns', columns);
+	saveDeck();
 }

 export function removeColumnWidget(id: Column['id'], widget: ColumnWidget) {
@@ -190,6 +246,7 @@ export function removeColumnWidget(id: Column['id'], widget: ColumnWidget) {
 	column.widgets = column.widgets.filter(w => w.id != widget.id);
 	columns[columnIndex] = column;
 	deckStore.set('columns', columns);
+	saveDeck();
 }

 export function setColumnWidgets(id: Column['id'], widgets: ColumnWidget[]) {
@@ -200,6 +257,7 @@ export function setColumnWidgets(id: Column['id'], widgets: ColumnWidget[]) {
 	column.widgets = widgets;
 	columns[columnIndex] = column;
 	deckStore.set('columns', columns);
+	saveDeck();
 }

 export function updateColumnWidget(id: Column['id'], widgetId: string, data: any) {
@@ -213,6 +271,7 @@ export function updateColumnWidget(id: Column['id'], widgetId: string, data: any
 	} : w);
 	columns[columnIndex] = column;
 	deckStore.set('columns', columns);
+	saveDeck();
 }

 export function updateColumn(id: Column['id'], column: Partial<Column>) {
@@ -225,4 +284,5 @@ export function updateColumn(id: Column['id'], column: Partial<Column>) {
 	}
 	columns[columnIndex] = currentColumn;
 	deckStore.set('columns', columns);
+	saveDeck();
 }
--- a/src/client/ui/deck/main-column.vue
+++ b/src/client/ui/deck/main-column.vue
@@ -7,7 +7,7 @@
 	<router-view v-slot="{ Component }">
 		<transition>
 			<keep-alive :include="['timeline']">
-				<component :is="Component" :ref="changePage"/>
+				<component :is="Component" :ref="changePage" @contextmenu.stop="onContextmenu"/>
 			</keep-alive>
 		</transition>
 	</router-view>
@@ -16,10 +16,12 @@

 <script lang="ts">
 import { defineComponent } from 'vue';
+import { faWindowMaximize } from '@fortawesome/free-solid-svg-icons';
 import XColumn from './column.vue';
 import XNotes from '@/components/notes.vue';
 import XHeader from '@/ui/_common_/header.vue';
 import { deckStore } from '@/ui/deck/deck-store';
+import * as os from '@/os';

 export default defineComponent({
 	components: {
@@ -43,7 +45,6 @@ export default defineComponent({
 		return {
 			deckStore,
 			pageInfo: null,
-			pageKey: 0,
 		}
 	},

@@ -54,6 +55,22 @@ export default defineComponent({
 				this.pageInfo = page.INFO;
 			}
 		},
+
+		onContextmenu(e) {
+			if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
+			if (window.getSelection().toString() !== '') return;
+			const path = this.$route.path;
+			os.contextMenu([{
+				type: 'label',
+				text: path,
+			}, {
+				icon: faWindowMaximize,
+				text: this.$ts.openInWindow,
+				action: () => {
+					os.pageWindow(path);
+				}
+			}], e);
+		},
 	}
 });
 </script>
--- a/src/client/ui/deck/widgets-column.vue
+++ b/src/client/ui/deck/widgets-column.vue
@@ -114,7 +114,9 @@ export default defineComponent({

 <style lang="scss" scoped>
 .wtdtxvec {
-	padding-top: 1px; // ウィジェットのbox-shadowを利用した1px borderを隠さないようにするため
+	._panel {
+		box-shadow: none;
+	}

 	> header {
 		padding: 16px;
--- a/src/client/ui/default.vue
+++ b/src/client/ui/default.vue
@@ -2,8 +2,8 @@
 <div class="mk-app" :class="{ wallpaper }">
 	<XSidebar ref="nav" class="sidebar"/>

-	<div class="contents" ref="contents">
-		<header class="header" ref="header" @contextmenu.prevent.stop="onContextmenu" @click="onHeaderClick">
+	<div class="contents" ref="contents" :class="{ withHeader: $store.state.titlebar }" @contextmenu.stop="onContextmenu">
+		<header v-if="$store.state.titlebar" class="header" ref="header" @click="onHeaderClick">
 			<XHeader :info="pageInfo"/>
 		</header>
 		<main ref="main">
@@ -29,6 +29,7 @@

 	<div class="buttons" :class="{ navHidden }">
 		<button class="button nav _button" @click="showNav" ref="navButton"><Fa :icon="faBars"/><i v-if="navIndicated"><Fa :icon="faCircle"/></i></button>
+		<button class="button home _button" @click="$route.name === 'index' ? top() : $router.push('/')"><Fa :icon="faHome"/></button>
 		<button class="button notifications _button" @click="$router.push('/my/notifications')"><Fa :icon="faBell"/><i v-if="$i.hasUnreadNotification"><Fa :icon="faCircle"/></i></button>
 		<button class="button widget _button" @click="widgetsShowing = true"><Fa :icon="faLayerGroup"/></button>
 		<button class="button post _button" @click="post"><Fa :icon="faPencilAlt"/></button>
@@ -53,10 +54,10 @@
 </template>

 <script lang="ts">
-import { defineComponent, defineAsyncComponent, markRaw } from 'vue';
+import { defineComponent, defineAsyncComponent } from 'vue';
 import { faLayerGroup, faBars, faHome, faCircle, faWindowMaximize, faColumns, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import { faBell } from '@fortawesome/free-regular-svg-icons';
-import { host } from '@/config';
+import { instanceName } from '@/config';
 import { StickySidebar } from '@/scripts/sticky-sidebar';
 import XSidebar from '@/components/sidebar.vue';
 import XCommon from './_common_/common.vue';
@@ -86,8 +87,6 @@ export default defineComponent({

 	data() {
 		return {
-			host: host,
-			pageKey: 0,
 			pageInfo: null,
 			isDesktop: window.innerWidth >= DESKTOP_THRESHOLD,
 			menuDef: sidebarDef,
@@ -108,12 +107,6 @@ export default defineComponent({
 		}
 	},

-	watch: {
-		$route(to, from) {
-			this.pageKey++;
-		},
-	},
-
 	created() {
 		document.documentElement.style.overflowY = 'scroll';

@@ -154,6 +147,7 @@ export default defineComponent({
 			if (page == null) return;
 			if (page.INFO) {
 				this.pageInfo = page.INFO;
+				document.title = `${this.pageInfo.title} | ${instanceName}`;
 			}
 		},

@@ -162,7 +156,7 @@ export default defineComponent({
 			this.navHidden = navWidth === 0;
 			if (this.$refs.contents == null) return;
 			const width = this.$refs.contents.offsetWidth;
-			this.$refs.header.style.width = `${width}px`;
+			if (this.$refs.header) this.$refs.header.style.width = `${width}px`;
 		},

 		showNav() {
@@ -193,6 +187,8 @@ export default defineComponent({
 		},

 		onContextmenu(e) {
+			if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
+			if (window.getSelection().toString() !== '') return;
 			const path = this.$route.path;
 			os.contextMenu([{
 				type: 'label',
@@ -256,7 +252,10 @@ export default defineComponent({
 	> .contents {
 		width: 100%;
 		min-width: 0;
-		padding-top: $header-height;
+
+		&.withHeader {
+			padding-top: $header-height;
+		}

 		> .header {
 			position: fixed;
@@ -336,15 +335,13 @@ export default defineComponent({
 		position: fixed;
 		z-index: 1000;
 		bottom: 0;
-		padding: 0 32px 32px 32px;
+		padding: 16px;
 		display: flex;
 		width: 100%;
 		box-sizing: border-box;
-		background: linear-gradient(0deg, var(--bg), var(--X1));
-
-		@media (max-width: 500px) {
-			padding: 0 16px 16px 16px;
-		}
+		-webkit-backdrop-filter: blur(32px);
+		backdrop-filter: blur(32px);
+		background-color: var(--header);

 		&:not(.navHidden) {
 			display: none;
@@ -352,15 +349,26 @@ export default defineComponent({

 		> .button {
 			position: relative;
+			flex: 1;
 			padding: 0;
 			margin: auto;
-			width: 64px;
 			height: 64px;
-			border-radius: 100%;
-			box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.2), 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12);
+			border-radius: 8px;
 			background: var(--panel);
 			color: var(--fg);

+			&:not(:last-child) {
+				margin-right: 12px;
+			}
+
+			@media (max-width: 400px) {
+				height: 60px;
+
+				&:not(:last-child) {
+					margin-right: 8px;
+				}
+			}
+
 			&:hover {
 				background: var(--X2);
 			}
--- a/src/client/ui/visitor/a.vue
+++ b/src/client/ui/visitor/a.vue
@@ -63,7 +63,6 @@ export default defineComponent({
 		return {
 			host,
 			instanceName,
-			pageKey: 0,
 			pageInfo: null,
 			meta: null,
 			narrow: window.innerWidth < 1280,
@@ -88,12 +87,6 @@ export default defineComponent({
 		},
 	},

-	watch: {
-		$route(to, from) {
-			this.pageKey++;
-		},
-	},
-
 	created() {
 		document.documentElement.style.overflowY = 'scroll';

--- a/src/client/ui/visitor/b.vue
+++ b/src/client/ui/visitor/b.vue
@@ -1,13 +1,13 @@
 <template>
-<div class="mk-app" :style="{ backgroundImage: root ? `url(${ $instance.backgroundImageUrl })` : 'none' }">
+<div class="mk-app">
 	<a v-if="root" href="https://github.com/syuilo/misskey" target="_blank" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:var(--panel); color:var(--fg); position: fixed; z-index: 10; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a>

-	<div class="side" v-if="!narrow">
-		<XKanban class="kanban" full :transparent="root" :powered-by="root"/>
+	<div class="side" v-if="!narrow && !root">
+		<XKanban class="kanban" full/>
 	</div>

 	<div class="main">
-		<XKanban class="banner" :full="root" :transparent="root" :powered-by="root" v-if="narrow"/>
+		<XKanban class="banner" :powered-by="root" v-if="narrow && !root"/>

 		<div class="contents">
 			<XHeader class="header" :info="pageInfo" v-if="!root"/>
@@ -76,7 +76,6 @@ export default defineComponent({
 		return {
 			host,
 			instanceName,
-			pageKey: 0,
 			pageInfo: null,
 			meta: null,
 			showMenu: false,
@@ -106,14 +105,8 @@ export default defineComponent({
 		},
 	},

-	watch: {
-		$route(to, from) {
-			this.pageKey++;
-		},
-	},
-
 	created() {
-		document.documentElement.style.overflowY = 'scroll';
+		//document.documentElement.style.overflowY = 'scroll';

 		os.api('meta', { detail: true }).then(meta => {
 			this.meta = meta;
--- a/src/client/ui/zen.vue
+++ b/src/client/ui/zen.vue
@@ -38,18 +38,11 @@ export default defineComponent({
 	data() {
 		return {
 			host: host,
-			pageKey: 0,
 			pageInfo: null,
 			faLayerGroup, faBars, faBell, faHome, faCircle,
 		};
 	},

-	watch: {
-		$route(to, from) {
-			this.pageKey++;
-		},
-	},
-
 	created() {
 		document.documentElement.style.overflowY = 'scroll';
 	},
--- a/Show More
+++ b/Show More