diff --git a/public/css/common.css b/public/css/common.css
index 85872b2..1fc6b90 100755
--- a/public/css/common.css
+++ b/public/css/common.css
@@ -37,9 +37,6 @@ button, input, optgroup, select, textarea {
   font-family: inherit;
   line-height: inherit;
 }
-*, :after, :before {
-  box-sizing: border-box;
-}
 input {
   text-rendering: auto;
   letter-spacing: normal;
@@ -112,23 +109,10 @@ input {
   font-size: 15px;
 }
 
-img, svg {
-  vertical-align: middle;
-}
-
-img {
-  border-style: none;
-}
-
 .dropdown-toggle {
   white-space: nowrap;
 }
 
-
-element.style {
-  overflow: hidden;
-  height: 32px;
-}
 #custom-css input, #custom-css textarea {
   background: var(--inputColor) !important;
   color: var(--mainForegroundColor) !important;
@@ -186,12 +170,6 @@ my-action-buttons {
   width: -webkit-max-content;
   width: max-content;
 }
-@media screen and (max-width: 1600px) {
-  .main-col {
-    --horizontalMarginContent: 15px;
-    --videosHorizontalMarginContent: 30px;
-  }
-}
 .video-info-description {
   margin-inline-end: 0;
 }
@@ -292,16 +270,12 @@ my-recommended-videos {
     column-gap: 30px;
     grid-template-columns: repeat(auto-fill,minmax(var(--miniatureMinWidth),1fr));
   }
-}
 
-@media screen and (min-width: 500px) {
   .margin-content .videos .video-wrapper, .margin-content .videos .playlist-wrapper, .margin-content .playlists .video-wrapper, .margin-content .playlists .playlist-wrapper {
     margin: 0 auto;
     width: 100%;
   }
-}
 
