diff --git a/app/Http/Controllers/Peertube/Videos/Local.php b/app/Http/Controllers/Peertube/Videos/Local.php
index d136134..1351e65 100644
--- a/app/Http/Controllers/Peertube/Videos/Local.php
+++ b/app/Http/Controllers/Peertube/Videos/Local.php
@@ -28,7 +28,7 @@ class Local extends Common {
   }
 
   function getVideo ($start, $count) {
-    $get = $this->ptapi_get('/api/v1/videos/?start='.$start.'&count='.$count.'&sort=-publishedAt&filter=local&skipCount=true&nsfw=both');
+    $get = $this->ptapi_get('/api/v1/videos?start='.$start.'&count='.$count.'&sort=-publishedAt&skipCount=true&isLocal=true&nsfw=both');
     return $this->vidlist($get);
   }
 }
diff --git a/resources/views/pages/peertube/a.blade.php b/resources/views/pages/peertube/a.blade.php
index 7ba8c12..8eb3f53 100644
--- a/resources/views/pages/peertube/a.blade.php
+++ b/resources/views/pages/peertube/a.blade.php
@@ -1,5 +1,13 @@
 @extends('theme.'.env('THEME').'.peertube')
 
 @section('content')
-  @include('theme.'.env('THEME').'.component.peertube.a')
+  <div id="content" tabindex="-1" class="main-col">
+    <div class="main-row">
+      <div class="root ng-star-inserted">
+        @include('theme.'.env('THEME').'.component.peertube.parts.a.info')
+        @include('theme.'.env('THEME').'.component.peertube.parts.a.links')
+        @include('theme.'.env('THEME').'.component.peertube.parts.a.channels')
+      </div>
+    </div>
+  </div>
 @endsection
diff --git a/resources/views/pages/peertube/c.blade.php b/resources/views/pages/peertube/c.blade.php
index c6cc33d..ff843e5 100644
--- a/resources/views/pages/peertube/c.blade.php
+++ b/resources/views/pages/peertube/c.blade.php
@@ -1,5 +1,9 @@
 @extends('theme.'.env('THEME').'.peertube')
 
 @section('content')
-  @include('theme.'.env('THEME').'.component.peertube.c')
+  <div id="content" tabindex="-1" class="main-col">
+    @include('theme.'.env('THEME').'.component.peertube.parts.c.head')
+    @include('theme.'.env('THEME').'.component.peertube.parts.c.links')
+    @include('theme.'.env('THEME').'.component.peertube.parts.c.'.($res['cat'] == 'video-playlists' ? 'playlists' : 'videos'))
+  </div>
 @endsection
diff --git a/resources/views/pages/peertube/videos/local.blade.php b/resources/views/pages/peertube/videos/local.blade.php
index e2680bb..ff65a2a 100644
--- a/resources/views/pages/peertube/videos/local.blade.php
+++ b/resources/views/pages/peertube/videos/local.blade.php
@@ -1,5 +1,34 @@
 @extends('theme.'.env('THEME').'.peertube')
 
 @section('content')
-  @include('theme.'.env('THEME').'.component.peertube.videos.local')
+  <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>
+              @include('theme.'.env('THEME').'.component.peertube.parts.common.videosbydate')
+              @include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
+                'root' => '/peertube/videos/local'
+              ])
+            </div>
+          </my-videos-list>
+        </div>
+      </div>
+    </div>
+  </div>
 @endsection
diff --git a/resources/views/pages/peertube/videos/overview.blade.php b/resources/views/pages/peertube/videos/overview.blade.php
index bd6d6dc..3d88ad4 100644
--- a/resources/views/pages/peertube/videos/overview.blade.php
+++ b/resources/views/pages/peertube/videos/overview.blade.php
@@ -1,5 +1,22 @@
 @extends('theme.'.env('THEME').'.peertube')
 
 @section('content')
