Merge branch 'develop' into swn

2021-11-29 15:50:26 +09:00 · 2021-11-29 15:50:26 +09:00 · 7e5ab7af1b
commit 7e5ab7af1b
parent a585664b72 2fc58a780e
70 changed files with 1834 additions and 1173 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -13,10 +13,16 @@
 ## 12.x.x (unreleased)

 ### Improvements
+- API: /antennas/notes API で日付による絞り込みができるように
+- クライアント: アンケートに投票する際に確認ダイアログを出すように
+- クライアント: Renoteなノート詳細ページから元のノートページに遷移できるように

 ### Bugfixes
 - クライアント: ログインにおいてパスワードが誤っている際のエラーメッセージが正しく表示されない問題を修正
 - クライアント: リアクションツールチップ、Renoteツールチップのユーザーの並び順を修正
+- クライアント: サウンドのマスターボリュームが正しく保存されない問題を修正
+- クライアント: 一部環境において通知が表示されると操作不能になる問題を修正
+- クライアント: モバイルでタップしたときにツールチップが表示される問題を修正

 ### Changes
 - クライアント: ノートにモデレーターバッジを表示するのを廃止
--- a/README.md
+++ b/README.md
@ -12,7 +12,7 @@

 [✨ Find an instance](https://misskey-hub.net/instances.html)
 •
-[📦 Create your own instance](https://misskey-hub.net/docs/install/install.html)
+[📦 Create your own instance](https://misskey-hub.net/docs/install.html)
 •
 [🛠️ Contribute](./CONTRIBUTING.md)
 •
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@ -931,6 +931,8 @@ _mfm:
  rainbowDescription: "Makes the content appear in rainbow colors."
  sparkle: "Sparkle"
  sparkleDescription: "Gives content a sparkling particle effect."
+  rotate: "Rotate"
+  rotateDescription: "Rotates the content by 90 degrees"
 _reversi:
  reversi: "Reversi"
  gameSettings: "Game settings"
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@ -809,6 +809,7 @@ ffVisibilityDescription: "自分のフォロー/フォロワー情報の公開
 continueThread: "さらにスレッドを見る"
 deleteAccountConfirm: "アカウントが削除されます。よろしいですか？"
 incorrectPassword: "パスワードが間違っています。"
+voteConfirm: "「{choice}」に投票しますか？"

 _emailUnavailable:
  used: "既に使用されています"
@ -824,7 +825,7 @@ _ffVisibility:

 _signup:
  almostThere: "ほとんど完了です"
-  emailAddressInfo: "あなたが使っているメールアドレスを入力してください。"
+  emailAddressInfo: "あなたが使っているメールアドレスを入力してください。メールアドレスが公開されることはありません。"
  emailSent: "入力されたメールアドレス({email})宛に確認のメールが送信されました。メールに記載されたリンクにアクセスすると、アカウントの作成が完了します。"

 _accountDelete:
@ -945,6 +946,8 @@ _mfm:
  rainbowDescription: "内容をレインボーにします。"
  sparkle: "キラキラ"
  sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
+  rotate: "回転"
+  rotateDescription: "指定した角度で回転させます。"

 _reversi:
  reversi: "リバーシ"
--- a/packages/backend/src/server/api/endpoints/antennas/notes.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts
@ -33,6 +33,14 @@ export const meta = {
 		untilId: {
 			validator: $.optional.type(ID),
 		},
+
+		sinceDate: {
+			validator: $.optional.num,
+		},
+
+		untilDate: {
+			validator: $.optional.num,
+		},
 	},

 	errors: {
@ -68,7 +76,8 @@ export default define(meta, async (ps, user) => {
 		.select('joining.noteId')
 		.where('joining.antennaId = :antennaId', { antennaId: antenna.id });

-	const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
+	const query = makePaginationQuery(Notes.createQueryBuilder('note'),
+			ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 		.andWhere(`note.id IN (${ antennaQuery.getQuery() })`)
 		.innerJoinAndSelect('note.user', 'user')
 		.leftJoinAndSelect('note.reply', 'reply')
--- a/packages/backend/src/tools/add-emoji.ts
+++ b/packages/backend/src/tools/add-emoji.ts
@ -1,7 +1,10 @@
-import { Emojis } from '@/models/index';
+import { initDb } from '@/db/postgre';
 import { genId } from '@/misc/gen-id';

 async function main(name: string, url: string, alias?: string): Promise<any> {
+	await initDb();
+	const { Emojis } = await import('@/models/index');
+
 	const aliases = alias != null ? [ alias ] : [];

 	await Emojis.save({
--- a/packages/backend/src/tools/demote-admin.ts
+++ b/packages/backend/src/tools/demote-admin.ts
@ -1,13 +1,11 @@
 import { initDb } from '../db/postgre';
-import { getRepository } from 'typeorm';
-import { User } from '@/models/entities/user';

 async function main(username: string) {
 	if (!username) throw `username required`;
 	username = username.replace(/^@/, '');

 	await initDb();
-	const Users = getRepository(User);
+	const { Users } = await import('@/models/index');

 	const res = await Users.update({
 		usernameLower: username.toLowerCase(),
--- a/packages/backend/src/tools/mark-admin.ts
+++ b/packages/backend/src/tools/mark-admin.ts
@ -1,13 +1,11 @@
 import { initDb } from '../db/postgre';
-import { getRepository } from 'typeorm';
-import { User } from '@/models/entities/user';

 async function main(username: string) {
 	if (!username) throw `username required`;
 	username = username.replace(/^@/, '');

 	await initDb();
-	const Users = getRepository(User);
+	const { Users } = await import('@/models/index');

 	const res = await Users.update({
 		usernameLower: username.toLowerCase(),
--- a/packages/backend/src/tools/refresh-question.ts
+++ b/packages/backend/src/tools/refresh-question.ts
@ -1,6 +1,9 @@
-import { updateQuestion } from '@/remote/activitypub/models/question';
+import { initDb } from '@/db/postgre';

 async function main(uri: string): Promise<any> {
+	await initDb();
+	const { updateQuestion } = await import('@/remote/activitypub/models/question');
+
 	return await updateQuestion(uri);
 }

--- a/packages/backend/src/tools/show-signin-history.ts
+++ b/packages/backend/src/tools/show-signin-history.ts
@ -1,4 +1,4 @@
-import { Users, Signins } from '@/models/index';
+import { initDb } from '@/db/postgre';

 // node built/tools/show-signin-history username
 //  => {Success} {Date} {IPAddrsss}
@ -10,6 +10,9 @@ import { Users, Signins } from '@/models/index';
 //  with full request headers

 async function main(username: string, headers?: string[]) {
+	await initDb();
+	const { Users, Signins } = await import('@/models/index');
+
 	const user = await Users.findOne({
 		host: null,
 		usernameLower: username.toLowerCase(),
--- a/packages/client/src/components/dialog.vue
+++ b/packages/client/src/components/dialog.vue
@ -14,7 +14,9 @@
 		</div>
 		<header v-if="title"><Mfm :text="title"/></header>
 		<div v-if="text" class="body"><Mfm :text="text"/></div>
-		<MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder" @keydown="onInputKeydown"></MkInput>
+		<MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder" @keydown="onInputKeydown">
+			<template v-if="input.type === 'password'" #prefix><i class="fas fa-lock"></i></template>
+		</MkInput>
 		<MkSelect v-if="select" v-model="selectedValue" autofocus>
 			<template v-if="select.items">
 				<option v-for="item in select.items" :value="item.value">{{ item.text }}</option>
@ -165,6 +167,10 @@ export default defineComponent({
 	> .icon {
 		font-size: 32px;

+		&.info {
+			color: #55c4dd;
+		}
+
 		&.success {
 			color: var(--success);
 		}
--- a/packages/client/src/components/emoji-picker-dialog.vue
+++ b/packages/client/src/components/emoji-picker-dialog.vue
@ -1,5 +1,5 @@
 <template>
-<MkPopup ref="popup" #default="{point}" :manual-showing="manualShowing" :src="src" :front="true" @click="$refs.popup.close()" @opening="opening" @close="$emit('close')" @closed="$emit('closed')">
+<MkPopup ref="popup" v-slot="{ point, close }" :manual-showing="manualShowing" :src="src" :front="true" @click="close()" @opening="opening" @close="$emit('close')" @closed="$emit('closed')">
 	<MkEmojiPicker ref="picker" class="ryghynhb _popup _shadow" :class="{ pointer: point === 'top' }" :show-pinned="showPinned" :as-reaction-picker="asReactionPicker" @chosen="chosen"/>
 </MkPopup>
 </template>
--- a/packages/client/src/components/form/group.vue
+++ b/packages/client/src/components/form/group.vue
@ -0,0 +1,35 @@
+<template>
+<div v-sticky-container v-panel class="adfeebaf _formBlock">
+	<div class="label"><slot name="label"></slot></div>
+	<div class="main _formRoot">
+		<slot></slot>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+});
+</script>
+
+<style lang="scss" scoped>
+.adfeebaf {
+	padding: 24px 24px;
+	border-radius: var(--radius);
+
+	> .label {
+		font-weight: bold;
+		padding: 0 0 16px 0;
+
+		&:empty {
+			display: none;
+		}
+	}
+
+	> .main {
+
+	}
+}
+</style>
--- a/packages/client/src/components/form/input.vue
+++ b/packages/client/src/components/form/input.vue
@ -5,6 +5,7 @@
 		<div ref="prefixEl" class="prefix"><slot name="prefix"></slot></div>
 		<input ref="inputEl"
 			v-model="v"
+			v-panel
 			:type="type"
 			:disabled="disabled"
 			:required="required"
@ -27,7 +28,7 @@
 	</div>
 	<div class="caption"><slot name="caption"></slot></div>

-	<MkButton v-if="manualSave && changed" primary @click="updated"><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>
+	<MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="fas fa-check"></i> {{ $ts.save }}</MkButton>
 </div>
 </template>

@ -114,9 +115,9 @@ export default defineComponent({
 		const changed = ref(false);
 		const invalid = ref(false);
 		const filled = computed(() => v.value !== '' && v.value != null);
-		const inputEl = ref(null);
-		const prefixEl = ref(null);
-		const suffixEl = ref(null);
+		const inputEl = ref<HTMLElement>();
+		const prefixEl = ref<HTMLElement>();
+		const suffixEl = ref<HTMLElement>();

 		const focus = () => inputEl.value.focus();
 		const onInput = (ev) => {
@ -208,7 +209,7 @@ export default defineComponent({
 .matxzzsk {
 	> .label {
 		font-size: 0.85em;
-		padding: 0 0 8px 12px;
+		padding: 0 0 8px 0;
 		user-select: none;

 		&:empty {
@ -217,8 +218,8 @@ export default defineComponent({
 	}

 	> .caption {
-		font-size: 0.8em;
-		padding: 8px 0 0 12px;
+		font-size: 0.85em;
+		padding: 8px 0 0 0;
 		color: var(--fgTransparentWeak);

 		&:empty {
@ -242,8 +243,7 @@ export default defineComponent({
 			font-weight: normal;
 			font-size: 1em;
 			color: var(--fg);
-			background: var(--panel);
-			border: solid 0.5px var(--inputBorder);
+			border: solid 0.5px var(--panel);
 			border-radius: 6px;
 			outline: none;
 			box-shadow: none;
@ -311,5 +311,9 @@ export default defineComponent({
 			}
 		}
 	}
+
+	> .save {
+		margin: 8px 0 0 0;
+	}
 }
 </style>
--- a/packages/client/src/components/form/link.vue
+++ b/packages/client/src/components/form/link.vue
@ -0,0 +1,112 @@
+<template>
+<div class="ffcbddfc" :class="{ inline }">
+	<a v-if="external" class="main _button" :href="to" target="_blank">
+		<span class="icon"><slot name="icon"></slot></span>
+		<span class="text"><slot></slot></span>
+		<span class="right">
+			<span class="text"><slot name="suffix"></slot></span>
+			<i class="fas fa-external-link-alt icon"></i>
+		</span>
+	</a>
+	<MkA v-else class="main _button" :class="{ active }" :to="to" :behavior="behavior">
+		<span class="icon"><slot name="icon"></slot></span>
+		<span class="text"><slot></slot></span>
+		<span class="right">
+			<span class="text"><slot name="suffix"></slot></span>
+			<i class="fas fa-chevron-right icon"></i>
+		</span>
+	</MkA>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	props: {
+		to: {
+			type: String,
+			required: true
+		},
+		active: {
+			type: Boolean,
+			required: false
+		},
+		external: {
+			type: Boolean,
+			required: false
+		},
+		behavior: {
+			type: String,
+			required: false,
+		},
+		inline: {
+			type: Boolean,
+			required: false
+		},
+	},
+});
+</script>
+
+<style lang="scss" scoped>
+.ffcbddfc {
+	display: block;
+
+	&.inline {
+		display: inline-block;
+	}
+
+	> .main {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 12px 14px 12px 14px;
+		background: var(--buttonBg);
+		border-radius: 6px;
+		font-size: 0.9em;
+
+		&:hover {
+			text-decoration: none;
+			background: var(--buttonHoverBg);
+		}
+
+		&.active {
+			color: var(--accent);
+			background: var(--buttonHoverBg);
+		}
+
+		> .icon {
+			margin-right: 0.75em;
+			flex-shrink: 0;
+			text-align: center;
+			opacity: 0.8;
+
+			&:empty {
+				display: none;
+
+				& + .text {
+					padding-left: 4px;
+				}
+			}
+		}
+
+		> .text {
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			padding-right: 12px;
+		}
+
+		> .right {
+			margin-left: auto;
+			opacity: 0.7;
+			white-space: nowrap;
+
+			> .text:not(:empty) {
+				margin-right: 0.75em;
+			}
+		}
+	}
+}
+</style>
--- a/packages/client/src/components/form/pagination.vue
+++ b/packages/client/src/components/form/pagination.vue
@ -0,0 +1,44 @@
+<template>
+<FormSlot>
+	<template #label><slot name="label"></slot></template>
+	<div class="abcaccfa">
+		<slot :items="items"></slot>
+		<div v-if="empty" key="_empty_" class="empty">
+			<slot name="empty"></slot>
+		</div>
+		<MkButton v-show="more" class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" @click="fetchMore">
+			<template v-if="!moreFetching">{{ $ts.loadMore }}</template>
+			<template v-if="moreFetching"><MkLoading inline/></template>
+		</MkButton>
+	</div>
+</FormSlot>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import MkButton from '@/components/ui/button.vue';
+import FormSlot from './slot.vue';
+import paging from '@/scripts/paging';
+
+export default defineComponent({
+	components: {
+		MkButton,
+		FormSlot,
+	},
+
+	mixins: [
+		paging({}),
+	],
+
+	props: {
+		pagination: {
+			required: true
+		},
+	},
+});
+</script>
+
+<style lang="scss" scoped>
+.abcaccfa {
+}
+</style>
--- a/packages/client/src/components/form/radio.vue
+++ b/packages/client/src/components/form/radio.vue
@ -1,5 +1,6 @@
 <template>
 <div
+	v-panel
 	class="novjtctn"
 	:class="{ disabled, checked }"
 	:aria-checked="checked"
@ -50,9 +51,10 @@ export default defineComponent({
 .novjtctn {
 	position: relative;
 	display: inline-block;
-	margin: 8px 20px 0 0;
 	text-align: left;
 	cursor: pointer;
+	padding: 11px 14px;
+	border-radius: 6px;
 	transition: all 0.3s;

 	> * {
@ -68,6 +70,14 @@ export default defineComponent({
 	}

 	&.checked {
+		background: var(--accentedBg) !important;
+		border-color: var(--accent);
+		color: var(--accent);
+
+		&, * {
+			cursor: default !important;
+		}
+
 		> .button {
 			border-color: var(--accent);

@ -79,6 +89,11 @@ export default defineComponent({
 		}
 	}

+	&:hover {
+		border-color: var(--inputBorderHover);
+		color: var(--accent);
+	}
+
 	> input {
 		position: absolute;
 		width: 0;
@ -89,8 +104,8 @@ export default defineComponent({

 	> .button {
 		position: absolute;
-		width: 20px;
-		height: 20px;
+		width: 14px;
+		height: 14px;
 		background: none;
 		border: solid 2px var(--inputBorder);
 		border-radius: 100%;
@ -114,7 +129,6 @@ export default defineComponent({
 	> .label {
 		margin-left: 28px;
 		display: block;
-		font-size: 16px;
 		line-height: 20px;
 		cursor: pointer;
 	}
--- a/packages/client/src/components/form/radios.vue
+++ b/packages/client/src/components/form/radios.vue
@ -23,6 +23,8 @@ export default defineComponent({
 	},
 	render() {
 		let options = this.$slots.default();
+		const label = this.$slots.label && this.$slots.label();
+		const caption = this.$slots.caption && this.$slots.caption();

 		// なぜかFragmentになることがあるため
 		if (options.length === 1 && options[0].props == null) options = options[0].children;
@ -30,12 +32,21 @@ export default defineComponent({
 		return h('div', {
 			class: 'novjtcto'
 		}, [
-			...options.map(option => h(MkRadio, {
+			...(label ? [h('div', {
+				class: 'label'
+			}, [label])] : []),
+			h('div', {
+				class: 'body'
+			}, options.map(option => h(MkRadio, {
 					key: option.key,
 					value: option.props.value,
 					modelValue: this.value,
 					'onUpdate:modelValue': value => this.value = value,
-			}, option.children))
+				}, option.children)),
+			),
+			...(caption ? [h('div', {
+				class: 'caption'
+			}, [caption])] : []),
 		]);
 	}
 });
@ -43,12 +54,30 @@ export default defineComponent({

 <style lang="scss">
 .novjtcto {
-	&:first-child {
-		margin-top: 0;
+	> .label {
+		font-size: 0.85em;
+		padding: 0 0 8px 0;
+		user-select: none;
+
+		&:empty {
+			display: none;
+		}
 	}

-	&:last-child {
-		margin-bottom: 0;
+	> .body {
+		display: grid;
+		grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+		grid-gap: 12px;
+	}
+
+	> .caption {
+		font-size: 0.85em;
+		padding: 8px 0 0 0;
+		color: var(--fgTransparentWeak);
+
+		&:empty {
+			display: none;
+		}
 	}
 }
 </style>
--- a/packages/client/src/components/form/range.vue
+++ b/packages/client/src/components/form/range.vue
@ -1,29 +1,27 @@
 <template>
-<div class="timctyfi" :class="{ focused, disabled }">
-	<div class="icon"><slot name="icon"></slot></div>
-	<span class="label"><slot name="label"></slot></span>
-	<input
-		ref="input"
-		v-model="v"
-		type="range"
-		:disabled="disabled"
-		:min="min"
-		:max="max"
-		:step="step"
-		:autofocus="autofocus"
-		@focus="focused = true"
-		@blur="focused = false"
-		@input="$emit('update:value', $event.target.value)"
-	/>
+<div class="timctyfi" :class="{ disabled }">
+	<div class="label"><slot name="label"></slot></div>
+	<div v-panel class="body">
+		<div ref="containerEl" class="container">
+			<div class="track">
+				<div class="highlight" :style="{ width: (steppedValue * 100) + '%' }"></div>
+			</div>
+			<div v-if="steps" class="ticks">
+				<div v-for="i in (steps + 1)" class="tick" :style="{ left: (((i - 1) / steps) * 100) + '%' }"></div>
+			</div>
+			<div ref="thumbEl" v-tooltip="textConverter(finalValue)" class="thumb" :style="{ left: thumbPosition + 'px' }" @mousedown="onMousedown" @touchstart="onMousedown"></div>
+		</div>
+	</div>
 </div>
 </template>

 <script lang="ts">
-import { defineComponent } from 'vue';
+import { computed, defineComponent, ref, watch } from 'vue';
+import * as os from '@/os';

 export default defineComponent({
 	props: {
-		value: {
+		modelValue: {
 			type: Number,
 			required: false,
 			default: 0
@ -51,88 +49,198 @@ export default defineComponent({
 		autofocus: {
 			type: Boolean,
 			required: false
-		}
 		},
-	data() {
+		textConverter: {
+			type: Function,
+			required: false,
+			default: (v) => v.toString(),
+		},
+	},
+
+	setup(props, context) {
+		const rawValue = ref((props.modelValue - props.min) / (props.max - props.min));
+		const steppedValue = computed(() => {
+			if (props.step) {
+				const step = props.step / (props.max - props.min);
+				return (step * Math.round(rawValue.value / step));
+			} else {
+				return rawValue.value;
+			}
+		});
+		const finalValue = computed(() => {
+			return (steppedValue.value * (props.max - props.min)) + props.min;
+		});
+		watch(finalValue, () => {
+			context.emit('update:modelValue', finalValue.value);
+		});
+
+		const thumbWidth = computed(() => {
+			if (thumbEl.value == null) return 0;
+			return thumbEl.value!.offsetWidth;
+		});
+		const thumbPosition = computed(() => {
+			if (containerEl.value == null) return 0;
+			return (containerEl.value.offsetWidth - thumbWidth.value) * steppedValue.value;
+		});
+		const steps = computed(() => {
+			if (props.step) {
+				return (props.max - props.min) / props.step;
+			} else {
+				return 0;
+			}
+		});
+		const containerEl = ref<HTMLElement>();
+		const thumbEl = ref<HTMLElement>();
+
+		const onMousedown = (ev: MouseEvent | TouchEvent) => {
+			ev.preventDefault();
+
+			const tooltipShowing = ref(true);
+			os.popup(import('@/components/ui/tooltip.vue'), {
+				showing: tooltipShowing,
+				text: computed(() => {
+					return props.textConverter(finalValue.value);
+				}),
+				source: thumbEl,
+			}, {}, 'closed');
+
+			const style = document.createElement('style');
+			style.appendChild(document.createTextNode('* { cursor: grabbing !important; } body * { pointer-events: none !important; }'));
+			document.head.appendChild(style);
+
+			const onDrag = (ev: MouseEvent | TouchEvent) => {
+				ev.preventDefault();
+				const containerRect = containerEl.value!.getBoundingClientRect();
+				const pointerX = ev.touches && ev.touches.length > 0 ? ev.touches[0].clientX : ev.clientX;
+				const pointerPositionOnContainer = pointerX - (containerRect.left + (thumbWidth.value / 2));
+				rawValue.value = Math.min(1, Math.max(0, pointerPositionOnContainer / (containerEl.value!.offsetWidth - thumbWidth.value)));
+			};
+
+			const onMouseup = () => {
+				document.head.removeChild(style);
+				tooltipShowing.value = false;
+				window.removeEventListener('mousemove', onDrag);
+				window.removeEventListener('touchmove', onDrag);
+				window.removeEventListener('mouseup', onMouseup);
+				window.removeEventListener('touchend', onMouseup);
+			};
+
+			window.addEventListener('mousemove', onDrag);
+			window.addEventListener('touchmove', onDrag);
+			window.addEventListener('mouseup', onMouseup, { once: true });
+			window.addEventListener('touchend', onMouseup, { once: true });
+		};
+
 		return {
-			v: this.value,
-			focused: false
+			rawValue,
+			finalValue,
+			steppedValue,
+			onMousedown,
+			containerEl,
+			thumbEl,
+			thumbPosition,
+			steps,
 		};
 	},
-	watch: {
-		value(v) {
-			this.v = parseFloat(v);
-		}
-	},
-	mounted() {
-		if (this.autofocus) {
-			this.$nextTick(() => {
-				this.$refs.input.focus();
-			});
-		}
-	}
 });
 </script>

 <style lang="scss" scoped>
+@use "sass:math";
+
 .timctyfi {
 	position: relative;
-	margin: 8px;

-	> .icon {
-		display: inline-block;
-		width: 24px;
-		text-align: center;
+	> .label {
+		font-size: 0.85em;
+		padding: 0 0 8px 0;
+		user-select: none;
+
+		&:empty {
+			display: none;
+		}
 	}

-	> .title {
-		pointer-events: none;
-		font-size: 16px;
-		color: var(--inputLabel);
-		overflow: hidden;
+	> .caption {
+		font-size: 0.85em;
+		padding: 8px 0 0 0;
+		color: var(--fgTransparentWeak);
+
+		&:empty {
+			display: none;
+		}
 	}

-	> input {
-		-webkit-appearance: none;
-		-moz-appearance: none;
-		appearance: none;
-		background: var(--X10);
-		height: 7px;
-		margin: 0 8px;
-		outline: 0;
-		border: 0;
-		border-radius: 7px;
+	$thumbHeight: 20px;
+	$thumbWidth: 20px;

-		&.disabled {
-			opacity: 0.6;
-			cursor: not-allowed;
-		}
+	> .body {
+		padding: 12px;
+		border-radius: 6px;

-		&::-webkit-slider-thumb {
-			-webkit-appearance: none;
-			appearance: none;
-			cursor: pointer;
-			width: 20px;
-			height: 20px;
-			display: block;
-			border-radius: 50%;
-			border: none;
+		> .container {
+			position: relative;
+			height: $thumbHeight;
+
+			> .track {
+				position: absolute;
+				top: 0;
+				bottom: 0;
+				left: 0;
+				right: 0;
+				margin: auto;
+				width: calc(100% - #{$thumbWidth});
+				height: 3px;
+				background: rgba(0, 0, 0, 0.1);
+				border-radius: 999px;
+				overflow: clip;
+
+				> .highlight {
+					position: absolute;
+					top: 0;
+					left: 0;
+					height: 100%;
 					background: var(--accent);
-			box-shadow: 0 0 6px rgba(0, 0, 0, 0.3);
-			box-sizing: content-box;
+					opacity: 0.5;
+					transition: width 0.2s cubic-bezier(0,0,0,1);
+				}
 			}

-		&::-moz-range-thumb {
-			-moz-appearance: none;
-			appearance: none;
-			cursor: pointer;
-			width: 20px;
-			height: 20px;
-			display: block;
-			border-radius: 50%;
-			border: none;
+			> .ticks {
+				$tickWidth: 3px;
+
+				position: absolute;
+				top: 0;
+				bottom: 0;
+				left: 0;
+				right: 0;
+				margin: auto;
+				width: calc(100% - #{$thumbWidth});
+
+				> .tick {
+					position: absolute;
+					bottom: 0;
+					width: $tickWidth;
+					height: 3px;
+					margin-left: - math.div($tickWidth, 2);
+					background: var(--divider);
+					border-radius: 999px;
+				}
+			}
+
+			> .thumb {
+				position: absolute;
+				width: $thumbWidth;
+				height: $thumbHeight;
+				cursor: grab;
 				background: var(--accent);
-			box-shadow: 0 0 6px rgba(0, 0, 0, 0.3);
+				border-radius: 999px;
+				transition: left 0.2s cubic-bezier(0,0,0,1);
+
+				&:hover {
+					background: var(--accentLighten);
+				}
+			}
 		}
 	}
 }
--- a/packages/client/src/components/form/section.vue
+++ b/packages/client/src/components/form/section.vue
@ -1,7 +1,7 @@
 <template>
-<div v-size="{ max: [500] }" v-sticky-container class="vrtktovh">
+<div v-size="{ max: [500] }" v-sticky-container class="vrtktovh _formBlock">
 	<div class="label"><slot name="label"></slot></div>
-	<div class="main">
+	<div class="main _formRoot">
 		<slot></slot>
 	</div>
 </div>
@ -17,15 +17,33 @@ export default defineComponent({

 <style lang="scss" scoped>
 .vrtktovh {
+	margin: 0;
 	border-top: solid 0.5px var(--divider);
+	border-bottom: solid 0.5px var(--divider);
+	padding: 24px 0;
+
+	& + .vrtktovh {
+		border-top: none;
+	}
+
+	&:first-child {
+		border-top: none;
+	}
+
+	&:last-child {
+		border-bottom: none;
+	}

 	> .label {
 		font-weight: bold;
-		padding: 24px 0 16px 0;
+		padding: 0 0 16px 0;
+
+		&:empty {
+			display: none;
+		}
 	}

 	> .main {
-		margin-bottom: 32px;
 	}
 }
 </style>
--- a/packages/client/src/components/form/select.vue
+++ b/packages/client/src/components/form/select.vue
@ -3,7 +3,7 @@
 	<div class="label" @click="focus"><slot name="label"></slot></div>
 	<div ref="container" class="input" :class="{ inline, disabled, focused }" @click.prevent="onClick">
 		<div ref="prefixEl" class="prefix"><slot name="prefix"></slot></div>
-		<select ref="inputEl" v-model="v"
+		<select ref="inputEl" v-model="v" v-panel
 			class="select"
 			:disabled="disabled"
 			:required="required"
@ -201,7 +201,7 @@ export default defineComponent({
 .vblkjoeq {
 	> .label {
 		font-size: 0.85em;
-		padding: 0 0 8px 12px;
+		padding: 0 0 8px 0;
 		user-select: none;

 		&:empty {
@ -210,8 +210,8 @@ export default defineComponent({
 	}

 	> .caption {
-		font-size: 0.8em;
-		padding: 8px 0 0 12px;
+		font-size: 0.85em;
+		padding: 8px 0 0 0;
 		color: var(--fgTransparentWeak);

 		&:empty {
@ -242,8 +242,7 @@ export default defineComponent({
 			font-weight: normal;
 			font-size: 1em;
 			color: var(--fg);
-			background: var(--panel);
-			border: solid 1px var(--inputBorder);
+			border: solid 1px var(--panel);
 			border-radius: 6px;
 			outline: none;
 			box-shadow: none;
--- a/packages/client/src/components/form/slot.vue
+++ b/packages/client/src/components/form/slot.vue
@ -18,11 +18,9 @@ export default defineComponent({

 <style lang="scss" scoped>
 .adhpbeou {
-	margin: 1.5em 0;
-
 	> .label {
 		font-size: 0.85em;
-		padding: 0 0 8px 12px;
+		padding: 0 0 8px 0;
 		user-select: none;

 		&:empty {
@ -31,20 +29,13 @@ export default defineComponent({
 	}

 	> .caption {
-		font-size: 0.8em;
-		padding: 8px 0 0 12px;
+		font-size: 0.85em;
+		padding: 8px 0 0 0;
 		color: var(--fgTransparentWeak);

 		&:empty {
 			display: none;
 		}
 	}
-
-	> .content {
-		position: relative;
-		background: var(--panel);
-		border: solid 0.5px var(--inputBorder);
-		border-radius: 6px;
-	}
 }
 </style>
--- a/packages/client/src/components/form/suspense.vue
+++ b/packages/client/src/components/form/suspense.vue
@ -0,0 +1,98 @@
+<template>
+<transition name="fade" mode="out-in">
+	<div v-if="pending">
+		<MkLoading/>
+	</div>
+	<div v-else-if="resolved">
+		<slot :result="result"></slot>
+	</div>
+	<div v-else>
+		<div class="wszdbhzo">
+			<div><i class="fas fa-exclamation-triangle"></i> {{ $ts.somethingHappened }}</div>
+			<MkButton inline class="retry" @click="retry"><i class="fas fa-redo-alt"></i> {{ $ts.retry }}</MkButton>
+		</div>
+	</div>
+</transition>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, ref, watch } from 'vue';
+import MkButton from '@/components/ui/button.vue';
+
+export default defineComponent({
+	components: {
+		MkButton
+	},
+
+	props: {
+		p: {
+			type: Function as PropType<() => Promise<any>>,
+			required: true,
+		}
+	},
+
+	setup(props, context) {
+		const pending = ref(true);
+		const resolved = ref(false);
+		const rejected = ref(false);
+		const result = ref(null);
+
+		const process = () => {
+			if (props.p == null) {
+				return;
+			}
+			const promise = props.p();
+			pending.value = true;
+			resolved.value = false;
+			rejected.value = false;
+			promise.then((_result) => {
+				pending.value = false;
+				resolved.value = true;
+				result.value = _result;
+			});
+			promise.catch(() => {
+				pending.value = false;
+				rejected.value = true;
+			});
+		};
+
+		watch(() => props.p, () => {
+			process();
+		}, {
+			immediate: true
+		});
+
+		const retry = () => {
+			process();
+		};
+
+		return {
+			pending,
+			resolved,
+			rejected,
+			result,
+			retry,
+		};
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.fade-enter-active,
+.fade-leave-active {
+	transition: opacity 0.125s ease;
+}
+.fade-enter-from,
+.fade-leave-to {
+	opacity: 0;
+}
+
+.wszdbhzo {
+	padding: 16px;
+	text-align: center;
+
+	> .retry {
+		margin-top: 16px;
+	}
+}
+</style>
--- a/packages/client/src/components/form/switch.vue
+++ b/packages/client/src/components/form/switch.vue
@ -18,7 +18,7 @@
 	</span>
 	<span class="label">
 		<span><slot></slot></span>
-		<p><slot name="caption"></slot></p>
+		<p class="caption"><slot name="caption"></slot></p>
 	</span>
 </div>
 </template>
@ -118,10 +118,14 @@ export default defineComponent({
 			transition: inherit;
 		}

-		> p {
-			margin: 0;
+		> .caption {
+			margin: 8px 0 0 0;
 			color: var(--fgTransparentWeak);
-			font-size: 90%;
+			font-size: 0.85em;
+
+			&:empty {
+				display: none;
+			}
 		}
 	}

--- a/packages/client/src/components/form/textarea.vue
+++ b/packages/client/src/components/form/textarea.vue
@ -4,6 +4,7 @@
 	<div class="input" :class="{ disabled, focused, tall, pre }">
 		<textarea ref="inputEl"
 			v-model="v"
+			v-panel
 			:class="{ code, _monospace: code }"
 			:disabled="disabled"
 			:required="required"
@ -20,7 +21,7 @@
 	</div>
 	<div class="caption"><slot name="caption"></slot></div>

-	<MkButton v-if="manualSave && changed" primary @click="updated"><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>
+	<MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>
 </div>
 </template>

@ -174,7 +175,7 @@ export default defineComponent({
 .adhpbeos {
 	> .label {
 		font-size: 0.85em;
-		padding: 0 0 8px 12px;
+		padding: 0 0 8px 0;
 		user-select: none;

 		&:empty {
@ -183,8 +184,8 @@ export default defineComponent({
 	}

 	> .caption {
-		font-size: 0.8em;
-		padding: 8px 0 0 12px;
+		font-size: 0.85em;
+		padding: 8px 0 0 0;
 		color: var(--fgTransparentWeak);

 		&:empty {
@ -209,8 +210,7 @@ export default defineComponent({
 			font-weight: normal;
 			font-size: 1em;
 			color: var(--fg);
-			background: var(--panel);
-			border: solid 0.5px var(--inputBorder);
+			border: solid 0.5px var(--panel);
 			border-radius: 6px;
 			outline: none;
 			box-shadow: none;
@ -248,5 +248,9 @@ export default defineComponent({
 			}
 		}
 	}
+
+	> .save {
+		margin: 8px 0 0 0;
+	}
 }
 </style>
--- a/packages/client/src/components/global/spacer.vue
+++ b/packages/client/src/components/global/spacer.vue
@ -15,19 +15,29 @@ export default defineComponent({
 			type: Number,
 			required: false,
 			default: null,
-		}
+		},
+		marginMin: {
+			type: Number,
+			required: false,
+			default: 12,
+		},
+		marginMax: {
+			type: Number,
+			required: false,
+			default: 32,
+		},
 	},

 	setup(props, context) {
 		let ro: ResizeObserver;
-		const root = ref<HTMLElement>(null);
-		const content = ref<HTMLElement>(null);
+		const root = ref<HTMLElement>();
+		const content = ref<HTMLElement>();
 		const margin = ref(0);
 		const adjust = (rect: { width: number; height: number; }) => {
 			if (rect.width > (props.contentMax || 500)) {
-				margin.value = 32;
+				margin.value = props.marginMax;
 			} else {
-				margin.value = 12;
+				margin.value = props.marginMin;
 			}
 		};

@ -40,14 +50,14 @@ export default defineComponent({
 				});
 				*/
 				adjust({
-					width: root.value.offsetWidth,
-					height: root.value.offsetHeight,
+					width: root.value!.offsetWidth,
+					height: root.value!.offsetHeight,
 				});
 			});
-			ro.observe(root.value);
+			ro.observe(root.value!);

 			if (props.contentMax) {
-				content.value.style.maxWidth = `${props.contentMax}px`;
+				content.value!.style.maxWidth = `${props.contentMax}px`;
 			}
 		});

--- a/packages/client/src/components/key-value.vue
+++ b/packages/client/src/components/key-value.vue
@ -0,0 +1,48 @@
+<template>
+<div class="alqyeyti">
+	<div class="key">
+		<slot name="key"></slot>
+	</div>
+	<div class="value">
+		<slot name="value"></slot>
+		<button v-if="copy" v-tooltip="$ts.copy" class="_textButton" style="margin-left: 0.5em;" @click="copy_"><i class="far fa-copy"></i></button>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import copyToClipboard from '@/scripts/copy-to-clipboard';
+import * as os from '@/os';
+
+export default defineComponent({
+	props: {
+		copy: {
+			type: String,
+			required: false,
+			default: null,
+		},
+	},
+
+	setup(props) {
+		const copy_ = () => {
+			copyToClipboard(props.copy);
+			os.success();
+		};
+
+		return {
+			copy_
+		};
+	},
+});
+</script>
+
+<style lang="scss" scoped>
+.alqyeyti {
+	> .key {
+		font-size: 0.85em;
+		padding: 0 0 0.25em 0;
+		opacity: 0.75;
+	}
+}
+</style>
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@ -184,6 +184,11 @@ export default defineComponent({
 								count, speed,
 							}, genEl(token.children));
 						}
+						case 'rotate': {
+							const degrees = parseInt(token.props.args.deg) || '90';
+							style = `transform: rotate(${degrees}deg); transform-origin: center center;`;
+							break;
+						}
 					}
 					if (style == null) {
 						return h('span', {}, ['$[', token.props.name, ' ', ...genEl(token.children), ']']);
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@ -84,7 +84,9 @@
 			</div>
 			<footer class="footer">
 				<div class="info">
-					<MkTime class="created-at" :time="appearNote.createdAt" mode="detail"/>
+					<MkA class="created-at" :to="notePage(appearNote)">
+						<MkTime :time="appearNote.createdAt" mode="detail"/>
+					</MkA>
 				</div>
 				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
 				<button class="button _button" @click="reply()">
@ -136,6 +138,7 @@ import { url } from '@/config';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
 import { checkWordMute } from '@/scripts/check-word-mute';
 import { userPage } from '@/filters/user';
+import { notePage } from '@/filters/note';
 import * as os from '@/os';
 import { noteActions, noteViewInterruptors } from '@/store';
 import { reactionPicker } from '@/scripts/reaction-picker';
@ -181,6 +184,7 @@ export default defineComponent({
 			muted: false,
 			translation: null,
 			translating: false,
+			notePage,
 		};
 	},

--- a/packages/client/src/components/note-header.vue
+++ b/packages/client/src/components/note-header.vue
@ -21,7 +21,7 @@

 <script lang="ts">
 import { defineComponent } from 'vue';
-import notePage from '@/filters/note';
+import { notePage } from '@/filters/note';
 import { userPage } from '@/filters/user';
 import * as os from '@/os';

--- a/packages/client/src/components/note.sub.vue
+++ b/packages/client/src/components/note.sub.vue
@ -26,7 +26,7 @@

 <script lang="ts">
 import { defineComponent } from 'vue';
-import notePage from '@/filters/note';
+import { notePage } from '@/filters/note';
 import XNoteHeader from './note-header.vue';
 import XSubNoteContent from './sub-note-content.vue';
 import XCwButton from './cw-button.vue';
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@ -858,6 +858,7 @@ export default defineComponent({
 .tkcbzcuz {
 	position: relative;
 	transition: box-shadow 0.1s ease;
+	font-size: 1.05em;
 	overflow: clip;
 	contain: content;

--- a/packages/client/src/components/notification.vue
+++ b/packages/client/src/components/notification.vue
@ -74,7 +74,7 @@ import { getNoteSummary } from '@/scripts/get-note-summary';
 import XReactionIcon from './reaction-icon.vue';
 import MkFollowButton from './follow-button.vue';
 import XReactionTooltip from './reaction-tooltip.vue';
-import notePage from '@/filters/note';
+import { notePage } from '@/filters/note';
 import { userPage } from '@/filters/user';
 import { i18n } from '@/i18n';
 import * as os from '@/os';
--- a/packages/client/src/components/poll.vue
+++ b/packages/client/src/components/poll.vue
@ -87,14 +87,20 @@ export default defineComponent({
 		toggleShowResult() {
 			this.showResult = !this.showResult;
 		},
-		vote(id) {
+		async vote(id) {
 			if (this.readOnly || this.closed || !this.poll.multiple && this.poll.choices.some(c => c.isVoted)) return;
-			os.api('notes/polls/vote', {
+
+			const { canceled } = await os.confirm({
+				type: 'question',
+				text: this.$t('voteConfirm', { choice: this.poll.choices[id].text }),
+			});
+			if (canceled) return;
+
+			await os.api('notes/polls/vote', {
 				noteId: this.note.id,
 				choice: id
-			}).then(() => {
-				if (!this.showResult) this.showResult = !this.poll.multiple;
 			});
+			if (!this.showResult) this.showResult = !this.poll.multiple;
 		}
 	}
 });
--- a/packages/client/src/components/ui/button.vue
+++ b/packages/client/src/components/ui/button.vue
@ -142,12 +142,12 @@ export default defineComponent({
 	padding: 8px 14px;
 	text-align: center;
 	font-weight: normal;
-	font-size: 0.8em;
+	font-size: 0.9em;
 	line-height: 22px;
 	box-shadow: none;
 	text-decoration: none;
 	background: var(--buttonBg);
-	border-radius: 4px;
+	border-radius: 5px;
 	overflow: clip;
 	box-sizing: border-box;
 	transition: background 0.1s ease;
--- a/packages/client/src/components/ui/menu.vue
+++ b/packages/client/src/components/ui/menu.vue
@ -2,7 +2,7 @@
 <div ref="items" v-hotkey="keymap"
 	class="rrevdjwt"
 	:class="{ center: align === 'center' }"
-	:style="{ width: width ? width + 'px' : null }"
+	:style="{ width: width ? width + 'px' : null, maxHeight: maxHeight ? maxHeight + 'px' : null }"
 	@contextmenu.self="e => e.preventDefault()"
 >
 	<template v-for="(item, i) in items2">
@ -64,6 +64,10 @@ export default defineComponent({
 			type: Number,
 			required: false
 		},
+		maxHeight: {
+			type: Number,
+			required: false
+		},
 	},
 	emits: ['close'],
 	data() {
@ -146,8 +150,8 @@ export default defineComponent({
 <style lang="scss" scoped>
 .rrevdjwt {
 	padding: 8px 0;
+	box-sizing: border-box;
 	min-width: 200px;
-	max-height: 90vh;
 	overflow: auto;

 	&.center {
--- a/packages/client/src/components/ui/popup-menu.vue
+++ b/packages/client/src/components/ui/popup-menu.vue
@ -1,6 +1,6 @@
 <template>
-<MkPopup ref="popup" :src="src" @closed="$emit('closed')">
-	<MkMenu :items="items" :align="align" :width="width" class="_popup _shadow" @close="$refs.popup.close()"/>
+<MkPopup ref="popup" v-slot="{ maxHeight, close }" :src="src" @closed="$emit('closed')">
+	<MkMenu :items="items" :align="align" :width="width" :max-height="maxHeight" class="_popup _shadow" @close="close()"/>
 </MkPopup>
 </template>

--- a/packages/client/src/components/ui/popup.vue
+++ b/packages/client/src/components/ui/popup.vue
@ -1,15 +1,15 @@
 <template>
-<transition :name="$store.state.animation ? 'popup-menu' : ''" appear @after-leave="onClosed" @enter="$emit('opening')" @after-enter="childRendered">
+<transition :name="$store.state.animation ? 'popup-menu' : ''" appear @after-leave="$emit('closed')" @enter="$emit('opening')">
 	<div v-show="manualShowing != null ? manualShowing : showing" ref="content" class="ccczpooj" :class="{ front, fixed, top: position === 'top' }" :style="{ pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
-		<slot></slot>
+		<slot :max-height="maxHeight" :close="close"></slot>
 	</div>
 </transition>
 </template>

 <script lang="ts">
-import { defineComponent, PropType } from 'vue';
+import { defineComponent, nextTick, onMounted, onUnmounted, PropType, ref, watch } from 'vue';

-function getFixedContainer(el: Element | null): Element | null {
+function getFixedContainer(el: Element | null | undefined): Element | null {
 	if (el == null || el.tagName === 'BODY') return null;
 	const position = window.getComputedStyle(el).getPropertyValue('position');
 	if (position === 'fixed') {
@ -41,55 +41,40 @@ export default defineComponent({
 			type: Boolean,
 			required: false,
 			default: false,
-		}
+		},
+		noOverlap: {
+			type: Boolean,
+			required: false,
+			default: true,
+		},
 	},

 	emits: ['opening', 'click', 'esc', 'close', 'closed'],

-	data() {
-		return {
-			showing: true,
-			fixed: false,
-			transformOrigin: 'center',
-			contentClicking: false,
-		};
-	},
+	setup(props, context) {
+		const maxHeight = ref<number>();
+		const fixed = ref(false);
+		const transformOrigin = ref('center');
+		const showing = ref(true);
+		const content = ref<HTMLElement>();

-	mounted() {
-		this.$watch('src', () => {
-			if (this.src) {
+		const close = () => {
 			// eslint-disable-next-line vue/no-mutating-props
-				this.src.style.pointerEvents = 'none';
-			}
-			this.fixed = getFixedContainer(this.src) != null;
-			this.$nextTick(() => {
-				this.align();
-			});
-		}, { immediate: true });
+			if (props.src) props.src.style.pointerEvents = 'auto';
+			showing.value = false;
+			context.emit('close');
+		};

-		this.$nextTick(() => {
-			const popover = this.$refs.content as any;
-			new ResizeObserver((entries, observer) => {
-				this.align();
-			}).observe(popover);
-		});
+		const MARGIN = 16;

-		document.addEventListener('mousedown', this.onDocumentClick, { passive: true });
-	},
+		const align = () => {
+			if (props.src == null) return;

-	beforeUnmount() {
-		document.removeEventListener('mousedown', this.onDocumentClick);
-	},
-
-	methods: {
-		align() {
-			if (this.src == null) return;
-
-			const popover = this.$refs.content as any;
+			const popover = content.value!;

 			if (popover == null) return;

-			const rect = this.src.getBoundingClientRect();
+			const rect = props.src.getBoundingClientRect();
 			
 			const width = popover.offsetWidth;
 			const height = popover.offsetHeight;
@ -97,81 +82,84 @@ export default defineComponent({
 			let left;
 			let top;

-			if (this.srcCenter) {
-				const x = rect.left + (this.fixed ? 0 : window.pageXOffset) + (this.src.offsetWidth / 2);
-				const y = rect.top + (this.fixed ? 0 : window.pageYOffset) + (this.src.offsetHeight / 2);
+			if (props.srcCenter) {
+				const x = rect.left + (fixed.value ? 0 : window.pageXOffset) + (props.src.offsetWidth / 2);
+				const y = rect.top + (fixed.value ? 0 : window.pageYOffset) + (props.src.offsetHeight / 2);
 				left = (x - (width / 2));
 				top = (y - (height / 2));
 			} else {
-				const x = rect.left + (this.fixed ? 0 : window.pageXOffset) + (this.src.offsetWidth / 2);
-				const y = rect.top + (this.fixed ? 0 : window.pageYOffset) + this.src.offsetHeight;
+				const x = rect.left + (fixed.value ? 0 : window.pageXOffset) + (props.src.offsetWidth / 2);
+				const y = rect.top + (fixed.value ? 0 : window.pageYOffset) + props.src.offsetHeight;
 				left = (x - (width / 2));
 				top = y;
 			}

-			if (this.fixed) {
+			if (fixed.value) {
+				// 画面から横にはみ出る場合
 				if (left + width > window.innerWidth) {
 					left = window.innerWidth - width;
 				}

-				if (top + height > window.innerHeight) {
-					top = window.innerHeight - height;
+				// 画面から縦にはみ出る場合
+				if (top + height > (window.innerHeight - MARGIN)) {
+					if (props.noOverlap) {
+						const underSpace = (window.innerHeight - MARGIN) - top;
+						const upperSpace = (rect.top - MARGIN);
+						if (underSpace >= (upperSpace / 3)) {
+							maxHeight.value =  underSpace;
+						} else {
+							maxHeight.value =  upperSpace;
+							top = (upperSpace + MARGIN) - height;
 						}
 					} else {
+						top = (window.innerHeight - MARGIN) - height;
+					}
+				}
+			} else {
+				// 画面から横にはみ出る場合
 				if (left + width - window.pageXOffset > window.innerWidth) {
 					left = window.innerWidth - width + window.pageXOffset - 1;
 				}

-				if (top + height - window.pageYOffset > window.innerHeight) {
-					top = window.innerHeight - height + window.pageYOffset - 1;
+				// 画面から縦にはみ出る場合
+				if (top + height - window.pageYOffset > (window.innerHeight - MARGIN)) {
+					if (props.noOverlap) {
+						const underSpace = (window.innerHeight - MARGIN) - (top - window.pageYOffset);
+						const upperSpace = (rect.top - MARGIN);
+						if (underSpace >= (upperSpace / 3)) {
+							maxHeight.value =  underSpace;
+						} else {
+							maxHeight.value =  upperSpace;
+							top = window.pageYOffset + ((upperSpace + MARGIN) - height);
+						}
+					} else {
+						top = (window.innerHeight - MARGIN) - height + window.pageYOffset - 1;
+					}
 				}
 			}

 			if (top < 0) {
-				top = 0;
+				top = MARGIN;
 			}

 			if (left < 0) {
 				left = 0;
 			}

-			if (top > rect.top + (this.fixed ? 0 : window.pageYOffset)) {
-				this.transformOrigin = 'center top';
+			if (top > rect.top + (fixed.value ? 0 : window.pageYOffset)) {
+				transformOrigin.value = 'center top';
+			} else if ((top + height) <= rect.top + (fixed.value ? 0 : window.pageYOffset)) {
+				transformOrigin.value = 'center bottom';
 			} else {
-				this.transformOrigin = 'center';
+				transformOrigin.value = 'center';
 			}

 			popover.style.left = left + 'px';
 			popover.style.top = top + 'px';
-		},
+		};

-		childRendered() {
-			// モーダルコンテンツにマウスボタンが押され、コンテンツ外でマウスボタンが離されたときにモーダルバックグラウンドクリックと判定させないためにマウスイベントを監視しフラグ管理する
-			const content = this.$refs.content.children[0];
-			content.addEventListener('mousedown', e => {
-				this.contentClicking = true;
-				window.addEventListener('mouseup', e => {
-					// click イベントより先に mouseup イベントが発生するかもしれないのでちょっと待つ
-					setTimeout(() => {
-						this.contentClicking = false;
-					}, 100);
-				}, { passive: true, once: true });
-			}, { passive: true });
-		},
-
-		close() {
-			// eslint-disable-next-line vue/no-mutating-props
-			if (this.src) this.src.style.pointerEvents = 'auto';
-			this.showing = false;
-			this.$emit('close');
-		},
-
-		onClosed() {
-			this.$emit('closed');
-		},
-
-		onDocumentClick(ev) {
-			const flyoutElement = this.$refs.content;
+		const onDocumentClick = (ev: MouseEvent) => {
+			const flyoutElement = content.value;
 			let targetElement = ev.target;
 			do {
 				if (targetElement === flyoutElement) {
@ -179,9 +167,45 @@ export default defineComponent({
 				}
 				targetElement = targetElement.parentNode;
 			} while (targetElement);
-			this.close();
-		}
+			close();
+		};
+
+		onMounted(() => {
+			watch(() => props.src, async () => {
+				if (props.src) {
+					// eslint-disable-next-line vue/no-mutating-props
+					props.src.style.pointerEvents = 'none';
 				}
+				fixed.value = getFixedContainer(props.src) != null;
+
+				await nextTick()
+				
+				align();
+			}, { immediate: true, });
+
+			nextTick(() => {
+				const popover = content.value;
+				new ResizeObserver((entries, observer) => {
+					align();
+				}).observe(popover!);
+			});
+
+			document.addEventListener('mousedown', onDocumentClick, { passive: true });
+
+			onUnmounted(() => {
+				document.removeEventListener('mousedown', onDocumentClick);
+			});
+		});
+
+		return {
+			showing,
+			fixed,
+			content,
+			transformOrigin,
+			maxHeight,
+			close,
+		};
+	},
 });
 </script>

--- a/packages/client/src/components/ui/super-menu.vue
+++ b/packages/client/src/components/ui/super-menu.vue
@ -51,7 +51,6 @@ export default defineComponent({
 		}

 		> .title {
-			font-size: 0.9em;
 			opacity: 0.7;
 			margin: 0 0 8px 12px;
 		}
@ -64,7 +63,6 @@ export default defineComponent({
 				box-sizing: border-box;
 				padding: 10px 16px 10px 8px;
 				border-radius: 9px;
-				font-size: 0.9em;

 				&:hover {
 					text-decoration: none;
--- a/packages/client/src/components/ui/tooltip.vue
+++ b/packages/client/src/components/ui/tooltip.vue
@ -1,13 +1,13 @@
 <template>
 <transition name="tooltip" appear @after-leave="$emit('closed')">
-	<div v-show="showing" ref="content" class="buebdbiu _acrylic _shadow" :style="{ maxWidth: maxWidth + 'px' }">
+	<div v-show="showing" ref="el" class="buebdbiu _acrylic _shadow" :style="{ maxWidth: maxWidth + 'px' }">
 		<slot>{{ text }}</slot>
 	</div>
 </transition>
 </template>

 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, nextTick, onMounted, onUnmounted, ref } from 'vue';

 export default defineComponent({
 	props: {
@ -31,35 +31,64 @@ export default defineComponent({

 	emits: ['closed'],

-	mounted() {
-		this.$nextTick(() => {
-			if (this.source == null) {
-				this.$emit('closed');
-				return;
-			}
+	setup(props, context) {
+		const el = ref<HTMLElement>();

-			const rect = this.source.getBoundingClientRect();
+		const setPosition = () => {
+			if (el.value == null) return;

-			const contentWidth = this.$refs.content.offsetWidth;
-			const contentHeight = this.$refs.content.offsetHeight;
+			const rect = props.source.getBoundingClientRect();

-			let left = rect.left + window.pageXOffset + (this.source.offsetWidth / 2);
+			const contentWidth = el.value.offsetWidth;
+			const contentHeight = el.value.offsetHeight;
+
+			let left = rect.left + window.pageXOffset + (props.source.offsetWidth / 2);
 			let top = rect.top + window.pageYOffset - contentHeight;

-			left -= (this.$el.offsetWidth / 2);
+			left -= (el.value.offsetWidth / 2);

 			if (left + contentWidth - window.pageXOffset > window.innerWidth) {
 				left = window.innerWidth - contentWidth + window.pageXOffset - 1;
 			}

 			if (top - window.pageYOffset < 0) {
-				top = rect.top + window.pageYOffset + this.source.offsetHeight;
-				this.$refs.content.style.transformOrigin = 'center top';
+				top = rect.top + window.pageYOffset + props.source.offsetHeight;
+				el.value.style.transformOrigin = 'center top';
 			}

-			this.$el.style.left = left + 'px';
-			this.$el.style.top = top + 'px';
+			el.value.style.left = left + 'px';
+			el.value.style.top = top + 'px';
+		};
+
+		onMounted(() => {
+			nextTick(() => {
+				if (props.source == null) {
+					context.emit('closed');
+					return;
+				}
+
+				setPosition();
+
+				let loopHandler;
+
+				const loop = () => {
+					loopHandler = window.requestAnimationFrame(() => {
+						setPosition();
+						loop();
 					});
+				};
+
+				loop();
+
+				onUnmounted(() => {
+					window.cancelAnimationFrame(loopHandler);
+				});
+			});
+		});
+
+		return {
+			el,
+		};
 	},
 })
 </script>
--- a/packages/client/src/directives/index.ts
+++ b/packages/client/src/directives/index.ts
@ -10,6 +10,7 @@ import appear from './appear';
 import anim from './anim';
 import stickyContainer from './sticky-container';
 import clickAnime from './click-anime';
+import panel from './panel';

 export default function(app: App) {
 	app.directive('userPreview', userPreview);
@ -23,4 +24,5 @@ export default function(app: App) {
 	app.directive('anim', anim);
 	app.directive('click-anime', clickAnime);
 	app.directive('sticky-container', stickyContainer);
+	app.directive('panel', panel);
 }
--- a/packages/client/src/directives/panel.ts
+++ b/packages/client/src/directives/panel.ts
@ -0,0 +1,24 @@
+import { Directive } from 'vue';
+
+export default {
+	mounted(src, binding, vn) {
+		const getBgColor = (el: HTMLElement) => {
+			const style = window.getComputedStyle(el);
+			if (style.backgroundColor && !['rgba(0, 0, 0, 0)', 'rgba(0,0,0,0)', 'transparent'].includes(style.backgroundColor)) {
+				return style.backgroundColor;
+			} else {
+				return getBgColor(el.parentElement);
+			}
+		}
+	
+		const parentBg = getBgColor(src.parentElement);
+
+		const myBg = getComputedStyle(document.documentElement).getPropertyValue('--panel');
+
+		if (parentBg === myBg) {
+			src.style.backgroundColor = 'var(--bg)';
+		} else {
+			src.style.backgroundColor = 'var(--panel)';
+		}
+	},
+} as Directive;
--- a/packages/client/src/filters/note.ts
+++ b/packages/client/src/filters/note.ts
@ -1,3 +1,3 @@
-export default note => {
+export const notePage = note => {
 	return `/notes/${note.id}`;
 };
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@ -12,6 +12,16 @@ import { resolve } from '@/router';
 import { $i } from '@/account';
 import { defaultStore } from '@/store';

+export let isScreenTouching = false;
+
+window.addEventListener('touchstart', () => {
+	isScreenTouching = true;
+}, { passive: true });
+
+window.addEventListener('touchend', () => {
+	isScreenTouching = false;
+}, { passive: true });
+
 export const stream = markRaw(new Misskey.Stream(url, $i));

 export const pendingApiRequestsCount = ref(0);
@ -214,6 +224,10 @@ export function modalPageWindow(path: string) {
 	}, {}, 'closed');
 }

+export function toast(message: string) {
+	// TODO
+}
+
 export function alert(props: {
 	type?: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
 	title?: string | null;
--- a/packages/client/src/pages/about-misskey.vue
+++ b/packages/client/src/pages/about-misskey.vue
@ -1,19 +1,19 @@
 <template>
 <div style="overflow: clip;">
-	<FormBase class="znqjceqz">
+	<MkSpacer :content-max="600" :margin-min="20">
+		<div class="_formRoot znqjceqz">
 			<div id="debug"></div>
-		<section class="_debobigegoItem about">
-			<div ref="about" class="_debobigegoPanel panel" :class="{ playing: easterEggEngine != null }">
+			<div ref="about" v-panel class="_formBlock about" :class="{ playing: easterEggEngine != null }">
 				<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
 				<div class="misskey">Misskey</div>
 				<div class="version">v{{ version }}</div>
 				<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"><MkEmoji class="emoji" :emoji="emoji.emoji" :custom-emojis="$instance.emojis" :is-reaction="false" :normal="true" :no-style="true"/></span>
 			</div>
-		</section>
-		<section class="_debobigegoItem" style="text-align: center; padding: 0 16px;">
+			<div class="_formBlock" style="text-align: center;">
 				{{ $ts._aboutMisskey.about }}<br><a href="https://misskey-hub.net/docs/misskey.html" target="_blank" class="_link">{{ $ts.learnMore }}</a>
-		</section>
-		<FormGroup>
+			</div>
+			<FormSection>
+				<div class="_formLinks">
 					<FormLink to="https://github.com/misskey-dev/misskey" external>
 						<template #icon><i class="fas fa-code"></i></template>
 						{{ $ts._aboutMisskey.source }}
@ -29,9 +29,11 @@
 						{{ $ts._aboutMisskey.donate }}
 						<template #suffix>Patreon</template>
 					</FormLink>
-		</FormGroup>
-		<FormGroup>
+				</div>
+			</FormSection>
+			<FormSection>
 				<template #label>{{ $ts._aboutMisskey.contributors }}</template>
+				<div class="_formLinks">
 					<FormLink to="https://github.com/syuilo" external>@syuilo</FormLink>
 					<FormLink to="https://github.com/AyaMorisawa" external>@AyaMorisawa</FormLink>
 					<FormLink to="https://github.com/mei23" external>@mei23</FormLink>
@ -41,24 +43,25 @@
 					<FormLink to="https://github.com/Xeltica" external>@Xeltica</FormLink>
 					<FormLink to="https://github.com/u1-liquid" external>@u1-liquid</FormLink>
 					<FormLink to="https://github.com/marihachi" external>@marihachi</FormLink>
+				</div>
 				<template #caption><MkLink url="https://github.com/misskey-dev/misskey/graphs/contributors">{{ $ts._aboutMisskey.allContributors }}</MkLink></template>
-		</FormGroup>
-		<FormGroup>
-			<template #label><Mfm text="[jelly ❤]"/> {{ $ts._aboutMisskey.patrons }}</template>
-			<FormKeyValueView v-for="patron in patrons" :key="patron"><template #key>{{ patron }}</template></FormKeyValueView>
+			</FormSection>
+			<FormSection>
+				<template #label><Mfm text="$[jelly ❤]"/> {{ $ts._aboutMisskey.patrons }}</template>
+				<div v-for="patron in patrons" :key="patron">{{ patron }}</div>
 				<template #caption>{{ $ts._aboutMisskey.morePatrons }}</template>
-		</FormGroup>
-	</FormBase>
+			</FormSection>
+		</div>
+	</MkSpacer>
 </div>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
 import { version } from '@/config';
-import FormLink from '@/components/debobigego/link.vue';
-import FormBase from '@/components/debobigego/base.vue';
-import FormGroup from '@/components/debobigego/group.vue';
-import FormKeyValueView from '@/components/debobigego/key-value-view.vue';
+import FormLink from '@/components/form/link.vue';
+import FormSection from '@/components/form/section.vue';
+import MkKeyValue from '@/components/key-value.vue';
 import MkLink from '@/components/link.vue';
 import { physics } from '@/scripts/physics';
 import * as symbols from '@/symbols';
@ -122,10 +125,9 @@ const patrons = [

 export default defineComponent({
 	components: {
-		FormBase,
-		FormGroup,
+		FormSection,
 		FormLink,
-		FormKeyValueView,
+		MkKeyValue,
 		MkLink,
 	},

@ -178,15 +180,11 @@ export default defineComponent({

 <style lang="scss" scoped>
 .znqjceqz {
-	max-width: 800px;
-	box-sizing: border-box;
-	margin: 0 auto;
-
 	> .about {
-		> .panel {
 		position: relative;
 		text-align: center;
 		padding: 16px;
+		border-radius: var(--radius);

 		&.playing {
 			&, * {
@ -234,5 +232,4 @@ export default defineComponent({
 		}
 	}
 }
-}
 </style>
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@ -1,70 +1,80 @@
 <template>
-<FormBase>
-	<div class="_debobigegoItem">
-		<div class="_debobigegoPanel fwhjspax">
+<MkSpacer :content-max="600" :margin-min="20">
+	<div class="_formRoot">
+		<div class="_formBlock fwhjspax" :style="{ backgroundImage: `url(${ $instance.bannerUrl })` }">
+			<div class="content">
 				<img :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" alt="" class="icon"/>
-			<span class="name">{{ $instance.name || host }}</span>
+				<div class="name">
+					<b>{{ $instance.name || host }}</b>
+				</div>
 			</div>
 		</div>

-	<FormTextarea readonly :value="$instance.description">
-	</FormTextarea>
+		<MkKeyValue class="_formBlock">
+			<template #key>{{ $ts.description }}</template>
+			<template #value>{{ $instance.description }}</template>
+		</MkKeyValue>

-	<FormGroup>
-		<FormKeyValueView>
+		<FormSection>
+			<MkKeyValue class="_formBlock" :copy="version">
 				<template #key>Misskey</template>
-			<template #value>v{{ version }}</template>
-		</FormKeyValueView>
+				<template #value>{{ version }}</template>
+			</MkKeyValue>
 			<FormLink to="/about-misskey">{{ $ts.aboutMisskey }}</FormLink>
-	</FormGroup>
+		</FormSection>

-	<FormGroup>
-		<FormKeyValueView>
+		<FormSection>
+			<div class="_inputSplit">
+				<MkKeyValue class="_formBlock">
 					<template #key>{{ $ts.administrator }}</template>
 					<template #value>{{ $instance.maintainerName }}</template>
-		</FormKeyValueView>
-		<FormKeyValueView>
+				</MkKeyValue>
+				<MkKeyValue class="_formBlock">
 					<template #key>{{ $ts.contact }}</template>
 					<template #value>{{ $instance.maintainerEmail }}</template>
-		</FormKeyValueView>
-	</FormGroup>
+				</MkKeyValue>
+			</div>
+		</FormSection>

 		<FormLink v-if="$instance.tosUrl" :to="$instance.tosUrl" external>{{ $ts.tos }}</FormLink>

 		<FormSuspense :p="initStats">
-		<FormGroup>
+			<FormSection>
 				<template #label>{{ $ts.statistics }}</template>
-			<FormKeyValueView>
+				<div class="_inputSplit">
+					<MkKeyValue class="_formBlock">
 						<template #key>{{ $ts.users }}</template>
 						<template #value>{{ number(stats.originalUsersCount) }}</template>
-			</FormKeyValueView>
-			<FormKeyValueView>
+					</MkKeyValue>
+					<MkKeyValue class="_formBlock">
 						<template #key>{{ $ts.notes }}</template>
 						<template #value>{{ number(stats.originalNotesCount) }}</template>
-			</FormKeyValueView>
-		</FormGroup>
+					</MkKeyValue>
+				</div>
+			</FormSection>
 		</FormSuspense>

-	<FormGroup>
+		<FormSection>
 			<template #label>Well-known resources</template>
+			<div class="_formLinks">
 				<FormLink :to="`/.well-known/host-meta`" external>host-meta</FormLink>
 				<FormLink :to="`/.well-known/host-meta.json`" external>host-meta.json</FormLink>
 				<FormLink :to="`/.well-known/nodeinfo`" external>nodeinfo</FormLink>
 				<FormLink :to="`/robots.txt`" external>robots.txt</FormLink>
 				<FormLink :to="`/manifest.json`" external>manifest.json</FormLink>
-	</FormGroup>
-</FormBase>
+			</div>
+		</FormSection>
+	</div>
+</MkSpacer>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
 import { version, instanceName } from '@/config';
-import FormLink from '@/components/debobigego/link.vue';
-import FormBase from '@/components/debobigego/base.vue';
-import FormGroup from '@/components/debobigego/group.vue';
-import FormKeyValueView from '@/components/debobigego/key-value-view.vue';
-import FormTextarea from '@/components/debobigego/textarea.vue';
-import FormSuspense from '@/components/debobigego/suspense.vue';
+import FormLink from '@/components/form/link.vue';
+import FormSection from '@/components/form/section.vue';
+import FormSuspense from '@/components/form/suspense.vue';
+import MkKeyValue from '@/components/key-value.vue';
 import * as os from '@/os';
 import number from '@/filters/number';
 import * as symbols from '@/symbols';
@ -72,11 +82,9 @@ import { host } from '@/config';

 export default defineComponent({
 	components: {
-		FormBase,
-		FormGroup,
+		MkKeyValue,
+		FormSection,
 		FormLink,
-		FormKeyValueView,
-		FormTextarea,
 		FormSuspense,
 	},

@ -105,19 +113,29 @@ export default defineComponent({

 <style lang="scss" scoped>
 .fwhjspax {
-	padding: 16px;
 	text-align: center;
+	border-radius: 10px;
+	overflow: clip;
+	background-size: cover;
+	background-position: center center;
+
+	> .content {
+		overflow: hidden;

 		> .icon {
 			display: block;
-		margin: auto;
+			margin: 16px auto 0 auto;
 			height: 64px;
 			border-radius: 8px;
 		}

 		> .name {
 			display: block;
-		margin-top: 12px;
+			padding: 16px;
+			color: #fff;
+			text-shadow: 0 0 8px #000;
+			background: linear-gradient(transparent, rgba(0, 0, 0, 0.7));
+		}
 	}
 }
 </style>
--- a/packages/client/src/pages/federation.vue
+++ b/packages/client/src/pages/federation.vue
@ -1,11 +1,12 @@
 <template>
+<MkSpacer :content-max="1000">
 	<div class="taeiyria">
 		<div class="query">
 			<MkInput v-model="host" :debounce="true" class="">
 				<template #prefix><i class="fas fa-search"></i></template>
 				<template #label>{{ $ts.host }}</template>
 			</MkInput>
-		<div class="_inputSplit">
+			<div class="_inputSplit" style="margin-top: var(--margin);">
 				<MkSelect v-model="state">
 					<template #label>{{ $ts.state }}</template>
 					<option value="all">{{ $ts.all }}</option>
@ -91,6 +92,7 @@
 			</div>
 		</MkPagination>
 	</div>
+</MkSpacer>
 </template>

 <script lang="ts">
@ -169,7 +171,7 @@ export default defineComponent({
 .taeiyria {
 	> .query {
 		background: var(--bg);
-		padding: 16px;
+		margin-bottom: 16px;
 	}
 }

@ -177,7 +179,6 @@ export default defineComponent({
 	display: grid;
 	grid-template-columns: repeat(auto-fill, minmax(270px, 1fr));
 	grid-gap: 12px;
-	padding: 16px;

 	> .instance {
 		padding: 16px;
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@ -281,6 +281,16 @@
 			</div>
 		</div>
 	</div>
+	<div class="section _block">
+		<div class="title">{{ $ts._mfm.rotate }}</div>
+		<div class="content">
+			<p>{{ $ts._mfm.rotateDescription }}</p>
+			<div class="preview">
+				<Mfm :text="preview_rotate"/>
+				<MkTextarea v-model="preview_rotate"><span>MFM</span></MkTextarea>
+			</div>
+		</div>
+	</div>
 </div>
 </template>

@ -328,6 +338,7 @@ export default defineComponent({
 			preview_blur: `$[blur ${this.$ts._mfm.dummy}]`,
 			preview_rainbow: `$[rainbow 🍮]`,
 			preview_sparkle: `$[sparkle 🍮]`,
+			preview_rotate: `$[rotate 🍮]`,
 		}
 	},
 });
--- a/packages/client/src/pages/settings/2fa.vue
+++ b/packages/client/src/pages/settings/2fa.vue
@ -1,7 +1,5 @@
 <template>
-<section class="_card">
-	<div class="_title"><i class="fas fa-lock"></i> {{ $ts.twoStepAuthentication }}</div>
-	<div class="_content">
+<div>
 	<MkButton v-if="!data && !$i.twoFactorEnabled" @click="register">{{ $ts._2fa.registerDevice }}</MkButton>
 	<template v-if="$i.twoFactorEnabled">
 		<p>{{ $ts._2fa.alreadyRegistered }}</p>
@ -63,7 +61,6 @@
 		<MkInfo>{{ $ts._2fa.step4 }}</MkInfo>
 	</div>
 </div>
-</section>
 </template>

 <script lang="ts">
@ -82,18 +79,11 @@ import * as symbols from '@/symbols';

 export default defineComponent({
 	components: {
-		FormBase,
 		MkButton, MkInfo, MkInput, MkSwitch
 	},

-	emits: ['info'],
-
 	data() {
 		return {
-			[symbols.PAGE_INFO]: {
-				title: this.$ts.twoStepAuthentication,
-				icon: 'fas fa-lock'
-			},
 			data: null,
 			supportsCredentials: !!navigator.credentials,
 			usePasswordLessLogin: this.$i.usePasswordLessLogin,
--- a/packages/client/src/pages/settings/drive.vue
+++ b/packages/client/src/pages/settings/drive.vue
@ -1,44 +1,43 @@
 <template>
-<FormBase class="">
-	<FormGroup v-if="!fetching">
+<div class="_formRoot">
+	<FormSection v-if="!fetching">
 		<template #label>{{ $ts.usageAmount }}</template>
-		<div class="_debobigegoItem uawsfosz">
-			<div class="_debobigegoPanel">
+		<div class="_formBlock uawsfosz">
 			<div class="meter"><div :style="meterStyle"></div></div>
 		</div>
-		</div>
-		<FormKeyValueView>
+		<div class="_inputSplit _formBlock">
+			<MkKeyValue class="_formBlock">
 				<template #key>{{ $ts.capacity }}</template>
 				<template #value>{{ bytes(capacity, 1) }}</template>
-		</FormKeyValueView>
-		<FormKeyValueView>
+			</MkKeyValue>
+			<MkKeyValue class="_formBlock">
 				<template #key>{{ $ts.inUse }}</template>
 				<template #value>{{ bytes(usage, 1) }}</template>
-		</FormKeyValueView>
-	</FormGroup>
+			</MkKeyValue>
+		</div>
+	</FormSection>

-	<div class="_debobigegoItem">
-		<div class="_debobigegoLabel">{{ $ts.statistics }}</div>
-		<div class="_debobigegoPanel">
+	<FormSection>
+		<template #label>{{ $ts.statistics }}</template>
 		<div ref="chart"></div>
-		</div>
-	</div>
+	</FormSection>

-	<FormButton :center="false" primary @click="chooseUploadFolder()">
+	<FormSection>
+		<FormLink @click="chooseUploadFolder()">
 			{{ $ts.uploadFolder }}
 			<template #suffix>{{ uploadFolder ? uploadFolder.name : '-' }}</template>
 			<template #suffixIcon><i class="fas fa-folder-open"></i></template>
-	</FormButton>
-</FormBase>
+		</FormLink>
+	</FormSection>
+</div>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
 import * as tinycolor from 'tinycolor2';
-import FormButton from '@/components/debobigego/button.vue';
-import FormGroup from '@/components/debobigego/group.vue';
-import FormKeyValueView from '@/components/debobigego/key-value-view.vue';
-import FormBase from '@/components/debobigego/base.vue';
+import FormLink from '@/components/form/link.vue';
+import FormSection from '@/components/form/section.vue';
+import MkKeyValue from '@/components/key-value.vue';
 import * as os from '@/os';
 import bytes from '@/filters/bytes';
 import * as symbols from '@/symbols';
@ -47,10 +46,9 @@ import * as symbols from '@/symbols';

 export default defineComponent({
 	components: {
-		FormBase,
-		FormButton,
-		FormGroup,
-		FormKeyValueView,
+		FormLink,
+		FormSection,
+		MkKeyValue,
 	},

 	emits: ['info'],
@ -128,8 +126,6 @@ export default defineComponent({
@use "sass:math";

 .uawsfosz {
-	> div {
-		padding: 24px;

 	> .meter {
 		$size: 12px;
@ -143,5 +139,4 @@ export default defineComponent({
 		}
 	}
 }
-}
 </style>
--- a/packages/client/src/pages/settings/email-address.vue
+++ b/packages/client/src/pages/settings/email-address.vue
@ -1,68 +0,0 @@
-<template>
-<FormBase>
-	<FormGroup>
-		<FormInput v-model="emailAddress" type="email">
-			{{ $ts.emailAddress }}
-			<template v-if="$i.email && !$i.emailVerified" #desc>{{ $ts.verificationEmailSent }}</template>
-			<template v-else-if="emailAddress === $i.email && $i.emailVerified" #desc>{{ $ts.emailVerified }}</template>
-		</FormInput>
-	</FormGroup>
-	<FormButton primary @click="save">{{ $ts.save }}</FormButton>
-</FormBase>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import FormButton from '@/components/debobigego/button.vue';
-import FormInput from '@/components/form/input.vue';
-import FormBase from '@/components/debobigego/base.vue';
-import FormGroup from '@/components/debobigego/group.vue';
-import * as os from '@/os';
-import * as symbols from '@/symbols';
-
-export default defineComponent({
-	components: {
-		FormBase,
-		FormInput,
-		FormButton,
-		FormGroup,
-	},
-
-	emits: ['info'],
-	
-	data() {
-		return {
-			[symbols.PAGE_INFO]: {
-				title: this.$ts.emailAddress,
-				icon: 'fas fa-envelope',
-				bg: 'var(--bg)',
-			},
-			emailAddress: null,
-			code: null,
-		}
-	},
-
-	created() {
-		this.emailAddress = this.$i.email;
-	},
-
-	mounted() {
-		this.$emit('info', this[symbols.PAGE_INFO]);
-	},
-
-	methods: {
-		save() {
-			os.inputText({
-				title: this.$ts.password,
-				type: 'password'
-			}).then(({ canceled, result: password }) => {
-				if (canceled) return;
-				os.apiWithDialog('i/update-email', {
-					password: password,
-					email: this.emailAddress,
-				});
-			});
-		}
-	}
-});
-</script>
--- a/packages/client/src/pages/settings/email-notification.vue
+++ b/packages/client/src/pages/settings/email-notification.vue
@ -1,91 +0,0 @@
-<template>
-<FormBase>
-	<FormGroup>
-		<FormSwitch v-model="mention">
-			{{ $ts._notification._types.mention }}
-		</FormSwitch>
-		<FormSwitch v-model="reply">
-			{{ $ts._notification._types.reply }}
-		</FormSwitch>
-		<FormSwitch v-model="quote">
-			{{ $ts._notification._types.quote }}
-		</FormSwitch>
-		<FormSwitch v-model="follow">
-			{{ $ts._notification._types.follow }}
-		</FormSwitch>
-		<FormSwitch v-model="receiveFollowRequest">
-			{{ $ts._notification._types.receiveFollowRequest }}
-		</FormSwitch>
-		<FormSwitch v-model="groupInvited">
-			{{ $ts._notification._types.groupInvited }}
-		</FormSwitch>
-	</FormGroup>
-</FormBase>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import FormButton from '@/components/debobigego/button.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormBase from '@/components/debobigego/base.vue';
-import FormGroup from '@/components/debobigego/group.vue';
-import * as os from '@/os';
-import * as symbols from '@/symbols';
-import * as symbols from '@/symbols';
-
-export default defineComponent({
-	components: {
-		FormBase,
-		FormSwitch,
-		FormButton,
-		FormGroup,
-	},
-
-	emits: ['info'],
-	
-	data() {
-		return {
-			[symbols.PAGE_INFO]: {
-				title: this.$ts.emailNotification,
-				icon: 'fas fa-envelope',
-				bg: 'var(--bg)',
-			},
-
-			mention: this.$i.emailNotificationTypes.includes('mention'),
-			reply: this.$i.emailNotificationTypes.includes('reply'),
-			quote: this.$i.emailNotificationTypes.includes('quote'),
-			follow: this.$i.emailNotificationTypes.includes('follow'),
-			receiveFollowRequest: this.$i.emailNotificationTypes.includes('receiveFollowRequest'),
-			groupInvited: this.$i.emailNotificationTypes.includes('groupInvited'),
-		}
-	},
-
-	created() {
-		this.$watch('mention', this.save);
-		this.$watch('reply', this.save);
-		this.$watch('quote', this.save);
-		this.$watch('follow', this.save);
-		this.$watch('receiveFollowRequest', this.save);
-		this.$watch('groupInvited', this.save);
-	},
-
-	mounted() {
-		this.$emit('info', this[symbols.PAGE_INFO]);
-	},
-
-	methods: {
-		save() {
-			os.api('i/update', {
-				emailNotificationTypes: [
-					...[this.mention ? 'mention' : null],
-					...[this.reply ? 'reply' : null],
-					...[this.quote ? 'quote' : null],
-					...[this.follow ? 'follow' : null],
-					...[this.receiveFollowRequest ? 'receiveFollowRequest' : null],
-					...[this.groupInvited ? 'groupInvited' : null],
-				].filter(x => x != null)
-			});
-		}
-	}
-});
-</script>
--- a/packages/client/src/pages/settings/email.vue
+++ b/packages/client/src/pages/settings/email.vue
@ -1,66 +1,133 @@
 <template>
-<FormBase>
-	<FormGroup>
+<div class="_formRoot">
+	<FormSection>
 		<template #label>{{ $ts.emailAddress }}</template>
-		<FormLink to="/settings/email/address">
-			<template v-if="$i.email && !$i.emailVerified" #icon><i class="fas fa-exclamation-triangle" style="color: var(--warn);"></i></template>
-			<template v-else-if="$i.email && $i.emailVerified" #icon><i class="fas fa-check" style="color: var(--success);"></i></template>
-			{{ $i.email || $ts.notSet }}
-		</FormLink>
-	</FormGroup>
-
-	<FormLink to="/settings/email/notification">
-		<template #icon><i class="fas fa-bell"></i></template>
-		{{ $ts.emailNotification }}
-	</FormLink>
+		<FormInput v-model="emailAddress" type="email" manual-save>
+			<template #prefix><i class="fas fa-envelope"></i></template>
+			<template v-if="$i.email && !$i.emailVerified" #caption>{{ $ts.verificationEmailSent }}</template>
+			<template v-else-if="emailAddress === $i.email && $i.emailVerified" #caption><i class="fas fa-check" style="color: var(--success);"></i> {{ $ts.emailVerified }}</template>
+		</FormInput>
+	</FormSection>

+	<FormSection>
 		<FormSwitch :value="$i.receiveAnnouncementEmail" @update:modelValue="onChangeReceiveAnnouncementEmail">
 			{{ $ts.receiveAnnouncementFromInstance }}
 		</FormSwitch>
-</FormBase>
+	</FormSection>
+
+	<FormSection>
+		<template #label>{{ $ts.emailNotification }}</template>
+		<FormSwitch v-model="emailNotification_mention" class="_formBlock">
+			{{ $ts._notification._types.mention }}
+		</FormSwitch>
+		<FormSwitch v-model="emailNotification_reply" class="_formBlock">
+			{{ $ts._notification._types.reply }}
+		</FormSwitch>
+		<FormSwitch v-model="emailNotification_quote" class="_formBlock">
+			{{ $ts._notification._types.quote }}
+		</FormSwitch>
+		<FormSwitch v-model="emailNotification_follow" class="_formBlock">
+			{{ $ts._notification._types.follow }}
+		</FormSwitch>
+		<FormSwitch v-model="emailNotification_receiveFollowRequest" class="_formBlock">
+			{{ $ts._notification._types.receiveFollowRequest }}
+		</FormSwitch>
+		<FormSwitch v-model="emailNotification_groupInvited" class="_formBlock">
+			{{ $ts._notification._types.groupInvited }}
+		</FormSwitch>
+	</FormSection>
+</div>
 </template>

 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, onMounted, ref, watch } from 'vue';
 import FormButton from '@/components/debobigego/button.vue';
 import FormLink from '@/components/debobigego/link.vue';
-import FormBase from '@/components/debobigego/base.vue';
-import FormGroup from '@/components/debobigego/group.vue';
-import FormSwitch from '@/components/debobigego/switch.vue';
+import FormSection from '@/components/form/section.vue';
+import FormInput from '@/components/form/input.vue';
+import FormSwitch from '@/components/form/switch.vue';
 import * as os from '@/os';
 import * as symbols from '@/symbols';
+import { $i } from '@/account';
+import { i18n } from '@/i18n';

 export default defineComponent({
 	components: {
-		FormBase,
+		FormSection,
 		FormLink,
 		FormButton,
 		FormSwitch,
-		FormGroup,
+		FormInput,
 	},

 	emits: ['info'],

-	data() {
-		return {
-			[symbols.PAGE_INFO]: {
-				title: this.$ts.email,
+	setup(props, context) {
+		const emailAddress = ref($i.email);
+
+		const INFO = {
+			title: i18n.locale.email,
 			icon: 'fas fa-envelope',
 			bg: 'var(--bg)',
-			},
-		}
-	},
+		};

-	mounted() {
-		this.$emit('info', this[symbols.PAGE_INFO]);
-	},
-
-	methods: {
-		onChangeReceiveAnnouncementEmail(v) {
+		const onChangeReceiveAnnouncementEmail = (v) => {
 			os.api('i/update', {
 				receiveAnnouncementEmail: v
 			});
+		};
+
+		const saveEmailAddress = () => {
+			os.inputText({
+				title: i18n.locale.password,
+				type: 'password'
+			}).then(({ canceled, result: password }) => {
+				if (canceled) return;
+				os.apiWithDialog('i/update-email', {
+					password: password,
+					email: emailAddress.value,
+				});
+			});
+		};
+
+		const emailNotification_mention = ref($i.emailNotificationTypes.includes('mention'));
+		const emailNotification_reply = ref($i.emailNotificationTypes.includes('reply'));
+		const emailNotification_quote = ref($i.emailNotificationTypes.includes('quote'));
+		const emailNotification_follow = ref($i.emailNotificationTypes.includes('follow'));
+		const emailNotification_receiveFollowRequest = ref($i.emailNotificationTypes.includes('receiveFollowRequest'));
+		const emailNotification_groupInvited = ref($i.emailNotificationTypes.includes('groupInvited'));
+
+		const saveNotificationSettings = () => {
+			os.api('i/update', {
+				emailNotificationTypes: [
+					...[emailNotification_mention.value ? 'mention' : null],
+					...[emailNotification_reply.value ? 'reply' : null],
+					...[emailNotification_quote.value ? 'quote' : null],
+					...[emailNotification_follow.value ? 'follow' : null],
+					...[emailNotification_receiveFollowRequest.value ? 'receiveFollowRequest' : null],
+					...[emailNotification_groupInvited.value ? 'groupInvited' : null],
+				].filter(x => x != null)
+			});
+		};
+
+		watch([emailNotification_mention, emailNotification_reply, emailNotification_quote, emailNotification_follow, emailNotification_receiveFollowRequest, emailNotification_groupInvited], () => {
+			saveNotificationSettings();
+		});
+
+		onMounted(() => {
+			context.emit('info', INFO);
+
+			watch(emailAddress, () => {
+				saveEmailAddress();
+			});
+		});
+
+		return {
+			[symbols.PAGE_INFO]: INFO,
+			emailAddress,
+			onChangeReceiveAnnouncementEmail,
+			emailNotification_mention, emailNotification_reply, emailNotification_quote, emailNotification_follow, emailNotification_receiveFollowRequest, emailNotification_groupInvited,
+		};
 	},
-	}
 });
 </script>
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@ -1,8 +1,6 @@
 <template>
-<FormBase>
-	<FormSwitch v-model="showFixedPostForm">{{ $ts.showFixedPostForm }}</FormSwitch>
-
-	<FormSelect v-model="lang">
+<div class="_formRoot">
+	<FormSelect v-model="lang" class="_formBlock">
 		<template #label>{{ $ts.uiLanguage }}</template>
 		<option v-for="x in langs" :key="x[0]" :value="x[0]">{{ x[1] }}</option>
 		<template #caption>
@ -14,57 +12,59 @@
 		</template>
 	</FormSelect>

-	<FormGroup>
-		<template #label>{{ $ts.behavior }}</template>
-		<FormSwitch v-model="imageNewTab">{{ $ts.openImageInNewTab }}</FormSwitch>
-		<FormSwitch v-model="enableInfiniteScroll">{{ $ts.enableInfiniteScroll }}</FormSwitch>
-		<FormSwitch v-model="useReactionPickerForContextMenu">{{ $ts.useReactionPickerForContextMenu }}</FormSwitch>
-		<FormSwitch v-model="disablePagesScript">{{ $ts.disablePagesScript }}</FormSwitch>
-	</FormGroup>
+	<FormSwitch v-model="showFixedPostForm" class="_formBlock">{{ $ts.showFixedPostForm }}</FormSwitch>

-	<FormSelect v-model="serverDisconnectedBehavior">
+	<FormSection>
+		<template #label>{{ $ts.behavior }}</template>
+		<FormSwitch v-model="imageNewTab" class="_formBlock">{{ $ts.openImageInNewTab }}</FormSwitch>
+		<FormSwitch v-model="enableInfiniteScroll" class="_formBlock">{{ $ts.enableInfiniteScroll }}</FormSwitch>
+		<FormSwitch v-model="useReactionPickerForContextMenu" class="_formBlock">{{ $ts.useReactionPickerForContextMenu }}</FormSwitch>
+		<FormSwitch v-model="disablePagesScript" class="_formBlock">{{ $ts.disablePagesScript }}</FormSwitch>
+
+		<FormSelect v-model="serverDisconnectedBehavior" class="_formBlock">
 			<template #label>{{ $ts.whenServerDisconnected }}</template>
 			<option value="reload">{{ $ts._serverDisconnectedBehavior.reload }}</option>
 			<option value="dialog">{{ $ts._serverDisconnectedBehavior.dialog }}</option>
 			<option value="quiet">{{ $ts._serverDisconnectedBehavior.quiet }}</option>
 		</FormSelect>
+	</FormSection>

-	<FormGroup>
+	<FormSection>
 		<template #label>{{ $ts.appearance }}</template>
-		<FormSwitch v-model="disableAnimatedMfm">{{ $ts.disableAnimatedMfm }}</FormSwitch>
-		<FormSwitch v-model="reduceAnimation">{{ $ts.reduceUiAnimation }}</FormSwitch>
-		<FormSwitch v-model="useBlurEffect">{{ $ts.useBlurEffect }}</FormSwitch>
-		<FormSwitch v-model="useBlurEffectForModal">{{ $ts.useBlurEffectForModal }}</FormSwitch>
-		<FormSwitch v-model="showGapBetweenNotesInTimeline">{{ $ts.showGapBetweenNotesInTimeline }}</FormSwitch>
-		<FormSwitch v-model="loadRawImages">{{ $ts.loadRawImages }}</FormSwitch>
-		<FormSwitch v-model="disableShowingAnimatedImages">{{ $ts.disableShowingAnimatedImages }}</FormSwitch>
-		<FormSwitch v-model="squareAvatars">{{ $ts.squareAvatars }}</FormSwitch>
-		<FormSwitch v-model="useSystemFont">{{ $ts.useSystemFont }}</FormSwitch>
-		<FormSwitch v-model="useOsNativeEmojis">{{ $ts.useOsNativeEmojis }}
+		<FormSwitch v-model="disableAnimatedMfm" class="_formBlock">{{ $ts.disableAnimatedMfm }}</FormSwitch>
+		<FormSwitch v-model="reduceAnimation" class="_formBlock">{{ $ts.reduceUiAnimation }}</FormSwitch>
+		<FormSwitch v-model="useBlurEffect" class="_formBlock">{{ $ts.useBlurEffect }}</FormSwitch>
+		<FormSwitch v-model="useBlurEffectForModal" class="_formBlock">{{ $ts.useBlurEffectForModal }}</FormSwitch>
+		<FormSwitch v-model="showGapBetweenNotesInTimeline" class="_formBlock">{{ $ts.showGapBetweenNotesInTimeline }}</FormSwitch>
+		<FormSwitch v-model="loadRawImages" class="_formBlock">{{ $ts.loadRawImages }}</FormSwitch>
+		<FormSwitch v-model="disableShowingAnimatedImages" class="_formBlock">{{ $ts.disableShowingAnimatedImages }}</FormSwitch>
+		<FormSwitch v-model="squareAvatars" class="_formBlock">{{ $ts.squareAvatars }}</FormSwitch>
+		<FormSwitch v-model="useSystemFont" class="_formBlock">{{ $ts.useSystemFont }}</FormSwitch>
+		<FormSwitch v-model="useOsNativeEmojis" class="_formBlock">{{ $ts.useOsNativeEmojis }}
 			<div><Mfm :key="useOsNativeEmojis" text="🍮🍦🍭🍩🍰🍫🍬🥞🍪"/></div>
 		</FormSwitch>
-	</FormGroup>

-	<FormGroup>
-		<FormSwitch v-model="aiChanMode">{{ $ts.aiChanMode }}</FormSwitch>
-	</FormGroup>
-
-	<FormRadios v-model="fontSize">
-		<template #desc>{{ $ts.fontSize }}</template>
+		<FormRadios v-model="fontSize" class="_formBlock">
+			<template #label>{{ $ts.fontSize }}</template>
 			<option value="small"><span style="font-size: 14px;">Aa</span></option>
 			<option :value="null"><span style="font-size: 16px;">Aa</span></option>
 			<option value="large"><span style="font-size: 18px;">Aa</span></option>
 			<option value="veryLarge"><span style="font-size: 20px;">Aa</span></option>
 		</FormRadios>
+	</FormSection>

-	<FormSelect v-model="instanceTicker">
+	<FormSection>
+		<FormSwitch v-model="aiChanMode">{{ $ts.aiChanMode }}</FormSwitch>
+	</FormSection>
+
+	<FormSelect v-model="instanceTicker" class="_formBlock">
 		<template #label>{{ $ts.instanceTicker }}</template>
 		<option value="none">{{ $ts._instanceTicker.none }}</option>
 		<option value="remote">{{ $ts._instanceTicker.remote }}</option>
 		<option value="always">{{ $ts._instanceTicker.always }}</option>
 	</FormSelect>

-	<FormSelect v-model="nsfw">
+	<FormSelect v-model="nsfw" class="_formBlock">
 		<template #label>{{ $ts.nsfw }}</template>
 		<option value="respect">{{ $ts._nsfw.respect }}</option>
 		<option value="ignore">{{ $ts._nsfw.ignore }}</option>
@ -76,28 +76,27 @@
 		<FormSwitch v-model="defaultSideView">{{ $ts.openInSideView }}</FormSwitch>
 	</FormGroup>

-	<FormSelect v-model="chatOpenBehavior">
+	<FormSelect v-model="chatOpenBehavior" class="_formBlock">
 		<template #label>{{ $ts.chatOpenBehavior }}</template>
 		<option value="page">{{ $ts.showInPage }}</option>
 		<option value="window">{{ $ts.openInWindow }}</option>
 		<option value="popout">{{ $ts.popout }}</option>
 	</FormSelect>

-	<FormLink to="/settings/deck">{{ $ts.deck }}</FormLink>
+	<FormLink to="/settings/deck" class="_formBlock">{{ $ts.deck }}</FormLink>

-	<FormLink to="/settings/custom-css"><template #icon><i class="fas fa-code"></i></template>{{ $ts.customCss }}</FormLink>
-</FormBase>
+	<FormLink to="/settings/custom-css" class="_formBlock"><template #icon><i class="fas fa-code"></i></template>{{ $ts.customCss }}</FormLink>
+</div>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
-import FormSwitch from '@/components/debobigego/switch.vue';
-import FormSelect from '@/components/debobigego/select.vue';
-import FormRadios from '@/components/debobigego/radios.vue';
-import FormBase from '@/components/debobigego/base.vue';
-import FormGroup from '@/components/debobigego/group.vue';
-import FormLink from '@/components/debobigego/link.vue';
-import FormButton from '@/components/debobigego/button.vue';
+import FormSwitch from '@/components/form/switch.vue';
+import FormSelect from '@/components/form/select.vue';
+import FormRadios from '@/components/form/radios.vue';
+import FormGroup from '@/components/form/group.vue';
+import FormSection from '@/components/form/section.vue';
+import FormLink from '@/components/form/link.vue';
 import MkLink from '@/components/link.vue';
 import { langs } from '@/config';
 import { defaultStore } from '@/store';
@ -112,10 +111,9 @@ export default defineComponent({
 		FormSwitch,
 		FormSelect,
 		FormRadios,
-		FormBase,
 		FormGroup,
 		FormLink,
-		FormButton,
+		FormSection,
 	},

 	emits: ['info'],
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@ -1,5 +1,5 @@
 <template>
-<div style="margin: 16px;">
+<div class="_formRoot">
 	<FormSection>
 		<template #label>{{ $ts._exportOrImport.allNotes }}</template>
 		<MkButton :class="$style.button" inline @click="doExport('notes')"><i class="fas fa-download"></i> {{ $ts.export }}</MkButton>
--- a/packages/client/src/pages/settings/index.vue
+++ b/packages/client/src/pages/settings/index.vue
@ -10,7 +10,12 @@
 		</MkSpacer>
 	</div>
 	<div class="main">
-		<component :is="component" :key="page" v-bind="pageProps"/>
+		<MkSpacer :content-max="600" :margin-min="20">
+			<div class="bkzroven">
+				<div v-if="childInfo" class="title">{{ childInfo.title }}</div>
+				<component :is="component" :key="page" v-bind="pageProps" @info="onInfo"/>
+			</div>
+		</MkSpacer>
 	</div>
 </div>
 </template>
@ -52,6 +57,7 @@ export default defineComponent({
 		const narrow = ref(false);
 		const view = ref(null);
 		const el = ref(null);
+		const childInfo = ref(null);
 		const menuDef = computed(() => [{
 			title: i18n.locale.basicSettings,
 			items: [{
@ -192,8 +198,6 @@ export default defineComponent({
 				case 'other': return defineAsyncComponent(() => import('./other.vue'));
 				case 'general': return defineAsyncComponent(() => import('./general.vue'));
 				case 'email': return defineAsyncComponent(() => import('./email.vue'));
-				case 'email/address': return defineAsyncComponent(() => import('./email-address.vue'));
-				case 'email/notification': return defineAsyncComponent(() => import('./email-notification.vue'));
 				case 'theme': return defineAsyncComponent(() => import('./theme.vue'));
 				case 'theme/install': return defineAsyncComponent(() => import('./theme.install.vue'));
 				case 'theme/manage': return defineAsyncComponent(() => import('./theme.manage.vue'));
@ -259,6 +263,10 @@ export default defineComponent({

 		const emailNotConfigured = computed(() => instance.enableEmail && ($i.email == null || !$i.emailVerified));

+		const onInfo = (info) => {
+			childInfo.value = info;
+		};
+
 		return {
 			[symbols.PAGE_INFO]: INFO,
 			page,
@ -269,6 +277,8 @@ export default defineComponent({
 			pageProps,
 			component,
 			emailNotConfigured,
+			onInfo,
+			childInfo,
 		};
 	},
 });
@ -285,7 +295,7 @@ export default defineComponent({
 			}

 			> .info {
-				margin: 0 16px;
+				margin: 16px 0;
 			}

 			> .accounts {
@ -299,6 +309,16 @@ export default defineComponent({
 		}
 	}

+	> .main {
+		.bkzroven {
+			> .title {
+				margin: 4px 0 20px 0;
+				font-size: 1.5em;
+				font-weight: bold;
+			}
+		}
+	}
+
 	&.wide {
 		display: flex;
 		max-width: 1000px;
@ -321,6 +341,12 @@ export default defineComponent({
 			flex: 1;
 			min-width: 0;
 			overflow: auto;
+
+			.bkzroven {
+				> .title {
+					margin: 6px 0 24px 0;
+				}
+			}
 		}
 	}
 }
--- a/packages/client/src/pages/settings/menu.vue
+++ b/packages/client/src/pages/settings/menu.vue
@ -1,28 +1,28 @@
 <template>
-<FormBase>
-	<FormTextarea v-model="items" tall manual-save>
-		<span>{{ $ts.menu }}</span>
-		<template #desc><button class="_textButton" @click="addItem">{{ $ts.addItem }}</button></template>
+<div class="_formRoot">
+	<FormTextarea v-model="items" tall manual-save class="_formBlock">
+		<template #label>{{ $ts.menu }}</template>
+		<template #caption><button class="_textButton" @click="addItem">{{ $ts.addItem }}</button></template>
 	</FormTextarea>

-	<FormRadios v-model="menuDisplay">
-		<template #desc>{{ $ts.display }}</template>
+	<FormRadios v-model="menuDisplay" class="_formBlock">
+		<template #label>{{ $ts.display }}</template>
 		<option value="sideFull">{{ $ts._menuDisplay.sideFull }}</option>
 		<option value="sideIcon">{{ $ts._menuDisplay.sideIcon }}</option>
 		<option value="top">{{ $ts._menuDisplay.top }}</option>
 		<!-- <MkRadio v-model="menuDisplay" value="hide" disabled>{{ $ts._menuDisplay.hide }}</MkRadio>--> <!-- TODO: サイドバーを完全に隠せるようにすると、別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 -->
 	</FormRadios>

-	<FormButton danger @click="reset()"><i class="fas fa-redo"></i> {{ $ts.default }}</FormButton>
-</FormBase>
+	<FormButton danger class="_formBlock" @click="reset()"><i class="fas fa-redo"></i> {{ $ts.default }}</FormButton>
+</div>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
-import FormTextarea from '@/components/debobigego/textarea.vue';
-import FormRadios from '@/components/debobigego/radios.vue';
+import FormTextarea from '@/components/form/textarea.vue';
+import FormRadios from '@/components/form/radios.vue';
 import FormBase from '@/components/debobigego/base.vue';
-import FormButton from '@/components/debobigego/button.vue';
+import FormButton from '@/components/ui/button.vue';
 import * as os from '@/os';
 import { menuDef } from '@/menu';
 import { defaultStore } from '@/store';
--- a/packages/client/src/pages/settings/notifications.vue
+++ b/packages/client/src/pages/settings/notifications.vue
@ -1,20 +1,20 @@
 <template>
-<FormBase>
-	<FormLink @click="configure">{{ $ts.notificationSetting }}</FormLink>
-	<FormGroup>
-		<FormButton @click="readAllNotifications">{{ $ts.markAsReadAllNotifications }}</FormButton>
-		<FormButton @click="readAllUnreadNotes">{{ $ts.markAsReadAllUnreadNotes }}</FormButton>
-		<FormButton @click="readAllMessagingMessages">{{ $ts.markAsReadAllTalkMessages }}</FormButton>
-	</FormGroup>
-</FormBase>
+<div class="_formRoot">
+	<FormLink class="_formBlock" @click="configure"><template #icon><i class="fas fa-cog"></i></template>{{ $ts.notificationSetting }}</FormLink>
+	<FormSection>
+		<FormLink class="_formBlock" @click="readAllNotifications">{{ $ts.markAsReadAllNotifications }}</FormLink>
+		<FormLink class="_formBlock" @click="readAllUnreadNotes">{{ $ts.markAsReadAllUnreadNotes }}</FormLink>
+		<FormLink class="_formBlock" @click="readAllMessagingMessages">{{ $ts.markAsReadAllTalkMessages }}</FormLink>
+	</FormSection>
+</div>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
-import FormButton from '@/components/debobigego/button.vue';
-import FormLink from '@/components/debobigego/link.vue';
+import FormButton from '@/components/ui/button.vue';
+import FormLink from '@/components/form/link.vue';
 import FormBase from '@/components/debobigego/base.vue';
-import FormGroup from '@/components/debobigego/group.vue';
+import FormSection from '@/components/form/section.vue';
 import { notificationTypes } from 'misskey-js';
 import * as os from '@/os';
 import * as symbols from '@/symbols';
@ -24,7 +24,7 @@ export default defineComponent({
 		FormBase,
 		FormLink,
 		FormButton,
-		FormGroup,
+		FormSection,
 	},

 	emits: ['info'],
--- a/packages/client/src/pages/settings/privacy.vue
+++ b/packages/client/src/pages/settings/privacy.vue
@ -1,64 +1,66 @@
 <template>
-<FormBase>
-	<FormGroup>
-		<FormSwitch v-model="isLocked" @update:modelValue="save()">{{ $ts.makeFollowManuallyApprove }}</FormSwitch>
-		<FormSwitch v-model="autoAcceptFollowed" :disabled="!isLocked" @update:modelValue="save()">{{ $ts.autoAcceptFollowed }}</FormSwitch>
-		<template #caption>{{ $ts.lockedAccountInfo }}</template>
-	</FormGroup>
-	<FormSwitch v-model="publicReactions" @update:modelValue="save()">
+<div class="_formRoot">
+	<FormSwitch v-model="isLocked" class="_formBlock" @update:modelValue="save()">{{ $ts.makeFollowManuallyApprove }}<template #caption>{{ $ts.lockedAccountInfo }}</template></FormSwitch>
+	<FormSwitch v-if="isLocked" v-model="autoAcceptFollowed" class="_formBlock" @update:modelValue="save()">{{ $ts.autoAcceptFollowed }}</FormSwitch>
+
+	<FormSwitch v-model="publicReactions" class="_formBlock" @update:modelValue="save()">
 		{{ $ts.makeReactionsPublic }}
-		<template #desc>{{ $ts.makeReactionsPublicDescription }}</template>
+		<template #caption>{{ $ts.makeReactionsPublicDescription }}</template>
 	</FormSwitch>
-	<FormGroup>
+		
+	<FormSelect v-model="ffVisibility" class="_formBlock">
 		<template #label>{{ $ts.ffVisibility }}</template>
-		<FormSelect v-model="ffVisibility">
 		<option value="public">{{ $ts._ffVisibility.public }}</option>
 		<option value="followers">{{ $ts._ffVisibility.followers }}</option>
 		<option value="private">{{ $ts._ffVisibility.private }}</option>
-		</FormSelect>
 		<template #caption>{{ $ts.ffVisibilityDescription }}</template>
-	</FormGroup>
-	<FormSwitch v-model="hideOnlineStatus" @update:modelValue="save()">
+	</FormSelect>
+		
+	<FormSwitch v-model="hideOnlineStatus" class="_formBlock" @update:modelValue="save()">
 		{{ $ts.hideOnlineStatus }}
-		<template #desc>{{ $ts.hideOnlineStatusDescription }}</template>
+		<template #caption>{{ $ts.hideOnlineStatusDescription }}</template>
 	</FormSwitch>
-	<FormSwitch v-model="noCrawle" @update:modelValue="save()">
+	<FormSwitch v-model="noCrawle" class="_formBlock" @update:modelValue="save()">
 		{{ $ts.noCrawle }}
-		<template #desc>{{ $ts.noCrawleDescription }}</template>
+		<template #caption>{{ $ts.noCrawleDescription }}</template>
 	</FormSwitch>
-	<FormSwitch v-model="isExplorable" @update:modelValue="save()">
+	<FormSwitch v-model="isExplorable" class="_formBlock" @update:modelValue="save()">
 		{{ $ts.makeExplorable }}
-		<template #desc>{{ $ts.makeExplorableDescription }}</template>
+		<template #caption>{{ $ts.makeExplorableDescription }}</template>
 	</FormSwitch>
-	<FormSwitch v-model="rememberNoteVisibility" @update:modelValue="save()">{{ $ts.rememberNoteVisibility }}</FormSwitch>
-	<FormGroup v-if="!rememberNoteVisibility">
+
+	<FormSection>
+		<FormSwitch v-model="rememberNoteVisibility" class="_formBlock" @update:modelValue="save()">{{ $ts.rememberNoteVisibility }}</FormSwitch>
+		<FormGroup v-if="!rememberNoteVisibility" class="_formBlock">
 			<template #label>{{ $ts.defaultNoteVisibility }}</template>
-		<FormSelect v-model="defaultNoteVisibility">
+			<FormSelect v-model="defaultNoteVisibility" class="_formBlock">
 				<option value="public">{{ $ts._visibility.public }}</option>
 				<option value="home">{{ $ts._visibility.home }}</option>
 				<option value="followers">{{ $ts._visibility.followers }}</option>
 				<option value="specified">{{ $ts._visibility.specified }}</option>
 			</FormSelect>
-		<FormSwitch v-model="defaultNoteLocalOnly">{{ $ts._visibility.localOnly }}</FormSwitch>
+			<FormSwitch v-model="defaultNoteLocalOnly" class="_formBlock">{{ $ts._visibility.localOnly }}</FormSwitch>
 		</FormGroup>
-	<FormSwitch v-model="keepCw" @update:modelValue="save()">{{ $ts.keepCw }}</FormSwitch>
-</FormBase>
+	</FormSection>
+
+	<FormSwitch v-model="keepCw" class="_formBlock" @update:modelValue="save()">{{ $ts.keepCw }}</FormSwitch>
+</div>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
-import FormSwitch from '@/components/debobigego/switch.vue';
-import FormSelect from '@/components/debobigego/select.vue';
-import FormBase from '@/components/debobigego/base.vue';
-import FormGroup from '@/components/debobigego/group.vue';
+import FormSwitch from '@/components/form/switch.vue';
+import FormSelect from '@/components/form/select.vue';
+import FormSection from '@/components/form/section.vue';
+import FormGroup from '@/components/form/group.vue';
 import * as os from '@/os';
 import { defaultStore } from '@/store';
 import * as symbols from '@/symbols';

 export default defineComponent({
 	components: {
-		FormBase,
 		FormSelect,
+		FormSection,
 		FormGroup,
 		FormSwitch,
 	},
--- a/packages/client/src/pages/settings/profile.vue
+++ b/packages/client/src/pages/settings/profile.vue
@ -1,59 +1,58 @@
 <template>
-<FormBase>
-	<FormGroup>
-		<div class="_debobigegoItem _debobigegoPanel llvierxe" :style="{ backgroundImage: $i.bannerUrl ? `url(${ $i.bannerUrl })` : null }">
-			<MkAvatar class="avatar" :user="$i"/>
+<div class="_formRoot">
+	<div class="llvierxe" :style="{ backgroundImage: $i.bannerUrl ? `url(${ $i.bannerUrl })` : null }">
+		<div class="avatar _acrylic">
+			<MkAvatar class="avatar" :user="$i" :disable-link="true" @click="changeAvatar"/>
+			<MkButton primary class="avatarEdit" @click="changeAvatar">{{ $ts._profile.changeAvatar }}</MkButton>
+		</div>
+		<MkButton primary class="bannerEdit" @click="changeBanner">{{ $ts._profile.changeBanner }}</MkButton>
 	</div>
-		<FormButton primary @click="changeAvatar">{{ $ts._profile.changeAvatar }}</FormButton>
-		<FormButton primary @click="changeBanner">{{ $ts._profile.changeBanner }}</FormButton>
-	</FormGroup>

-	<FormInput v-model="name" :max="30" manual-save>
-		<span>{{ $ts._profile.name }}</span>
+	<FormInput v-model="name" :max="30" manual-save class="_formBlock">
+		<template #label>{{ $ts._profile.name }}</template>
 	</FormInput>

-	<FormTextarea v-model="description" :max="500" tall manual-save>
-		<span>{{ $ts._profile.description }}</span>
-		<template #desc>{{ $ts._profile.youCanIncludeHashtags }}</template>
+	<FormTextarea v-model="description" :max="500" tall manual-save class="_formBlock">
+		<template #label>{{ $ts._profile.description }}</template>
+		<template #caption>{{ $ts._profile.youCanIncludeHashtags }}</template>
 	</FormTextarea>

-	<FormInput v-model="location" manual-save>
-		<span>{{ $ts.location }}</span>
+	<FormInput v-model="location" manual-save class="_formBlock">
+		<template #label>{{ $ts.location }}</template>
 		<template #prefix><i class="fas fa-map-marker-alt"></i></template>
 	</FormInput>

-	<FormInput v-model="birthday" type="date" manual-save>
-		<span>{{ $ts.birthday }}</span>
+	<FormInput v-model="birthday" type="date" manual-save class="_formBlock">
+		<template #label>{{ $ts.birthday }}</template>
 		<template #prefix><i class="fas fa-birthday-cake"></i></template>
 	</FormInput>

-	<FormSelect v-model="lang">
+	<FormSelect v-model="lang" class="_formBlock">
 		<template #label>{{ $ts.language }}</template>
 		<option v-for="x in langs" :key="x[0]" :value="x[0]">{{ x[1] }}</option>
 	</FormSelect>

-	<FormGroup>
-		<FormButton primary @click="editMetadata">{{ $ts._profile.metadataEdit }}</FormButton>
+	<FormSlot>
+		<MkButton @click="editMetadata">{{ $ts._profile.metadataEdit }}</MkButton>
 		<template #caption>{{ $ts._profile.metadataDescription }}</template>
-	</FormGroup>
+	</FormSlot>

-	<FormSwitch v-model="isCat">{{ $ts.flagAsCat }}<template #desc>{{ $ts.flagAsCatDescription }}</template></FormSwitch>
+	<FormSwitch v-model="isCat" class="_formBlock">{{ $ts.flagAsCat }}<template #caption>{{ $ts.flagAsCatDescription }}</template></FormSwitch>

-	<FormSwitch v-model="isBot">{{ $ts.flagAsBot }}<template #desc>{{ $ts.flagAsBotDescription }}</template></FormSwitch>
+	<FormSwitch v-model="isBot" class="_formBlock">{{ $ts.flagAsBot }}<template #caption>{{ $ts.flagAsBotDescription }}</template></FormSwitch>

-	<FormSwitch v-model="alwaysMarkNsfw">{{ $ts.alwaysMarkSensitive }}</FormSwitch>
-</FormBase>
+	<FormSwitch v-model="alwaysMarkNsfw" class="_formBlock">{{ $ts.alwaysMarkSensitive }}</FormSwitch>
+</div>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
-import FormButton from '@/components/debobigego/button.vue';
-import FormInput from '@/components/debobigego/input.vue';
-import FormTextarea from '@/components/debobigego/textarea.vue';
-import FormSwitch from '@/components/debobigego/switch.vue';
-import FormSelect from '@/components/debobigego/select.vue';
-import FormBase from '@/components/debobigego/base.vue';
-import FormGroup from '@/components/debobigego/group.vue';
+import MkButton from '@/components/ui/button.vue';
+import FormInput from '@/components/form/input.vue';
+import FormTextarea from '@/components/form/textarea.vue';
+import FormSwitch from '@/components/form/switch.vue';
+import FormSelect from '@/components/form/select.vue';
+import FormSlot from '@/components/form/slot.vue';
 import { host, langs } from '@/config';
 import { selectFile } from '@/scripts/select-file';
 import * as os from '@/os';
@ -61,13 +60,12 @@ import * as symbols from '@/symbols';

 export default defineComponent({
 	components: {
-		FormButton,
+		MkButton,
 		FormInput,
 		FormTextarea,
 		FormSwitch,
 		FormSelect,
-		FormBase,
-		FormGroup,
+		FormSlot,
 	},
 	
 	emits: ['info'],
@ -257,25 +255,28 @@ export default defineComponent({
 <style lang="scss" scoped>
 .llvierxe {
 	position: relative;
-	height: 150px;
 	background-size: cover;
 	background-position: center;
-
-	> * {
-		pointer-events: none;
-	}
+	border-radius: 10px;
+	overflow: clip;

 	> .avatar {
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		display: block;
+		display: inline-block;
+		text-align: center;
+		padding: 16px;
+
+		> .avatar {
+			display: inline-block;
 			width: 72px;
 			height: 72px;
-		margin: auto;
-		box-shadow: 0 0 0 6px rgba(0, 0, 0, 0.5);
+			margin: 0 auto 16px auto;
+		}
+	}
+
+	> .bannerEdit {
+		position: absolute;
+		top: 16px;
+		right: 16px;
 	}
 }
 </style>
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@ -1,8 +1,8 @@
 <template>
-<FormBase>
-	<div class="_debobigegoItem">
-		<div class="_debobigegoLabel">{{ $ts.reactionSettingDescription }}</div>
-		<div class="_debobigegoPanel">
+<div class="_formRoot">
+	<FromSlot class="_formBlock">
+		<template #label>{{ $ts.reactionSettingDescription }}</template>
+		<div v-panel style="border-radius: 6px;">
 			<XDraggable v-model="reactions" class="zoaiodol" :item-key="item => item" animation="150" delay="100" delay-on-touch-only="true">
 				<template #item="{element}">
 					<button class="_button item" @click="remove(element, $event)">
@ -14,33 +14,38 @@
 				</template>
 			</XDraggable>
 		</div>
-		<div class="_debobigegoCaption">{{ $ts.reactionSettingDescription2 }} <button class="_textButton" @click="preview">{{ $ts.preview }}</button></div>
-	</div>
+		<template #caption>{{ $ts.reactionSettingDescription2 }} <button class="_textButton" @click="preview">{{ $ts.preview }}</button></template>
+	</FromSlot>

-	<FormRadios v-model="reactionPickerWidth">
-		<template #desc>{{ $ts.width }}</template>
+	<FormRadios v-model="reactionPickerWidth" class="_formBlock">
+		<template #label>{{ $ts.width }}</template>
 		<option :value="1">{{ $ts.small }}</option>
 		<option :value="2">{{ $ts.medium }}</option>
 		<option :value="3">{{ $ts.large }}</option>
 	</FormRadios>
-	<FormRadios v-model="reactionPickerHeight">
-		<template #desc>{{ $ts.height }}</template>
+	<FormRadios v-model="reactionPickerHeight" class="_formBlock">
+		<template #label>{{ $ts.height }}</template>
 		<option :value="1">{{ $ts.small }}</option>
 		<option :value="2">{{ $ts.medium }}</option>
 		<option :value="3">{{ $ts.large }}</option>
 	</FormRadios>
+	<FormSection>
 		<FormButton @click="preview"><i class="fas fa-eye"></i> {{ $ts.preview }}</FormButton>
+	</FormSection>
+	<FormSection>
 		<FormButton danger @click="setDefault"><i class="fas fa-undo"></i> {{ $ts.default }}</FormButton>
-</FormBase>
+	</FormSection>
+</div>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
 import XDraggable from 'vuedraggable';
-import FormInput from '@/components/debobigego/input.vue';
-import FormRadios from '@/components/debobigego/radios.vue';
-import FormBase from '@/components/debobigego/base.vue';
-import FormButton from '@/components/debobigego/button.vue';
+import FormInput from '@/components/form/input.vue';
+import FormRadios from '@/components/form/radios.vue';
+import FromSlot from '@/components/form/slot.vue';
+import FormButton from '@/components/ui/button.vue';
+import FormSection from '@/components/form/section.vue';
 import * as os from '@/os';
 import { defaultStore } from '@/store';
 import * as symbols from '@/symbols';
@ -49,8 +54,9 @@ export default defineComponent({
 	components: {
 		FormInput,
 		FormButton,
-		FormBase,
+		FromSlot,
 		FormRadios,
+		FormSection,
 		XDraggable,
 	},

@ -135,7 +141,8 @@ export default defineComponent({

 <style lang="scss" scoped>
 .zoaiodol {
-	padding: 16px;
+	padding: 12px;
+	font-size: 1.1em;

 	> .item {
 		display: inline-block;
--- a/packages/client/src/pages/settings/security.vue
+++ b/packages/client/src/pages/settings/security.vue
@ -1,12 +1,21 @@
 <template>
-<FormBase>
-	<X2fa/>
-	<FormLink to="/settings/2fa"><template #icon><i class="fas fa-mobile-alt"></i></template>{{ $ts.twoStepAuthentication }}</FormLink>
+<div class="_formRoot">
+	<FormSection>
+		<template #label>{{ $ts.password }}</template>
 		<FormButton primary @click="change()">{{ $ts.changePassword }}</FormButton>
-	<FormPagination :pagination="pagination">
+	</FormSection>
+
+	<FormSection>
+		<template #label>{{ $ts.twoStepAuthentication }}</template>
+		<X2fa/>
+	</FormSection>
+	
+	<FormSection>
 		<template #label>{{ $ts.signinHistory }}</template>
+		<FormPagination :pagination="pagination">
 			<template #default="{items}">
-			<div v-for="item in items" :key="item.id" class="_debobigegoPanel timnmucd">
+				<div>
+					<div v-for="item in items" :key="item.id" v-panel class="timnmucd">
 						<header>
 							<i v-if="item.success" class="fas fa-check icon succ"></i>
 							<i v-else class="fas fa-times-circle icon fail"></i>
@ -14,32 +23,39 @@
 							<MkTime :time="item.createdAt" class="time"/>
 						</header>
 					</div>
+				</div>
 			</template>
 		</FormPagination>
-	<FormGroup>
+	</FormSection>
+
+	<FormSection>
+		<FormSlot>
 			<FormButton danger @click="regenerateToken"><i class="fas fa-sync-alt"></i> {{ $ts.regenerateLoginToken }}</FormButton>
 			<template #caption>{{ $ts.regenerateLoginTokenDescription }}</template>
-	</FormGroup>
-</FormBase>
+		</FormSlot>
+	</FormSection>
+</div>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
-import FormBase from '@/components/debobigego/base.vue';
+import FormSection from '@/components/form/section.vue';
 import FormLink from '@/components/debobigego/link.vue';
-import FormGroup from '@/components/debobigego/group.vue';
-import FormButton from '@/components/debobigego/button.vue';
-import FormPagination from '@/components/debobigego/pagination.vue';
+import FormSlot from '@/components/form/slot.vue';
+import FormButton from '@/components/ui/button.vue';
+import FormPagination from '@/components/form/pagination.vue';
+import X2fa from './2fa.vue';
 import * as os from '@/os';
 import * as symbols from '@/symbols';

 export default defineComponent({
 	components: {
-		FormBase,
+		FormSection,
 		FormLink,
 		FormButton,
 		FormPagination,
-		FormGroup,
+		FormSlot,
+		X2fa,
 	},
 	
 	emits: ['info'],
@ -115,6 +131,20 @@ export default defineComponent({
 .timnmucd {
 	padding: 16px;

+	&:first-child {
+		border-top-left-radius: 6px;
+		border-top-right-radius: 6px;
+	}
+
+	&:last-child {
+		border-bottom-left-radius: 6px;
+		border-bottom-right-radius: 6px;
+	}
+
+	&:not(:last-child) {
+		border-bottom: solid 0.5px var(--divider);
+	}
+
 	> header {
 		display: flex;
 		align-items: center;
--- a/packages/client/src/pages/settings/sounds.vue
+++ b/packages/client/src/pages/settings/sounds.vue
@ -1,29 +1,28 @@
 <template>
-<FormBase>
-	<FormRange v-model="masterVolume" :min="0" :max="1" :step="0.05">
-		<template #label><i class="fas fa-volume-icon"></i> {{ $ts.masterVolume }}</template>
+<div class="_formRoot">
+	<FormRange v-model="masterVolume" :min="0" :max="1" :step="0.05" :text-converter="(v) => `${Math.floor(v * 100)}%`" class="_formBlock">
+		<template #label>{{ $ts.masterVolume }}</template>
 	</FormRange>

-	<FormGroup>
+	<FormSection>
 		<template #label>{{ $ts.sounds }}</template>
-		<FormButton v-for="type in Object.keys(sounds)" :key="type" :center="false" @click="edit(type)">
+		<FormLink v-for="type in Object.keys(sounds)" :key="type" style="margin-bottom: 8px;" @click="edit(type)">
 			{{ $t('_sfx.' + type) }}
 			<template #suffix>{{ sounds[type].type || $ts.none }}</template>
 			<template #suffixIcon><i class="fas fa-chevron-down"></i></template>
-		</FormButton>
-	</FormGroup>
+		</FormLink>
+	</FormSection>

-	<FormButton danger @click="reset()"><i class="fas fa-redo"></i> {{ $ts.default }}</FormButton>
-</FormBase>
+	<FormButton danger class="_formBlock" @click="reset()"><i class="fas fa-redo"></i> {{ $ts.default }}</FormButton>
+</div>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
-import FormRange from '@/components/debobigego/range.vue';
-import FormSelect from '@/components/debobigego/select.vue';
-import FormBase from '@/components/debobigego/base.vue';
-import FormButton from '@/components/debobigego/button.vue';
-import FormGroup from '@/components/debobigego/group.vue';
+import FormRange from '@/components/form/range.vue';
+import FormButton from '@/components/ui/button.vue';
+import FormLink from '@/components/form/link.vue';
+import FormSection from '@/components/form/section.vue';
 import * as os from '@/os';
 import { ColdDeviceStorage } from '@/store';
 import { playFile } from '@/scripts/sound';
@ -58,11 +57,10 @@ const soundsTypes = [

 export default defineComponent({
 	components: {
-		FormSelect,
+		FormLink,
 		FormButton,
-		FormBase,
 		FormRange,
-		FormGroup,
+		FormSection,
 	},

 	emits: ['info'],
--- a/packages/client/src/pages/settings/theme.vue
+++ b/packages/client/src/pages/settings/theme.vue
@ -1,8 +1,7 @@
 <template>
-<FormBase>
-	<FormGroup>
-		<div class="rfqxtzch _debobigegoItem _debobigegoPanel">
-			<div class="darkMode">
+<div class="_formRoot">
+	<div v-panel class="rfqxtzch _formBlock">
+		<div class="toggle">
 			<div class="toggleWrapper">
 				<input id="dn" v-model="darkMode" type="checkbox" class="dn"/>
 				<label for="dn" class="toggle">
@ -22,13 +21,15 @@
 				</label>
 			</div>
 		</div>
-		</div>
+		<div class="sync">
 			<FormSwitch v-model="syncDeviceDarkMode">{{ $ts.syncDeviceDarkMode }}</FormSwitch>
-	</FormGroup>
+		</div>
+	</div>

 	<template v-if="darkMode">
-		<FormSelect v-model="darkThemeId">
+		<FormSelect v-model="darkThemeId" class="_formBlock">
 			<template #label>{{ $ts.themeForDarkMode }}</template>
+			<template #prefix><i class="fas fa-moon"></i></template>
 			<optgroup :label="$ts.darkThemes">
 				<option v-for="x in darkThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
 			</optgroup>
@ -36,8 +37,9 @@
 				<option v-for="x in lightThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
 			</optgroup>
 		</FormSelect>
-		<FormSelect v-model="lightThemeId">
+		<FormSelect v-model="lightThemeId" class="_formBlock">
 			<template #label>{{ $ts.themeForLightMode }}</template>
+			<template #prefix><i class="fas fa-sun"></i></template>
 			<optgroup :label="$ts.lightThemes">
 				<option v-for="x in lightThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
 			</optgroup>
@ -47,8 +49,9 @@
 		</FormSelect>
 	</template>
 	<template v-else>
-		<FormSelect v-model="lightThemeId">
+		<FormSelect v-model="lightThemeId" class="_formBlock">
 			<template #label>{{ $ts.themeForLightMode }}</template>
+			<template #prefix><i class="fas fa-sun"></i></template>
 			<optgroup :label="$ts.lightThemes">
 				<option v-for="x in lightThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
 			</optgroup>
@ -56,8 +59,9 @@
 				<option v-for="x in darkThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
 			</optgroup>
 		</FormSelect>
-		<FormSelect v-model="darkThemeId">
+		<FormSelect v-model="darkThemeId" class="_formBlock">
 			<template #label>{{ $ts.themeForDarkMode }}</template>
+			<template #prefix><i class="fas fa-moon"></i></template>
 			<optgroup :label="$ts.darkThemes">
 				<option v-for="x in darkThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
 			</optgroup>
@ -67,31 +71,28 @@
 		</FormSelect>
 	</template>

-	<FormButton v-if="wallpaper == null" primary @click="setWallpaper">{{ $ts.setWallpaper }}</FormButton>
-	<FormButton v-else primary @click="wallpaper = null">{{ $ts.removeWallpaper }}</FormButton>
-
-	<FormGroup>
+	<FormSection>
+		<div class="_formLinksGrid">
+			<FormLink to="/settings/theme/manage"><template #icon><i class="fas fa-folder-open"></i></template>{{ $ts._theme.manage }}<template #suffix>{{ themesCount }}</template></FormLink>
 			<FormLink to="https://assets.misskey.io/theme/list" external><template #icon><i class="fas fa-globe"></i></template>{{ $ts._theme.explore }}</FormLink>
 			<FormLink to="/settings/theme/install"><template #icon><i class="fas fa-download"></i></template>{{ $ts._theme.install }}</FormLink>
-	</FormGroup>
-
-	<FormGroup>
 			<FormLink to="/theme-editor"><template #icon><i class="fas fa-paint-roller"></i></template>{{ $ts._theme.make }}</FormLink>
-		<!--<FormLink to="/advanced-theme-editor"><template #icon><i class="fas fa-paint-roller"></i></template>{{ $ts._theme.make }} ({{ $ts.advanced }})</FormLink>-->
-	</FormGroup>
+		</div>
+	</FormSection>

-	<FormLink to="/settings/theme/manage"><template #icon><i class="fas fa-folder-open"></i></template>{{ $ts._theme.manage }}<template #suffix>{{ themesCount }}</template></FormLink>
-</FormBase>
+	<FormButton v-if="wallpaper == null" class="_formBlock" @click="setWallpaper">{{ $ts.setWallpaper }}</FormButton>
+	<FormButton v-else class="_formBlock" @click="wallpaper = null">{{ $ts.removeWallpaper }}</FormButton>
+</div>
 </template>

 <script lang="ts">
 import { computed, defineComponent, onActivated, onMounted, ref, watch } from 'vue';
-import FormSwitch from '@/components/debobigego/switch.vue';
-import FormSelect from '@/components/debobigego/select.vue';
-import FormBase from '@/components/debobigego/base.vue';
-import FormGroup from '@/components/debobigego/group.vue';
-import FormLink from '@/components/debobigego/link.vue';
-import FormButton from '@/components/debobigego/button.vue';
+import FormSwitch from '@/components/form/switch.vue';
+import FormSelect from '@/components/form/select.vue';
+import FormGroup from '@/components/form/group.vue';
+import FormSection from '@/components/form/section.vue';
+import FormLink from '@/components/form/link.vue';
+import FormButton from '@/components/ui/button.vue';
 import { builtinThemes } from '@/scripts/theme';
 import { selectFile } from '@/scripts/select-file';
 import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
@ -105,8 +106,8 @@ export default defineComponent({
 	components: {
 		FormSwitch,
 		FormSelect,
-		FormBase,
 		FormGroup,
+		FormSection,
 		FormLink,
 		FormButton,
 	},
@ -198,11 +199,12 @@ export default defineComponent({

 <style lang="scss" scoped>
 .rfqxtzch {
-	padding: 16px;
+	border-radius: 6px;

-	> .darkMode {
+	> .toggle {
 		position: relative;
-		padding: 32px 0;
+		padding: 26px 0;
+		text-align: center;

 		&.disabled {
 			opacity: 0.7;
@ -212,13 +214,11 @@ export default defineComponent({
 			}
 		}

-		.toggleWrapper {
-			position: absolute;
-			top: 50%;
-			left: 50%;
-			overflow: hidden;
+		> .toggleWrapper {
+			display: inline-block;
+			text-align: left;
+			overflow: clip;
 			padding: 0 100px;
-			transform: translate3d(-50%, -50%, 0);

 			input {
 				position: absolute;
@ -239,7 +239,6 @@ export default defineComponent({
 			> .before, > .after {
 				position: absolute;
 				top: 15px;
-				font-size: 18px;
 				transition: color 1s ease;
 			}

@ -420,5 +419,10 @@ export default defineComponent({
 			}
 		}
 	}
+
+	> .sync {
+		padding: 14px 16px;
+		border-top: solid 0.5px var(--divider);
+	}
 }
 </style>
--- a/packages/client/src/pages/settings/word-mute.vue
+++ b/packages/client/src/pages/settings/word-mute.vue
@ -1,32 +1,30 @@
 <template>
-<div>
-	<MkTab v-model="tab">
+<div class="_formRoot">
+	<MkTab v-model="tab" class="_formBlock">
 		<option value="soft">{{ $ts._wordMute.soft }}</option>
 		<option value="hard">{{ $ts._wordMute.hard }}</option>
 	</MkTab>
-	<FormBase>
-		<div class="_debobigegoItem">
+	<div class="_formBlock">
 		<div v-show="tab === 'soft'">
-				<FormInfo>{{ $ts._wordMute.softDescription }}</FormInfo>
-				<FormTextarea v-model="softMutedWords">
+			<MkInfo class="_formBlock">{{ $ts._wordMute.softDescription }}</MkInfo>
+			<FormTextarea v-model="softMutedWords" class="_formBlock">
 				<span>{{ $ts._wordMute.muteWords }}</span>
-					<template #desc>{{ $ts._wordMute.muteWordsDescription }}<br>{{ $ts._wordMute.muteWordsDescription2 }}</template>
+				<template #caption>{{ $ts._wordMute.muteWordsDescription }}<br>{{ $ts._wordMute.muteWordsDescription2 }}</template>
 			</FormTextarea>
 		</div>
 		<div v-show="tab === 'hard'">
-				<FormInfo>{{ $ts._wordMute.hardDescription }}</FormInfo>
-				<FormTextarea v-model="hardMutedWords">
+			<MkInfo class="_formBlock">{{ $ts._wordMute.hardDescription }}</MkInfo>
+			<FormTextarea v-model="hardMutedWords" class="_formBlock">
 				<span>{{ $ts._wordMute.muteWords }}</span>
-					<template #desc>{{ $ts._wordMute.muteWordsDescription }}<br>{{ $ts._wordMute.muteWordsDescription2 }}</template>
+				<template #caption>{{ $ts._wordMute.muteWordsDescription }}<br>{{ $ts._wordMute.muteWordsDescription2 }}</template>
 			</FormTextarea>
-				<FormKeyValueView v-if="hardWordMutedNotesCount != null">
+			<MkKeyValue v-if="hardWordMutedNotesCount != null" class="_formBlock">
 				<template #key>{{ $ts._wordMute.mutedNotes }}</template>
 				<template #value>{{ number(hardWordMutedNotesCount) }}</template>
-				</FormKeyValueView>
+			</MkKeyValue>
 		</div>
 	</div>
-		<FormButton primary inline :disabled="!changed" @click="save()"><i class="fas fa-save"></i> {{ $ts.save }}</FormButton>
-	</FormBase>
+	<MkButton primary inline :disabled="!changed" @click="save()"><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>
 </div>
 </template>

@ -34,9 +32,9 @@
 import { defineComponent } from 'vue';
 import FormTextarea from '@/components/form/textarea.vue';
 import FormBase from '@/components/debobigego/base.vue';
-import FormKeyValueView from '@/components/debobigego/key-value-view.vue';
-import FormButton from '@/components/debobigego/button.vue';
-import FormInfo from '@/components/debobigego/info.vue';
+import MkKeyValue from '@/components/key-value.vue';
+import MkButton from '@/components/ui/button.vue';
+import MkInfo from '@/components/ui/info.vue';
 import MkTab from '@/components/tab.vue';
 import * as os from '@/os';
 import number from '@/filters/number';
@ -45,11 +43,11 @@ import * as symbols from '@/symbols';
 export default defineComponent({
 	components: {
 		FormBase,
-		FormButton,
+		MkButton,
 		FormTextarea,
-		FormKeyValueView,
+		MkKeyValue,
 		MkTab,
-		FormInfo,
+		MkInfo,
 	},

 	emits: ['info'],
--- a/packages/client/src/pages/user/index.photos.vue
+++ b/packages/client/src/pages/user/index.photos.vue
@ -20,7 +20,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import notePage from '@/filters/note';
+import { notePage } from '@/filters/note';
 import * as os from '@/os';
 import MkContainer from '@/components/ui/container.vue';
 import ImgWithBlurhash from '@/components/img-with-blurhash.vue';
--- a/packages/client/src/scripts/mfm-tags.ts
+++ b/packages/client/src/scripts/mfm-tags.ts
@ -1 +1 @@
-export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'font', 'blur', 'rainbow', 'sparkle'];
+export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'font', 'blur', 'rainbow', 'sparkle', 'rotate'];
--- a/packages/client/src/scripts/use-tooltip.ts
+++ b/packages/client/src/scripts/use-tooltip.ts
@ -1,3 +1,4 @@
+import { isScreenTouching } from '@/os';
 import { Ref, ref } from 'vue';

 export function useTooltip(onShow: (showing: Ref<boolean>) => void) {
@ -10,6 +11,10 @@ export function useTooltip(onShow: (showing: Ref<boolean>) => void) {
 		close();
 		if (!isHovering) return;

+		// iOS(Androidも？)では、要素をタップした直後に(おせっかいで)mouseoverイベントを発火させたりするため、その対策
+		// これが無いと、画面に触れてないのにツールチップが出たりしてしまう
+		if (!isScreenTouching) return;
+
 		const showing = ref(true);
 		onShow(showing);
 		changeShowingState = () => {
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@ -29,6 +29,7 @@ html {
 	overflow: auto;
 	overflow-wrap: break-word;
 	font-family: "BIZ UDGothic", Roboto, HelveticaNeue, Arial, sans-serif;
+	font-size: 15px;
 	line-height: 1.35;
 	text-size-adjust: 100%;
 	tab-size: 2;
@ -387,9 +388,8 @@ hr {

 ._inputSplit {
 	display: grid;
-	grid-template-columns: repeat(auto-fill, minmax(170px, 1fr));
-	grid-gap: 8px;
-	margin: 1em 0;
+	grid-template-columns: repeat(auto-fill, minmax(210px, 1fr));
+	grid-gap: 12px;

 	> * {
 		margin: 0 !important;
@ -397,7 +397,7 @@ hr {
 }

 ._formBlock {
-	margin: 20px 0;
+	margin: 1.5em 0;
 }

 ._formRoot {
@ -410,6 +410,18 @@ hr {
 	}
 }

+._formLinksGrid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+	grid-gap: 12px;
+}
+
+._formLinks {
+	> *:not(:last-child) {
+		margin-bottom: 8px;
+	}
+}
+
 ._table {
 	> ._row {
 		display: flex;
--- a/packages/client/src/ui/chat/note-header.vue
+++ b/packages/client/src/ui/chat/note-header.vue
@ -21,7 +21,7 @@

 <script lang="ts">
 import { defineComponent } from 'vue';
-import notePage from '@/filters/note';
+import { notePage } from '@/filters/note';
 import { userPage } from '@/filters/user';
 import * as os from '@/os';