-@media screen and (min-width: 500px) {
   .margin-content .videos .video-wrapper my-video-miniature, .margin-content .videos .video-wrapper my-video-playlist-miniature, .margin-content .videos .playlist-wrapper my-video-miniature, .margin-content .videos .playlist-wrapper my-video-playlist-miniature, .margin-content .playlists .video-wrapper my-video-miniature, .margin-content .playlists .video-wrapper my-video-playlist-miniature, .margin-content .playlists .playlist-wrapper my-video-miniature, .margin-content .playlists .playlist-wrapper my-video-playlist-miniature {
     display: block;
     min-width: var(--miniatureMinWidth);
@@ -330,63 +304,6 @@ my-video-miniature {
   height: 100%;
   top: 0;
 }
-.video-thumbnail {
-  display: flex;
-  flex-direction: column;
-  position: relative;
-  border-radius: 3px;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  background-color: #ececec;
-  transition: filter .2s ease;
-}
-.video-thumbnail-actions-overlay {
-  position: absolute;
-  display: flex;
-  flex-direction: column;
-  right: 5px;
-  top: 5px;
-  opacity: 0;
-}
-.video-thumbnail-label-overlay.danger {
-  background-color: red;
-}
-.video-thumbnail-label-overlay {
-  position: absolute;
-  padding: 0 5px;
-  left: 5px;
-  top: 5px;
-  font-weight: 700;
-}
-.video-thumbnail-watch-later-overlay, .video-thumbnail-label-overlay, .video-thumbnail-duration-overlay, .video-thumbnail-live-overlay {
-  display: inline-block;
-  background-color: #000000b3;
-  color: #fff;
-  border-radius: 3px;
-  font-size: 12px;
-  font-weight: 600;
-  line-height: 1.1;
-  z-index: 10;
-}
-.video-thumbnail-duration-overlay, .video-thumbnail-live-overlay {
-  position: absolute;
-  padding: 0 3px;
-  right: 5px;
-  bottom: 5px;
-}
-.video-thumbnail .play-overlay, .video-thumbnail .play-overlay .icon {
-  transition: all .2s ease;
-}
-.video-thumbnail .play-overlay {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  width: inherit;
-  height: inherit;
-  opacity: 0;
-  background-color: #0000004d;
-}
 .video-miniature:not(.display-as-row) .video-bottom {
   display: flex;
   width: 100%;
@@ -461,6 +378,26 @@ my-video-miniature {
   font-weight: 600;
 }
 
+.video-thumbnail-watch-later-overlay, .video-thumbnail-label-overlay, .video-thumbnail-duration-overlay, .video-thumbnail-live-overlay {
+  display: inline-block;
+  background-color: #000000b3;
+  color: #fff;
+  border-radius: 3px;
+  font-size: 12px;
+  font-weight: 600;
+  line-height: 1.1;
+  z-index: 10;
+}
+
+.video-thumbnail-actions-overlay {
+  position: absolute;
+  display: flex;
+  flex-direction: column;
+  right: 5px;
+  top: 5px;
+  opacity: 0;
+}
+
 .video-thumbnail {
   display: flex;
   flex-direction: column;
@@ -478,6 +415,13 @@ my-video-miniature {
     height: inherit;
 }
 
+.video-thumbnail-duration-overlay, .video-thumbnail-live-overlay {
+  position: absolute;
+  padding: 0 3px;
+  right: 5px;
+  bottom: 5px;
+}
+
 .video-thumbnail-label-overlay.warning {
   background-color: orange;
 }
@@ -569,32 +513,6 @@ my-actor-avatar {
   margin-top: 10px;
   margin-bottom: 0;
 }
-.video-miniature:not(.display-as-row) .video-miniature-name {
-  margin-top: 10px;
-  margin-bottom: 5px;
-}
-.video-miniature-name {
-  display: block;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  font-size: 1.1em;
-  line-height: 1.1em;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-height: 2.2em;
-  word-break: break-word;
-  word-wrap: break-word;
-  overflow-wrap: break-word;
-  transition: color .2s;
-  font-weight: 600;
-  color: var(--mainForegroundColor);
-}
-.video-miniature:not(.display-as-row) .video-miniature-created-at-views {
-  display: block;
-}
-.video-miniature-created-at-views {
-  font-size: 13px;
-}
 .video-miniature-account, .video-miniature-channel {
   white-space: nowrap;
   overflow: hidden;
@@ -603,12 +521,6 @@ my-actor-avatar {
   font-size: 13px;
   color: var(--greyForegroundColor);
 }
-.video-miniature-created-at-views {
-  font-size: 13px;
-}
-.video-info-privacy, .video-info-blocked .blocked-label, .video-info-nsfw {
-  font-weight: 600;
-}
 
 
 .icon-search {
@@ -629,9 +541,6 @@ my-actor-avatar {
 my-search-typeahead {
   margin-inline-end: 15px;
 }
-.w-100 {
-  width: 100%!important;
-}
 
 .icon-logo {
   background-image: url(/client/assets/images/logo.svg?f43d062f4606d20e41cab4363a9d9da456139512);
@@ -697,11 +606,6 @@ my-search-typeahead {
   cursor: pointer;
 }
 
-a {
-  text-decoration: none;
-  background-color: initial;
-}
-
 menu:focus, menu:hover {
   overflow-y: auto;
 }
@@ -1025,18 +929,9 @@ my-actor-avatar {
 .avatar-32 {
   --avatarSize: 32px;
 }
-.flex-column {
-  flex-direction: column!important;
-}
 .main-row {
   min-height: calc(100vh - 50px - 30px - 30px);
 }
-@media screen and (max-width: 1600px) {
-  .main-col {
-    --horizontalMarginContent: 15px;
-    --videosHorizontalMarginContent: 30px;
-  }
-}
 .main-col {
   margin-inline-start: 240px;
 }
@@ -1057,15 +952,6 @@ svg {
   width: inherit;
   height: inherit;
 }
-svg {
-  overflow: hidden;
-}
-img, svg {
-  vertical-align: middle;
-}
-img {
-  border-style: none;
-}
 
 .title-page-container .title-page.active, .title-page-container .title-page.title-page-single {
   margin-inline-end: .5rem!important;
@@ -1095,12 +981,6 @@ h2 {
   margin-block-start: 0.83em;
   margin-block-end: 0.83em;
 }
-@media screen and (max-width: 1600px) {
-  .main-col {
-    --horizontalMarginContent: 15px;
-    --videosHorizontalMarginContent: 30px;
-  }
-}
 
 #custom-css .dropdown-menu, #custom-css .dropdown-menu .dropdown-item { background-color: #421a46 !important; }
 
@@ -1279,16 +1159,10 @@ my-subscribe-button {
 .pt-3, .py-3 {
   padding-top: 1rem!important;
 }
-.w-100 {
-  width: 100%!important;
-}
 
 .justify-content-end {
   justify-content: flex-end!important;
 }
-.d-flex {
-  display: flex!important;
-}
 .position-relative {
   position: relative!important;
 }
@@ -1623,4 +1497,4 @@ p {
   width: 15px;
   height: 15px;
   margin-inline-start: 20px;
-}
\ No newline at end of file
+}
diff --git a/public/css/style.css b/public/css/style.css
index 97fe07b..21bc037 100755
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1,20 +1,13 @@
 body {
-    --mainColor: #00abff;
-    --mainBackgroundColor: #121212;
-    --mainForegroundColor: rgba(195,195,195,0.878431);
     --submenuColor: #272727;
-    --submenuBackgroundColor: #272727;
-    --channelBackgroundColor: #272727;
     --inputColor: #272727;
     --inputPlaceholderColor: rgba(195,195,195,0.878431);
     --menuAndHeaderBackgroundColor: #272727;
     --menuForegroundColor: rgba(195,195,195,0.878431);
     --menuBackgroundColor: #272727;
     --whiteColor: #ffffff;
-    --mainHoverColor: #0481bf;
-    --actionButtonColor: #ffffff;
     --dangerBackgroundColor: #d9534f;
-    /*font-family: "Open Sans",sans-serif;*/
+    font-family: "Open Sans",sans-serif;
   }
   
   /* Main background */
@@ -470,4 +463,4 @@ body {
   /* About */
   #custom-css .anchor-link .section-title {
     color: inherit;
-  }
\ No newline at end of file
+  }
diff --git a/resources/views/layout/component/a/channels.blade.php b/resources/views/layout/component/a/channels.blade.php
index cb3be77..1d764b6 100644
--- a/resources/views/layout/component/a/channels.blade.php
+++ b/resources/views/layout/component/a/channels.blade.php
@@ -1,11 +1,13 @@
-<my-account-video-channels class="ng-star-inserted">
+<my-account-video-channels>
   <div class="margin-content">
     <div class="channels">
       @foreach ($res['channel']->data as $ch)
-        <div class="channel ng-star-inserted">
+        <div class="channel">
           @include('layout.component.a.channels.avatar')
           @include('layout.component.common.subscribe')
-          @include('layout.component.a.channels.videos')
+          @foreach ($ch->video->data as $v)
+            @include('layout.component.common.videominature')
+          @endforeach
         </div>
       @endforeach
     </div>
diff --git a/resources/views/layout/component/a/channels/avatar.blade.php b/resources/views/layout/component/a/channels/avatar.blade.php
index 4b99ebf..4d5f56c 100644
--- a/resources/views/layout/component/a/channels/avatar.blade.php
+++ b/resources/views/layout/component/a/channels/avatar.blade.php
@@ -1,14 +1,14 @@
 <div class="channel-avatar-row">
   <my-actor-avatar title="この動画チャンネルを見る">
-    <a title="この動画チャンネルを見る" href="/c/{{ ptFullHandle($ch) }}" class="ng-star-inserted">
-      <img class="avatar channelng ng-star-inserted" src="{{ ptAvatar($ch) }}" alt="チャンネルのアバター">
+    <a title="この動画チャンネルを見る" href="/c/{{ ptFullHandle($ch) }}">
+      <img class="avatar channelng" src="{{ ptAvatar($ch) }}" alt="チャンネルのアバター">
     </a>
   </my-actor-avatar>
   <h2>
     <a title="この動画チャンネルを見る" href="/c/{{ ptFullHandle($ch) }}"> {{ $ch->displayName }} </a>
   </h2>
   <div class="actor-counters">
-    <div class="followers">{{ $ch->followersCount }}人登録者</div>・<span class="videos-count ng-star-inserted"> {{ $ch->video->total }}枚動画 </span>
+    <div class="followers">{{ $ch->followersCount }}人登録者</div>・<span class="videos-count"> {{ $ch->video->total }}枚動画 </span>
   </div>
   <div class="description-html">
     <p>
diff --git a/resources/views/layout/component/a/channels/videos.blade.php b/resources/views/layout/component/a/channels/videos.blade.php
deleted file mode 100644
index 77a844f..0000000
--- a/resources/views/layout/component/a/channels/videos.blade.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="videos">
-  @foreach ($ch->video->data as $v)
-    <my-video-miniature class="ng-star-inserted">
-      <div class="video-miniature">
-        <my-video-thumbnail>
-          <a class="video-thumbnail ng-star-inserted" href="/w/{{ $v->shortUUID }}">
-            <img alt="" aria-label="{{ $v->name }}" src="{{ env('PEER_URI') }}{{ $v->thumbnailPath }}" class="ng-star-inserted">
-            <div class="video-thumbnail-label-overlay warning ng-star-inserted"></div>
-            <div class="video-thumbnail-label-overlay danger ng-star-inserted"></div>
-            <div class="video-thumbnail-duration-overlay ng-star-inserted">{{ ptDuration($v->duration) }}</div>
-            <div class="play-overlay ng-star-inserted">
-              <div class="icon"></div>
-            </div>
-            <div class="progress-bar ng-star-inserted">
-              <div style="width: 100%;"></div>
-            </div>
-          </a>
-        </my-video-thumbnail>
-        <div class="video-bottom">
-          <div class="video-miniature-information">
-            <div class="d-flex video-miniature-meta">
-              <div class="w-100 d-flex flex-column">
-                <my-link tabindex="-1" class="video-miniature-name" style="max-height: 3em;">
-                  <a tabindex="-1" title="{{ $v->name }}" href="/w/{{ $v->shortUUID }}" class="ng-star-inserted"> {{ $v->name }} </a>
-                </my-link>
-                <span class="video-miniature-created-at-views">
-                  <my-date-toggle class="ng-star-inserted">
-                    <span class="date-toggle" title="{{ date('Y/m/d', strtotime($v->publishedAt)) }}"> {{ date('Y/m/d', strtotime($v->publishedAt)) }} </span>
-                  </my-date-toggle>
-                  <span class="views" title=""> • 
-                    <my-video-views-counter class="ng-star-inserted">
-                      <span title=""> {{ $v->views }} 回視聴</span>
-                    </my-video-views-counter>
-                  </span>
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </my-video-miniature>
-  @endforeach
-
-  <div class="miniature-show-channel ng-star-inserted">
-    <a href="/c/{{ ptFullHandle($ch) }}">このチャンネルを表示&gt;</a>
-  </div>
-</div>
diff --git a/resources/views/layout/component/a/info.blade.php b/resources/views/layout/component/a/info.blade.php
index 98e5fe4..4203d95 100644
--- a/resources/views/layout/component/a/info.blade.php
+++ b/resources/views/layout/component/a/info.blade.php
@@ -1,7 +1,7 @@
 <div class="account-info">
   <div class="account-avatar-row">
     <my-actor-avatar class="main-avatar">
-      <img class="account avatar ng-star-inserted" src="{{ ptAvatar($res['owner']) }}" alt="アカウントのアバター">
+      <img class="account avatar" src="{{ ptAvatar($res['owner']) }}" alt="アカウントのアバター">
     </my-actor-avatar>
     <div>
       <div class="section-label">アカウント</div>
@@ -14,7 +14,7 @@
             <span>{{ '@'.ptFullHandle($res['owner']) }}</span>
           </div>
           <div class="actor-counters">
-            <span>{{ $res['owner']->followersCount }}人登録者</span>・<span class="videos-count ng-star-inserted"> {{ $res['owner']->totalVideo }}枚動画 </span>
+            <span>{{ $res['owner']->followersCount }}人登録者</span>・<span class="videos-count"> {{ $res['owner']->totalVideo }}枚動画 </span>
           </div>
         </div>
       </div>
diff --git a/resources/views/layout/component/a/links.blade.php b/resources/views/layout/component/a/links.blade.php
index 7f6b0f3..38d2d00 100644
--- a/resources/views/layout/component/a/links.blade.php
+++ b/resources/views/layout/component/a/links.blade.php
@@ -1,11 +1,11 @@
 <div class="links on-channel-page">
   <my-list-overflow>
     <div class="d-flex align-items-center text-nowrap w-100 list-overflow-parent">
-      <span id="pe_0" class="ng-star-inserted" style="visibility: inherit;">
-        <a class="title-page ng-star-inserted{{ $cat == 'video-channels' ? ' active' : '' }}" href="/a/{{ ptFullHandle($res['owner']) }}/video-channels">チャンネル</a>
+      <span id="pe_0" style="visibility: inherit;">
+        <a class="title-page{{ $cat == 'video-channels' ? ' active' : '' }}" href="/a/{{ ptFullHandle($res['owner']) }}/video-channels">チャンネル</a>
       </span>
-      <span id="pe_1" class="ng-star-inserted" style="visibility: inherit;">
-        <a class="title-page ng-star-inserted{{ $cat == 'videos' ? ' active' : '' }}" href="/a/{{ ptFullHandle($res['owner']) }}/videos">動画</a>
+      <span id="pe_1" style="visibility: inherit;">
+        <a class="title-page{{ $cat == 'videos' ? ' active' : '' }}" href="/a/{{ ptFullHandle($res['owner']) }}/videos">動画</a>
       </span>
     </div>
   </my-list-overflow>
diff --git a/resources/views/layout/component/about/about/admin.blade.php b/resources/views/layout/component/about/about/admin.blade.php
index 9d51f34..4ff5451 100644
--- a/resources/views/layout/component/about/about/admin.blade.php
+++ b/resources/views/layout/component/about/about/admin.blade.php
@@ -1,8 +1,8 @@
 <div id="administrators-and-sustainability" class="anchor"></div>
-<a class="anchor-link ng-star-inserted" href="/about/instance#administrators-and-sustainability">
+<a class="anchor-link" href="/about/instance#administrators-and-sustainability">
   <h2 class="middle-title">管理者とインスタンスの持続可能性</h2>
 </a>
-<div class="block administrator ng-star-inserted">
+<div class="block administrator">
   <div id="administrators" class="anchor"></div>
   <a class="anchor-link" href="/about/instance#administrators">
     <h3 class="section-title">運営者について</h3>
diff --git a/resources/views/layout/component/about/about/business.blade.php b/resources/views/layout/component/about/about/business.blade.php
index 05853fb..e23d5a2 100644
--- a/resources/views/layout/component/about/about/business.blade.php
+++ b/resources/views/layout/component/about/about/business.blade.php
@@ -1,4 +1,4 @@
-<div class="block business-model ng-star-inserted">
+<div class="block business-model">
   <div id="business-model" class="anchor"></div>
   <a class="anchor-link" href="/about/instance#business-model">
     <h3 class="section-title">このインスタンスを維持するための資金をどうやって確保しているか</h3>
diff --git a/resources/views/layout/component/about/about/cock.blade.php b/resources/views/layout/component/about/about/cock.blade.php
index cd1e350..04df43a 100644
--- a/resources/views/layout/component/about/about/cock.blade.php
+++ b/resources/views/layout/component/about/about/cock.blade.php
@@ -1,4 +1,4 @@
-<div class="block code-of-conduct ng-star-inserted">
+<div class="block code-of-conduct">
   <div id="code-of-conduct" class="anchor"></div>
   <a class="anchor-link" href="/about/instance#code-of-conduct">
     <h3 class="section-title">行動規範</h3>
diff --git a/resources/views/layout/component/about/about/creation.blade.php b/resources/views/layout/component/about/about/creation.blade.php
index 9d8881f..22f6f59 100644
--- a/resources/views/layout/component/about/about/creation.blade.php
+++ b/resources/views/layout/component/about/about/creation.blade.php
@@ -1,4 +1,4 @@
-<div class="block creation-reason ng-star-inserted">
+<div class="block creation-reason">
   <div id="creation-reason" class="anchor"></div>
   <a class="anchor-link" href="/about/instance#creation-reason">
     <h3 class="section-title">なぜこのインスタンスを建てたのか</h3>
diff --git a/resources/views/layout/component/about/about/features.blade.php b/resources/views/layout/component/about/about/features.blade.php
index 45ccea6..6e2f12d 100644
--- a/resources/views/layout/component/about/about/features.blade.php
+++ b/resources/views/layout/component/about/about/features.blade.php
@@ -1,5 +1,5 @@
-<div class="feature-table ng-star-inserted">
-  <table class="table ng-star-inserted" style="color: #fcfcfc;">
+<div class="feature-table">
+  <table class="table" style="color: #fcfcfc;">
     <caption>このインスタンスの特徴</caption>
     <tr>
       <th scope="row" class="label">PeerTubeバージョン</th>
@@ -32,7 +32,7 @@
     <tr>
       <th scope="row" class="sub-label">動画のアップロード</th>
       <td>
-        <span class="ng-star-inserted">{{ $conf->autoBlacklist->videos->ofUsers->enabled ? '手動で管理者に確認する事が必要です。' : '自動的に投稿されます' }}</span>
+        <span>{{ $conf->autoBlacklist->videos->ofUsers->enabled ? '手動で管理者に確認する事が必要です。' : '自動的に投稿されます' }}</span>
       </td>
     </tr>
     <tr>
@@ -46,11 +46,11 @@
       <th scope="row" class="sub-label">ライブ配信</th>
       @include('layout.component.about.about.isfeature', ['check' => $conf->live->enabled])
     </tr>
-    <tr class="ng-star-inserted">
+    <tr>
       <th scope="row" class="sub-label">複数の解像度でのライブ配信のトランスコーディング</th>
       @include('layout.component.about.about.isfeature', ['check' => $conf->live->transcoding->enabled && count($conf->live->transcoding->enabledResolutions) > 1])
     </tr>
-    <tr class="ng-star-inserted">
+    <tr>
       <th scope="row" class="sub-label">同時ライブ配信の最大</th>
       <td>{{ $conf->live->maxUserLives }} ユーザー / {{ $conf->live->maxInstanceLives }} インスタンス </td>
     </tr>
@@ -86,7 +86,7 @@
       <th scope="row" class="sub-label">Available themes</th>
       <td>
         @foreach ($conf->theme->registered as $them)
-          <span class="theme ng-star-inserted"> {{ $them->name }} </span>
+          <span class="theme"> {{ $them->name }} </span>
         @endforeach
       </td>
     </tr>
@@ -94,7 +94,7 @@
       <th scope="row" class="sub-label">Plugins enabled</th>
       <td>
         @foreach ($conf->plugin->registered as $plug)
-          <span class="plugin ng-star-inserted"> {{ $plug->name }} </span>
+          <span class="plugin"> {{ $plug->name }} </span>
         @endforeach
       </td>
     </tr>
diff --git a/resources/views/layout/component/about/about/information.blade.php b/resources/views/layout/component/about/about/information.blade.php
index 6e16480..b932dfa 100644
--- a/resources/views/layout/component/about/about/information.blade.php
+++ b/resources/views/layout/component/about/about/information.blade.php
@@ -1,5 +1,5 @@
 <div id="information" class="anchor"></div>
-<a class="anchor-link ng-star-inserted" href="/about/instance#information">
+<a class="anchor-link" href="/about/instance#information">
   <h2 class="middle-title">インスタンス情報</h2>
 </a>
 <div class="block description">
diff --git a/resources/views/layout/component/about/about/instance.blade.php b/resources/views/layout/component/about/about/instance.blade.php
index e08fa6a..7a00371 100644
--- a/resources/views/layout/component/about/about/instance.blade.php
+++ b/resources/views/layout/component/about/about/instance.blade.php
@@ -1,26 +1,26 @@
-          <my-about-instance class="ng-star-inserted">
+          <my-about-instance>
             <div class="row">
               <div class="col-md-12 col-xl-6">
                 <div class="about-instance-title">
                   <h1 class="title">{{ $res['about']->instance->name }}について</h1>
-                  <a class="contact-admin ng-star-inserted" href="/about/contact">Contact us</a>
+                  <a class="contact-admin" href="/about/contact">Contact us</a>
                 </div>
-                <div class="instance-badges ng-star-inserted">
+                <div class="instance-badges">
                   @foreach ($res['about']->instance->categories as $cat)
-                    <span class="badge badge-primary category ng-star-inserted">{{ ptGetCatId($cat) }}</span>
+                    <span class="badge badge-primary category">{{ ptGetCatId($cat) }}</span>
                   @endforeach
                   @foreach ($res['about']->instance->languages as $lan)
-                    <span class="badge badge-secondary language ng-star-inserted">{{ $lan }}</span>
+                    <span class="badge badge-secondary language">{{ $lan }}</span>
                   @endforeach
                 </div>
                 <div class="short-description">
                   <div class="block short-description">{{ $res['about']->instance->shortDescription }}</div>
                 </div>
                 <div id="administrators-and-sustainability" class="anchor"></div>
-                <a class="anchor-link ng-star-inserted" href="/about/instance#administrators-and-sustainability">
+                <a class="anchor-link" href="/about/instance#administrators-and-sustainability">
                   <h2 class="middle-title">管理者とインスタンスの持続可能性</h2>
                 </a>
-                <div class="block administrator ng-star-inserted">
+                <div class="block administrator">
                   <div id="administrators" class="anchor"></div>
                   <a class="anchor-link" href="/about/instance#administrators">
                     <h3 class="section-title">運営者について</h3>
@@ -29,7 +29,7 @@
                     <?php echo nl2br($res['about']->instance->administrator); ?>
                   </div>
                 </div>
-                <div class="block creation-reason ng-star-inserted">
+                <div class="block creation-reason">
                   <div id="creation-reason" class="anchor"></div>
                   <a class="anchor-link" href="/about/instance#creation-reason">
                     <h3 class="section-title">なぜこのインスタンスを建てたのか</h3>
@@ -38,7 +38,7 @@
                     <?php echo nl2br($res['about']->instance->creationReason); ?>
                   </div>
                 </div>
-                <div class="block maintenance-lifetime ng-star-inserted">
+                <div class="block maintenance-lifetime">
                   <div id="maintenance-lifetime" class="anchor"></div>
                   <a class="anchor-link" href="/about/instance#maintenance-lifetime">
                     <h3 class="section-title">このインスタンスを運営者はどれぐらいの期間続ける予定か</h3>
@@ -47,7 +47,7 @@
                     <?php echo nl2br($res['about']->instance->maintenanceLifetime); ?>
                   </div>
                 </div>
-                <div class="block business-model ng-star-inserted">
+                <div class="block business-model">
                   <div id="business-model" class="anchor"></div>
                   <a class="anchor-link" href="/about/instance#business-model">
                     <h3 class="section-title">このインスタンスを維持するための資金をどうやって確保しているか</h3>
@@ -57,7 +57,7 @@
                   </div>
                 </div>
                 <div id="information" class="anchor"></div>
-                <a class="anchor-link ng-star-inserted" href="/about/instance#information">
+                <a class="anchor-link" href="/about/instance#information">
                   <h2 class="middle-title">インスタンス情報</h2>
                 </a>
                 <div class="block description">
@@ -74,10 +74,10 @@
                   </my-custom-markup-container>
                 </div>
                 <div id="moderation" class="anchor"></div>
-                <a class="anchor-link ng-star-inserted" href="/about/instance#moderation">
+                <a class="anchor-link" href="/about/instance#moderation">
                   <h2 class="middle-title">モデレーション</h2>
                 </a>
-                <div class="block moderation-information ng-star-inserted">
+                <div class="block moderation-information">
                   <div id="moderation-information" class="anchor"></div>
                   <a class="anchor-link" href="/about/instance#moderation-information">
                     <h3 class="section-title">モデレーションについて</h3>
@@ -86,7 +86,7 @@
                     <?php echo nl2br($res['about']->instance->moderationInformation); ?>
                   </div>
                 </div>
-                <div class="block code-of-conduct ng-star-inserted">
+                <div class="block code-of-conduct">
                   <div id="code-of-conduct" class="anchor"></div>
                   <a class="anchor-link" href="/about/instance#code-of-conduct">
                     <h3 class="section-title">行動規範</h3>
@@ -116,7 +116,7 @@
                   <h2 class="middle-title">統計</h2>
                 </a>
                 <my-instance-statistics>
-                  <section class="ng-star-inserted">
+                  <section>
                     <h3>ローカル</h3>
                     <div class="row">
                       <div class="col-6 col-lg-4 col-xl-3">
diff --git a/resources/views/layout/component/about/about/ippan.blade.php b/resources/views/layout/component/about/about/ippan.blade.php
index e7c2d19..34f2e9f 100644
--- a/resources/views/layout/component/about/about/ippan.blade.php
+++ b/resources/views/layout/component/about/about/ippan.blade.php
@@ -1,13 +1,13 @@
 <div class="about-instance-title">
   <h1 class="title">{{ $res['about']->instance->name }}について</h1>
-  <a class="contact-admin ng-star-inserted" href="/about/contact">打ち合わせ</a>
+  <a class="contact-admin" href="/about/contact">打ち合わせ</a>
 </div>
-<div class="instance-badges ng-star-inserted">
+<div class="instance-badges">
   @foreach ($res['about']->instance->categories as $cat)
-    <span class="badge badge-primary category ng-star-inserted">{{ ptGetCatId($cat) }}</span>
+    <span class="badge badge-primary category">{{ ptGetCatId($cat) }}</span>
   @endforeach
   @foreach ($res['about']->instance->languages as $lan)
-    <span class="badge badge-secondary language ng-star-inserted">{{ $lan }}</span>
+    <span class="badge badge-secondary language">{{ $lan }}</span>
   @endforeach
 </div>
 <div class="short-description">
diff --git a/resources/views/layout/component/about/about/mentelife.blade.php b/resources/views/layout/component/about/about/mentelife.blade.php
index e828f26..986af7d 100644
--- a/resources/views/layout/component/about/about/mentelife.blade.php
+++ b/resources/views/layout/component/about/about/mentelife.blade.php
@@ -1,4 +1,4 @@
-<div class="block maintenance-lifetime ng-star-inserted">
+<div class="block maintenance-lifetime">
   <div id="maintenance-lifetime" class="anchor"></div>
   <a class="anchor-link" href="/about/instance#maintenance-lifetime">
     <h3 class="section-title">このインスタンスを運営者はどれぐらいの期間続ける予定か</h3>
diff --git a/resources/views/layout/component/about/about/moderation.blade.php b/resources/views/layout/component/about/about/moderation.blade.php
index 397106e..bd87d55 100644
--- a/resources/views/layout/component/about/about/moderation.blade.php
+++ b/resources/views/layout/component/about/about/moderation.blade.php
@@ -1,8 +1,8 @@
 <div id="moderation" class="anchor"></div>
-<a class="anchor-link ng-star-inserted" href="/about/instance#moderation">
+<a class="anchor-link" href="/about/instance#moderation">
   <h2 class="middle-title">モデレーション</h2>
 </a>
-<div class="block moderation-information ng-star-inserted">
+<div class="block moderation-information">
   <div id="moderation-information" class="anchor"></div>
   <a class="anchor-link" href="/about/instance#moderation-information">
     <h3 class="section-title">モデレーションについて</h3>
diff --git a/resources/views/layout/component/about/about/other.blade.php b/resources/views/layout/component/about/about/other.blade.php
index 09846e3..f475388 100644
--- a/resources/views/layout/component/about/about/other.blade.php
+++ b/resources/views/layout/component/about/about/other.blade.php
@@ -1,5 +1,5 @@
 <div id="other-information" class="anchor"></div>
-<a class="anchor-link ng-star-inserted" href="/about/instance#other-information">
+<a class="anchor-link" href="/about/instance#other-information">
   <h2 class="middle-title">その他の情報</h2>
 </a>
 @include('layout.component.about.about.other.hardware')
diff --git a/resources/views/layout/component/about/about/other/hardware.blade.php b/resources/views/layout/component/about/about/other/hardware.blade.php
index 2d82120..89f9ed5 100644
--- a/resources/views/layout/component/about/about/other/hardware.blade.php
+++ b/resources/views/layout/component/about/about/other/hardware.blade.php
@@ -1,4 +1,4 @@
-<div class="block hardware-information ng-star-inserted">
+<div class="block hardware-information">
   <div id="hardware-information" class="anchor"></div>
   <a class="anchor-link" href="/about/instance#hardware-information">
     <h3 class="section-title">ハードウェアについて</h3>
diff --git a/resources/views/layout/component/about/features.blade.php b/resources/views/layout/component/about/features.blade.php
index 2ffe2b7..5a4330d 100644
--- a/resources/views/layout/component/about/features.blade.php
+++ b/resources/views/layout/component/about/features.blade.php
@@ -1,8 +1,8 @@
 
     <h2 class="sr-only">特徴</h2>
     <my-instance-features-table>
-      <div class="feature-table ng-star-inserted">
-        <table class="table ng-star-inserted" style="color: #fcfcfc;">
+      <div class="feature-table">
+        <table class="table" style="color: #fcfcfc;">
           <caption>このインスタンスの特徴</caption>
           <tr>
             <th scope="row" class="label">PeerTubeバージョン</th>
@@ -39,7 +39,7 @@
           <tr>
             <th scope="row" class="sub-label">動画のアップロード</th>
             <td>
-              <span class="ng-star-inserted">{{ $conf->autoBlacklist->videos->ofUsers->enabled ? '手動で管理者に確認する事が必要です。' : '自動的に投稿されます' }}</span>
+              <span>{{ $conf->autoBlacklist->videos->ofUsers->enabled ? '手動で管理者に確認する事が必要です。' : '自動的に投稿されます' }}</span>
             </td>
           </tr>
           <tr>
@@ -53,11 +53,11 @@
             <th scope="row" class="sub-label">ライブ配信</th>
             @include('layout.component.about.isfeature', ['check' => $conf->live->enabled])
           </tr>
-          <tr class="ng-star-inserted">
+          <tr>
             <th scope="row" class="sub-label">複数の解像度でのライブ配信のトランスコーディング</th>
             @include('layout.component.about.isfeature', ['check' => $conf->live->transcoding->enabled && count($conf->live->transcoding->enabledResolutions) > 1])
           </tr>
-          <tr class="ng-star-inserted">
+          <tr>
             <th scope="row" class="sub-label">同時ライブ配信の最大</th>
             <td>{{ $conf->live->maxUserLives }} ユーザー / {{ $conf->live->maxInstanceLives }} インスタンス </td>
           </tr>
@@ -93,7 +93,7 @@
             <th scope="row" class="sub-label">Available themes</th>
             <td>
               @foreach ($conf->theme->registered as $them)
-                <span class="theme ng-star-inserted"> {{ $them->name }} </span>
+                <span class="theme"> {{ $them->name }} </span>
               @endforeach
             </td>
           </tr>
@@ -101,7 +101,7 @@
             <th scope="row" class="sub-label">Plugins enabled</th>
             <td>
               @foreach ($conf->plugin->registered as $plug)
-                <span class="plugin ng-star-inserted"> {{ $plug->name }} </span>
+                <span class="plugin"> {{ $plug->name }} </span>
               @endforeach
             </td>
           </tr>
diff --git a/resources/views/layout/component/about/network.blade.php b/resources/views/layout/component/about/network.blade.php
index 491e425..52173c0 100644
--- a/resources/views/layout/component/about/network.blade.php
+++ b/resources/views/layout/component/about/network.blade.php
@@ -4,13 +4,13 @@
     <div class="col-xl-6 col-md-12">
       <h2 class="subtitle">フォロワーのインスタンス({{ $res['follower']->total }})</h2>
       @foreach ($res['follower']->data as $x)
-        <a target="_blank" rel="noopener noreferrer" href="https://{{ $x->follower->host }}" class="ng-star-inserted"> {{ $x->follower->host }} </a>
+        <a target="_blank" rel="noopener noreferrer" href="https://{{ $x->follower->host }}"> {{ $x->follower->host }} </a>
       @endforeach
     </div>
     <div class="col-xl-6 col-md-12">
       <h2 class="subtitle">フォローしてるインスタンス({{ $res['following']->total }})</h2>
       @foreach ($res['following']->data as $y)
-        <a target="_blank" rel="noopener noreferrer" href="https://{{ $y->following->host }}" class="ng-star-inserted"> {{ $y->following->host }} </a>
+        <a target="_blank" rel="noopener noreferrer" href="https://{{ $y->following->host }}"> {{ $y->following->host }} </a>
       @endforeach
     </div>
   </div>
diff --git a/resources/views/layout/component/about/statistics.blade.php b/resources/views/layout/component/about/statistics.blade.php
index b2b416d..c04af94 100644
--- a/resources/views/layout/component/about/statistics.blade.php
+++ b/resources/views/layout/component/about/statistics.blade.php
@@ -2,7 +2,7 @@
 <a class="anchor-link" href="/about/instance#statistics">
   <h2 class="middle-title">統計</h2>
 </a>
-<section class="ng-star-inserted">
+<section>
   <h3>ローカル</h3>
   <div class="row">
     @include('layout.component.about.statcard', ['value' => $res['stats']->totalUsers, 'label' => 'ユーザー'])
diff --git a/resources/views/layout/component/c/head.blade.php b/resources/views/layout/component/c/head.blade.php
index 7c74b3f..a0bfdae 100644
--- a/resources/views/layout/component/c/head.blade.php
+++ b/resources/views/layout/component/c/head.blade.php
@@ -1,5 +1,5 @@
 <div class="main-row">
-  <div class="root ng-star-inserted">
+  <div class="root">
     @include('layout.component.c.head.banner')
     @include('layout.component.c.head.info')
     @include('layout.component.c.head.owner', ['class' => 'bottom-owner'])
diff --git a/resources/views/layout/component/c/head/banner.blade.php b/resources/views/layout/component/c/head/banner.blade.php
index 9963fba..4b61f83 100644
--- a/resources/views/layout/component/c/head/banner.blade.php
+++ b/resources/views/layout/component/c/head/banner.blade.php
@@ -1,5 +1,5 @@
 @if (!is_null($res['channel']->banner))
-  <div class="banner ng-star-inserted">
+  <div class="banner">
     <img alt="Channel banner" src="{{ env('PEER_URI') }}{{ $res['channel']->banner->path }}">
   </div>
 @endif
diff --git a/resources/views/layout/component/c/head/info.blade.php b/resources/views/layout/component/c/head/info.blade.php
index 68d52e0..bb4b967 100644
--- a/resources/views/layout/component/c/head/info.blade.php
+++ b/resources/views/layout/component/c/head/info.blade.php
@@ -1,7 +1,7 @@
 <div class="channel-info">
   <div class="channel-avatar-row">
     <my-actor-avatar class="main-avatar">
-      <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($res['channel']) }}" alt="チャンネルのアバター">
+      <img class="avatar channel" src="{{ ptAvatar($res['channel']) }}" alt="チャンネルのアバター">
     </my-actor-avatar>
     <div>
       <div class="section-label">動画チャンネル</div>
@@ -15,12 +15,12 @@
           </div>
           <div class="actor-counters">
             <span>{{ $res['channel']->followersCount }}人登録者</span>
-            <span class="videos-count ng-star-inserted"> {{ $res['video']->total }}枚動画 </span>
+            <span class="videos-count"> {{ $res['video']->total }}枚動画 </span>
           </div>
         </div>
         <div class="channel-buttons right">
           @include('layout.component.common.subscribe')
-          <button class="support-button peertube-button orange-button-inverted ng-star-inserted">
+          <button class="support-button peertube-button orange-button-inverted">
             <my-global-icon iconname="support" aria-hidden="true">
               <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 947.70386 999.3125" width="947.70386" height="999.3125">
                 <g transform="translate(2.669496,27.625894)">
diff --git a/resources/views/layout/component/c/head/owner.blade.php b/resources/views/layout/component/c/head/owner.blade.php
index 4496951..0ca864c 100644
--- a/resources/views/layout/component/c/head/owner.blade.php
+++ b/resources/views/layout/component/c/head/owner.blade.php
@@ -1,10 +1,10 @@
 <div class="{{ $class }}">
-  <div class="owner-block ng-star-inserted">
-    <div class="section-label">OWNER ACCOUNT</div>
+  <div class="owner-block">
+    <div class="section-label">主</div>
     <div class="avatar-row">
       <my-actor-avatar class="account-avatar">
-        <a title="{{ ptFullHandle($res['channel']->ownerAccount) }} (アカウントページへ) " href="/a/{{ ptFullHandle($res['channel']->ownerAccount) }}" class="ng-star-inserted">
-          <img class="account avatar ng-star-inserted" src="{{ ptAvatar($res['channel']->ownerAccount) }}" alt="アカウントのアバター">
+        <a title="{{ ptFullHandle($res['channel']->ownerAccount) }} (アカウントページへ) " href="/a/{{ ptFullHandle($res['channel']->ownerAccount) }}">
+          <img class="account avatar" src="{{ ptAvatar($res['channel']->ownerAccount) }}" alt="アカウントのアバター">
         </a>
       </my-actor-avatar>
       <div class="actor-info">
diff --git a/resources/views/layout/component/c/links.blade.php b/resources/views/layout/component/c/links.blade.php
index d22704c..f7f57a1 100644
--- a/resources/views/layout/component/c/links.blade.php
+++ b/resources/views/layout/component/c/links.blade.php
@@ -1,11 +1,11 @@
 <div class="links">
   <my-list-overflow>
     <div class="d-flex align-items-center text-nowrap w-100 list-overflow-parent">
-      <span id="pe_0" class="ng-star-inserted" style="visibility: inherit;">
-        <a class="title-page ng-star-inserted{{ $res['cat'] == 'videos' ? ' active' : '' }}" href="/c/{{ ptFullHandle($res['channel']) }}/videos">動画</a>
+      <span id="pe_0" style="visibility: inherit;">
+        <a class="title-page{{ $res['cat'] == 'videos' ? ' active' : '' }}" href="/c/{{ ptFullHandle($res['channel']) }}/videos">動画</a>
       </span>
-      <span id="pe_1" class="ng-star-inserted" style="visibility: inherit;">
-        <a class="title-page ng-star-inserted{{ $res['cat'] == 'video-playlists' ? ' active' : '' }}" href="/c/{{ ptFullHandle($res['channel']) }}/video-playlists">プレイリスト</a>
+      <span id="pe_1" style="visibility: inherit;">
+        <a class="title-page{{ $res['cat'] == 'video-playlists' ? ' active' : '' }}" href="/c/{{ ptFullHandle($res['channel']) }}/video-playlists">プレイリスト</a>
       </span>
     </div>
   </my-list-overflow>
diff --git a/resources/views/layout/component/c/playlists.blade.php b/resources/views/layout/component/c/playlists.blade.php
index e92e292..cbe570d 100644
--- a/resources/views/layout/component/c/playlists.blade.php
+++ b/resources/views/layout/component/c/playlists.blade.php
@@ -1,22 +1,22 @@
 <div class="margin-content">
-  <div class="title-page title-page-single ng-star-inserted"> 再生リスト数：{{ $res['video']->total }} </div>
+  <div class="title-page title-page-single"> 再生リスト数：{{ $res['video']->total }} </div>
   <div class="playlists">
     @foreach ($res['video']->data as $v)
-      <div class="playlist-wrapper ng-star-inserted">
+      <div class="playlist-wrapper">
         <my-video-playlist-miniature>
           <div class="miniature">
             <my-link class="miniature-thumbnail">
-              <a tabindex="0" href="/w/p/{{ $v->shortUUID }}" class="ng-star-inserted">
-                <img alt="" aria-labelledby="{{ $v->displayName }}" src="{{ !is_null($v->thumbnailPath) ? env('PEER_URI').$v->thumbnailPath : '/img/noicon.jpg' }}" class="ng-star-inserted" />
-                <div class="miniature-playlist-info-overlay ng-star-inserted">動画数：{{ $v->videosLength }} </div>
-                <div class="play-overlay ng-star-inserted">
+              <a tabindex="0" href="/w/p/{{ $v->shortUUID }}">
+                <img alt="" aria-labelledby="{{ $v->displayName }}" src="{{ !is_null($v->thumbnailPath) ? env('PEER_URI').$v->thumbnailPath : '/img/noicon.jpg' }}" />
+                <div class="miniature-playlist-info-overlay">動画数：{{ $v->videosLength }} </div>
+                <div class="play-overlay">
                   <div class="icon"></div>
                 </div>
               </a>
             </my-link>
             <div class="miniature-info">
               <my-link tabindex="-1" class="miniature-name">
-                <a tabindex="-1" href="/w/p/ocDHV9wrgt4BhWZ3STJrfg" class="ng-star-inserted"> {{ $v->displayName }} </a>
+                <a tabindex="-1" href="/w/p/{{ $v->shortUUID }}"> {{ $v->displayName }} </a>
               </my-link>
               <div class="privacy-date">
                 <span class="updated-at">最新更新： {{ date('Y年m月d日', strtotime($v->updatedAt)) }}</span>
diff --git a/resources/views/layout/component/c/videos.blade.php b/resources/views/layout/component/c/videos.blade.php
index 18fcd08..d17531a 100644
--- a/resources/views/layout/component/c/videos.blade.php
+++ b/resources/views/layout/component/c/videos.blade.php
@@ -1,27 +1,22 @@
-<my-video-channel-videos class="ng-star-inserted" style="">
-  <my-videos-list class="ng-star-inserted">
-    <div class="margin-content">
-      <div class="videos-header">
-        <div class="title-subscription no-title ng-star-inserted">
-          Subscribe to RSS feed "動画"
-          <my-feed>
-            <div class="feed">
-              <my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication ng-star-inserted">
-                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
+<div class="margin-content">
+  <div class="videos-header">
+    <div class="title-subscription no-title">
+      Subscribe to RSS feed "動画"
+      <my-feed>
+        <div class="feed">
+          <my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication">
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
               </my-global-icon>
-            </div>
-          </my-feed>
         </div>
-        <div class="action-block"></div>
-      </div>
-      <div class="videos">
-        @foreach ($res['video']->data as $v)
-          @include('layout.component.common.videominature')
-        @endforeach
-      </div>
-      @include('layout.component.common.paginate', [
-        'root' => '/c/'.ptFullHandle($res['channel']).'/'.$res['cat']
-      ])
+      </my-feed>
     </div>
-  </my-videos-list>
-</my-video-channel-videos>
+  </div>
+  <div class="videos">
+    @foreach ($res['video']->data as $v)
+      @include('layout.component.common.videominature')
+    @endforeach
+  </div>
+  @include('layout.component.common.paginate', [
+    'root' => '/c/'.ptFullHandle($res['channel']).'/'.$res['cat']
+  ])
+</div>
diff --git a/resources/views/layout/component/common/subscribe.blade.php b/resources/views/layout/component/common/subscribe.blade.php
index c0e805d..3a149fa 100644
--- a/resources/views/layout/component/common/subscribe.blade.php
+++ b/resources/views/layout/component/common/subscribe.blade.php
@@ -1,7 +1,7 @@
 <my-subscribe-button size="small">
   <div class="btn-group-subscribe btn subscribe-button">
-    <button type="button" role="button" class="btn btn-sm ng-star-inserted">登録</button>
-    <button type="button" role="button" class="btn btn-sm ng-star-inserted">リモート登録</button>
-    <button type="button" role="button" class="btn btn-sm ng-star-inserted">RSSで登録</button>
+    <button type="button" role="button" class="btn btn-sm">登録</button>
+    <button type="button" role="button" class="btn btn-sm">リモート登録</button>
+    <button type="button" role="button" class="btn btn-sm">RSSで登録</button>
   </div>
-</my-subscribe-button>
\ No newline at end of file
+</my-subscribe-button>
diff --git a/resources/views/layout/component/common/videominature.blade.php b/resources/views/layout/component/common/videominature.blade.php
index 03fbfe4..176259b 100644
--- a/resources/views/layout/component/common/videominature.blade.php
+++ b/resources/views/layout/component/common/videominature.blade.php
@@ -1,25 +1,15 @@
-<div class="video-wrapper ng-star-inserted">
+<div class="{{ $res['page'] == 'search' ? 'entry video' : 'video-wrapper' }}">
   <my-video-miniature>
-    <div class="video-miniature">
+    <div class="video-miniature{{ $res['page'] == 'search' ? ' display-as-row' : '' }}">
       <my-video-thumbnail>
-        <a class="video-thumbnail ng-star-inserted" href="/w/{{ $v->shortUUID }}">
-          <img alt="" aria-label="{{ $v->name }}" src="{{ env('PEER_URI') }}{{ $v->thumbnailPath }}" class="ng-star-inserted">
-          <div class="video-thumbnail-actions-overlay ng-star-inserted">
-            <div placement="left" container="body" class="video-thumbnail-watch-later-overlay ng-star-inserted">
-              <my-global-icon iconname="clock" role="button" aria-label="「後で見る」に追加する">
-                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-clock"><circle cx="12" cy="12" r="10"></circle><polyline points="12 6 12 12 16 14"></polyline></svg>
-              </my-global-icon>
-            </div>
-          </div>
-          <div class="video-thumbnail-label-overlay warning ng-star-inserted"></div>
-          <div class="video-thumbnail-label-overlay danger ng-star-inserted"></div>
-          <div class="video-thumbnail-duration-overlay ng-star-inserted">{{ ptDuration($v->duration) }}</div>
-          <div class="play-overlay ng-star-inserted">
+        <a class="video-thumbnail" href="/w/{{ $v->shortUUID }}">
+          <img alt="" aria-label="{{ $v->name }}" src="{{ env('PEER_URI') }}{{ $v->thumbnailPath }}">
+          <div class="video-thumbnail-label-overlay warning"></div>
+          <div class="video-thumbnail-label-overlay danger"></div>
+          <div class="video-thumbnail-duration-overlay">{{ ptDuration($v->duration) }}</div>
+          <div class="play-overlay">
             <div class="icon"></div>
           </div>
-          <div class="progress-bar ng-star-inserted">
-            <div style="width: 100%;"></div>
-          </div>
         </a>
       </my-video-thumbnail>
       <div class="video-bottom">
@@ -27,26 +17,24 @@
           <div class="d-flex video-miniature-meta">
             <div class="w-100 d-flex flex-column">
               <my-link tabindex="-1" class="video-miniature-name" style="max-height: 3em;">
-                <a tabindex="-1" title="{{ $v->name }}" href="/w/{{ $v->shortUUID }}" class="ng-star-inserted"> {{ $v->name }} </a>
+                <a tabindex="-1" title="{{ $v->name }}" href="/w/{{ $v->shortUUID }}"> {{ $v->name }} </a>
               </my-link>
               <span class="video-miniature-created-at-views">
-                <my-date-toggle class="ng-star-inserted">
-                  <span class="date-toggle" title="{{ date('Y/m/d', strtotime($v->createdAt)) }}"> {{ date('Y年m月d日 H:i:s T', strtotime($v->createdAt)) }} </span>
+                <my-date-toggle>
+                  <span class="date-toggle" title="{{ date('Y/m/d', strtotime($v->publishedAt)) }}"> {{ date('Y年m月d日 H:i:s T', strtotime($v->publishedAt)) }} </span>
                 </my-date-toggle>
                 <span class="views" title=""> • 
-                  <my-video-views-counter class="ng-star-inserted">
+                  <my-video-views-counter>
                     <span title=""> {{ $v->views }} 回視聴 </span>
                   </my-video-views-counter>
                 </span>
               </span>
               @if ($res['page'] != 'channel')
-                <a tabindex="-1" class="video-miniature-channel ng-star-inserted" href="/c/{{ ptFullHandle($v->channel) }}"> {{ $v->channel->displayName }} </a>
+                <a tabindex="-1" class="video-miniature-channel" href="/c/{{ ptFullHandle($v->channel) }}"> {{ $v->channel->displayName }} </a>
               @endif
-              <div class="video-info-privacy"></div>
             </div>
           </div>
         </div>
-        <div class="video-actions"></div>
       </div>
     </div>
   </my-video-miniature>
diff --git a/resources/views/layout/component/common/videosbydate.blade.php b/resources/views/layout/component/common/videosbydate.blade.php
index 5d7407a..53f925c 100644
--- a/resources/views/layout/component/common/videosbydate.blade.php
+++ b/resources/views/layout/component/common/videosbydate.blade.php
@@ -1,41 +1,41 @@
 <div class="videos">
   @if (!empty($res['video']['today']))
-    <h2 class="date-title ng-star-inserted"> 今日 </h2>
+    <h2 class="date-title"> 今日 </h2>
     @foreach ($res['video']['today'] as $v)
       @include('layout.component.common.videominature')
     @endforeach
   @endif
 
   @if (!empty($res['video']['yesterday']))
-    <h2 class="date-title ng-star-inserted"> 今日 </h2>
-    @foreach ($res['video']['today'] as $v)
+    <h2 class="date-title"> 昨日 </h2>
+    @foreach ($res['video']['yesterday'] as $v)
       @include('layout.component.common.videominature')
     @endforeach
   @endif
 
   @if (!empty($res['video']['week']))
-    <h2 class="date-title ng-star-inserted"> 今週 </h2>
+    <h2 class="date-title"> 今週 </h2>
     @foreach ($res['video']['week'] as $v)
       @include('layout.component.common.videominature')
     @endforeach
   @endif
 
   @if (!empty($res['video']['month']))
-    <h2 class="date-title ng-star-inserted"> 今月 </h2>
+    <h2 class="date-title"> 今月 </h2>
     @foreach ($res['video']['month'] as $v)
       @include('layout.component.common.videominature')
     @endforeach
   @endif
 
   @if (!empty($res['video']['lastmonth']))
-    <h2 class="date-title ng-star-inserted"> 先月 </h2>
+    <h2 class="date-title"> 先月 </h2>
     @foreach ($res['video']['lastmonth'] as $v)
       @include('layout.component.common.videominature')
     @endforeach
   @endif
 
   @if (!empty($res['video']['moreearly']))
-    <h2 class="date-title ng-star-inserted"> もっと前 </h2>
+    <h2 class="date-title"> もっと前 </h2>
     @foreach ($res['video']['moreearly'] as $v)
       @include('layout.component.common.videominature')
     @endforeach
diff --git a/resources/views/layout/component/header.blade.php b/resources/views/layout/component/header.blade.php
index fb8c273..41e5989 100644
--- a/resources/views/layout/component/header.blade.php
+++ b/resources/views/layout/component/header.blade.php
@@ -17,40 +17,13 @@
     <my-header class="w-100 d-flex justify-content-end">
       <my-search-typeahead class="w-100 d-flex justify-content-end">
         <div id="typeahead-container" class="d-inline-flex position-relative">
-          <input type="text" id="search-video" name="search-video" placeholder="動画、プレイリスト、チャンネルを検索する…" aria-label="Search" autocomplete="off" class="ng-untouched ng-pristine ng-valid">
-          <my-global-icon title="検索" role="button" iconname="search" class="icon icon-search">
-            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-search"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg>
-          </my-global-icon>
-          <!--div class="position-absolute jump-to-suggestions">
-            <ul role="listbox" class="p-0 m-0" hidden="">
-            </ul>
-            <div id="typeahead-instructions" class="overflow-hidden ng-star-inserted">
-              <span class="text-muted">Your query will be matched against video names or descriptions, channel names.</span>
-              <div class="d-flex justify-content-between mt-3">
-                <label class="small-title">高度な検索</label>
-                <div class="advanced-search-status c-help">
-                  <span title="Determines whether you can resolve any distant content, or if this instance only allows doing so for instances it follows." class="text-success">
-                    <span class="mr-1 ng-star-inserted">any instance</span>
-                    <i class="glyphicon glyphicon-ok-sign"></i>
-                  </span>
-                </div>
-              </div>
-              <ul>
-                <li>
-                  <em>@channel_id@domain</em>
-                  <span class="flex-auto text-muted">検索にマッチしたチャンネルを表示します</span>
-                </li>
-                <li>
-                  <em>URL</em>
-                  <span class="text-muted">検索にマッチしたチャンネルを表示します</span>
-                </li>
-                <li>
-                  <em>UUID</em>
-                  <span class="text-muted">検索にマッチした動画を表示します</span>
-                </li>
-              </ul>
-            </div>
-          </div-->
+          <form style="margin-bottom: 0;" action="/search" method="post">
+            @csrf
+            <input type="text" id="search-video" name="search" placeholder="動画、プレイリスト、チャンネルを検索する…" aria-label="Search" autocomplete="off" class="ng-untouched ng-pristine ng-valid" />
+            <my-global-icoin title="検索" role="button" iconname="search" class="icon icon-search">
+              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-search"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg>
+            </my-global-icon>
+          </form>
         </div>
       </my-search-typeahead>
       <a class="publish-button" href="/videos/upload">
diff --git a/resources/views/layout/component/home/newest.blade.php b/resources/views/layout/component/home/newest.blade.php
index ae23937..015e5c0 100644
--- a/resources/views/layout/component/home/newest.blade.php
+++ b/resources/views/layout/component/home/newest.blade.php
@@ -1,4 +1,4 @@
-<div class="section channel videos ng-star-inserted">
+<div class="section channel videos">
   <div class="section-title">
     <h2 class="section-title">最新投稿された動画</h2>
   </div>
diff --git a/resources/views/layout/component/home/popularest.blade.php b/resources/views/layout/component/home/popularest.blade.php
index 00c8311..6791d82 100644
--- a/resources/views/layout/component/home/popularest.blade.php
+++ b/resources/views/layout/component/home/popularest.blade.php
@@ -1,4 +1,4 @@
-<div class="section channel videos ng-star-inserted">
+<div class="section channel videos">
   <div class="section-title">
     <h2 class="section-title">人気な動画</h2>
   </div>
diff --git a/resources/views/layout/component/menu.blade.php b/resources/views/layout/component/menu.blade.php
index cf253c1..fb3592b 100644
--- a/resources/views/layout/component/menu.blade.php
+++ b/resources/views/layout/component/menu.blade.php
@@ -1,6 +1,6 @@
-<my-menu class="ng-star-inserted">
+<my-menu>
   <div class="menu-wrapper">
-    <menu class="is-logged-in">
+    <menu>
       @include('layout.component.menu.top')
       @include('layout.component.menu.footer')
     </menu>
diff --git a/resources/views/layout/component/menu/top/inmylibrary.blade.php b/resources/views/layout/component/menu/top/inmylibrary.blade.php
index 3c46348..b425b2f 100644
--- a/resources/views/layout/component/menu/top/inmylibrary.blade.php
+++ b/resources/views/layout/component/menu/top/inmylibrary.blade.php
@@ -1,26 +1,26 @@
-<div class="in-my-library menu-block ng-star-inserted">
+<div class="in-my-library menu-block">
   <div class="block-title">
     In my library
   </div>
-  <a class="menu-link ng-star-inserted" href="/my-library/videos">
+  <a class="menu-link" href="/my-library/videos">
     <my-global-icon aria-hidden="true">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="material" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"></path><path d="M4 6H2v14c0 1.1.9 2 2 2h14v-2H4V6zm16-4H8c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-8 12.5v-9l6 4.5-6 4.5z"></path></svg>
     </my-global-icon>
     動画
   </a>
-  <a class="menu-link ng-star-inserted" href="/my-library/video-playlists">
+  <a class="menu-link" href="/my-library/video-playlists">
     <my-global-icon aria-hidden="true">
       <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-list"><line x1="8" y1="6" x2="21" y2="6"></line><line x1="8" y1="12" x2="21" y2="12"></line><line x1="8" y1="18" x2="21" y2="18"></line><line x1="3" y1="6" x2="3.01" y2="6"></line><line x1="3" y1="12" x2="3.01" y2="12"></line><line x1="3" y1="18" x2="3.01" y2="18"></line></svg>
     </my-global-icon>
     再生リスト
   </a>
-  <a class="menu-link ng-star-inserted" href="/videos/subscriptions">
+  <a class="menu-link" href="/videos/subscriptions">
     <my-global-icon aria-hidden="true">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="material" width="24px" height="24px"><path d="M20 8H4V6h16v2zm-2-6H6v2h12V2zm4 10v8c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2v-8c0-1.1.9-2 2-2h16c1.1 0 2 .9 2 2zm-6 4l-6-3.27v6.53L16 16z"></path><path d="M0 0h24v24H0z" fill="none"></path></svg>
     </my-global-icon>
     登録チャンネル
   </a>
-  <a class="menu-link ng-star-inserted" href="/my-library/history/videos">
+  <a class="menu-link" href="/my-library/history/videos">
     <my-global-icon aria-hidden="true">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="material" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"></path><path d="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89.07.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13 21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54.72-1.21-3.5-2.08V8H12z"></path></svg>
     </my-global-icon>
diff --git a/resources/views/layout/component/menu/top/loggedin.blade.php b/resources/views/layout/component/menu/top/loggedin.blade.php
index dd6ecbf..0a2405a 100644
--- a/resources/views/layout/component/menu/top/loggedin.blade.php
+++ b/resources/views/layout/component/menu/top/loggedin.blade.php
@@ -1,10 +1,10 @@
-<div class="logged-in-block ng-star-inserted">
+<div class="logged-in-block">
   <div>
     <div placement="bottom-left auto" autoclose="outside" class="logged-in-more dropdown">
       <a href="/a/{{ ptFullHandle($res['userinfo']['me']->account) }}">
         <div class="dropdown-toggle" aria-expanded="false">
           <my-actor-avatar size="34">
-            <img class="account avatar avatar-34 ng-star-inserted" src="{{ ptAvatar($res['userinfo']['me']->account) }}" alt="アカウントのアバター">
+            <img class="account avatar avatar-34" src="{{ ptAvatar($res['userinfo']['me']->account) }}" alt="アカウントのアバター">
           </my-actor-avatar>
           <div class="logged-in-info">
             <div class="logged-in-display-name">{{ $res['userinfo']['me']->account->displayName }}</div>
@@ -29,7 +29,7 @@
       自分のライブラリ
     </a>
     @if (!is_null($res['userinfo']) && (isset($res['userinfo']['me']) && !is_null($res['userinfo']['me']) && $res['userinfo']['me']->adminFlags == 1))
-      <a class="menu-link ng-star-inserted" href="/admin/users">
+      <a class="menu-link" href="/admin/users">
         <my-global-icon iconname="cog" aria-hidden="true">
           <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-settings"><circle cx="12" cy="12" r="3"></circle><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"></path></svg>
         </my-global-icon>
@@ -37,7 +37,7 @@
       </a>
     @endif
     @if (!is_null($res['userinfo']) && (isset($res['userinfo']['me']) && !is_null($res['userinfo']['me'])))
-      <a class="menu-link ng-star-inserted" href="/logout">
+      <a class="menu-link" href="/logout">
         <my-global-icon iconname="cog" aria-hidden="true">
           <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-log-out"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path><polyline points="16 17 21 12 16 7"></polyline><line x1="21" y1="12" x2="9" y2="12"></line></svg>
         </my-global-icon>
diff --git a/resources/views/layout/component/menu/top/loginmenu.blade.php b/resources/views/layout/component/menu/top/loginmenu.blade.php
index 266bc92..411006d 100644
--- a/resources/views/layout/component/menu/top/loginmenu.blade.php
+++ b/resources/views/layout/component/menu/top/loginmenu.blade.php
@@ -1,4 +1,4 @@
-<div class="login-buttons-block ng-star-inserted">
+<div class="login-buttons-block">
   <a class="peertube-button-link orange-button" href="/login">ログイン</a>
-  <a class="peertube-button-link create-account-button ng-star-inserted" href="/signup">登録</a>
+  <a class="peertube-button-link create-account-button" href="/signup">登録</a>
 </div>
diff --git a/resources/views/layout/component/menu/top/notification.blade.php b/resources/views/layout/component/menu/top/notification.blade.php
index 9dc9838..964281f 100644
--- a/resources/views/layout/component/menu/top/notification.blade.php
+++ b/resources/views/layout/component/menu/top/notification.blade.php
@@ -1,7 +1,7 @@
 <my-notification>
   <div autoclose="outside" placement="bottom" container="{this}" popoverclass="popover-notifications" title="通知を表示" class="notification-inbox-popover">
     <a href="/my-account/notifications" style="color: var(--menuForegroundColor);">
-      @if ($res['userinfo']['notify']->total > 0) <div class="unread-notifications ng-star-inserted">{{ $res['userinfo']['notify']->total }}</div> @endif
+      @if ($res['userinfo']['notify']->total > 0) <div class="unread-notifications">{{ $res['userinfo']['notify']->total }}</div> @endif
       <my-global-icon iconname="bell">
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-bell"><path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"></path><path d="M13.73 21a2 2 0 0 1-3.46 0"></path></svg>
       </my-global-icon>
diff --git a/resources/views/layout/component/menu/top/oninstance.blade.php b/resources/views/layout/component/menu/top/oninstance.blade.php
index d6f2940..8875f57 100644
--- a/resources/views/layout/component/menu/top/oninstance.blade.php
+++ b/resources/views/layout/component/menu/top/oninstance.blade.php
@@ -1,30 +1,30 @@
-<div class="on-instance menu-block ng-star-inserted">
+<div class="on-instance menu-block">
   <div class="block-title">ON 076動画</div>
-  <a class="menu-link ng-star-inserted" href="/home">
+  <a class="menu-link" href="/home">
     <my-global-icon aria-hidden="true">
       <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-home"><path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"></path><polyline points="9 22 9 12 15 12 15 22"></polyline></svg>
     </my-global-icon>
     ホーム
   </a>
-  <a class="menu-link ng-star-inserted" href="/videos/overview">
+  <a class="menu-link" href="/videos/overview">
     <my-global-icon aria-hidden="true">
       <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-globe"><circle cx="12" cy="12" r="10"></circle><line x1="2" y1="12" x2="22" y2="12"></line><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"></path></svg>
     </my-global-icon>
     ディスカバー
   </a>
-  <a class="menu-link ng-star-inserted" href="/videos/trending">
+  <a class="menu-link" href="/videos/trending">
     <my-global-icon aria-hidden="true">
       <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-trending-up"><polyline points="23 6 13.5 15.5 8.5 10.5 1 18"></polyline><polyline points="17 6 23 6 23 12"></polyline></svg>
     </my-global-icon>
     トレンド
   </a>
-  <a class="menu-link ng-star-inserted" href="/videos/recently-added">
+  <a class="menu-link" href="/videos/recently-added">
     <my-global-icon aria-hidden="true">
       <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="16"></line><line x1="8" y1="12" x2="16" y2="12"></line></svg>
     </my-global-icon>
     最近投稿された動画
   </a>
-  <a class="menu-link ng-star-inserted" href="/videos/local">
+  <a class="menu-link" href="/videos/local">
     <my-global-icon aria-hidden="true">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8.4666667 8.4666667" x="0px" y="0px" class="misc"><path fill="currentColor" d="m 4.2330754,3.0330699e-4 c -1.9062912,0 -3.45664101,1.55086299301 -3.45663572,3.45715399301 0,1.041342 0.84545222,2.220339 1.65622812,3.201355 0.8107786,0.981014 1.6190225,1.736328 1.6190225,1.736328 a 0.26460984,0.26460984 0 0 0 0.3612197,0 c 0,0 0.8082439,-0.755314 1.6190224,-1.736328 0.810776,-0.981016 1.6582946,-2.160013 1.6582946,-3.201355 0,-1.906291 -1.5508605,-3.45715399301 -3.4571516,-3.45715399301 z m 0,0.52968500301 c 1.6203083,0 2.9279876,1.30716399 2.9279849,2.92746899 0,0.721961 -0.7497154,1.914917 -1.5353056,2.865459 -0.6952271,0.8412 -1.2416102,1.3482 -1.3926793,1.491898 C 4.0825513,7.6716453 3.5360226,7.1646033 2.840396,6.3229163 2.0548058,5.3723743 1.3035373,4.1794183 1.3035373,3.4574573 1.3035347,1.8371523 2.6127671,0.52998831 4.2330754,0.52998831 Z m 0.00878,0.91518899 a 0.26460979,0.26460979 0 0 0 -0.026355,5.16e-4 0.26460979,0.26460979 0 0 0 -0.1405599,0.05116 L 2.444037,2.6998813 a 0.26474432,0.26474432 0 1 0 0.3147086,0.425813 l 0.056327,-0.04134 v 1.224733 a 0.26460979,0.26460979 0 0 0 0.2640673,0.265615 h 2.30632 a 0.26460979,0.26460979 0 0 0 0.2656152,-0.265615 v -1.223698 l 0.054777,0.04031 A 0.2647471,0.2647471 0 1 0 6.0205633,2.6998813 L 5.5513406,2.3536473 a 0.26460979,0.26460979 0 0 0 -0.00775,-0.0057 L 4.3896558,1.4968523 a 0.26460979,0.26460979 0 0 0 -0.1477963,-0.05168 z m -0.00878,0.594278 0.8888333,0.655775 v 0.217556 1.132747 H 4.4971428 v -0.437697 a 0.26460984,0.26460984 0 0 0 -0.2676843,-0.267684 0.26460984,0.26460984 0 0 0 -0.262001,0.267684 v 0.437697 H 3.344758 v -1.132747 -0.219107 z"></path></svg>
     </my-global-icon>
diff --git a/resources/views/layout/component/my-account/filter.blade.php b/resources/views/layout/component/my-account/filter.blade.php
index 1a1b19a..63d4d97 100644
--- a/resources/views/layout/component/my-account/filter.blade.php
+++ b/resources/views/layout/component/my-account/filter.blade.php
@@ -15,10 +15,10 @@
   <form class="btn ml-auto" action="/my-account/notifications/readAll" method="post">
     @csrf
     <button{{ $res['userinfo']['notify']->total == 0 ? ' disabled' : '' }}>
-      <my-global-icon iconname="tick" aria-hidden="true" class="ng-star-inserted">
+      <my-global-icon iconname="tick" aria-hidden="true">
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check"><polyline points="20 6 9 17 4 12"></polyline></svg>
       </my-global-icon>
-      <span class="ng-star-inserted">全てを既読にする</span>
+      <span>全てを既読にする</span>
     </button>
   </form>
 </div>
diff --git a/resources/views/layout/component/my-account/menu.blade.php b/resources/views/layout/component/my-account/menu.blade.php
index 900d8bf..e6f2e69 100644
--- a/resources/views/layout/component/my-account/menu.blade.php
+++ b/resources/views/layout/component/my-account/menu.blade.php
@@ -12,7 +12,7 @@
 <my-top-menu-dropdown>
   <div class="sub-menu sub-menu-fixed">
     @foreach ($menu as $k => $v)
-      <a class="title-page title-page-settings ng-star-inserted{{ $active == $k ? ' active' : '' }}" href="/my-account/{{ $k }}">{{ $v }}</a>
+      <a class="title-page title-page-settings{{ $active == $k ? ' active' : '' }}" href="/my-account/{{ $k }}">{{ $v }}</a>
     @endforeach
   </div>
 </my-top-menu-dropdown>
diff --git a/resources/views/layout/component/my-account/notifications.blade.php b/resources/views/layout/component/my-account/notifications.blade.php
index 61518ed..cba8d5f 100644
--- a/resources/views/layout/component/my-account/notifications.blade.php
+++ b/resources/views/layout/component/my-account/notifications.blade.php
@@ -1,7 +1,7 @@
 <my-user-notifications>
   <div class="notifications">
     @foreach ($res['notification']->data as $n)
-      <div class="notification{{ !$n->read ? ' unread' : '' }} ng-star-inserted">
+      <div class="notification{{ !$n->read ? ' unread' : '' }}">
         @if (isset($n->comment))
           @include('layout.component.my-account.notifications.comment')
         @elseif (isset($n->account))
@@ -23,7 +23,7 @@
           @csrf
           <input type="hidden" name="id" value="{{ $n->id }}" />
           <button style="background-color: var(--mainHoverColor); color: var(--whiteColor);" class="btn ml-auto"{{ $n->read ? ' disabled' : '' }}>
-            <span class="ng-star-inserted">既読</span>
+            <span>既読</span>
           </button>
         </form>
         <div class="from-date" title="{{ date('Y/m/d', strtotime($n->createdAt)) }}">
diff --git a/resources/views/layout/component/my-account/notifications/account.blade.php b/resources/views/layout/component/my-account/notifications/account.blade.php
index 87f5a83..110beff 100644
--- a/resources/views/layout/component/my-account/notifications/account.blade.php
+++ b/resources/views/layout/component/my-account/notifications/account.blade.php
@@ -1,6 +1,6 @@
-<my-global-icon iconname="user-add" aria-hidden="true" class="ng-star-inserted">
+<my-global-icon iconname="user-add" aria-hidden="true">
   <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-user-plus"><path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="8.5" cy="7" r="4"></circle><line x1="20" y1="8" x2="20" y2="14"></line><line x1="23" y1="11" x2="17" y2="11"></line></svg>
 </my-global-icon>
-<div class="message ng-star-inserted">
+<div class="message">
   <a href="/a/{{ ptFullHandle($n->account) }}">{{ $n->account->displayName }}</a>さんがこのインスタンスに登録しました
 </div>
diff --git a/resources/views/layout/component/my-account/notifications/actorfollow.blade.php b/resources/views/layout/component/my-account/notifications/actorfollow.blade.php
index 499fef9..9969f55 100644
--- a/resources/views/layout/component/my-account/notifications/actorfollow.blade.php
+++ b/resources/views/layout/component/my-account/notifications/actorfollow.blade.php
@@ -1,13 +1,13 @@
 @if ($n->actorFollow->following->type == 'instance')
-  <my-global-icon iconname="users" aria-hidden="true" class="ng-star-inserted">
+  <my-global-icon iconname="users" aria-hidden="true">
     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-users"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="9" cy="7" r="4"></circle><path d="M23 21v-2a4 4 0 0 0-3-3.87"></path><path d="M16 3.13a4 4 0 0 1 0 7.75"></path></svg>
   </my-global-icon>
 @elseif ($n->actorFollow->following->type == 'account')
-  <a href="/a/{{ ptFullHandle($n->actorFollow->follower) }}" class="ng-star-inserted">
+  <a href="/a/{{ ptFullHandle($n->actorFollow->follower) }}">
     <img alt="" aria-labelledby="avatar" class="avatar" src="{{ ptAvatar($n->actorFollow->follower) }}">
   </a>
 @endif
-<div class="message ng-star-inserted">
+<div class="message">
   @if ($n->actorFollow->following->type == 'instance')
     @if ($n->actorFollow->follower->id == 1)
       あなたのインスタンスは<a href="/admin/follows/following-list"> {{ $n->actorFollow->following->host }}</a>を自動でフォローされています
diff --git a/resources/views/layout/component/my-account/notifications/comment.blade.php b/resources/views/layout/component/my-account/notifications/comment.blade.php
index 7e11b09..cc925e3 100644
--- a/resources/views/layout/component/my-account/notifications/comment.blade.php
+++ b/resources/views/layout/component/my-account/notifications/comment.blade.php
@@ -1,12 +1,11 @@
-<a href="/a/{{ ptFullHandle($n->comment->account) }}" class="ng-star-inserted">
+<a href="/a/{{ ptFullHandle($n->comment->account) }}">
   <img alt="" aria-labelledby="avatar" class="avatar" src="{{ ptAvatar($n->comment->account) }}">
 </a>
-@if ($n->type == 11)
-  <div class="message ng-star-inserted">
-    <a href="/a/{{ ptFullHandle($n->comment->account) }}">{{ $n->comment->account->displayName }}</a>さんは<a href="/w/{{ $n->comment->video->shortUUID }}#threadId={{ $n->comment->threadId }}">{{ $n->comment->video->name }}</a>という動画でメンションされました。
-  </div>
-@elseif ($n->type == 2)
-  <div class="message ng-star-inserted">
-    <a href="/a/{{ ptFullHandle($n->comment->account) }}">{{ $n->comment->account->displayName }}</a>さんは<a href="/w/{{ $n->comment->video->shortUUID }}#threadId={{ $n->comment->threadId }}">{{ $n->comment->video->name }}</a>でコメントを投稿しました
-  </div>
-@endif
+<div class="message">
+<a href="/a/{{ ptFullHandle($n->comment->account) }}">{{ $n->comment->account->displayName }}</a>さんは<a href="/w/{{ $n->comment->video->shortUUID }}#threadId={{ $n->comment->threadId }}">{{ $n->comment->video->name }}</a>
+  @if ($n->type == 11)
+    という動画でメンションされました。
+  @elseif ($n->type == 2)
+    でコメントを投稿しました
+  @endif
+</div>
diff --git a/resources/views/layout/component/my-account/notifications/import.blade.php b/resources/views/layout/component/my-account/notifications/import.blade.php
index 4103f34..af3ba44 100644
--- a/resources/views/layout/component/my-account/notifications/import.blade.php
+++ b/resources/views/layout/component/my-account/notifications/import.blade.php
@@ -1,6 +1,6 @@
-<my-global-icon iconname="cloud-download" aria-hidden="true" class="ng-star-inserted">
+<my-global-icon iconname="cloud-download" aria-hidden="true">
   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs></defs><g fill="none" fill-rule="evenodd" stroke="currentColor" stroke-linecap="round" stroke-width="2"><path stroke-linejoin="round" d="M8 17H5h0a4 4 0 111-7.9v-.6a5.5 5.5 0 0110.8-1.4A5 5 0 0123 12a5 5 0 01-5 5h-2"></path><path d="M12 13v8"></path><path stroke-linejoin="round" d="M15 20l-3 3-3-3"></path></g></svg>
 </my-global-icon>
-<div class="message ng-star-inserted">
+<div class="message">
   <a href="/w/hVqERbk4AQgdjEQXiXwsLm">動画のインポートに成功しました</a> https://www.youtube.com/watch?v=7cTSM-NEUqM
 </div>
diff --git a/resources/views/layout/component/my-account/notifications/plugin.blade.php b/resources/views/layout/component/my-account/notifications/plugin.blade.php
index 6126ffa..c86e9e4 100644
--- a/resources/views/layout/component/my-account/notifications/plugin.blade.php
+++ b/resources/views/layout/component/my-account/notifications/plugin.blade.php
@@ -1,6 +1,6 @@
-<my-global-icon iconname="cog" aria-hidden="true" class="ng-star-inserted">
+<my-global-icon iconname="cog" aria-hidden="true">
   <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-settings"><circle cx="12" cy="12" r="3"></circle><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"></path></svg>
 </my-global-icon>
-<div class="message ng-star-inserted">
+<div class="message">
   <a href="/admin/plugins/list-installed?pluginType={{ $n->plugin->type }}">{{ $n->plugin->name }}</a>というプラグイン・テーマの最新バージョンまで更新できるようになりました: {{ $n->plugin->latestVersion }}
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/layout/component/my-account/notifications/video.blade.php b/resources/views/layout/component/my-account/notifications/video.blade.php
index 069c87c..758afe1 100644
--- a/resources/views/layout/component/my-account/notifications/video.blade.php
+++ b/resources/views/layout/component/my-account/notifications/video.blade.php
@@ -1,6 +1,6 @@
-<a class="ng-star-inserted">
+<a>
   <img alt="" aria-labelledby="avatar" class="avatar" src="{{ ptAvatar($n->video->channel) }}">
 </a>
-<div class="message ng-star-inserted">
+<div class="message">
   {{ $n->video->channel->displayName }}さんは新しい動画を投稿しました: <a href="/w/{{ $n->video->shortUUID }}">{{ $n->video->name }}</a>
 </div>
diff --git a/resources/views/layout/component/videos/categories.blade.php b/resources/views/layout/component/videos/categories.blade.php
index d16d8b4..cfc4bd5 100644
--- a/resources/views/layout/component/videos/categories.blade.php
+++ b/resources/views/layout/component/videos/categories.blade.php
@@ -1,4 +1,4 @@
-<div class="section videos ng-star-inserted">
+<div class="section videos">
   <h1 class="section-title">
     <a href="/search?categoryOneOf={{ $res['video']->categories[0]->category->id }}">{{ $res['video']->categories[0]->category->label }}</a>
   </h1>
diff --git a/resources/views/layout/component/videos/channels.blade.php b/resources/views/layout/component/videos/channels.blade.php
index 7616f20..ea52402 100644
--- a/resources/views/layout/component/videos/channels.blade.php
+++ b/resources/views/layout/component/videos/channels.blade.php
@@ -1,8 +1,8 @@
-<div class="section channel videos ng-star-inserted">
+<div class="section channel videos">
   <div class="section-title">
     <a href="/c/{{ ptFullHandle($res['video']->channels[0]->channel) }}">
       <my-actor-avatar>
-        <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($res['video']->channels[0]->channel) }}" alt="チャンネルのアバター">
+        <img class="avatar channel" src="{{ ptAvatar($res['video']->channels[0]->channel) }}" alt="チャンネルのアバター">
       </my-actor-avatar>
       <h2 class="section-title">{{ $res['video']->channels[0]->channel->displayName }}</h2>
     </a>
diff --git a/resources/views/layout/component/videos/tags.blade.php b/resources/views/layout/component/videos/tags.blade.php
index 38f8381..2e5bd80 100644
--- a/resources/views/layout/component/videos/tags.blade.php
+++ b/resources/views/layout/component/videos/tags.blade.php
@@ -1,6 +1,6 @@
-<div class="section videos ng-star-inserted">
+<div class="section videos">
   <h2 class="section-title">
-    <a href="/search?tagsOneOf=vampiros">{{ '#'.$res['video']->tags[0]->tag }}</a>
+    <a href="/search?tagsOneOf={{ $res['video']->tags[0]->tag }}">{{ '#'.$res['video']->tags[0]->tag }}</a>
   </h2>
   @foreach ($res['video']->tags[0]->videos as $k => $v)
     @include('layout.component.common.videominature')
diff --git a/resources/views/layout/component/w/info.blade.php b/resources/views/layout/component/w/info.blade.php
index 6dbc5f6..fbe3580 100644
--- a/resources/views/layout/component/w/info.blade.php
+++ b/resources/views/layout/component/w/info.blade.php
@@ -1,4 +1,4 @@
-<div class="margin-content video-bottom ng-star-inserted">
+<div class="margin-content video-bottom">
   <div class="video-info">
     @include('layout.component.w.info.first')
     @include('layout.component.w.info.description')
diff --git a/resources/views/layout/component/w/info/attrib.blade.php b/resources/views/layout/component/w/info/attrib.blade.php
index 8fb4fba..e139b57 100644
--- a/resources/views/layout/component/w/info/attrib.blade.php
+++ b/resources/views/layout/component/w/info/attrib.blade.php
@@ -1,31 +1,31 @@
 <my-video-attributes>
   <div class="attribute">
     <span class="attribute-label">公開設定</span>
-    <span class="attribute-value ng-star-inserted">{{ $res['detail']->privacy->label }}</span>
+    <span class="attribute-value">{{ $res['detail']->privacy->label }}</span>
   </div>
 
   <div class="attribute">
     <span class="attribute-label">カテゴリ</span>
-    @if (is_null($res['detail']->category->id)) <span class="attribute-value ng-star-inserted">{{ $res['detail']->category->label }}</span>
-    @else <a class="attribute-value ng-star-inserted" href="/search?categoryOneOf={{ $res['detail']->category->id }}">{{ $res['detail']->category->label }}</a> @endif
+    @if (is_null($res['detail']->category->id)) <span class="attribute-value">{{ $res['detail']->category->label }}</span>
+    @else <a class="attribute-value" href="/search?categoryOneOf={{ $res['detail']->category->id }}">{{ $res['detail']->category->label }}</a> @endif
   </div>
 
   @if (!is_null($res['detail']->originallyPublishedAt))
     <div class="attribute">
       <span class="attribute-label">投稿日</span>
-      <span class="attribute-value ng-star-inserted">{{ date('Y年m月d日', strtotime($res['detail']->originallyPublishedAt)) }}</span>
+      <span class="attribute-value">{{ date('Y年m月d日', strtotime($res['detail']->originallyPublishedAt)) }}</span>
     </div>
   @endif
 
   <div class="attribute">
     <span class="attribute-label">ライセンス</span>
-    <span class="attribute-value ng-star-inserted">{{ $res['detail']->licence->label }}</span>
+    <span class="attribute-value">{{ $res['detail']->licence->label }}</span>
   </div>
 
   <div class="attribute">
     <span class="attribute-label">言語</span>
-    @if (is_null($res['detail']->language->id)) <span class="attribute-value ng-star-inserted">{{ $res['detail']->language->label }}</span>
-    @else <a class="attribute-value ng-star-inserted" href="/search?languageOneOf={{ $res['detail']->language->id }}">{{ $res['detail']->language->label }}</a> @endif
+    @if (is_null($res['detail']->language->id)) <span class="attribute-value">{{ $res['detail']->language->label }}</span>
+    @else <a class="attribute-value" href="/search?languageOneOf={{ $res['detail']->language->id }}">{{ $res['detail']->language->label }}</a> @endif
   </div>
 
   <div class="attribute attribute-tags">
@@ -33,13 +33,13 @@
     @if (count($res['detail']->tags) > 0)
       <span class="attribute-label">
         @foreach ($res['detail']->tags as $k => $v)
-          <a class="attribute-value ng-star-inserted" href="/search?tagsOneOf={{ $v }}">{{ $v }}</a>{{ count($res['detail']->tags)-1 != $k ? ', ' : '' }}
+          <a class="attribute-value" href="/search?tagsOneOf={{ $v }}">{{ $v }}</a>{{ count($res['detail']->tags)-1 != $k ? ', ' : '' }}
         @endforeach
       </span>
     @endif
   </div>
 
-  <div class="attribute ng-star-inserted">
+  <div class="attribute">
     <span class="attribute-label">再生時間</span>
     @php
       $seconds = $res['detail']->duration;
diff --git a/resources/views/layout/component/w/info/channel.blade.php b/resources/views/layout/component/w/info/channel.blade.php
index 8c6bf98..999fe43 100644
--- a/resources/views/layout/component/w/info/channel.blade.php
+++ b/resources/views/layout/component/w/info/channel.blade.php
@@ -2,15 +2,15 @@
   <my-video-avatar-channel>
     <div class="wrapper">
       <my-actor-avatar class="channel">
-        <a title="{{ ptFullHandle($res['detail']->channel) }} (チャンネルページへ) " href="/c/{{ ptFullHandle($res['detail']->channel) }}" class="ng-star-inserted">
-          <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($res['detail']->channel) }}" alt="チャンネルのアバター">
+        <a title="{{ ptFullHandle($res['detail']->channel) }} (チャンネルページへ) " href="/c/{{ ptFullHandle($res['detail']->channel) }}">
+          <img class="avatar channel" src="{{ ptAvatar($res['detail']->channel) }}" alt="チャンネルのアバター">
         </a>
       </my-actor-avatar>
     </div>
   </my-video-avatar-channel>
   <div class="video-info-channel-left-links ml-1">
-    <a title="チャンネルページ" href="/c/{{ ptFullHandle($res['detail']->channel) }}" class="ng-star-inserted"> {{ $res['detail']->channel->displayName }} </a>
-    <a title="アカウントページ" href="/a/{{ ptFullHandle($res['detail']->account) }}" class="ng-star-inserted">
+    <a title="チャンネルページ" href="/c/{{ ptFullHandle($res['detail']->channel) }}"> {{ $res['detail']->channel->displayName }} </a>
+    <a title="アカウントページ" href="/a/{{ ptFullHandle($res['detail']->account) }}">
       <span>{{ ptFullHandle($res['detail']->account) }} 制作</span>
     </a>
   </div>
diff --git a/resources/views/layout/component/w/info/comments.blade.php b/resources/views/layout/component/w/info/comments.blade.php
index b88bdb2..aa6ac3f 100644
--- a/resources/views/layout/component/w/info/comments.blade.php
+++ b/resources/views/layout/component/w/info/comments.blade.php
@@ -4,7 +4,7 @@
       <h2 class="title-page title-page-single"> {{ $res['comment']->totalNotDeletedComments }} コメント </h2>
       <my-feed>
         <div class="feed">
-          <my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication ng-star-inserted">
+          <my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication">
             <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
           </my-global-icon>
         </div>
@@ -17,11 +17,11 @@
         </div>
       </div-->
     </div>
-    <my-video-comment-add class="ng-star-inserted">
+    <my-video-comment-add>
       <form novalidate="" class="ng-untouched ng-pristine ng-invalid">
         <div class="avatar-and-textarea">
           <my-actor-avatar size="25">
-            <img class="account avatar avatar-25 ng-star-inserted" src="{{ env('PEER_URI') }}/lazy-static/avatars/aa9883c7-d4d0-48c3-8e3a-72a9f2d96784.png" alt="アカウントのアバター">
+            <img class="account avatar avatar-25" src="{{ env('PEER_URI') }}/lazy-static/avatars/aa9883c7-d4d0-48c3-8e3a-72a9f2d96784.png" alt="アカウントのアバター">
           </my-actor-avatar>
           <div class="form-group">
             <textarea placeholder="コメントを入力..." myautoresize="" formcontrolname="text" rows="1" class="ng-untouched ng-pristine ng-invalid" style="overflow: hidden; height: 32px;"></textarea>
@@ -31,20 +31,19 @@
       </form>
     </my-video-comment-add>
     @if (count($res['comment']->data) == 0)
-      <div class="ng-star-inserted">コメントがありません。</div>
+      <div>コメントがありません。</div>
     @else
       @foreach ($res['comment']->data as $k => $v)
         @if (!$v->isDeleted)
-          <div class="comment-threads ng-star-inserted">
+          <div class="comment-threads">
             <div>
               <div id="highlighted-comment" class="anchor"></div>
-              <my-video-comment class="ng-star-inserted">
-                <div class="root-comment ng-star-inserted">
+              <my-video-comment>
+                <div class="root-comment">
                   <div class="left">
-
-                    <my-actor-avatar class="ng-star-inserted">
-                      <a target="_blank" rel="noopener noreferrer" href="{{ $v->account->url }}" title="{{ $v->account->name }} (アカウントページへ) " class="ng-star-inserted">
-                        <img class="account avatar ng-star-inserted" src="{{ ptAvatar($v->account) }}" alt="アカウントのアバター">
+                    <my-actor-avatar>
+                      <a target="_blank" rel="noopener noreferrer" href="{{ $v->account->url }}" title="{{ $v->account->name }} (アカウントページへ) ">
+                        <img class="account avatar" src="{{ ptAvatar($v->account) }}" alt="アカウントのアバター">
                       </a>
                     </my-actor-avatar>
 
@@ -55,8 +54,8 @@
                       @php
                         $comsrc = ptComeSrc($v->src);
                       @endphp
-                      <div class="highlighted-comment ng-star-inserted" style="background-color: {{ $comsrc->bg }}; color: {{ $comsrc->fg }};">{{ $comsrc->tx }}</div>
-                      <div class="comment-account-date ng-star-inserted">
+                      <div class="highlighted-comment" style="background-color: {{ $comsrc->bg }}; color: {{ $comsrc->fg }};">{{ $comsrc->tx }}</div>
+                      <div class="comment-account-date">
                         <div class="comment-account">
                           @if ($v->src != 'TS' && $v->src != 'PT')
                             <a href="{{ $v->account->url }}">
@@ -85,26 +84,24 @@
                           {{ date('Y年m月d日 H:i:s T', strtotime($v->createdAt)) }}
                         </a>
                       </div>
-                      <div mytimestamproutetransformer="" class="comment-html ng-star-inserted">
+                      <div mytimestamproutetransformer="" class="comment-html">
                         <?php echo $v->text; ?>
                       </div>
                       @if ($v->src == 'TS' || $v->src == 'PT')
-                        <div class="comment-actions ng-star-inserted">
+                        <div class="comment-actions">
                           <div tabindex="0" class="comment-action-reply">返事</div>
                         </div>
                       @endif
-                      <div class="ng-star-inserted"></div>
                     </div>
                   </div>
                 </div>
-                <div class="ng-star-inserted"></div>
               </my-video-comment>
             </div>
           </div>
         @endif
       @endforeach
     @endif
-    <div class="comment-threads ng-star-inserted">
+    <div class="comment-threads">
       <div>
         <div id="highlighted-comment" class="anchor"></div>
       </div>
diff --git a/resources/views/layout/component/w/info/save.blade.php b/resources/views/layout/component/w/info/save.blade.php
index 1c2bd85..a0495c2 100644
--- a/resources/views/layout/component/w/info/save.blade.php
+++ b/resources/views/layout/component/w/info/save.blade.php
@@ -1,4 +1,4 @@
-<!--div placement="bottom auto" role="button" autoclose="outside" class="action-dropdown ng-star-inserted dropdown">
+<!--div placement="bottom auto" role="button" autoclose="outside" class="action-dropdown dropdown">
   <button class="dropdown-toggle action-button action-button-save" aria-expanded="false">
     <my-global-icon iconname="playlist-add" aria-hidden="true">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 426.7 426.7">
@@ -21,7 +21,7 @@
           <input type="text" placeholder="再生リストを検索" class="ng-untouched ng-pristine ng-valid">
         </div>
         <div class="playlists">
-          <div class="playlist dropdown-item ng-star-inserted">
+          <div class="playlist dropdown-item">
             <div class="primary-row">
               <my-peertube-checkbox class="ng-untouched ng-pristine ng-valid">
                 <div class="root flex-column">
@@ -50,4 +50,4 @@
       </div>
     </my-video-add-to-playlist>
   </div>
-</div-->
\ No newline at end of file
+</div-->
diff --git a/resources/views/layout/component/w/info/support.blade.php b/resources/views/layout/component/w/info/support.blade.php
index b449730..5709873 100644
--- a/resources/views/layout/component/w/info/support.blade.php
+++ b/resources/views/layout/component/w/info/support.blade.php
@@ -1,4 +1,4 @@
-<button placement="bottom auto" class="action-button action-button-support ng-star-inserted" aria-label="この動画への寄付方法">
+<button placement="bottom auto" class="action-button action-button-support" aria-label="この動画への寄付方法">
   <my-global-icon iconname="support" aria-hidden="true">
     <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 947.70386 999.3125" width="947.70386" height="999.3125">
       <g transform="translate(2.669496,27.625894)">
@@ -10,4 +10,4 @@
     </svg>
   </my-global-icon>
   <span class="icon-text">寄付する</span>
-</button>
\ No newline at end of file
+</button>
diff --git a/resources/views/layout/component/w/info/videorate.blade.php b/resources/views/layout/component/w/info/videorate.blade.php
index db05a34..c819350 100644
--- a/resources/views/layout/component/w/info/videorate.blade.php
+++ b/resources/views/layout/component/w/info/videorate.blade.php
@@ -3,12 +3,12 @@
     <my-global-icon iconname="like">
       <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-thumbs-up"><path d="M14 9V5a3 3 0 0 0-3-3l-4 9v11h11.28a2 2 0 0 0 2-1.7l1.38-9a2 2 0 0 0-2-2.3zM7 22H4a2 2 0 0 1-2-2v-7a2 2 0 0 1 2-2h3"></path></svg>
     </my-global-icon>
-    @if ($res['detail']->likes > 0) <span class="count ng-star-inserted">{{ $res['detail']->likes }}</span> @endif
+    @if ($res['detail']->likes > 0) <span class="count">{{ $res['detail']->likes }}</span> @endif
   </button>
   <button placement="bottom auto" class="action-button action-button-dislike" aria-pressed="false" aria-label="動画を低く評価">
     <my-global-icon iconname="dislike">
       <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-thumbs-down"><path d="M10 15v4a3 3 0 0 0 3 3l4-9V2H5.72a2 2 0 0 0-2 1.7l-1.38 9a2 2 0 0 0 2 2.3zm7-13h2.67A2.31 2.31 0 0 1 22 4v7a2.31 2.31 0 0 1-2.33 2H17"></path></svg>
     </my-global-icon>
-    @if ($res['detail']->dislikes > 0) <span class="count ng-star-inserted">{{ $res['detail']->dislikes }}</span> @endif
+    @if ($res['detail']->dislikes > 0) <span class="count">{{ $res['detail']->dislikes }}</span> @endif
   </button>
-</my-video-rate>
\ No newline at end of file
+</my-video-rate>
diff --git a/resources/views/layout/component/w/info/viewsdate.blade.php b/resources/views/layout/component/w/info/viewsdate.blade.php
index b222dd5..ed81655 100644
--- a/resources/views/layout/component/w/info/viewsdate.blade.php
+++ b/resources/views/layout/component/w/info/viewsdate.blade.php
@@ -1,10 +1,10 @@
 <div class="d-none d-md-block video-info-date-views">
-  <my-date-toggle class="ng-star-inserted">
+  <my-date-toggle>
     <span class="date-toggle" title="{{ date('Y/m/d', strtotime($res['detail']->publishedAt)) }}">{{ date('Y年m月d日 H:i:s T', strtotime($res['detail']->publishedAt)) }}</span>
   </my-date-toggle>
   に投稿
   •
-  <my-video-views-counter class="ng-star-inserted">
+  <my-video-views-counter>
     <span title="">{{ $res['detail']->views }} 回視聴</span>
   </my-video-views-counter>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/layout/component/w/videorecommend.blade.php b/resources/views/layout/component/w/videorecommend.blade.php
index 87e13c0..17762e0 100644
--- a/resources/views/layout/component/w/videorecommend.blade.php
+++ b/resources/views/layout/component/w/videorecommend.blade.php
@@ -1,18 +1,18 @@
 <my-recommended-videos>
   <div class="other-videos">
-    <div class="title-page-container ng-star-inserted">
+    <div class="title-page-container">
       <h2 class="title-page title-page-single">他の動画</h2>
     </div>
     @foreach ($res['recommend']->data as $k => $v)
-      <my-video-miniature actorimagesize="32" class="ng-star-inserted">
+      <my-video-miniature actorimagesize="32">
         <div class="video-miniature">
           <my-video-thumbnail>
-            <a class="video-thumbnail ng-star-inserted" href="/w/{{ $v->shortUUID }}">
-              <img alt="" aria-label="{{ $v->name }}" src="{{ env('PEER_URI') }}{{ $v->thumbnailPath }}" class="ng-star-inserted">
-              <div class="video-thumbnail-label-overlay warning ng-star-inserted"></div>
-              <div class="video-thumbnail-label-overlay danger ng-star-inserted"></div>
-              <div class="video-thumbnail-duration-overlay ng-star-inserted">{{ ptDuration($v->duration) }}</div>
-              <div class="play-overlay ng-star-inserted">
+            <a class="video-thumbnail" href="/w/{{ $v->shortUUID }}">
+              <img alt="" aria-label="{{ $v->name }}" src="{{ env('PEER_URI') }}{{ $v->thumbnailPath }}">
+              <div class="video-thumbnail-label-overlay warning"></div>
+              <div class="video-thumbnail-label-overlay danger"></div>
+              <div class="video-thumbnail-duration-overlay">{{ ptDuration($v->duration) }}</div>
+              <div class="play-overlay">
                 <div class="icon"></div>
               </div>
             </a>
@@ -20,26 +20,26 @@
           <div class="video-bottom">
             <div class="video-miniature-information">
               <div class="d-flex video-miniature-meta">
-                <my-actor-avatar class="ng-star-inserted">
-                  <a title="{{ $v->channel->name }} (チャンネルページへ) " href="/c/{{ $v->channel->name }}" class="ng-star-inserted">
-                    <img class="avatar avatar-32 channel ng-star-inserted" src="{{ ptAvatar($v->channel) }}" alt="チャンネルのアバター">
+                <my-actor-avatar>
+                  <a title="{{ $v->channel->name }} (チャンネルページへ) " href="/c/{{ $v->channel->name }}">
+                    <img class="avatar avatar-32 channel" src="{{ ptAvatar($v->channel) }}" alt="チャンネルのアバター">
                   </a>
                 </my-actor-avatar>
                 <div class="w-100 d-flex flex-column">
                   <my-link tabindex="-1" class="video-miniature-name" style="max-height: 3em;">
-                    <a tabindex="-1" title="{{ $v->name }}" href="/w/{{ $v->shortUUID }}" class="ng-star-inserted"> {{ $v->name }} </a>
+                    <a tabindex="-1" title="{{ $v->name }}" href="/w/{{ $v->shortUUID }}"> {{ $v->name }} </a>
                   </my-link>
                   <span class="video-miniature-created-at-views">
-                    <my-date-toggle class="ng-star-inserted">
+                    <my-date-toggle>
                       <span class="date-toggle" title="{{ date('Y年m月d日 H:i:s T', strtotime($v->createdAt)) }}">{{ date('Y/m/d', strtotime($v->createdAt)) }} </span>
                     </my-date-toggle>
                     <span class="views" title=""> • 
-                      <my-video-views-counter class="ng-star-inserted">
+                      <my-video-views-counter>
                         <span title=""> {{ $v->views }} 回視聴</span>
                       </my-video-views-counter>
                     </span>
                   </span>
-                  <a tabindex="-1" class="video-miniature-account ng-star-inserted" href="/c/{{ ptFullHandle($v->channel) }}"> {{ ptFullHandle($v->account) }} </a>
+                  <a tabindex="-1" class="video-miniature-account" href="/c/{{ ptFullHandle($v->channel) }}"> {{ ptFullHandle($v->account) }} </a>
                   <div class="video-info-privacy"></div>
                 </div>
               </div>
@@ -48,7 +48,7 @@
           </div>
         </div>
       </my-video-miniature>
-      <hr class="ng-star-inserted">
+      <hr>
     @endforeach
   </div>
 </my-recommended-videos>
diff --git a/resources/views/pages/peertube/a.blade.php b/resources/views/pages/peertube/a.blade.php
index 6a8d49f..237ab65 100644
--- a/resources/views/pages/peertube/a.blade.php
+++ b/resources/views/pages/peertube/a.blade.php
@@ -3,7 +3,7 @@
 @section('content')
   <div id="content" tabindex="-1" class="main-col">
     <div class="main-row">
-      <div class="root ng-star-inserted">
+      <div class="root">
         @include('layout.component.a.info')
         @include('layout.component.a.links')
         @if ($cat == 'videos')
diff --git a/resources/views/pages/peertube/home.blade.php b/resources/views/pages/peertube/home.blade.php
index 761f7cd..b2ddb1f 100644
--- a/resources/views/pages/peertube/home.blade.php
+++ b/resources/views/pages/peertube/home.blade.php
@@ -3,14 +3,10 @@
 @section('content')
   <div id="content" tabindex="-1" class="main-col">
     <div class="main-row">
-      <ng-component class="ng-star-inserted">
-        <ng-component class="ng-star-inserted">
-          <h1 class="sr-only">トップページ</h1>
-          <div class="margin-content">
-            @include('layout.component.home.newest')
-            @include('layout.component.home.popularest')
-          </div>
-        </div>
+      <h1 class="sr-only">トップページ</h1>
+      <div class="margin-content">
+        @include('layout.component.home.newest')
+        @include('layout.component.home.popularest')
       </div>
     </div>
   </div>
diff --git a/resources/views/pages/peertube/login.blade.php b/resources/views/pages/peertube/login.blade.php
index 2dbaebc..ffbb3d9 100644
--- a/resources/views/pages/peertube/login.blade.php
+++ b/resources/views/pages/peertube/login.blade.php
@@ -3,11 +3,11 @@
 @section('content')
   <div id="content" tabindex="-1" class="main-col">
     <div class="main-row">
-      <my-login class="ng-star-inserted">
+      <my-login>
         <div class="margin-content">
           <div class="title-page title-page-single">ログイン</div>
-          @if (!is_null($res['err'])) <div _ngcontent-fjg-c238="" class="alert alert-danger ng-star-inserted">{{ $err }}</div> @endif
-          <div class="wrapper ng-star-inserted">
+          @if (!is_null($res['err'])) <div _ngcontent-fjg-c238="" class="alert alert-danger">{{ $err }}</div> @endif
+          <div class="wrapper">
             <div class="login-form-and-externals">
               <form action="/login" method="post" role="form" id="plugin-selector-login-form" class="ng-pristine ng-invalid ng-touched">
                 @csrf
@@ -24,13 +24,13 @@
                 <input type="submit" value="ログイン" class="peertube-button orange-button">
                 <div class="additionnal-links">
                   <a title="クリックしてパスワードをリセットします" class="forgot-password-button">パスワードを忘れました</a>
-                  <div class="signup-link ng-star-inserted">
+                  <div class="signup-link">
                     <span>·</span><a class="create-an-account" href="/signup">アカウントを作成する</a>
                   </div>
                 </div>
                 <div role="alert" class="looking-for-account alert alert-info">
                   <h6 class="alert-heading">あなたのアカウントでログインする事で、コンテンツを公開することができます</h6>
-                  <div class="ng-star-inserted"> This instance allows registration. However, be careful to check the Terms before creating an account. You may also search for another instance to match your exact needs at: <br><a href="https://joinpeertube.org/instances" target="_blank" rel="noopener noreferrer" class="alert-link">https://joinpeertube.org/instances</a>. </div>
+                  <div> This instance allows registration. However, be careful to check the Terms before creating an account. You may also search for another instance to match your exact needs at: <br><a href="https://joinpeertube.org/instances" target="_blank" rel="noopener noreferrer" class="alert-link">https://joinpeertube.org/instances</a>. </div>
                 </div>
               </form>
             </div>
@@ -39,10 +39,10 @@
                 <h2 class="instance-name">076動画</h2>
                 <div class="instance-short-description">JSのないPeerTube</div>
                 <ngb-accordion role="tablist" class="accordion" aria-multiselectable="false">
-                  <div class="card ng-star-inserted">
-                    <div role="tabpanel" id="terms" aria-labelledby="terms-header" class="ng-star-inserted collapse show">
+                  <div class="card">
+                    <div role="tabpanel" id="terms" aria-labelledby="terms-header" collapse show">
                       <div class="card-body">
-                        <div _ngcontent-fjg-c88="" class="block ng-star-inserted">
+                        <div _ngcontent-fjg-c88="" class="block">
                           <p>
                             ・デフォルトで各ユーザーは一日2GBまで、総合50GBまでアップ出来ますが、信頼があれば、限界を段々増大するかもしれません。<br>
                             ・差別は禁止です。人種、宗教、国籍、性別、ワクチン状況等込み。冗談はOKです。<br>
diff --git a/resources/views/pages/peertube/my-account/notifications.blade.php b/resources/views/pages/peertube/my-account/notifications.blade.php
index a5d4fc9..c302587 100644
--- a/resources/views/pages/peertube/my-account/notifications.blade.php
+++ b/resources/views/pages/peertube/my-account/notifications.blade.php
@@ -3,18 +3,14 @@
 @section('content')
   <div id="content" tabindex="-1" class="main-col">
     <div class="main-row">
-      <my-my-account class="ng-star-inserted">
-        <div class="row">
-          @include('layout.component.my-account.menu', ['active' => 'notifications'])
-          <div class="margin-content pb-5 offset-content">
-            <ng-component class="ng-star-inserted">
-              <h1 class="sr-only">通知</h1>
-              @include('layout.component.my-account.filter')
-              @include('layout.component.my-account.notifications')
-            </ng-component>
-          </div>
+      <div class="row">
+        @include('layout.component.my-account.menu', ['active' => 'notifications'])
+        <div class="margin-content pb-5 offset-content">
+          <h1 class="sr-only">通知</h1>
+          @include('layout.component.my-account.filter')
+          @include('layout.component.my-account.notifications')
         </div>
-      </my-my-account>
+      </div>
     </div>
   </div>
 @endsection
diff --git a/resources/views/pages/peertube/videos/local.blade.php b/resources/views/pages/peertube/videos/local.blade.php
index b1387e1..35730d9 100644
--- a/resources/views/pages/peertube/videos/local.blade.php
+++ b/resources/views/pages/peertube/videos/local.blade.php
@@ -3,31 +3,24 @@
 @section('content')
   <div id="content" tabindex="-1" class="main-col">
     <div class="main-row">
-      <ng-component class="ng-star-inserted">
-        <ng-component class="ng-star-inserted">
-          <my-videos-list>
-            <div class="margin-content">
-              <div class="videos-header">
-                <h1 placement="bottom" container="body" class="title ng-star-inserted"> ローカル動画 </h1>
-                <div class="title-subscription ng-star-inserted">
-                  Subscribe to RSS feed "ローカル動画"
-                  <my-feed>
-                    <div class="feed">
-                      <my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication ng-star-inserted">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
-                      </my-global-icon>
-                    </div>
-                  </my-feed>
-                </div>
-                <div class="action-block"></div>
+      <div class="margin-content">
+        <div class="videos-header">
+          <h1 placement="bottom" container="body" class="title"> ローカル動画 </h1>
+          <div class="title-subscription">
+            Subscribe to RSS feed "ローカル動画"
+            <my-feed>
+              <div class="feed">
+                <my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
+                </my-global-icon>
               </div>
-              @include('layout.component.common.videosbydate')
-              @include('layout.component.common.paginate', [
-                'root' => '/videos/local'
-              ])
-            </div>
-          </my-videos-list>
+            </my-feed>
+          </div>
         </div>
+        @include('layout.component.common.videosbydate')
+        @include('layout.component.common.paginate', [
+          'root' => '/videos/local'
+        ])
       </div>
     </div>
   </div>
diff --git a/resources/views/pages/peertube/videos/overview.blade.php b/resources/views/pages/peertube/videos/overview.blade.php
index 02d8ef4..7ae7fc4 100644
--- a/resources/views/pages/peertube/videos/overview.blade.php
+++ b/resources/views/pages/peertube/videos/overview.blade.php
@@ -3,19 +3,15 @@
 @section('content')
   <div id="content" tabindex="-1" class="main-col">
     <div class="main-row">
-      <ng-component class="ng-star-inserted">
-        <ng-component class="ng-star-inserted">
-          <h1 class="sr-only">ディスカバー</h1>
-          <div class="margin-content">
-            @if (!empty($res['video']->categories)) @include('layout.component.videos.categories') @endif
-            @if (!empty($res['video']->tags)) @include('layout.component.videos.tags') @endif
-            @if (!empty($res['video']->channels)) @include('layout.component.videos.channels') @endif
-            <div style="margin-top: 16px;"></div>
-            @include('layout.component.common.paginate', [
-              'root' => '/videos/overview'
-            ])
-          </div>
-        </div>
+      <h1 class="sr-only">ディスカバー</h1>
+      <div class="margin-content">
+        @if (!empty($res['video']->categories)) @include('layout.component.videos.categories') @endif
+        @if (!empty($res['video']->tags)) @include('layout.component.videos.tags') @endif
+        @if (!empty($res['video']->channels)) @include('layout.component.videos.channels') @endif
+        <div style="margin-top: 16px;"></div>
+        @include('layout.component.common.paginate', [
+          'root' => '/videos/overview'
+        ])
       </div>
     </div>
   </div>
diff --git a/resources/views/pages/peertube/videos/recentlyadded.blade.php b/resources/views/pages/peertube/videos/recentlyadded.blade.php
index 5765ac1..60f3cc1 100644
--- a/resources/views/pages/peertube/videos/recentlyadded.blade.php
+++ b/resources/views/pages/peertube/videos/recentlyadded.blade.php
@@ -3,31 +3,24 @@
 @section('content')
   <div id="content" tabindex="-1" class="main-col">
     <div class="main-row">
-      <ng-component class="ng-star-inserted">
-        <ng-component class="ng-star-inserted">
-          <my-videos-list>
-            <div class="margin-content">
-              <div class="videos-header">
-                <h1 placement="bottom" container="body" class="title ng-star-inserted"> 最近投稿された動画 </h1>
-                <div class="title-subscription ng-star-inserted">
-                  Subscribe to RSS feed "最近投稿された動画"
-                  <my-feed>
-                    <div class="feed">
-                      <my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication ng-star-inserted">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
-                      </my-global-icon>
-                    </div>
-                  </my-feed>
-                </div>
-                <div class="action-block"></div>
+      <div class="margin-content">
+        <div class="videos-header">
+          <h1 placement="bottom" container="body" class="title"> 最近投稿された動画 </h1>
+          <div class="title-subscription">
+            Subscribe to RSS feed "最近投稿された動画"
+            <my-feed>
+              <div class="feed">
+                <my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
+                </my-global-icon>
               </div>
-              @include('layout.component.common.videosbydate')
-              @include('layout.component.common.paginate', [
-                'root' => '/videos/recently-added'
-              ])
-            </div>
+            </my-feed>
           </div>
         </div>
+        @include('layout.component.common.videosbydate')
+        @include('layout.component.common.paginate', [
+          'root' => '/videos/recently-added'
+        ])
       </div>
     </div>
   </div>
diff --git a/resources/views/pages/peertube/videos/trending.blade.php b/resources/views/pages/peertube/videos/trending.blade.php
index c16c4e9..a9b3ffd 100644
--- a/resources/views/pages/peertube/videos/trending.blade.php
+++ b/resources/views/pages/peertube/videos/trending.blade.php
@@ -3,35 +3,28 @@
 @section('content')
   <div id="content" tabindex="-1" class="main-col">
     <div class="main-row">
-      <ng-component class="ng-star-inserted">
-        <ng-component class="ng-star-inserted">
-          <my-videos-list>
-            <div class="margin-content">
-              <div class="videos-header">
-                <h1 placement="bottom" container="body" class="title ng-star-inserted"> トレンド </h1>
-                <div class="title-subscription ng-star-inserted">
-                  Subscribe to RSS feed "トレンド"
-                  <my-feed>
-                    <div class="feed">
-                      <my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication ng-star-inserted">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
-                      </my-global-icon>
-                    </div>
-                  </my-feed>
-                </div>
-                <div class="action-block"></div>
+      <div class="margin-content">
+        <div class="videos-header">
+          <h1 placement="bottom" container="body" class="title"> トレンド </h1>
+          <div class="title-subscription">
+            Subscribe to RSS feed "トレンド"
+            <my-feed>
+              <div class="feed">
+                <my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
+                </my-global-icon>
               </div>
-              <div class="videos">
-                @foreach ($res['video']->data as $v)
-                  @include('layout.component.common.videominature')
-                @endforeach
-              </div>
-              @include('layout.component.common.paginate', [
-                'root' => '/videos/trending'
-              ])
-            </div>
+            </my-feed>
           </div>
         </div>
+        <div class="videos">
+          @foreach ($res['video']->data as $v)
+            @include('layout.component.common.videominature')
+          @endforeach
+        </div>
+        @include('layout.component.common.paginate', [
+          'root' => '/videos/trending'
+        ])
       </div>
     </div>
   </div>
diff --git a/resources/views/pages/peertube/w.blade.php b/resources/views/pages/peertube/w.blade.php
index c695c1e..57d237c 100644
--- a/resources/views/pages/peertube/w.blade.php
+++ b/resources/views/pages/peertube/w.blade.php
@@ -3,7 +3,7 @@
 @section('content')
   <div id="content" tabindex="-1" class="main-col">
     <div class="main-row">
-      <my-video-watch class="ng-star-inserted">
+      <my-video-watch>
         <div class="root">
           @include('layout.component.w.player')
           @include('layout.component.w.info')