-  @include('theme.'.env('THEME').'.component.peertube.videos.overview')
+  <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('theme.'.env('THEME').'.component.peertube.parts.videos.categories') @endif
+            @if (!empty($res['video']->tags)) @include('theme.'.env('THEME').'.component.peertube.parts.videos.tags') @endif
+            @if (!empty($res['video']->channels)) @include('theme.'.env('THEME').'.component.peertube.parts.videos.channels') @endif
+            <div style="margin-top: 16px;"></div>
+            @include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
+              'root' => '/peertube/videos/overview'
+            ])
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 @endsection
diff --git a/resources/views/pages/peertube/videos/recentlyadded.blade.php b/resources/views/pages/peertube/videos/recentlyadded.blade.php
index c9002ea..9b4ac6e 100644
--- a/resources/views/pages/peertube/videos/recentlyadded.blade.php
+++ b/resources/views/pages/peertube/videos/recentlyadded.blade.php
@@ -1,5 +1,34 @@
 @extends('theme.'.env('THEME').'.peertube')
 
 @section('content')
-  @include('theme.'.env('THEME').'.component.peertube.videos.recentlyadded')
+  <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>
+              @include('theme.'.env('THEME').'.component.peertube.parts.common.videosbydate')
+              @include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
+                'root' => '/peertube/videos/recently-added'
+              ])
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 @endsection
diff --git a/resources/views/pages/peertube/videos/trending.blade.php b/resources/views/pages/peertube/videos/trending.blade.php
index cb264ad..861e3a7 100644
--- a/resources/views/pages/peertube/videos/trending.blade.php
+++ b/resources/views/pages/peertube/videos/trending.blade.php
@@ -1,5 +1,38 @@
 @extends('theme.'.env('THEME').'.peertube')
 
 @section('content')
-  @include('theme.'.env('THEME').'.component.peertube.videos.trending')
+  <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>
+              <div class="videos">
+                @foreach ($res['video']->data as $v)
+                  @include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
+                @endforeach
+              </div>
+              @include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
+                'root' => '/peertube/videos/trending'
+              ])
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 @endsection
diff --git a/resources/views/pages/peertube/w.blade.php b/resources/views/pages/peertube/w.blade.php
index 9c4d463..3469ace 100644
--- a/resources/views/pages/peertube/w.blade.php
+++ b/resources/views/pages/peertube/w.blade.php
@@ -1,5 +1,14 @@
 @extends('theme.'.env('THEME').'.peertube')
 
 @section('content')
-  @include('theme.'.env('THEME').'.component.peertube.w')
+  <div id="content" tabindex="-1" class="main-col">
+    <div class="main-row">
+      <my-video-watch class="ng-star-inserted">
+        <div class="root">
+          @include('theme.'.env('THEME').'.component.peertube.parts.w.player')
+          @include('theme.'.env('THEME').'.component.peertube.parts.w.info')
+        </div>
+      </my-video-watch>
+    </div>
+  </div>
 @endsection
diff --git a/resources/views/theme/techsuwa/component/peertube/a.blade.php b/resources/views/theme/techsuwa/component/peertube/a.blade.php
deleted file mode 100644
index b08c10a..0000000
--- a/resources/views/theme/techsuwa/component/peertube/a.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="content" tabindex="-1" class="main-col">
-  <div class="main-row">
-    <div class="root ng-star-inserted">
-      @include('theme.'.env('THEME').'.component.peertube.parts.a.info')
-      @include('theme.'.env('THEME').'.component.peertube.parts.a.links')
-      @include('theme.'.env('THEME').'.component.peertube.parts.a.channels')
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/a/channels.blade.php b/resources/views/theme/techsuwa/component/peertube/a/channels.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/a/channels.blade.php
rename to resources/views/theme/techsuwa/component/peertube/a/channels.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/a/channels/avatar.blade.php b/resources/views/theme/techsuwa/component/peertube/a/channels/avatar.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/a/channels/avatar.blade.php
rename to resources/views/theme/techsuwa/component/peertube/a/channels/avatar.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/a/channels/videos.blade.php b/resources/views/theme/techsuwa/component/peertube/a/channels/videos.blade.php
similarity index 95%
rename from resources/views/theme/techsuwa/component/peertube/parts/a/channels/videos.blade.php
rename to resources/views/theme/techsuwa/component/peertube/a/channels/videos.blade.php
index cbd554e..05fb34b 100644
--- a/resources/views/theme/techsuwa/component/peertube/parts/a/channels/videos.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/a/channels/videos.blade.php
@@ -11,8 +11,8 @@
               $seconds = $v->duration;
               $hours = floor($seconds / 3600);
               $seconds -= $hours * 3600;
-              $minutes = floor($seconds / 60);
-              $seconds -= $minutes * 60;
+              $minutes = sprintf("%02d", floor($seconds / 60));
+              $seconds -= sprintf("%02d", $minutes * 60);
             @endphp
             <div class="video-thumbnail-duration-overlay ng-star-inserted">{{ $hours != 0 ? $hours.':' : '' }}{{ $minutes != 0 ? $minutes.':' : '0:' }}{{ $seconds }}</div>
             <div class="play-overlay ng-star-inserted">
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/a/info.blade.php b/resources/views/theme/techsuwa/component/peertube/a/info.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/a/info.blade.php
rename to resources/views/theme/techsuwa/component/peertube/a/info.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/a/links.blade.php b/resources/views/theme/techsuwa/component/peertube/a/links.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/a/links.blade.php
rename to resources/views/theme/techsuwa/component/peertube/a/links.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/c.blade.php b/resources/views/theme/techsuwa/component/peertube/c.blade.php
deleted file mode 100644
index 9d320be..0000000
--- a/resources/views/theme/techsuwa/component/peertube/c.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="content" tabindex="-1" class="main-col">
-  @include('theme.'.env('THEME').'.component.peertube.parts.c.head')
-  @include('theme.'.env('THEME').'.component.peertube.parts.c.links')
-  @include('theme.'.env('THEME').'.component.peertube.parts.c.'.($res['cat'] == 'video-playlists' ? 'playlists' : 'videos'))
-</div>
\ No newline at end of file
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/c/head.blade.php b/resources/views/theme/techsuwa/component/peertube/c/head.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/c/head.blade.php
rename to resources/views/theme/techsuwa/component/peertube/c/head.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/c/head/banner.blade.php b/resources/views/theme/techsuwa/component/peertube/c/head/banner.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/c/head/banner.blade.php
rename to resources/views/theme/techsuwa/component/peertube/c/head/banner.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/c/head/info.blade.php b/resources/views/theme/techsuwa/component/peertube/c/head/info.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/c/head/info.blade.php
rename to resources/views/theme/techsuwa/component/peertube/c/head/info.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/c/head/owner.blade.php b/resources/views/theme/techsuwa/component/peertube/c/head/owner.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/c/head/owner.blade.php
rename to resources/views/theme/techsuwa/component/peertube/c/head/owner.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/c/links.blade.php b/resources/views/theme/techsuwa/component/peertube/c/links.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/c/links.blade.php
rename to resources/views/theme/techsuwa/component/peertube/c/links.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/c/playlists.blade.php b/resources/views/theme/techsuwa/component/peertube/c/playlists.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/c/playlists.blade.php
rename to resources/views/theme/techsuwa/component/peertube/c/playlists.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/c/videos.blade.php b/resources/views/theme/techsuwa/component/peertube/c/videos.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/c/videos.blade.php
rename to resources/views/theme/techsuwa/component/peertube/c/videos.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/common/paginate.blade.php b/resources/views/theme/techsuwa/component/peertube/common/paginate.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/common/paginate.blade.php
rename to resources/views/theme/techsuwa/component/peertube/common/paginate.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/common/subscribe.blade.php b/resources/views/theme/techsuwa/component/peertube/common/subscribe.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/common/subscribe.blade.php
rename to resources/views/theme/techsuwa/component/peertube/common/subscribe.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/common/videominature.blade.php b/resources/views/theme/techsuwa/component/peertube/common/videominature.blade.php
similarity index 96%
rename from resources/views/theme/techsuwa/component/peertube/parts/common/videominature.blade.php
rename to resources/views/theme/techsuwa/component/peertube/common/videominature.blade.php
index fc0b605..82b2417 100644
--- a/resources/views/theme/techsuwa/component/peertube/parts/common/videominature.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/common/videominature.blade.php
@@ -17,8 +17,8 @@
             $seconds = $v->duration;
             $hours = floor($seconds / 3600);
             $seconds -= $hours * 3600;
-            $minutes = floor($seconds / 60);
-            $seconds -= $minutes * 60;
+            $minutes = sprintf("%02d", floor($seconds / 60));
+            $seconds -= sprintf("%02d", $minutes * 60);
           @endphp
           <div class="video-thumbnail-duration-overlay ng-star-inserted">{{ $hours != 0 ? $hours.':' : '' }}{{ $minutes != 0 ? $minutes.':' : '0:' }}{{ $seconds }}</div>
           <div class="play-overlay ng-star-inserted">
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/common/videosbydate.blade.php b/resources/views/theme/techsuwa/component/peertube/common/videosbydate.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/common/videosbydate.blade.php
rename to resources/views/theme/techsuwa/component/peertube/common/videosbydate.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/header.blade.php b/resources/views/theme/techsuwa/component/peertube/header.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/header.blade.php
rename to resources/views/theme/techsuwa/component/peertube/header.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/manifest.blade.php b/resources/views/theme/techsuwa/component/peertube/manifest.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/manifest.blade.php
rename to resources/views/theme/techsuwa/component/peertube/manifest.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/menu.blade.php b/resources/views/theme/techsuwa/component/peertube/menu.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/menu.blade.php
rename to resources/views/theme/techsuwa/component/peertube/menu.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/menu/footer.blade.php b/resources/views/theme/techsuwa/component/peertube/menu/footer.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/menu/footer.blade.php
rename to resources/views/theme/techsuwa/component/peertube/menu/footer.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/menu/top.blade.php b/resources/views/theme/techsuwa/component/peertube/menu/top.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/menu/top.blade.php
rename to resources/views/theme/techsuwa/component/peertube/menu/top.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/menu/top/inmylibrary.blade.php b/resources/views/theme/techsuwa/component/peertube/menu/top/inmylibrary.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/menu/top/inmylibrary.blade.php
rename to resources/views/theme/techsuwa/component/peertube/menu/top/inmylibrary.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/menu/top/loggedin.blade.php b/resources/views/theme/techsuwa/component/peertube/menu/top/loggedin.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/menu/top/loggedin.blade.php
rename to resources/views/theme/techsuwa/component/peertube/menu/top/loggedin.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/menu/top/loginmenu.blade.php b/resources/views/theme/techsuwa/component/peertube/menu/top/loginmenu.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/menu/top/loginmenu.blade.php
rename to resources/views/theme/techsuwa/component/peertube/menu/top/loginmenu.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/menu/top/notification.blade.php b/resources/views/theme/techsuwa/component/peertube/menu/top/notification.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/menu/top/notification.blade.php
rename to resources/views/theme/techsuwa/component/peertube/menu/top/notification.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/menu/top/oninstance.blade.php b/resources/views/theme/techsuwa/component/peertube/menu/top/oninstance.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/menu/top/oninstance.blade.php
rename to resources/views/theme/techsuwa/component/peertube/menu/top/oninstance.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/meta.blade.php b/resources/views/theme/techsuwa/component/peertube/meta.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/meta.blade.php
rename to resources/views/theme/techsuwa/component/peertube/meta.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/style.blade.php b/resources/views/theme/techsuwa/component/peertube/style.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/style.blade.php
rename to resources/views/theme/techsuwa/component/peertube/style.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/stylelink.blade.php b/resources/views/theme/techsuwa/component/peertube/stylelink.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/stylelink.blade.php
rename to resources/views/theme/techsuwa/component/peertube/stylelink.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/videos/categories.blade.php b/resources/views/theme/techsuwa/component/peertube/videos/categories.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/videos/categories.blade.php
rename to resources/views/theme/techsuwa/component/peertube/videos/categories.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/videos/channels.blade.php b/resources/views/theme/techsuwa/component/peertube/videos/channels.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/videos/channels.blade.php
rename to resources/views/theme/techsuwa/component/peertube/videos/channels.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/videos/local.blade.php b/resources/views/theme/techsuwa/component/peertube/videos/local.blade.php
deleted file mode 100644
index d740438..0000000
--- a/resources/views/theme/techsuwa/component/peertube/videos/local.blade.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<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>
-            @include('theme.'.env('THEME').'.component.peertube.parts.common.videosbydate')
-            @include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
-              'root' => '/peertube/videos/local'
-            ])
-          </div>
-        </my-videos-list>
-      </div>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/theme/techsuwa/component/peertube/videos/overview.blade.php b/resources/views/theme/techsuwa/component/peertube/videos/overview.blade.php
deleted file mode 100644
index 8ad476a..0000000
--- a/resources/views/theme/techsuwa/component/peertube/videos/overview.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<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('theme.'.env('THEME').'.component.peertube.parts.videos.categories') @endif
-          @if (!empty($res['video']->tags)) @include('theme.'.env('THEME').'.component.peertube.parts.videos.tags') @endif
-          @if (!empty($res['video']->channels)) @include('theme.'.env('THEME').'.component.peertube.parts.videos.channels') @endif
-          <div style="margin-top: 16px;"></div>
-          @include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
-            'root' => '/peertube/videos/overview'
-          ])
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/theme/techsuwa/component/peertube/videos/recentlyadded.blade.php b/resources/views/theme/techsuwa/component/peertube/videos/recentlyadded.blade.php
deleted file mode 100644
index 657a82b..0000000
--- a/resources/views/theme/techsuwa/component/peertube/videos/recentlyadded.blade.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<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>
-            @include('theme.'.env('THEME').'.component.peertube.parts.common.videosbydate')
-            @include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
-              'root' => '/peertube/videos/recently-added'
-            ])
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/videos/tags.blade.php b/resources/views/theme/techsuwa/component/peertube/videos/tags.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/videos/tags.blade.php
rename to resources/views/theme/techsuwa/component/peertube/videos/tags.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/videos/trending.blade.php b/resources/views/theme/techsuwa/component/peertube/videos/trending.blade.php
deleted file mode 100644
index fdc2865..0000000
--- a/resources/views/theme/techsuwa/component/peertube/videos/trending.blade.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<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>
-            <div class="videos">
-              @foreach ($res['video']->data as $v)
-                @include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
-              @endforeach
-            </div>
-            @include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
-              'root' => '/peertube/videos/trending'
-            ])
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/theme/techsuwa/component/peertube/w.blade.php b/resources/views/theme/techsuwa/component/peertube/w.blade.php
deleted file mode 100644
index cbefc34..0000000
--- a/resources/views/theme/techsuwa/component/peertube/w.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="content" tabindex="-1" class="main-col">
-  <div class="main-row">
-    <my-video-watch class="ng-star-inserted">
-      <div class="root">
-        @include('theme.'.env('THEME').'.component.peertube.parts.w.player')
-        @include('theme.'.env('THEME').'.component.peertube.parts.w.info')
-      </div>
-    </my-video-watch>
-  </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/info.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/info.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info/attrib.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/attrib.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/info/attrib.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/info/attrib.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info/channel.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/channel.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/info/channel.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/info/channel.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info/comments.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/comments.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/info/comments.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/info/comments.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info/description.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/description.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/info/description.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/info/description.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info/first.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/first.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/info/first.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/info/first.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info/more.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/more.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/info/more.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/info/more.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info/save.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/save.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/info/save.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/info/save.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info/share.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/share.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/info/share.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/info/share.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info/support.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/support.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/info/support.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/info/support.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info/videorate.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/videorate.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/info/videorate.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/info/videorate.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info/viewsdate.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/viewsdate.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/info/viewsdate.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/info/viewsdate.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/player.blade.php b/resources/views/theme/techsuwa/component/peertube/w/player.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/player.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/player.blade.php
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/videorecommend.blade.php b/resources/views/theme/techsuwa/component/peertube/w/videorecommend.blade.php
similarity index 100%
rename from resources/views/theme/techsuwa/component/peertube/parts/w/videorecommend.blade.php
rename to resources/views/theme/techsuwa/component/peertube/w/videorecommend.blade.php