From 5e041ff7c2a72f1fdff75d0bc11dd6248108266f Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 4 Mar 2024 10:01:52 +0100
Subject: [PATCH] Migrate to standalone components

---
 .../about-follows/about-follows.component.ts  |   5 +-
 .../about-instance.component.ts               |  23 +-
 .../about-instance/about-instance.resolver.ts |   2 +-
 .../contact-admin-modal.component.ts          |   9 +-
 .../instance-statistics.component.ts          |   7 +-
 .../about-peertube.component.ts               |   3 +-
 client/src/app/+about/about.component.ts      |   7 +-
 client/src/app/+about/about.module.ts         |  46 ----
 client/src/app/+about/index.ts                |   3 -
 .../{about-routing.module.ts => routes.ts}    |  21 +-
 .../account-video-channels.component.ts       |  10 +-
 .../account-videos.component.ts               |   6 +-
 .../src/app/+accounts/accounts.component.ts   |  31 ++-
 client/src/app/+accounts/accounts.module.ts   |  39 ---
 client/src/app/+accounts/index.ts             |   3 -
 .../{accounts-routing.module.ts => routes.ts} |  22 +-
 client/src/app/+admin/admin-routing.module.ts |  36 ---
 client/src/app/+admin/admin.component.ts      |   7 +-
 client/src/app/+admin/admin.module.ts         | 159 ------------
 .../edit-advanced-configuration.component.ts  |   9 +-
 .../edit-basic-configuration.component.html   |  18 +-
 .../edit-basic-configuration.component.ts     |  29 ++-
 .../edit-custom-config.component.ts           |  30 ++-
 .../edit-homepage.component.ts                |   9 +-
 .../edit-instance-information.component.ts    |  32 ++-
 .../edit-live-configuration.component.ts      |  23 +-
 .../edit-vod-transcoding.component.ts         |  23 +-
 .../followers-list.component.ts               |  27 ++-
 .../following-list/follow-modal.component.ts  |   7 +-
 .../following-list.component.ts               |  26 +-
 .../shared/redundancy-checkbox.component.ts   |   6 +-
 .../video-redundancies-list.component.ts      |  30 ++-
 .../video-redundancy-information.component.ts |   6 +-
 .../abuse-list/abuse-list.component.ts        |   6 +-
 .../instance-account-blocklist.component.ts   |  22 +-
 .../instance-server-blocklist.component.ts    |  22 +-
 .../process-registration-modal.component.ts   |   8 +-
 .../registration-list.component.ts            |  29 ++-
 .../video-block-list.component.ts             |  30 ++-
 .../comments/video-comment-list.component.ts  |  32 ++-
 .../users/user-edit/user-create.component.ts  |  34 ++-
 .../user-edit/user-password.component.ts      |   6 +-
 .../users/user-edit/user-update.component.ts  |  34 ++-
 .../users/user-list/user-list.component.ts    |  48 +++-
 .../overview/videos/video-list.component.ts   |  38 ++-
 .../plugin-list-installed.component.ts        |  20 +-
 .../plugin-search/plugin-search.component.ts  |  22 +-
 .../plugin-show-installed.component.ts        |   7 +-
 .../plugins/shared/plugin-card.component.ts   |   5 +-
 .../shared/plugin-navigation.component.ts     |   6 +-
 client/src/app/+admin/routes.ts               |  66 +++++
 client/src/app/+admin/shared/index.ts         |   3 +-
 .../app/+admin/shared/shared-admin.module.ts  |  23 --
 .../shared/user-email-info.component.ts       |   5 +-
 .../shared/user-real-quota-info.component.ts  |   6 +-
 .../+admin/system/debug/debug.component.ts    |   3 +-
 .../app/+admin/system/jobs/jobs.component.ts  |  24 +-
 .../app/+admin/system/logs/logs.component.ts  |   9 +-
 .../runner-job-list.component.ts              |  29 ++-
 .../runner-list/runner-list.component.ts      |  22 +-
 ...unner-registration-token-list.component.ts |  26 +-
 .../app/+error-page/error-page.component.ts   |   6 +-
 .../src/app/+error-page/error-page.module.ts  |  25 --
 ...error-page-routing.module.ts => routes.ts} |  13 +-
 client/src/app/+home/home-routing.module.ts   |  21 --
 client/src/app/+home/home.component.ts        |   5 +-
 client/src/app/+home/home.module.ts           |  25 --
 client/src/app/+home/index.ts                 |   3 -
 client/src/app/+home/routes.ts                |  29 +++
 client/src/app/+login/login.component.ts      |  26 +-
 client/src/app/+login/login.module.ts         |  31 ---
 .../{login-routing.module.ts => routes.ts}    |  14 +-
 client/src/app/+manage/manage.module.ts       |  31 ---
 .../{manage-routing.module.ts => routes.ts}   |  13 +-
 .../video-channel-create.component.ts         |  21 +-
 .../video-channel-update.component.ts         |  23 +-
 client/src/app/+my-account/index.ts           |   3 -
 .../my-account-abuses-list.component.ts       |   6 +-
 .../my-account-applications.component.ts      |   6 +-
 .../my-account-blocklist.component.ts         |  22 +-
 .../my-account-server-blocklist.component.ts  |  22 +-
 .../my-account-export.component.ts            |   9 +-
 .../my-account-import-export.component.ts     |   6 +-
 .../my-account-import.component.ts            |   7 +-
 .../my-account-notifications.component.ts     |   8 +-
 .../my-account-change-email.component.ts      |   7 +-
 .../my-account-change-password.component.ts   |   7 +-
 .../my-account-danger-zone.component.ts       |   3 +-
 .../my-account-email-preferences.component.ts |   6 +-
 ...ount-notification-preferences.component.ts |   7 +-
 .../my-account-profile.component.ts           |   6 +-
 .../my-account-settings.component.ts          |  32 ++-
 .../my-account-two-factor-button.component.ts |   6 +-
 .../my-account-two-factor.component.ts        |  10 +-
 .../app/+my-account/my-account.component.ts   |   8 +-
 .../src/app/+my-account/my-account.module.ts  |  97 --------
 ...my-account-routing.module.ts => routes.ts} |  26 +-
 .../my-video-channels.component.ts            |  30 ++-
 .../my-video-channels.module.ts               |  29 ---
 ...o-channels-routing.module.ts => routes.ts} |  13 +-
 client/src/app/+my-library/index.ts           |   3 -
 .../my-follows/my-followers.component.ts      |   9 +-
 .../my-follows/my-subscriptions.component.ts  |  20 +-
 .../my-history/my-history.component.ts        |  20 +-
 .../app/+my-library/my-library.component.ts   |   8 +-
 .../src/app/+my-library/my-library.module.ts  |  87 -------
 .../my-accept-ownership.component.ts          |   8 +-
 .../my-ownership/my-ownership.component.ts    |  25 +-
 .../my-video-channel-syncs.component.ts       |  24 +-
 .../video-channel-sync-edit.component.ts      |   7 +-
 .../my-video-imports.component.ts             |  32 ++-
 .../my-video-playlist-create.component.ts     |  24 +-
 .../my-video-playlist-elements.component.ts   |  23 +-
 .../my-video-playlist-update.component.ts     |  24 +-
 .../my-video-playlists.component.ts           |  24 +-
 .../video-change-ownership.component.ts       |   8 +-
 .../my-videos/my-videos.component.ts          |  24 +-
 ...my-library-routing.module.ts => routes.ts} |  28 ++-
 client/src/app/+plugin-pages/index.ts         |   3 -
 .../plugin-pages-routing.module.ts            |  19 --
 .../+plugin-pages/plugin-pages.component.ts   |   3 +-
 .../app/+plugin-pages/plugin-pages.module.ts  |  21 --
 client/src/app/+plugin-pages/routes.ts        |  12 +
 .../remote-interaction.component.ts           |   5 +-
 .../remote-interaction.module.ts              |  26 --
 ...nteraction-routing.module.ts => routes.ts} |  18 +-
 .../reset-password-routing.module.ts          |  21 --
 .../reset-password.component.ts               |   8 +-
 .../+reset-password/reset-password.module.ts  |  26 --
 client/src/app/+reset-password/routes.ts      |  14 ++
 client/src/app/+search/routes.ts              |  46 ++++
 .../app/+search/search-filters.component.ts   |   7 +-
 .../src/app/+search/search-routing.module.ts  |  43 ----
 client/src/app/+search/search.component.ts    |  28 ++-
 client/src/app/+search/search.module.ts       |  44 ----
 .../+register/custom-stepper.component.ts     |   6 +-
 .../+signup/+register/register.component.ts   |  34 ++-
 .../app/+signup/+register/register.module.ts  |  39 ---
 .../{register-routing.module.ts => routes.ts} |  15 +-
 .../steps/register-step-about.component.ts    |   7 +-
 .../steps/register-step-channel.component.ts  |   8 +-
 .../steps/register-step-terms.component.ts    |   9 +-
 .../steps/register-step-user.component.ts     |   8 +-
 ...fy-account-routing.module.ts => routes.ts} |  15 +-
 ...verify-account-ask-send-email.component.ts |   6 +-
 .../verify-account-email.component.ts         |   8 +-
 .../+verify-account/verify-account.module.ts  |  24 --
 .../+signup/shared/shared-signup.module.ts    |  42 ----
 .../+signup/shared/signup-mascot.component.ts |   3 +-
 .../shared/signup-step-title.component.ts     |   6 +-
 .../signup-success-after-email.component.ts   |   6 +-
 .../signup-success-before-email.component.ts  |   6 +-
 client/src/app/+stats/index.ts                |   1 -
 .../{stats-routing.module.ts => routes.ts}    |  21 +-
 client/src/app/+stats/stats.module.ts         |  31 ---
 .../app/+stats/video/video-stats.component.ts |  29 ++-
 client/src/app/+video-channels/index.ts       |   3 -
 ...o-channels-routing.module.ts => routes.ts} |  24 +-
 .../video-channel-playlists.component.ts      |   7 +-
 .../video-channel-videos.component.ts         |   6 +-
 .../video-channels.component.ts               |  27 ++-
 .../+video-channels/video-channels.module.ts  |  45 ----
 .../edit/video-studio-edit.component.ts       |  19 +-
 client/src/app/+video-studio/index.ts         |   1 -
 ...deo-studio-routing.module.ts => routes.ts} |  15 +-
 .../app/+video-studio/video-studio.module.ts  |  26 --
 .../src/app/+videos/+video-edit/add-routes.ts |  20 ++
 .../video-caption-add-modal.component.ts      |   9 +-
 ...eo-caption-edit-modal-content.component.ts |   7 +-
 .../shared/video-edit.component.ts            |  66 ++++-
 .../+video-edit/shared/video-edit.module.ts   |  44 ----
 .../app/+videos/+video-edit/update-routes.ts  |  25 ++
 .../drag-drop.directive.ts                    |   3 +-
 .../video-go-live.component.ts                |  20 ++
 .../video-import-torrent.component.ts         |  26 ++
 .../video-import-url.component.ts             |  24 +-
 .../video-upload.component.ts                 |  26 ++
 .../+video-edit/video-add-routing.module.ts   |  19 --
 .../+video-edit/video-add.component.ts        |  27 ++-
 .../+videos/+video-edit/video-add.module.ts   |  37 ---
 .../video-update-routing.module.ts            |  23 --
 .../+video-edit/video-update.component.ts     |  20 +-
 .../+video-edit/video-update.module.ts        |  27 ---
 .../+video-watch/player-styles.component.ts   |   3 +-
 client/src/app/+videos/+video-watch/routes.ts |  42 ++++
 .../action-buttons.component.ts               |  25 +-
 .../action-buttons/video-rate.component.ts    |   7 +-
 .../comment/video-comment-add.component.ts    |  27 ++-
 .../shared/comment/video-comment.component.ts |  22 +-
 .../comment/video-comments.component.ts       |  24 +-
 .../information/privacy-concerns.component.ts |   5 +-
 .../information/video-alert.component.ts      |   5 +-
 .../metadata/video-attributes.component.ts    |   8 +-
 .../video-avatar-channel.component.ts         |   6 +-
 .../metadata/video-description.component.ts   |   6 +-
 .../video-watch-playlist.component.ts         |   9 +-
 .../shared/recommendations/index.ts           |   1 -
 .../recommendations/recommendations.module.ts |  34 ---
 .../recommended-videos.component.ts           |   9 +-
 .../timestamp-route-transformer.directive.ts  |   3 +-
 .../video-watch-routing.module.ts             |  24 --
 .../+video-watch/video-watch.component.ts     |  39 ++-
 .../+video-watch/video-watch.module.ts        |  85 -------
 client/src/app/+videos/index.ts               |   1 -
 .../{videos-routing.module.ts => routes.ts}   |  23 +-
 .../overview/video-overview.component.ts      |   9 +-
 .../video-user-subscriptions.component.ts     |   5 +-
 .../videos-list-common-page.component.ts      |   5 +-
 client/src/app/+videos/videos.module.ts       |  37 ---
 client/src/app/app.component.ts               |  36 ++-
 client/src/app/app.module.ts                  | 103 --------
 .../{app-routing.module.ts => app.routes.ts}  |  70 ++----
 .../{core.module.ts => core-providers.ts}     |  40 +--
 client/src/app/core/index.ts                  |   2 +-
 client/src/app/core/module-import-guard.ts    |   5 -
 client/src/app/core/routing/index.ts          |   1 -
 client/src/app/empty.component.ts             |   3 +-
 client/src/app/header/header.component.ts     |   7 +-
 client/src/app/header/highlight.pipe.ts       |   5 +-
 .../app/header/search-typeahead.component.ts  |   7 +-
 client/src/app/header/suggestion.component.ts |   7 +-
 .../homepage-redirect.component.ts            |   5 +-
 .../hotkeys/hotkeys-cheat-sheet.component.ts  |   7 +-
 client/src/app/index.ts                       |   1 -
 .../app/menu/language-chooser.component.ts    |   4 +-
 client/src/app/menu/menu.component.ts         |  27 ++-
 client/src/app/menu/notification.component.ts |   9 +-
 .../menu/quick-settings-modal.component.ts    |   6 +-
 .../account-setup-warning-modal.component.ts  |   7 +-
 .../modal/admin-welcome-modal.component.ts    |   4 +-
 client/src/app/modal/confirm.component.ts     |   8 +-
 .../src/app/modal/custom-modal.component.ts   |   6 +-
 ...instance-config-warning-modal.component.ts |   7 +-
 .../abuse-details.component.ts                |   9 +-
 .../abuse-list-table.component.ts             |  34 ++-
 .../abuse-message-modal.component.ts          |   7 +-
 .../moderation-comment-modal.component.ts     |   7 +-
 .../shared-abuse-list.module.ts               |  45 ----
 .../actor-avatar-edit.component.ts            |   9 +-
 .../actor-banner-edit.component.ts            |   8 +-
 .../shared-actor-image-edit.module.ts         |  30 ---
 .../actor-avatar.component.ts                 |   6 +-
 .../shared-actor-image.module.ts              |  22 --
 .../custom-markup-container.component.ts      |   3 +-
 .../custom-markup-help.component.ts           |   3 +-
 .../app/shared/shared-custom-markup/index.ts  |   1 -
 .../button-markup.component.ts                |   5 +-
 .../channel-miniature-markup.component.ts     |   8 +-
 .../embed-markup.component.ts                 |   3 +-
 .../instance-avatar-markup.component.ts       |   6 +-
 .../instance-banner-markup.component.ts       |   5 +-
 .../playlist-miniature-markup.component.ts    |   6 +-
 .../video-miniature-markup.component.ts       |   6 +-
 .../videos-list-markup.component.ts           |   6 +-
 .../shared-custom-markup.module.ts            |  67 ------
 .../advanced-input-filter.component.ts        |   8 +-
 .../dynamic-form-field.component.ts           |  20 +-
 client/src/app/shared/shared-forms/index.ts   |   2 +-
 .../shared-forms/input-switch.component.ts    |   3 +-
 .../shared-forms/input-text.component.ts      |   9 +-
 .../markdown-textarea.component.ts            |  20 +-
 .../peertube-checkbox.component.ts            |   8 +-
 .../shared-forms/preview-upload.component.ts  |   6 +-
 .../shared-forms/reactive-file.component.ts   |   9 +-
 .../select/select-categories.component.ts     |   7 +-
 .../select/select-channel.component.ts        |   8 +-
 .../select/select-checkbox-all.component.ts   |  10 +-
 .../select/select-checkbox.component.ts       |   7 +-
 .../select/select-custom-value.component.ts   |   8 +-
 .../select/select-languages.component.ts      |   7 +-
 .../select/select-options.component.ts        |   8 +-
 .../select/select-tags.component.ts           |   7 +-
 .../shared-forms/shared-form-providers.ts     |   6 +
 .../shared/shared-forms/shared-form.module.ts | 103 --------
 .../textarea-autoresize.directive.ts          |   3 +-
 .../shared-forms/timestamp-input.component.ts |   8 +-
 .../shared-icons/global-icon.component.ts     |   3 +-
 client/src/app/shared/shared-icons/index.ts   |   2 -
 .../shared-icons/shared-global-icon.module.ts |  20 --
 .../feature-boolean.component.ts              |   6 +-
 .../src/app/shared/shared-instance/index.ts   |   2 -
 .../instance-about-accordion.component.ts     |  33 ++-
 .../instance-banner.component.ts              |   5 +-
 .../instance-features-table.component.ts      |   9 +-
 .../shared-instance/shared-instance.module.ts |  38 ---
 .../shared-main/account/account.service.ts    |   2 +-
 .../account/signup-label.component.ts         |   5 +-
 .../angular/auto-colspan.directive.ts         |   3 +-
 .../angular/autofocus.directive.ts            |   3 +-
 .../shared/shared-main/angular/bytes.pipe.ts  |   5 +-
 .../angular/days-duration-formatter.pipe.ts   |   3 +-
 .../angular/defer-loading.directive.ts        |   3 +-
 .../shared-main/angular/from-now.pipe.ts      |   5 +-
 .../angular/infinite-scroller.directive.ts    |   3 +-
 .../shared-main/angular/link.component.ts     |   6 +-
 .../angular/login-link.component.ts           |   5 +-
 .../angular/number-formatter.pipe.ts          |   5 +-
 .../angular/peertube-template.directive.ts    |   3 +-
 .../angular/time-duration-formatter.pipe.ts   |   3 +-
 .../buttons/action-dropdown.component.ts      |   9 +-
 .../shared-main/buttons/button.component.ts   |   9 +-
 .../buttons/copy-button.component.ts          |   7 +-
 .../buttons/delete-button.component.ts        |   5 +-
 .../buttons/edit-button.component.ts          |   5 +-
 .../shared-main/date/date-toggle.component.ts |   3 +-
 .../shared-main/feeds/feed.component.ts       |   7 +-
 client/src/app/shared/shared-main/index.ts    |   3 +-
 .../app/shared/shared-main/instance/index.ts  |   1 +
 .../instance}/instance.service.ts             |   2 +-
 .../shared-main/loaders/loader.component.ts   |   5 +-
 .../app/shared/shared-main/main-providers.ts  |  44 ++++
 .../misc/channels-setup-message.component.ts  |   7 +-
 .../shared/shared-main/misc/help.component.ts |   7 +-
 .../misc/list-overflow.component.ts           |  19 +-
 .../misc/simple-search-input.component.ts     |   7 +-
 .../misc/top-menu-dropdown.component.ts       |  21 +-
 .../plugins/plugin-placeholder.component.ts   |   3 +-
 .../plugins/plugin-selector.directive.ts      |   5 +-
 .../shared/shared-main/shared-main.module.ts  | 227 ------------------
 .../shared-main/users/user-quota.component.ts |   6 +-
 .../video-channel/video-channel.service.ts    |   2 +-
 .../shared-main/video/embed.component.ts      |   3 +-
 .../account-block-badges.component.ts         |   5 +-
 .../account-blocklist.component.ts            |   4 +-
 .../batch-domains-modal.component.ts          |   7 +-
 .../src/app/shared/shared-moderation/index.ts |   1 -
 .../report-modals/account-report.component.ts |  19 +-
 .../report-modals/comment-report.component.ts |  19 +-
 .../report-modals/video-report.component.ts   |  27 ++-
 .../server-blocklist.component.ts             |   4 +-
 .../shared-moderation.module.ts               |  58 -----
 .../user-ban-modal.component.ts               |   9 +-
 .../user-moderation-dropdown.component.ts     |   7 +-
 .../video-block.component.ts                  |   9 +-
 client/src/app/shared/shared-search/index.ts  |   1 -
 .../shared-search/shared-search.module.ts     |  24 --
 .../app/shared/shared-share-modal/index.ts    |   2 -
 .../shared-share-modal.module.ts              |  27 ---
 .../video-share.component.ts                  |  43 +++-
 .../app/shared/shared-support-modal/index.ts  |   2 -
 .../shared-support-modal.module.ts            |  24 --
 .../support-modal.component.ts                |   5 +-
 client/src/app/shared/shared-tables/index.ts  |   1 -
 .../shared-tables/shared-tables.module.ts     |  24 --
 .../table-expander-icon.component.ts          |   6 +-
 .../shared-tables/video-cell.component.ts     |   3 +-
 .../src/app/shared/shared-thumbnail/index.ts  |   1 -
 .../shared-thumbnail.module.ts                |  22 --
 .../video-thumbnail.component.ts              |   8 +-
 .../app/shared/shared-user-settings/index.ts  |   2 -
 .../shared-user-settings.module.ts            |  25 --
 .../user-interface-settings.component.ts      |   6 +-
 .../user-video-settings.component.ts          |  20 +-
 .../shared/shared-user-subscription/index.ts  |   2 -
 .../remote-subscribe.component.ts             |   8 +-
 .../shared-user-subscription.module.ts        |  28 ---
 .../subscribe-button.component.ts             |  17 +-
 client/src/app/shared/shared-users/index.ts   |   2 -
 .../shared-users/shared-users.module.ts       |  20 --
 .../app/shared/shared-video-comment/index.ts  |   2 -
 .../shared-video-comment.module.ts            |  18 --
 .../src/app/shared/shared-video-live/index.ts |   2 -
 .../live-documentation-link.component.ts      |   3 +-
 .../live-stream-information.component.ts      |  19 +-
 .../shared-video-live.module.ts               |  30 ---
 .../shared/shared-video-miniature/index.ts    |   1 -
 .../shared-video-miniature.module.ts          |  51 ----
 .../video-actions-dropdown.component.ts       |  19 +-
 .../video-download.component.ts               |  34 ++-
 .../video-filters-header.component.ts         |  28 ++-
 .../video-miniature.component.ts              |  24 +-
 .../videos-list.component.ts                  |  27 ++-
 .../videos-selection.component.ts             |  10 +-
 .../app/shared/shared-video-playlist/index.ts |   2 -
 .../shared-video-playlist.module.ts           |  37 ---
 .../video-add-to-playlist.component.ts        |  18 +-
 ...eo-playlist-element-miniature.component.ts |  33 ++-
 .../video-playlist-miniature.component.ts     |   8 +-
 client/src/app/shared/shared-video/index.ts   |   2 +-
 .../shared-video/shared-video.module.ts       |  18 --
 .../video-views-counter.component.ts          |   6 +-
 .../user-notifications.component.ts           |   7 +-
 client/src/main.ts                            |  99 +++++++-
 383 files changed, 3448 insertions(+), 3148 deletions(-)
 delete mode 100644 client/src/app/+about/about.module.ts
 delete mode 100644 client/src/app/+about/index.ts
 rename client/src/app/+about/{about-routing.module.ts => routes.ts} (80%)
 delete mode 100644 client/src/app/+accounts/accounts.module.ts
 delete mode 100644 client/src/app/+accounts/index.ts
 rename client/src/app/+accounts/{accounts-routing.module.ts => routes.ts} (70%)
 delete mode 100644 client/src/app/+admin/admin-routing.module.ts
 delete mode 100644 client/src/app/+admin/admin.module.ts
 create mode 100644 client/src/app/+admin/routes.ts
 delete mode 100644 client/src/app/+admin/shared/shared-admin.module.ts
 delete mode 100644 client/src/app/+error-page/error-page.module.ts
 rename client/src/app/+error-page/{error-page-routing.module.ts => routes.ts} (54%)
 delete mode 100644 client/src/app/+home/home-routing.module.ts
 delete mode 100644 client/src/app/+home/home.module.ts
 delete mode 100644 client/src/app/+home/index.ts
 create mode 100644 client/src/app/+home/routes.ts
 delete mode 100644 client/src/app/+login/login.module.ts
 rename client/src/app/+login/{login-routing.module.ts => routes.ts} (55%)
 delete mode 100644 client/src/app/+manage/manage.module.ts
 rename client/src/app/+manage/{manage-routing.module.ts => routes.ts} (67%)
 delete mode 100644 client/src/app/+my-account/index.ts
 delete mode 100644 client/src/app/+my-account/my-account.module.ts
 rename client/src/app/+my-account/{my-account-routing.module.ts => routes.ts} (87%)
 delete mode 100644 client/src/app/+my-library/+my-video-channels/my-video-channels.module.ts
 rename client/src/app/+my-library/+my-video-channels/{my-video-channels-routing.module.ts => routes.ts} (56%)
 delete mode 100644 client/src/app/+my-library/index.ts
 delete mode 100644 client/src/app/+my-library/my-library.module.ts
 rename client/src/app/+my-library/{my-library-routing.module.ts => routes.ts} (87%)
 delete mode 100644 client/src/app/+plugin-pages/index.ts
 delete mode 100644 client/src/app/+plugin-pages/plugin-pages-routing.module.ts
 delete mode 100644 client/src/app/+plugin-pages/plugin-pages.module.ts
 create mode 100644 client/src/app/+plugin-pages/routes.ts
 delete mode 100644 client/src/app/+remote-interaction/remote-interaction.module.ts
 rename client/src/app/+remote-interaction/{remote-interaction-routing.module.ts => routes.ts} (50%)
 delete mode 100644 client/src/app/+reset-password/reset-password-routing.module.ts
 delete mode 100644 client/src/app/+reset-password/reset-password.module.ts
 create mode 100644 client/src/app/+reset-password/routes.ts
 create mode 100644 client/src/app/+search/routes.ts
 delete mode 100644 client/src/app/+search/search-routing.module.ts
 delete mode 100644 client/src/app/+search/search.module.ts
 delete mode 100644 client/src/app/+signup/+register/register.module.ts
 rename client/src/app/+signup/+register/{register-routing.module.ts => routes.ts} (56%)
 rename client/src/app/+signup/+verify-account/{verify-account-routing.module.ts => routes.ts} (71%)
 delete mode 100644 client/src/app/+signup/+verify-account/verify-account.module.ts
 delete mode 100644 client/src/app/+signup/shared/shared-signup.module.ts
 delete mode 100644 client/src/app/+stats/index.ts
 rename client/src/app/+stats/{stats-routing.module.ts => routes.ts} (52%)
 delete mode 100644 client/src/app/+stats/stats.module.ts
 delete mode 100644 client/src/app/+video-channels/index.ts
 rename client/src/app/+video-channels/{video-channels-routing.module.ts => routes.ts} (65%)
 delete mode 100644 client/src/app/+video-channels/video-channels.module.ts
 delete mode 100644 client/src/app/+video-studio/index.ts
 rename client/src/app/+video-studio/{video-studio-routing.module.ts => routes.ts} (63%)
 delete mode 100644 client/src/app/+video-studio/video-studio.module.ts
 create mode 100644 client/src/app/+videos/+video-edit/add-routes.ts
 delete mode 100644 client/src/app/+videos/+video-edit/shared/video-edit.module.ts
 create mode 100644 client/src/app/+videos/+video-edit/update-routes.ts
 delete mode 100644 client/src/app/+videos/+video-edit/video-add-routing.module.ts
 delete mode 100644 client/src/app/+videos/+video-edit/video-add.module.ts
 delete mode 100644 client/src/app/+videos/+video-edit/video-update-routing.module.ts
 delete mode 100644 client/src/app/+videos/+video-edit/video-update.module.ts
 create mode 100644 client/src/app/+videos/+video-watch/routes.ts
 delete mode 100644 client/src/app/+videos/+video-watch/shared/recommendations/recommendations.module.ts
 delete mode 100644 client/src/app/+videos/+video-watch/video-watch-routing.module.ts
 delete mode 100644 client/src/app/+videos/+video-watch/video-watch.module.ts
 delete mode 100644 client/src/app/+videos/index.ts
 rename client/src/app/+videos/{videos-routing.module.ts => routes.ts} (73%)
 delete mode 100644 client/src/app/+videos/videos.module.ts
 delete mode 100644 client/src/app/app.module.ts
 rename client/src/app/{app-routing.module.ts => app.routes.ts} (51%)
 rename client/src/app/core/{core.module.ts => core-providers.ts} (71%)
 delete mode 100644 client/src/app/core/module-import-guard.ts
 rename client/src/app/{core/routing => }/homepage-redirect.component.ts (88%)
 delete mode 100644 client/src/app/index.ts
 delete mode 100644 client/src/app/shared/shared-abuse-list/shared-abuse-list.module.ts
 delete mode 100644 client/src/app/shared/shared-actor-image-edit/shared-actor-image-edit.module.ts
 delete mode 100644 client/src/app/shared/shared-actor-image/shared-actor-image.module.ts
 delete mode 100644 client/src/app/shared/shared-custom-markup/shared-custom-markup.module.ts
 create mode 100644 client/src/app/shared/shared-forms/shared-form-providers.ts
 delete mode 100644 client/src/app/shared/shared-forms/shared-form.module.ts
 delete mode 100644 client/src/app/shared/shared-icons/shared-global-icon.module.ts
 delete mode 100644 client/src/app/shared/shared-instance/shared-instance.module.ts
 create mode 100644 client/src/app/shared/shared-main/instance/index.ts
 rename client/src/app/shared/{shared-instance => shared-main/instance}/instance.service.ts (98%)
 create mode 100644 client/src/app/shared/shared-main/main-providers.ts
 delete mode 100644 client/src/app/shared/shared-main/shared-main.module.ts
 delete mode 100644 client/src/app/shared/shared-moderation/shared-moderation.module.ts
 delete mode 100644 client/src/app/shared/shared-search/shared-search.module.ts
 delete mode 100644 client/src/app/shared/shared-share-modal/shared-share-modal.module.ts
 delete mode 100644 client/src/app/shared/shared-support-modal/shared-support-modal.module.ts
 delete mode 100644 client/src/app/shared/shared-tables/shared-tables.module.ts
 delete mode 100644 client/src/app/shared/shared-thumbnail/shared-thumbnail.module.ts
 delete mode 100644 client/src/app/shared/shared-user-settings/shared-user-settings.module.ts
 delete mode 100644 client/src/app/shared/shared-user-subscription/shared-user-subscription.module.ts
 delete mode 100644 client/src/app/shared/shared-users/shared-users.module.ts
 delete mode 100644 client/src/app/shared/shared-video-comment/shared-video-comment.module.ts
 delete mode 100644 client/src/app/shared/shared-video-live/shared-video-live.module.ts
 delete mode 100644 client/src/app/shared/shared-video-miniature/shared-video-miniature.module.ts
 delete mode 100644 client/src/app/shared/shared-video-playlist/shared-video-playlist.module.ts
 delete mode 100644 client/src/app/shared/shared-video/shared-video.module.ts

diff --git a/client/src/app/+about/about-follows/about-follows.component.ts b/client/src/app/+about/about-follows/about-follows.component.ts
index a542cdbf1..8df44f689 100644
--- a/client/src/app/+about/about-follows/about-follows.component.ts
+++ b/client/src/app/+about/about-follows/about-follows.component.ts
@@ -3,11 +3,14 @@ import { Component, OnInit } from '@angular/core'
 import { ComponentPagination, hasMoreItems, Notifier, RestService, ServerService } from '@app/core'
 import { InstanceFollowService } from '@app/shared/shared-instance'
 import { Actor } from '@peertube/peertube-models'
+import { NgIf, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-about-follows',
   templateUrl: './about-follows.component.html',
-  styleUrls: [ './about-follows.component.scss' ]
+  styleUrls: [ './about-follows.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, NgFor ]
 })
 
 export class AboutFollowsComponent implements OnInit {
diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts
index e22352eea..2f8cde98a 100644
--- a/client/src/app/+about/about-instance/about-instance.component.ts
+++ b/client/src/app/+about/about-instance/about-instance.component.ts
@@ -1,17 +1,32 @@
-import { ViewportScroller } from '@angular/common'
+import { ViewportScroller, NgIf, NgFor } from '@angular/common'
 import { AfterViewChecked, Component, ElementRef, OnInit, ViewChild } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
+import { ActivatedRoute, RouterLink } from '@angular/router'
 import { Notifier, ServerService } from '@app/core'
-import { AboutHTML } from '@app/shared/shared-instance'
 import { HTMLServerConfig, ServerStats } from '@peertube/peertube-models'
 import { copyToClipboard } from '@root-helpers/utils'
 import { ResolverData } from './about-instance.resolver'
 import { ContactAdminModalComponent } from './contact-admin-modal.component'
+import { InstanceStatisticsComponent } from './instance-statistics.component'
+import { InstanceFeaturesTableComponent } from '../../shared/shared-instance/instance-features-table.component'
+import { PluginSelectorDirective } from '../../shared/shared-main/plugins/plugin-selector.directive'
+import { CustomMarkupContainerComponent } from '../../shared/shared-custom-markup/custom-markup-container.component'
+import { AboutHTML } from '@app/shared/shared-main'
 
 @Component({
   selector: 'my-about-instance',
   templateUrl: './about-instance.component.html',
-  styleUrls: [ './about-instance.component.scss' ]
+  styleUrls: [ './about-instance.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    RouterLink,
+    NgFor,
+    CustomMarkupContainerComponent,
+    PluginSelectorDirective,
+    InstanceFeaturesTableComponent,
+    InstanceStatisticsComponent,
+    ContactAdminModalComponent
+  ]
 })
 export class AboutInstanceComponent implements OnInit, AfterViewChecked {
   @ViewChild('descriptionWrapper') descriptionWrapper: ElementRef<HTMLInputElement>
diff --git a/client/src/app/+about/about-instance/about-instance.resolver.ts b/client/src/app/+about/about-instance/about-instance.resolver.ts
index b5e8ccaa2..f98a21d5a 100644
--- a/client/src/app/+about/about-instance/about-instance.resolver.ts
+++ b/client/src/app/+about/about-instance/about-instance.resolver.ts
@@ -3,8 +3,8 @@ import { map, switchMap } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { ServerService } from '@app/core'
 import { CustomMarkupService } from '@app/shared/shared-custom-markup'
-import { AboutHTML, InstanceService } from '@app/shared/shared-instance'
 import { About, ServerStats } from '@peertube/peertube-models'
+import { InstanceService, AboutHTML } from '@app/shared/shared-main'
 
 export type ResolverData = {
   serverStats: ServerStats
diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.ts b/client/src/app/+about/about-instance/contact-admin-modal.component.ts
index 38e577fcd..60c2a47ea 100644
--- a/client/src/app/+about/about-instance/contact-admin-modal.component.ts
+++ b/client/src/app/+about/about-instance/contact-admin-modal.component.ts
@@ -8,10 +8,13 @@ import {
   SUBJECT_VALIDATOR
 } from '@app/shared/form-validators/instance-validators'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
-import { InstanceService } from '@app/shared/shared-instance'
+import { InstanceService } from '@app/shared/shared-main'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
 import { HTMLServerConfig, HttpStatusCode } from '@peertube/peertube-models'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf, NgClass } from '@angular/common'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 type Prefill = {
   subject?: string
@@ -21,7 +24,9 @@ type Prefill = {
 @Component({
   selector: 'my-contact-admin-modal',
   templateUrl: './contact-admin-modal.component.html',
-  styleUrls: [ './contact-admin-modal.component.scss' ]
+  styleUrls: [ './contact-admin-modal.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent, NgIf, FormsModule, ReactiveFormsModule, NgClass ]
 })
 export class ContactAdminModalComponent extends FormReactive implements OnInit {
   @ViewChild('modal', { static: true }) modal: NgbModal
diff --git a/client/src/app/+about/about-instance/instance-statistics.component.ts b/client/src/app/+about/about-instance/instance-statistics.component.ts
index 9eb56d0a4..cc918f856 100644
--- a/client/src/app/+about/about-instance/instance-statistics.component.ts
+++ b/client/src/app/+about/about-instance/instance-statistics.component.ts
@@ -1,10 +1,15 @@
 import { Component, Input } from '@angular/core'
 import { ServerStats } from '@peertube/peertube-models'
+import { BytesPipe } from '../../shared/shared-main/angular/bytes.pipe'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
+import { NgIf, DecimalPipe } from '@angular/common'
 
 @Component({
   selector: 'my-instance-statistics',
   templateUrl: './instance-statistics.component.html',
-  styleUrls: [ './instance-statistics.component.scss' ]
+  styleUrls: [ './instance-statistics.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, GlobalIconComponent, DecimalPipe, BytesPipe ]
 })
 export class InstanceStatisticsComponent {
   @Input() serverStats: ServerStats
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.ts b/client/src/app/+about/about-peertube/about-peertube.component.ts
index b175a41bc..729034dc8 100644
--- a/client/src/app/+about/about-peertube/about-peertube.component.ts
+++ b/client/src/app/+about/about-peertube/about-peertube.component.ts
@@ -4,7 +4,8 @@ import { ViewportScroller } from '@angular/common'
 @Component({
   selector: 'my-about-peertube',
   templateUrl: './about-peertube.component.html',
-  styleUrls: [ './about-peertube.component.scss' ]
+  styleUrls: [ './about-peertube.component.scss' ],
+  standalone: true
 })
 
 export class AboutPeertubeComponent implements AfterViewChecked {
diff --git a/client/src/app/+about/about.component.ts b/client/src/app/+about/about.component.ts
index d24225714..f0f26f902 100644
--- a/client/src/app/+about/about.component.ts
+++ b/client/src/app/+about/about.component.ts
@@ -1,9 +1,14 @@
 import { Component } from '@angular/core'
 import { ScreenService } from '@app/core'
+import { RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router'
+import { PluginSelectorDirective } from '../shared/shared-main/plugins/plugin-selector.directive'
+import { NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-about',
-  templateUrl: './about.component.html'
+  templateUrl: './about.component.html',
+  standalone: true,
+  imports: [ NgClass, PluginSelectorDirective, RouterLink, RouterLinkActive, RouterOutlet ]
 })
 
 export class AboutComponent {
diff --git a/client/src/app/+about/about.module.ts b/client/src/app/+about/about.module.ts
deleted file mode 100644
index 2cdfdf822..000000000
--- a/client/src/app/+about/about.module.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { NgModule } from '@angular/core'
-import { AboutFollowsComponent } from '@app/+about/about-follows/about-follows.component'
-import { AboutInstanceComponent } from '@app/+about/about-instance/about-instance.component'
-import { AboutInstanceResolver } from '@app/+about/about-instance/about-instance.resolver'
-import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component'
-import { InstanceStatisticsComponent } from '@app/+about/about-instance/instance-statistics.component'
-import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertube.component'
-import { SharedCustomMarkupModule } from '@app/shared/shared-custom-markup'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedInstanceModule } from '@app/shared/shared-instance'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { AboutRoutingModule } from './about-routing.module'
-import { AboutComponent } from './about.component'
-
-@NgModule({
-  imports: [
-    AboutRoutingModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedInstanceModule,
-    SharedGlobalIconModule,
-    SharedCustomMarkupModule
-  ],
-
-  declarations: [
-    AboutComponent,
-
-    AboutInstanceComponent,
-    ContactAdminModalComponent,
-    InstanceStatisticsComponent,
-
-    AboutPeertubeComponent,
-    AboutFollowsComponent
-  ],
-
-  exports: [
-    AboutComponent
-  ],
-
-  providers: [
-    AboutInstanceResolver
-  ]
-})
-export class AboutModule { }
diff --git a/client/src/app/+about/index.ts b/client/src/app/+about/index.ts
deleted file mode 100644
index 218d09801..000000000
--- a/client/src/app/+about/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './about-routing.module'
-export * from './about.component'
-export * from './about.module'
diff --git a/client/src/app/+about/about-routing.module.ts b/client/src/app/+about/routes.ts
similarity index 80%
rename from client/src/app/+about/about-routing.module.ts
rename to client/src/app/+about/routes.ts
index cf5570d31..fa7eb7092 100644
--- a/client/src/app/+about/about-routing.module.ts
+++ b/client/src/app/+about/routes.ts
@@ -1,15 +1,22 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { AboutFollowsComponent } from '@app/+about/about-follows/about-follows.component'
 import { AboutInstanceComponent } from '@app/+about/about-instance/about-instance.component'
 import { AboutInstanceResolver } from '@app/+about/about-instance/about-instance.resolver'
 import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertube.component'
 import { AboutComponent } from './about.component'
+import { InstanceFollowService } from '@app/shared/shared-instance'
+import { CustomMarkupService, DynamicElementService } from '@app/shared/shared-custom-markup'
 
-const aboutRoutes: Routes = [
+export default [
   {
     path: '',
     component: AboutComponent,
+    providers: [
+      AboutInstanceResolver,
+      InstanceFollowService,
+      CustomMarkupService,
+      DynamicElementService
+    ],
     children: [
       {
         path: '',
@@ -61,10 +68,4 @@ const aboutRoutes: Routes = [
       }
     ]
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(aboutRoutes) ],
-  exports: [ RouterModule ]
-})
-export class AboutRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
index b8afa66ff..dfb36fa0b 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
@@ -6,11 +6,19 @@ import { SimpleMemoize } from '@app/helpers'
 import { Account, AccountService, Video, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main'
 import { MiniatureDisplayOptions } from '@app/shared/shared-video-miniature'
 import { NSFWPolicyType, VideoSortField } from '@peertube/peertube-models'
+import { VideoMiniatureComponent } from '../../shared/shared-video-miniature/video-miniature.component'
+import { SubscribeButtonComponent } from '../../shared/shared-user-subscription/subscribe-button.component'
+import { RouterLink } from '@angular/router'
+import { ActorAvatarComponent } from '../../shared/shared-actor-image/actor-avatar.component'
+import { InfiniteScrollerDirective } from '../../shared/shared-main/angular/infinite-scroller.directive'
+import { NgIf, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-account-video-channels',
   templateUrl: './account-video-channels.component.html',
-  styleUrls: [ './account-video-channels.component.scss' ]
+  styleUrls: [ './account-video-channels.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, InfiniteScrollerDirective, NgFor, ActorAvatarComponent, RouterLink, SubscribeButtonComponent, VideoMiniatureComponent ]
 })
 export class AccountVideoChannelsComponent implements OnInit, OnDestroy {
   account: Account
diff --git a/client/src/app/+accounts/account-videos/account-videos.component.ts b/client/src/app/+accounts/account-videos/account-videos.component.ts
index d8e8377e1..ccafd34c9 100644
--- a/client/src/app/+accounts/account-videos/account-videos.component.ts
+++ b/client/src/app/+accounts/account-videos/account-videos.component.ts
@@ -5,10 +5,14 @@ import { ComponentPaginationLight, DisableForReuseHook, ScreenService } from '@a
 import { Account, AccountService, VideoService } from '@app/shared/shared-main'
 import { VideoFilters } from '@app/shared/shared-video-miniature'
 import { VideoSortField } from '@peertube/peertube-models'
+import { VideosListComponent } from '../../shared/shared-video-miniature/videos-list.component'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-account-videos',
-  templateUrl: './account-videos.component.html'
+  templateUrl: './account-videos.component.html',
+  standalone: true,
+  imports: [ NgIf, VideosListComponent ]
 })
 export class AccountVideosComponent implements OnInit, OnDestroy, DisableForReuseHook {
   getVideosObservableFunction = this.getVideosObservable.bind(this)
diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index b0fb30347..78ea8031e 100644
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -1,7 +1,7 @@
 import { Subscription } from 'rxjs'
 import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute, Router, RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router'
 import { AuthService, MarkdownService, Notifier, RedirectService, RestExtractor, ScreenService, UserService } from '@app/core'
 import {
   Account,
@@ -14,10 +14,37 @@ import {
 } from '@app/shared/shared-main'
 import { AccountReportComponent, BlocklistService } from '@app/shared/shared-moderation'
 import { HttpStatusCode, User, UserRight } from '@peertube/peertube-models'
+import { SimpleSearchInputComponent } from '../shared/shared-main/misc/simple-search-input.component'
+import { ListOverflowComponent } from '../shared/shared-main/misc/list-overflow.component'
+import { SubscribeButtonComponent } from '../shared/shared-user-subscription/subscribe-button.component'
+import { CopyButtonComponent } from '../shared/shared-main/buttons/copy-button.component'
+import { AccountBlockBadgesComponent } from '../shared/shared-moderation/account-block-badges.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { UserModerationDropdownComponent } from '../shared/shared-moderation/user-moderation-dropdown.component'
+import { ActorAvatarComponent } from '../shared/shared-actor-image/actor-avatar.component'
+import { NgIf, NgClass, DatePipe } from '@angular/common'
 
 @Component({
   templateUrl: './accounts.component.html',
-  styleUrls: [ './accounts.component.scss' ]
+  styleUrls: [ './accounts.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    ActorAvatarComponent,
+    UserModerationDropdownComponent,
+    NgbTooltip,
+    AccountBlockBadgesComponent,
+    CopyButtonComponent,
+    NgClass,
+    RouterLink,
+    SubscribeButtonComponent,
+    RouterLinkActive,
+    ListOverflowComponent,
+    SimpleSearchInputComponent,
+    RouterOutlet,
+    AccountReportComponent,
+    DatePipe
+  ]
 })
 export class AccountsComponent implements OnInit, OnDestroy {
   @ViewChild('accountReportModal') accountReportModal: AccountReportComponent
diff --git a/client/src/app/+accounts/accounts.module.ts b/client/src/app/+accounts/accounts.module.ts
deleted file mode 100644
index aedc69b16..000000000
--- a/client/src/app/+accounts/accounts.module.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedModerationModule } from '@app/shared/shared-moderation'
-import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
-import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
-import { SharedActorImageModule } from '../shared/shared-actor-image/shared-actor-image.module'
-import { AccountVideoChannelsComponent } from './account-video-channels/account-video-channels.component'
-import { AccountVideosComponent } from './account-videos/account-videos.component'
-import { AccountsRoutingModule } from './accounts-routing.module'
-import { AccountsComponent } from './accounts.component'
-
-@NgModule({
-  imports: [
-    AccountsRoutingModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedUserSubscriptionModule,
-    SharedModerationModule,
-    SharedVideoMiniatureModule,
-    SharedGlobalIconModule,
-    SharedActorImageModule
-  ],
-
-  declarations: [
-    AccountsComponent,
-    AccountVideosComponent,
-    AccountVideoChannelsComponent
-  ],
-
-  exports: [
-    AccountsComponent
-  ],
-
-  providers: []
-})
-export class AccountsModule { }
diff --git a/client/src/app/+accounts/index.ts b/client/src/app/+accounts/index.ts
deleted file mode 100644
index 4dfb6f586..000000000
--- a/client/src/app/+accounts/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './accounts-routing.module'
-export * from './accounts.component'
-export * from './accounts.module'
diff --git a/client/src/app/+accounts/accounts-routing.module.ts b/client/src/app/+accounts/routes.ts
similarity index 70%
rename from client/src/app/+accounts/accounts-routing.module.ts
rename to client/src/app/+accounts/routes.ts
index d80df2293..884520113 100644
--- a/client/src/app/+accounts/accounts-routing.module.ts
+++ b/client/src/app/+accounts/routes.ts
@@ -1,10 +1,12 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { AccountVideoChannelsComponent } from './account-video-channels/account-video-channels.component'
 import { AccountVideosComponent } from './account-videos/account-videos.component'
 import { AccountsComponent } from './accounts.component'
+import { UserSubscriptionService } from '@app/shared/shared-user-subscription'
+import { BlocklistService, VideoBlockService } from '@app/shared/shared-moderation'
+import { VideoPlaylistService } from '@app/shared/shared-video-playlist'
 
-const accountsRoutes: Routes = [
+export default [
   {
     path: 'peertube',
     redirectTo: '/videos/local'
@@ -12,6 +14,12 @@ const accountsRoutes: Routes = [
   {
     path: ':accountId',
     component: AccountsComponent,
+    providers: [
+      UserSubscriptionService,
+      BlocklistService,
+      VideoPlaylistService,
+      VideoBlockService
+    ],
     children: [
       {
         path: '',
@@ -48,10 +56,4 @@ const accountsRoutes: Routes = [
       }
     ]
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(accountsRoutes) ],
-  exports: [ RouterModule ]
-})
-export class AccountsRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+admin/admin-routing.module.ts b/client/src/app/+admin/admin-routing.module.ts
deleted file mode 100644
index bd08b8287..000000000
--- a/client/src/app/+admin/admin-routing.module.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-import { ConfigRoutes } from '@app/+admin/config'
-import { ModerationRoutes } from '@app/+admin/moderation/moderation.routes'
-import { PluginsRoutes } from '@app/+admin/plugins/plugins.routes'
-import { SystemRoutes } from '@app/+admin/system'
-import { AdminComponent } from './admin.component'
-import { FollowsRoutes } from './follows'
-import { OverviewRoutes } from './overview'
-
-const adminRoutes: Routes = [
-  {
-    path: '',
-    component: AdminComponent,
-    children: [
-      {
-        path: '',
-        redirectTo: 'users',
-        pathMatch: 'full'
-      },
-
-      ...FollowsRoutes,
-      ...OverviewRoutes,
-      ...ModerationRoutes,
-      ...SystemRoutes,
-      ...ConfigRoutes,
-      ...PluginsRoutes
-    ]
-  }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(adminRoutes) ],
-  exports: [ RouterModule ]
-})
-export class AdminRoutingModule {}
diff --git a/client/src/app/+admin/admin.component.ts b/client/src/app/+admin/admin.component.ts
index 71c2d94d1..5a4f21928 100644
--- a/client/src/app/+admin/admin.component.ts
+++ b/client/src/app/+admin/admin.component.ts
@@ -3,10 +3,15 @@ import { AuthService, ScreenService, ServerService } from '@app/core'
 import { ListOverflowItem } from '@app/shared/shared-main'
 import { TopMenuDropdownParam } from '@app/shared/shared-main/misc/top-menu-dropdown.component'
 import { UserRight } from '@peertube/peertube-models'
+import { RouterOutlet } from '@angular/router'
+import { NgClass } from '@angular/common'
+import { TopMenuDropdownComponent } from '../shared/shared-main/misc/top-menu-dropdown.component'
 
 @Component({
   templateUrl: './admin.component.html',
-  styleUrls: [ './admin.component.scss' ]
+  styleUrls: [ './admin.component.scss' ],
+  standalone: true,
+  imports: [ TopMenuDropdownComponent, NgClass, RouterOutlet ]
 })
 export class AdminComponent implements OnInit {
   items: ListOverflowItem[] = []
diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
deleted file mode 100644
index 006cb025a..000000000
--- a/client/src/app/+admin/admin.module.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import { ChartModule } from 'primeng/chart'
-import { TableModule } from 'primeng/table'
-import { NgModule } from '@angular/core'
-import { SharedAbuseListModule } from '@app/shared/shared-abuse-list'
-import { SharedActorImageEditModule } from '@app/shared/shared-actor-image-edit'
-import { SharedActorImageModule } from '@app/shared/shared-actor-image/shared-actor-image.module'
-import { SharedCustomMarkupModule } from '@app/shared/shared-custom-markup'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedModerationModule } from '@app/shared/shared-moderation'
-import { SharedTablesModule } from '@app/shared/shared-tables'
-import { SharedUsersModule } from '@app/shared/shared-users'
-import { SharedVideoCommentModule } from '@app/shared/shared-video-comment'
-import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
-import { AdminRoutingModule } from './admin-routing.module'
-import { AdminComponent } from './admin.component'
-import {
-  EditAdvancedConfigurationComponent,
-  EditBasicConfigurationComponent,
-  EditConfigurationService,
-  EditCustomConfigComponent,
-  EditHomepageComponent,
-  EditInstanceInformationComponent,
-  EditLiveConfigurationComponent,
-  EditVODTranscodingComponent
-} from './config'
-import { ConfigService } from './config/shared/config.service'
-import { FollowersListComponent, FollowModalComponent, VideoRedundanciesListComponent } from './follows'
-import { FollowingListComponent } from './follows/following-list/following-list.component'
-import { RedundancyCheckboxComponent } from './follows/shared/redundancy-checkbox.component'
-import { VideoRedundancyInformationComponent } from './follows/video-redundancies-list/video-redundancy-information.component'
-import {
-  AbuseListComponent,
-  AdminRegistrationService,
-  ProcessRegistrationModalComponent,
-  RegistrationListComponent,
-  VideoBlockListComponent
-} from './moderation'
-import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from './moderation/instance-blocklist'
-import {
-  UserCreateComponent,
-  UserListComponent,
-  UserPasswordComponent,
-  UserUpdateComponent,
-  VideoAdminService,
-  VideoCommentListComponent,
-  VideoListComponent
-} from './overview'
-import {
-  PluginApiService,
-  PluginCardComponent,
-  PluginListInstalledComponent,
-  PluginNavigationComponent,
-  PluginSearchComponent,
-  PluginShowInstalledComponent
-} from './plugins'
-import { SharedAdminModule } from './shared'
-import {
-  JobService,
-  LogsComponent,
-  LogsService,
-  RunnerJobListComponent,
-  RunnerListComponent,
-  RunnerRegistrationTokenListComponent,
-  RunnerService
-} from './system'
-import { DebugComponent, DebugService } from './system/debug'
-import { JobsComponent } from './system/jobs'
-
-@NgModule({
-  imports: [
-    AdminRoutingModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedModerationModule,
-    SharedGlobalIconModule,
-    SharedAbuseListModule,
-    SharedVideoCommentModule,
-    SharedActorImageModule,
-    SharedActorImageEditModule,
-    SharedCustomMarkupModule,
-    SharedVideoMiniatureModule,
-    SharedTablesModule,
-    SharedUsersModule,
-    SharedAdminModule,
-
-    TableModule,
-    ChartModule
-  ],
-
-  declarations: [
-    AdminComponent,
-
-    VideoListComponent,
-
-    FollowersListComponent,
-    FollowingListComponent,
-    FollowModalComponent,
-    RedundancyCheckboxComponent,
-    VideoRedundanciesListComponent,
-    VideoRedundancyInformationComponent,
-
-    UserCreateComponent,
-    UserUpdateComponent,
-    UserPasswordComponent,
-    UserListComponent,
-
-    VideoBlockListComponent,
-    AbuseListComponent,
-    VideoCommentListComponent,
-
-    InstanceServerBlocklistComponent,
-    InstanceAccountBlocklistComponent,
-
-    PluginListInstalledComponent,
-    PluginSearchComponent,
-    PluginShowInstalledComponent,
-    PluginCardComponent,
-    PluginNavigationComponent,
-
-    JobsComponent,
-    LogsComponent,
-    DebugComponent,
-
-    EditCustomConfigComponent,
-    EditBasicConfigurationComponent,
-    EditVODTranscodingComponent,
-    EditLiveConfigurationComponent,
-    EditAdvancedConfigurationComponent,
-    EditInstanceInformationComponent,
-    EditHomepageComponent,
-
-    RegistrationListComponent,
-    ProcessRegistrationModalComponent,
-
-    RunnerRegistrationTokenListComponent,
-    RunnerListComponent,
-    RunnerJobListComponent
-  ],
-
-  exports: [
-    AdminComponent
-  ],
-
-  providers: [
-    JobService,
-    LogsService,
-    DebugService,
-    ConfigService,
-    PluginApiService,
-    EditConfigurationService,
-    VideoAdminService,
-    AdminRegistrationService,
-    RunnerService
-  ]
-})
-export class AdminModule { }
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.ts
index 06c5e6221..fd5f915e2 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.ts
@@ -1,10 +1,15 @@
 import { Component, Input } from '@angular/core'
-import { FormGroup } from '@angular/forms'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive'
+import { HelpComponent } from '../../../shared/shared-main/misc/help.component'
+import { NgClass, NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-edit-advanced-configuration',
   templateUrl: './edit-advanced-configuration.component.html',
-  styleUrls: [ './edit-custom-config.component.scss' ]
+  styleUrls: [ './edit-custom-config.component.scss' ],
+  standalone: true,
+  imports: [ FormsModule, ReactiveFormsModule, NgClass, NgIf, HelpComponent, PeerTubeTemplateDirective ]
 })
 export class EditAdvancedConfigurationComponent {
   @Input() form: FormGroup
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
index f75b62f0a..1f3ba283f 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
@@ -90,7 +90,7 @@
     </div>
   </div>
 
-  <div class="row mt-4"> <!-- broadcast grid -->
+  <div class="pt-two-cols mt-4"> <!-- broadcast grid -->
     <div class="title-col">
       <h2 i18n>BROADCAST MESSAGE</h2>
       <div i18n class="inner-form-description">
@@ -146,7 +146,7 @@
     </div>
   </div>
 
-  <div class="row mt-4"> <!-- new users grid -->
+  <div class="pt-two-cols mt-4"> <!-- new users grid -->
     <div class="title-col">
       <h2 i18n>NEW USERS</h2>
       <div i18n class="inner-form-description">
@@ -263,7 +263,7 @@
     </div>
   </div>
 
-  <div class="row mt-4"> <!-- videos grid -->
+  <div class="pt-two-cols mt-4"> <!-- videos grid -->
     <div class="title-col">
       <h2 i18n>VIDEOS</h2>
     </div>
@@ -375,7 +375,7 @@
     </div>
   </div>
 
-  <div class="row mt-4"> <!-- video channels grid -->
+  <div class="pt-two-cols mt-4"> <!-- video channels grid -->
     <div class="title-col">
       <h2 i18n>VIDEO CHANNELS</h2>
     </div>
@@ -397,7 +397,7 @@
     </div>
   </div>
 
-  <div class="row mt-4"> <!-- search grid -->
+  <div class="pt-two-cols mt-4"> <!-- search grid -->
     <div class="title-col">
       <h2 i18n>SEARCH</h2>
     </div>
@@ -486,7 +486,7 @@
     </div>
   </div>
 
-  <div class="row mt-4"> <!-- import/export grid -->
+  <div class="pt-two-cols mt-4"> <!-- import/export grid -->
     <div class="title-col">
       <h2 i18n>USER IMPORT/EXPORT</h2>
     </div>
@@ -562,7 +562,7 @@
     </div>
   </div>
 
-  <div class="row mt-4"> <!-- federation grid -->
+  <div class="pt-two-cols mt-4"> <!-- federation grid -->
     <div class="title-col">
       <h2 i18n>FEDERATION</h2>
       <div i18n class="inner-form-description">
@@ -641,7 +641,7 @@
     </div>
   </div>
 
-  <div class="row mt-4"> <!-- administrators grid -->
+  <div class="pt-two-cols mt-4"> <!-- administrators grid -->
     <div class="title-col">
       <h2 i18n>ADMINISTRATORS</h2>
     </div>
@@ -669,7 +669,7 @@
     </div>
   </div>
 
-  <div class="row mt-4"> <!-- Twitter grid -->
+  <div class="pt-two-cols mt-4"> <!-- Twitter grid -->
     <div class="title-col">
       <h2 i18n>TWITTER</h2>
       <div i18n class="inner-form-description">
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts
index d55248555..9f1cbc758 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts
@@ -1,15 +1,40 @@
 import { pairwise } from 'rxjs/operators'
 import { SelectOptionsItem } from 'src/types/select-options-item.model'
 import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'
-import { FormGroup } from '@angular/forms'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { MenuService, ThemeService } from '@app/core'
 import { HTMLServerConfig } from '@peertube/peertube-models'
 import { ConfigService } from '../shared/config.service'
+import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive'
+import { SelectOptionsComponent } from '../../../shared/shared-forms/select/select-options.component'
+import { UserRealQuotaInfoComponent } from '../../shared/user-real-quota-info.component'
+import { MarkdownTextareaComponent } from '../../../shared/shared-forms/markdown-textarea.component'
+import { HelpComponent } from '../../../shared/shared-main/misc/help.component'
+import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component'
+import { SelectCustomValueComponent } from '../../../shared/shared-forms/select/select-custom-value.component'
+import { NgFor, NgIf, NgClass } from '@angular/common'
+import { RouterLink } from '@angular/router'
 
 @Component({
   selector: 'my-edit-basic-configuration',
   templateUrl: './edit-basic-configuration.component.html',
-  styleUrls: [ './edit-custom-config.component.scss' ]
+  styleUrls: [ './edit-custom-config.component.scss' ],
+  standalone: true,
+  imports: [
+    FormsModule,
+    ReactiveFormsModule,
+    RouterLink,
+    NgFor,
+    SelectCustomValueComponent,
+    NgIf,
+    PeertubeCheckboxComponent,
+    HelpComponent,
+    MarkdownTextareaComponent,
+    NgClass,
+    UserRealQuotaInfoComponent,
+    SelectOptionsComponent,
+    PeerTubeTemplateDirective
+  ]
 })
 export class EditBasicConfigurationComponent implements OnInit, OnChanges {
   @Input() form: FormGroup
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index 8f10e1158..dc88f681c 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -30,6 +30,15 @@ import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { CustomPageService } from '@app/shared/shared-main/custom-page'
 import { CustomConfig, CustomPage, HTMLServerConfig } from '@peertube/peertube-models'
 import { EditConfigurationService } from './edit-configuration.service'
+import { EditAdvancedConfigurationComponent } from './edit-advanced-configuration.component'
+import { EditLiveConfigurationComponent } from './edit-live-configuration.component'
+import { EditVODTranscodingComponent } from './edit-vod-transcoding.component'
+import { EditBasicConfigurationComponent } from './edit-basic-configuration.component'
+import { EditInstanceInformationComponent } from './edit-instance-information.component'
+import { EditHomepageComponent } from './edit-homepage.component'
+import { NgbNav, NgbNavItem, NgbNavLink, NgbNavLinkBase, NgbNavContent, NgbNavOutlet } from '@ng-bootstrap/ng-bootstrap'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf, NgFor } from '@angular/common'
 
 type ComponentCustomConfig = CustomConfig & {
   instanceCustomHomepage: CustomPage
@@ -38,7 +47,26 @@ type ComponentCustomConfig = CustomConfig & {
 @Component({
   selector: 'my-edit-custom-config',
   templateUrl: './edit-custom-config.component.html',
-  styleUrls: [ './edit-custom-config.component.scss' ]
+  styleUrls: [ './edit-custom-config.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    FormsModule,
+    ReactiveFormsModule,
+    NgbNav,
+    NgbNavItem,
+    NgbNavLink,
+    NgbNavLinkBase,
+    NgbNavContent,
+    EditHomepageComponent,
+    EditInstanceInformationComponent,
+    EditBasicConfigurationComponent,
+    EditVODTranscodingComponent,
+    EditLiveConfigurationComponent,
+    EditAdvancedConfigurationComponent,
+    NgbNavOutlet,
+    NgFor
+  ]
 })
 export class EditCustomConfigComponent extends FormReactive implements OnInit {
   activeNav: string
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.ts
index dc834da14..c22c77b27 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.ts
@@ -1,11 +1,16 @@
 import { Component, Input } from '@angular/core'
-import { FormGroup } from '@angular/forms'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { CustomMarkupService } from '@app/shared/shared-custom-markup'
+import { NgIf } from '@angular/common'
+import { MarkdownTextareaComponent } from '../../../shared/shared-forms/markdown-textarea.component'
+import { CustomMarkupHelpComponent } from '../../../shared/shared-custom-markup/custom-markup-help.component'
 
 @Component({
   selector: 'my-edit-homepage',
   templateUrl: './edit-homepage.component.html',
-  styleUrls: [ './edit-custom-config.component.scss' ]
+  styleUrls: [ './edit-custom-config.component.scss' ],
+  standalone: true,
+  imports: [ FormsModule, ReactiveFormsModule, CustomMarkupHelpComponent, MarkdownTextareaComponent, NgIf ]
 })
 export class EditHomepageComponent {
   @Input() form: FormGroup
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.ts
index e370268aa..57d65a4c1 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.ts
@@ -1,17 +1,43 @@
 import { SelectOptionsItem } from 'src/types/select-options-item.model'
 import { Component, Input, OnInit } from '@angular/core'
-import { FormGroup } from '@angular/forms'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { CustomMarkupService } from '@app/shared/shared-custom-markup'
 import { Notifier, ServerService } from '@app/core'
 import { HttpErrorResponse } from '@angular/common/http'
 import { genericUploadErrorHandler } from '@app/helpers'
-import { InstanceService } from '@app/shared/shared-instance'
+import { InstanceService } from '@app/shared/shared-main'
 import { ActorImage, HTMLServerConfig } from '@peertube/peertube-models'
+import { HelpComponent } from '../../../shared/shared-main/misc/help.component'
+import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive'
+import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component'
+import { RouterLink } from '@angular/router'
+import { SelectCheckboxComponent } from '../../../shared/shared-forms/select/select-checkbox.component'
+import { MarkdownTextareaComponent } from '../../../shared/shared-forms/markdown-textarea.component'
+import { CustomMarkupHelpComponent } from '../../../shared/shared-custom-markup/custom-markup-help.component'
+import { NgClass, NgIf } from '@angular/common'
+import { ActorBannerEditComponent } from '../../../shared/shared-actor-image-edit/actor-banner-edit.component'
+import { ActorAvatarEditComponent } from '../../../shared/shared-actor-image-edit/actor-avatar-edit.component'
 
 @Component({
   selector: 'my-edit-instance-information',
   templateUrl: './edit-instance-information.component.html',
-  styleUrls: [ './edit-custom-config.component.scss' ]
+  styleUrls: [ './edit-custom-config.component.scss' ],
+  standalone: true,
+  imports: [
+    FormsModule,
+    ReactiveFormsModule,
+    ActorAvatarEditComponent,
+    ActorBannerEditComponent,
+    NgClass,
+    NgIf,
+    CustomMarkupHelpComponent,
+    MarkdownTextareaComponent,
+    SelectCheckboxComponent,
+    RouterLink,
+    PeertubeCheckboxComponent,
+    PeerTubeTemplateDirective,
+    HelpComponent
+  ]
 })
 export class EditInstanceInformationComponent implements OnInit {
   @Input() form: FormGroup
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.ts
index 7bed4b529..76e5cc3d0 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.ts
@@ -1,14 +1,33 @@
 import { SelectOptionsItem } from 'src/types/select-options-item.model'
 import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'
-import { FormGroup } from '@angular/forms'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { HTMLServerConfig } from '@peertube/peertube-models'
 import { ConfigService } from '../shared/config.service'
 import { EditConfigurationService, ResolutionOption } from './edit-configuration.service'
+import { SelectCustomValueComponent } from '../../../shared/shared-forms/select/select-custom-value.component'
+import { RouterLink } from '@angular/router'
+import { SelectOptionsComponent } from '../../../shared/shared-forms/select/select-options.component'
+import { NgClass, NgIf, NgFor } from '@angular/common'
+import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive'
+import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component'
 
 @Component({
   selector: 'my-edit-live-configuration',
   templateUrl: './edit-live-configuration.component.html',
-  styleUrls: [ './edit-custom-config.component.scss' ]
+  styleUrls: [ './edit-custom-config.component.scss' ],
+  standalone: true,
+  imports: [
+    FormsModule,
+    ReactiveFormsModule,
+    PeertubeCheckboxComponent,
+    PeerTubeTemplateDirective,
+    NgClass,
+    NgIf,
+    SelectOptionsComponent,
+    NgFor,
+    RouterLink,
+    SelectCustomValueComponent
+  ]
 })
 export class EditLiveConfigurationComponent implements OnInit, OnChanges {
   @Input() form: FormGroup
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts
index 305bf94db..8a99f9c6d 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts
@@ -1,14 +1,33 @@
 import { SelectOptionsItem } from 'src/types/select-options-item.model'
 import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'
-import { FormGroup } from '@angular/forms'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { HTMLServerConfig } from '@peertube/peertube-models'
 import { ConfigService } from '../shared/config.service'
 import { EditConfigurationService, ResolutionOption } from './edit-configuration.service'
+import { SelectOptionsComponent } from '../../../shared/shared-forms/select/select-options.component'
+import { SelectCustomValueComponent } from '../../../shared/shared-forms/select/select-custom-value.component'
+import { RouterLink } from '@angular/router'
+import { NgClass, NgFor, NgIf } from '@angular/common'
+import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive'
+import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component'
 
 @Component({
   selector: 'my-edit-vod-transcoding',
   templateUrl: './edit-vod-transcoding.component.html',
-  styleUrls: [ './edit-custom-config.component.scss' ]
+  styleUrls: [ './edit-custom-config.component.scss' ],
+  standalone: true,
+  imports: [
+    FormsModule,
+    ReactiveFormsModule,
+    PeertubeCheckboxComponent,
+    PeerTubeTemplateDirective,
+    NgClass,
+    NgFor,
+    NgIf,
+    RouterLink,
+    SelectCustomValueComponent,
+    SelectOptionsComponent
+  ]
 })
 export class EditVODTranscodingComponent implements OnInit, OnChanges {
   @Input() form: FormGroup
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.ts b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
index 656a7bf87..cab156548 100644
--- a/client/src/app/+admin/follows/followers-list/followers-list.component.ts
+++ b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
@@ -1,4 +1,4 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, OnInit } from '@angular/core'
 import { ConfirmService, Notifier, RestPagination, RestTable } from '@app/core'
 import { formatICU } from '@app/helpers'
@@ -6,11 +6,34 @@ import { AdvancedInputFilter } from '@app/shared/shared-forms'
 import { InstanceFollowService } from '@app/shared/shared-instance'
 import { DropdownAction } from '@app/shared/shared-main'
 import { ActorFollow } from '@peertube/peertube-models'
+import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive'
+import { DeleteButtonComponent } from '../../../shared/shared-main/buttons/delete-button.component'
+import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { AdvancedInputFilterComponent } from '../../../shared/shared-forms/advanced-input-filter.component'
+import { ActionDropdownComponent } from '../../../shared/shared-main/buttons/action-dropdown.component'
+import { NgIf, DatePipe } from '@angular/common'
+import { TableModule } from 'primeng/table'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-followers-list',
   templateUrl: './followers-list.component.html',
-  styleUrls: [ './followers-list.component.scss' ]
+  styleUrls: [ './followers-list.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    TableModule,
+    SharedModule,
+    NgIf,
+    ActionDropdownComponent,
+    AdvancedInputFilterComponent,
+    NgbTooltip,
+    ButtonComponent,
+    DeleteButtonComponent,
+    AutoColspanDirective,
+    DatePipe
+  ]
 })
 export class FollowersListComponent extends RestTable <ActorFollow> implements OnInit {
   followers: ActorFollow[] = []
diff --git a/client/src/app/+admin/follows/following-list/follow-modal.component.ts b/client/src/app/+admin/follows/following-list/follow-modal.component.ts
index 54b3cebc5..a3a42e86d 100644
--- a/client/src/app/+admin/follows/following-list/follow-modal.component.ts
+++ b/client/src/app/+admin/follows/following-list/follow-modal.component.ts
@@ -6,11 +6,16 @@ import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { InstanceFollowService } from '@app/shared/shared-instance'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
+import { NgClass, NgIf } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-follow-modal',
   templateUrl: './follow-modal.component.html',
-  styleUrls: [ './follow-modal.component.scss' ]
+  styleUrls: [ './follow-modal.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent, FormsModule, ReactiveFormsModule, NgClass, NgIf ]
 })
 export class FollowModalComponent extends FormReactive implements OnInit {
   @ViewChild('modal', { static: true }) modal: NgbModal
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.ts b/client/src/app/+admin/follows/following-list/following-list.component.ts
index da6647f6b..ff50a9dcb 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.ts
+++ b/client/src/app/+admin/follows/following-list/following-list.component.ts
@@ -1,4 +1,4 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { ConfirmService, Notifier, RestPagination, RestTable } from '@app/core'
 import { AdvancedInputFilter } from '@app/shared/shared-forms'
@@ -7,10 +7,32 @@ import { ActorFollow } from '@peertube/peertube-models'
 import { FollowModalComponent } from './follow-modal.component'
 import { DropdownAction } from '@app/shared/shared-main'
 import { formatICU } from '@app/helpers'
+import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive'
+import { RedundancyCheckboxComponent } from '../shared/redundancy-checkbox.component'
+import { DeleteButtonComponent } from '../../../shared/shared-main/buttons/delete-button.component'
+import { AdvancedInputFilterComponent } from '../../../shared/shared-forms/advanced-input-filter.component'
+import { ActionDropdownComponent } from '../../../shared/shared-main/buttons/action-dropdown.component'
+import { NgIf, DatePipe } from '@angular/common'
+import { TableModule } from 'primeng/table'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   templateUrl: './following-list.component.html',
-  styleUrls: [ './following-list.component.scss' ]
+  styleUrls: [ './following-list.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    TableModule,
+    SharedModule,
+    NgIf,
+    ActionDropdownComponent,
+    AdvancedInputFilterComponent,
+    DeleteButtonComponent,
+    RedundancyCheckboxComponent,
+    AutoColspanDirective,
+    FollowModalComponent,
+    DatePipe
+  ]
 })
 export class FollowingListComponent extends RestTable <ActorFollow> implements OnInit {
   @ViewChild('followModal') followModal: FollowModalComponent
diff --git a/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts b/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts
index 3935ddc4f..87775188b 100644
--- a/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts
+++ b/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts
@@ -1,10 +1,14 @@
 import { Component, Input } from '@angular/core'
 import { Notifier } from '@app/core'
 import { RedundancyService } from '@app/shared/shared-main'
+import { FormsModule } from '@angular/forms'
+import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component'
 
 @Component({
   selector: 'my-redundancy-checkbox',
-  templateUrl: './redundancy-checkbox.component.html'
+  templateUrl: './redundancy-checkbox.component.html',
+  standalone: true,
+  imports: [ PeertubeCheckboxComponent, FormsModule ]
 })
 export class RedundancyCheckboxComponent {
   @Input() redundancyAllowed: boolean
diff --git a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts
index 09fc038ce..74701b654 100644
--- a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts
+++ b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts
@@ -1,15 +1,41 @@
 import { ChartData, ChartOptions, TooltipItem } from 'chart.js'
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, OnInit } from '@angular/core'
 import { ConfirmService, Notifier, RestPagination, RestTable, ServerService } from '@app/core'
 import { BytesPipe, RedundancyService } from '@app/shared/shared-main'
 import { VideoRedundanciesTarget, VideoRedundancy, VideosRedundancyStats } from '@peertube/peertube-models'
 import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
+import { ChartModule } from 'primeng/chart'
+import { VideoRedundancyInformationComponent } from './video-redundancy-information.component'
+import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive'
+import { DeleteButtonComponent } from '../../../shared/shared-main/buttons/delete-button.component'
+import { TableExpanderIconComponent } from '../../../shared/shared-tables/table-expander-icon.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { NgIf, NgFor } from '@angular/common'
+import { TableModule } from 'primeng/table'
+import { FormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-video-redundancies-list',
   templateUrl: './video-redundancies-list.component.html',
-  styleUrls: [ './video-redundancies-list.component.scss' ]
+  styleUrls: [ './video-redundancies-list.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    FormsModule,
+    TableModule,
+    SharedModule,
+    NgIf,
+    NgbTooltip,
+    TableExpanderIconComponent,
+    DeleteButtonComponent,
+    AutoColspanDirective,
+    NgFor,
+    VideoRedundancyInformationComponent,
+    ChartModule,
+    BytesPipe
+  ]
 })
 export class VideoRedundanciesListComponent extends RestTable implements OnInit {
   private static LOCAL_STORAGE_DISPLAY_TYPE = 'video-redundancies-list-display-type'
diff --git a/client/src/app/+admin/follows/video-redundancies-list/video-redundancy-information.component.ts b/client/src/app/+admin/follows/video-redundancies-list/video-redundancy-information.component.ts
index 779d19059..169cdbdf7 100644
--- a/client/src/app/+admin/follows/video-redundancies-list/video-redundancy-information.component.ts
+++ b/client/src/app/+admin/follows/video-redundancies-list/video-redundancy-information.component.ts
@@ -1,10 +1,14 @@
 import { Component, Input } from '@angular/core'
 import { FileRedundancyInformation, StreamingPlaylistRedundancyInformation } from '@peertube/peertube-models'
+import { BytesPipe } from '../../../shared/shared-main/angular/bytes.pipe'
+import { DatePipe } from '@angular/common'
 
 @Component({
   selector: 'my-video-redundancy-information',
   templateUrl: './video-redundancy-information.component.html',
-  styleUrls: [ './video-redundancy-information.component.scss' ]
+  styleUrls: [ './video-redundancy-information.component.scss' ],
+  standalone: true,
+  imports: [ DatePipe, BytesPipe ]
 })
 export class VideoRedundancyInformationComponent {
   @Input() redundancyElement: FileRedundancyInformation | StreamingPlaylistRedundancyInformation
diff --git a/client/src/app/+admin/moderation/abuse-list/abuse-list.component.ts b/client/src/app/+admin/moderation/abuse-list/abuse-list.component.ts
index 85a150de9..9ee23882f 100644
--- a/client/src/app/+admin/moderation/abuse-list/abuse-list.component.ts
+++ b/client/src/app/+admin/moderation/abuse-list/abuse-list.component.ts
@@ -1,9 +1,13 @@
 import { Component } from '@angular/core'
+import { AbuseListTableComponent } from '../../../shared/shared-abuse-list/abuse-list-table.component'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-abuse-list',
   templateUrl: './abuse-list.component.html',
-  styleUrls: [ ]
+  styleUrls: [],
+  standalone: true,
+  imports: [ GlobalIconComponent, AbuseListTableComponent ]
 })
 export class AbuseListComponent {
 
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts
index a6e445b4c..33a70ed34 100644
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts
+++ b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts
@@ -1,10 +1,30 @@
 import { Component } from '@angular/core'
 import { BlocklistComponentType, GenericAccountBlocklistComponent } from '@app/shared/shared-moderation'
+import { NgIf, DatePipe } from '@angular/common'
+import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive'
+import { ActorAvatarComponent } from '../../../shared/shared-actor-image/actor-avatar.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { AdvancedInputFilterComponent } from '../../../shared/shared-forms/advanced-input-filter.component'
+import { SharedModule } from 'primeng/api'
+import { TableModule } from 'primeng/table'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-instance-account-blocklist',
   styleUrls: [ '../../../shared/shared-moderation/moderation.scss' ],
-  templateUrl: '../../../shared/shared-moderation/account-blocklist.component.html'
+  templateUrl: '../../../shared/shared-moderation/account-blocklist.component.html',
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    TableModule,
+    SharedModule,
+    AdvancedInputFilterComponent,
+    NgbTooltip,
+    ActorAvatarComponent,
+    AutoColspanDirective,
+    NgIf,
+    DatePipe
+  ]
 })
 export class InstanceAccountBlocklistComponent extends GenericAccountBlocklistComponent {
   mode = BlocklistComponentType.Instance
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
index 3afae529f..16a6823c9 100644
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
+++ b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
@@ -1,10 +1,30 @@
 import { Component } from '@angular/core'
 import { GenericServerBlocklistComponent, BlocklistComponentType } from '@app/shared/shared-moderation'
+import { BatchDomainsModalComponent } from '../../../shared/shared-moderation/batch-domains-modal.component'
+import { NgIf, DatePipe } from '@angular/common'
+import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { AdvancedInputFilterComponent } from '../../../shared/shared-forms/advanced-input-filter.component'
+import { SharedModule } from 'primeng/api'
+import { TableModule } from 'primeng/table'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-instance-server-blocklist',
   styleUrls: [ '../../../shared/shared-moderation/server-blocklist.component.scss' ],
-  templateUrl: '../../../shared/shared-moderation/server-blocklist.component.html'
+  templateUrl: '../../../shared/shared-moderation/server-blocklist.component.html',
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    TableModule,
+    SharedModule,
+    AdvancedInputFilterComponent,
+    NgbTooltip,
+    AutoColspanDirective,
+    NgIf,
+    BatchDomainsModalComponent,
+    DatePipe
+  ]
 })
 export class InstanceServerBlocklistComponent extends GenericServerBlocklistComponent {
   mode = BlocklistComponentType.Instance
diff --git a/client/src/app/+admin/moderation/registration-list/process-registration-modal.component.ts b/client/src/app/+admin/moderation/registration-list/process-registration-modal.component.ts
index f8e346f50..3f71f2afd 100644
--- a/client/src/app/+admin/moderation/registration-list/process-registration-modal.component.ts
+++ b/client/src/app/+admin/moderation/registration-list/process-registration-modal.component.ts
@@ -6,10 +6,16 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
 import { UserRegistration } from '@peertube/peertube-models'
 import { AdminRegistrationService } from './admin-registration.service'
 import { REGISTRATION_MODERATION_RESPONSE_VALIDATOR } from './process-registration-validators'
+import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-process-registration-modal',
-  templateUrl: './process-registration-modal.component.html'
+  templateUrl: './process-registration-modal.component.html',
+  standalone: true,
+  imports: [ NgIf, GlobalIconComponent, FormsModule, ReactiveFormsModule, NgClass, PeertubeCheckboxComponent ]
 })
 export class ProcessRegistrationModalComponent extends FormReactive implements OnInit {
   @ViewChild('modal', { static: true }) modal: NgbModal
diff --git a/client/src/app/+admin/moderation/registration-list/registration-list.component.ts b/client/src/app/+admin/moderation/registration-list/registration-list.component.ts
index 1dc5e9077..34f899358 100644
--- a/client/src/app/+admin/moderation/registration-list/registration-list.component.ts
+++ b/client/src/app/+admin/moderation/registration-list/registration-list.component.ts
@@ -1,4 +1,4 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { ConfirmService, MarkdownService, Notifier, RestPagination, RestTable, ServerService } from '@app/core'
@@ -8,11 +8,36 @@ import { DropdownAction } from '@app/shared/shared-main'
 import { UserRegistration, UserRegistrationState } from '@peertube/peertube-models'
 import { AdminRegistrationService } from './admin-registration.service'
 import { ProcessRegistrationModalComponent } from './process-registration-modal.component'
+import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive'
+import { UserEmailInfoComponent } from '../../shared/user-email-info.component'
+import { TableExpanderIconComponent } from '../../../shared/shared-tables/table-expander-icon.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { AdvancedInputFilterComponent } from '../../../shared/shared-forms/advanced-input-filter.component'
+import { ActionDropdownComponent } from '../../../shared/shared-main/buttons/action-dropdown.component'
+import { NgIf, NgClass, DatePipe } from '@angular/common'
+import { TableModule } from 'primeng/table'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-registration-list',
   templateUrl: './registration-list.component.html',
-  styleUrls: [ '../../../shared/shared-moderation/moderation.scss', './registration-list.component.scss' ]
+  styleUrls: [ '../../../shared/shared-moderation/moderation.scss', './registration-list.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    TableModule,
+    SharedModule,
+    NgIf,
+    ActionDropdownComponent,
+    AdvancedInputFilterComponent,
+    NgbTooltip,
+    TableExpanderIconComponent,
+    NgClass,
+    UserEmailInfoComponent,
+    AutoColspanDirective,
+    ProcessRegistrationModalComponent,
+    DatePipe
+  ]
 })
 export class RegistrationListComponent extends RestTable <UserRegistration> implements OnInit {
   @ViewChild('processRegistrationModal', { static: true }) processRegistrationModal: ProcessRegistrationModalComponent
diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
index 140af89f9..aab902700 100644
--- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
+++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
@@ -1,4 +1,4 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { switchMap } from 'rxjs/operators'
 import { environment } from 'src/environments/environment'
 import { Component, OnInit } from '@angular/core'
@@ -10,11 +10,37 @@ import { VideoBlockService } from '@app/shared/shared-moderation'
 import { buildVideoEmbedLink, decorateVideoLink } from '@peertube/peertube-core-utils'
 import { VideoBlacklist, VideoBlacklistType, VideoBlacklistType_Type } from '@peertube/peertube-models'
 import { buildVideoOrPlaylistEmbed } from '@root-helpers/video'
+import { EmbedComponent } from '../../../shared/shared-main/video/embed.component'
+import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive'
+import { VideoCellComponent } from '../../../shared/shared-tables/video-cell.component'
+import { ActionDropdownComponent } from '../../../shared/shared-main/buttons/action-dropdown.component'
+import { TableExpanderIconComponent } from '../../../shared/shared-tables/table-expander-icon.component'
+import { NgIf, NgClass, DatePipe } from '@angular/common'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { AdvancedInputFilterComponent } from '../../../shared/shared-forms/advanced-input-filter.component'
+import { TableModule } from 'primeng/table'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-video-block-list',
   templateUrl: './video-block-list.component.html',
-  styleUrls: [ '../../../shared/shared-moderation/moderation.scss', './video-block-list.component.scss' ]
+  styleUrls: [ '../../../shared/shared-moderation/moderation.scss', './video-block-list.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    TableModule,
+    SharedModule,
+    AdvancedInputFilterComponent,
+    NgbTooltip,
+    NgIf,
+    TableExpanderIconComponent,
+    ActionDropdownComponent,
+    NgClass,
+    VideoCellComponent,
+    AutoColspanDirective,
+    EmbedComponent,
+    DatePipe
+  ]
 })
 export class VideoBlockListComponent extends RestTable implements OnInit {
   blocklist: (VideoBlacklist & { reasonHtml?: string })[] = []
diff --git a/client/src/app/+admin/overview/comments/video-comment-list.component.ts b/client/src/app/+admin/overview/comments/video-comment-list.component.ts
index 254e76a60..a8692797c 100644
--- a/client/src/app/+admin/overview/comments/video-comment-list.component.ts
+++ b/client/src/app/+admin/overview/comments/video-comment-list.component.ts
@@ -1,4 +1,4 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { AuthService, ConfirmService, MarkdownService, Notifier, RestPagination, RestTable } from '@app/core'
@@ -8,11 +8,39 @@ import { BulkService } from '@app/shared/shared-moderation'
 import { VideoCommentAdmin, VideoCommentService } from '@app/shared/shared-video-comment'
 import { FeedFormat, UserRight } from '@peertube/peertube-models'
 import { formatICU } from '@app/helpers'
+import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive'
+import { ActorAvatarComponent } from '../../../shared/shared-actor-image/actor-avatar.component'
+import { TableExpanderIconComponent } from '../../../shared/shared-tables/table-expander-icon.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component'
+import { AdvancedInputFilterComponent } from '../../../shared/shared-forms/advanced-input-filter.component'
+import { ActionDropdownComponent } from '../../../shared/shared-main/buttons/action-dropdown.component'
+import { NgIf, NgClass, DatePipe } from '@angular/common'
+import { TableModule } from 'primeng/table'
+import { FeedComponent } from '../../../shared/shared-main/feeds/feed.component'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-video-comment-list',
   templateUrl: './video-comment-list.component.html',
-  styleUrls: [ '../../../shared/shared-moderation/moderation.scss', './video-comment-list.component.scss' ]
+  styleUrls: [ '../../../shared/shared-moderation/moderation.scss', './video-comment-list.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    FeedComponent,
+    TableModule,
+    SharedModule,
+    NgIf,
+    ActionDropdownComponent,
+    AdvancedInputFilterComponent,
+    ButtonComponent,
+    NgbTooltip,
+    TableExpanderIconComponent,
+    NgClass,
+    ActorAvatarComponent,
+    AutoColspanDirective,
+    DatePipe
+  ]
 })
 export class VideoCommentListComponent extends RestTable <VideoCommentAdmin> implements OnInit {
   comments: VideoCommentAdmin[]
diff --git a/client/src/app/+admin/overview/users/user-edit/user-create.component.ts b/client/src/app/+admin/overview/users/user-edit/user-create.component.ts
index 77acb9988..2221e24af 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-create.component.ts
+++ b/client/src/app/+admin/overview/users/user-edit/user-create.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core'
-import { Router } from '@angular/router'
+import { Router, RouterLink } from '@angular/router'
 import { ConfigService } from '@app/+admin/config/shared/config.service'
 import { AuthService, Notifier, ScreenService, ServerService } from '@app/core'
 import {
@@ -16,11 +16,41 @@ import { FormReactiveService } from '@app/shared/shared-forms'
 import { UserAdminService } from '@app/shared/shared-users'
 import { UserCreate, UserRole } from '@peertube/peertube-models'
 import { UserEdit } from './user-edit'
+import { BytesPipe } from '../../../../shared/shared-main/angular/bytes.pipe'
+import { UserPasswordComponent } from './user-password.component'
+import { PeertubeCheckboxComponent } from '../../../../shared/shared-forms/peertube-checkbox.component'
+import { UserRealQuotaInfoComponent } from '../../../shared/user-real-quota-info.component'
+import { SelectCustomValueComponent } from '../../../../shared/shared-forms/select/select-custom-value.component'
+import { InputTextComponent } from '../../../../shared/shared-forms/input-text.component'
+import { PeerTubeTemplateDirective } from '../../../../shared/shared-main/angular/peertube-template.directive'
+import { HelpComponent } from '../../../../shared/shared-main/misc/help.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { ActorAvatarEditComponent } from '../../../../shared/shared-actor-image-edit/actor-avatar-edit.component'
+import { NgIf, NgTemplateOutlet, NgClass, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-user-create',
   templateUrl: './user-edit.component.html',
-  styleUrls: [ './user-edit.component.scss' ]
+  styleUrls: [ './user-edit.component.scss' ],
+  standalone: true,
+  imports: [
+    RouterLink,
+    NgIf,
+    NgTemplateOutlet,
+    ActorAvatarEditComponent,
+    FormsModule,
+    ReactiveFormsModule,
+    NgClass,
+    HelpComponent,
+    PeerTubeTemplateDirective,
+    InputTextComponent,
+    NgFor,
+    SelectCustomValueComponent,
+    UserRealQuotaInfoComponent,
+    PeertubeCheckboxComponent,
+    UserPasswordComponent,
+    BytesPipe
+  ]
 })
 export class UserCreateComponent extends UserEdit implements OnInit {
   error: string
diff --git a/client/src/app/+admin/overview/users/user-edit/user-password.component.ts b/client/src/app/+admin/overview/users/user-edit/user-password.component.ts
index af39c82af..4efeb2983 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-password.component.ts
+++ b/client/src/app/+admin/overview/users/user-edit/user-password.component.ts
@@ -4,11 +4,15 @@ import { USER_PASSWORD_VALIDATOR } from '@app/shared/form-validators/user-valida
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { UserAdminService } from '@app/shared/shared-users'
 import { UserUpdate } from '@peertube/peertube-models'
+import { NgClass, NgIf } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 
 @Component({
   selector: 'my-user-password',
   templateUrl: './user-password.component.html',
-  styleUrls: [ './user-password.component.scss' ]
+  styleUrls: [ './user-password.component.scss' ],
+  standalone: true,
+  imports: [ FormsModule, ReactiveFormsModule, NgClass, NgIf ]
 })
 export class UserPasswordComponent extends FormReactive implements OnInit {
   @Input() userId: number
diff --git a/client/src/app/+admin/overview/users/user-edit/user-update.component.ts b/client/src/app/+admin/overview/users/user-edit/user-update.component.ts
index b55a519f3..fb4ac1f10 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-update.component.ts
+++ b/client/src/app/+admin/overview/users/user-edit/user-update.component.ts
@@ -1,6 +1,6 @@
 import { Subscription } from 'rxjs'
 import { Component, OnDestroy, OnInit } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute, Router, RouterLink } from '@angular/router'
 import { ConfigService } from '@app/+admin/config/shared/config.service'
 import { AuthService, Notifier, ScreenService, ServerService, User, UserService } from '@app/core'
 import {
@@ -13,11 +13,41 @@ import { FormReactiveService } from '@app/shared/shared-forms'
 import { TwoFactorService, UserAdminService } from '@app/shared/shared-users'
 import { User as UserType, UserAdminFlag, UserRole, UserUpdate } from '@peertube/peertube-models'
 import { UserEdit } from './user-edit'
+import { BytesPipe } from '../../../../shared/shared-main/angular/bytes.pipe'
+import { UserPasswordComponent } from './user-password.component'
+import { PeertubeCheckboxComponent } from '../../../../shared/shared-forms/peertube-checkbox.component'
+import { UserRealQuotaInfoComponent } from '../../../shared/user-real-quota-info.component'
+import { SelectCustomValueComponent } from '../../../../shared/shared-forms/select/select-custom-value.component'
+import { InputTextComponent } from '../../../../shared/shared-forms/input-text.component'
+import { PeerTubeTemplateDirective } from '../../../../shared/shared-main/angular/peertube-template.directive'
+import { HelpComponent } from '../../../../shared/shared-main/misc/help.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { ActorAvatarEditComponent } from '../../../../shared/shared-actor-image-edit/actor-avatar-edit.component'
+import { NgIf, NgTemplateOutlet, NgClass, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-user-update',
   templateUrl: './user-edit.component.html',
-  styleUrls: [ './user-edit.component.scss' ]
+  styleUrls: [ './user-edit.component.scss' ],
+  standalone: true,
+  imports: [
+    RouterLink,
+    NgIf,
+    NgTemplateOutlet,
+    ActorAvatarEditComponent,
+    FormsModule,
+    ReactiveFormsModule,
+    NgClass,
+    HelpComponent,
+    PeerTubeTemplateDirective,
+    InputTextComponent,
+    NgFor,
+    SelectCustomValueComponent,
+    UserRealQuotaInfoComponent,
+    PeertubeCheckboxComponent,
+    UserPasswordComponent,
+    BytesPipe
+  ]
 })
 export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy {
   error: string
diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.ts b/client/src/app/+admin/overview/users/user-list/user-list.component.ts
index 36849011d..7a0e8fd73 100644
--- a/client/src/app/+admin/overview/users/user-list/user-list.component.ts
+++ b/client/src/app/+admin/overview/users/user-list/user-list.component.ts
@@ -1,6 +1,6 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, OnInit, ViewChild } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute, Router, RouterLink } from '@angular/router'
 import { AuthService, ConfirmService, LocalStorageService, Notifier, RestPagination, RestTable, ServerService } from '@app/core'
 import { formatICU, getAPIHost } from '@app/helpers'
 import { AdvancedInputFilter } from '@app/shared/shared-forms'
@@ -9,6 +9,21 @@ import { AccountMutedStatus, BlocklistService, UserBanModalComponent, UserModera
 import { UserAdminService } from '@app/shared/shared-users'
 import { User, UserRole, UserRoleType } from '@peertube/peertube-models'
 import { logger } from '@root-helpers/logger'
+import { BytesPipe } from '../../../../shared/shared-main/angular/bytes.pipe'
+import { AutoColspanDirective } from '../../../../shared/shared-main/angular/auto-colspan.directive'
+import { UserEmailInfoComponent } from '../../../shared/user-email-info.component'
+import { ActorAvatarComponent } from '../../../../shared/shared-actor-image/actor-avatar.component'
+import { UserModerationDropdownComponent } from '../../../../shared/shared-moderation/user-moderation-dropdown.component'
+import { TableExpanderIconComponent } from '../../../../shared/shared-tables/table-expander-icon.component'
+import { PeertubeCheckboxComponent } from '../../../../shared/shared-forms/peertube-checkbox.component'
+import { FormsModule } from '@angular/forms'
+import { SelectCheckboxComponent } from '../../../../shared/shared-forms/select/select-checkbox.component'
+import { NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem, NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { AdvancedInputFilterComponent } from '../../../../shared/shared-forms/advanced-input-filter.component'
+import { ActionDropdownComponent } from '../../../../shared/shared-main/buttons/action-dropdown.component'
+import { NgIf, NgClass, DatePipe } from '@angular/common'
+import { TableModule } from 'primeng/table'
+import { GlobalIconComponent } from '../../../../shared/shared-icons/global-icon.component'
 
 type UserForList = User & {
   rawVideoQuota: number
@@ -20,7 +35,34 @@ type UserForList = User & {
 @Component({
   selector: 'my-user-list',
   templateUrl: './user-list.component.html',
-  styleUrls: [ './user-list.component.scss' ]
+  styleUrls: [ './user-list.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    TableModule,
+    SharedModule,
+    NgIf,
+    ActionDropdownComponent,
+    RouterLink,
+    AdvancedInputFilterComponent,
+    NgbDropdown,
+    NgbDropdownToggle,
+    NgbDropdownMenu,
+    NgbDropdownItem,
+    SelectCheckboxComponent,
+    FormsModule,
+    PeertubeCheckboxComponent,
+    NgbTooltip,
+    NgClass,
+    TableExpanderIconComponent,
+    UserModerationDropdownComponent,
+    ActorAvatarComponent,
+    UserEmailInfoComponent,
+    AutoColspanDirective,
+    UserBanModalComponent,
+    DatePipe,
+    BytesPipe
+  ]
 })
 export class UserListComponent extends RestTable <User> implements OnInit {
   private static readonly LOCAL_STORAGE_SELECTED_COLUMNS_KEY = 'admin-user-list-selected-columns'
diff --git a/client/src/app/+admin/overview/videos/video-list.component.ts b/client/src/app/+admin/overview/videos/video-list.component.ts
index 2e12a2b31..6a19d35bf 100644
--- a/client/src/app/+admin/overview/videos/video-list.component.ts
+++ b/client/src/app/+admin/overview/videos/video-list.component.ts
@@ -1,4 +1,4 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { finalize } from 'rxjs/operators'
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
@@ -11,11 +11,45 @@ import { VideoActionsDisplayType } from '@app/shared/shared-video-miniature'
 import { getAllFiles } from '@peertube/peertube-core-utils'
 import { UserRight, VideoFile, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from '@peertube/peertube-models'
 import { VideoAdminService } from './video-admin.service'
+import { BytesPipe } from '../../../shared/shared-main/angular/bytes.pipe'
+import { EmbedComponent } from '../../../shared/shared-main/video/embed.component'
+import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive'
+import { VideoCellComponent } from '../../../shared/shared-tables/video-cell.component'
+import { VideoActionsDropdownComponent } from '../../../shared/shared-video-miniature/video-actions-dropdown.component'
+import { TableExpanderIconComponent } from '../../../shared/shared-tables/table-expander-icon.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component'
+import { AdvancedInputFilterComponent } from '../../../shared/shared-forms/advanced-input-filter.component'
+import { ActionDropdownComponent } from '../../../shared/shared-main/buttons/action-dropdown.component'
+import { NgClass, NgIf, NgFor, DatePipe } from '@angular/common'
+import { TableModule } from 'primeng/table'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-video-list',
   templateUrl: './video-list.component.html',
-  styleUrls: [ './video-list.component.scss' ]
+  styleUrls: [ './video-list.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    TableModule,
+    NgClass,
+    SharedModule,
+    NgIf,
+    ActionDropdownComponent,
+    AdvancedInputFilterComponent,
+    ButtonComponent,
+    NgbTooltip,
+    TableExpanderIconComponent,
+    VideoActionsDropdownComponent,
+    VideoCellComponent,
+    AutoColspanDirective,
+    NgFor,
+    EmbedComponent,
+    VideoBlockComponent,
+    DatePipe,
+    BytesPipe
+  ]
 })
 export class VideoListComponent extends RestTable <Video> implements OnInit {
   @ViewChild('videoBlockModal') videoBlockModal: VideoBlockComponent
diff --git a/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts b/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts
index 1b78a00cd..3e5096da7 100644
--- a/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts
+++ b/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts
@@ -6,11 +6,29 @@ import { ComponentPagination, ConfirmService, hasMoreItems, Notifier } from '@ap
 import { PluginService } from '@app/core/plugins/plugin.service'
 import { compareSemVer } from '@peertube/peertube-core-utils'
 import { PeerTubePlugin, PluginType, PluginType_Type } from '@peertube/peertube-models'
+import { DeleteButtonComponent } from '../../../shared/shared-main/buttons/delete-button.component'
+import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component'
+import { EditButtonComponent } from '../../../shared/shared-main/buttons/edit-button.component'
+import { PluginCardComponent } from '../shared/plugin-card.component'
+import { InfiniteScrollerDirective } from '../../../shared/shared-main/angular/infinite-scroller.directive'
+import { NgIf, NgFor } from '@angular/common'
+import { PluginNavigationComponent } from '../shared/plugin-navigation.component'
 
 @Component({
   selector: 'my-plugin-list-installed',
   templateUrl: './plugin-list-installed.component.html',
-  styleUrls: [ './plugin-list-installed.component.scss' ]
+  styleUrls: [ './plugin-list-installed.component.scss' ],
+  standalone: true,
+  imports: [
+    PluginNavigationComponent,
+    NgIf,
+    InfiniteScrollerDirective,
+    NgFor,
+    PluginCardComponent,
+    EditButtonComponent,
+    ButtonComponent,
+    DeleteButtonComponent
+  ]
 })
 export class PluginListInstalledComponent implements OnInit {
   pluginType: PluginType_Type
diff --git a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts
index af24c58dd..fbb59628b 100644
--- a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts
+++ b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts
@@ -6,11 +6,31 @@ import { PluginApiService } from '@app/+admin/plugins/shared/plugin-api.service'
 import { ComponentPagination, ConfirmService, hasMoreItems, Notifier, PluginService } from '@app/core'
 import { PeerTubePluginIndex, PluginType, PluginType_Type } from '@peertube/peertube-models'
 import { logger } from '@root-helpers/logger'
+import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component'
+import { EditButtonComponent } from '../../../shared/shared-main/buttons/edit-button.component'
+import { PluginCardComponent } from '../shared/plugin-card.component'
+import { InfiniteScrollerDirective } from '../../../shared/shared-main/angular/infinite-scroller.directive'
+import { AutofocusDirective } from '../../../shared/shared-main/angular/autofocus.directive'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
+import { NgIf, NgFor } from '@angular/common'
+import { PluginNavigationComponent } from '../shared/plugin-navigation.component'
 
 @Component({
   selector: 'my-plugin-search',
   templateUrl: './plugin-search.component.html',
-  styleUrls: [ './plugin-search.component.scss' ]
+  styleUrls: [ './plugin-search.component.scss' ],
+  standalone: true,
+  imports: [
+    PluginNavigationComponent,
+    NgIf,
+    GlobalIconComponent,
+    AutofocusDirective,
+    InfiniteScrollerDirective,
+    NgFor,
+    PluginCardComponent,
+    EditButtonComponent,
+    ButtonComponent
+  ]
 })
 export class PluginSearchComponent implements OnInit {
   pluginType: PluginType_Type
diff --git a/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts b/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts
index 9eee1a901..8d876af31 100644
--- a/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts
+++ b/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts
@@ -7,11 +7,16 @@ import { BuildFormArgument } from '@app/shared/form-validators'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { PeerTubePlugin, RegisterServerSettingOptions } from '@peertube/peertube-models'
 import { PluginApiService } from '../shared/plugin-api.service'
+import { DynamicFormFieldComponent } from '../../../shared/shared-forms/dynamic-form-field.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-plugin-show-installed',
   templateUrl: './plugin-show-installed.component.html',
-  styleUrls: [ './plugin-show-installed.component.scss' ]
+  styleUrls: [ './plugin-show-installed.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, FormsModule, ReactiveFormsModule, NgFor, DynamicFormFieldComponent ]
 })
 export class PluginShowInstalledComponent extends FormReactive implements OnInit, OnDestroy {
   plugin: PeerTubePlugin
diff --git a/client/src/app/+admin/plugins/shared/plugin-card.component.ts b/client/src/app/+admin/plugins/shared/plugin-card.component.ts
index ae91f6887..f16efa88c 100644
--- a/client/src/app/+admin/plugins/shared/plugin-card.component.ts
+++ b/client/src/app/+admin/plugins/shared/plugin-card.component.ts
@@ -1,11 +1,14 @@
 import { Component, Input } from '@angular/core'
 import { PeerTubePlugin, PeerTubePluginIndex, PluginType_Type } from '@peertube/peertube-models'
 import { PluginApiService } from './plugin-api.service'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-plugin-card',
   templateUrl: './plugin-card.component.html',
-  styleUrls: [ './plugin-card.component.scss' ]
+  styleUrls: [ './plugin-card.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent ]
 })
 
 export class PluginCardComponent {
diff --git a/client/src/app/+admin/plugins/shared/plugin-navigation.component.ts b/client/src/app/+admin/plugins/shared/plugin-navigation.component.ts
index c829bc975..74496f92a 100644
--- a/client/src/app/+admin/plugins/shared/plugin-navigation.component.ts
+++ b/client/src/app/+admin/plugins/shared/plugin-navigation.component.ts
@@ -1,10 +1,14 @@
 import { Component, Input } from '@angular/core'
 import { PluginType_Type } from '@peertube/peertube-models'
+import { NgClass } from '@angular/common'
+import { RouterLink, RouterLinkActive } from '@angular/router'
 
 @Component({
   selector: 'my-plugin-navigation',
   templateUrl: './plugin-navigation.component.html',
-  styleUrls: [ './plugin-navigation.component.scss' ]
+  styleUrls: [ './plugin-navigation.component.scss' ],
+  standalone: true,
+  imports: [ RouterLink, RouterLinkActive, NgClass ]
 })
 export class PluginNavigationComponent {
   @Input() pluginType: PluginType_Type
diff --git a/client/src/app/+admin/routes.ts b/client/src/app/+admin/routes.ts
new file mode 100644
index 000000000..3a2ceda26
--- /dev/null
+++ b/client/src/app/+admin/routes.ts
@@ -0,0 +1,66 @@
+import { Routes } from '@angular/router'
+import { ConfigRoutes, EditConfigurationService } from '@app/+admin/config'
+import { ModerationRoutes } from '@app/+admin/moderation/moderation.routes'
+import { PluginsRoutes } from '@app/+admin/plugins/plugins.routes'
+import { DebugService, JobService, LogsService, RunnerService, SystemRoutes } from '@app/+admin/system'
+import { AdminComponent } from './admin.component'
+import { FollowsRoutes } from './follows'
+import { OverviewRoutes, VideoAdminService } from './overview'
+import { TwoFactorService, UserAdminService } from '@app/shared/shared-users'
+import { AbuseService, BlocklistService, BulkService, VideoBlockService } from '@app/shared/shared-moderation'
+import { CustomMarkupService, DynamicElementService } from '@app/shared/shared-custom-markup'
+import { InstanceFollowService } from '@app/shared/shared-instance'
+import { CustomPageService } from '@app/shared/shared-main/custom-page'
+import { VideoCommentService } from '@app/shared/shared-video-comment'
+import { AdminRegistrationService } from './moderation/registration-list'
+import { PluginApiService } from './plugins/shared/plugin-api.service'
+import { ConfigService } from './config/shared/config.service'
+import { FindInBulkService, SearchService } from '@app/shared/shared-search'
+import { VideoPlaylistService } from '@app/shared/shared-video-playlist'
+
+export default [
+  {
+    path: '',
+    component: AdminComponent,
+    providers: [
+      BlocklistService,
+      UserAdminService,
+      BulkService,
+      AdminRegistrationService,
+      CustomMarkupService,
+      CustomPageService,
+      DebugService,
+      EditConfigurationService,
+      InstanceFollowService,
+      JobService,
+      LogsService,
+      PluginApiService,
+      RunnerService,
+      TwoFactorService,
+      UserAdminService,
+      VideoAdminService,
+      VideoBlockService,
+      VideoCommentService,
+      ConfigService,
+      AbuseService,
+      DynamicElementService,
+      FindInBulkService,
+      SearchService,
+      VideoPlaylistService
+    ],
+    children: [
+      {
+        path: '',
+        redirectTo: 'users',
+        pathMatch: 'full'
+      },
+
+      ...FollowsRoutes,
+      ...OverviewRoutes,
+      ...ModerationRoutes,
+      ...SystemRoutes,
+      ...ConfigRoutes,
+      ...PluginsRoutes
+    ]
+  }
+] satisfies Routes
diff --git a/client/src/app/+admin/shared/index.ts b/client/src/app/+admin/shared/index.ts
index 9e3834aae..f3ef9cdcd 100644
--- a/client/src/app/+admin/shared/index.ts
+++ b/client/src/app/+admin/shared/index.ts
@@ -1,3 +1,2 @@
+export * from './user-email-info.component'
 export * from './user-real-quota-info.component'
-
-export * from './shared-admin.module'
diff --git a/client/src/app/+admin/shared/shared-admin.module.ts b/client/src/app/+admin/shared/shared-admin.module.ts
deleted file mode 100644
index a5c300d12..000000000
--- a/client/src/app/+admin/shared/shared-admin.module.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedMainModule } from '../../shared/shared-main/shared-main.module'
-import { UserEmailInfoComponent } from './user-email-info.component'
-import { UserRealQuotaInfoComponent } from './user-real-quota-info.component'
-
-@NgModule({
-  imports: [
-    SharedMainModule
-  ],
-
-  declarations: [
-    UserRealQuotaInfoComponent,
-    UserEmailInfoComponent
-  ],
-
-  exports: [
-    UserRealQuotaInfoComponent,
-    UserEmailInfoComponent
-  ],
-
-  providers: []
-})
-export class SharedAdminModule { }
diff --git a/client/src/app/+admin/shared/user-email-info.component.ts b/client/src/app/+admin/shared/user-email-info.component.ts
index 0af905c84..87df3f684 100644
--- a/client/src/app/+admin/shared/user-email-info.component.ts
+++ b/client/src/app/+admin/shared/user-email-info.component.ts
@@ -1,10 +1,13 @@
 import { Component, Input } from '@angular/core'
 import { User, UserRegistration } from '@peertube/peertube-models'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-user-email-info',
   templateUrl: './user-email-info.component.html',
-  styleUrls: [ './user-email-info.component.scss' ]
+  styleUrls: [ './user-email-info.component.scss' ],
+  standalone: true,
+  imports: [ NgIf ]
 })
 export class UserEmailInfoComponent {
   @Input() entry: User | UserRegistration
diff --git a/client/src/app/+admin/shared/user-real-quota-info.component.ts b/client/src/app/+admin/shared/user-real-quota-info.component.ts
index 6951b742e..ae2bc5052 100644
--- a/client/src/app/+admin/shared/user-real-quota-info.component.ts
+++ b/client/src/app/+admin/shared/user-real-quota-info.component.ts
@@ -1,10 +1,14 @@
 import { Component, Input, OnInit } from '@angular/core'
 import { ServerService } from '@app/core'
 import { HTMLServerConfig, VideoResolution } from '@peertube/peertube-models'
+import { BytesPipe } from '../../shared/shared-main/angular/bytes.pipe'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-user-real-quota-info',
-  templateUrl: './user-real-quota-info.component.html'
+  templateUrl: './user-real-quota-info.component.html',
+  standalone: true,
+  imports: [ NgIf, BytesPipe ]
 })
 export class UserRealQuotaInfoComponent implements OnInit {
   @Input() videoQuota: number | string
diff --git a/client/src/app/+admin/system/debug/debug.component.ts b/client/src/app/+admin/system/debug/debug.component.ts
index 5c86803ef..dc29f1bbc 100644
--- a/client/src/app/+admin/system/debug/debug.component.ts
+++ b/client/src/app/+admin/system/debug/debug.component.ts
@@ -5,7 +5,8 @@ import { DebugService } from './debug.service'
 
 @Component({
   templateUrl: './debug.component.html',
-  styleUrls: [ './debug.component.scss' ]
+  styleUrls: [ './debug.component.scss' ],
+  standalone: true
 })
 export class DebugComponent implements OnInit {
   debug: Debug
diff --git a/client/src/app/+admin/system/jobs/jobs.component.ts b/client/src/app/+admin/system/jobs/jobs.component.ts
index 5aca2cf39..bd0799707 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.ts
+++ b/client/src/app/+admin/system/jobs/jobs.component.ts
@@ -1,4 +1,4 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, OnInit } from '@angular/core'
 import { Notifier, RestPagination, RestTable } from '@app/core'
 import { escapeHTML } from '@peertube/peertube-core-utils'
@@ -7,11 +7,31 @@ import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
 import { JobStateClient } from '../../../../types/job-state-client.type'
 import { JobTypeClient } from '../../../../types/job-type-client.type'
 import { JobService } from './job.service'
+import { TableExpanderIconComponent } from '../../../shared/shared-tables/table-expander-icon.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { TableModule } from 'primeng/table'
+import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component'
+import { NgSelectModule } from '@ng-select/ng-select'
+import { NgFor, NgClass, NgIf } from '@angular/common'
+import { FormsModule } from '@angular/forms'
 
 @Component({
   selector: 'my-jobs',
   templateUrl: './jobs.component.html',
-  styleUrls: [ './jobs.component.scss' ]
+  styleUrls: [ './jobs.component.scss' ],
+  standalone: true,
+  imports: [
+    FormsModule,
+    NgFor,
+    NgSelectModule,
+    NgClass,
+    ButtonComponent,
+    TableModule,
+    SharedModule,
+    NgIf,
+    NgbTooltip,
+    TableExpanderIconComponent
+  ]
 })
 export class JobsComponent extends RestTable implements OnInit {
   private static LOCAL_STORAGE_STATE = 'jobs-list-state'
diff --git a/client/src/app/+admin/system/logs/logs.component.ts b/client/src/app/+admin/system/logs/logs.component.ts
index 22375fcd9..18fcdbe4c 100644
--- a/client/src/app/+admin/system/logs/logs.component.ts
+++ b/client/src/app/+admin/system/logs/logs.component.ts
@@ -3,10 +3,17 @@ import { LocalStorageService, Notifier } from '@app/core'
 import { ServerLogLevel } from '@peertube/peertube-models'
 import { LogRow } from './log-row.model'
 import { LogsService } from './logs.service'
+import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component'
+import { SelectTagsComponent } from '../../../shared/shared-forms/select/select-tags.component'
+import { NgSelectModule } from '@ng-select/ng-select'
+import { NgFor, NgIf, NgClass, DatePipe } from '@angular/common'
+import { FormsModule } from '@angular/forms'
 
 @Component({
   templateUrl: './logs.component.html',
-  styleUrls: [ './logs.component.scss' ]
+  styleUrls: [ './logs.component.scss' ],
+  standalone: true,
+  imports: [ FormsModule, NgFor, NgSelectModule, NgIf, NgClass, SelectTagsComponent, ButtonComponent, DatePipe ]
 })
 export class LogsComponent implements OnInit {
   private static LOCAL_STORAGE_LOG_TYPE_CHOICE_KEY = 'admin-logs-log-type-choice'
diff --git a/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.ts b/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.ts
index e75446d8c..249cb149f 100644
--- a/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.ts
+++ b/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.ts
@@ -1,4 +1,4 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, OnInit } from '@angular/core'
 import { ConfirmService, Notifier, RestPagination, RestTable } from '@app/core'
 import { formatICU } from '@app/helpers'
@@ -6,10 +6,35 @@ import { DropdownAction } from '@app/shared/shared-main'
 import { RunnerJob, RunnerJobState } from '@peertube/peertube-models'
 import { RunnerJobFormatted, RunnerService } from '../runner.service'
 import { AdvancedInputFilter } from '@app/shared/shared-forms'
+import { AutoColspanDirective } from '../../../../shared/shared-main/angular/auto-colspan.directive'
+import { TableExpanderIconComponent } from '../../../../shared/shared-tables/table-expander-icon.component'
+import { ButtonComponent } from '../../../../shared/shared-main/buttons/button.component'
+import { AdvancedInputFilterComponent } from '../../../../shared/shared-forms/advanced-input-filter.component'
+import { ActionDropdownComponent } from '../../../../shared/shared-main/buttons/action-dropdown.component'
+import { NgIf, NgClass } from '@angular/common'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { TableModule } from 'primeng/table'
+import { RouterLink } from '@angular/router'
+import { GlobalIconComponent } from '../../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-runner-job-list',
-  templateUrl: './runner-job-list.component.html'
+  templateUrl: './runner-job-list.component.html',
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    RouterLink,
+    TableModule,
+    SharedModule,
+    NgbTooltip,
+    NgIf,
+    ActionDropdownComponent,
+    AdvancedInputFilterComponent,
+    ButtonComponent,
+    TableExpanderIconComponent,
+    NgClass,
+    AutoColspanDirective
+  ]
 })
 export class RunnerJobListComponent extends RestTable <RunnerJob> implements OnInit {
   runnerJobs: RunnerJobFormatted[] = []
diff --git a/client/src/app/+admin/system/runners/runner-list/runner-list.component.ts b/client/src/app/+admin/system/runners/runner-list/runner-list.component.ts
index 0964471f9..6b9d6ec71 100644
--- a/client/src/app/+admin/system/runners/runner-list/runner-list.component.ts
+++ b/client/src/app/+admin/system/runners/runner-list/runner-list.component.ts
@@ -1,13 +1,31 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, OnInit } from '@angular/core'
 import { ConfirmService, Notifier, RestPagination, RestTable } from '@app/core'
 import { DropdownAction } from '@app/shared/shared-main'
 import { Runner } from '@peertube/peertube-models'
 import { RunnerService } from '../runner.service'
+import { DatePipe } from '@angular/common'
+import { AutoColspanDirective } from '../../../../shared/shared-main/angular/auto-colspan.directive'
+import { ActionDropdownComponent } from '../../../../shared/shared-main/buttons/action-dropdown.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { TableModule } from 'primeng/table'
+import { RouterLink } from '@angular/router'
+import { GlobalIconComponent } from '../../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-runner-list',
-  templateUrl: './runner-list.component.html'
+  templateUrl: './runner-list.component.html',
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    RouterLink,
+    TableModule,
+    SharedModule,
+    NgbTooltip,
+    ActionDropdownComponent,
+    AutoColspanDirective,
+    DatePipe
+  ]
 })
 export class RunnerListComponent extends RestTable <Runner> implements OnInit {
   runners: Runner[] = []
diff --git a/client/src/app/+admin/system/runners/runner-registration-token-list/runner-registration-token-list.component.ts b/client/src/app/+admin/system/runners/runner-registration-token-list/runner-registration-token-list.component.ts
index c8a597b18..d393da469 100644
--- a/client/src/app/+admin/system/runners/runner-registration-token-list/runner-registration-token-list.component.ts
+++ b/client/src/app/+admin/system/runners/runner-registration-token-list/runner-registration-token-list.component.ts
@@ -1,14 +1,36 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, OnInit } from '@angular/core'
 import { ConfirmService, Notifier, RestPagination, RestTable } from '@app/core'
 import { DropdownAction } from '@app/shared/shared-main'
 import { RunnerRegistrationToken } from '@peertube/peertube-models'
 import { RunnerService } from '../runner.service'
+import { DatePipe } from '@angular/common'
+import { AutoColspanDirective } from '../../../../shared/shared-main/angular/auto-colspan.directive'
+import { CopyButtonComponent } from '../../../../shared/shared-main/buttons/copy-button.component'
+import { ActionDropdownComponent } from '../../../../shared/shared-main/buttons/action-dropdown.component'
+import { ButtonComponent } from '../../../../shared/shared-main/buttons/button.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { TableModule } from 'primeng/table'
+import { RouterLink } from '@angular/router'
+import { GlobalIconComponent } from '../../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-runner-registration-token-list',
   styleUrls: [ './runner-registration-token-list.component.scss' ],
-  templateUrl: './runner-registration-token-list.component.html'
+  templateUrl: './runner-registration-token-list.component.html',
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    RouterLink,
+    TableModule,
+    SharedModule,
+    NgbTooltip,
+    ButtonComponent,
+    ActionDropdownComponent,
+    CopyButtonComponent,
+    AutoColspanDirective,
+    DatePipe
+  ]
 })
 export class RunnerRegistrationTokenListComponent extends RestTable <RunnerRegistrationToken> implements OnInit {
   registrationTokens: RunnerRegistrationToken[] = []
diff --git a/client/src/app/+error-page/error-page.component.ts b/client/src/app/+error-page/error-page.component.ts
index 9cc4646df..8b37d14da 100644
--- a/client/src/app/+error-page/error-page.component.ts
+++ b/client/src/app/+error-page/error-page.component.ts
@@ -2,11 +2,15 @@ import { Component, OnInit } from '@angular/core'
 import { Title } from '@angular/platform-browser'
 import { Router } from '@angular/router'
 import { HttpStatusCode, HttpStatusCodeType } from '@peertube/peertube-models'
+import { LoginLinkComponent } from '../shared/shared-main/angular/login-link.component'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-error-page',
   templateUrl: './error-page.component.html',
-  styleUrls: [ './error-page.component.scss' ]
+  styleUrls: [ './error-page.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, LoginLinkComponent ]
 })
 export class ErrorPageComponent implements OnInit {
   status: HttpStatusCodeType = HttpStatusCode.NOT_FOUND_404
diff --git a/client/src/app/+error-page/error-page.module.ts b/client/src/app/+error-page/error-page.module.ts
deleted file mode 100644
index 34f026ea8..000000000
--- a/client/src/app/+error-page/error-page.module.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { NgModule } from '@angular/core'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { ErrorPageRoutingModule } from './error-page-routing.module'
-import { ErrorPageComponent } from './error-page.component'
-
-@NgModule({
-  imports: [
-    CommonModule,
-    SharedMainModule,
-
-    ErrorPageRoutingModule
-  ],
-
-  declarations: [
-    ErrorPageComponent
-  ],
-
-  exports: [
-    ErrorPageComponent
-  ],
-
-  providers: []
-})
-export class ErrorPageModule { }
diff --git a/client/src/app/+error-page/error-page-routing.module.ts b/client/src/app/+error-page/routes.ts
similarity index 54%
rename from client/src/app/+error-page/error-page-routing.module.ts
rename to client/src/app/+error-page/routes.ts
index a81f6c756..07bfc34b3 100644
--- a/client/src/app/+error-page/error-page-routing.module.ts
+++ b/client/src/app/+error-page/routes.ts
@@ -1,9 +1,8 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { ErrorPageComponent } from './error-page.component'
 import { MenuGuards } from '@app/core'
 
-const errorPageRoutes: Routes = [
+export default [
   {
     path: '',
     component: ErrorPageComponent,
@@ -15,10 +14,4 @@ const errorPageRoutes: Routes = [
       }
     }
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(errorPageRoutes) ],
-  exports: [ RouterModule ]
-})
-export class ErrorPageRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+home/home-routing.module.ts b/client/src/app/+home/home-routing.module.ts
deleted file mode 100644
index bedf26be0..000000000
--- a/client/src/app/+home/home-routing.module.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-import { HomeComponent } from './home.component'
-
-const homeRoutes: Routes = [
-  {
-    path: '',
-    component: HomeComponent,
-    data: {
-      meta: {
-        title: $localize`Homepage`
-      }
-    }
-  }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(homeRoutes) ],
-  exports: [ RouterModule ]
-})
-export class HomeRoutingModule {}
diff --git a/client/src/app/+home/home.component.ts b/client/src/app/+home/home.component.ts
index f966a2b02..813846ab7 100644
--- a/client/src/app/+home/home.component.ts
+++ b/client/src/app/+home/home.component.ts
@@ -1,9 +1,12 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'
 import { CustomPageService } from '@app/shared/shared-main/custom-page'
+import { CustomMarkupContainerComponent } from '../shared/shared-custom-markup/custom-markup-container.component'
 
 @Component({
   templateUrl: './home.component.html',
-  styleUrls: [ './home.component.scss' ]
+  styleUrls: [ './home.component.scss' ],
+  standalone: true,
+  imports: [ CustomMarkupContainerComponent ]
 })
 
 export class HomeComponent implements OnInit {
diff --git a/client/src/app/+home/home.module.ts b/client/src/app/+home/home.module.ts
deleted file mode 100644
index 102cdc296..000000000
--- a/client/src/app/+home/home.module.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedCustomMarkupModule } from '@app/shared/shared-custom-markup'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { HomeRoutingModule } from './home-routing.module'
-import { HomeComponent } from './home.component'
-
-@NgModule({
-  imports: [
-    HomeRoutingModule,
-
-    SharedMainModule,
-    SharedCustomMarkupModule
-  ],
-
-  declarations: [
-    HomeComponent
-  ],
-
-  exports: [
-    HomeComponent
-  ],
-
-  providers: [ ]
-})
-export class HomeModule { }
diff --git a/client/src/app/+home/index.ts b/client/src/app/+home/index.ts
deleted file mode 100644
index 7c77cf9fd..000000000
--- a/client/src/app/+home/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './home-routing.module'
-export * from './home.component'
-export * from './home.module'
diff --git a/client/src/app/+home/routes.ts b/client/src/app/+home/routes.ts
new file mode 100644
index 000000000..10e0a62eb
--- /dev/null
+++ b/client/src/app/+home/routes.ts
@@ -0,0 +1,29 @@
+import { Routes } from '@angular/router'
+import { HomeComponent } from './home.component'
+import { CustomPageService } from '../shared/shared-main/custom-page'
+import { CustomMarkupService, DynamicElementService } from '@app/shared/shared-custom-markup'
+import { FindInBulkService, SearchService } from '@app/shared/shared-search'
+import { VideoPlaylistService } from '@app/shared/shared-video-playlist'
+import { BlocklistService, VideoBlockService } from '@app/shared/shared-moderation'
+
+export default [
+  {
+    path: '',
+    component: HomeComponent,
+    providers: [
+      CustomPageService,
+      FindInBulkService,
+      SearchService,
+      VideoPlaylistService,
+      CustomMarkupService,
+      DynamicElementService,
+      BlocklistService,
+      VideoBlockService
+    ],
+    data: {
+      meta: {
+        title: $localize`Homepage`
+      }
+    }
+  }
+] satisfies Routes
diff --git a/client/src/app/+login/login.component.ts b/client/src/app/+login/login.component.ts
index 73991ddd0..743f81872 100644
--- a/client/src/app/+login/login.component.ts
+++ b/client/src/app/+login/login.component.ts
@@ -1,6 +1,6 @@
 import { environment } from 'src/environments/environment'
 import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute, Router, RouterLink } from '@angular/router'
 import { AuthService, Notifier, RedirectService, SessionStorageService, UserService } from '@app/core'
 import { HooksService } from '@app/core/plugins/hooks.service'
 import { LOGIN_PASSWORD_VALIDATOR, LOGIN_USERNAME_VALIDATOR } from '@app/shared/form-validators/login-validators'
@@ -10,11 +10,33 @@ import { InstanceAboutAccordionComponent } from '@app/shared/shared-instance'
 import { NgbAccordionDirective, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
 import { getExternalAuthHref } from '@peertube/peertube-core-utils'
 import { RegisteredExternalAuthConfig, ServerConfig, ServerErrorCode } from '@peertube/peertube-models'
+import { GlobalIconComponent } from '../shared/shared-icons/global-icon.component'
+import { InstanceBannerComponent } from '../shared/shared-instance/instance-banner.component'
+import { AutofocusDirective } from '../shared/shared-main/angular/autofocus.directive'
+import { PluginSelectorDirective } from '../shared/shared-main/plugins/plugin-selector.directive'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf, NgClass, NgTemplateOutlet, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-login',
   templateUrl: './login.component.html',
-  styleUrls: [ './login.component.scss' ]
+  styleUrls: [ './login.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    RouterLink,
+    FormsModule,
+    PluginSelectorDirective,
+    ReactiveFormsModule,
+    AutofocusDirective,
+    NgClass,
+    NgTemplateOutlet,
+    InputTextComponent,
+    NgFor,
+    InstanceBannerComponent,
+    InstanceAboutAccordionComponent,
+    GlobalIconComponent
+  ]
 })
 
 export class LoginComponent extends FormReactive implements OnInit, AfterViewInit {
diff --git a/client/src/app/+login/login.module.ts b/client/src/app/+login/login.module.ts
deleted file mode 100644
index 9d8607e5d..000000000
--- a/client/src/app/+login/login.module.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedInstanceModule } from '@app/shared/shared-instance'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { LoginRoutingModule } from './login-routing.module'
-import { LoginComponent } from './login.component'
-
-@NgModule({
-  imports: [
-    LoginRoutingModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedGlobalIconModule,
-
-    SharedInstanceModule
-  ],
-
-  declarations: [
-    LoginComponent
-  ],
-
-  exports: [
-    LoginComponent
-  ],
-
-  providers: [
-  ]
-})
-export class LoginModule { }
diff --git a/client/src/app/+login/login-routing.module.ts b/client/src/app/+login/routes.ts
similarity index 55%
rename from client/src/app/+login/login-routing.module.ts
rename to client/src/app/+login/routes.ts
index c5f0f23c2..0d3e40b92 100644
--- a/client/src/app/+login/login-routing.module.ts
+++ b/client/src/app/+login/routes.ts
@@ -1,9 +1,8 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { ServerConfigResolver } from '@app/core/routing/server-config-resolver.service'
 import { LoginComponent } from './login.component'
 
-const loginRoutes: Routes = [
+export default [
   {
     path: '',
     component: LoginComponent,
@@ -12,14 +11,9 @@ const loginRoutes: Routes = [
         title: $localize`Login`
       }
     },
+    providers: [ ServerConfigResolver ],
     resolve: {
       serverConfig: ServerConfigResolver
     }
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(loginRoutes) ],
-  exports: [ RouterModule ]
-})
-export class LoginRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+manage/manage.module.ts b/client/src/app/+manage/manage.module.ts
deleted file mode 100644
index 28939ec5a..000000000
--- a/client/src/app/+manage/manage.module.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedActorImageModule } from '../shared/shared-actor-image/shared-actor-image.module'
-import { SharedActorImageEditModule } from '@app/shared/shared-actor-image-edit'
-import { VideoChannelCreateComponent } from './video-channel-edit/video-channel-create.component'
-import { VideoChannelUpdateComponent } from './video-channel-edit/video-channel-update.component'
-import { ManageRoutingModule } from './manage-routing.module'
-
-@NgModule({
-  imports: [
-    ManageRoutingModule,
-    SharedMainModule,
-    SharedFormModule,
-    SharedGlobalIconModule,
-    SharedActorImageModule,
-    SharedActorImageEditModule
-  ],
-
-  declarations: [
-    VideoChannelCreateComponent,
-    VideoChannelUpdateComponent
-  ],
-
-  exports: [
-  ],
-
-  providers: []
-})
-export class ManageModule { }
diff --git a/client/src/app/+manage/manage-routing.module.ts b/client/src/app/+manage/routes.ts
similarity index 67%
rename from client/src/app/+manage/manage-routing.module.ts
rename to client/src/app/+manage/routes.ts
index 14ae4f1e0..194d2fdac 100644
--- a/client/src/app/+manage/manage-routing.module.ts
+++ b/client/src/app/+manage/routes.ts
@@ -1,9 +1,8 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { VideoChannelCreateComponent } from './video-channel-edit/video-channel-create.component'
 import { VideoChannelUpdateComponent } from './video-channel-edit/video-channel-update.component'
 
-const manageRoutes: Routes = [
+export default [
   {
     path: 'create',
     component: VideoChannelCreateComponent,
@@ -22,10 +21,4 @@ const manageRoutes: Routes = [
       }
     }
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(manageRoutes) ],
-  exports: [ RouterModule ]
-})
-export class ManageRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+manage/video-channel-edit/video-channel-create.component.ts b/client/src/app/+manage/video-channel-edit/video-channel-create.component.ts
index a7796f26c..74bf83ee9 100644
--- a/client/src/app/+manage/video-channel-edit/video-channel-create.component.ts
+++ b/client/src/app/+manage/video-channel-edit/video-channel-create.component.ts
@@ -13,10 +13,29 @@ import { FormReactiveService } from '@app/shared/shared-forms'
 import { VideoChannel, VideoChannelService } from '@app/shared/shared-main'
 import { HttpStatusCode, VideoChannelCreate } from '@peertube/peertube-models'
 import { VideoChannelEdit } from './video-channel-edit'
+import { PeertubeCheckboxComponent } from '../../shared/shared-forms/peertube-checkbox.component'
+import { MarkdownTextareaComponent } from '../../shared/shared-forms/markdown-textarea.component'
+import { HelpComponent } from '../../shared/shared-main/misc/help.component'
+import { ActorAvatarEditComponent } from '../../shared/shared-actor-image-edit/actor-avatar-edit.component'
+import { ActorBannerEditComponent } from '../../shared/shared-actor-image-edit/actor-banner-edit.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   templateUrl: './video-channel-edit.component.html',
-  styleUrls: [ './video-channel-edit.component.scss' ]
+  styleUrls: [ './video-channel-edit.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    FormsModule,
+    ReactiveFormsModule,
+    ActorBannerEditComponent,
+    ActorAvatarEditComponent,
+    NgClass,
+    HelpComponent,
+    MarkdownTextareaComponent,
+    PeertubeCheckboxComponent
+  ]
 })
 export class VideoChannelCreateComponent extends VideoChannelEdit implements OnInit, AfterViewInit {
   error: string
diff --git a/client/src/app/+manage/video-channel-edit/video-channel-update.component.ts b/client/src/app/+manage/video-channel-edit/video-channel-update.component.ts
index 8e5472d7c..94d7e7698 100644
--- a/client/src/app/+manage/video-channel-edit/video-channel-update.component.ts
+++ b/client/src/app/+manage/video-channel-edit/video-channel-update.component.ts
@@ -14,11 +14,30 @@ import { VideoChannel, VideoChannelService } from '@app/shared/shared-main'
 import { VideoChannelUpdate } from '@peertube/peertube-models'
 import { VideoChannelEdit } from './video-channel-edit'
 import { shallowCopy } from '@peertube/peertube-core-utils'
+import { PeertubeCheckboxComponent } from '../../shared/shared-forms/peertube-checkbox.component'
+import { MarkdownTextareaComponent } from '../../shared/shared-forms/markdown-textarea.component'
+import { HelpComponent } from '../../shared/shared-main/misc/help.component'
+import { ActorAvatarEditComponent } from '../../shared/shared-actor-image-edit/actor-avatar-edit.component'
+import { ActorBannerEditComponent } from '../../shared/shared-actor-image-edit/actor-banner-edit.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-video-channel-update',
   templateUrl: './video-channel-edit.component.html',
-  styleUrls: [ './video-channel-edit.component.scss' ]
+  styleUrls: [ './video-channel-edit.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    FormsModule,
+    ReactiveFormsModule,
+    ActorBannerEditComponent,
+    ActorAvatarEditComponent,
+    NgClass,
+    HelpComponent,
+    MarkdownTextareaComponent,
+    PeertubeCheckboxComponent
+  ]
 })
 export class VideoChannelUpdateComponent extends VideoChannelEdit implements OnInit, AfterViewInit, OnDestroy {
   error: string
@@ -179,7 +198,7 @@ export class VideoChannelUpdateComponent extends VideoChannelEdit implements OnI
   }
 
   getFormButtonTitle () {
-    return $localize`Update ${this.videoChannel.name}`
+    return $localize`Update ${this.videoChannel?.name}`
   }
 
   isBulkUpdateVideosDisplayed () {
diff --git a/client/src/app/+my-account/index.ts b/client/src/app/+my-account/index.ts
deleted file mode 100644
index 3df96dd7a..000000000
--- a/client/src/app/+my-account/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './my-account-routing.module'
-export * from './my-account.component'
-export * from './my-account.module'
diff --git a/client/src/app/+my-account/my-account-abuses/my-account-abuses-list.component.ts b/client/src/app/+my-account/my-account-abuses/my-account-abuses-list.component.ts
index 9316fc0dd..3fbf5bee0 100644
--- a/client/src/app/+my-account/my-account-abuses/my-account-abuses-list.component.ts
+++ b/client/src/app/+my-account/my-account-abuses/my-account-abuses-list.component.ts
@@ -1,9 +1,13 @@
 import { Component } from '@angular/core'
+import { AbuseListTableComponent } from '../../shared/shared-abuse-list/abuse-list-table.component'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-account-abuses-list',
   templateUrl: './my-account-abuses-list.component.html',
-  styleUrls: [ ]
+  styleUrls: [],
+  standalone: true,
+  imports: [ GlobalIconComponent, AbuseListTableComponent ]
 })
 export class MyAccountAbusesListComponent {
 
diff --git a/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts b/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts
index 281a12eda..621ef3c27 100644
--- a/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts
+++ b/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts
@@ -3,11 +3,15 @@ import { AuthService, ConfirmService, Notifier, ScopedTokensService } from '@app
 import { VideoService } from '@app/shared/shared-main'
 import { FeedFormat, ScopedToken } from '@peertube/peertube-models'
 import { environment } from '../../../environments/environment'
+import { InputTextComponent } from '../../shared/shared-forms/input-text.component'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-account-applications',
   templateUrl: './my-account-applications.component.html',
-  styleUrls: [ './my-account-applications.component.scss' ]
+  styleUrls: [ './my-account-applications.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent, InputTextComponent ]
 })
 export class MyAccountApplicationsComponent implements OnInit {
   feedUrl: string
diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts b/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts
index 8b9819ba2..b7c9b6ca4 100644
--- a/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts
+++ b/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts
@@ -1,9 +1,29 @@
 import { Component } from '@angular/core'
 import { BlocklistComponentType, GenericAccountBlocklistComponent } from '@app/shared/shared-moderation'
+import { NgIf, DatePipe } from '@angular/common'
+import { AutoColspanDirective } from '../../shared/shared-main/angular/auto-colspan.directive'
+import { ActorAvatarComponent } from '../../shared/shared-actor-image/actor-avatar.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { AdvancedInputFilterComponent } from '../../shared/shared-forms/advanced-input-filter.component'
+import { SharedModule } from 'primeng/api'
+import { TableModule } from 'primeng/table'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-account-blocklist',
-  templateUrl: '../../shared/shared-moderation/account-blocklist.component.html'
+  templateUrl: '../../shared/shared-moderation/account-blocklist.component.html',
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    TableModule,
+    SharedModule,
+    AdvancedInputFilterComponent,
+    NgbTooltip,
+    ActorAvatarComponent,
+    AutoColspanDirective,
+    NgIf,
+    DatePipe
+  ]
 })
 export class MyAccountBlocklistComponent extends GenericAccountBlocklistComponent {
   mode = BlocklistComponentType.Account
diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts
index 50e724f87..d32364795 100644
--- a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts
+++ b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts
@@ -1,10 +1,30 @@
 import { Component } from '@angular/core'
 import { BlocklistComponentType, GenericServerBlocklistComponent } from '@app/shared/shared-moderation'
+import { BatchDomainsModalComponent } from '../../shared/shared-moderation/batch-domains-modal.component'
+import { NgIf, DatePipe } from '@angular/common'
+import { AutoColspanDirective } from '../../shared/shared-main/angular/auto-colspan.directive'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { AdvancedInputFilterComponent } from '../../shared/shared-forms/advanced-input-filter.component'
+import { SharedModule } from 'primeng/api'
+import { TableModule } from 'primeng/table'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-account-server-blocklist',
   styleUrls: [ '../../shared/shared-moderation/moderation.scss', '../../shared/shared-moderation/server-blocklist.component.scss' ],
-  templateUrl: '../../shared/shared-moderation/server-blocklist.component.html'
+  templateUrl: '../../shared/shared-moderation/server-blocklist.component.html',
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    TableModule,
+    SharedModule,
+    AdvancedInputFilterComponent,
+    NgbTooltip,
+    AutoColspanDirective,
+    NgIf,
+    BatchDomainsModalComponent,
+    DatePipe
+  ]
 })
 export class MyAccountServerBlocklistComponent extends GenericServerBlocklistComponent {
   mode = BlocklistComponentType.Account
diff --git a/client/src/app/+my-account/my-account-import-export/my-account-export.component.ts b/client/src/app/+my-account/my-account-import-export/my-account-export.component.ts
index aef439edc..a9a3d2fa9 100644
--- a/client/src/app/+my-account/my-account-import-export/my-account-export.component.ts
+++ b/client/src/app/+my-account/my-account-import-export/my-account-export.component.ts
@@ -4,11 +4,18 @@ import { PeerTubeProblemDocument, ServerErrorCode, UserExport, UserExportState }
 import { UserImportExportService } from './user-import-export.service'
 import { concatMap, first, from, of, switchMap, toArray } from 'rxjs'
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
+import { BytesPipe } from '../../shared/shared-main/angular/bytes.pipe'
+import { FormsModule } from '@angular/forms'
+import { PeertubeCheckboxComponent } from '../../shared/shared-forms/peertube-checkbox.component'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
+import { NgIf, NgFor, DatePipe } from '@angular/common'
 
 @Component({
   selector: 'my-account-export',
   templateUrl: './my-account-export.component.html',
-  styleUrls: [ './my-account-export.component.scss' ]
+  styleUrls: [ './my-account-export.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, NgFor, GlobalIconComponent, PeertubeCheckboxComponent, FormsModule, DatePipe, BytesPipe ]
 })
 export class MyAccountExportComponent implements OnInit {
   @ViewChild('exportModal', { static: true }) exportModal: NgbModal
diff --git a/client/src/app/+my-account/my-account-import-export/my-account-import-export.component.ts b/client/src/app/+my-account/my-account-import-export/my-account-import-export.component.ts
index 271f13398..4dcee52c8 100644
--- a/client/src/app/+my-account/my-account-import-export/my-account-import-export.component.ts
+++ b/client/src/app/+my-account/my-account-import-export/my-account-import-export.component.ts
@@ -2,10 +2,14 @@ import { Component, OnInit, ViewChild } from '@angular/core'
 import { AuthService, CanComponentDeactivate, UserService } from '@app/core'
 import { MyAccountImportComponent } from './my-account-import.component'
 import { first } from 'rxjs'
+import { MyAccountExportComponent } from './my-account-export.component'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-account-import-export',
-  templateUrl: './my-account-import-export.component.html'
+  templateUrl: './my-account-import-export.component.html',
+  standalone: true,
+  imports: [ GlobalIconComponent, MyAccountImportComponent, MyAccountExportComponent ]
 })
 export class MyAccountImportExportComponent implements OnInit, CanComponentDeactivate {
   @ViewChild('accountImport') accountImport: MyAccountImportComponent
diff --git a/client/src/app/+my-account/my-account-import-export/my-account-import.component.ts b/client/src/app/+my-account/my-account-import-export/my-account-import.component.ts
index 879cdc9c3..f63dea763 100644
--- a/client/src/app/+my-account/my-account-import-export/my-account-import.component.ts
+++ b/client/src/app/+my-account/my-account-import-export/my-account-import.component.ts
@@ -7,11 +7,16 @@ import { buildHTTPErrorResponse, genericUploadErrorHandler, getUploadXRetryConfi
 import { HttpStatusCode, UserImport, UserImportState } from '@peertube/peertube-models'
 import { UploadxService, UploadState, UploaderX } from 'ngx-uploadx'
 import { BytesPipe } from '@app/shared/shared-main'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { UploadProgressComponent } from '../../shared/standalone-upload/upload-progress.component'
+import { NgIf, DatePipe } from '@angular/common'
 
 @Component({
   selector: 'my-account-import',
   templateUrl: './my-account-import.component.html',
-  styleUrls: [ './my-account-import.component.scss' ]
+  styleUrls: [ './my-account-import.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, UploadProgressComponent, NgbTooltip, DatePipe ]
 })
 export class MyAccountImportComponent implements OnInit, OnDestroy, CanComponentDeactivate {
   @Input() videoQuotaUsed: number
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.ts b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.ts
index 7c7a9352b..02ccc902c 100644
--- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.ts
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.ts
@@ -1,11 +1,17 @@
 import { Component, ViewChild } from '@angular/core'
 import { UserNotificationsComponent } from '@app/shared/standalone-notifications/user-notifications.component'
+import { NgIf } from '@angular/common'
+import { FormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
+import { RouterLink } from '@angular/router'
 
 type NotificationSortType = 'createdAt' | 'read'
 
 @Component({
   templateUrl: './my-account-notifications.component.html',
-  styleUrls: [ './my-account-notifications.component.scss' ]
+  styleUrls: [ './my-account-notifications.component.scss' ],
+  standalone: true,
+  imports: [ RouterLink, GlobalIconComponent, FormsModule, NgIf, UserNotificationsComponent ]
 })
 export class MyAccountNotificationsComponent {
   @ViewChild('userNotification', { static: true }) userNotification: UserNotificationsComponent
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts
index 7bbd240d0..ac1623da8 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts
@@ -5,11 +5,16 @@ import { AuthService, Notifier, ServerService, UserService } from '@app/core'
 import { USER_EMAIL_VALIDATOR, USER_PASSWORD_VALIDATOR } from '@app/shared/form-validators/user-validators'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { HttpStatusCode, User } from '@peertube/peertube-models'
+import { InputTextComponent } from '../../../shared/shared-forms/input-text.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-account-change-email',
   templateUrl: './my-account-change-email.component.html',
-  styleUrls: [ './my-account-change-email.component.scss' ]
+  styleUrls: [ './my-account-change-email.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, FormsModule, ReactiveFormsModule, NgClass, InputTextComponent ]
 })
 export class MyAccountChangeEmailComponent extends FormReactive implements OnInit {
   error: string = null
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
index f916740be..98dd67a9f 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
@@ -8,11 +8,16 @@ import {
 } from '@app/shared/form-validators/user-validators'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { HttpStatusCode, User } from '@peertube/peertube-models'
+import { InputTextComponent } from '../../../shared/shared-forms/input-text.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-account-change-password',
   templateUrl: './my-account-change-password.component.html',
-  styleUrls: [ './my-account-change-password.component.scss' ]
+  styleUrls: [ './my-account-change-password.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, FormsModule, ReactiveFormsModule, InputTextComponent ]
 })
 export class MyAccountChangePasswordComponent extends FormReactive implements OnInit {
   error: string = null
diff --git a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
index 9619623ee..64f73512e 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
@@ -4,7 +4,8 @@ import { AuthService, ConfirmService, Notifier, RedirectService, User, UserServi
 @Component({
   selector: 'my-account-danger-zone',
   templateUrl: './my-account-danger-zone.component.html',
-  styleUrls: [ './my-account-danger-zone.component.scss' ]
+  styleUrls: [ './my-account-danger-zone.component.scss' ],
+  standalone: true
 })
 export class MyAccountDangerZoneComponent {
   @Input() user: User = null
diff --git a/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.ts b/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.ts
index bf6accc3e..8dc09fb25 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.ts
@@ -3,11 +3,15 @@ import { Component, Input, OnInit } from '@angular/core'
 import { Notifier, UserService } from '@app/core'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { User, UserUpdateMe } from '@peertube/peertube-models'
+import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 
 @Component({
   selector: 'my-account-email-preferences',
   templateUrl: './my-account-email-preferences.component.html',
-  styleUrls: [ './my-account-email-preferences.component.scss' ]
+  styleUrls: [ './my-account-email-preferences.component.scss' ],
+  standalone: true,
+  imports: [ FormsModule, ReactiveFormsModule, PeertubeCheckboxComponent ]
 })
 export class MyAccountEmailPreferencesComponent extends FormReactive implements OnInit {
   @Input() user: User = null
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
index eaa65c9bb..cb7140b27 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
@@ -5,11 +5,16 @@ import { Notifier, ServerService, User } from '@app/core'
 import { UserNotificationService } from '@app/shared/shared-main'
 import { objectKeysTyped } from '@peertube/peertube-core-utils'
 import { UserNotificationSetting, UserNotificationSettingValue, UserRight, UserRightType } from '@peertube/peertube-models'
+import { FormsModule } from '@angular/forms'
+import { InputSwitchComponent } from '../../../shared/shared-forms/input-switch.component'
+import { NgIf, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-account-notification-preferences',
   templateUrl: './my-account-notification-preferences.component.html',
-  styleUrls: [ './my-account-notification-preferences.component.scss' ]
+  styleUrls: [ './my-account-notification-preferences.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, NgFor, InputSwitchComponent, FormsModule ]
 })
 export class MyAccountNotificationPreferencesComponent implements OnInit {
   @Input() user: User
diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts
index a2d128190..d3c4dae54 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts
@@ -3,11 +3,15 @@ import { Component, Input, OnInit } from '@angular/core'
 import { Notifier, User, UserService } from '@app/core'
 import { USER_DESCRIPTION_VALIDATOR, USER_DISPLAY_NAME_REQUIRED_VALIDATOR } from '@app/shared/form-validators/user-validators'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-account-profile',
   templateUrl: './my-account-profile.component.html',
-  styleUrls: [ './my-account-profile.component.scss' ]
+  styleUrls: [ './my-account-profile.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, FormsModule, ReactiveFormsModule, NgClass ]
 })
 export class MyAccountProfileComponent extends FormReactive implements OnInit {
   @Input() user: User = null
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts b/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
index 4b3b33bcc..544265bc5 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
@@ -1,14 +1,42 @@
-import { ViewportScroller } from '@angular/common'
+import { ViewportScroller, NgIf } from '@angular/common'
 import { HttpErrorResponse } from '@angular/common/http'
 import { AfterViewChecked, Component, OnInit } from '@angular/core'
 import { AuthService, Notifier, User, UserService } from '@app/core'
 import { genericUploadErrorHandler } from '@app/helpers'
 import { shallowCopy } from '@peertube/peertube-core-utils'
+import { MyAccountDangerZoneComponent } from './my-account-danger-zone/my-account-danger-zone.component'
+import { MyAccountChangeEmailComponent } from './my-account-change-email/my-account-change-email.component'
+import { MyAccountEmailPreferencesComponent } from './my-account-email-preferences/my-account-email-preferences.component'
+import { MyAccountTwoFactorButtonComponent } from './my-account-two-factor/my-account-two-factor-button.component'
+import { MyAccountChangePasswordComponent } from './my-account-change-password/my-account-change-password.component'
+import {
+  MyAccountNotificationPreferencesComponent
+} from './my-account-notification-preferences/my-account-notification-preferences.component'
+import { UserVideoSettingsComponent } from '../../shared/shared-user-settings/user-video-settings.component'
+import { UserInterfaceSettingsComponent } from '../../shared/shared-user-settings/user-interface-settings.component'
+import { MyAccountProfileComponent } from './my-account-profile/my-account-profile.component'
+import { UserQuotaComponent } from '../../shared/shared-main/users/user-quota.component'
+import { ActorAvatarEditComponent } from '../../shared/shared-actor-image-edit/actor-avatar-edit.component'
 
 @Component({
   selector: 'my-account-settings',
   templateUrl: './my-account-settings.component.html',
-  styleUrls: [ './my-account-settings.component.scss' ]
+  styleUrls: [ './my-account-settings.component.scss' ],
+  standalone: true,
+  imports: [
+    ActorAvatarEditComponent,
+    UserQuotaComponent,
+    MyAccountProfileComponent,
+    UserInterfaceSettingsComponent,
+    UserVideoSettingsComponent,
+    MyAccountNotificationPreferencesComponent,
+    NgIf,
+    MyAccountChangePasswordComponent,
+    MyAccountTwoFactorButtonComponent,
+    MyAccountEmailPreferencesComponent,
+    MyAccountChangeEmailComponent,
+    MyAccountDangerZoneComponent
+  ]
 })
 export class MyAccountSettingsComponent implements OnInit, AfterViewChecked {
   user: User = null
diff --git a/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor-button.component.ts b/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor-button.component.ts
index 393c3ad6b..79fd68ca6 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor-button.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor-button.component.ts
@@ -2,10 +2,14 @@ import { Subject } from 'rxjs'
 import { Component, Input, OnInit } from '@angular/core'
 import { AuthService, ConfirmService, Notifier, User } from '@app/core'
 import { TwoFactorService } from '@app/shared/shared-users'
+import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-account-two-factor-button',
-  templateUrl: './my-account-two-factor-button.component.html'
+  templateUrl: './my-account-two-factor-button.component.html',
+  standalone: true,
+  imports: [ NgIf, ButtonComponent ]
 })
 export class MyAccountTwoFactorButtonComponent implements OnInit {
   @Input() user: User = null
diff --git a/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor.component.ts b/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor.component.ts
index 259090d64..21168b83a 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor.component.ts
@@ -1,15 +1,21 @@
 import { Component, OnInit } from '@angular/core'
-import { FormGroup } from '@angular/forms'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { Router } from '@angular/router'
 import { AuthService, Notifier, User } from '@app/core'
 import { USER_EXISTING_PASSWORD_VALIDATOR, USER_OTP_TOKEN_VALIDATOR } from '@app/shared/form-validators/user-validators'
 import { FormReactiveService } from '@app/shared/shared-forms'
 import { TwoFactorService } from '@app/shared/shared-users'
+import { QRCodeModule } from 'angularx-qrcode'
+import { InputTextComponent } from '../../../shared/shared-forms/input-text.component'
+import { NgIf } from '@angular/common'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-account-two-factor',
   templateUrl: './my-account-two-factor.component.html',
-  styleUrls: [ './my-account-two-factor.component.scss' ]
+  styleUrls: [ './my-account-two-factor.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent, NgIf, FormsModule, ReactiveFormsModule, InputTextComponent, QRCodeModule ]
 })
 export class MyAccountTwoFactorComponent implements OnInit {
   twoFactorAlreadyEnabled: boolean
diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts
index d8131a991..1b60260cd 100644
--- a/client/src/app/+my-account/my-account.component.ts
+++ b/client/src/app/+my-account/my-account.component.ts
@@ -1,11 +1,15 @@
 import { Component, OnInit } from '@angular/core'
 import { AuthUser, ScreenService } from '@app/core'
-import { TopMenuDropdownParam } from '../shared/shared-main/misc/top-menu-dropdown.component'
+import { TopMenuDropdownParam, TopMenuDropdownComponent } from '../shared/shared-main/misc/top-menu-dropdown.component'
+import { RouterOutlet } from '@angular/router'
+import { NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-my-account',
   templateUrl: './my-account.component.html',
-  styleUrls: [ './my-account.component.scss' ]
+  styleUrls: [ './my-account.component.scss' ],
+  standalone: true,
+  imports: [ TopMenuDropdownComponent, NgClass, RouterOutlet ]
 })
 export class MyAccountComponent implements OnInit {
   menuEntries: TopMenuDropdownParam[] = []
diff --git a/client/src/app/+my-account/my-account.module.ts b/client/src/app/+my-account/my-account.module.ts
deleted file mode 100644
index aca09c9a1..000000000
--- a/client/src/app/+my-account/my-account.module.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { QRCodeModule } from 'angularx-qrcode'
-import { AutoCompleteModule } from 'primeng/autocomplete'
-import { TableModule } from 'primeng/table'
-import { DragDropModule } from '@angular/cdk/drag-drop'
-import { NgModule } from '@angular/core'
-import { SharedAbuseListModule } from '@app/shared/shared-abuse-list'
-import { SharedActorImageEditModule } from '@app/shared/shared-actor-image-edit'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedModerationModule } from '@app/shared/shared-moderation'
-import { SharedShareModal } from '@app/shared/shared-share-modal'
-import { SharedUserInterfaceSettingsModule } from '@app/shared/shared-user-settings'
-import { SharedUsersModule } from '@app/shared/shared-users'
-import { SharedActorImageModule } from '../shared/shared-actor-image/shared-actor-image.module'
-import { MyAccountAbusesListComponent } from './my-account-abuses/my-account-abuses-list.component'
-import { MyAccountApplicationsComponent } from './my-account-applications/my-account-applications.component'
-import { MyAccountBlocklistComponent } from './my-account-blocklist/my-account-blocklist.component'
-import { MyAccountServerBlocklistComponent } from './my-account-blocklist/my-account-server-blocklist.component'
-import { MyAccountNotificationsComponent } from './my-account-notifications/my-account-notifications.component'
-import { MyAccountRoutingModule } from './my-account-routing.module'
-import { MyAccountChangeEmailComponent } from './my-account-settings/my-account-change-email'
-import { MyAccountChangePasswordComponent } from './my-account-settings/my-account-change-password/my-account-change-password.component'
-import { MyAccountDangerZoneComponent } from './my-account-settings/my-account-danger-zone'
-import { MyAccountEmailPreferencesComponent } from './my-account-settings/my-account-email-preferences'
-import { MyAccountNotificationPreferencesComponent } from './my-account-settings/my-account-notification-preferences'
-import { MyAccountProfileComponent } from './my-account-settings/my-account-profile/my-account-profile.component'
-import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component'
-import { MyAccountTwoFactorButtonComponent, MyAccountTwoFactorComponent } from './my-account-settings/my-account-two-factor'
-import { MyAccountComponent } from './my-account.component'
-import {
-  MyAccountImportExportComponent,
-  MyAccountExportComponent,
-  MyAccountImportComponent,
-  UserImportExportService
-} from './my-account-import-export'
-import { UploadProgressComponent } from '@app/shared/standalone-upload'
-import { UserNotificationsComponent } from '@app/shared/standalone-notifications/user-notifications.component'
-
-@NgModule({
-  imports: [
-    MyAccountRoutingModule,
-
-    QRCodeModule,
-    AutoCompleteModule,
-    TableModule,
-    DragDropModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedModerationModule,
-    SharedUserInterfaceSettingsModule,
-    SharedUsersModule,
-    SharedGlobalIconModule,
-    SharedAbuseListModule,
-    SharedShareModal,
-    SharedActorImageModule,
-    SharedActorImageEditModule,
-
-    UploadProgressComponent,
-    UserNotificationsComponent
-  ],
-
-  declarations: [
-    MyAccountComponent,
-    MyAccountSettingsComponent,
-    MyAccountChangePasswordComponent,
-    MyAccountProfileComponent,
-    MyAccountChangeEmailComponent,
-    MyAccountApplicationsComponent,
-
-    MyAccountTwoFactorButtonComponent,
-    MyAccountTwoFactorComponent,
-
-    MyAccountDangerZoneComponent,
-    MyAccountBlocklistComponent,
-    MyAccountAbusesListComponent,
-    MyAccountServerBlocklistComponent,
-    MyAccountNotificationsComponent,
-    MyAccountNotificationPreferencesComponent,
-
-    MyAccountEmailPreferencesComponent,
-    MyAccountImportExportComponent,
-    MyAccountExportComponent,
-    MyAccountImportComponent
-  ],
-
-  exports: [
-    MyAccountComponent
-  ],
-
-  providers: [
-    UserImportExportService
-  ]
-})
-export class MyAccountModule {
-}
diff --git a/client/src/app/+my-account/my-account-routing.module.ts b/client/src/app/+my-account/routes.ts
similarity index 87%
rename from client/src/app/+my-account/my-account-routing.module.ts
rename to client/src/app/+my-account/routes.ts
index edd3e8ffd..3109a85f8 100644
--- a/client/src/app/+my-account/my-account-routing.module.ts
+++ b/client/src/app/+my-account/routes.ts
@@ -1,5 +1,4 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { CanDeactivateGuard, LoginGuard } from '../core'
 import { MyAccountAbusesListComponent } from './my-account-abuses/my-account-abuses-list.component'
 import { MyAccountApplicationsComponent } from './my-account-applications/my-account-applications.component'
@@ -8,13 +7,24 @@ import { MyAccountServerBlocklistComponent } from './my-account-blocklist/my-acc
 import { MyAccountNotificationsComponent } from './my-account-notifications/my-account-notifications.component'
 import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component'
 import { MyAccountTwoFactorComponent } from './my-account-settings/my-account-two-factor'
-import { MyAccountImportExportComponent } from './my-account-import-export'
+import { MyAccountImportExportComponent, UserImportExportService } from './my-account-import-export'
 import { MyAccountComponent } from './my-account.component'
+import { TwoFactorService } from '@app/shared/shared-users'
+import { AbuseService, BlocklistService, VideoBlockService } from '@app/shared/shared-moderation'
+import { VideoCommentService } from '@app/shared/shared-video-comment'
 
-const myAccountRoutes: Routes = [
+export default [
   {
     path: '',
     component: MyAccountComponent,
+    providers: [
+      UserImportExportService,
+      TwoFactorService,
+      BlocklistService,
+      AbuseService,
+      VideoCommentService,
+      VideoBlockService
+    ],
     canActivateChild: [ LoginGuard ],
     children: [
       {
@@ -151,10 +161,4 @@ const myAccountRoutes: Routes = [
       }
     ]
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(myAccountRoutes) ],
-  exports: [ RouterModule ]
-})
-export class MyAccountRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
index 56297a31b..e242eb75b 100644
--- a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
+++ b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
@@ -5,10 +5,38 @@ import { Component } from '@angular/core'
 import { AuthService, ComponentPagination, ConfirmService, hasMoreItems, Notifier, ScreenService } from '@app/core'
 import { VideoChannel, VideoChannelService } from '@app/shared/shared-main'
 import { formatICU } from '@app/helpers'
+import { NumberFormatterPipe } from '../../shared/shared-main/angular/number-formatter.pipe'
+import { ChartModule } from 'primeng/chart'
+import { DeferLoadingDirective } from '../../shared/shared-main/angular/defer-loading.directive'
+import { DeleteButtonComponent } from '../../shared/shared-main/buttons/delete-button.component'
+import { EditButtonComponent } from '../../shared/shared-main/buttons/edit-button.component'
+import { ActorAvatarComponent } from '../../shared/shared-actor-image/actor-avatar.component'
+import { InfiniteScrollerDirective } from '../../shared/shared-main/angular/infinite-scroller.directive'
+import { AdvancedInputFilterComponent } from '../../shared/shared-forms/advanced-input-filter.component'
+import { ChannelsSetupMessageComponent } from '../../shared/shared-main/misc/channels-setup-message.component'
+import { RouterLink } from '@angular/router'
+import { NgIf, NgFor } from '@angular/common'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   templateUrl: './my-video-channels.component.html',
-  styleUrls: [ './my-video-channels.component.scss' ]
+  styleUrls: [ './my-video-channels.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    NgIf,
+    RouterLink,
+    ChannelsSetupMessageComponent,
+    AdvancedInputFilterComponent,
+    InfiniteScrollerDirective,
+    NgFor,
+    ActorAvatarComponent,
+    EditButtonComponent,
+    DeleteButtonComponent,
+    DeferLoadingDirective,
+    ChartModule,
+    NumberFormatterPipe
+  ]
 })
 export class MyVideoChannelsComponent {
   videoChannels: VideoChannel[] = []
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channels.module.ts b/client/src/app/+my-library/+my-video-channels/my-video-channels.module.ts
deleted file mode 100644
index a17eb9f10..000000000
--- a/client/src/app/+my-library/+my-video-channels/my-video-channels.module.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { ChartModule } from 'primeng/chart'
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { MyVideoChannelsRoutingModule } from './my-video-channels-routing.module'
-import { MyVideoChannelsComponent } from './my-video-channels.component'
-import { SharedActorImageModule } from '@app/shared/shared-actor-image/shared-actor-image.module'
-
-@NgModule({
-  imports: [
-    MyVideoChannelsRoutingModule,
-
-    ChartModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedGlobalIconModule,
-    SharedActorImageModule
-  ],
-
-  declarations: [
-    MyVideoChannelsComponent
-  ],
-
-  exports: [],
-  providers: []
-})
-export class MyVideoChannelsModule { }
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channels-routing.module.ts b/client/src/app/+my-library/+my-video-channels/routes.ts
similarity index 56%
rename from client/src/app/+my-library/+my-video-channels/my-video-channels-routing.module.ts
rename to client/src/app/+my-library/+my-video-channels/routes.ts
index b4962ed35..6e96545d8 100644
--- a/client/src/app/+my-library/+my-video-channels/my-video-channels-routing.module.ts
+++ b/client/src/app/+my-library/+my-video-channels/routes.ts
@@ -1,8 +1,7 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { MyVideoChannelsComponent } from './my-video-channels.component'
 
-const myVideoChannelsRoutes: Routes = [
+export default [
   {
     path: '',
     component: MyVideoChannelsComponent,
@@ -20,10 +19,4 @@ const myVideoChannelsRoutes: Routes = [
     path: 'update/:videoChannelName',
     redirectTo: '/manage/update/:videoChannelName'
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(myVideoChannelsRoutes) ],
-  exports: [ RouterModule ]
-})
-export class MyVideoChannelsRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+my-library/index.ts b/client/src/app/+my-library/index.ts
deleted file mode 100644
index d51a36a7c..000000000
--- a/client/src/app/+my-library/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './my-library-routing.module'
-export * from './my-library.component'
-export * from './my-library.module'
diff --git a/client/src/app/+my-library/my-follows/my-followers.component.ts b/client/src/app/+my-library/my-follows/my-followers.component.ts
index 4e3e5bcc4..2395bf438 100644
--- a/client/src/app/+my-library/my-follows/my-followers.component.ts
+++ b/client/src/app/+my-library/my-follows/my-followers.component.ts
@@ -5,10 +5,17 @@ import { AuthService, ComponentPagination, Notifier } from '@app/core'
 import { AdvancedInputFilter } from '@app/shared/shared-forms'
 import { UserSubscriptionService } from '@app/shared/shared-user-subscription'
 import { ActorFollow } from '@peertube/peertube-models'
+import { ActorAvatarComponent } from '../../shared/shared-actor-image/actor-avatar.component'
+import { InfiniteScrollerDirective } from '../../shared/shared-main/angular/infinite-scroller.directive'
+import { AdvancedInputFilterComponent } from '../../shared/shared-forms/advanced-input-filter.component'
+import { NgIf, NgFor } from '@angular/common'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   templateUrl: './my-followers.component.html',
-  styleUrls: [ './my-followers.component.scss' ]
+  styleUrls: [ './my-followers.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent, NgIf, AdvancedInputFilterComponent, InfiniteScrollerDirective, NgFor, ActorAvatarComponent ]
 })
 export class MyFollowersComponent implements OnInit {
   follows: ActorFollow[] = []
diff --git a/client/src/app/+my-library/my-follows/my-subscriptions.component.ts b/client/src/app/+my-library/my-follows/my-subscriptions.component.ts
index f676aa014..d0cb493a7 100644
--- a/client/src/app/+my-library/my-follows/my-subscriptions.component.ts
+++ b/client/src/app/+my-library/my-follows/my-subscriptions.component.ts
@@ -3,10 +3,28 @@ import { Component } from '@angular/core'
 import { ComponentPagination, Notifier } from '@app/core'
 import { VideoChannel } from '@app/shared/shared-main'
 import { UserSubscriptionService } from '@app/shared/shared-user-subscription'
+import { SubscribeButtonComponent } from '../../shared/shared-user-subscription/subscribe-button.component'
+import { RouterLink } from '@angular/router'
+import { ActorAvatarComponent } from '../../shared/shared-actor-image/actor-avatar.component'
+import { InfiniteScrollerDirective } from '../../shared/shared-main/angular/infinite-scroller.directive'
+import { AdvancedInputFilterComponent } from '../../shared/shared-forms/advanced-input-filter.component'
+import { NgIf, NgFor } from '@angular/common'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   templateUrl: './my-subscriptions.component.html',
-  styleUrls: [ './my-subscriptions.component.scss' ]
+  styleUrls: [ './my-subscriptions.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    NgIf,
+    AdvancedInputFilterComponent,
+    InfiniteScrollerDirective,
+    NgFor,
+    ActorAvatarComponent,
+    RouterLink,
+    SubscribeButtonComponent
+  ]
 })
 export class MySubscriptionsComponent {
   videoChannels: VideoChannel[] = []
diff --git a/client/src/app/+my-library/my-history/my-history.component.ts b/client/src/app/+my-library/my-history/my-history.component.ts
index c4878c957..6e3bf1ada 100644
--- a/client/src/app/+my-library/my-history/my-history.component.ts
+++ b/client/src/app/+my-library/my-history/my-history.component.ts
@@ -4,10 +4,28 @@ import { AuthService, ComponentPagination, ConfirmService, DisableForReuseHook,
 import { immutableAssign } from '@app/helpers'
 import { UserHistoryService, Video } from '@app/shared/shared-main'
 import { MiniatureDisplayOptions, VideosSelectionComponent } from '@app/shared/shared-video-miniature'
+import { DeleteButtonComponent } from '../../shared/shared-main/buttons/delete-button.component'
+import { PeerTubeTemplateDirective } from '../../shared/shared-main/angular/peertube-template.directive'
+import { FormsModule } from '@angular/forms'
+import { InputSwitchComponent } from '../../shared/shared-forms/input-switch.component'
+import { AdvancedInputFilterComponent } from '../../shared/shared-forms/advanced-input-filter.component'
+import { NgIf } from '@angular/common'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   templateUrl: './my-history.component.html',
-  styleUrls: [ './my-history.component.scss' ]
+  styleUrls: [ './my-history.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    NgIf,
+    AdvancedInputFilterComponent,
+    InputSwitchComponent,
+    FormsModule,
+    VideosSelectionComponent,
+    PeerTubeTemplateDirective,
+    DeleteButtonComponent
+  ]
 })
 export class MyHistoryComponent implements OnInit, DisableForReuseHook {
   @ViewChild('videosSelection', { static: true }) videosSelection: VideosSelectionComponent
diff --git a/client/src/app/+my-library/my-library.component.ts b/client/src/app/+my-library/my-library.component.ts
index 35eb617ab..d3a5b2aea 100644
--- a/client/src/app/+my-library/my-library.component.ts
+++ b/client/src/app/+my-library/my-library.component.ts
@@ -1,11 +1,15 @@
 import { Component, OnInit } from '@angular/core'
 import { AuthService, AuthUser, ScreenService, ServerService } from '@app/core'
 import { HTMLServerConfig } from '@peertube/peertube-models'
-import { TopMenuDropdownParam } from '../shared/shared-main/misc/top-menu-dropdown.component'
+import { TopMenuDropdownParam, TopMenuDropdownComponent } from '../shared/shared-main/misc/top-menu-dropdown.component'
+import { RouterOutlet } from '@angular/router'
+import { NgClass } from '@angular/common'
 
 @Component({
   templateUrl: './my-library.component.html',
-  styleUrls: [ './my-library.component.scss' ]
+  styleUrls: [ './my-library.component.scss' ],
+  standalone: true,
+  imports: [ TopMenuDropdownComponent, NgClass, RouterOutlet ]
 })
 export class MyLibraryComponent implements OnInit {
   menuEntries: TopMenuDropdownParam[] = []
diff --git a/client/src/app/+my-library/my-library.module.ts b/client/src/app/+my-library/my-library.module.ts
deleted file mode 100644
index 4acb3b75e..000000000
--- a/client/src/app/+my-library/my-library.module.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { AutoCompleteModule } from 'primeng/autocomplete'
-import { TableModule } from 'primeng/table'
-import { DragDropModule } from '@angular/cdk/drag-drop'
-import { NgModule } from '@angular/core'
-import { SharedAbuseListModule } from '@app/shared/shared-abuse-list'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedModerationModule } from '@app/shared/shared-moderation'
-import { SharedShareModal } from '@app/shared/shared-share-modal'
-import { SharedTablesModule } from '@app/shared/shared-tables'
-import { SharedUserInterfaceSettingsModule } from '@app/shared/shared-user-settings'
-import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription/shared-user-subscription.module'
-import { SharedVideoLiveModule } from '@app/shared/shared-video-live'
-import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
-import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist/shared-video-playlist.module'
-import { SharedActorImageModule } from '../shared/shared-actor-image/shared-actor-image.module'
-import { MyFollowersComponent } from './my-follows/my-followers.component'
-import { MySubscriptionsComponent } from './my-follows/my-subscriptions.component'
-import { MyHistoryComponent } from './my-history/my-history.component'
-import { MyLibraryRoutingModule } from './my-library-routing.module'
-import { MyLibraryComponent } from './my-library.component'
-import { MyAcceptOwnershipComponent } from './my-ownership/my-accept-ownership/my-accept-ownership.component'
-import { MyOwnershipComponent } from './my-ownership/my-ownership.component'
-import { MyVideoImportsComponent } from './my-video-imports/my-video-imports.component'
-import { MyVideoPlaylistCreateComponent } from './my-video-playlists/my-video-playlist-create.component'
-import { MyVideoPlaylistElementsComponent } from './my-video-playlists/my-video-playlist-elements.component'
-import { MyVideoPlaylistUpdateComponent } from './my-video-playlists/my-video-playlist-update.component'
-import { MyVideoPlaylistsComponent } from './my-video-playlists/my-video-playlists.component'
-import { VideoChangeOwnershipComponent } from './my-videos/modals/video-change-ownership.component'
-import { MyVideosComponent } from './my-videos/my-videos.component'
-import { MyVideoChannelSyncsComponent } from './my-video-channel-syncs/my-video-channel-syncs.component'
-import { VideoChannelSyncEditComponent } from './my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component'
-
-@NgModule({
-  imports: [
-    MyLibraryRoutingModule,
-
-    AutoCompleteModule,
-    TableModule,
-    DragDropModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedModerationModule,
-    SharedVideoMiniatureModule,
-    SharedUserSubscriptionModule,
-    SharedVideoPlaylistModule,
-    SharedUserInterfaceSettingsModule,
-    SharedGlobalIconModule,
-    SharedAbuseListModule,
-    SharedShareModal,
-    SharedVideoLiveModule,
-    SharedActorImageModule,
-    SharedTablesModule
-  ],
-
-  declarations: [
-    MyLibraryComponent,
-
-    MyVideosComponent,
-
-    VideoChangeOwnershipComponent,
-
-    MyOwnershipComponent,
-    MyAcceptOwnershipComponent,
-    MyVideoImportsComponent,
-    MyVideoChannelSyncsComponent,
-    VideoChannelSyncEditComponent,
-    MySubscriptionsComponent,
-    MyFollowersComponent,
-    MyHistoryComponent,
-
-    MyVideoPlaylistCreateComponent,
-    MyVideoPlaylistUpdateComponent,
-    MyVideoPlaylistsComponent,
-    MyVideoPlaylistElementsComponent
-  ],
-
-  exports: [
-    MyLibraryComponent
-  ],
-
-  providers: []
-})
-export class MyLibraryModule {
-}
diff --git a/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts b/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts
index 87e389411..176d51b2a 100644
--- a/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts
+++ b/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts
@@ -7,11 +7,17 @@ import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { VideoOwnershipService } from '@app/shared/shared-main'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { VideoChangeOwnership } from '@peertube/peertube-models'
+import { NgIf } from '@angular/common'
+import { SelectChannelComponent } from '../../../shared/shared-forms/select/select-channel.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-accept-ownership',
   templateUrl: './my-accept-ownership.component.html',
-  styleUrls: [ './my-accept-ownership.component.scss' ]
+  styleUrls: [ './my-accept-ownership.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent, FormsModule, ReactiveFormsModule, SelectChannelComponent, NgIf ]
 })
 export class MyAcceptOwnershipComponent extends FormReactive implements OnInit {
   @Output() accepted = new EventEmitter<void>()
diff --git a/client/src/app/+my-library/my-ownership/my-ownership.component.ts b/client/src/app/+my-library/my-ownership/my-ownership.component.ts
index 4838eca27..2e808893b 100644
--- a/client/src/app/+my-library/my-ownership/my-ownership.component.ts
+++ b/client/src/app/+my-library/my-ownership/my-ownership.component.ts
@@ -1,13 +1,34 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { Notifier, RestPagination, RestTable } from '@app/core'
 import { Account, VideoOwnershipService } from '@app/shared/shared-main'
 import { VideoChangeOwnership, VideoChangeOwnershipStatus, VideoChangeOwnershipStatusType } from '@peertube/peertube-models'
 import { MyAcceptOwnershipComponent } from './my-accept-ownership/my-accept-ownership.component'
+import { AutoColspanDirective } from '../../shared/shared-main/angular/auto-colspan.directive'
+import { ActorAvatarComponent } from '../../shared/shared-actor-image/actor-avatar.component'
+import { ButtonComponent } from '../../shared/shared-main/buttons/button.component'
+import { NgIf, NgClass, DatePipe } from '@angular/common'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { TableModule } from 'primeng/table'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   templateUrl: './my-ownership.component.html',
-  styleUrls: [ './my-ownership.component.scss' ]
+  styleUrls: [ './my-ownership.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    TableModule,
+    SharedModule,
+    NgbTooltip,
+    NgIf,
+    ButtonComponent,
+    ActorAvatarComponent,
+    NgClass,
+    AutoColspanDirective,
+    MyAcceptOwnershipComponent,
+    DatePipe
+  ]
 })
 export class MyOwnershipComponent extends RestTable implements OnInit {
   videoChangeOwnerships: VideoChangeOwnership[] = []
diff --git a/client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.ts b/client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.ts
index 44e5c45b9..4d04f0581 100644
--- a/client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.ts
+++ b/client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.ts
@@ -1,13 +1,33 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { mergeMap } from 'rxjs'
 import { Component, OnInit } from '@angular/core'
 import { AuthService, Notifier, RestPagination, RestTable, ServerService } from '@app/core'
 import { DropdownAction, VideoChannelService, VideoChannelSyncService } from '@app/shared/shared-main'
 import { HTMLServerConfig, VideoChannelSync, VideoChannelSyncState, VideoChannelSyncStateType } from '@peertube/peertube-models'
+import { ActorAvatarComponent } from '../../shared/shared-actor-image/actor-avatar.component'
+import { ActionDropdownComponent } from '../../shared/shared-main/buttons/action-dropdown.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { RouterLink } from '@angular/router'
+import { TableModule } from 'primeng/table'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
+import { NgIf, NgClass, DatePipe } from '@angular/common'
 
 @Component({
   templateUrl: './my-video-channel-syncs.component.html',
-  styleUrls: [ './my-video-channel-syncs.component.scss' ]
+  styleUrls: [ './my-video-channel-syncs.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    GlobalIconComponent,
+    TableModule,
+    SharedModule,
+    RouterLink,
+    NgbTooltip,
+    ActionDropdownComponent,
+    ActorAvatarComponent,
+    NgClass,
+    DatePipe
+  ]
 })
 export class MyVideoChannelSyncsComponent extends RestTable implements OnInit {
   error: string
diff --git a/client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.ts b/client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.ts
index a40a68764..c140e18e3 100644
--- a/client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.ts
+++ b/client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.ts
@@ -8,11 +8,16 @@ import { VIDEO_CHANNEL_EXTERNAL_URL_VALIDATOR } from '@app/shared/form-validator
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { VideoChannelService, VideoChannelSyncService } from '@app/shared/shared-main'
 import { VideoChannelSyncCreate } from '@peertube/peertube-models'
+import { SelectChannelComponent } from '../../../shared/shared-forms/select/select-channel.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-video-channel-sync-edit',
   templateUrl: './video-channel-sync-edit.component.html',
-  styleUrls: [ './video-channel-sync-edit.component.scss' ]
+  styleUrls: [ './video-channel-sync-edit.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, FormsModule, ReactiveFormsModule, NgClass, SelectChannelComponent ]
 })
 export class VideoChannelSyncEditComponent extends FormReactive implements OnInit {
   error: string
diff --git a/client/src/app/+my-library/my-video-imports/my-video-imports.component.ts b/client/src/app/+my-library/my-video-imports/my-video-imports.component.ts
index 76cefa7bd..007dbb81b 100644
--- a/client/src/app/+my-library/my-video-imports/my-video-imports.component.ts
+++ b/client/src/app/+my-library/my-video-imports/my-video-imports.component.ts
@@ -1,12 +1,40 @@
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, OnInit } from '@angular/core'
 import { Notifier, RestPagination, RestTable } from '@app/core'
 import { Video, VideoImportService } from '@app/shared/shared-main'
 import { VideoImport, VideoImportState, VideoImportStateType } from '@peertube/peertube-models'
+import { AutoColspanDirective } from '../../shared/shared-main/angular/auto-colspan.directive'
+import { EditButtonComponent } from '../../shared/shared-main/buttons/edit-button.component'
+import { DeleteButtonComponent } from '../../shared/shared-main/buttons/delete-button.component'
+import { ButtonComponent } from '../../shared/shared-main/buttons/button.component'
+import { TableExpanderIconComponent } from '../../shared/shared-tables/table-expander-icon.component'
+import { NgIf, NgClass, DatePipe } from '@angular/common'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { TableModule } from 'primeng/table'
+import { AdvancedInputFilterComponent } from '../../shared/shared-forms/advanced-input-filter.component'
+import { RouterLink } from '@angular/router'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   templateUrl: './my-video-imports.component.html',
-  styleUrls: [ './my-video-imports.component.scss' ]
+  styleUrls: [ './my-video-imports.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    RouterLink,
+    AdvancedInputFilterComponent,
+    TableModule,
+    SharedModule,
+    NgbTooltip,
+    NgIf,
+    TableExpanderIconComponent,
+    ButtonComponent,
+    DeleteButtonComponent,
+    EditButtonComponent,
+    NgClass,
+    AutoColspanDirective,
+    DatePipe
+  ]
 })
 export class MyVideoImportsComponent extends RestTable implements OnInit {
   videoImports: VideoImport[] = []
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-create.component.ts b/client/src/app/+my-library/my-video-playlists/my-video-playlist-create.component.ts
index a54b3ca86..8dba9ad01 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-create.component.ts
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-create.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core'
-import { Router } from '@angular/router'
+import { Router, RouterLink } from '@angular/router'
 import { AuthService, Notifier, ServerService } from '@app/core'
 import { listUserChannelsForSelect } from '@app/helpers'
 import {
@@ -13,10 +13,30 @@ import { FormReactiveService } from '@app/shared/shared-forms'
 import { VideoPlaylistService } from '@app/shared/shared-video-playlist'
 import { VideoPlaylistCreate, VideoPlaylistPrivacy } from '@peertube/peertube-models'
 import { MyVideoPlaylistEdit } from './my-video-playlist-edit'
+import { SelectChannelComponent } from '../../shared/shared-forms/select/select-channel.component'
+import { SelectOptionsComponent } from '../../shared/shared-forms/select/select-options.component'
+import { MarkdownTextareaComponent } from '../../shared/shared-forms/markdown-textarea.component'
+import { HelpComponent } from '../../shared/shared-main/misc/help.component'
+import { PreviewUploadComponent } from '../../shared/shared-forms/preview-upload.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   templateUrl: './my-video-playlist-edit.component.html',
-  styleUrls: [ './my-video-playlist-edit.component.scss' ]
+  styleUrls: [ './my-video-playlist-edit.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    RouterLink,
+    FormsModule,
+    ReactiveFormsModule,
+    PreviewUploadComponent,
+    NgClass,
+    HelpComponent,
+    MarkdownTextareaComponent,
+    SelectOptionsComponent,
+    SelectChannelComponent
+  ]
 })
 export class MyVideoPlaylistCreateComponent extends MyVideoPlaylistEdit implements OnInit {
   error: string
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.ts b/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.ts
index 7a9588743..77b920037 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.ts
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.ts
@@ -1,5 +1,5 @@
 import { Subject, Subscription } from 'rxjs'
-import { CdkDragDrop } from '@angular/cdk/drag-drop'
+import { CdkDragDrop, CdkDropList, CdkDrag } from '@angular/cdk/drag-drop'
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { ComponentPagination, ConfirmService, HooksService, Notifier, ScreenService } from '@app/core'
@@ -7,10 +7,29 @@ import { DropdownAction } from '@app/shared/shared-main'
 import { VideoShareComponent } from '@app/shared/shared-share-modal'
 import { VideoPlaylist, VideoPlaylistElement, VideoPlaylistService } from '@app/shared/shared-video-playlist'
 import { VideoPlaylistType } from '@peertube/peertube-models'
+import { VideoPlaylistElementMiniatureComponent } from '../../shared/shared-video-playlist/video-playlist-element-miniature.component'
+import { InfiniteScrollerDirective } from '../../shared/shared-main/angular/infinite-scroller.directive'
+import { ActionDropdownComponent } from '../../shared/shared-main/buttons/action-dropdown.component'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
+import { VideoPlaylistMiniatureComponent } from '../../shared/shared-video-playlist/video-playlist-miniature.component'
+import { NgIf, NgFor } from '@angular/common'
 
 @Component({
   templateUrl: './my-video-playlist-elements.component.html',
-  styleUrls: [ './my-video-playlist-elements.component.scss' ]
+  styleUrls: [ './my-video-playlist-elements.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    VideoPlaylistMiniatureComponent,
+    GlobalIconComponent,
+    ActionDropdownComponent,
+    InfiniteScrollerDirective,
+    CdkDropList,
+    NgFor,
+    CdkDrag,
+    VideoPlaylistElementMiniatureComponent,
+    VideoShareComponent
+  ]
 })
 export class MyVideoPlaylistElementsComponent implements OnInit, OnDestroy {
   @ViewChild('videoShareModal') videoShareModal: VideoShareComponent
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-update.component.ts b/client/src/app/+my-library/my-video-playlists/my-video-playlist-update.component.ts
index f29a0cc45..0960f4247 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-update.component.ts
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-update.component.ts
@@ -1,7 +1,7 @@
 import { forkJoin, Subscription } from 'rxjs'
 import { map, switchMap } from 'rxjs/operators'
 import { Component, OnDestroy, OnInit } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute, Router, RouterLink } from '@angular/router'
 import { AuthService, Notifier, ServerService } from '@app/core'
 import { listUserChannelsForSelect } from '@app/helpers'
 import {
@@ -15,10 +15,30 @@ import { FormReactiveService } from '@app/shared/shared-forms'
 import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist'
 import { VideoPlaylistUpdate } from '@peertube/peertube-models'
 import { MyVideoPlaylistEdit } from './my-video-playlist-edit'
+import { SelectChannelComponent } from '../../shared/shared-forms/select/select-channel.component'
+import { SelectOptionsComponent } from '../../shared/shared-forms/select/select-options.component'
+import { MarkdownTextareaComponent } from '../../shared/shared-forms/markdown-textarea.component'
+import { HelpComponent } from '../../shared/shared-main/misc/help.component'
+import { PreviewUploadComponent } from '../../shared/shared-forms/preview-upload.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   templateUrl: './my-video-playlist-edit.component.html',
-  styleUrls: [ './my-video-playlist-edit.component.scss' ]
+  styleUrls: [ './my-video-playlist-edit.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    RouterLink,
+    FormsModule,
+    ReactiveFormsModule,
+    PreviewUploadComponent,
+    NgClass,
+    HelpComponent,
+    MarkdownTextareaComponent,
+    SelectOptionsComponent,
+    SelectChannelComponent
+  ]
 })
 export class MyVideoPlaylistUpdateComponent extends MyVideoPlaylistEdit implements OnInit, OnDestroy {
   error: string
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.ts b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.ts
index 08bd94fae..4e8fa21cc 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.ts
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.ts
@@ -4,10 +4,32 @@ import { Component } from '@angular/core'
 import { AuthService, ComponentPagination, ConfirmService, Notifier } from '@app/core'
 import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist'
 import { VideoPlaylistType } from '@peertube/peertube-models'
+import { EditButtonComponent } from '../../shared/shared-main/buttons/edit-button.component'
+import { DeleteButtonComponent } from '../../shared/shared-main/buttons/delete-button.component'
+import { VideoPlaylistMiniatureComponent } from '../../shared/shared-video-playlist/video-playlist-miniature.component'
+import { InfiniteScrollerDirective } from '../../shared/shared-main/angular/infinite-scroller.directive'
+import { RouterLink } from '@angular/router'
+import { AdvancedInputFilterComponent } from '../../shared/shared-forms/advanced-input-filter.component'
+import { ChannelsSetupMessageComponent } from '../../shared/shared-main/misc/channels-setup-message.component'
+import { NgIf, NgFor } from '@angular/common'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   templateUrl: './my-video-playlists.component.html',
-  styleUrls: [ './my-video-playlists.component.scss' ]
+  styleUrls: [ './my-video-playlists.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    NgIf,
+    ChannelsSetupMessageComponent,
+    AdvancedInputFilterComponent,
+    RouterLink,
+    InfiniteScrollerDirective,
+    NgFor,
+    VideoPlaylistMiniatureComponent,
+    DeleteButtonComponent,
+    EditButtonComponent
+  ]
 })
 export class MyVideoPlaylistsComponent {
   videoPlaylists: VideoPlaylist[] = []
diff --git a/client/src/app/+my-library/my-videos/modals/video-change-ownership.component.ts b/client/src/app/+my-library/my-videos/modals/video-change-ownership.component.ts
index 72187e893..78c612937 100644
--- a/client/src/app/+my-library/my-videos/modals/video-change-ownership.component.ts
+++ b/client/src/app/+my-library/my-videos/modals/video-change-ownership.component.ts
@@ -4,11 +4,17 @@ import { OWNERSHIP_CHANGE_USERNAME_VALIDATOR } from '@app/shared/form-validators
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { Video, VideoOwnershipService } from '@app/shared/shared-main'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { NgIf } from '@angular/common'
+import { AutoCompleteModule } from 'primeng/autocomplete'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-video-change-ownership',
   templateUrl: './video-change-ownership.component.html',
-  styleUrls: [ './video-change-ownership.component.scss' ]
+  styleUrls: [ './video-change-ownership.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent, FormsModule, ReactiveFormsModule, AutoCompleteModule, NgIf ]
 })
 export class VideoChangeOwnershipComponent extends FormReactive implements OnInit {
   @ViewChild('modal', { static: true }) modal: ElementRef
diff --git a/client/src/app/+my-library/my-videos/my-videos.component.ts b/client/src/app/+my-library/my-videos/my-videos.component.ts
index f7e212e1d..1f174251d 100644
--- a/client/src/app/+my-library/my-videos/my-videos.component.ts
+++ b/client/src/app/+my-library/my-videos/my-videos.component.ts
@@ -2,7 +2,7 @@ import { uniqBy } from 'lodash-es'
 import { concat, Observable } from 'rxjs'
 import { tap, toArray } from 'rxjs/operators'
 import { Component, OnInit, ViewChild } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute, Router, RouterLink } from '@angular/router'
 import { AuthService, ComponentPagination, ConfirmService, Notifier, ScreenService, ServerService, User } from '@app/core'
 import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook'
 import { immutableAssign, formatICU } from '@app/helpers'
@@ -18,10 +18,30 @@ import {
 import { VideoPlaylistService } from '@app/shared/shared-video-playlist'
 import { VideoChannel, VideoExistInPlaylist, VideosExistInPlaylists, VideoSortField } from '@peertube/peertube-models'
 import { VideoChangeOwnershipComponent } from './modals/video-change-ownership.component'
+import { VideoActionsDropdownComponent } from '../../shared/shared-video-miniature/video-actions-dropdown.component'
+import { EditButtonComponent } from '../../shared/shared-main/buttons/edit-button.component'
+import { PeerTubeTemplateDirective } from '../../shared/shared-main/angular/peertube-template.directive'
+import { FormsModule } from '@angular/forms'
+import { AdvancedInputFilterComponent } from '../../shared/shared-forms/advanced-input-filter.component'
+import { NgIf } from '@angular/common'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
 
 @Component({
   templateUrl: './my-videos.component.html',
-  styleUrls: [ './my-videos.component.scss' ]
+  styleUrls: [ './my-videos.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    NgIf,
+    RouterLink,
+    AdvancedInputFilterComponent,
+    FormsModule,
+    VideosSelectionComponent,
+    PeerTubeTemplateDirective,
+    EditButtonComponent,
+    VideoActionsDropdownComponent,
+    VideoChangeOwnershipComponent
+  ]
 })
 export class MyVideosComponent implements OnInit, DisableForReuseHook {
   @ViewChild('videosSelection', { static: true }) videosSelection: VideosSelectionComponent
diff --git a/client/src/app/+my-library/my-library-routing.module.ts b/client/src/app/+my-library/routes.ts
similarity index 87%
rename from client/src/app/+my-library/my-library-routing.module.ts
rename to client/src/app/+my-library/routes.ts
index de3ef4d96..1620aea32 100644
--- a/client/src/app/+my-library/my-library-routing.module.ts
+++ b/client/src/app/+my-library/routes.ts
@@ -1,5 +1,4 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { LoginGuard } from '../core'
 import { MyFollowersComponent } from './my-follows/my-followers.component'
 import { MySubscriptionsComponent } from './my-follows/my-subscriptions.component'
@@ -14,11 +13,22 @@ import { MyVideoPlaylistElementsComponent } from './my-video-playlists/my-video-
 import { MyVideoPlaylistUpdateComponent } from './my-video-playlists/my-video-playlist-update.component'
 import { MyVideoPlaylistsComponent } from './my-video-playlists/my-video-playlists.component'
 import { MyVideosComponent } from './my-videos/my-videos.component'
+import { VideoPlaylistService } from '@app/shared/shared-video-playlist'
+import { BlocklistService, VideoBlockService } from '@app/shared/shared-moderation'
+import { LiveVideoService } from '@app/shared/shared-video-live'
+import { UserSubscriptionService } from '@app/shared/shared-user-subscription'
 
-const myLibraryRoutes: Routes = [
+export default [
   {
     path: '',
     component: MyLibraryComponent,
+    providers: [
+      VideoPlaylistService,
+      BlocklistService,
+      VideoBlockService,
+      LiveVideoService,
+      UserSubscriptionService
+    ],
     canActivateChild: [ LoginGuard ],
     children: [
       {
@@ -29,9 +39,7 @@ const myLibraryRoutes: Routes = [
 
       {
         path: 'video-channels',
-        loadChildren: () => {
-          return import('./+my-video-channels/my-video-channels.module').then(m => m.MyVideoChannelsModule)
-        }
+        loadChildren: () => import('./+my-video-channels/routes')
       },
 
       {
@@ -156,10 +164,4 @@ const myLibraryRoutes: Routes = [
       }
     ]
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(myLibraryRoutes) ],
-  exports: [ RouterModule ]
-})
-export class MyLibraryRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+plugin-pages/index.ts b/client/src/app/+plugin-pages/index.ts
deleted file mode 100644
index b988f13f6..000000000
--- a/client/src/app/+plugin-pages/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './plugin-pages-routing.module'
-export * from './plugin-pages.component'
-export * from './plugin-pages.module'
diff --git a/client/src/app/+plugin-pages/plugin-pages-routing.module.ts b/client/src/app/+plugin-pages/plugin-pages-routing.module.ts
deleted file mode 100644
index b47a787e0..000000000
--- a/client/src/app/+plugin-pages/plugin-pages-routing.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-import { PluginPagesComponent } from './plugin-pages.component'
-
-const pluginPagesRoutes: Routes = [
-  {
-    path: '**',
-    component: PluginPagesComponent,
-    data: {
-      reloadOnSameNavigation: true
-    }
-  }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(pluginPagesRoutes) ],
-  exports: [ RouterModule ]
-})
-export class PluginPagesRoutingModule {}
diff --git a/client/src/app/+plugin-pages/plugin-pages.component.ts b/client/src/app/+plugin-pages/plugin-pages.component.ts
index 9fe4b413e..a9df10b64 100644
--- a/client/src/app/+plugin-pages/plugin-pages.component.ts
+++ b/client/src/app/+plugin-pages/plugin-pages.component.ts
@@ -4,7 +4,8 @@ import { PluginService } from '@app/core'
 import { logger } from '@root-helpers/logger'
 
 @Component({
-  templateUrl: './plugin-pages.component.html'
+  templateUrl: './plugin-pages.component.html',
+  standalone: true
 })
 export class PluginPagesComponent implements AfterViewInit {
   @ViewChild('root') root: ElementRef
diff --git a/client/src/app/+plugin-pages/plugin-pages.module.ts b/client/src/app/+plugin-pages/plugin-pages.module.ts
deleted file mode 100644
index 86f86c752..000000000
--- a/client/src/app/+plugin-pages/plugin-pages.module.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { NgModule } from '@angular/core'
-import { PluginPagesRoutingModule } from './plugin-pages-routing.module'
-import { PluginPagesComponent } from './plugin-pages.component'
-
-@NgModule({
-  imports: [
-    PluginPagesRoutingModule
-  ],
-
-  declarations: [
-    PluginPagesComponent
-  ],
-
-  exports: [
-    PluginPagesComponent
-  ],
-
-  providers: [
-  ]
-})
-export class PluginPagesModule { }
diff --git a/client/src/app/+plugin-pages/routes.ts b/client/src/app/+plugin-pages/routes.ts
new file mode 100644
index 000000000..6d03035d3
--- /dev/null
+++ b/client/src/app/+plugin-pages/routes.ts
@@ -0,0 +1,12 @@
+import { Routes } from '@angular/router'
+import { PluginPagesComponent } from './plugin-pages.component'
+
+export default [
+  {
+    path: '**',
+    component: PluginPagesComponent,
+    data: {
+      reloadOnSameNavigation: true
+    }
+  }
+] satisfies Routes
diff --git a/client/src/app/+remote-interaction/remote-interaction.component.ts b/client/src/app/+remote-interaction/remote-interaction.component.ts
index 88dc43c58..841541426 100644
--- a/client/src/app/+remote-interaction/remote-interaction.component.ts
+++ b/client/src/app/+remote-interaction/remote-interaction.component.ts
@@ -3,10 +3,13 @@ import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { Video, VideoChannel } from '@app/shared/shared-main'
 import { SearchService } from '@app/shared/shared-search'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-remote-interaction',
-  templateUrl: './remote-interaction.component.html'
+  templateUrl: './remote-interaction.component.html',
+  standalone: true,
+  imports: [ NgIf ]
 })
 export class RemoteInteractionComponent implements OnInit {
   error = ''
diff --git a/client/src/app/+remote-interaction/remote-interaction.module.ts b/client/src/app/+remote-interaction/remote-interaction.module.ts
deleted file mode 100644
index 9f9f1cdfd..000000000
--- a/client/src/app/+remote-interaction/remote-interaction.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { NgModule } from '@angular/core'
-import { SharedSearchModule } from '@app/shared/shared-search'
-import { RemoteInteractionRoutingModule } from './remote-interaction-routing.module'
-import { RemoteInteractionComponent } from './remote-interaction.component'
-
-@NgModule({
-  imports: [
-    CommonModule,
-
-    SharedSearchModule,
-
-    RemoteInteractionRoutingModule
-  ],
-
-  declarations: [
-    RemoteInteractionComponent
-  ],
-
-  exports: [
-    RemoteInteractionComponent
-  ],
-
-  providers: []
-})
-export class RemoteInteractionModule { }
diff --git a/client/src/app/+remote-interaction/remote-interaction-routing.module.ts b/client/src/app/+remote-interaction/routes.ts
similarity index 50%
rename from client/src/app/+remote-interaction/remote-interaction-routing.module.ts
rename to client/src/app/+remote-interaction/routes.ts
index 1dddfb3ba..7078f7f45 100644
--- a/client/src/app/+remote-interaction/remote-interaction-routing.module.ts
+++ b/client/src/app/+remote-interaction/routes.ts
@@ -1,12 +1,16 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { LoginGuard } from '@app/core'
 import { RemoteInteractionComponent } from './remote-interaction.component'
+import { FindInBulkService, SearchService } from '@app/shared/shared-search'
 
-const remoteInteractionRoutes: Routes = [
+export default [
   {
     path: '',
     component: RemoteInteractionComponent,
+    providers: [
+      FindInBulkService,
+      SearchService
+    ],
     canActivate: [ LoginGuard ],
     data: {
       meta: {
@@ -14,10 +18,4 @@ const remoteInteractionRoutes: Routes = [
       }
     }
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(remoteInteractionRoutes) ],
-  exports: [ RouterModule ]
-})
-export class RemoteInteractionRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+reset-password/reset-password-routing.module.ts b/client/src/app/+reset-password/reset-password-routing.module.ts
deleted file mode 100644
index 3532cdbc1..000000000
--- a/client/src/app/+reset-password/reset-password-routing.module.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-import { ResetPasswordComponent } from './reset-password.component'
-
-const resetPasswordRoutes: Routes = [
-  {
-    path: '',
-    component: ResetPasswordComponent,
-    data: {
-      meta: {
-        title: $localize`Reset password`
-      }
-    }
-  }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(resetPasswordRoutes) ],
-  exports: [ RouterModule ]
-})
-export class ResetPasswordRoutingModule {}
diff --git a/client/src/app/+reset-password/reset-password.component.ts b/client/src/app/+reset-password/reset-password.component.ts
index a99894458..d5955f135 100644
--- a/client/src/app/+reset-password/reset-password.component.ts
+++ b/client/src/app/+reset-password/reset-password.component.ts
@@ -4,13 +4,15 @@ import { Notifier, UserService } from '@app/core'
 import { RESET_PASSWORD_CONFIRM_VALIDATOR } from '@app/shared/form-validators/reset-password-validators'
 import { USER_PASSWORD_VALIDATOR } from '@app/shared/form-validators/user-validators'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
+import { InputTextComponent } from '../shared/shared-forms/input-text.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 
 @Component({
-  selector: 'my-login',
   templateUrl: './reset-password.component.html',
-  styleUrls: [ './reset-password.component.scss' ]
+  styleUrls: [ './reset-password.component.scss' ],
+  standalone: true,
+  imports: [ FormsModule, ReactiveFormsModule, InputTextComponent ]
 })
-
 export class ResetPasswordComponent extends FormReactive implements OnInit {
   private userId: number
   private verificationString: string
diff --git a/client/src/app/+reset-password/reset-password.module.ts b/client/src/app/+reset-password/reset-password.module.ts
deleted file mode 100644
index c77f1c4b0..000000000
--- a/client/src/app/+reset-password/reset-password.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { ResetPasswordRoutingModule } from './reset-password-routing.module'
-import { ResetPasswordComponent } from './reset-password.component'
-
-@NgModule({
-  imports: [
-    ResetPasswordRoutingModule,
-
-    SharedMainModule,
-    SharedFormModule
-  ],
-
-  declarations: [
-    ResetPasswordComponent
-  ],
-
-  exports: [
-    ResetPasswordComponent
-  ],
-
-  providers: [
-  ]
-})
-export class ResetPasswordModule { }
diff --git a/client/src/app/+reset-password/routes.ts b/client/src/app/+reset-password/routes.ts
new file mode 100644
index 000000000..f5ecbff50
--- /dev/null
+++ b/client/src/app/+reset-password/routes.ts
@@ -0,0 +1,14 @@
+import { Routes } from '@angular/router'
+import { ResetPasswordComponent } from './reset-password.component'
+
+export default [
+  {
+    path: '',
+    component: ResetPasswordComponent,
+    data: {
+      meta: {
+        title: $localize`Reset password`
+      }
+    }
+  }
+] satisfies Routes
diff --git a/client/src/app/+search/routes.ts b/client/src/app/+search/routes.ts
new file mode 100644
index 000000000..c2ab4b1fa
--- /dev/null
+++ b/client/src/app/+search/routes.ts
@@ -0,0 +1,46 @@
+import { Routes } from '@angular/router'
+import { SearchComponent } from './search.component'
+import { ChannelLazyLoadResolver, PlaylistLazyLoadResolver, VideoLazyLoadResolver } from './shared'
+import { UserSubscriptionService } from '../shared/shared-user-subscription/user-subscription.service'
+import { VideoPlaylistService } from '../shared/shared-video-playlist'
+import { SearchService } from '@app/shared/shared-search'
+
+export default [
+  {
+    path: '',
+    component: SearchComponent,
+    data: {
+      meta: {
+        title: $localize`Search`
+      }
+    },
+    providers: [
+      SearchService,
+      VideoPlaylistService,
+      UserSubscriptionService
+    ],
+    children: [
+      {
+        path: 'lazy-load-video',
+        component: SearchComponent,
+        resolve: {
+          data: VideoLazyLoadResolver
+        }
+      },
+      {
+        path: 'lazy-load-channel',
+        component: SearchComponent,
+        resolve: {
+          data: ChannelLazyLoadResolver
+        }
+      },
+      {
+        path: 'lazy-load-playlist',
+        component: SearchComponent,
+        resolve: {
+          data: PlaylistLazyLoadResolver
+        }
+      }
+    ]
+  }
+] satisfies Routes
diff --git a/client/src/app/+search/search-filters.component.ts b/client/src/app/+search/search-filters.component.ts
index b98acee18..85b66b529 100644
--- a/client/src/app/+search/search-filters.component.ts
+++ b/client/src/app/+search/search-filters.component.ts
@@ -2,13 +2,18 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { ServerService } from '@app/core'
 import { AdvancedSearch } from '@app/shared/shared-search'
 import { HTMLServerConfig, VideoConstant } from '@peertube/peertube-models'
+import { SelectTagsComponent } from '../shared/shared-forms/select/select-tags.component'
+import { NgIf, NgFor } from '@angular/common'
+import { FormsModule } from '@angular/forms'
 
 type FormOption = { id: string, label: string }
 
 @Component({
   selector: 'my-search-filters',
   styleUrls: [ './search-filters.component.scss' ],
-  templateUrl: './search-filters.component.html'
+  templateUrl: './search-filters.component.html',
+  standalone: true,
+  imports: [ FormsModule, NgIf, NgFor, SelectTagsComponent ]
 })
 export class SearchFiltersComponent implements OnInit {
   @Input() advancedSearch: AdvancedSearch = new AdvancedSearch()
diff --git a/client/src/app/+search/search-routing.module.ts b/client/src/app/+search/search-routing.module.ts
deleted file mode 100644
index 5d00aae13..000000000
--- a/client/src/app/+search/search-routing.module.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-import { SearchComponent } from './search.component'
-import { ChannelLazyLoadResolver, PlaylistLazyLoadResolver, VideoLazyLoadResolver } from './shared'
-
-const searchRoutes: Routes = [
-  {
-    path: '',
-    component: SearchComponent,
-    data: {
-      meta: {
-        title: $localize`Search`
-      }
-    }
-  },
-  {
-    path: 'lazy-load-video',
-    component: SearchComponent,
-    resolve: {
-      data: VideoLazyLoadResolver
-    }
-  },
-  {
-    path: 'lazy-load-channel',
-    component: SearchComponent,
-    resolve: {
-      data: ChannelLazyLoadResolver
-    }
-  },
-  {
-    path: 'lazy-load-playlist',
-    component: SearchComponent,
-    resolve: {
-      data: PlaylistLazyLoadResolver
-    }
-  }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(searchRoutes) ],
-  exports: [ RouterModule ]
-})
-export class SearchRoutingModule {}
diff --git a/client/src/app/+search/search.component.ts b/client/src/app/+search/search.component.ts
index ec96bb160..3a2e1e8ae 100644
--- a/client/src/app/+search/search.component.ts
+++ b/client/src/app/+search/search.component.ts
@@ -1,7 +1,7 @@
 import { forkJoin, Subject, Subscription } from 'rxjs'
 import { LinkType } from 'src/types/link.type'
 import { Component, OnDestroy, OnInit } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute, Router, RouterLink } from '@angular/router'
 import { AuthService, HooksService, MetaService, Notifier, ServerService, User, UserService } from '@app/core'
 import { immutableAssign, SimpleMemoize } from '@app/helpers'
 import { validateHost } from '@app/shared/form-validators/host-validators'
@@ -10,11 +10,35 @@ import { AdvancedSearch, SearchService } from '@app/shared/shared-search'
 import { MiniatureDisplayOptions } from '@app/shared/shared-video-miniature'
 import { VideoPlaylist } from '@app/shared/shared-video-playlist'
 import { HTMLServerConfig, SearchTargetType } from '@peertube/peertube-models'
+import { NumberFormatterPipe } from '../shared/shared-main/angular/number-formatter.pipe'
+import { VideoPlaylistMiniatureComponent } from '../shared/shared-video-playlist/video-playlist-miniature.component'
+import { VideoMiniatureComponent } from '../shared/shared-video-miniature/video-miniature.component'
+import { SubscribeButtonComponent } from '../shared/shared-user-subscription/subscribe-button.component'
+import { ActorAvatarComponent } from '../shared/shared-actor-image/actor-avatar.component'
+import { SearchFiltersComponent } from './search-filters.component'
+import { NgbCollapse } from '@ng-bootstrap/ng-bootstrap'
+import { NgIf, NgFor, NgTemplateOutlet } from '@angular/common'
+import { InfiniteScrollerDirective } from '../shared/shared-main/angular/infinite-scroller.directive'
 
 @Component({
   selector: 'my-search',
   styleUrls: [ './search.component.scss' ],
-  templateUrl: './search.component.html'
+  templateUrl: './search.component.html',
+  standalone: true,
+  imports: [
+    InfiniteScrollerDirective,
+    NgIf,
+    NgbCollapse,
+    SearchFiltersComponent,
+    NgFor,
+    ActorAvatarComponent,
+    RouterLink,
+    NgTemplateOutlet,
+    SubscribeButtonComponent,
+    VideoMiniatureComponent,
+    VideoPlaylistMiniatureComponent,
+    NumberFormatterPipe
+  ]
 })
 export class SearchComponent implements OnInit, OnDestroy {
   error: string
diff --git a/client/src/app/+search/search.module.ts b/client/src/app/+search/search.module.ts
deleted file mode 100644
index 26f1523fd..000000000
--- a/client/src/app/+search/search.module.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedActorImageModule } from '@app/shared/shared-actor-image/shared-actor-image.module'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedSearchModule } from '@app/shared/shared-search'
-import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
-import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
-import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist'
-import { SearchService } from '../shared/shared-search/search.service'
-import { SearchFiltersComponent } from './search-filters.component'
-import { SearchRoutingModule } from './search-routing.module'
-import { SearchComponent } from './search.component'
-import { ChannelLazyLoadResolver, PlaylistLazyLoadResolver, VideoLazyLoadResolver } from './shared'
-
-@NgModule({
-  imports: [
-    SearchRoutingModule,
-
-    SharedMainModule,
-    SharedSearchModule,
-    SharedFormModule,
-    SharedActorImageModule,
-    SharedUserSubscriptionModule,
-    SharedVideoMiniatureModule,
-    SharedVideoPlaylistModule
-  ],
-
-  declarations: [
-    SearchComponent,
-    SearchFiltersComponent
-  ],
-
-  exports: [
-    SearchComponent
-  ],
-
-  providers: [
-    SearchService,
-    VideoLazyLoadResolver,
-    ChannelLazyLoadResolver,
-    PlaylistLazyLoadResolver
-  ]
-})
-export class SearchModule { }
diff --git a/client/src/app/+signup/+register/custom-stepper.component.ts b/client/src/app/+signup/+register/custom-stepper.component.ts
index 4c308f7b6..d7d719808 100644
--- a/client/src/app/+signup/+register/custom-stepper.component.ts
+++ b/client/src/app/+signup/+register/custom-stepper.component.ts
@@ -1,11 +1,15 @@
 import { CdkStep, CdkStepper } from '@angular/cdk/stepper'
 import { Component } from '@angular/core'
+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
+import { NgIf, NgFor, NgClass, NgTemplateOutlet } from '@angular/common'
 
 @Component({
   selector: 'my-custom-stepper',
   templateUrl: './custom-stepper.component.html',
   styleUrls: [ './custom-stepper.component.scss' ],
-  providers: [ { provide: CdkStepper, useExisting: CustomStepperComponent } ]
+  providers: [ { provide: CdkStepper, useExisting: CustomStepperComponent } ],
+  standalone: true,
+  imports: [ NgIf, NgFor, NgClass, GlobalIconComponent, NgTemplateOutlet ]
 })
 export class CustomStepperComponent extends CdkStepper {
 
diff --git a/client/src/app/+signup/+register/register.component.ts b/client/src/app/+signup/+register/register.component.ts
index 3a65bff2f..9e224f02e 100644
--- a/client/src/app/+signup/+register/register.component.ts
+++ b/client/src/app/+signup/+register/register.component.ts
@@ -1,17 +1,45 @@
-import { CdkStep } from '@angular/cdk/stepper'
+import { CdkStep, CdkStepperNext, CdkStepperPrevious } from '@angular/cdk/stepper'
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { FormGroup } from '@angular/forms'
-import { ActivatedRoute } from '@angular/router'
+import { ActivatedRoute, RouterLink } from '@angular/router'
 import { AuthService, ServerService } from '@app/core'
 import { HooksService } from '@app/core/plugins/hooks.service'
 import { InstanceAboutAccordionComponent } from '@app/shared/shared-instance'
 import { ServerConfig, ServerStats, UserRegister } from '@peertube/peertube-models'
 import { SignupService } from '../shared/signup.service'
+import { SignupSuccessBeforeEmailComponent } from '../shared/signup-success-before-email.component'
+import { LoaderComponent } from '../../shared/shared-main/loaders/loader.component'
+import { RegisterStepChannelComponent } from './steps/register-step-channel.component'
+import { RegisterStepUserComponent } from './steps/register-step-user.component'
+import { RegisterStepTermsComponent } from './steps/register-step-terms.component'
+import { RegisterStepAboutComponent } from './steps/register-step-about.component'
+import { SignupStepTitleComponent } from '../shared/signup-step-title.component'
+import { CustomStepperComponent } from './custom-stepper.component'
+import { SignupLabelComponent } from '../../shared/shared-main/account/signup-label.component'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-register',
   templateUrl: './register.component.html',
-  styleUrls: [ './register.component.scss' ]
+  styleUrls: [ './register.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    SignupLabelComponent,
+    CustomStepperComponent,
+    CdkStep,
+    SignupStepTitleComponent,
+    RegisterStepAboutComponent,
+    RouterLink,
+    CdkStepperNext,
+    InstanceAboutAccordionComponent,
+    RegisterStepTermsComponent,
+    CdkStepperPrevious,
+    RegisterStepUserComponent,
+    RegisterStepChannelComponent,
+    LoaderComponent,
+    SignupSuccessBeforeEmailComponent
+  ]
 })
 export class RegisterComponent implements OnInit {
   @ViewChild('lastStep') lastStep: CdkStep
diff --git a/client/src/app/+signup/+register/register.module.ts b/client/src/app/+signup/+register/register.module.ts
deleted file mode 100644
index 684aae2e9..000000000
--- a/client/src/app/+signup/+register/register.module.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { CdkStepperModule } from '@angular/cdk/stepper'
-import { NgModule } from '@angular/core'
-import { SharedSignupModule } from '@app/+signup/shared/shared-signup.module'
-import { SharedInstanceModule } from '@app/shared/shared-instance'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { CustomStepperComponent } from './custom-stepper.component'
-import { RegisterRoutingModule } from './register-routing.module'
-import { RegisterComponent } from './register.component'
-import { RegisterStepAboutComponent, RegisterStepChannelComponent, RegisterStepTermsComponent, RegisterStepUserComponent } from './steps'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    RegisterRoutingModule,
-
-    CdkStepperModule,
-
-    SharedSignupModule,
-
-    SharedInstanceModule
-  ],
-
-  declarations: [
-    RegisterComponent,
-    CustomStepperComponent,
-    RegisterStepChannelComponent,
-    RegisterStepTermsComponent,
-    RegisterStepUserComponent,
-    RegisterStepAboutComponent
-  ],
-
-  exports: [
-    RegisterComponent
-  ],
-
-  providers: [
-  ]
-})
-export class RegisterModule { }
diff --git a/client/src/app/+signup/+register/register-routing.module.ts b/client/src/app/+signup/+register/routes.ts
similarity index 56%
rename from client/src/app/+signup/+register/register-routing.module.ts
rename to client/src/app/+signup/+register/routes.ts
index dabe79fa5..05acff032 100644
--- a/client/src/app/+signup/+register/register-routing.module.ts
+++ b/client/src/app/+signup/+register/routes.ts
@@ -1,9 +1,9 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { ServerConfigResolver, UnloggedGuard } from '@app/core'
 import { RegisterComponent } from './register.component'
+import { SignupService } from '../shared/signup.service'
 
-const registerRoutes: Routes = [
+export default [
   {
     path: '',
     component: RegisterComponent,
@@ -13,14 +13,9 @@ const registerRoutes: Routes = [
         title: $localize`Register`
       }
     },
+    providers: [ ServerConfigResolver, SignupService ],
     resolve: {
       serverConfig: ServerConfigResolver
     }
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(registerRoutes) ],
-  exports: [ RouterModule ]
-})
-export class RegisterRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+signup/+register/steps/register-step-about.component.ts b/client/src/app/+signup/+register/steps/register-step-about.component.ts
index f1223889e..28de76c37 100644
--- a/client/src/app/+signup/+register/steps/register-step-about.component.ts
+++ b/client/src/app/+signup/+register/steps/register-step-about.component.ts
@@ -1,11 +1,16 @@
 import { Component, Input } from '@angular/core'
 import { ServerService } from '@app/core'
 import { ServerStats } from '@peertube/peertube-models'
+import { DaysDurationFormatterPipe } from '../../../shared/shared-main/angular/days-duration-formatter.pipe'
+import { NgIf } from '@angular/common'
+import { InstanceBannerComponent } from '../../../shared/shared-instance/instance-banner.component'
 
 @Component({
   selector: 'my-register-step-about',
   templateUrl: './register-step-about.component.html',
-  styleUrls: [ './register-step-about.component.scss' ]
+  styleUrls: [ './register-step-about.component.scss' ],
+  standalone: true,
+  imports: [ InstanceBannerComponent, NgIf, DaysDurationFormatterPipe ]
 })
 export class RegisterStepAboutComponent {
   @Input() requiresApproval: boolean
diff --git a/client/src/app/+signup/+register/steps/register-step-channel.component.ts b/client/src/app/+signup/+register/steps/register-step-channel.component.ts
index 478ca0177..8e5df4115 100644
--- a/client/src/app/+signup/+register/steps/register-step-channel.component.ts
+++ b/client/src/app/+signup/+register/steps/register-step-channel.component.ts
@@ -1,15 +1,19 @@
 import { concat, of } from 'rxjs'
 import { pairwise } from 'rxjs/operators'
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
-import { FormGroup } from '@angular/forms'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { SignupService } from '@app/+signup/shared/signup.service'
 import { VIDEO_CHANNEL_DISPLAY_NAME_VALIDATOR, VIDEO_CHANNEL_NAME_VALIDATOR } from '@app/shared/form-validators/video-channel-validators'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
+import { BytesPipe } from '../../../shared/shared-main/angular/bytes.pipe'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-register-step-channel',
   templateUrl: './register-step-channel.component.html',
-  styleUrls: [ './step.component.scss' ]
+  styleUrls: [ './step.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, FormsModule, ReactiveFormsModule, NgClass, BytesPipe ]
 })
 export class RegisterStepChannelComponent extends FormReactive implements OnInit {
   @Input() username: string
diff --git a/client/src/app/+signup/+register/steps/register-step-terms.component.ts b/client/src/app/+signup/+register/steps/register-step-terms.component.ts
index 1b1fb49ee..9fdebfdef 100644
--- a/client/src/app/+signup/+register/steps/register-step-terms.component.ts
+++ b/client/src/app/+signup/+register/steps/register-step-terms.component.ts
@@ -1,12 +1,17 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
-import { FormGroup } from '@angular/forms'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { REGISTER_REASON_VALIDATOR, REGISTER_TERMS_VALIDATOR } from '../shared'
+import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive'
+import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-register-step-terms',
   templateUrl: './register-step-terms.component.html',
-  styleUrls: [ './step.component.scss' ]
+  styleUrls: [ './step.component.scss' ],
+  standalone: true,
+  imports: [ FormsModule, ReactiveFormsModule, NgIf, NgClass, PeertubeCheckboxComponent, PeerTubeTemplateDirective ]
 })
 export class RegisterStepTermsComponent extends FormReactive implements OnInit {
   @Input() hasCodeOfConduct = false
diff --git a/client/src/app/+signup/+register/steps/register-step-user.component.ts b/client/src/app/+signup/+register/steps/register-step-user.component.ts
index 0a5d2e437..bb2439788 100644
--- a/client/src/app/+signup/+register/steps/register-step-user.component.ts
+++ b/client/src/app/+signup/+register/steps/register-step-user.component.ts
@@ -1,7 +1,7 @@
 import { concat, of } from 'rxjs'
 import { pairwise } from 'rxjs/operators'
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
-import { FormGroup } from '@angular/forms'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { SignupService } from '@app/+signup/shared/signup.service'
 import {
   USER_DISPLAY_NAME_REQUIRED_VALIDATOR,
@@ -10,11 +10,15 @@ import {
   USER_USERNAME_VALIDATOR
 } from '@app/shared/form-validators/user-validators'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
+import { InputTextComponent } from '../../../shared/shared-forms/input-text.component'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-register-step-user',
   templateUrl: './register-step-user.component.html',
-  styleUrls: [ './step.component.scss' ]
+  styleUrls: [ './step.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, FormsModule, ReactiveFormsModule, NgClass, InputTextComponent ]
 })
 export class RegisterStepUserComponent extends FormReactive implements OnInit {
   @Input() videoUploadDisabled = false
diff --git a/client/src/app/+signup/+verify-account/verify-account-routing.module.ts b/client/src/app/+signup/+verify-account/routes.ts
similarity index 71%
rename from client/src/app/+signup/+verify-account/verify-account-routing.module.ts
rename to client/src/app/+signup/+verify-account/routes.ts
index d53a5ed78..21889a533 100644
--- a/client/src/app/+signup/+verify-account/verify-account-routing.module.ts
+++ b/client/src/app/+signup/+verify-account/routes.ts
@@ -1,11 +1,12 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { VerifyAccountAskSendEmailComponent } from './verify-account-ask-send-email/verify-account-ask-send-email.component'
 import { VerifyAccountEmailComponent } from './verify-account-email/verify-account-email.component'
+import { SignupService } from '../shared/signup.service'
 
-const verifyAccountRoutes: Routes = [
+export default [
   {
     path: '',
+    providers: [ SignupService ],
     children: [
       {
         path: 'email',
@@ -27,10 +28,4 @@ const verifyAccountRoutes: Routes = [
       }
     ]
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(verifyAccountRoutes) ],
-  exports: [ RouterModule ]
-})
-export class VerifyAccountRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts b/client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
index 75b599e0e..4001a5f7d 100644
--- a/client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
+++ b/client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
@@ -3,11 +3,15 @@ import { SignupService } from '@app/+signup/shared/signup.service'
 import { Notifier, RedirectService, ServerService } from '@app/core'
 import { USER_EMAIL_VALIDATOR } from '@app/shared/form-validators/user-validators'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-verify-account-ask-send-email',
   templateUrl: './verify-account-ask-send-email.component.html',
-  styleUrls: [ './verify-account-ask-send-email.component.scss' ]
+  styleUrls: [ './verify-account-ask-send-email.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, FormsModule, ReactiveFormsModule, NgClass ]
 })
 
 export class VerifyAccountAskSendEmailComponent extends FormReactive implements OnInit {
diff --git a/client/src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.ts b/client/src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.ts
index faf663391..144cd6dbf 100644
--- a/client/src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.ts
+++ b/client/src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.ts
@@ -1,11 +1,15 @@
 import { Component, OnInit } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
+import { ActivatedRoute, RouterLink } from '@angular/router'
 import { SignupService } from '@app/+signup/shared/signup.service'
 import { AuthService, Notifier, ServerService } from '@app/core'
+import { SignupSuccessAfterEmailComponent } from '../../shared/signup-success-after-email.component'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-verify-account-email',
-  templateUrl: './verify-account-email.component.html'
+  templateUrl: './verify-account-email.component.html',
+  standalone: true,
+  imports: [ NgIf, SignupSuccessAfterEmailComponent, RouterLink ]
 })
 
 export class VerifyAccountEmailComponent implements OnInit {
diff --git a/client/src/app/+signup/+verify-account/verify-account.module.ts b/client/src/app/+signup/+verify-account/verify-account.module.ts
deleted file mode 100644
index ec342df8d..000000000
--- a/client/src/app/+signup/+verify-account/verify-account.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedSignupModule } from '../shared/shared-signup.module'
-import { VerifyAccountAskSendEmailComponent } from './verify-account-ask-send-email/verify-account-ask-send-email.component'
-import { VerifyAccountEmailComponent } from './verify-account-email/verify-account-email.component'
-import { VerifyAccountRoutingModule } from './verify-account-routing.module'
-
-@NgModule({
-  imports: [
-    VerifyAccountRoutingModule,
-
-    SharedSignupModule
-  ],
-
-  declarations: [
-    VerifyAccountEmailComponent,
-    VerifyAccountAskSendEmailComponent
-  ],
-
-  exports: [],
-
-  providers: []
-})
-export class VerifyAccountModule {
-}
diff --git a/client/src/app/+signup/shared/shared-signup.module.ts b/client/src/app/+signup/shared/shared-signup.module.ts
deleted file mode 100644
index 0600f0af8..000000000
--- a/client/src/app/+signup/shared/shared-signup.module.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedUsersModule } from '@app/shared/shared-users'
-import { SignupMascotComponent } from './signup-mascot.component'
-import { SignupStepTitleComponent } from './signup-step-title.component'
-import { SignupSuccessBeforeEmailComponent } from './signup-success-before-email.component'
-import { SignupSuccessAfterEmailComponent } from './signup-success-after-email.component'
-import { SignupService } from './signup.service'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    SharedFormModule,
-    SharedGlobalIconModule,
-    SharedUsersModule
-  ],
-
-  declarations: [
-    SignupSuccessBeforeEmailComponent,
-    SignupSuccessAfterEmailComponent,
-    SignupStepTitleComponent,
-    SignupMascotComponent
-  ],
-
-  exports: [
-    SharedMainModule,
-    SharedFormModule,
-    SharedGlobalIconModule,
-
-    SignupSuccessBeforeEmailComponent,
-    SignupSuccessAfterEmailComponent,
-    SignupStepTitleComponent,
-    SignupMascotComponent
-  ],
-
-  providers: [
-    SignupService
-  ]
-})
-export class SharedSignupModule { }
diff --git a/client/src/app/+signup/shared/signup-mascot.component.ts b/client/src/app/+signup/shared/signup-mascot.component.ts
index c325f46fc..ef6c99684 100644
--- a/client/src/app/+signup/shared/signup-mascot.component.ts
+++ b/client/src/app/+signup/shared/signup-mascot.component.ts
@@ -15,7 +15,8 @@ export type MascotImageName = keyof typeof images
   selector: 'my-signup-mascot',
   styleUrls: [ './signup-mascot.component.scss' ],
   template: `<div class="root" [innerHTML]="html"></div>`,
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true
 })
 export class SignupMascotComponent {
   @Input() imageName: MascotImageName
diff --git a/client/src/app/+signup/shared/signup-step-title.component.ts b/client/src/app/+signup/shared/signup-step-title.component.ts
index 9664eb7f3..4b48eefd8 100644
--- a/client/src/app/+signup/shared/signup-step-title.component.ts
+++ b/client/src/app/+signup/shared/signup-step-title.component.ts
@@ -1,10 +1,12 @@
 import { Component, Input } from '@angular/core'
-import { MascotImageName } from './signup-mascot.component'
+import { MascotImageName, SignupMascotComponent } from './signup-mascot.component'
 
 @Component({
   selector: 'my-signup-step-title',
   templateUrl: './signup-step-title.component.html',
-  styleUrls: [ './signup-step-title.component.scss' ]
+  styleUrls: [ './signup-step-title.component.scss' ],
+  standalone: true,
+  imports: [ SignupMascotComponent ]
 })
 export class SignupStepTitleComponent {
   @Input() mascotImageName: MascotImageName
diff --git a/client/src/app/+signup/shared/signup-success-after-email.component.ts b/client/src/app/+signup/shared/signup-success-after-email.component.ts
index 3d72fdae9..98bda4274 100644
--- a/client/src/app/+signup/shared/signup-success-after-email.component.ts
+++ b/client/src/app/+signup/shared/signup-success-after-email.component.ts
@@ -1,9 +1,13 @@
 import { Component, Input } from '@angular/core'
+import { NgIf } from '@angular/common'
+import { SignupStepTitleComponent } from './signup-step-title.component'
 
 @Component({
   selector: 'my-signup-success-after-email',
   templateUrl: './signup-success-after-email.component.html',
-  styleUrls: [ './signup-success.component.scss' ]
+  styleUrls: [ './signup-success.component.scss' ],
+  standalone: true,
+  imports: [ SignupStepTitleComponent, NgIf ]
 })
 export class SignupSuccessAfterEmailComponent {
   @Input() requiresApproval: boolean
diff --git a/client/src/app/+signup/shared/signup-success-before-email.component.ts b/client/src/app/+signup/shared/signup-success-before-email.component.ts
index d72462340..aeee0f733 100644
--- a/client/src/app/+signup/shared/signup-success-before-email.component.ts
+++ b/client/src/app/+signup/shared/signup-success-before-email.component.ts
@@ -1,9 +1,13 @@
 import { Component, Input } from '@angular/core'
+import { NgIf } from '@angular/common'
+import { SignupStepTitleComponent } from './signup-step-title.component'
 
 @Component({
   selector: 'my-signup-success-before-email',
   templateUrl: './signup-success-before-email.component.html',
-  styleUrls: [ './signup-success.component.scss' ]
+  styleUrls: [ './signup-success.component.scss' ],
+  standalone: true,
+  imports: [ SignupStepTitleComponent, NgIf ]
 })
 export class SignupSuccessBeforeEmailComponent {
   @Input() requiresApproval: boolean
diff --git a/client/src/app/+stats/index.ts b/client/src/app/+stats/index.ts
deleted file mode 100644
index d880024a5..000000000
--- a/client/src/app/+stats/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './stats.module'
diff --git a/client/src/app/+stats/stats-routing.module.ts b/client/src/app/+stats/routes.ts
similarity index 52%
rename from client/src/app/+stats/stats-routing.module.ts
rename to client/src/app/+stats/routes.ts
index b6225cafd..31d54c30f 100644
--- a/client/src/app/+stats/stats-routing.module.ts
+++ b/client/src/app/+stats/routes.ts
@@ -1,10 +1,10 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { LoginGuard } from '@app/core'
 import { VideoResolver } from '@app/shared/shared-main'
-import { VideoStatsComponent } from './video'
+import { VideoStatsComponent, VideoStatsService } from './video'
+import { LiveVideoService } from '@app/shared/shared-video-live'
 
-const statsRoutes: Routes = [
+export default [
   {
     path: 'videos/:videoId',
     canActivate: [ LoginGuard ],
@@ -14,14 +14,13 @@ const statsRoutes: Routes = [
         title: $localize`Video stats`
       }
     },
+    providers: [
+      LiveVideoService,
+      VideoStatsService,
+      VideoResolver
+    ],
     resolve: {
       video: VideoResolver
     }
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(statsRoutes) ],
-  exports: [ RouterModule ]
-})
-export class StatsRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+stats/stats.module.ts b/client/src/app/+stats/stats.module.ts
deleted file mode 100644
index e81378220..000000000
--- a/client/src/app/+stats/stats.module.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { ChartModule } from 'primeng/chart'
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedVideoLiveModule } from '@app/shared/shared-video-live'
-import { StatsRoutingModule } from './stats-routing.module'
-import { VideoStatsComponent, VideoStatsService } from './video'
-
-@NgModule({
-  imports: [
-    StatsRoutingModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedGlobalIconModule,
-    SharedVideoLiveModule,
-
-    ChartModule
-  ],
-
-  declarations: [
-    VideoStatsComponent
-  ],
-
-  exports: [],
-  providers: [
-    VideoStatsService
-  ]
-})
-export class StatsModule { }
diff --git a/client/src/app/+stats/video/video-stats.component.ts b/client/src/app/+stats/video/video-stats.component.ts
index 2cc5251de..4b1410daf 100644
--- a/client/src/app/+stats/video/video-stats.component.ts
+++ b/client/src/app/+stats/video/video-stats.component.ts
@@ -17,6 +17,15 @@ import {
   VideoStatsTimeserieMetric
 } from '@peertube/peertube-models'
 import { VideoStatsService } from './video-stats.service'
+import { ButtonComponent } from '../../shared/shared-main/buttons/button.component'
+import { ChartModule } from 'primeng/chart'
+import { NgbNav, NgbNavItem, NgbNavLink, NgbNavLinkBase, NgbNavContent, NgbNavOutlet } from '@ng-bootstrap/ng-bootstrap'
+import { FormsModule } from '@angular/forms'
+import { SelectOptionsComponent } from '../../shared/shared-forms/select/select-options.component'
+import { EmbedComponent } from '../../shared/shared-main/video/embed.component'
+import { PeerTubeTemplateDirective } from '../../shared/shared-main/angular/peertube-template.directive'
+import { HelpComponent } from '../../shared/shared-main/misc/help.component'
+import { NgFor, NgIf } from '@angular/common'
 
 type ActiveGraphId = VideoStatsTimeserieMetric | 'retention' | 'countries' | 'regions'
 
@@ -42,7 +51,25 @@ ChartJSDefaults.color = getComputedStyle(document.body).getPropertyValue('--main
 @Component({
   templateUrl: './video-stats.component.html',
   styleUrls: [ './video-stats.component.scss' ],
-  providers: [ NumberFormatterPipe ]
+  providers: [ NumberFormatterPipe ],
+  standalone: true,
+  imports: [
+    NgFor,
+    NgIf,
+    HelpComponent,
+    PeerTubeTemplateDirective,
+    EmbedComponent,
+    SelectOptionsComponent,
+    FormsModule,
+    NgbNav,
+    NgbNavItem,
+    NgbNavLink,
+    NgbNavLinkBase,
+    NgbNavContent,
+    ChartModule,
+    ButtonComponent,
+    NgbNavOutlet
+  ]
 })
 export class VideoStatsComponent implements OnInit {
   // Cannot handle date filters
diff --git a/client/src/app/+video-channels/index.ts b/client/src/app/+video-channels/index.ts
deleted file mode 100644
index 6683d1b12..000000000
--- a/client/src/app/+video-channels/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './video-channels-routing.module'
-export * from './video-channels.component'
-export * from './video-channels.module'
diff --git a/client/src/app/+video-channels/video-channels-routing.module.ts b/client/src/app/+video-channels/routes.ts
similarity index 65%
rename from client/src/app/+video-channels/video-channels-routing.module.ts
rename to client/src/app/+video-channels/routes.ts
index 4ee052873..9ddf98014 100644
--- a/client/src/app/+video-channels/video-channels-routing.module.ts
+++ b/client/src/app/+video-channels/routes.ts
@@ -1,13 +1,23 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { VideoChannelPlaylistsComponent } from './video-channel-playlists/video-channel-playlists.component'
 import { VideoChannelVideosComponent } from './video-channel-videos/video-channel-videos.component'
 import { VideoChannelsComponent } from './video-channels.component'
+import { BlocklistService, BulkService, AbuseService, VideoBlockService } from '@app/shared/shared-moderation'
+import { UserSubscriptionService } from '@app/shared/shared-user-subscription'
+import { VideoPlaylistService } from '@app/shared/shared-video-playlist'
 
-const videoChannelsRoutes: Routes = [
+export default [
   {
     path: ':videoChannelName',
     component: VideoChannelsComponent,
+    providers: [
+      VideoPlaylistService,
+      UserSubscriptionService,
+      BlocklistService,
+      BulkService,
+      AbuseService,
+      VideoBlockService
+    ],
     children: [
       {
         path: '',
@@ -38,10 +48,4 @@ const videoChannelsRoutes: Routes = [
       }
     ]
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(videoChannelsRoutes) ],
-  exports: [ RouterModule ]
-})
-export class VideoChannelsRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.ts b/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.ts
index 82af65026..7c35d14a7 100644
--- a/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.ts
+++ b/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.ts
@@ -3,11 +3,16 @@ import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core'
 import { ComponentPagination, hasMoreItems, HooksService, ScreenService } from '@app/core'
 import { VideoChannel, VideoChannelService } from '@app/shared/shared-main'
 import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist'
+import { VideoPlaylistMiniatureComponent } from '../../shared/shared-video-playlist/video-playlist-miniature.component'
+import { InfiniteScrollerDirective } from '../../shared/shared-main/angular/infinite-scroller.directive'
+import { NgIf, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-video-channel-playlists',
   templateUrl: './video-channel-playlists.component.html',
-  styleUrls: [ './video-channel-playlists.component.scss' ]
+  styleUrls: [ './video-channel-playlists.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, InfiniteScrollerDirective, NgFor, VideoPlaylistMiniatureComponent ]
 })
 export class VideoChannelPlaylistsComponent implements OnInit, AfterViewInit, OnDestroy {
   videoPlaylists: VideoPlaylist[] = []
diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
index 725990300..71d79b991 100644
--- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
+++ b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
@@ -5,10 +5,14 @@ import { ComponentPaginationLight, DisableForReuseHook, HooksService, ScreenServ
 import { VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main'
 import { MiniatureDisplayOptions, VideoFilters } from '@app/shared/shared-video-miniature'
 import { Video, VideoSortField } from '@peertube/peertube-models'
+import { VideosListComponent } from '../../shared/shared-video-miniature/videos-list.component'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-video-channel-videos',
-  templateUrl: './video-channel-videos.component.html'
+  templateUrl: './video-channel-videos.component.html',
+  standalone: true,
+  imports: [ NgIf, VideosListComponent ]
 })
 export class VideoChannelVideosComponent implements OnInit, AfterViewInit, OnDestroy, DisableForReuseHook {
   getVideosObservableFunction = this.getVideosObservable.bind(this)
diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts
index af8db5f09..80fde6c10 100644
--- a/client/src/app/+video-channels/video-channels.component.ts
+++ b/client/src/app/+video-channels/video-channels.component.ts
@@ -1,17 +1,40 @@
 import { Subscription } from 'rxjs'
 import { catchError, distinctUntilChanged, map, switchMap } from 'rxjs/operators'
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
+import { ActivatedRoute, RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router'
 import { AuthService, MarkdownService, Notifier, RestExtractor, ScreenService, Hotkey, HotkeysService } from '@app/core'
 import { Account, ListOverflowItem, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main'
 import { BlocklistService } from '@app/shared/shared-moderation'
 import { SupportModalComponent } from '@app/shared/shared-support-modal'
 import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription'
 import { HttpStatusCode, UserRight } from '@peertube/peertube-models'
+import { ListOverflowComponent } from '../shared/shared-main/misc/list-overflow.component'
+import { CopyButtonComponent } from '../shared/shared-main/buttons/copy-button.component'
+import { AccountBlockBadgesComponent } from '../shared/shared-moderation/account-block-badges.component'
+import { ActorAvatarComponent } from '../shared/shared-actor-image/actor-avatar.component'
+import { GlobalIconComponent } from '../shared/shared-icons/global-icon.component'
+import { NgIf, NgTemplateOutlet, NgClass, DatePipe } from '@angular/common'
 
 @Component({
   templateUrl: './video-channels.component.html',
-  styleUrls: [ './video-channels.component.scss' ]
+  styleUrls: [ './video-channels.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    RouterLink,
+    SubscribeButtonComponent,
+    GlobalIconComponent,
+    ActorAvatarComponent,
+    AccountBlockBadgesComponent,
+    CopyButtonComponent,
+    NgTemplateOutlet,
+    NgClass,
+    RouterLinkActive,
+    ListOverflowComponent,
+    RouterOutlet,
+    SupportModalComponent,
+    DatePipe
+  ]
 })
 export class VideoChannelsComponent implements OnInit, OnDestroy {
   @ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent
diff --git a/client/src/app/+video-channels/video-channels.module.ts b/client/src/app/+video-channels/video-channels.module.ts
deleted file mode 100644
index aef3ed0a3..000000000
--- a/client/src/app/+video-channels/video-channels.module.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedModerationModule } from '@app/shared/shared-moderation'
-import { SharedSupportModal } from '@app/shared/shared-support-modal'
-import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
-import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
-import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist'
-import { SharedActorImageModule } from '../shared/shared-actor-image/shared-actor-image.module'
-import { VideoChannelPlaylistsComponent } from './video-channel-playlists/video-channel-playlists.component'
-import { VideoChannelVideosComponent } from './video-channel-videos/video-channel-videos.component'
-import { VideoChannelsRoutingModule } from './video-channels-routing.module'
-import { VideoChannelsComponent } from './video-channels.component'
-import { SharedActorImageEditModule } from '@app/shared/shared-actor-image-edit'
-
-@NgModule({
-  imports: [
-    VideoChannelsRoutingModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedVideoPlaylistModule,
-    SharedVideoMiniatureModule,
-    SharedUserSubscriptionModule,
-    SharedGlobalIconModule,
-    SharedSupportModal,
-    SharedActorImageModule,
-    SharedActorImageEditModule,
-    SharedModerationModule
-  ],
-
-  declarations: [
-    VideoChannelsComponent,
-    VideoChannelVideosComponent,
-    VideoChannelPlaylistsComponent
-  ],
-
-  exports: [
-    VideoChannelsComponent
-  ],
-
-  providers: []
-})
-export class VideoChannelsModule { }
diff --git a/client/src/app/+video-studio/edit/video-studio-edit.component.ts b/client/src/app/+video-studio/edit/video-studio-edit.component.ts
index 40e9cf40a..62e42af51 100644
--- a/client/src/app/+video-studio/edit/video-studio-edit.component.ts
+++ b/client/src/app/+video-studio/edit/video-studio-edit.component.ts
@@ -8,11 +8,28 @@ import { logger } from '@root-helpers/logger'
 import { secondsToTime } from '@peertube/peertube-core-utils'
 import { VideoStudioTask, VideoStudioTaskCut } from '@peertube/peertube-models'
 import { VideoStudioService } from '../shared'
+import { NgIf, NgFor } from '@angular/common'
+import { EmbedComponent } from '../../shared/shared-main/video/embed.component'
+import { ButtonComponent } from '../../shared/shared-main/buttons/button.component'
+import { ReactiveFileComponent } from '../../shared/shared-forms/reactive-file.component'
+import { TimestampInputComponent } from '../../shared/shared-forms/timestamp-input.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 
 @Component({
   selector: 'my-video-studio-edit',
   templateUrl: './video-studio-edit.component.html',
-  styleUrls: [ './video-studio-edit.component.scss' ]
+  styleUrls: [ './video-studio-edit.component.scss' ],
+  standalone: true,
+  imports: [
+    FormsModule,
+    ReactiveFormsModule,
+    TimestampInputComponent,
+    ReactiveFileComponent,
+    ButtonComponent,
+    EmbedComponent,
+    NgIf,
+    NgFor
+  ]
 })
 export class VideoStudioEditComponent extends FormReactive implements OnInit {
   isRunningEdition = false
diff --git a/client/src/app/+video-studio/index.ts b/client/src/app/+video-studio/index.ts
deleted file mode 100644
index d50c21cdc..000000000
--- a/client/src/app/+video-studio/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './video-studio.module'
diff --git a/client/src/app/+video-studio/video-studio-routing.module.ts b/client/src/app/+video-studio/routes.ts
similarity index 63%
rename from client/src/app/+video-studio/video-studio-routing.module.ts
rename to client/src/app/+video-studio/routes.ts
index 9d276be7c..240954446 100644
--- a/client/src/app/+video-studio/video-studio-routing.module.ts
+++ b/client/src/app/+video-studio/routes.ts
@@ -1,13 +1,14 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { Routes } from '@angular/router'
 import { LoginGuard } from '@app/core'
 import { VideoResolver } from '@app/shared/shared-main'
 import { VideoStudioEditComponent } from './edit'
+import { VideoStudioService } from './shared'
 
-const videoStudioRoutes: Routes = [
+export default [
   {
     path: '',
     canActivateChild: [ LoginGuard ],
+    providers: [ VideoStudioService ],
     children: [
       {
         path: 'edit/:videoId',
@@ -23,10 +24,4 @@ const videoStudioRoutes: Routes = [
       }
     ]
   }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(videoStudioRoutes) ],
-  exports: [ RouterModule ]
-})
-export class VideoStudioRoutingModule {}
+] satisfies Routes
diff --git a/client/src/app/+video-studio/video-studio.module.ts b/client/src/app/+video-studio/video-studio.module.ts
deleted file mode 100644
index 7c1dc02ea..000000000
--- a/client/src/app/+video-studio/video-studio.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { VideoStudioEditComponent } from './edit'
-import { VideoStudioService } from './shared'
-import { VideoStudioRoutingModule } from './video-studio-routing.module'
-
-@NgModule({
-  imports: [
-    VideoStudioRoutingModule,
-
-    SharedMainModule,
-    SharedFormModule
-  ],
-
-  declarations: [
-    VideoStudioEditComponent
-  ],
-
-  exports: [],
-
-  providers: [
-    VideoStudioService
-  ]
-})
-export class VideoStudioModule { }
diff --git a/client/src/app/+videos/+video-edit/add-routes.ts b/client/src/app/+videos/+video-edit/add-routes.ts
new file mode 100644
index 000000000..db071c96a
--- /dev/null
+++ b/client/src/app/+videos/+video-edit/add-routes.ts
@@ -0,0 +1,20 @@
+import { Routes } from '@angular/router'
+import { CanDeactivateGuard, LoginGuard } from '@app/core'
+import { VideoAddComponent } from './video-add.component'
+import { LiveVideoService } from '@app/shared/shared-video-live'
+import { I18nPrimengCalendarService } from './shared/i18n-primeng-calendar.service'
+import { VideoUploadService } from './shared/video-upload.service'
+
+export default [
+  {
+    path: '',
+    component: VideoAddComponent,
+    canActivate: [ LoginGuard ],
+    canDeactivate: [ CanDeactivateGuard ],
+    providers: [
+      LiveVideoService,
+      I18nPrimengCalendarService,
+      VideoUploadService
+    ]
+  }
+] satisfies Routes
diff --git a/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts
index e595cf2c9..2656216f6 100644
--- a/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts
+++ b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts
@@ -5,11 +5,18 @@ import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { VideoCaptionEdit } from '@app/shared/shared-main'
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
 import { HTMLServerConfig, VideoConstant } from '@peertube/peertube-models'
+import { ReactiveFileComponent } from '../../../shared/shared-forms/reactive-file.component'
+import { NgIf } from '@angular/common'
+import { NgSelectModule } from '@ng-select/ng-select'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 
 @Component({
   selector: 'my-video-caption-add-modal',
   styleUrls: [ './video-caption-add-modal.component.scss' ],
-  templateUrl: './video-caption-add-modal.component.html'
+  templateUrl: './video-caption-add-modal.component.html',
+  standalone: true,
+  imports: [ FormsModule, ReactiveFormsModule, GlobalIconComponent, NgSelectModule, NgIf, ReactiveFileComponent ]
 })
 
 export class VideoCaptionAddModalComponent extends FormReactive implements OnInit {
diff --git a/client/src/app/+videos/+video-edit/shared/video-caption-edit-modal-content/video-caption-edit-modal-content.component.ts b/client/src/app/+videos/+video-edit/shared/video-caption-edit-modal-content/video-caption-edit-modal-content.component.ts
index 6c6a30d96..25a849533 100644
--- a/client/src/app/+videos/+video-edit/shared/video-caption-edit-modal-content/video-caption-edit-modal-content.component.ts
+++ b/client/src/app/+videos/+video-edit/shared/video-caption-edit-modal-content/video-caption-edit-modal-content.component.ts
@@ -5,6 +5,9 @@ import { VideoCaptionEdit, VideoCaptionService, VideoCaptionWithPathEdit } from
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { HTMLServerConfig, VideoConstant } from '@peertube/peertube-models'
 import { ServerService } from '../../../../core'
+import { NgClass, NgIf } from '@angular/common'
+import { GlobalIconComponent } from '../../../../shared/shared-icons/global-icon.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 
 /**
  * https://github.com/valor-software/ngx-bootstrap/issues/3825
@@ -14,7 +17,9 @@ import { ServerService } from '../../../../core'
 @Component({
   selector: 'my-video-caption-edit-modal-content',
   styleUrls: [ './video-caption-edit-modal-content.component.scss' ],
-  templateUrl: './video-caption-edit-modal-content.component.html'
+  templateUrl: './video-caption-edit-modal-content.component.html',
+  standalone: true,
+  imports: [ FormsModule, ReactiveFormsModule, GlobalIconComponent, NgClass, NgIf ]
 })
 
 export class VideoCaptionEditModalContentComponent extends FormReactive implements OnInit {
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.ts b/client/src/app/+videos/+video-edit/shared/video-edit.component.ts
index 35beba5b1..c3d6e31c9 100644
--- a/client/src/app/+videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.ts
@@ -2,7 +2,7 @@ import { forkJoin } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { SelectChannelItem, SelectOptionsItem } from 'src/types/select-options-item.model'
 import { ChangeDetectorRef, Component, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'
-import { AbstractControl, FormArray, FormGroup, Validators } from '@angular/forms'
+import { AbstractControl, FormArray, FormGroup, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { HooksService, PluginService, ServerService } from '@app/core'
 import { removeElementFromArray } from '@app/helpers'
 import { BuildFormArgument, BuildFormValidator } from '@app/shared/form-validators'
@@ -22,9 +22,15 @@ import {
 } from '@app/shared/form-validators/video-validators'
 import { VIDEO_CHAPTERS_ARRAY_VALIDATOR, VIDEO_CHAPTER_TITLE_VALIDATOR } from '@app/shared/form-validators/video-chapter-validators'
 import { FormReactiveErrors, FormReactiveValidationMessages, FormValidatorService } from '@app/shared/shared-forms'
-import { InstanceService } from '@app/shared/shared-instance'
-import { VideoCaptionEdit, VideoCaptionWithPathEdit, VideoChaptersEdit, VideoEdit, VideoService } from '@app/shared/shared-main'
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import {
+  InstanceService,
+  VideoCaptionEdit,
+  VideoCaptionWithPathEdit,
+  VideoChaptersEdit,
+  VideoEdit,
+  VideoService
+} from '@app/shared/shared-main'
+import { NgbModal, NgbNav, NgbNavItem, NgbNavLink, NgbNavLinkBase, NgbNavContent, NgbNavOutlet } from '@ng-bootstrap/ng-bootstrap'
 import {
   HTMLServerConfig,
   LiveVideo,
@@ -44,6 +50,23 @@ import { I18nPrimengCalendarService } from './i18n-primeng-calendar.service'
 import { VideoCaptionAddModalComponent } from './video-caption-add-modal.component'
 import { VideoCaptionEditModalContentComponent } from './video-caption-edit-modal-content/video-caption-edit-modal-content.component'
 import { VideoEditType } from './video-edit.type'
+import { PreviewUploadComponent } from '../../../shared/shared-forms/preview-upload.component'
+import { LiveDocumentationLinkComponent } from '../../../shared/shared-video-live/live-documentation-link.component'
+import { EmbedComponent } from '../../../shared/shared-main/video/embed.component'
+import { DeleteButtonComponent } from '../../../shared/shared-main/buttons/delete-button.component'
+import { TimestampInputComponent } from '../../../shared/shared-forms/timestamp-input.component'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
+import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component'
+import { CalendarModule } from 'primeng/calendar'
+import { InputTextComponent } from '../../../shared/shared-forms/input-text.component'
+import { SelectOptionsComponent } from '../../../shared/shared-forms/select/select-options.component'
+import { SelectChannelComponent } from '../../../shared/shared-forms/select/select-channel.component'
+import { MarkdownTextareaComponent } from '../../../shared/shared-forms/markdown-textarea.component'
+import { SelectTagsComponent } from '../../../shared/shared-forms/select/select-tags.component'
+import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive'
+import { HelpComponent } from '../../../shared/shared-main/misc/help.component'
+import { NgIf, NgFor, NgTemplateOutlet, NgClass, DatePipe } from '@angular/common'
+import { DynamicFormFieldComponent } from '../../../shared/shared-forms/dynamic-form-field.component'
 
 type VideoLanguages = VideoConstant<string> & { group?: string }
 type PluginField = {
@@ -55,7 +78,40 @@ type PluginField = {
 @Component({
   selector: 'my-video-edit',
   styleUrls: [ './video-edit.component.scss' ],
-  templateUrl: './video-edit.component.html'
+  templateUrl: './video-edit.component.html',
+  standalone: true,
+  imports: [
+    FormsModule,
+    ReactiveFormsModule,
+    NgbNav,
+    DynamicFormFieldComponent,
+    NgbNavItem,
+    NgbNavLink,
+    NgbNavLinkBase,
+    NgbNavContent,
+    NgIf,
+    HelpComponent,
+    PeerTubeTemplateDirective,
+    SelectTagsComponent,
+    MarkdownTextareaComponent,
+    SelectChannelComponent,
+    SelectOptionsComponent,
+    InputTextComponent,
+    CalendarModule,
+    PeertubeCheckboxComponent,
+    NgFor,
+    NgTemplateOutlet,
+    GlobalIconComponent,
+    NgClass,
+    TimestampInputComponent,
+    DeleteButtonComponent,
+    EmbedComponent,
+    LiveDocumentationLinkComponent,
+    PreviewUploadComponent,
+    NgbNavOutlet,
+    VideoCaptionAddModalComponent,
+    DatePipe
+  ]
 })
 export class VideoEditComponent implements OnInit, OnDestroy {
   @Input() form: FormGroup
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.module.ts b/client/src/app/+videos/+video-edit/shared/video-edit.module.ts
deleted file mode 100644
index 455fe74e6..000000000
--- a/client/src/app/+videos/+video-edit/shared/video-edit.module.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { CalendarModule } from 'primeng/calendar'
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedVideoLiveModule } from '@app/shared/shared-video-live'
-import { I18nPrimengCalendarService } from './i18n-primeng-calendar.service'
-import { VideoCaptionAddModalComponent } from './video-caption-add-modal.component'
-import { VideoCaptionEditModalContentComponent } from './video-caption-edit-modal-content/video-caption-edit-modal-content.component'
-import { VideoEditComponent } from './video-edit.component'
-import { VideoUploadService } from './video-upload.service'
-
-@NgModule({
-  imports: [
-    CalendarModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedGlobalIconModule,
-    SharedVideoLiveModule
-  ],
-
-  declarations: [
-    VideoEditComponent,
-    VideoCaptionAddModalComponent,
-    VideoCaptionEditModalContentComponent
-  ],
-
-  exports: [
-    CalendarModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedGlobalIconModule,
-
-    VideoEditComponent
-  ],
-
-  providers: [
-    I18nPrimengCalendarService,
-    VideoUploadService
-  ]
-})
-export class VideoEditModule { }
diff --git a/client/src/app/+videos/+video-edit/update-routes.ts b/client/src/app/+videos/+video-edit/update-routes.ts
new file mode 100644
index 000000000..24e2a0ae2
--- /dev/null
+++ b/client/src/app/+videos/+video-edit/update-routes.ts
@@ -0,0 +1,25 @@
+import { Routes } from '@angular/router'
+import { CanDeactivateGuard, LoginGuard } from '@app/core'
+import { VideoUpdateComponent } from './video-update.component'
+import { VideoUpdateResolver } from './video-update.resolver'
+import { LiveVideoService } from '@app/shared/shared-video-live'
+import { I18nPrimengCalendarService } from './shared/i18n-primeng-calendar.service'
+import { VideoUploadService } from './shared/video-upload.service'
+
+export default [
+  {
+    path: '',
+    component: VideoUpdateComponent,
+    canActivate: [ LoginGuard ],
+    canDeactivate: [ CanDeactivateGuard ],
+    providers: [
+      VideoUpdateResolver,
+      LiveVideoService,
+      I18nPrimengCalendarService,
+      VideoUploadService
+    ],
+    resolve: {
+      videoData: VideoUpdateResolver
+    }
+  }
+] satisfies Routes
diff --git a/client/src/app/+videos/+video-edit/video-add-components/drag-drop.directive.ts b/client/src/app/+videos/+video-edit/video-add-components/drag-drop.directive.ts
index 7c35e6b84..a3cdc242f 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/drag-drop.directive.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/drag-drop.directive.ts
@@ -1,7 +1,8 @@
 import { Directive, Output, EventEmitter, HostBinding, HostListener } from '@angular/core'
 
 @Directive({
-  selector: '[myDragDrop]'
+  selector: '[myDragDrop]',
+  standalone: true
 })
 export class DragDropDirective {
   @Output() fileDropped = new EventEmitter<FileList>()
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts
index 69d12b85f..a69c770c3 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts
@@ -18,6 +18,14 @@ import {
   VideoPrivacy
 } from '@peertube/peertube-models'
 import { VideoSend } from './video-send'
+import { TimeDurationFormatterPipe } from '../../../shared/shared-main/angular/time-duration-formatter.pipe'
+import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component'
+import { VideoEditComponent } from '../shared/video-edit.component'
+import { SelectOptionsComponent } from '../../../shared/shared-forms/select/select-options.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { SelectChannelComponent } from '../../../shared/shared-forms/select/select-channel.component'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-video-go-live',
@@ -26,6 +34,18 @@ import { VideoSend } from './video-send'
     '../shared/video-edit.component.scss',
     './video-go-live.component.scss',
     './video-send.scss'
+  ],
+  standalone: true,
+  imports: [
+    NgIf,
+    GlobalIconComponent,
+    SelectChannelComponent,
+    FormsModule,
+    SelectOptionsComponent,
+    ReactiveFormsModule,
+    VideoEditComponent,
+    ButtonComponent,
+    TimeDurationFormatterPipe
   ]
 })
 export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterViewInit, CanComponentDeactivate {
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.ts
index 50eb14c6e..78f74d5b7 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.ts
@@ -10,6 +10,17 @@ import { logger } from '@root-helpers/logger'
 import { PeerTubeProblemDocument, ServerErrorCode, VideoUpdate } from '@peertube/peertube-models'
 import { hydrateFormFromVideo } from '../shared/video-edit-utils'
 import { VideoSend } from './video-send'
+import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component'
+import { VideoEditComponent } from '../shared/video-edit.component'
+import { SelectOptionsComponent } from '../../../shared/shared-forms/select/select-options.component'
+import { SelectChannelComponent } from '../../../shared/shared-forms/select/select-channel.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive'
+import { HelpComponent } from '../../../shared/shared-main/misc/help.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
+import { DragDropDirective } from './drag-drop.directive'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-video-import-torrent',
@@ -18,6 +29,21 @@ import { VideoSend } from './video-send'
     '../shared/video-edit.component.scss',
     './video-import-torrent.component.scss',
     './video-send.scss'
+  ],
+  standalone: true,
+  imports: [
+    NgIf,
+    DragDropDirective,
+    GlobalIconComponent,
+    NgbTooltip,
+    HelpComponent,
+    PeerTubeTemplateDirective,
+    FormsModule,
+    SelectChannelComponent,
+    SelectOptionsComponent,
+    ReactiveFormsModule,
+    VideoEditComponent,
+    ButtonComponent
   ]
 })
 export class VideoImportTorrentComponent extends VideoSend implements OnInit, AfterViewInit, CanComponentDeactivate {
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.ts
index 4dc04b83e..c682473d5 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.ts
@@ -1,7 +1,7 @@
 import { forkJoin } from 'rxjs'
 import { map, switchMap } from 'rxjs/operators'
 import { AfterViewInit, Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'
-import { Router } from '@angular/router'
+import { Router, RouterLink } from '@angular/router'
 import { AuthService, CanComponentDeactivate, HooksService, Notifier, ServerService } from '@app/core'
 import { scrollToTop } from '@app/helpers'
 import { FormReactiveService } from '@app/shared/shared-forms'
@@ -12,6 +12,14 @@ import { VideoUpdate } from '@peertube/peertube-models'
 import { hydrateFormFromVideo } from '../shared/video-edit-utils'
 import { VideoSend } from './video-send'
 import { VideoEditComponent } from '../shared/video-edit.component'
+import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component'
+import { SelectOptionsComponent } from '../../../shared/shared-forms/select/select-options.component'
+import { SelectChannelComponent } from '../../../shared/shared-forms/select/select-channel.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive'
+import { HelpComponent } from '../../../shared/shared-main/misc/help.component'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-video-import-url',
@@ -19,6 +27,20 @@ import { VideoEditComponent } from '../shared/video-edit.component'
   styleUrls: [
     '../shared/video-edit.component.scss',
     './video-send.scss'
+  ],
+  standalone: true,
+  imports: [
+    NgIf,
+    GlobalIconComponent,
+    HelpComponent,
+    PeerTubeTemplateDirective,
+    FormsModule,
+    RouterLink,
+    SelectChannelComponent,
+    SelectOptionsComponent,
+    ReactiveFormsModule,
+    VideoEditComponent,
+    ButtonComponent
   ]
 })
 export class VideoImportUrlComponent extends VideoSend implements OnInit, AfterViewInit, CanComponentDeactivate {
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
index 7a542794d..ab064b2d8 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
@@ -13,6 +13,17 @@ import { logger } from '@root-helpers/logger'
 import { HttpStatusCode, VideoCreateResult } from '@peertube/peertube-models'
 import { VideoUploadService } from '../shared/video-upload.service'
 import { VideoSend } from './video-send'
+import { VideoEditComponent } from '../shared/video-edit.component'
+import { UploadProgressComponent } from '../../../shared/standalone-upload/upload-progress.component'
+import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component'
+import { PreviewUploadComponent } from '../../../shared/shared-forms/preview-upload.component'
+import { SelectOptionsComponent } from '../../../shared/shared-forms/select/select-options.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { SelectChannelComponent } from '../../../shared/shared-forms/select/select-channel.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
+import { DragDropDirective } from './drag-drop.directive'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-video-upload',
@@ -21,6 +32,21 @@ import { VideoSend } from './video-send'
     '../shared/video-edit.component.scss',
     './video-upload.component.scss',
     './video-send.scss'
+  ],
+  standalone: true,
+  imports: [
+    NgIf,
+    DragDropDirective,
+    GlobalIconComponent,
+    NgbTooltip,
+    SelectChannelComponent,
+    FormsModule,
+    SelectOptionsComponent,
+    PreviewUploadComponent,
+    ButtonComponent,
+    UploadProgressComponent,
+    ReactiveFormsModule,
+    VideoEditComponent
   ]
 })
 export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy, AfterViewInit, CanComponentDeactivate {
diff --git a/client/src/app/+videos/+video-edit/video-add-routing.module.ts b/client/src/app/+videos/+video-edit/video-add-routing.module.ts
deleted file mode 100644
index 3b9a5ab3a..000000000
--- a/client/src/app/+videos/+video-edit/video-add-routing.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-import { CanDeactivateGuard, LoginGuard } from '@app/core'
-import { VideoAddComponent } from './video-add.component'
-
-const videoAddRoutes: Routes = [
-  {
-    path: '',
-    component: VideoAddComponent,
-    canActivate: [ LoginGuard ],
-    canDeactivate: [ CanDeactivateGuard ]
-  }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(videoAddRoutes) ],
-  exports: [ RouterModule ]
-})
-export class VideoAddRoutingModule {}
diff --git a/client/src/app/+videos/+video-edit/video-add.component.ts b/client/src/app/+videos/+video-edit/video-add.component.ts
index 413fe4780..375ca9cb4 100644
--- a/client/src/app/+videos/+video-edit/video-add.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add.component.ts
@@ -1,5 +1,5 @@
 import { Component, HostListener, OnInit, ViewChild } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute, Router, RouterLink } from '@angular/router'
 import {
   AuthService,
   AuthUser,
@@ -14,11 +14,34 @@ import { VideoGoLiveComponent } from './video-add-components/video-go-live.compo
 import { VideoImportTorrentComponent } from './video-add-components/video-import-torrent.component'
 import { VideoImportUrlComponent } from './video-add-components/video-import-url.component'
 import { VideoUploadComponent } from './video-add-components/video-upload.component'
+import { NgbNav, NgbNavItem, NgbNavLink, NgbNavLinkBase, NgbNavContent, NgbNavOutlet } from '@ng-bootstrap/ng-bootstrap'
+import { ChannelsSetupMessageComponent } from '../../shared/shared-main/misc/channels-setup-message.component'
+import { UserQuotaComponent } from '../../shared/shared-main/users/user-quota.component'
+import { NgIf, NgTemplateOutlet, NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-videos-add',
   templateUrl: './video-add.component.html',
-  styleUrls: [ './video-add.component.scss' ]
+  styleUrls: [ './video-add.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    RouterLink,
+    NgTemplateOutlet,
+    UserQuotaComponent,
+    ChannelsSetupMessageComponent,
+    NgbNav,
+    NgClass,
+    NgbNavItem,
+    NgbNavLink,
+    NgbNavLinkBase,
+    NgbNavContent,
+    VideoUploadComponent,
+    VideoImportUrlComponent,
+    VideoImportTorrentComponent,
+    VideoGoLiveComponent,
+    NgbNavOutlet
+  ]
 })
 export class VideoAddComponent implements OnInit, CanComponentDeactivate {
   @ViewChild('videoUpload') videoUpload: VideoUploadComponent
diff --git a/client/src/app/+videos/+video-edit/video-add.module.ts b/client/src/app/+videos/+video-edit/video-add.module.ts
deleted file mode 100644
index 30150ff04..000000000
--- a/client/src/app/+videos/+video-edit/video-add.module.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { UploadxModule } from 'ngx-uploadx'
-import { NgModule } from '@angular/core'
-import { VideoEditModule } from './shared/video-edit.module'
-import { DragDropDirective } from './video-add-components/drag-drop.directive'
-import { VideoGoLiveComponent } from './video-add-components/video-go-live.component'
-import { VideoImportTorrentComponent } from './video-add-components/video-import-torrent.component'
-import { VideoImportUrlComponent } from './video-add-components/video-import-url.component'
-import { VideoUploadComponent } from './video-add-components/video-upload.component'
-import { VideoAddRoutingModule } from './video-add-routing.module'
-import { VideoAddComponent } from './video-add.component'
-import { UploadProgressComponent } from '@app/shared/standalone-upload'
-
-@NgModule({
-  imports: [
-    VideoAddRoutingModule,
-
-    VideoEditModule,
-
-    UploadxModule,
-
-    UploadProgressComponent
-  ],
-
-  declarations: [
-    VideoAddComponent,
-    VideoUploadComponent,
-    VideoImportUrlComponent,
-    VideoImportTorrentComponent,
-    DragDropDirective,
-    VideoGoLiveComponent
-  ],
-
-  exports: [ ],
-
-  providers: []
-})
-export class VideoAddModule { }
diff --git a/client/src/app/+videos/+video-edit/video-update-routing.module.ts b/client/src/app/+videos/+video-edit/video-update-routing.module.ts
deleted file mode 100644
index ba9167dd0..000000000
--- a/client/src/app/+videos/+video-edit/video-update-routing.module.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-import { CanDeactivateGuard, LoginGuard } from '@app/core'
-import { VideoUpdateComponent } from './video-update.component'
-import { VideoUpdateResolver } from './video-update.resolver'
-
-const videoUpdateRoutes: Routes = [
-  {
-    path: '',
-    component: VideoUpdateComponent,
-    canActivate: [ LoginGuard ],
-    canDeactivate: [ CanDeactivateGuard ],
-    resolve: {
-      videoData: VideoUpdateResolver
-    }
-  }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(videoUpdateRoutes) ],
-  exports: [ RouterModule ]
-})
-export class VideoUpdateRoutingModule {}
diff --git a/client/src/app/+videos/+video-edit/video-update.component.ts b/client/src/app/+videos/+video-edit/video-update.component.ts
index b23c12c8e..8c1c16819 100644
--- a/client/src/app/+videos/+video-edit/video-update.component.ts
+++ b/client/src/app/+videos/+video-edit/video-update.component.ts
@@ -5,7 +5,7 @@ import { catchError, map, switchMap } from 'rxjs/operators'
 import { SelectChannelItem } from 'src/types/select-options-item.model'
 import { HttpErrorResponse } from '@angular/common/http'
 import { Component, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute, Router, RouterLink } from '@angular/router'
 import { AuthService, CanComponentDeactivate, ConfirmService, Notifier, ServerService, UserService } from '@app/core'
 import { buildHTTPErrorResponse, genericUploadErrorHandler } from '@app/helpers'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
@@ -26,13 +26,29 @@ import { HttpStatusCode, LiveVideo, LiveVideoUpdate, VideoPrivacy, VideoSource,
 import { hydrateFormFromVideo } from './shared/video-edit-utils'
 import { VideoUploadService } from './shared/video-upload.service'
 import { VideoEditComponent } from './shared/video-edit.component'
+import { ButtonComponent } from '../../shared/shared-main/buttons/button.component'
+import { ReactiveFileComponent } from '../../shared/shared-forms/reactive-file.component'
+import { NgIf } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { UploadProgressComponent } from '../../shared/standalone-upload/upload-progress.component'
 
 const debugLogger = debug('peertube:video-update')
 
 @Component({
   selector: 'my-videos-update',
   styleUrls: [ './shared/video-edit.component.scss' ],
-  templateUrl: './video-update.component.html'
+  templateUrl: './video-update.component.html',
+  standalone: true,
+  imports: [
+    RouterLink,
+    UploadProgressComponent,
+    FormsModule,
+    ReactiveFormsModule,
+    VideoEditComponent,
+    NgIf,
+    ReactiveFileComponent,
+    ButtonComponent
+  ]
 })
 export class VideoUpdateComponent extends FormReactive implements OnInit, OnDestroy, CanComponentDeactivate {
   @ViewChild('videoEdit', { static: false }) videoEditComponent: VideoEditComponent
diff --git a/client/src/app/+videos/+video-edit/video-update.module.ts b/client/src/app/+videos/+video-edit/video-update.module.ts
deleted file mode 100644
index 98ea647a8..000000000
--- a/client/src/app/+videos/+video-edit/video-update.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NgModule } from '@angular/core'
-import { VideoEditModule } from './shared/video-edit.module'
-import { VideoUpdateRoutingModule } from './video-update-routing.module'
-import { VideoUpdateComponent } from './video-update.component'
-import { VideoUpdateResolver } from './video-update.resolver'
-import { UploadProgressComponent } from '@app/shared/standalone-upload'
-
-@NgModule({
-  imports: [
-    VideoUpdateRoutingModule,
-
-    VideoEditModule,
-
-    UploadProgressComponent
-  ],
-
-  declarations: [
-    VideoUpdateComponent
-  ],
-
-  exports: [ ],
-
-  providers: [
-    VideoUpdateResolver
-  ]
-})
-export class VideoUpdateModule { }
diff --git a/client/src/app/+videos/+video-watch/player-styles.component.ts b/client/src/app/+videos/+video-watch/player-styles.component.ts
index 448a0ee96..dda5653c8 100644
--- a/client/src/app/+videos/+video-watch/player-styles.component.ts
+++ b/client/src/app/+videos/+video-watch/player-styles.component.ts
@@ -9,7 +9,8 @@ import { Component, ViewEncapsulation } from '@angular/core'
   template: '',
   styleUrls: [ './player-styles.component.scss' ],
   /* eslint-disable @angular-eslint/use-component-view-encapsulation */
-  encapsulation: ViewEncapsulation.None
+  encapsulation: ViewEncapsulation.None,
+  standalone: true
 })
 export class PlayerStylesComponent {
 }
diff --git a/client/src/app/+videos/+video-watch/routes.ts b/client/src/app/+videos/+video-watch/routes.ts
new file mode 100644
index 000000000..0490d30e1
--- /dev/null
+++ b/client/src/app/+videos/+video-watch/routes.ts
@@ -0,0 +1,42 @@
+import { Routes } from '@angular/router'
+import { VideoWatchComponent } from './video-watch.component'
+import { BlocklistService, VideoBlockService } from '@app/shared/shared-moderation'
+import { UserSubscriptionService } from '@app/shared/shared-user-subscription'
+import { VideoPlaylistService } from '@app/shared/shared-video-playlist'
+import { OverviewService } from '../video-list'
+import { LiveVideoService } from '@app/shared/shared-video-live'
+import { VideoCommentService } from '@app/shared/shared-video-comment'
+import { RecentVideosRecommendationService, RecommendedVideosStore } from './shared'
+import { SearchService } from '@app/shared/shared-search'
+
+export default [
+  {
+    path: '',
+    providers: [
+      OverviewService,
+      UserSubscriptionService,
+      VideoPlaylistService,
+      BlocklistService,
+      VideoBlockService,
+      LiveVideoService,
+      VideoCommentService,
+      RecentVideosRecommendationService,
+      RecommendedVideosStore,
+      SearchService
+    ],
+    children: [
+      {
+        path: 'p/:playlistId',
+        component: VideoWatchComponent
+      },
+      {
+        path: ':videoId/comments/:commentId',
+        redirectTo: ':videoId'
+      },
+      {
+        path: ':videoId',
+        component: VideoWatchComponent
+      }
+    ]
+  }
+] satisfies Routes
diff --git a/client/src/app/+videos/+video-watch/shared/action-buttons/action-buttons.component.ts b/client/src/app/+videos/+video-watch/shared/action-buttons/action-buttons.component.ts
index d6f1f8f14..dd4f2a867 100644
--- a/client/src/app/+videos/+video-watch/shared/action-buttons/action-buttons.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/action-buttons/action-buttons.component.ts
@@ -6,11 +6,34 @@ import { SupportModalComponent } from '@app/shared/shared-support-modal'
 import { VideoActionsDisplayType, VideoDownloadComponent } from '@app/shared/shared-video-miniature'
 import { VideoPlaylist } from '@app/shared/shared-video-playlist'
 import { UserVideoRateType, VideoCaption, VideoPrivacy } from '@peertube/peertube-models'
+import { VideoActionsDropdownComponent } from '../../../../shared/shared-video-miniature/video-actions-dropdown.component'
+import { VideoAddToPlaylistComponent } from '../../../../shared/shared-video-playlist/video-add-to-playlist.component'
+import { GlobalIconComponent } from '../../../../shared/shared-icons/global-icon.component'
+import { NgbTooltip, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu } from '@ng-bootstrap/ng-bootstrap'
+import { NgIf, NgClass, NgStyle } from '@angular/common'
+import { VideoRateComponent } from './video-rate.component'
 
 @Component({
   selector: 'my-action-buttons',
   templateUrl: './action-buttons.component.html',
-  styleUrls: [ './action-buttons.component.scss' ]
+  styleUrls: [ './action-buttons.component.scss' ],
+  standalone: true,
+  imports: [
+    VideoRateComponent,
+    NgIf,
+    NgbTooltip,
+    GlobalIconComponent,
+    NgbDropdown,
+    NgbDropdownToggle,
+    NgbDropdownMenu,
+    VideoAddToPlaylistComponent,
+    VideoDownloadComponent,
+    VideoActionsDropdownComponent,
+    NgClass,
+    NgStyle,
+    SupportModalComponent,
+    VideoShareComponent
+  ]
 })
 export class ActionButtonsComponent implements OnInit, OnChanges {
   @ViewChild('videoShareModal') videoShareModal: VideoShareComponent
diff --git a/client/src/app/+videos/+video-watch/shared/action-buttons/video-rate.component.ts b/client/src/app/+videos/+video-watch/shared/action-buttons/video-rate.component.ts
index 186649e60..9420f16b7 100644
--- a/client/src/app/+videos/+video-watch/shared/action-buttons/video-rate.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/action-buttons/video-rate.component.ts
@@ -3,11 +3,16 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output }
 import { Notifier, ScreenService, Hotkey, HotkeysService } from '@app/core'
 import { VideoDetails, VideoService } from '@app/shared/shared-main'
 import { UserVideoRateType } from '@peertube/peertube-models'
+import { GlobalIconComponent } from '../../../../shared/shared-icons/global-icon.component'
+import { NgClass, NgIf } from '@angular/common'
+import { NgbPopover, NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
   selector: 'my-video-rate',
   templateUrl: './video-rate.component.html',
-  styleUrls: [ './video-rate.component.scss' ]
+  styleUrls: [ './video-rate.component.scss' ],
+  standalone: true,
+  imports: [ NgbPopover, NgClass, NgbTooltip, GlobalIconComponent, NgIf ]
 })
 export class VideoRateComponent implements OnInit, OnChanges, OnDestroy {
   @Input() video: VideoDetails
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.ts b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.ts
index 64e3f65dd..73512d7d4 100644
--- a/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.ts
@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs'
-import { getLocaleDirection } from '@angular/common'
+import { getLocaleDirection, NgClass, NgIf, NgFor } from '@angular/common'
 import {
   Component,
   ElementRef,
@@ -20,11 +20,34 @@ import { Video } from '@app/shared/shared-main'
 import { VideoComment, VideoCommentService } from '@app/shared/shared-video-comment'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { VideoCommentCreate } from '@peertube/peertube-models'
+import { LoginLinkComponent } from '../../../../shared/shared-main/angular/login-link.component'
+import { RemoteSubscribeComponent } from '../../../../shared/shared-user-subscription/remote-subscribe.component'
+import { GlobalIconComponent } from '../../../../shared/shared-icons/global-icon.component'
+import { PeerTubeTemplateDirective } from '../../../../shared/shared-main/angular/peertube-template.directive'
+import { HelpComponent } from '../../../../shared/shared-main/misc/help.component'
+import { TextareaAutoResizeDirective } from '../../../../shared/shared-forms/textarea-autoresize.directive'
+import { ActorAvatarComponent } from '../../../../shared/shared-actor-image/actor-avatar.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 
 @Component({
   selector: 'my-video-comment-add',
   templateUrl: './video-comment-add.component.html',
-  styleUrls: [ './video-comment-add.component.scss' ]
+  styleUrls: [ './video-comment-add.component.scss' ],
+  standalone: true,
+  imports: [
+    FormsModule,
+    ReactiveFormsModule,
+    ActorAvatarComponent,
+    TextareaAutoResizeDirective,
+    NgClass,
+    HelpComponent,
+    PeerTubeTemplateDirective,
+    NgIf,
+    GlobalIconComponent,
+    RemoteSubscribeComponent,
+    LoginLinkComponent,
+    NgFor
+  ]
 })
 export class VideoCommentAddComponent extends FormReactive implements OnChanges, OnInit {
   @Input() user: User
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.ts b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.ts
index 11d923a34..b1ed82bcb 100644
--- a/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.ts
@@ -5,11 +5,31 @@ import { Account, DropdownAction, Video } from '@app/shared/shared-main'
 import { CommentReportComponent } from '@app/shared/shared-moderation/report-modals/comment-report.component'
 import { VideoComment, VideoCommentThreadTree } from '@app/shared/shared-video-comment'
 import { User, UserRight } from '@peertube/peertube-models'
+import { FromNowPipe } from '../../../../shared/shared-main/angular/from-now.pipe'
+import { VideoCommentAddComponent } from './video-comment-add.component'
+import { UserModerationDropdownComponent } from '../../../../shared/shared-moderation/user-moderation-dropdown.component'
+import { TimestampRouteTransformerDirective } from '../timestamp-route-transformer.directive'
+import { RouterLink } from '@angular/router'
+import { ActorAvatarComponent } from '../../../../shared/shared-actor-image/actor-avatar.component'
+import { NgIf, NgClass, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-video-comment',
   templateUrl: './video-comment.component.html',
-  styleUrls: [ './video-comment.component.scss' ]
+  styleUrls: [ './video-comment.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    NgClass,
+    ActorAvatarComponent,
+    RouterLink,
+    TimestampRouteTransformerDirective,
+    UserModerationDropdownComponent,
+    VideoCommentAddComponent,
+    NgFor,
+    CommentReportComponent,
+    FromNowPipe
+  ]
 })
 export class VideoCommentComponent implements OnInit, OnChanges {
   @ViewChild('commentReportModal') commentReportModal: CommentReportComponent
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.ts b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.ts
index 1a8c89bdc..82a2454c4 100644
--- a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.ts
@@ -6,11 +6,33 @@ import { HooksService } from '@app/core/plugins/hooks.service'
 import { Syndication, VideoDetails } from '@app/shared/shared-main'
 import { VideoComment, VideoCommentService, VideoCommentThreadTree } from '@app/shared/shared-video-comment'
 import { PeerTubeProblemDocument, ServerErrorCode } from '@peertube/peertube-models'
+import { LoaderComponent } from '../../../../shared/shared-main/loaders/loader.component'
+import { VideoCommentComponent } from './video-comment.component'
+import { InfiniteScrollerDirective } from '../../../../shared/shared-main/angular/infinite-scroller.directive'
+import { VideoCommentAddComponent } from './video-comment-add.component'
+import { NgIf, NgFor } from '@angular/common'
+import { NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownButtonItem, NgbDropdownItem } from '@ng-bootstrap/ng-bootstrap'
+import { FeedComponent } from '../../../../shared/shared-main/feeds/feed.component'
 
 @Component({
   selector: 'my-video-comments',
   templateUrl: './video-comments.component.html',
-  styleUrls: [ './video-comments.component.scss' ]
+  styleUrls: [ './video-comments.component.scss' ],
+  standalone: true,
+  imports: [
+    FeedComponent,
+    NgbDropdown,
+    NgbDropdownToggle,
+    NgbDropdownMenu,
+    NgbDropdownButtonItem,
+    NgbDropdownItem,
+    NgIf,
+    VideoCommentAddComponent,
+    InfiniteScrollerDirective,
+    VideoCommentComponent,
+    NgFor,
+    LoaderComponent
+  ]
 })
 export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
   @ViewChild('commentHighlightBlock') commentHighlightBlock: ElementRef
diff --git a/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.ts b/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.ts
index d2f8aa45d..0ee4b10bc 100644
--- a/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.ts
@@ -3,11 +3,14 @@ import { ServerService, User, UserService } from '@app/core'
 import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
 import { isP2PEnabled } from '@root-helpers/video'
 import { HTMLServerConfig, Video } from '@peertube/peertube-models'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-privacy-concerns',
   templateUrl: './privacy-concerns.component.html',
-  styleUrls: [ './privacy-concerns.component.scss' ]
+  styleUrls: [ './privacy-concerns.component.scss' ],
+  standalone: true,
+  imports: [ NgIf ]
 })
 export class PrivacyConcernsComponent implements OnInit {
   private static LOCAL_STORAGE_PRIVACY_CONCERN_KEY = 'video-watch-privacy-concern'
diff --git a/client/src/app/+videos/+video-watch/shared/information/video-alert.component.ts b/client/src/app/+videos/+video-watch/shared/information/video-alert.component.ts
index c52b8665b..0b6b35766 100644
--- a/client/src/app/+videos/+video-watch/shared/information/video-alert.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/information/video-alert.component.ts
@@ -2,11 +2,14 @@ import { Component, Input } from '@angular/core'
 import { AuthUser } from '@app/core'
 import { VideoDetails } from '@app/shared/shared-main'
 import { VideoPrivacy, VideoState } from '@peertube/peertube-models'
+import { NgIf, DatePipe } from '@angular/common'
 
 @Component({
   selector: 'my-video-alert',
   templateUrl: './video-alert.component.html',
-  styleUrls: [ './video-alert.component.scss' ]
+  styleUrls: [ './video-alert.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, DatePipe ]
 })
 export class VideoAlertComponent {
   @Input() user: AuthUser
diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-attributes.component.ts b/client/src/app/+videos/+video-watch/shared/metadata/video-attributes.component.ts
index 1834f7be5..675615458 100644
--- a/client/src/app/+videos/+video-watch/shared/metadata/video-attributes.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-attributes.component.ts
@@ -1,6 +1,10 @@
 import { Component, Input, OnInit } from '@angular/core'
 import { HooksService } from '@app/core'
 import { VideoDetails } from '@app/shared/shared-main'
+import { TimeDurationFormatterPipe } from '../../../../shared/shared-main/angular/time-duration-formatter.pipe'
+import { GlobalIconComponent } from '../../../../shared/shared-icons/global-icon.component'
+import { RouterLink } from '@angular/router'
+import { NgIf, NgFor, DatePipe } from '@angular/common'
 
 type PluginMetadata = {
   label: string
@@ -12,7 +16,9 @@ type PluginMetadata = {
 @Component({
   selector: 'my-video-attributes',
   templateUrl: './video-attributes.component.html',
-  styleUrls: [ './video-attributes.component.scss' ]
+  styleUrls: [ './video-attributes.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, RouterLink, GlobalIconComponent, NgFor, DatePipe, TimeDurationFormatterPipe ]
 })
 export class VideoAttributesComponent implements OnInit {
   @Input() video: VideoDetails
diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts
index 4bfc7bd9d..14c83534e 100644
--- a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts
@@ -1,10 +1,14 @@
 import { Component, Input, OnInit } from '@angular/core'
 import { Video } from '@app/shared/shared-main/video'
+import { ActorAvatarComponent } from '../../../../shared/shared-actor-image/actor-avatar.component'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-video-avatar-channel',
   templateUrl: './video-avatar-channel.component.html',
-  styleUrls: [ './video-avatar-channel.component.scss' ]
+  styleUrls: [ './video-avatar-channel.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, ActorAvatarComponent ]
 })
 export class VideoAvatarChannelComponent implements OnInit {
   @Input() video: Video
diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.ts b/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.ts
index 911cf7264..6fafeb3f7 100644
--- a/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.ts
@@ -1,11 +1,15 @@
 import { Component, EventEmitter, Input, OnChanges, Output, ViewChild, ElementRef } from '@angular/core'
 import { MarkdownService } from '@app/core'
 import { VideoDetails } from '@app/shared/shared-main'
+import { NgClass, NgIf } from '@angular/common'
+import { TimestampRouteTransformerDirective } from '../timestamp-route-transformer.directive'
 
 @Component({
   selector: 'my-video-description',
   templateUrl: './video-description.component.html',
-  styleUrls: [ './video-description.component.scss' ]
+  styleUrls: [ './video-description.component.scss' ],
+  standalone: true,
+  imports: [ TimestampRouteTransformerDirective, NgClass, NgIf ]
 })
 export class VideoDescriptionComponent implements OnChanges {
   @ViewChild('descriptionHTML') descriptionHTML: ElementRef<HTMLElement>
diff --git a/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts
index eca7cf87c..f1dd0d8e3 100644
--- a/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts
@@ -6,11 +6,18 @@ import { VideoPlaylist, VideoPlaylistElement, VideoPlaylistService } from '@app/
 import { getBoolOrDefault } from '@root-helpers/local-storage-utils'
 import { peertubeSessionStorage } from '@root-helpers/peertube-web-storage'
 import { VideoPlaylistPrivacy } from '@peertube/peertube-models'
+import { VideoPlaylistElementMiniatureComponent } from '../../../../shared/shared-video-playlist/video-playlist-element-miniature.component'
+import { GlobalIconComponent } from '../../../../shared/shared-icons/global-icon.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { InfiniteScrollerDirective } from '../../../../shared/shared-main/angular/infinite-scroller.directive'
+import { NgIf, NgClass, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-video-watch-playlist',
   templateUrl: './video-watch-playlist.component.html',
-  styleUrls: [ './video-watch-playlist.component.scss' ]
+  styleUrls: [ './video-watch-playlist.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, InfiniteScrollerDirective, NgClass, NgbTooltip, GlobalIconComponent, NgFor, VideoPlaylistElementMiniatureComponent ]
 })
 export class VideoWatchPlaylistComponent {
   static SESSION_STORAGE_LOOP_PLAYLIST = 'loop_playlist'
diff --git a/client/src/app/+videos/+video-watch/shared/recommendations/index.ts b/client/src/app/+videos/+video-watch/shared/recommendations/index.ts
index ffcf84585..49b711d70 100644
--- a/client/src/app/+videos/+video-watch/shared/recommendations/index.ts
+++ b/client/src/app/+videos/+video-watch/shared/recommendations/index.ts
@@ -1,5 +1,4 @@
 export * from './recent-videos-recommendation.service'
 export * from './recommendation-info.model'
-export * from './recommendations.module'
 export * from './recommended-videos.component'
 export * from './recommended-videos.store'
diff --git a/client/src/app/+videos/+video-watch/shared/recommendations/recommendations.module.ts b/client/src/app/+videos/+video-watch/shared/recommendations/recommendations.module.ts
deleted file mode 100644
index 5a1394744..000000000
--- a/client/src/app/+videos/+video-watch/shared/recommendations/recommendations.module.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedSearchModule } from '@app/shared/shared-search'
-import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
-import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist'
-import { RecentVideosRecommendationService } from './recent-videos-recommendation.service'
-import { RecommendedVideosComponent } from './recommended-videos.component'
-import { RecommendedVideosStore } from './recommended-videos.store'
-
-@NgModule({
-  imports: [
-    CommonModule,
-
-    SharedMainModule,
-    SharedSearchModule,
-    SharedVideoPlaylistModule,
-    SharedVideoMiniatureModule,
-    SharedFormModule
-  ],
-  declarations: [
-    RecommendedVideosComponent
-  ],
-  exports: [
-    RecommendedVideosComponent
-  ],
-  providers: [
-    RecommendedVideosStore,
-    RecentVideosRecommendationService
-  ]
-})
-export class RecommendationsModule {
-}
diff --git a/client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.ts b/client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.ts
index 42259129c..a21842590 100644
--- a/client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.ts
@@ -6,11 +6,18 @@ import { MiniatureDisplayOptions } from '@app/shared/shared-video-miniature'
 import { VideoPlaylist } from '@app/shared/shared-video-playlist'
 import { RecommendationInfo } from './recommendation-info.model'
 import { RecommendedVideosStore } from './recommended-videos.store'
+import { VideoMiniatureComponent } from '../../../../shared/shared-video-miniature/video-miniature.component'
+import { FormsModule } from '@angular/forms'
+import { InputSwitchComponent } from '../../../../shared/shared-forms/input-switch.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { NgClass, NgIf, NgFor, AsyncPipe } from '@angular/common'
 
 @Component({
   selector: 'my-recommended-videos',
   templateUrl: './recommended-videos.component.html',
-  styleUrls: [ './recommended-videos.component.scss' ]
+  styleUrls: [ './recommended-videos.component.scss' ],
+  standalone: true,
+  imports: [ NgClass, NgIf, NgbTooltip, InputSwitchComponent, FormsModule, NgFor, VideoMiniatureComponent, AsyncPipe ]
 })
 export class RecommendedVideosComponent implements OnInit, OnChanges, OnDestroy {
   @Input() inputRecommendation: RecommendationInfo
diff --git a/client/src/app/+videos/+video-watch/shared/timestamp-route-transformer.directive.ts b/client/src/app/+videos/+video-watch/shared/timestamp-route-transformer.directive.ts
index ef9f5a59f..f95d84d25 100644
--- a/client/src/app/+videos/+video-watch/shared/timestamp-route-transformer.directive.ts
+++ b/client/src/app/+videos/+video-watch/shared/timestamp-route-transformer.directive.ts
@@ -1,7 +1,8 @@
 import { Directive, EventEmitter, HostListener, Output } from '@angular/core'
 
 @Directive({
-  selector: '[myTimestampRouteTransformer]'
+  selector: '[myTimestampRouteTransformer]',
+  standalone: true
 })
 export class TimestampRouteTransformerDirective {
   @Output() timestampClicked = new EventEmitter<number>()
diff --git a/client/src/app/+videos/+video-watch/video-watch-routing.module.ts b/client/src/app/+videos/+video-watch/video-watch-routing.module.ts
deleted file mode 100644
index 657fd10f8..000000000
--- a/client/src/app/+videos/+video-watch/video-watch-routing.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-import { VideoWatchComponent } from './video-watch.component'
-
-const videoWatchRoutes: Routes = [
-  {
-    path: 'p/:playlistId',
-    component: VideoWatchComponent
-  },
-  {
-    path: ':videoId/comments/:commentId',
-    redirectTo: ':videoId'
-  },
-  {
-    path: ':videoId',
-    component: VideoWatchComponent
-  }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(videoWatchRoutes) ],
-  exports: [ RouterModule ]
-})
-export class VideoWatchRoutingModule {}
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index b74855187..f49723fc1 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -1,7 +1,7 @@
 import { forkJoin, map, Observable, of, Subscription, switchMap } from 'rxjs'
-import { PlatformLocation } from '@angular/common'
+import { PlatformLocation, NgClass, NgIf, NgTemplateOutlet } from '@angular/common'
 import { Component, ElementRef, Inject, LOCALE_ID, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute, Router, RouterLink } from '@angular/router'
 import {
   AuthService,
   AuthUser,
@@ -51,6 +51,18 @@ import {
 import { cleanupVideoWatch, getStoredTheater, getStoredVideoWatchHistory } from '../../../assets/player/peertube-player-local-storage'
 import { environment } from '../../../environments/environment'
 import { VideoWatchPlaylistComponent } from './shared'
+import { PlayerStylesComponent } from './player-styles.component'
+import { PrivacyConcernsComponent } from './shared/information/privacy-concerns.component'
+import { RecommendedVideosComponent } from './shared/recommendations/recommended-videos.component'
+import { VideoCommentsComponent } from './shared/comment/video-comments.component'
+import { VideoAttributesComponent } from './shared/metadata/video-attributes.component'
+import { VideoDescriptionComponent } from './shared/metadata/video-description.component'
+import { VideoAvatarChannelComponent } from './shared/metadata/video-avatar-channel.component'
+import { ActionButtonsComponent } from './shared/action-buttons/action-buttons.component'
+import { VideoViewsCounterComponent } from '../../shared/shared-video/video-views-counter.component'
+import { DateToggleComponent } from '../../shared/shared-main/date/date-toggle.component'
+import { VideoAlertComponent } from './shared/information/video-alert.component'
+import { PluginPlaceholderComponent } from '../../shared/shared-main/plugins/plugin-placeholder.component'
 
 type URLOptions = {
   playerMode: PlayerMode
@@ -74,7 +86,28 @@ type URLOptions = {
 @Component({
   selector: 'my-video-watch',
   templateUrl: './video-watch.component.html',
-  styleUrls: [ './video-watch.component.scss' ]
+  styleUrls: [ './video-watch.component.scss' ],
+  standalone: true,
+  imports: [
+    NgClass,
+    NgIf,
+    VideoWatchPlaylistComponent,
+    PluginPlaceholderComponent,
+    VideoAlertComponent,
+    DateToggleComponent,
+    VideoViewsCounterComponent,
+    NgTemplateOutlet,
+    ActionButtonsComponent,
+    VideoAvatarChannelComponent,
+    RouterLink,
+    SubscribeButtonComponent,
+    VideoDescriptionComponent,
+    VideoAttributesComponent,
+    VideoCommentsComponent,
+    RecommendedVideosComponent,
+    PrivacyConcernsComponent,
+    PlayerStylesComponent
+  ]
 })
 export class VideoWatchComponent implements OnInit, OnDestroy {
   @ViewChild('videoWatchPlaylist', { static: true }) videoWatchPlaylist: VideoWatchPlaylistComponent
diff --git a/client/src/app/+videos/+video-watch/video-watch.module.ts b/client/src/app/+videos/+video-watch/video-watch.module.ts
deleted file mode 100644
index 8f5ffdb1d..000000000
--- a/client/src/app/+videos/+video-watch/video-watch.module.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedModerationModule } from '@app/shared/shared-moderation'
-import { SharedShareModal } from '@app/shared/shared-share-modal'
-import { SharedSupportModal } from '@app/shared/shared-support-modal'
-import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
-import { SharedVideoModule } from '@app/shared/shared-video'
-import { SharedVideoCommentModule } from '@app/shared/shared-video-comment'
-import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
-import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist'
-import { SharedActorImageModule } from '../../shared/shared-actor-image/shared-actor-image.module'
-import { VideoCommentService } from '../../shared/shared-video-comment/video-comment.service'
-import { PlayerStylesComponent } from './player-styles.component'
-import {
-  ActionButtonsComponent,
-  PrivacyConcernsComponent,
-  RecommendationsModule,
-  VideoAlertComponent,
-  VideoAvatarChannelComponent,
-  VideoDescriptionComponent,
-  VideoRateComponent,
-  VideoWatchPlaylistComponent,
-  VideoAttributesComponent
-} from './shared'
-import { VideoCommentAddComponent } from './shared/comment/video-comment-add.component'
-import { VideoCommentComponent } from './shared/comment/video-comment.component'
-import { VideoCommentsComponent } from './shared/comment/video-comments.component'
-import { TimestampRouteTransformerDirective } from './shared/timestamp-route-transformer.directive'
-import { VideoWatchRoutingModule } from './video-watch-routing.module'
-import { VideoWatchComponent } from './video-watch.component'
-
-@NgModule({
-  imports: [
-    VideoWatchRoutingModule,
-    RecommendationsModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedVideoMiniatureModule,
-    SharedVideoPlaylistModule,
-    SharedUserSubscriptionModule,
-    SharedModerationModule,
-    SharedGlobalIconModule,
-    SharedVideoCommentModule,
-    SharedShareModal,
-    SharedVideoModule,
-    SharedSupportModal,
-    SharedActorImageModule
-  ],
-
-  declarations: [
-    VideoWatchComponent,
-    VideoWatchPlaylistComponent,
-    VideoRateComponent,
-    VideoDescriptionComponent,
-    PrivacyConcernsComponent,
-    ActionButtonsComponent,
-    VideoAlertComponent,
-    VideoAttributesComponent,
-
-    VideoCommentsComponent,
-    VideoCommentAddComponent,
-    VideoCommentComponent,
-    VideoAvatarChannelComponent,
-
-    VideoAvatarChannelComponent,
-
-    TimestampRouteTransformerDirective,
-
-    PlayerStylesComponent
-  ],
-
-  exports: [
-    VideoWatchComponent,
-
-    TimestampRouteTransformerDirective
-  ],
-
-  providers: [
-    VideoCommentService
-  ]
-})
-export class VideoWatchModule { }
diff --git a/client/src/app/+videos/index.ts b/client/src/app/+videos/index.ts
deleted file mode 100644
index 028a5854b..000000000
--- a/client/src/app/+videos/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './videos.module'
diff --git a/client/src/app/+videos/videos-routing.module.ts b/client/src/app/+videos/routes.ts
similarity index 73%
rename from client/src/app/+videos/videos-routing.module.ts
rename to client/src/app/+videos/routes.ts
index 8c777fbb6..480f5dcef 100644
--- a/client/src/app/+videos/videos-routing.module.ts
+++ b/client/src/app/+videos/routes.ts
@@ -1,13 +1,22 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes, UrlSegment } from '@angular/router'
+import { UrlSegment } from '@angular/router'
 import { LoginGuard } from '@app/core'
-import { VideosListCommonPageComponent } from './video-list'
+import { OverviewService, VideosListCommonPageComponent } from './video-list'
 import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
 import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component'
+import { UserSubscriptionService } from '@app/shared/shared-user-subscription'
+import { BlocklistService, VideoBlockService } from '@app/shared/shared-moderation'
+import { VideoPlaylistService } from '@app/shared/shared-video-playlist'
 
-const videosRoutes: Routes = [
+export default [
   {
     path: '',
+    providers: [
+      OverviewService,
+      UserSubscriptionService,
+      VideoPlaylistService,
+      BlocklistService,
+      VideoBlockService
+    ],
     children: [
       {
         path: 'overview',
@@ -64,9 +73,3 @@ const videosRoutes: Routes = [
     ]
   }
 ]
-
-@NgModule({
-  imports: [ RouterModule.forChild(videosRoutes) ],
-  exports: [ RouterModule ]
-})
-export class VideosRoutingModule {}
diff --git a/client/src/app/+videos/video-list/overview/video-overview.component.ts b/client/src/app/+videos/video-list/overview/video-overview.component.ts
index c7720ad5c..384b70350 100644
--- a/client/src/app/+videos/video-list/overview/video-overview.component.ts
+++ b/client/src/app/+videos/video-list/overview/video-overview.component.ts
@@ -4,11 +4,18 @@ import { Notifier, ScreenService, User, UserService } from '@app/core'
 import { Video } from '@app/shared/shared-main'
 import { OverviewService } from './overview.service'
 import { VideosOverview } from './videos-overview.model'
+import { ActorAvatarComponent } from '../../../shared/shared-actor-image/actor-avatar.component'
+import { VideoMiniatureComponent } from '../../../shared/shared-video-miniature/video-miniature.component'
+import { RouterLink } from '@angular/router'
+import { InfiniteScrollerDirective } from '../../../shared/shared-main/angular/infinite-scroller.directive'
+import { NgIf, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-video-overview',
   templateUrl: './video-overview.component.html',
-  styleUrls: [ './video-overview.component.scss' ]
+  styleUrls: [ './video-overview.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, InfiniteScrollerDirective, NgFor, RouterLink, VideoMiniatureComponent, ActorAvatarComponent ]
 })
 export class VideoOverviewComponent implements OnInit, OnDestroy {
   onDataSubject = new Subject<any>()
diff --git a/client/src/app/+videos/video-list/video-user-subscriptions.component.ts b/client/src/app/+videos/video-list/video-user-subscriptions.component.ts
index ec1aa3f8b..60e064b68 100644
--- a/client/src/app/+videos/video-list/video-user-subscriptions.component.ts
+++ b/client/src/app/+videos/video-list/video-user-subscriptions.component.ts
@@ -7,10 +7,13 @@ import { VideoService } from '@app/shared/shared-main'
 import { UserSubscriptionService } from '@app/shared/shared-user-subscription'
 import { VideoFilters } from '@app/shared/shared-video-miniature'
 import { VideoSortField } from '@peertube/peertube-models'
+import { VideosListComponent } from '../../shared/shared-video-miniature/videos-list.component'
 
 @Component({
   selector: 'my-videos-user-subscriptions',
-  templateUrl: './video-user-subscriptions.component.html'
+  templateUrl: './video-user-subscriptions.component.html',
+  standalone: true,
+  imports: [ VideosListComponent ]
 })
 export class VideoUserSubscriptionsComponent implements DisableForReuseHook {
   getVideosObservableFunction = this.getVideosObservable.bind(this)
diff --git a/client/src/app/+videos/video-list/videos-list-common-page.component.ts b/client/src/app/+videos/video-list/videos-list-common-page.component.ts
index b4aded512..9fbfbae8e 100644
--- a/client/src/app/+videos/video-list/videos-list-common-page.component.ts
+++ b/client/src/app/+videos/video-list/videos-list-common-page.component.ts
@@ -6,6 +6,7 @@ import { VideoService } from '@app/shared/shared-main'
 import { VideoFilters, VideoFilterScope } from '@app/shared/shared-video-miniature/video-filters.model'
 import { ClientFilterHookName, VideoSortField } from '@peertube/peertube-models'
 import { Subscription } from 'rxjs'
+import { VideosListComponent } from '../../shared/shared-video-miniature/videos-list.component'
 
 export type VideosListCommonPageRouteData = {
   sort: VideoSortField
@@ -16,7 +17,9 @@ export type VideosListCommonPageRouteData = {
 }
 
 @Component({
-  templateUrl: './videos-list-common-page.component.html'
+  templateUrl: './videos-list-common-page.component.html',
+  standalone: true,
+  imports: [ VideosListComponent ]
 })
 export class VideosListCommonPageComponent implements OnInit, OnDestroy, DisableForReuseHook {
   getVideosObservableFunction = this.getVideosObservable.bind(this)
diff --git a/client/src/app/+videos/videos.module.ts b/client/src/app/+videos/videos.module.ts
deleted file mode 100644
index f06f4be2b..000000000
--- a/client/src/app/+videos/videos.module.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedActorImageModule } from '@app/shared/shared-actor-image/shared-actor-image.module'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
-import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
-import { OverviewService, VideosListCommonPageComponent } from './video-list'
-import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
-import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component'
-import { VideosRoutingModule } from './videos-routing.module'
-
-@NgModule({
-  imports: [
-    VideosRoutingModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedVideoMiniatureModule,
-    SharedUserSubscriptionModule,
-    SharedGlobalIconModule,
-    SharedActorImageModule
-  ],
-
-  declarations: [
-    VideoUserSubscriptionsComponent,
-    VideoOverviewComponent,
-    VideosListCommonPageComponent
-  ],
-
-  exports: [],
-
-  providers: [
-    OverviewService
-  ]
-})
-export class VideosModule { }
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index d38e9eea1..bdea095fb 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,9 +1,9 @@
 import { delay, forkJoin } from 'rxjs'
 import { filter, first, map } from 'rxjs/operators'
-import { DOCUMENT, getLocaleDirection, PlatformLocation } from '@angular/common'
+import { DOCUMENT, getLocaleDirection, PlatformLocation, NgIf, NgClass } from '@angular/common'
 import { AfterViewInit, Component, Inject, LOCALE_ID, OnInit, ViewChild } from '@angular/core'
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
-import { Event, GuardsCheckStart, RouteConfigLoadEnd, RouteConfigLoadStart, Router } from '@angular/router'
+import { Event, GuardsCheckStart, RouteConfigLoadEnd, RouteConfigLoadStart, Router, RouterLink, RouterOutlet } from '@angular/router'
 import {
   AuthService,
   MarkdownService,
@@ -25,7 +25,7 @@ import { AdminWelcomeModalComponent } from '@app/modal/admin-welcome-modal.compo
 import { CustomModalComponent } from '@app/modal/custom-modal.component'
 import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component'
 import { NgbConfig, NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { LoadingBarService } from '@ngx-loading-bar/core'
+import { LoadingBarService, LoadingBarModule } from '@ngx-loading-bar/core'
 import { getShortLocale } from '@peertube/peertube-core-utils'
 import { BroadcastMessageLevel, HTMLServerConfig, UserRole } from '@peertube/peertube-models'
 import { logger } from '@root-helpers/logger'
@@ -33,12 +33,38 @@ import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
 import { MenuService } from './core/menu/menu.service'
 import { POP_STATE_MODAL_DISMISS } from './helpers'
 import { GlobalIconName } from './shared/shared-icons'
-import { InstanceService } from './shared/shared-instance'
+import { SharedModule } from 'primeng/api'
+import { ToastModule } from 'primeng/toast'
+import { ConfirmComponent } from './modal/confirm.component'
+import { GlobalIconComponent } from './shared/shared-icons/global-icon.component'
+import { MenuComponent } from './menu/menu.component'
+import { HeaderComponent } from './header/header.component'
+import { HotkeysCheatSheetComponent } from './hotkeys/hotkeys-cheat-sheet.component'
+import { InstanceService } from './shared/shared-main'
 
 @Component({
   selector: 'my-app',
   templateUrl: './app.component.html',
-  styleUrls: [ './app.component.scss' ]
+  styleUrls: [ './app.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    HotkeysCheatSheetComponent,
+    NgClass,
+    RouterLink,
+    HeaderComponent,
+    MenuComponent,
+    GlobalIconComponent,
+    RouterOutlet,
+    LoadingBarModule,
+    ConfirmComponent,
+    ToastModule,
+    SharedModule,
+    AccountSetupWarningModalComponent,
+    AdminWelcomeModalComponent,
+    InstanceConfigWarningModalComponent,
+    CustomModalComponent
+  ]
 })
 export class AppComponent implements OnInit, AfterViewInit {
   private static BROADCAST_MESSAGE_KEY = 'app-broadcast-message-dismissed'
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
deleted file mode 100644
index d235a58ac..000000000
--- a/client/src/app/app.module.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import 'focus-visible'
-import { tap } from 'rxjs/operators'
-import { environment } from 'src/environments/environment'
-import { APP_BASE_HREF, registerLocaleData } from '@angular/common'
-import { APP_INITIALIZER, NgModule } from '@angular/core'
-import { BrowserModule } from '@angular/platform-browser'
-import { ServiceWorkerModule } from '@angular/service-worker'
-import localeOc from '@app/helpers/locales/oc'
-import { AppRoutingModule } from './app-routing.module'
-import { AppComponent } from './app.component'
-import { CoreModule, PluginService, RedirectService, ServerService } from './core'
-import { EmptyComponent } from './empty.component'
-import { HeaderComponent, SearchTypeaheadComponent, SuggestionComponent } from './header'
-import { HighlightPipe } from './header/highlight.pipe'
-import { polyfillICU } from './helpers'
-import { MenuComponent } from './menu'
-import { ConfirmComponent } from './modal/confirm.component'
-import { CustomModalComponent } from './modal/custom-modal.component'
-import { SharedActorImageModule } from './shared/shared-actor-image/shared-actor-image.module'
-import { SharedFormModule } from './shared/shared-forms'
-import { SharedGlobalIconModule } from './shared/shared-icons'
-import { SharedInstanceModule } from './shared/shared-instance'
-import { SharedMainModule } from './shared/shared-main'
-import { SharedUserInterfaceSettingsModule } from './shared/shared-user-settings'
-import { HotkeysCheatSheetComponent } from './hotkeys'
-import { InstanceConfigWarningModalComponent } from './modal/instance-config-warning-modal.component'
-import { AdminWelcomeModalComponent } from './modal/admin-welcome-modal.component'
-import { AccountSetupWarningModalComponent } from './modal/account-setup-warning-modal.component'
-
-registerLocaleData(localeOc, 'oc')
-
-export function loadConfigFactory (server: ServerService, pluginService: PluginService, redirectService: RedirectService) {
-  const initializeServices = () => {
-    redirectService.init()
-    pluginService.initializePlugins()
-  }
-
-  return () => {
-    const result = server.loadHTMLConfig()
-    if (result) return result.pipe(tap(() => initializeServices()))
-
-    initializeServices()
-  }
-}
-
-@NgModule({
-  bootstrap: [ AppComponent ],
-
-  declarations: [
-    AppComponent,
-    EmptyComponent,
-
-    HeaderComponent,
-    SearchTypeaheadComponent,
-    SuggestionComponent,
-    HighlightPipe,
-
-    CustomModalComponent,
-    ConfirmComponent,
-
-    HotkeysCheatSheetComponent
-  ],
-
-  imports: [
-    BrowserModule,
-    ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
-
-    CoreModule,
-    SharedMainModule,
-    SharedFormModule,
-    SharedUserInterfaceSettingsModule,
-    SharedGlobalIconModule,
-    SharedInstanceModule,
-    SharedActorImageModule,
-
-    MenuComponent,
-
-    InstanceConfigWarningModalComponent,
-    AdminWelcomeModalComponent,
-    AccountSetupWarningModalComponent,
-
-    AppRoutingModule // Put it after all the module because it has the 404 route
-  ],
-
-  providers: [
-    {
-      provide: APP_BASE_HREF,
-      useValue: '/'
-    },
-    {
-      provide: APP_INITIALIZER,
-      useFactory: loadConfigFactory,
-      deps: [ ServerService, PluginService, RedirectService ],
-      multi: true
-    },
-    {
-      provide: APP_INITIALIZER,
-      useFactory: () => polyfillICU,
-      multi: true
-    }
-  ]
-})
-export class AppModule {}
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app.routes.ts
similarity index 51%
rename from client/src/app/app-routing.module.ts
rename to client/src/app/app.routes.ts
index 6c285fe30..4b0396947 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app.routes.ts
@@ -1,10 +1,9 @@
-import { NgModule } from '@angular/core'
-import { RouteReuseStrategy, RouterModule, Routes, UrlMatchResult, UrlSegment } from '@angular/router'
-import { CustomReuseStrategy } from '@app/core/routing/custom-reuse-strategy'
+import { Routes, UrlMatchResult, UrlSegment } from '@angular/router'
 import { MenuGuards } from '@app/core/routing/menu-guard.service'
 import { POSSIBLE_LOCALES } from '@peertube/peertube-core-utils'
-import { HomepageRedirectComponent, MetaGuard, PreloadSelectedModulesList } from './core'
+import { MetaGuard } from './core'
 import { EmptyComponent } from './empty.component'
+import { HomepageRedirectComponent } from './homepage-redirect.component'
 import { USER_USERNAME_REGEX_CHARACTERS } from './shared/form-validators/user-validators'
 import { ActorRedirectGuard } from './shared/shared-main'
 
@@ -13,27 +12,27 @@ const routes: Routes = [
     path: 'admin',
     canActivate: [ MenuGuards.close() ],
     canDeactivate: [ MenuGuards.open() ],
-    loadChildren: () => import('./+admin/admin.module').then(m => m.AdminModule),
+    loadChildren: () => import('./+admin/routes'),
     canActivateChild: [ MetaGuard ]
   },
   {
     path: 'home',
-    loadChildren: () => import('./+home/home.module').then(m => m.HomeModule),
+    loadChildren: () => import('./+home/routes'),
     canActivateChild: [ MetaGuard ]
   },
   {
     path: 'my-account',
-    loadChildren: () => import('./+my-account/my-account.module').then(m => m.MyAccountModule),
+    loadChildren: () => import('./+my-account/routes'),
     canActivateChild: [ MetaGuard ]
   },
   {
     path: 'my-library',
-    loadChildren: () => import('./+my-library/my-library.module').then(m => m.MyLibraryModule),
+    loadChildren: () => import('./+my-library/routes'),
     canActivateChild: [ MetaGuard ]
   },
   {
     path: 'verify-account',
-    loadChildren: () => import('./+signup/+verify-account/verify-account.module').then(m => m.VerifyAccountModule),
+    loadChildren: () => import('./+signup/+verify-account/routes'),
     canActivateChild: [ MetaGuard ]
   },
 
@@ -43,7 +42,7 @@ const routes: Routes = [
   },
   {
     path: 'a',
-    loadChildren: () => import('./+accounts/accounts.module').then(m => m.AccountsModule),
+    loadChildren: () => import('./+accounts/routes'),
     canActivateChild: [ MetaGuard ]
   },
 
@@ -53,49 +52,49 @@ const routes: Routes = [
   },
   {
     path: 'c',
-    loadChildren: () => import('./+video-channels/video-channels.module').then(m => m.VideoChannelsModule),
+    loadChildren: () => import('./+video-channels/routes'),
     canActivateChild: [ MetaGuard ]
   },
   {
     path: 'manage',
-    loadChildren: () => import('./+manage/manage.module').then(m => m.ManageModule),
+    loadChildren: () => import('./+manage/routes'),
     canActivateChild: [ MetaGuard ]
   },
   {
     path: 'p',
-    loadChildren: () => import('./+plugin-pages/plugin-pages.module').then(m => m.PluginPagesModule),
+    loadChildren: () => import('./+plugin-pages/routes'),
     canActivateChild: [ MetaGuard ]
   },
 
   {
     path: 'about',
-    loadChildren: () => import('./+about/about.module').then(m => m.AboutModule),
+    loadChildren: () => import('./+about/routes'),
     canActivateChild: [ MetaGuard ]
   },
   {
     path: 'signup',
-    loadChildren: () => import('./+signup/+register/register.module').then(m => m.RegisterModule),
+    loadChildren: () => import('./+signup/+register/routes'),
     canActivateChild: [ MetaGuard ]
   },
   {
     path: 'reset-password',
-    loadChildren: () => import('./+reset-password/reset-password.module').then(m => m.ResetPasswordModule),
+    loadChildren: () => import('./+reset-password/routes'),
     canActivateChild: [ MetaGuard ]
   },
   {
     path: 'login',
-    loadChildren: () => import('./+login/login.module').then(m => m.LoginModule),
+    loadChildren: () => import('./+login/routes'),
     canActivateChild: [ MetaGuard ]
   },
   {
     path: 'search',
-    loadChildren: () => import('./+search/search.module').then(m => m.SearchModule),
+    loadChildren: () => import('./+search/routes'),
     canActivateChild: [ MetaGuard ]
   },
 
   {
     path: 'videos/upload',
-    loadChildren: () => import('@app/+videos/+video-edit/video-add.module').then(m => m.VideoAddModule),
+    loadChildren: () => import('@app/+videos/+video-edit/add-routes'),
     canActivateChild: [ MetaGuard ],
     data: {
       meta: {
@@ -105,7 +104,7 @@ const routes: Routes = [
   },
   {
     path: 'videos/update/:uuid',
-    loadChildren: () => import('@app/+videos/+video-edit/video-update.module').then(m => m.VideoUpdateModule),
+    loadChildren: () => import('@app/+videos/+video-edit/update-routes'),
     canActivateChild: [ MetaGuard ],
     data: {
       meta: {
@@ -124,14 +123,14 @@ const routes: Routes = [
   },
   {
     path: 'w',
-    loadChildren: () => import('@app/+videos/+video-watch/video-watch.module').then(m => m.VideoWatchModule),
+    loadChildren: () => import('@app/+videos/+video-watch/routes'),
     data: {
       preload: 5000
     }
   },
   {
     path: 'videos',
-    loadChildren: () => import('./+videos/videos.module').then(m => m.VideosModule),
+    loadChildren: () => import('./+videos/routes'),
     canActivateChild: [ MetaGuard ]
   },
   {
@@ -141,19 +140,19 @@ const routes: Routes = [
 
   {
     path: 'remote-interaction',
-    loadChildren: () => import('./+remote-interaction/remote-interaction.module').then(m => m.RemoteInteractionModule),
+    loadChildren: () => import('./+remote-interaction/routes'),
     canActivateChild: [ MetaGuard ]
   },
 
   {
     path: 'studio',
-    loadChildren: () => import('./+video-studio/video-studio.module').then(m => m.VideoStudioModule),
+    loadChildren: () => import('./+video-studio/routes'),
     canActivateChild: [ MetaGuard ]
   },
 
   {
     path: 'stats',
-    loadChildren: () => import('./+stats/stats.module').then(m => m.StatsModule),
+    loadChildren: () => import('./+stats/routes'),
     canActivateChild: [ MetaGuard ]
   },
 
@@ -194,24 +193,7 @@ for (const locale of POSSIBLE_LOCALES) {
 
 routes.push({
   path: '**',
-  loadChildren: () => import('./+error-page/error-page.module').then(m => m.ErrorPageModule)
+  loadChildren: () => import('./+error-page/routes')
 })
 
-@NgModule({
-  imports: [
-    RouterModule.forRoot(routes, {
-      useHash: false,
-      // Redefined in app component
-      scrollPositionRestoration: 'disabled',
-      preloadingStrategy: PreloadSelectedModulesList,
-      anchorScrolling: 'disabled'
-    })
-  ],
-  providers: [
-    MenuGuards.guards,
-    PreloadSelectedModulesList,
-    { provide: RouteReuseStrategy, useClass: CustomReuseStrategy }
-  ],
-  exports: [ RouterModule ]
-})
-export class AppRoutingModule {}
+export default routes
diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core-providers.ts
similarity index 71%
rename from client/src/app/core/core.module.ts
rename to client/src/app/core/core-providers.ts
index c66dd5b57..6fe7d0e77 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core-providers.ts
@@ -1,19 +1,13 @@
 import { MessageService } from 'primeng/api'
-import { ToastModule } from 'primeng/toast'
-import { CommonModule } from '@angular/common'
-import { NgModule, Optional, SkipSelf } from '@angular/core'
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 import { PeerTubeSocket } from '@app/core/notification/peertube-socket.service'
 import { HooksService, PluginService } from '@app/core/plugins'
 import { AuthService } from './auth'
 import { ConfirmService } from './confirm'
 import { MenuService } from './menu'
-import { throwIfAlreadyLoaded } from './module-import-guard'
 import { Notifier } from './notification'
 import { HtmlRendererService, LinkifierService, MarkdownService } from './renderer'
 import { RestExtractor, RestService } from './rest'
 import {
-  HomepageRedirectComponent,
   LoginGuard,
   MetaGuard,
   MetaService,
@@ -32,25 +26,8 @@ import { UserLocalStorageService, UserService } from './users'
 import { LocalStorageService, ScreenService, SessionStorageService } from './wrappers'
 import { HotkeysService } from './hotkeys'
 
-@NgModule({
-  imports: [
-    CommonModule,
-    BrowserAnimationsModule,
-
-    ToastModule
-  ],
-
-  declarations: [
-    HomepageRedirectComponent
-  ],
-
-  exports: [
-    ToastModule,
-
-    HomepageRedirectComponent
-  ],
-
-  providers: [
+export function getCoreProviders () {
+  return [
     AuthService,
     ScopedTokensService,
     ConfirmService,
@@ -60,24 +37,18 @@ import { HotkeysService } from './hotkeys'
     LoginGuard,
     UserRightGuard,
     UnloggedGuard,
-
     PluginService,
     HooksService,
-
     HtmlRendererService,
     LinkifierService,
     MarkdownService,
-
     RestExtractor,
     RestService,
-
     UserService,
     UserLocalStorageService,
-
     ScreenService,
     LocalStorageService,
     SessionStorageService,
-
     RedirectService,
     Notifier,
     MessageService,
@@ -86,15 +57,8 @@ import { HotkeysService } from './hotkeys'
     CanDeactivateGuard,
     PeerTubeRouterService,
     ScrollService,
-
     MetaService,
     MetaGuard,
-
     HotkeysService
   ]
-})
-export class CoreModule {
-  constructor (@Optional() @SkipSelf() parentModule: CoreModule) {
-    throwIfAlreadyLoaded(parentModule, 'CoreModule')
-  }
 }
diff --git a/client/src/app/core/index.ts b/client/src/app/core/index.ts
index 9245ff6fc..826582d66 100644
--- a/client/src/app/core/index.ts
+++ b/client/src/app/core/index.ts
@@ -13,4 +13,4 @@ export * from './theme'
 export * from './users'
 export * from './wrappers'
 
-export * from './core.module'
+export * from './core-providers'
diff --git a/client/src/app/core/module-import-guard.ts b/client/src/app/core/module-import-guard.ts
deleted file mode 100644
index 32b1d8f19..000000000
--- a/client/src/app/core/module-import-guard.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export function throwIfAlreadyLoaded (parentModule: any, moduleName: string) {
-  if (parentModule) {
-    throw new Error(`${moduleName} has already been loaded. Import Core modules in the AppModule only.`)
-  }
-}
diff --git a/client/src/app/core/routing/index.ts b/client/src/app/core/routing/index.ts
index 3b1690ecc..7443d5c78 100644
--- a/client/src/app/core/routing/index.ts
+++ b/client/src/app/core/routing/index.ts
@@ -1,7 +1,6 @@
 export * from './can-deactivate-guard.service'
 export * from './custom-reuse-strategy'
 export * from './disable-for-reuse-hook'
-export * from './homepage-redirect.component'
 export * from './login-guard.service'
 export * from './menu-guard.service'
 export * from './meta-guard.service'
diff --git a/client/src/app/empty.component.ts b/client/src/app/empty.component.ts
index c38ac8f2a..7e4e1bf17 100644
--- a/client/src/app/empty.component.ts
+++ b/client/src/app/empty.component.ts
@@ -2,7 +2,8 @@ import { Component } from '@angular/core'
 
 @Component({
   selector: 'my-empty',
-  template: ''
+  template: '',
+  standalone: true
 })
 export class EmptyComponent {
 
diff --git a/client/src/app/header/header.component.ts b/client/src/app/header/header.component.ts
index cce76b0d1..4a6bc71ca 100644
--- a/client/src/app/header/header.component.ts
+++ b/client/src/app/header/header.component.ts
@@ -1,9 +1,14 @@
 import { Component } from '@angular/core'
+import { GlobalIconComponent } from '../shared/shared-icons/global-icon.component'
+import { RouterLink } from '@angular/router'
+import { SearchTypeaheadComponent } from './search-typeahead.component'
 
 @Component({
   selector: 'my-header',
   templateUrl: './header.component.html',
-  styleUrls: [ './header.component.scss' ]
+  styleUrls: [ './header.component.scss' ],
+  standalone: true,
+  imports: [ SearchTypeaheadComponent, RouterLink, GlobalIconComponent ]
 })
 
 export class HeaderComponent {}
diff --git a/client/src/app/header/highlight.pipe.ts b/client/src/app/header/highlight.pipe.ts
index 50ee5c1bd..f1af8a470 100644
--- a/client/src/app/header/highlight.pipe.ts
+++ b/client/src/app/header/highlight.pipe.ts
@@ -2,7 +2,10 @@ import { PipeTransform, Pipe } from '@angular/core'
 import { SafeHtml } from '@angular/platform-browser'
 
 // Thanks https://gist.github.com/adamrecsko/0f28f474eca63e0279455476cc11eca7#gistcomment-2917369
-@Pipe({ name: 'highlight' })
+@Pipe({
+  name: 'highlight',
+  standalone: true
+})
 export class HighlightPipe implements PipeTransform {
   /* use this for single match search */
   static SINGLE_MATCH = 'Single-Match'
diff --git a/client/src/app/header/search-typeahead.component.ts b/client/src/app/header/search-typeahead.component.ts
index a3a04041f..2dca39ec1 100644
--- a/client/src/app/header/search-typeahead.component.ts
+++ b/client/src/app/header/search-typeahead.component.ts
@@ -7,11 +7,16 @@ import { AuthService, ServerService } from '@app/core'
 import { logger } from '@root-helpers/logger'
 import { HTMLServerConfig, SearchTargetType } from '@peertube/peertube-models'
 import { SuggestionComponent, SuggestionPayload, SuggestionPayloadType } from './suggestion.component'
+import { NgFor, NgIf, NgClass } from '@angular/common'
+import { GlobalIconComponent } from '../shared/shared-icons/global-icon.component'
+import { FormsModule } from '@angular/forms'
 
 @Component({
   selector: 'my-search-typeahead',
   templateUrl: './search-typeahead.component.html',
-  styleUrls: [ './search-typeahead.component.scss' ]
+  styleUrls: [ './search-typeahead.component.scss' ],
+  standalone: true,
+  imports: [ FormsModule, GlobalIconComponent, NgFor, SuggestionComponent, NgIf, NgClass ]
 })
 export class SearchTypeaheadComponent implements OnInit, AfterViewChecked, OnDestroy {
   @ViewChildren(SuggestionComponent) suggestionItems: QueryList<SuggestionComponent>
diff --git a/client/src/app/header/suggestion.component.ts b/client/src/app/header/suggestion.component.ts
index c874212a5..235dd44da 100644
--- a/client/src/app/header/suggestion.component.ts
+++ b/client/src/app/header/suggestion.component.ts
@@ -1,6 +1,9 @@
 import { ListKeyManagerOption } from '@angular/cdk/a11y'
 import { Component, Input, OnInit } from '@angular/core'
 import { RouterLink } from '@angular/router'
+import { HighlightPipe } from './highlight.pipe'
+import { NgIf } from '@angular/common'
+import { GlobalIconComponent } from '../shared/shared-icons/global-icon.component'
 
 export type SuggestionPayload = {
   text: string
@@ -14,7 +17,9 @@ export type SuggestionPayloadType = 'search-instance' | 'search-index'
 @Component({
   selector: 'my-suggestion',
   templateUrl: './suggestion.component.html',
-  styleUrls: [ './suggestion.component.scss' ]
+  styleUrls: [ './suggestion.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent, NgIf, HighlightPipe ]
 })
 export class SuggestionComponent implements OnInit, ListKeyManagerOption {
   @Input() result: SuggestionPayload
diff --git a/client/src/app/core/routing/homepage-redirect.component.ts b/client/src/app/homepage-redirect.component.ts
similarity index 88%
rename from client/src/app/core/routing/homepage-redirect.component.ts
rename to client/src/app/homepage-redirect.component.ts
index e9be832e0..76c7e222b 100644
--- a/client/src/app/core/routing/homepage-redirect.component.ts
+++ b/client/src/app/homepage-redirect.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { is18nPath } from '@peertube/peertube-core-utils'
-import { RedirectService } from './redirect.service'
+import { RedirectService } from './core/routing/redirect.service'
 
 /*
  * We have to use a component instead of an homepage because of a weird issue when using router.navigate in guard
@@ -11,7 +11,8 @@ import { RedirectService } from './redirect.service'
 */
 
 @Component({
-  template: ''
+  template: '',
+  standalone: true
 })
 export class HomepageRedirectComponent implements OnInit {
 
diff --git a/client/src/app/hotkeys/hotkeys-cheat-sheet.component.ts b/client/src/app/hotkeys/hotkeys-cheat-sheet.component.ts
index 68e6460bb..849c9f656 100644
--- a/client/src/app/hotkeys/hotkeys-cheat-sheet.component.ts
+++ b/client/src/app/hotkeys/hotkeys-cheat-sheet.component.ts
@@ -1,11 +1,16 @@
 import { Subscription } from 'rxjs'
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'
 import { LocalStorageService, HotkeysService, Hotkey } from '@app/core'
+import { FormsModule } from '@angular/forms'
+import { PeertubeCheckboxComponent } from '../shared/shared-forms/peertube-checkbox.component'
+import { NgClass, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-hotkeys-cheat-sheet',
   templateUrl: './hotkeys-cheat-sheet.component.html',
-  styleUrls: [ './hotkeys-cheat-sheet.component.scss' ]
+  styleUrls: [ './hotkeys-cheat-sheet.component.scss' ],
+  standalone: true,
+  imports: [ NgClass, PeertubeCheckboxComponent, FormsModule, NgFor ]
 })
 export class HotkeysCheatSheetComponent implements OnInit, OnDestroy {
   @Input() title = $localize`Keyboard Shortcuts`
diff --git a/client/src/app/index.ts b/client/src/app/index.ts
deleted file mode 100644
index d45dbeff6..000000000
--- a/client/src/app/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './app.module'
diff --git a/client/src/app/menu/language-chooser.component.ts b/client/src/app/menu/language-chooser.component.ts
index b636ba76e..591259841 100644
--- a/client/src/app/menu/language-chooser.component.ts
+++ b/client/src/app/menu/language-chooser.component.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common'
 import { Component, ElementRef, Inject, LOCALE_ID, ViewChild } from '@angular/core'
 import { getDevLocale, isOnDevLocale } from '@app/helpers'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
+import { GlobalIconComponent } from '@app/shared/shared-icons'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { getCompleteLocale, getShortLocale, I18N_LOCALES, objectKeysTyped, sortBy } from '@peertube/peertube-core-utils'
 
@@ -10,7 +10,7 @@ import { getCompleteLocale, getShortLocale, I18N_LOCALES, objectKeysTyped, sortB
   templateUrl: './language-chooser.component.html',
   styleUrls: [ './language-chooser.component.scss' ],
   standalone: true,
-  imports: [ CommonModule, SharedGlobalIconModule ]
+  imports: [ CommonModule, GlobalIconComponent ]
 })
 export class LanguageChooserComponent {
   @ViewChild('modal', { static: true }) modal: ElementRef
diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts
index 507125411..415624d9e 100644
--- a/client/src/app/menu/menu.component.ts
+++ b/client/src/app/menu/menu.component.ts
@@ -3,7 +3,7 @@ import { forkJoin, Subscription } from 'rxjs'
 import { first, switchMap } from 'rxjs/operators'
 import { CommonModule, ViewportScroller } from '@angular/common'
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'
-import { Router } from '@angular/router'
+import { Router, RouterLink } from '@angular/router'
 import {
   AuthService,
   AuthStatus,
@@ -19,16 +19,15 @@ import {
 } from '@app/core'
 import { scrollToTop } from '@app/helpers'
 import { PeertubeModalService } from '@app/shared/shared-main/peertube-modal/peertube-modal.service'
-import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
+import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { HTMLServerConfig, ServerConfig, UserRight, UserRightType, VideoConstant } from '@peertube/peertube-models'
 import { NotificationComponent } from './notification.component'
-import { SharedMainModule } from '@app/shared/shared-main'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
-import { SharedUserInterfaceSettingsModule } from '@app/shared/shared-user-settings'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedActorImageModule } from '@app/shared/shared-actor-image/shared-actor-image.module'
 import { LanguageChooserComponent } from './language-chooser.component'
 import { QuickSettingsModalComponent } from './quick-settings-modal.component'
+import { GlobalIconComponent } from '@app/shared/shared-icons'
+import { ActorAvatarComponent } from '@app/shared/shared-actor-image/actor-avatar.component'
+import { InputSwitchComponent } from '@app/shared/shared-forms'
+import { LoginLinkComponent, SignupLabelComponent } from '@app/shared/shared-main'
 
 const debugLogger = debug('peertube:menu:MenuComponent')
 
@@ -39,14 +38,16 @@ const debugLogger = debug('peertube:menu:MenuComponent')
   standalone: true,
   imports: [
     CommonModule,
-    SharedActorImageModule,
     NotificationComponent,
-    SharedMainModule,
-    SharedGlobalIconModule,
-    SharedUserInterfaceSettingsModule,
-    SharedFormModule,
+    ActorAvatarComponent,
+    InputSwitchComponent,
+    SignupLabelComponent,
+    LoginLinkComponent,
     LanguageChooserComponent,
-    QuickSettingsModalComponent
+    QuickSettingsModalComponent,
+    GlobalIconComponent,
+    RouterLink,
+    NgbDropdownModule
   ]
 })
 export class MenuComponent implements OnInit, OnDestroy {
diff --git a/client/src/app/menu/notification.component.ts b/client/src/app/menu/notification.component.ts
index 9c2bcd6c4..105369f9e 100644
--- a/client/src/app/menu/notification.component.ts
+++ b/client/src/app/menu/notification.component.ts
@@ -3,17 +3,18 @@ import { filter } from 'rxjs/operators'
 import { Component, EventEmitter, Output, OnDestroy, OnInit, ViewChild } from '@angular/core'
 import { NavigationEnd, Router } from '@angular/router'
 import { Notifier, PeerTubeSocket, ScreenService } from '@app/core'
-import { SharedMainModule, UserNotificationService } from '@app/shared/shared-main'
-import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
+import { LoaderComponent, UserNotificationService } from '@app/shared/shared-main'
+import { NgbPopover, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
 import { UserNotificationsComponent } from '@app/shared/standalone-notifications/user-notifications.component'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
+import { GlobalIconComponent } from '@app/shared/shared-icons'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'my-notification',
   templateUrl: './notification.component.html',
   styleUrls: [ './notification.component.scss' ],
   standalone: true,
-  imports: [ UserNotificationsComponent, SharedMainModule, SharedGlobalIconModule ]
+  imports: [ CommonModule, NgbPopoverModule, UserNotificationsComponent, GlobalIconComponent, LoaderComponent ]
 })
 export class NotificationComponent implements OnInit, OnDestroy {
   @ViewChild('popover', { static: true }) popover: NgbPopover
diff --git a/client/src/app/menu/quick-settings-modal.component.ts b/client/src/app/menu/quick-settings-modal.component.ts
index 0e4fb5612..8c65357af 100644
--- a/client/src/app/menu/quick-settings-modal.component.ts
+++ b/client/src/app/menu/quick-settings-modal.component.ts
@@ -5,15 +5,15 @@ import { ActivatedRoute, Router } from '@angular/router'
 import { AuthService, AuthStatus, LocalStorageService, User, UserService } from '@app/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
-import { SharedUserInterfaceSettingsModule } from '@app/shared/shared-user-settings'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
 import { CommonModule } from '@angular/common'
+import { GlobalIconComponent } from '@app/shared/shared-icons'
+import { UserInterfaceSettingsComponent, UserVideoSettingsComponent } from '@app/shared/shared-user-settings'
 
 @Component({
   selector: 'my-quick-settings',
   templateUrl: './quick-settings-modal.component.html',
   standalone: true,
-  imports: [ CommonModule, SharedGlobalIconModule, SharedUserInterfaceSettingsModule ]
+  imports: [ CommonModule, GlobalIconComponent, UserVideoSettingsComponent, UserInterfaceSettingsComponent ]
 })
 export class QuickSettingsModalComponent implements OnInit, OnDestroy {
   private static readonly QUERY_MODAL_NAME = 'quick-settings'
diff --git a/client/src/app/modal/account-setup-warning-modal.component.ts b/client/src/app/modal/account-setup-warning-modal.component.ts
index b7207ba3e..5792bf259 100644
--- a/client/src/app/modal/account-setup-warning-modal.component.ts
+++ b/client/src/app/modal/account-setup-warning-modal.component.ts
@@ -1,8 +1,9 @@
 import { CommonModule } from '@angular/common'
 import { Component, ElementRef, ViewChild } from '@angular/core'
+import { FormsModule } from '@angular/forms'
 import { Notifier, ServerService, User, UserService } from '@app/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
+import { PeertubeCheckboxComponent } from '@app/shared/shared-forms'
+import { GlobalIconComponent } from '@app/shared/shared-icons'
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
 import { logger } from '@root-helpers/logger'
 import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
@@ -12,7 +13,7 @@ import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
   templateUrl: './account-setup-warning-modal.component.html',
   styleUrls: [ './account-setup-warning-modal.component.scss' ],
   standalone: true,
-  imports: [ CommonModule, SharedGlobalIconModule, SharedFormModule ]
+  imports: [ CommonModule, GlobalIconComponent, PeertubeCheckboxComponent, FormsModule ]
 })
 export class AccountSetupWarningModalComponent {
   @ViewChild('modal', { static: true }) modal: ElementRef
diff --git a/client/src/app/modal/admin-welcome-modal.component.ts b/client/src/app/modal/admin-welcome-modal.component.ts
index 94def8396..1eeb76c14 100644
--- a/client/src/app/modal/admin-welcome-modal.component.ts
+++ b/client/src/app/modal/admin-welcome-modal.component.ts
@@ -1,6 +1,6 @@
 import { Component, ElementRef, ViewChild } from '@angular/core'
 import { Notifier, User, UserService } from '@app/core'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
+import { GlobalIconComponent } from '@app/shared/shared-icons'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { logger } from '@root-helpers/logger'
 import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
@@ -10,7 +10,7 @@ import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
   templateUrl: './admin-welcome-modal.component.html',
   styleUrls: [ './admin-welcome-modal.component.scss' ],
   standalone: true,
-  imports: [ SharedGlobalIconModule ]
+  imports: [ GlobalIconComponent ]
 })
 export class AdminWelcomeModalComponent {
   @ViewChild('modal', { static: true }) modal: ElementRef
diff --git a/client/src/app/modal/confirm.component.ts b/client/src/app/modal/confirm.component.ts
index 43369befa..c99fd4151 100644
--- a/client/src/app/modal/confirm.component.ts
+++ b/client/src/app/modal/confirm.component.ts
@@ -4,11 +4,17 @@ import { ConfirmService } from '@app/core/confirm/confirm.service'
 import { POP_STATE_MODAL_DISMISS } from '@app/helpers'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
+import { InputTextComponent } from '../shared/shared-forms/input-text.component'
+import { FormsModule } from '@angular/forms'
+import { NgIf } from '@angular/common'
+import { GlobalIconComponent } from '../shared/shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-confirm',
   templateUrl: './confirm.component.html',
-  styleUrls: [ './confirm.component.scss' ]
+  styleUrls: [ './confirm.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent, NgIf, FormsModule, InputTextComponent ]
 })
 export class ConfirmComponent implements OnInit {
   @ViewChild('confirmModal', { static: true }) confirmModal: ElementRef
diff --git a/client/src/app/modal/custom-modal.component.ts b/client/src/app/modal/custom-modal.component.ts
index 49343ae71..0297c5f18 100644
--- a/client/src/app/modal/custom-modal.component.ts
+++ b/client/src/app/modal/custom-modal.component.ts
@@ -1,11 +1,15 @@
 import { Component, ElementRef, Input, ViewChild } from '@angular/core'
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
 import { logger } from '@root-helpers/logger'
+import { GlobalIconComponent } from '../shared/shared-icons/global-icon.component'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-custom-modal',
   templateUrl: './custom-modal.component.html',
-  styleUrls: [ './custom-modal.component.scss' ]
+  styleUrls: [ './custom-modal.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, GlobalIconComponent ]
 })
 export class CustomModalComponent {
   @ViewChild('modal', { static: true }) modal: ElementRef
diff --git a/client/src/app/modal/instance-config-warning-modal.component.ts b/client/src/app/modal/instance-config-warning-modal.component.ts
index c43cf2a2a..d86353d8e 100644
--- a/client/src/app/modal/instance-config-warning-modal.component.ts
+++ b/client/src/app/modal/instance-config-warning-modal.component.ts
@@ -1,8 +1,9 @@
 import { CommonModule, Location } from '@angular/common'
 import { Component, ElementRef, ViewChild } from '@angular/core'
+import { FormsModule } from '@angular/forms'
 import { Notifier, User, UserService } from '@app/core'
-import { SharedFormModule } from '@app/shared/shared-forms'
-import { SharedGlobalIconModule } from '@app/shared/shared-icons'
+import { PeertubeCheckboxComponent } from '@app/shared/shared-forms'
+import { GlobalIconComponent } from '@app/shared/shared-icons'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { About, ServerConfig } from '@peertube/peertube-models'
 import { logger } from '@root-helpers/logger'
@@ -13,7 +14,7 @@ import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
   templateUrl: './instance-config-warning-modal.component.html',
   styleUrls: [ './instance-config-warning-modal.component.scss' ],
   standalone: true,
-  imports: [ CommonModule, SharedGlobalIconModule, SharedFormModule ]
+  imports: [ CommonModule, FormsModule, GlobalIconComponent, PeertubeCheckboxComponent ]
 })
 export class InstanceConfigWarningModalComponent {
   @ViewChild('modal', { static: true }) modal: ElementRef
diff --git a/client/src/app/shared/shared-abuse-list/abuse-details.component.ts b/client/src/app/shared/shared-abuse-list/abuse-details.component.ts
index 357dc4522..c34655504 100644
--- a/client/src/app/shared/shared-abuse-list/abuse-details.component.ts
+++ b/client/src/app/shared/shared-abuse-list/abuse-details.component.ts
@@ -2,11 +2,18 @@ import { Component, Input, OnInit } from '@angular/core'
 import { durationToString } from '@app/helpers'
 import { AbusePredefinedReasonsString } from '@peertube/peertube-models'
 import { ProcessedAbuse } from './processed-abuse.model'
+import { EmbedComponent } from '../shared-main/video/embed.component'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { ActorAvatarComponent } from '../shared-actor-image/actor-avatar.component'
+import { RouterLink } from '@angular/router'
+import { NgIf, NgFor, DatePipe } from '@angular/common'
 
 @Component({
   selector: 'my-abuse-details',
   templateUrl: './abuse-details.component.html',
-  styleUrls: [ '../shared-moderation/moderation.scss', './abuse-details.component.scss' ]
+  styleUrls: [ '../shared-moderation/moderation.scss', './abuse-details.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, RouterLink, ActorAvatarComponent, GlobalIconComponent, NgFor, EmbedComponent, DatePipe ]
 })
 export class AbuseDetailsComponent implements OnInit {
   @Input() abuse: ProcessedAbuse
diff --git a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts
index 691859584..32ad2f590 100644
--- a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts
+++ b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts
@@ -1,5 +1,5 @@
 import * as debug from 'debug'
-import { SortMeta } from 'primeng/api'
+import { SortMeta, SharedModule } from 'primeng/api'
 import { Component, Input, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { ConfirmService, MarkdownService, Notifier, RestPagination, RestTable } from '@app/core'
@@ -12,13 +12,43 @@ import { AdvancedInputFilter } from '../shared-forms'
 import { AbuseMessageModalComponent } from './abuse-message-modal.component'
 import { ModerationCommentModalComponent } from './moderation-comment-modal.component'
 import { ProcessedAbuse } from './processed-abuse.model'
+import { AbuseDetailsComponent } from './abuse-details.component'
+import { AutoColspanDirective } from '../shared-main/angular/auto-colspan.directive'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { VideoCellComponent } from '../shared-tables/video-cell.component'
+import { ActorAvatarComponent } from '../shared-actor-image/actor-avatar.component'
+import { ActionDropdownComponent } from '../shared-main/buttons/action-dropdown.component'
+import { TableExpanderIconComponent } from '../shared-tables/table-expander-icon.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { NgIf, NgClass, DatePipe } from '@angular/common'
+import { AdvancedInputFilterComponent } from '../shared-forms/advanced-input-filter.component'
+import { TableModule } from 'primeng/table'
 
 const debugLogger = debug('peertube:moderation:AbuseListTableComponent')
 
 @Component({
   selector: 'my-abuse-list-table',
   templateUrl: './abuse-list-table.component.html',
-  styleUrls: [ '../shared-moderation/moderation.scss', './abuse-list-table.component.scss' ]
+  styleUrls: [ '../shared-moderation/moderation.scss', './abuse-list-table.component.scss' ],
+  standalone: true,
+  imports: [
+    TableModule,
+    SharedModule,
+    AdvancedInputFilterComponent,
+    NgIf,
+    NgbTooltip,
+    TableExpanderIconComponent,
+    ActionDropdownComponent,
+    NgClass,
+    ActorAvatarComponent,
+    VideoCellComponent,
+    GlobalIconComponent,
+    AutoColspanDirective,
+    AbuseDetailsComponent,
+    ModerationCommentModalComponent,
+    AbuseMessageModalComponent,
+    DatePipe
+  ]
 })
 export class AbuseListTableComponent extends RestTable implements OnInit {
   @Input() viewType: 'admin' | 'user'
diff --git a/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.ts b/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.ts
index 8d20166f6..aece19f6f 100644
--- a/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.ts
+++ b/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.ts
@@ -7,11 +7,16 @@ import { logger } from '@root-helpers/logger'
 import { AbuseMessage, UserAbuse } from '@peertube/peertube-models'
 import { ABUSE_MESSAGE_VALIDATOR } from '../form-validators/abuse-validators'
 import { AbuseService } from '../shared-moderation'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { NgIf, NgFor, NgClass, DatePipe } from '@angular/common'
 
 @Component({
   selector: 'my-abuse-message-modal',
   templateUrl: './abuse-message-modal.component.html',
-  styleUrls: [ './abuse-message-modal.component.scss' ]
+  styleUrls: [ './abuse-message-modal.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, GlobalIconComponent, NgFor, NgClass, FormsModule, ReactiveFormsModule, DatePipe ]
 })
 export class AbuseMessageModalComponent extends FormReactive implements OnInit {
   @ViewChild('modal', { static: true }) modal: NgbModal
diff --git a/client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.ts b/client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.ts
index e42939f96..0fb90d434 100644
--- a/client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.ts
+++ b/client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.ts
@@ -6,11 +6,16 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
 import { AdminAbuse } from '@peertube/peertube-models'
 import { ABUSE_MODERATION_COMMENT_VALIDATOR } from '../form-validators/abuse-validators'
+import { NgClass, NgIf } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-moderation-comment-modal',
   templateUrl: './moderation-comment-modal.component.html',
-  styleUrls: [ './moderation-comment-modal.component.scss' ]
+  styleUrls: [ './moderation-comment-modal.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent, FormsModule, ReactiveFormsModule, NgClass, NgIf ]
 })
 export class ModerationCommentModalComponent extends FormReactive implements OnInit {
   @ViewChild('modal', { static: true }) modal: NgbModal
diff --git a/client/src/app/shared/shared-abuse-list/shared-abuse-list.module.ts b/client/src/app/shared/shared-abuse-list/shared-abuse-list.module.ts
deleted file mode 100644
index 219b72028..000000000
--- a/client/src/app/shared/shared-abuse-list/shared-abuse-list.module.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { TableModule } from 'primeng/table'
-import { NgModule } from '@angular/core'
-import { SharedActorImageModule } from '../shared-actor-image/shared-actor-image.module'
-import { SharedFormModule } from '../shared-forms/shared-form.module'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { SharedModerationModule } from '../shared-moderation'
-import { SharedTablesModule } from '../shared-tables'
-import { SharedVideoCommentModule } from '../shared-video-comment'
-import { AbuseDetailsComponent } from './abuse-details.component'
-import { AbuseListTableComponent } from './abuse-list-table.component'
-import { AbuseMessageModalComponent } from './abuse-message-modal.component'
-import { ModerationCommentModalComponent } from './moderation-comment-modal.component'
-
-@NgModule({
-  imports: [
-    TableModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedModerationModule,
-    SharedGlobalIconModule,
-    SharedVideoCommentModule,
-    SharedActorImageModule,
-    SharedTablesModule
-  ],
-
-  declarations: [
-    AbuseDetailsComponent,
-    AbuseListTableComponent,
-    ModerationCommentModalComponent,
-    AbuseMessageModalComponent
-  ],
-
-  exports: [
-    AbuseDetailsComponent,
-    AbuseListTableComponent,
-    ModerationCommentModalComponent,
-    AbuseMessageModalComponent
-  ],
-
-  providers: [
-  ]
-})
-export class SharedAbuseListModule { }
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts
index 3403d6192..203cab087 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts
+++ b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts
@@ -2,8 +2,11 @@ import { Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output,
 import { Notifier, ServerService } from '@app/core'
 import { getBytes } from '@root-helpers/bytes'
 import { imageToDataURL } from '@root-helpers/images'
-import { ActorAvatarInput } from '../shared-actor-image/actor-avatar.component'
+import { ActorAvatarInput, ActorAvatarComponent } from '../shared-actor-image/actor-avatar.component'
 import { ActorImage } from '@peertube/peertube-models'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { NgbTooltip, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu } from '@ng-bootstrap/ng-bootstrap'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-actor-avatar-edit',
@@ -11,7 +14,9 @@ import { ActorImage } from '@peertube/peertube-models'
   styleUrls: [
     './actor-image-edit.scss',
     './actor-avatar-edit.component.scss'
-  ]
+  ],
+  standalone: true,
+  imports: [ NgIf, ActorAvatarComponent, NgbTooltip, GlobalIconComponent, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu ]
 })
 export class ActorAvatarEditComponent implements OnInit, OnChanges {
   @ViewChild('avatarfileInput') avatarfileInput: ElementRef<HTMLInputElement>
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
index c4993d94e..cca94cac3 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
+++ b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
@@ -1,9 +1,11 @@
 import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
 import { SafeResourceUrl } from '@angular/platform-browser'
 import { Notifier, ServerService } from '@app/core'
-import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
+import { NgbPopover, NgbTooltip, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu } from '@ng-bootstrap/ng-bootstrap'
 import { getBytes } from '@root-helpers/bytes'
 import { imageToDataURL } from '@root-helpers/images'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { NgIf, NgTemplateOutlet } from '@angular/common'
 
 @Component({
   selector: 'my-actor-banner-edit',
@@ -11,7 +13,9 @@ import { imageToDataURL } from '@root-helpers/images'
   styleUrls: [
     './actor-image-edit.scss',
     './actor-banner-edit.component.scss'
-  ]
+  ],
+  standalone: true,
+  imports: [ NgIf, NgbTooltip, NgTemplateOutlet, NgbDropdown, NgbDropdownToggle, GlobalIconComponent, NgbDropdownMenu ]
 })
 export class ActorBannerEditComponent implements OnInit {
   @ViewChild('bannerfileInput') bannerfileInput: ElementRef<HTMLInputElement>
diff --git a/client/src/app/shared/shared-actor-image-edit/shared-actor-image-edit.module.ts b/client/src/app/shared/shared-actor-image-edit/shared-actor-image-edit.module.ts
deleted file mode 100644
index de2e209b6..000000000
--- a/client/src/app/shared/shared-actor-image-edit/shared-actor-image-edit.module.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { NgModule } from '@angular/core'
-import { SharedActorImageModule } from '../shared-actor-image/shared-actor-image.module'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main'
-import { ActorAvatarEditComponent } from './actor-avatar-edit.component'
-import { ActorBannerEditComponent } from './actor-banner-edit.component'
-
-@NgModule({
-  imports: [
-    CommonModule,
-
-    SharedMainModule,
-    SharedActorImageModule,
-    SharedGlobalIconModule
-  ],
-
-  declarations: [
-    ActorAvatarEditComponent,
-    ActorBannerEditComponent
-  ],
-
-  exports: [
-    ActorAvatarEditComponent,
-    ActorBannerEditComponent
-  ],
-
-  providers: [ ]
-})
-export class SharedActorImageEditModule { }
diff --git a/client/src/app/shared/shared-actor-image/actor-avatar.component.ts b/client/src/app/shared/shared-actor-image/actor-avatar.component.ts
index 448414d27..666062431 100644
--- a/client/src/app/shared/shared-actor-image/actor-avatar.component.ts
+++ b/client/src/app/shared/shared-actor-image/actor-avatar.component.ts
@@ -2,6 +2,8 @@ import { Component, ElementRef, Input, OnChanges, OnInit, ViewChild, booleanAttr
 import { VideoChannel } from '../shared-main'
 import { Account } from '../shared-main/account/account.model'
 import { objectKeysTyped } from '@peertube/peertube-core-utils'
+import { RouterLink } from '@angular/router'
+import { NgIf, NgClass, NgTemplateOutlet } from '@angular/common'
 
 export type ActorAvatarInput = {
   name: string
@@ -11,7 +13,9 @@ export type ActorAvatarInput = {
 @Component({
   selector: 'my-actor-avatar',
   styleUrls: [ './actor-avatar.component.scss' ],
-  templateUrl: './actor-avatar.component.html'
+  templateUrl: './actor-avatar.component.html',
+  standalone: true,
+  imports: [ NgIf, NgClass, NgTemplateOutlet, RouterLink ]
 })
 export class ActorAvatarComponent implements OnInit, OnChanges {
   @ViewChild('avatarEl') avatarEl: ElementRef
diff --git a/client/src/app/shared/shared-actor-image/shared-actor-image.module.ts b/client/src/app/shared/shared-actor-image/shared-actor-image.module.ts
deleted file mode 100644
index dfa295baa..000000000
--- a/client/src/app/shared/shared-actor-image/shared-actor-image.module.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { ActorAvatarComponent } from './actor-avatar.component'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    SharedGlobalIconModule
-  ],
-
-  declarations: [
-    ActorAvatarComponent
-  ],
-
-  exports: [
-    ActorAvatarComponent
-  ],
-
-  providers: [ ]
-})
-export class SharedActorImageModule { }
diff --git a/client/src/app/shared/shared-custom-markup/custom-markup-container.component.ts b/client/src/app/shared/shared-custom-markup/custom-markup-container.component.ts
index b2ee2d8f2..a3726c00a 100644
--- a/client/src/app/shared/shared-custom-markup/custom-markup-container.component.ts
+++ b/client/src/app/shared/shared-custom-markup/custom-markup-container.component.ts
@@ -3,7 +3,8 @@ import { CustomMarkupService } from './custom-markup.service'
 
 @Component({
   selector: 'my-custom-markup-container',
-  templateUrl: './custom-markup-container.component.html'
+  templateUrl: './custom-markup-container.component.html',
+  standalone: true
 })
 export class CustomMarkupContainerComponent implements OnChanges {
   @ViewChild('contentWrapper', { static: true }) contentWrapper: ElementRef<HTMLInputElement>
diff --git a/client/src/app/shared/shared-custom-markup/custom-markup-help.component.ts b/client/src/app/shared/shared-custom-markup/custom-markup-help.component.ts
index 0a5a67794..62c2fddae 100644
--- a/client/src/app/shared/shared-custom-markup/custom-markup-help.component.ts
+++ b/client/src/app/shared/shared-custom-markup/custom-markup-help.component.ts
@@ -2,7 +2,8 @@ import { Component } from '@angular/core'
 
 @Component({
   selector: 'my-custom-markup-help',
-  templateUrl: './custom-markup-help.component.html'
+  templateUrl: './custom-markup-help.component.html',
+  standalone: true
 })
 export class CustomMarkupHelpComponent {
 }
diff --git a/client/src/app/shared/shared-custom-markup/index.ts b/client/src/app/shared/shared-custom-markup/index.ts
index 3bff3a914..172fce8e2 100644
--- a/client/src/app/shared/shared-custom-markup/index.ts
+++ b/client/src/app/shared/shared-custom-markup/index.ts
@@ -2,4 +2,3 @@ export * from './custom-markup.service'
 export * from './custom-markup-container.component'
 export * from './dynamic-element.service'
 export * from './custom-markup-help.component'
-export * from './shared-custom-markup.module'
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/button-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/button-markup.component.ts
index 264dd9577..56562cbce 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/button-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/button-markup.component.ts
@@ -1,6 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { VideoChannel } from '../../shared-main'
 import { CustomMarkupComponent } from './shared'
+import { NgClass } from '@angular/common'
 
 /*
  * Markup component that creates a button
@@ -10,7 +11,9 @@ import { CustomMarkupComponent } from './shared'
   selector: 'my-button-markup',
   templateUrl: 'button-markup.component.html',
   styleUrls: [ 'button-markup.component.scss' ],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [ NgClass ]
 })
 export class ButtonMarkupComponent implements CustomMarkupComponent {
   @Input() theme: 'primary' | 'secondary'
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts
index b731ccc64..902d7eca7 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts
@@ -6,6 +6,10 @@ import { FindInBulkService } from '@app/shared/shared-search'
 import { VideoSortField } from '@peertube/peertube-models'
 import { Video, VideoChannel, VideoService } from '../../shared-main'
 import { CustomMarkupComponent } from './shared'
+import { VideoMiniatureMarkupComponent } from './video-miniature-markup.component'
+import { RouterLink } from '@angular/router'
+import { ActorAvatarComponent } from '../../shared-actor-image/actor-avatar.component'
+import { NgIf } from '@angular/common'
 
 /*
  * Markup component that creates a channel miniature only
@@ -15,7 +19,9 @@ import { CustomMarkupComponent } from './shared'
   selector: 'my-channel-miniature-markup',
   templateUrl: 'channel-miniature-markup.component.html',
   styleUrls: [ 'channel-miniature-markup.component.scss' ],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [ NgIf, ActorAvatarComponent, RouterLink, VideoMiniatureMarkupComponent ]
 })
 export class ChannelMiniatureMarkupComponent implements CustomMarkupComponent, OnInit {
   @Input() name: string
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/embed-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/embed-markup.component.ts
index bca7444ec..8b46597d7 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/embed-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/embed-markup.component.ts
@@ -6,7 +6,8 @@ import { CustomMarkupComponent } from './shared'
 
 @Component({
   selector: 'my-embed-markup',
-  template: ''
+  template: '',
+  standalone: true
 })
 export class EmbedMarkupComponent implements CustomMarkupComponent, OnInit {
   @Input() uuid: string
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-avatar-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-avatar-markup.component.ts
index 3edd270cf..6fc3e268d 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-avatar-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-avatar-markup.component.ts
@@ -2,6 +2,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit }
 import { CustomMarkupComponent } from './shared'
 import { ActorAvatarInput } from '@app/shared/shared-actor-image/actor-avatar.component'
 import { ServerService } from '@app/core'
+import { ActorAvatarComponent } from '../../shared-actor-image/actor-avatar.component'
+import { NgIf } from '@angular/common'
 
 /*
  * Markup component that creates the img HTML element containing the instance avatar
@@ -10,7 +12,9 @@ import { ServerService } from '@app/core'
 @Component({
   selector: 'my-instance-avatar-markup',
   templateUrl: 'instance-avatar-markup.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [ NgIf, ActorAvatarComponent ]
 })
 export class InstanceAvatarMarkupComponent implements OnInit, CustomMarkupComponent {
   @Input() size: number
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-banner-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-banner-markup.component.ts
index cf99f4d77..bb7b62243 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-banner-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-banner-markup.component.ts
@@ -1,6 +1,7 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'
 import { CustomMarkupComponent } from './shared'
 import { ServerService } from '@app/core'
+import { NgIf, NgClass } from '@angular/common'
 
 /*
  * Markup component that creates the img HTML element containing the instance banner
@@ -9,7 +10,9 @@ import { ServerService } from '@app/core'
 @Component({
   selector: 'my-instance-banner-markup',
   templateUrl: 'instance-banner-markup.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [ NgIf, NgClass ]
 })
 export class InstanceBannerMarkupComponent implements OnInit, CustomMarkupComponent {
   @Input() revertHomePaddingTop: boolean
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/playlist-miniature-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/playlist-miniature-markup.component.ts
index d2cf1326e..f17bb1e74 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/playlist-miniature-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/playlist-miniature-markup.component.ts
@@ -5,6 +5,8 @@ import { FindInBulkService } from '@app/shared/shared-search'
 import { MiniatureDisplayOptions } from '../../shared-video-miniature'
 import { VideoPlaylist } from '../../shared-video-playlist'
 import { CustomMarkupComponent } from './shared'
+import { VideoPlaylistMiniatureComponent } from '../../shared-video-playlist/video-playlist-miniature.component'
+import { NgIf } from '@angular/common'
 
 /*
  * Markup component that creates a playlist miniature only
@@ -14,7 +16,9 @@ import { CustomMarkupComponent } from './shared'
   selector: 'my-playlist-miniature-markup',
   templateUrl: 'playlist-miniature-markup.component.html',
   styleUrls: [ 'playlist-miniature-markup.component.scss' ],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [ NgIf, VideoPlaylistMiniatureComponent ]
 })
 export class PlaylistMiniatureMarkupComponent implements CustomMarkupComponent, OnInit {
   @Input() uuid: string
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts
index d692abbe3..064659217 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts
@@ -6,6 +6,8 @@ import { objectKeysTyped } from '@peertube/peertube-core-utils'
 import { Video } from '../../shared-main'
 import { MiniatureDisplayOptions } from '../../shared-video-miniature'
 import { CustomMarkupComponent } from './shared'
+import { VideoMiniatureComponent } from '../../shared-video-miniature/video-miniature.component'
+import { NgIf } from '@angular/common'
 
 /*
  * Markup component that creates a video miniature only
@@ -15,7 +17,9 @@ import { CustomMarkupComponent } from './shared'
   selector: 'my-video-miniature-markup',
   templateUrl: 'video-miniature-markup.component.html',
   styleUrls: [ 'video-miniature-markup.component.scss' ],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [ NgIf, VideoMiniatureComponent ]
 })
 export class VideoMiniatureMarkupComponent implements CustomMarkupComponent, OnInit {
   @Input() uuid: string
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
index 53fae6ad4..0deefd5e3 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
@@ -7,6 +7,8 @@ import { Video, VideoService } from '../../shared-main'
 import { MiniatureDisplayOptions } from '../../shared-video-miniature'
 import { CustomMarkupComponent } from './shared'
 import { Observable } from 'rxjs'
+import { VideoMiniatureComponent } from '../../shared-video-miniature/video-miniature.component'
+import { NgStyle, NgFor } from '@angular/common'
 
 /*
  * Markup component list videos depending on criteria
@@ -16,7 +18,9 @@ import { Observable } from 'rxjs'
   selector: 'my-videos-list-markup',
   templateUrl: 'videos-list-markup.component.html',
   styleUrls: [ 'videos-list-markup.component.scss' ],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [ NgStyle, NgFor, VideoMiniatureComponent ]
 })
 export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit {
   @Input() sort: string
diff --git a/client/src/app/shared/shared-custom-markup/shared-custom-markup.module.ts b/client/src/app/shared/shared-custom-markup/shared-custom-markup.module.ts
deleted file mode 100644
index 93db88f58..000000000
--- a/client/src/app/shared/shared-custom-markup/shared-custom-markup.module.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { NgModule } from '@angular/core'
-import { SharedActorImageModule } from '../shared-actor-image/shared-actor-image.module'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main'
-import { SharedSearchModule } from '../shared-search'
-import { SharedVideoMiniatureModule } from '../shared-video-miniature'
-import { SharedVideoPlaylistModule } from '../shared-video-playlist'
-import { CustomMarkupContainerComponent } from './custom-markup-container.component'
-import { CustomMarkupHelpComponent } from './custom-markup-help.component'
-import { CustomMarkupService } from './custom-markup.service'
-import { DynamicElementService } from './dynamic-element.service'
-import {
-  ButtonMarkupComponent,
-  ChannelMiniatureMarkupComponent,
-  EmbedMarkupComponent,
-  InstanceAvatarMarkupComponent,
-  InstanceBannerMarkupComponent,
-  PlaylistMiniatureMarkupComponent,
-  VideoMiniatureMarkupComponent,
-  VideosListMarkupComponent
-} from './peertube-custom-tags'
-
-@NgModule({
-  imports: [
-    CommonModule,
-
-    SharedMainModule,
-    SharedGlobalIconModule,
-    SharedVideoMiniatureModule,
-    SharedVideoPlaylistModule,
-    SharedActorImageModule,
-    SharedSearchModule
-  ],
-
-  declarations: [
-    VideoMiniatureMarkupComponent,
-    PlaylistMiniatureMarkupComponent,
-    ChannelMiniatureMarkupComponent,
-    EmbedMarkupComponent,
-    VideosListMarkupComponent,
-    ButtonMarkupComponent,
-    CustomMarkupHelpComponent,
-    CustomMarkupContainerComponent,
-    InstanceBannerMarkupComponent,
-    InstanceAvatarMarkupComponent
-  ],
-
-  exports: [
-    VideoMiniatureMarkupComponent,
-    PlaylistMiniatureMarkupComponent,
-    ChannelMiniatureMarkupComponent,
-    VideosListMarkupComponent,
-    EmbedMarkupComponent,
-    ButtonMarkupComponent,
-    CustomMarkupHelpComponent,
-    CustomMarkupContainerComponent,
-    InstanceBannerMarkupComponent,
-    InstanceAvatarMarkupComponent
-  ],
-
-  providers: [
-    CustomMarkupService,
-    DynamicElementService
-  ]
-})
-export class SharedCustomMarkupModule { }
diff --git a/client/src/app/shared/shared-forms/advanced-input-filter.component.ts b/client/src/app/shared/shared-forms/advanced-input-filter.component.ts
index 929438749..30018371d 100644
--- a/client/src/app/shared/shared-forms/advanced-input-filter.component.ts
+++ b/client/src/app/shared/shared-forms/advanced-input-filter.component.ts
@@ -4,6 +4,10 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators'
 import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { ActivatedRoute, Params, Router } from '@angular/router'
 import { RestService } from '@app/core'
+import { FormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { NgIf, NgFor, NgClass } from '@angular/common'
+import { NgbDropdown, NgbDropdownToggle, NgbDropdownMenu } from '@ng-bootstrap/ng-bootstrap'
 
 export type AdvancedInputFilter = {
   title: string
@@ -21,7 +25,9 @@ const debugLogger = debug('peertube:AdvancedInputFilterComponent')
 @Component({
   selector: 'my-advanced-input-filter',
   templateUrl: './advanced-input-filter.component.html',
-  styleUrls: [ './advanced-input-filter.component.scss' ]
+  styleUrls: [ './advanced-input-filter.component.scss' ],
+  standalone: true,
+  imports: [ NgbDropdown, NgIf, NgbDropdownToggle, NgbDropdownMenu, NgFor, GlobalIconComponent, NgClass, FormsModule ]
 })
 export class AdvancedInputFilterComponent implements OnInit, AfterViewInit {
   @Input() filters: AdvancedInputFilter[] = []
diff --git a/client/src/app/shared/shared-forms/dynamic-form-field.component.ts b/client/src/app/shared/shared-forms/dynamic-form-field.component.ts
index a95463944..a1ed2d154 100644
--- a/client/src/app/shared/shared-forms/dynamic-form-field.component.ts
+++ b/client/src/app/shared/shared-forms/dynamic-form-field.component.ts
@@ -1,11 +1,27 @@
 import { Component, Input } from '@angular/core'
-import { FormGroup } from '@angular/forms'
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { RegisterClientFormFieldOptions } from '@peertube/peertube-models'
+import { MarkdownTextareaComponent } from './markdown-textarea.component'
+import { HelpComponent } from '../shared-main/misc/help.component'
+import { InputTextComponent } from './input-text.component'
+import { PeertubeCheckboxComponent } from './peertube-checkbox.component'
+import { NgIf, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-dynamic-form-field',
   templateUrl: './dynamic-form-field.component.html',
-  styleUrls: [ './dynamic-form-field.component.scss' ]
+  styleUrls: [ './dynamic-form-field.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    FormsModule,
+    ReactiveFormsModule,
+    PeertubeCheckboxComponent,
+    NgFor,
+    InputTextComponent,
+    HelpComponent,
+    MarkdownTextareaComponent
+  ]
 })
 
 export class DynamicFormFieldComponent {
diff --git a/client/src/app/shared/shared-forms/index.ts b/client/src/app/shared/shared-forms/index.ts
index bff9862f2..b2293e191 100644
--- a/client/src/app/shared/shared-forms/index.ts
+++ b/client/src/app/shared/shared-forms/index.ts
@@ -10,6 +10,6 @@ export * from './peertube-checkbox.component'
 export * from './preview-upload.component'
 export * from './reactive-file.component'
 export * from './select'
-export * from './shared-form.module'
+export * from './shared-form-providers'
 export * from './textarea-autoresize.directive'
 export * from './timestamp-input.component'
diff --git a/client/src/app/shared/shared-forms/input-switch.component.ts b/client/src/app/shared/shared-forms/input-switch.component.ts
index a4036ba58..3b54cd27e 100644
--- a/client/src/app/shared/shared-forms/input-switch.component.ts
+++ b/client/src/app/shared/shared-forms/input-switch.component.ts
@@ -11,7 +11,8 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
       useExisting: forwardRef(() => InputSwitchComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true
 })
 export class InputSwitchComponent implements ControlValueAccessor {
   @Input() checked = false
diff --git a/client/src/app/shared/shared-forms/input-text.component.ts b/client/src/app/shared/shared-forms/input-text.component.ts
index dcfceb40e..ce827a606 100644
--- a/client/src/app/shared/shared-forms/input-text.component.ts
+++ b/client/src/app/shared/shared-forms/input-text.component.ts
@@ -1,6 +1,9 @@
 import { AfterViewInit, Component, ElementRef, forwardRef, Input, ViewChild } from '@angular/core'
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'
 import { FormReactiveErrors } from './form-reactive.service'
+import { CopyButtonComponent } from '../shared-main/buttons/copy-button.component'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { NgClass, NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-input-text',
@@ -12,7 +15,9 @@ import { FormReactiveErrors } from './form-reactive.service'
       useExisting: forwardRef(() => InputTextComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ FormsModule, NgClass, NgIf, GlobalIconComponent, CopyButtonComponent ]
 })
 export class InputTextComponent implements ControlValueAccessor, AfterViewInit {
   @ViewChild('input') inputElement: ElementRef
diff --git a/client/src/app/shared/shared-forms/markdown-textarea.component.ts b/client/src/app/shared/shared-forms/markdown-textarea.component.ts
index 77e6cbd8c..a33d3efb3 100644
--- a/client/src/app/shared/shared-forms/markdown-textarea.component.ts
+++ b/client/src/app/shared/shared-forms/markdown-textarea.component.ts
@@ -1,12 +1,14 @@
 import { Subject } from 'rxjs'
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators'
-import { ViewportScroller } from '@angular/common'
+import { ViewportScroller, NgClass, NgIf } from '@angular/common'
 import { Component, ElementRef, forwardRef, Input, OnInit, ViewChild } from '@angular/core'
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'
 import { SafeHtml } from '@angular/platform-browser'
 import { MarkdownService, ScreenService } from '@app/core'
 import { Video } from '@peertube/peertube-models'
 import { FormReactiveErrors } from './form-reactive.service'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { NgbNav, NgbNavItem, NgbNavLink, NgbNavLinkBase, NgbNavContent, NgbTooltip, NgbNavOutlet } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
   selector: 'my-markdown-textarea',
@@ -18,6 +20,20 @@ import { FormReactiveErrors } from './form-reactive.service'
       useExisting: forwardRef(() => MarkdownTextareaComponent),
       multi: true
     }
+  ],
+  standalone: true,
+  imports: [
+    NgClass,
+    FormsModule,
+    NgbNav,
+    NgIf,
+    NgbNavItem,
+    NgbNavLink,
+    NgbNavLinkBase,
+    NgbNavContent,
+    GlobalIconComponent,
+    NgbTooltip,
+    NgbNavOutlet
   ]
 })
 
diff --git a/client/src/app/shared/shared-forms/peertube-checkbox.component.ts b/client/src/app/shared/shared-forms/peertube-checkbox.component.ts
index f71eb3d34..4230d4aa6 100644
--- a/client/src/app/shared/shared-forms/peertube-checkbox.component.ts
+++ b/client/src/app/shared/shared-forms/peertube-checkbox.component.ts
@@ -1,6 +1,8 @@
 import { AfterContentInit, Component, ContentChildren, forwardRef, Input, QueryList, TemplateRef } from '@angular/core'
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'
 import { PeerTubeTemplateDirective } from '@app/shared/shared-main'
+import { HelpComponent } from '../shared-main/misc/help.component'
+import { NgIf, NgTemplateOutlet } from '@angular/common'
 
 @Component({
   selector: 'my-peertube-checkbox',
@@ -12,7 +14,9 @@ import { PeerTubeTemplateDirective } from '@app/shared/shared-main'
       useExisting: forwardRef(() => PeertubeCheckboxComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ FormsModule, NgIf, NgTemplateOutlet, HelpComponent, PeerTubeTemplateDirective ]
 })
 export class PeertubeCheckboxComponent implements ControlValueAccessor, AfterContentInit {
   @Input() checked = false
diff --git a/client/src/app/shared/shared-forms/preview-upload.component.ts b/client/src/app/shared/shared-forms/preview-upload.component.ts
index 3db7c34f7..732a6544d 100644
--- a/client/src/app/shared/shared-forms/preview-upload.component.ts
+++ b/client/src/app/shared/shared-forms/preview-upload.component.ts
@@ -4,6 +4,8 @@ import { ServerService } from '@app/core'
 import { imageToDataURL } from '@root-helpers/images'
 import { HTMLServerConfig } from '@peertube/peertube-models'
 import { BytesPipe } from '../shared-main'
+import { NgIf, NgStyle } from '@angular/common'
+import { ReactiveFileComponent } from './reactive-file.component'
 
 @Component({
   selector: 'my-preview-upload',
@@ -15,7 +17,9 @@ import { BytesPipe } from '../shared-main'
       useExisting: forwardRef(() => PreviewUploadComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ ReactiveFileComponent, NgIf, NgStyle ]
 })
 export class PreviewUploadComponent implements OnInit, ControlValueAccessor {
   @Input() inputLabel: string
diff --git a/client/src/app/shared/shared-forms/reactive-file.component.ts b/client/src/app/shared/shared-forms/reactive-file.component.ts
index 609aa0f40..6b000b93c 100644
--- a/client/src/app/shared/shared-forms/reactive-file.component.ts
+++ b/client/src/app/shared/shared-forms/reactive-file.component.ts
@@ -1,7 +1,10 @@
 import { Component, EventEmitter, forwardRef, Input, OnChanges, OnInit, Output } from '@angular/core'
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'
 import { Notifier } from '@app/core'
 import { GlobalIconName } from '@app/shared/shared-icons'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { NgClass, NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-reactive-file',
@@ -13,7 +16,9 @@ import { GlobalIconName } from '@app/shared/shared-icons'
       useExisting: forwardRef(() => ReactiveFileComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ NgClass, NgbTooltip, NgIf, GlobalIconComponent, FormsModule ]
 })
 export class ReactiveFileComponent implements OnInit, OnChanges, ControlValueAccessor {
   @Input() theme: 'primary' | 'secondary' = 'secondary'
diff --git a/client/src/app/shared/shared-forms/select/select-categories.component.ts b/client/src/app/shared/shared-forms/select/select-categories.component.ts
index 47a6575f4..65162cf84 100644
--- a/client/src/app/shared/shared-forms/select/select-categories.component.ts
+++ b/client/src/app/shared/shared-forms/select/select-categories.component.ts
@@ -1,8 +1,9 @@
 import { Component, forwardRef, OnInit } from '@angular/core'
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'
 import { ServerService } from '@app/core'
 import { SelectOptionsItem } from '../../../../types/select-options-item.model'
 import { ItemSelectCheckboxValue } from './select-checkbox.component'
+import { SelectCheckboxAllComponent } from './select-checkbox-all.component'
 
 @Component({
   selector: 'my-select-categories',
@@ -14,7 +15,9 @@ import { ItemSelectCheckboxValue } from './select-checkbox.component'
       useExisting: forwardRef(() => SelectCategoriesComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ SelectCheckboxAllComponent, FormsModule ]
 })
 export class SelectCategoriesComponent implements ControlValueAccessor, OnInit {
   selectedCategories: ItemSelectCheckboxValue[] = []
diff --git a/client/src/app/shared/shared-forms/select/select-channel.component.ts b/client/src/app/shared/shared-forms/select/select-channel.component.ts
index 26d6216ef..8b9619b73 100644
--- a/client/src/app/shared/shared-forms/select/select-channel.component.ts
+++ b/client/src/app/shared/shared-forms/select/select-channel.component.ts
@@ -1,7 +1,9 @@
 import { Component, forwardRef, Input, OnChanges } from '@angular/core'
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'
 import { VideoChannel } from '@app/shared/shared-main'
 import { SelectChannelItem } from '../../../../types/select-options-item.model'
+import { NgFor } from '@angular/common'
+import { NgSelectModule } from '@ng-select/ng-select'
 
 @Component({
   selector: 'my-select-channel',
@@ -13,7 +15,9 @@ import { SelectChannelItem } from '../../../../types/select-options-item.model'
       useExisting: forwardRef(() => SelectChannelComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ NgSelectModule, FormsModule, NgFor ]
 })
 export class SelectChannelComponent implements ControlValueAccessor, OnChanges {
   @Input() items: SelectChannelItem[] = []
diff --git a/client/src/app/shared/shared-forms/select/select-checkbox-all.component.ts b/client/src/app/shared/shared-forms/select/select-checkbox-all.component.ts
index 8b6cd091a..b60f30022 100644
--- a/client/src/app/shared/shared-forms/select/select-checkbox-all.component.ts
+++ b/client/src/app/shared/shared-forms/select/select-checkbox-all.component.ts
@@ -1,14 +1,13 @@
 import { Component, forwardRef, Input } from '@angular/core'
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'
 import { Notifier } from '@app/core'
 import { formatICU } from '@app/helpers'
 import { SelectOptionsItem } from '../../../../types/select-options-item.model'
-import { ItemSelectCheckboxValue } from './select-checkbox.component'
+import { ItemSelectCheckboxValue, SelectCheckboxComponent } from './select-checkbox.component'
 
 @Component({
   selector: 'my-select-checkbox-all',
   styleUrls: [ './select-shared.component.scss' ],
-
   template: `
   <my-select-checkbox
     [(ngModel)]="selectedItems"
@@ -19,14 +18,15 @@ import { ItemSelectCheckboxValue } from './select-checkbox.component'
     (focusout)="onBlur()"
   >
   </my-select-checkbox>`,
-
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
       useExisting: forwardRef(() => SelectCheckboxAllComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ SelectCheckboxComponent, FormsModule ]
 })
 export class SelectCheckboxAllComponent implements ControlValueAccessor {
   @Input() availableItems: SelectOptionsItem[] = []
diff --git a/client/src/app/shared/shared-forms/select/select-checkbox.component.ts b/client/src/app/shared/shared-forms/select/select-checkbox.component.ts
index c9a500324..7378ba54d 100644
--- a/client/src/app/shared/shared-forms/select/select-checkbox.component.ts
+++ b/client/src/app/shared/shared-forms/select/select-checkbox.component.ts
@@ -1,6 +1,7 @@
 import { Component, forwardRef, Input, OnInit } from '@angular/core'
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'
 import { SelectOptionsItem } from '../../../../types/select-options-item.model'
+import { NgSelectModule } from '@ng-select/ng-select'
 
 export type ItemSelectCheckboxValue = { id?: string, group?: string } | string
 
@@ -14,7 +15,9 @@ export type ItemSelectCheckboxValue = { id?: string, group?: string } | string
       useExisting: forwardRef(() => SelectCheckboxComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ NgSelectModule, FormsModule ]
 })
 export class SelectCheckboxComponent implements OnInit, ControlValueAccessor {
   @Input() availableItems: SelectOptionsItem[] = []
diff --git a/client/src/app/shared/shared-forms/select/select-custom-value.component.ts b/client/src/app/shared/shared-forms/select/select-custom-value.component.ts
index 636bd6101..94973ae3f 100644
--- a/client/src/app/shared/shared-forms/select/select-custom-value.component.ts
+++ b/client/src/app/shared/shared-forms/select/select-custom-value.component.ts
@@ -1,6 +1,8 @@
 import { Component, forwardRef, Input, OnChanges } from '@angular/core'
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'
 import { SelectOptionsItem } from '../../../../types/select-options-item.model'
+import { NgIf } from '@angular/common'
+import { SelectOptionsComponent } from './select-options.component'
 
 @Component({
   selector: 'my-select-custom-value',
@@ -12,7 +14,9 @@ import { SelectOptionsItem } from '../../../../types/select-options-item.model'
       useExisting: forwardRef(() => SelectCustomValueComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ SelectOptionsComponent, FormsModule, NgIf ]
 })
 export class SelectCustomValueComponent implements ControlValueAccessor, OnChanges {
   @Input() items: SelectOptionsItem[] = []
diff --git a/client/src/app/shared/shared-forms/select/select-languages.component.ts b/client/src/app/shared/shared-forms/select/select-languages.component.ts
index 6b5415785..47a6aab4c 100644
--- a/client/src/app/shared/shared-forms/select/select-languages.component.ts
+++ b/client/src/app/shared/shared-forms/select/select-languages.component.ts
@@ -1,8 +1,9 @@
 import { Component, forwardRef, Input, OnInit } from '@angular/core'
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'
 import { ServerService } from '@app/core'
 import { SelectOptionsItem } from '../../../../types/select-options-item.model'
 import { ItemSelectCheckboxValue } from './select-checkbox.component'
+import { SelectCheckboxAllComponent } from './select-checkbox-all.component'
 
 @Component({
   selector: 'my-select-languages',
@@ -14,7 +15,9 @@ import { ItemSelectCheckboxValue } from './select-checkbox.component'
       useExisting: forwardRef(() => SelectLanguagesComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ SelectCheckboxAllComponent, FormsModule ]
 })
 export class SelectLanguagesComponent implements ControlValueAccessor, OnInit {
   @Input() maxLanguages: number
diff --git a/client/src/app/shared/shared-forms/select/select-options.component.ts b/client/src/app/shared/shared-forms/select/select-options.component.ts
index 820a82c24..62df5c80e 100644
--- a/client/src/app/shared/shared-forms/select/select-options.component.ts
+++ b/client/src/app/shared/shared-forms/select/select-options.component.ts
@@ -1,6 +1,8 @@
 import { Component, forwardRef, HostListener, Input } from '@angular/core'
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'
 import { SelectOptionsItem } from '../../../../types/select-options-item.model'
+import { NgIf } from '@angular/common'
+import { NgSelectModule } from '@ng-select/ng-select'
 
 @Component({
   selector: 'my-select-options',
@@ -12,7 +14,9 @@ import { SelectOptionsItem } from '../../../../types/select-options-item.model'
       useExisting: forwardRef(() => SelectOptionsComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ NgSelectModule, FormsModule, NgIf ]
 })
 export class SelectOptionsComponent implements ControlValueAccessor {
   @Input() items: SelectOptionsItem[] = []
diff --git a/client/src/app/shared/shared-forms/select/select-tags.component.ts b/client/src/app/shared/shared-forms/select/select-tags.component.ts
index bef04de8a..b13af7620 100644
--- a/client/src/app/shared/shared-forms/select/select-tags.component.ts
+++ b/client/src/app/shared/shared-forms/select/select-tags.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, forwardRef } from '@angular/core'
-import { NG_VALUE_ACCESSOR, ControlValueAccessor } from '@angular/forms'
+import { NG_VALUE_ACCESSOR, ControlValueAccessor, FormsModule } from '@angular/forms'
+import { NgSelectModule } from '@ng-select/ng-select'
 
 @Component({
   selector: 'my-select-tags',
@@ -11,7 +12,9 @@ import { NG_VALUE_ACCESSOR, ControlValueAccessor } from '@angular/forms'
       useExisting: forwardRef(() => SelectTagsComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ NgSelectModule, FormsModule ]
 })
 export class SelectTagsComponent implements ControlValueAccessor {
   @Input() availableItems: string[] = []
diff --git a/client/src/app/shared/shared-forms/shared-form-providers.ts b/client/src/app/shared/shared-forms/shared-form-providers.ts
new file mode 100644
index 000000000..995d5835b
--- /dev/null
+++ b/client/src/app/shared/shared-forms/shared-form-providers.ts
@@ -0,0 +1,6 @@
+import { FormReactiveService } from './form-reactive.service'
+import { FormValidatorService } from './form-validator.service'
+
+export function getFormProviders () {
+  return [ FormValidatorService, FormReactiveService ]
+}
diff --git a/client/src/app/shared/shared-forms/shared-form.module.ts b/client/src/app/shared/shared-forms/shared-form.module.ts
deleted file mode 100644
index 628affb56..000000000
--- a/client/src/app/shared/shared-forms/shared-form.module.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { InputMaskModule } from 'primeng/inputmask'
-import { NgModule } from '@angular/core'
-import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { NgSelectModule } from '@ng-select/ng-select'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { AdvancedInputFilterComponent } from './advanced-input-filter.component'
-import { DynamicFormFieldComponent } from './dynamic-form-field.component'
-import { FormReactiveService } from './form-reactive.service'
-import { FormValidatorService } from './form-validator.service'
-import { InputSwitchComponent } from './input-switch.component'
-import { InputTextComponent } from './input-text.component'
-import { MarkdownTextareaComponent } from './markdown-textarea.component'
-import { PeertubeCheckboxComponent } from './peertube-checkbox.component'
-import { PreviewUploadComponent } from './preview-upload.component'
-import { ReactiveFileComponent } from './reactive-file.component'
-import {
-  SelectCategoriesComponent,
-  SelectChannelComponent,
-  SelectCheckboxAllComponent,
-  SelectCheckboxComponent,
-  SelectCustomValueComponent,
-  SelectLanguagesComponent,
-  SelectOptionsComponent,
-  SelectTagsComponent
-} from './select'
-import { TextareaAutoResizeDirective } from './textarea-autoresize.directive'
-import { TimestampInputComponent } from './timestamp-input.component'
-
-@NgModule({
-  imports: [
-    FormsModule,
-    ReactiveFormsModule,
-
-    InputMaskModule,
-    NgSelectModule,
-
-    SharedMainModule,
-    SharedGlobalIconModule
-  ],
-
-  declarations: [
-    InputTextComponent,
-    MarkdownTextareaComponent,
-    PeertubeCheckboxComponent,
-    PreviewUploadComponent,
-    ReactiveFileComponent,
-    TextareaAutoResizeDirective,
-    TimestampInputComponent,
-
-    InputSwitchComponent,
-
-    SelectChannelComponent,
-    SelectOptionsComponent,
-    SelectTagsComponent,
-    SelectCheckboxComponent,
-    SelectCustomValueComponent,
-    SelectLanguagesComponent,
-    SelectCategoriesComponent,
-    SelectCheckboxAllComponent,
-
-    DynamicFormFieldComponent,
-
-    AdvancedInputFilterComponent
-  ],
-
-  exports: [
-    FormsModule,
-    ReactiveFormsModule,
-
-    InputMaskModule,
-    NgSelectModule,
-
-    InputTextComponent,
-    MarkdownTextareaComponent,
-    PeertubeCheckboxComponent,
-    PreviewUploadComponent,
-    ReactiveFileComponent,
-    TextareaAutoResizeDirective,
-    TimestampInputComponent,
-
-    InputSwitchComponent,
-
-    SelectChannelComponent,
-    SelectOptionsComponent,
-    SelectTagsComponent,
-    SelectCheckboxComponent,
-    SelectCustomValueComponent,
-    SelectLanguagesComponent,
-    SelectCategoriesComponent,
-    SelectCheckboxAllComponent,
-
-    DynamicFormFieldComponent,
-
-    AdvancedInputFilterComponent
-  ],
-
-  providers: [
-    FormValidatorService,
-    FormReactiveService
-  ]
-})
-export class SharedFormModule { }
diff --git a/client/src/app/shared/shared-forms/textarea-autoresize.directive.ts b/client/src/app/shared/shared-forms/textarea-autoresize.directive.ts
index f8c855c16..5943ad55f 100644
--- a/client/src/app/shared/shared-forms/textarea-autoresize.directive.ts
+++ b/client/src/app/shared/shared-forms/textarea-autoresize.directive.ts
@@ -2,7 +2,8 @@
 import { AfterViewInit, Directive, ElementRef, HostBinding, HostListener } from '@angular/core'
 
 @Directive({
-  selector: 'textarea[myAutoResize]'
+  selector: 'textarea[myAutoResize]',
+  standalone: true
 })
 export class TextareaAutoResizeDirective implements AfterViewInit {
   @HostBinding('attr.rows') rows = '1'
diff --git a/client/src/app/shared/shared-forms/timestamp-input.component.ts b/client/src/app/shared/shared-forms/timestamp-input.component.ts
index 15a5675a3..631709bc8 100644
--- a/client/src/app/shared/shared-forms/timestamp-input.component.ts
+++ b/client/src/app/shared/shared-forms/timestamp-input.component.ts
@@ -1,6 +1,8 @@
 import { ChangeDetectorRef, Component, EventEmitter, forwardRef, Input, OnInit, Output } from '@angular/core'
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'
 import { secondsToTime, timeToInt } from '@peertube/peertube-core-utils'
+import { NgClass } from '@angular/common'
+import { InputMaskModule } from 'primeng/inputmask'
 
 @Component({
   selector: 'my-timestamp-input',
@@ -12,7 +14,9 @@ import { secondsToTime, timeToInt } from '@peertube/peertube-core-utils'
       useExisting: forwardRef(() => TimestampInputComponent),
       multi: true
     }
-  ]
+  ],
+  standalone: true,
+  imports: [ InputMaskModule, FormsModule, NgClass ]
 })
 export class TimestampInputComponent implements ControlValueAccessor, OnInit {
   @Input() maxTimestamp: number
diff --git a/client/src/app/shared/shared-icons/global-icon.component.ts b/client/src/app/shared/shared-icons/global-icon.component.ts
index 18d54f9a2..3235c9fac 100644
--- a/client/src/app/shared/shared-icons/global-icon.component.ts
+++ b/client/src/app/shared/shared-icons/global-icon.component.ts
@@ -86,7 +86,8 @@ export type GlobalIconName = keyof typeof icons
   selector: 'my-global-icon',
   template: '',
   styleUrls: [ './global-icon.component.scss' ],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true
 })
 export class GlobalIconComponent implements OnInit {
   @Input() iconName: GlobalIconName
diff --git a/client/src/app/shared/shared-icons/index.ts b/client/src/app/shared/shared-icons/index.ts
index 478e5c97d..d1e9ca1b0 100644
--- a/client/src/app/shared/shared-icons/index.ts
+++ b/client/src/app/shared/shared-icons/index.ts
@@ -1,3 +1 @@
 export * from './global-icon.component'
-
-export * from './shared-global-icon.module'
diff --git a/client/src/app/shared/shared-icons/shared-global-icon.module.ts b/client/src/app/shared/shared-icons/shared-global-icon.module.ts
deleted file mode 100644
index f63c647d1..000000000
--- a/client/src/app/shared/shared-icons/shared-global-icon.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { NgModule } from '@angular/core'
-import { GlobalIconComponent } from './global-icon.component'
-
-@NgModule({
-  imports: [
-    CommonModule
-  ],
-
-  declarations: [
-    GlobalIconComponent
-  ],
-
-  exports: [
-    GlobalIconComponent
-  ],
-
-  providers: [ ]
-})
-export class SharedGlobalIconModule { }
diff --git a/client/src/app/shared/shared-instance/feature-boolean.component.ts b/client/src/app/shared/shared-instance/feature-boolean.component.ts
index d02d513d6..3a84daeff 100644
--- a/client/src/app/shared/shared-instance/feature-boolean.component.ts
+++ b/client/src/app/shared/shared-instance/feature-boolean.component.ts
@@ -1,9 +1,13 @@
 import { Component, Input } from '@angular/core'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-feature-boolean',
   templateUrl: './feature-boolean.component.html',
-  styleUrls: [ './feature-boolean.component.scss' ]
+  styleUrls: [ './feature-boolean.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, GlobalIconComponent ]
 })
 export class FeatureBooleanComponent {
   @Input() value: boolean
diff --git a/client/src/app/shared/shared-instance/index.ts b/client/src/app/shared/shared-instance/index.ts
index 22b84bda3..fbdef65fd 100644
--- a/client/src/app/shared/shared-instance/index.ts
+++ b/client/src/app/shared/shared-instance/index.ts
@@ -3,5 +3,3 @@ export * from './instance-about-accordion.component'
 export * from './instance-banner.component'
 export * from './instance-features-table.component'
 export * from './instance-follow.service'
-export * from './instance.service'
-export * from './shared-instance.module'
diff --git a/client/src/app/shared/shared-instance/instance-about-accordion.component.ts b/client/src/app/shared/shared-instance/instance-about-accordion.component.ts
index 78d960d93..0c87e4fa5 100644
--- a/client/src/app/shared/shared-instance/instance-about-accordion.component.ts
+++ b/client/src/app/shared/shared-instance/instance-about-accordion.component.ts
@@ -1,13 +1,40 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
 import { HooksService, Notifier } from '@app/core'
-import { NgbAccordionDirective } from '@ng-bootstrap/ng-bootstrap'
+import {
+  NgbAccordionDirective,
+  NgbAccordionItem,
+  NgbAccordionHeader,
+  NgbAccordionToggle,
+  NgbAccordionButton,
+  NgbCollapse,
+  NgbAccordionCollapse,
+  NgbAccordionBody
+} from '@ng-bootstrap/ng-bootstrap'
 import { About, ClientFilterHookName, PluginClientScope } from '@peertube/peertube-models'
-import { InstanceService } from './instance.service'
+import { InstanceService } from '../shared-main/instance/instance.service'
+import { InstanceFeaturesTableComponent } from './instance-features-table.component'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { NgIf, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-instance-about-accordion',
   templateUrl: './instance-about-accordion.component.html',
-  styleUrls: [ './instance-about-accordion.component.scss' ]
+  styleUrls: [ './instance-about-accordion.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    NgbAccordionDirective,
+    NgbAccordionItem,
+    NgbAccordionHeader,
+    NgbAccordionToggle,
+    NgbAccordionButton,
+    GlobalIconComponent,
+    NgbCollapse,
+    NgbAccordionCollapse,
+    NgbAccordionBody,
+    InstanceFeaturesTableComponent,
+    NgFor
+  ]
 })
 export class InstanceAboutAccordionComponent implements OnInit {
   @ViewChild('accordion', { static: true }) accordion: NgbAccordionDirective
diff --git a/client/src/app/shared/shared-instance/instance-banner.component.ts b/client/src/app/shared/shared-instance/instance-banner.component.ts
index f15848f8c..b6bc720d0 100644
--- a/client/src/app/shared/shared-instance/instance-banner.component.ts
+++ b/client/src/app/shared/shared-instance/instance-banner.component.ts
@@ -1,9 +1,12 @@
 import { Component, Input, OnInit, booleanAttribute } from '@angular/core'
 import { ServerService } from '@app/core'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-instance-banner',
-  templateUrl: './instance-banner.component.html'
+  templateUrl: './instance-banner.component.html',
+  standalone: true,
+  imports: [ NgIf, NgClass ]
 })
 export class InstanceBannerComponent implements OnInit {
   @Input({ transform: booleanAttribute }) rounded = false
diff --git a/client/src/app/shared/shared-instance/instance-features-table.component.ts b/client/src/app/shared/shared-instance/instance-features-table.component.ts
index ae53661b0..65955ed07 100644
--- a/client/src/app/shared/shared-instance/instance-features-table.component.ts
+++ b/client/src/app/shared/shared-instance/instance-features-table.component.ts
@@ -3,11 +3,18 @@ import { ServerService } from '@app/core'
 import { formatICU } from '@app/helpers'
 import { ServerConfig, ServerStats } from '@peertube/peertube-models'
 import { DaysDurationFormatterPipe } from '../shared-main'
+import { BytesPipe } from '../shared-main/angular/bytes.pipe'
+import { PeerTubeTemplateDirective } from '../shared-main/angular/peertube-template.directive'
+import { HelpComponent } from '../shared-main/misc/help.component'
+import { FeatureBooleanComponent } from './feature-boolean.component'
+import { NgIf, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-instance-features-table',
   templateUrl: './instance-features-table.component.html',
-  styleUrls: [ './instance-features-table.component.scss' ]
+  styleUrls: [ './instance-features-table.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, FeatureBooleanComponent, HelpComponent, PeerTubeTemplateDirective, NgFor, BytesPipe ]
 })
 export class InstanceFeaturesTableComponent implements OnInit {
   quotaHelpIndication = ''
diff --git a/client/src/app/shared/shared-instance/shared-instance.module.ts b/client/src/app/shared/shared-instance/shared-instance.module.ts
deleted file mode 100644
index 7fe043582..000000000
--- a/client/src/app/shared/shared-instance/shared-instance.module.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { NgModule } from '@angular/core'
-import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { FeatureBooleanComponent } from './feature-boolean.component'
-import { InstanceAboutAccordionComponent } from './instance-about-accordion.component'
-import { InstanceFeaturesTableComponent } from './instance-features-table.component'
-import { InstanceFollowService } from './instance-follow.service'
-import { InstanceService } from './instance.service'
-import { InstanceBannerComponent } from './instance-banner.component'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    SharedGlobalIconModule,
-    NgbAccordionModule
-  ],
-
-  declarations: [
-    FeatureBooleanComponent,
-    InstanceAboutAccordionComponent,
-    InstanceFeaturesTableComponent,
-    InstanceBannerComponent
-  ],
-
-  exports: [
-    FeatureBooleanComponent,
-    InstanceAboutAccordionComponent,
-    InstanceFeaturesTableComponent,
-    InstanceBannerComponent
-  ],
-
-  providers: [
-    InstanceFollowService,
-    InstanceService
-  ]
-})
-export class SharedInstanceModule { }
diff --git a/client/src/app/shared/shared-main/account/account.service.ts b/client/src/app/shared/shared-main/account/account.service.ts
index 9c1afaa73..2eb072377 100644
--- a/client/src/app/shared/shared-main/account/account.service.ts
+++ b/client/src/app/shared/shared-main/account/account.service.ts
@@ -16,7 +16,7 @@ export class AccountService {
   constructor (
     private authHttp: HttpClient,
     private restExtractor: RestExtractor
-  ) {}
+  ) { }
 
   getAccount (id: number | string): Observable<Account> {
     return this.authHttp.get<ServerAccount>(AccountService.BASE_ACCOUNT_URL + id)
diff --git a/client/src/app/shared/shared-main/account/signup-label.component.ts b/client/src/app/shared/shared-main/account/signup-label.component.ts
index caacb9c6f..c194c78dd 100644
--- a/client/src/app/shared/shared-main/account/signup-label.component.ts
+++ b/client/src/app/shared/shared-main/account/signup-label.component.ts
@@ -1,8 +1,11 @@
 import { Component, Input } from '@angular/core'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-signup-label',
-  templateUrl: './signup-label.component.html'
+  templateUrl: './signup-label.component.html',
+  standalone: true,
+  imports: [ NgIf ]
 })
 export class SignupLabelComponent {
   @Input() requiresApproval: boolean
diff --git a/client/src/app/shared/shared-main/angular/auto-colspan.directive.ts b/client/src/app/shared/shared-main/angular/auto-colspan.directive.ts
index 8da89b668..613f2a929 100644
--- a/client/src/app/shared/shared-main/angular/auto-colspan.directive.ts
+++ b/client/src/app/shared/shared-main/angular/auto-colspan.directive.ts
@@ -1,7 +1,8 @@
 import { AfterViewInit, Directive, ElementRef, Renderer2 } from '@angular/core'
 
 @Directive({
-  selector: '[myAutoColspan]'
+  selector: '[myAutoColspan]',
+  standalone: true
 })
 export class AutoColspanDirective implements AfterViewInit {
 
diff --git a/client/src/app/shared/shared-main/angular/autofocus.directive.ts b/client/src/app/shared/shared-main/angular/autofocus.directive.ts
index 051635f45..925150249 100644
--- a/client/src/app/shared/shared-main/angular/autofocus.directive.ts
+++ b/client/src/app/shared/shared-main/angular/autofocus.directive.ts
@@ -1,7 +1,8 @@
 import { AfterViewInit, Directive, ElementRef } from '@angular/core'
 
 @Directive({
-  selector: '[myAutofocus]'
+  selector: '[myAutofocus]',
+  standalone: true
 })
 export class AutofocusDirective implements AfterViewInit {
   constructor (private host: ElementRef) { }
diff --git a/client/src/app/shared/shared-main/angular/bytes.pipe.ts b/client/src/app/shared/shared-main/angular/bytes.pipe.ts
index 1e10799b7..b671aa149 100644
--- a/client/src/app/shared/shared-main/angular/bytes.pipe.ts
+++ b/client/src/app/shared/shared-main/angular/bytes.pipe.ts
@@ -3,7 +3,10 @@ import { getBytes } from '@root-helpers/bytes'
 
 // Thanks: https://github.com/danrevah/ngx-pipes/blob/master/src/ng-pipes/pipes/math/bytes.ts
 
-@Pipe({ name: 'bytes' })
+@Pipe({
+  name: 'bytes',
+  standalone: true
+})
 export class BytesPipe implements PipeTransform {
 
   transform (value: number, precision = 0): string | number {
diff --git a/client/src/app/shared/shared-main/angular/days-duration-formatter.pipe.ts b/client/src/app/shared/shared-main/angular/days-duration-formatter.pipe.ts
index 59069d11d..8351f4d8e 100644
--- a/client/src/app/shared/shared-main/angular/days-duration-formatter.pipe.ts
+++ b/client/src/app/shared/shared-main/angular/days-duration-formatter.pipe.ts
@@ -1,7 +1,8 @@
 import { Pipe, PipeTransform } from '@angular/core'
 
 @Pipe({
-  name: 'myDaysDurationFormatter'
+  name: 'myDaysDurationFormatter',
+  standalone: true
 })
 export class DaysDurationFormatterPipe implements PipeTransform {
 
diff --git a/client/src/app/shared/shared-main/angular/defer-loading.directive.ts b/client/src/app/shared/shared-main/angular/defer-loading.directive.ts
index c2a4f744e..28a4bf437 100644
--- a/client/src/app/shared/shared-main/angular/defer-loading.directive.ts
+++ b/client/src/app/shared/shared-main/angular/defer-loading.directive.ts
@@ -16,7 +16,8 @@ import {
 const debugLogger = debug('peertube:main:DeferLoadingDirective')
 
 @Directive({
-  selector: '[myDeferLoading]'
+  selector: '[myDeferLoading]',
+  standalone: true
 })
 export class DeferLoadingDirective implements AfterViewInit, OnDestroy {
   @ContentChild(TemplateRef) template: TemplateRef<any>
diff --git a/client/src/app/shared/shared-main/angular/from-now.pipe.ts b/client/src/app/shared/shared-main/angular/from-now.pipe.ts
index 4ff244bbb..ac519a1bc 100644
--- a/client/src/app/shared/shared-main/angular/from-now.pipe.ts
+++ b/client/src/app/shared/shared-main/angular/from-now.pipe.ts
@@ -2,7 +2,10 @@ import { Pipe, PipeTransform } from '@angular/core'
 import { formatICU } from '@app/helpers'
 
 // Thanks: https://stackoverflow.com/questions/3177836/how-to-format-time-since-xxx-e-g-4-minutes-ago-similar-to-stack-exchange-site
-@Pipe({ name: 'myFromNow' })
+@Pipe({
+  name: 'myFromNow',
+  standalone: true
+})
 export class FromNowPipe implements PipeTransform {
 
   transform (arg: number | Date | string) {
diff --git a/client/src/app/shared/shared-main/angular/infinite-scroller.directive.ts b/client/src/app/shared/shared-main/angular/infinite-scroller.directive.ts
index c247cfde2..2ad446e92 100644
--- a/client/src/app/shared/shared-main/angular/infinite-scroller.directive.ts
+++ b/client/src/app/shared/shared-main/angular/infinite-scroller.directive.ts
@@ -4,7 +4,8 @@ import { AfterViewChecked, Directive, ElementRef, EventEmitter, Input, OnDestroy
 import { PeerTubeRouterService, RouterSetting } from '@app/core'
 
 @Directive({
-  selector: '[myInfiniteScroller]'
+  selector: '[myInfiniteScroller]',
+  standalone: true
 })
 export class InfiniteScrollerDirective implements OnInit, OnDestroy, AfterViewChecked {
   @Input() percentLimit = 70
diff --git a/client/src/app/shared/shared-main/angular/link.component.ts b/client/src/app/shared/shared-main/angular/link.component.ts
index e69cbf068..964953695 100644
--- a/client/src/app/shared/shared-main/angular/link.component.ts
+++ b/client/src/app/shared/shared-main/angular/link.component.ts
@@ -1,9 +1,13 @@
 import { Component, Input, OnInit } from '@angular/core'
+import { RouterLink } from '@angular/router'
+import { NgIf, NgClass, NgTemplateOutlet } from '@angular/common'
 
 @Component({
   selector: 'my-link',
   styleUrls: [ './link.component.scss' ],
-  templateUrl: './link.component.html'
+  templateUrl: './link.component.html',
+  standalone: true,
+  imports: [ NgIf, RouterLink, NgClass, NgTemplateOutlet ]
 })
 export class LinkComponent implements OnInit {
   @Input() internalLink?: string | any[]
diff --git a/client/src/app/shared/shared-main/angular/login-link.component.ts b/client/src/app/shared/shared-main/angular/login-link.component.ts
index 7e3a773c2..82107b07d 100644
--- a/client/src/app/shared/shared-main/angular/login-link.component.ts
+++ b/client/src/app/shared/shared-main/angular/login-link.component.ts
@@ -2,10 +2,13 @@ import { environment } from 'src/environments/environment'
 import { Component, Input } from '@angular/core'
 import { ServerService } from '@app/core'
 import { PluginsManager } from '@root-helpers/plugins-manager'
+import { LinkComponent } from './link.component'
 
 @Component({
   selector: 'my-login-link',
-  templateUrl: './login-link.component.html'
+  templateUrl: './login-link.component.html',
+  standalone: true,
+  imports: [ LinkComponent ]
 })
 export class LoginLinkComponent {
   @Input() label = $localize`Login`
diff --git a/client/src/app/shared/shared-main/angular/number-formatter.pipe.ts b/client/src/app/shared/shared-main/angular/number-formatter.pipe.ts
index 00cfbc692..49bf1f8c7 100644
--- a/client/src/app/shared/shared-main/angular/number-formatter.pipe.ts
+++ b/client/src/app/shared/shared-main/angular/number-formatter.pipe.ts
@@ -3,7 +3,10 @@ import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core'
 
 // Thanks: https://github.com/danrevah/ngx-pipes/blob/master/src/ng-pipes/pipes/math/bytes.ts
 
-@Pipe({ name: 'myNumberFormatter' })
+@Pipe({
+  name: 'myNumberFormatter',
+  standalone: true
+})
 export class NumberFormatterPipe implements PipeTransform {
 
   /**
diff --git a/client/src/app/shared/shared-main/angular/peertube-template.directive.ts b/client/src/app/shared/shared-main/angular/peertube-template.directive.ts
index dc0cde12d..5d806a7e2 100644
--- a/client/src/app/shared/shared-main/angular/peertube-template.directive.ts
+++ b/client/src/app/shared/shared-main/angular/peertube-template.directive.ts
@@ -2,7 +2,8 @@ import { Directive, Input, TemplateRef } from '@angular/core'
 
 @Directive({
   // eslint-disable-next-line @angular-eslint/directive-selector
-  selector: '[ptTemplate]'
+  selector: '[ptTemplate]',
+  standalone: true
 })
 export class PeerTubeTemplateDirective <T extends string> {
   @Input('ptTemplate') name: T
diff --git a/client/src/app/shared/shared-main/angular/time-duration-formatter.pipe.ts b/client/src/app/shared/shared-main/angular/time-duration-formatter.pipe.ts
index 05a4f7db2..4fd8d60d3 100644
--- a/client/src/app/shared/shared-main/angular/time-duration-formatter.pipe.ts
+++ b/client/src/app/shared/shared-main/angular/time-duration-formatter.pipe.ts
@@ -1,7 +1,8 @@
 import { Pipe, PipeTransform } from '@angular/core'
 
 @Pipe({
-  name: 'myTimeDurationFormatter'
+  name: 'myTimeDurationFormatter',
+  standalone: true
 })
 export class TimeDurationFormatterPipe implements PipeTransform {
 
diff --git a/client/src/app/shared/shared-main/buttons/action-dropdown.component.ts b/client/src/app/shared/shared-main/buttons/action-dropdown.component.ts
index 7d24ff4ae..9fff9f5b7 100644
--- a/client/src/app/shared/shared-main/buttons/action-dropdown.component.ts
+++ b/client/src/app/shared/shared-main/buttons/action-dropdown.component.ts
@@ -1,6 +1,9 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { Params } from '@angular/router'
+import { Params, RouterLink } from '@angular/router'
 import { GlobalIconName } from '@app/shared/shared-icons'
+import { GlobalIconComponent } from '../../shared-icons/global-icon.component'
+import { NgbDropdown, NgbDropdownToggle, NgbDropdownMenu } from '@ng-bootstrap/ng-bootstrap'
+import { NgIf, NgClass, NgFor, NgTemplateOutlet } from '@angular/common'
 
 export type DropdownAction<T> = {
   label?: string
@@ -26,7 +29,9 @@ export type DropdownDirection = 'horizontal' | 'vertical'
   selector: 'my-action-dropdown',
   styleUrls: [ './action-dropdown.component.scss' ],
   templateUrl: './action-dropdown.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [ NgIf, NgbDropdown, NgbDropdownToggle, NgClass, GlobalIconComponent, NgbDropdownMenu, NgFor, RouterLink, NgTemplateOutlet ]
 })
 
 export class ActionDropdownComponent<T> {
diff --git a/client/src/app/shared/shared-main/buttons/button.component.ts b/client/src/app/shared/shared-main/buttons/button.component.ts
index d64969653..04ecefe7f 100644
--- a/client/src/app/shared/shared-main/buttons/button.component.ts
+++ b/client/src/app/shared/shared-main/buttons/button.component.ts
@@ -1,11 +1,18 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit, booleanAttribute } from '@angular/core'
 import { GlobalIconName } from '@app/shared/shared-icons'
+import { GlobalIconComponent } from '../../shared-icons/global-icon.component'
+import { LoaderComponent } from '../loaders/loader.component'
+import { RouterLink } from '@angular/router'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { NgIf, NgClass, NgTemplateOutlet } from '@angular/common'
 
 @Component({
   selector: 'my-button',
   styleUrls: [ './button.component.scss' ],
   templateUrl: './button.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [ NgIf, NgClass, NgbTooltip, NgTemplateOutlet, RouterLink, LoaderComponent, GlobalIconComponent ]
 })
 
 export class ButtonComponent implements OnInit, OnChanges {
diff --git a/client/src/app/shared/shared-main/buttons/copy-button.component.ts b/client/src/app/shared/shared-main/buttons/copy-button.component.ts
index aac9ab8b0..6b8ac9dc9 100644
--- a/client/src/app/shared/shared-main/buttons/copy-button.component.ts
+++ b/client/src/app/shared/shared-main/buttons/copy-button.component.ts
@@ -1,10 +1,15 @@
 import { Component, Input } from '@angular/core'
 import { Notifier } from '@app/core'
+import { GlobalIconComponent } from '../../shared-icons/global-icon.component'
+import { NgClass } from '@angular/common'
+import { CdkCopyToClipboard } from '@angular/cdk/clipboard'
 
 @Component({
   selector: 'my-copy-button',
   styleUrls: [ './copy-button.component.scss' ],
-  templateUrl: './copy-button.component.html'
+  templateUrl: './copy-button.component.html',
+  standalone: true,
+  imports: [ CdkCopyToClipboard, NgClass, GlobalIconComponent ]
 })
 export class CopyButtonComponent {
   @Input() value: string
diff --git a/client/src/app/shared/shared-main/buttons/delete-button.component.ts b/client/src/app/shared/shared-main/buttons/delete-button.component.ts
index 0ee7d3757..a3d296516 100644
--- a/client/src/app/shared/shared-main/buttons/delete-button.component.ts
+++ b/client/src/app/shared/shared-main/buttons/delete-button.component.ts
@@ -1,4 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core'
+import { ButtonComponent } from './button.component'
 
 @Component({
   selector: 'my-delete-button',
@@ -8,7 +9,9 @@ import { Component, Input, OnInit } from '@angular/core'
       [disabled]="disabled" [label]="label" [title]="title"
       [responsiveLabel]="responsiveLabel"
     ></my-button>
-  `
+  `,
+  standalone: true,
+  imports: [ ButtonComponent ]
 })
 export class DeleteButtonComponent implements OnInit {
   @Input() label: string
diff --git a/client/src/app/shared/shared-main/buttons/edit-button.component.ts b/client/src/app/shared/shared-main/buttons/edit-button.component.ts
index efc83179d..69e9ec413 100644
--- a/client/src/app/shared/shared-main/buttons/edit-button.component.ts
+++ b/client/src/app/shared/shared-main/buttons/edit-button.component.ts
@@ -1,4 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core'
+import { ButtonComponent } from './button.component'
 
 @Component({
   selector: 'my-edit-button',
@@ -7,7 +8,9 @@ import { Component, Input, OnInit } from '@angular/core'
       icon="edit" [label]="label" [title]="title" [responsiveLabel]="responsiveLabel"
       [ptRouterLink]="ptRouterLink"
     ></my-button>
-  `
+  `,
+  standalone: true,
+  imports: [ ButtonComponent ]
 })
 export class EditButtonComponent implements OnInit {
   @Input() label: string
diff --git a/client/src/app/shared/shared-main/date/date-toggle.component.ts b/client/src/app/shared/shared-main/date/date-toggle.component.ts
index c0060aba1..55d8370a8 100644
--- a/client/src/app/shared/shared-main/date/date-toggle.component.ts
+++ b/client/src/app/shared/shared-main/date/date-toggle.component.ts
@@ -4,7 +4,8 @@ import { FromNowPipe } from '../angular/from-now.pipe'
 @Component({
   selector: 'my-date-toggle',
   templateUrl: './date-toggle.component.html',
-  styleUrls: [ './date-toggle.component.scss' ]
+  styleUrls: [ './date-toggle.component.scss' ],
+  standalone: true
 })
 export class DateToggleComponent implements OnChanges {
   @Input() date: Date
diff --git a/client/src/app/shared/shared-main/feeds/feed.component.ts b/client/src/app/shared/shared-main/feeds/feed.component.ts
index ee3731c1d..47e0477dc 100644
--- a/client/src/app/shared/shared-main/feeds/feed.component.ts
+++ b/client/src/app/shared/shared-main/feeds/feed.component.ts
@@ -1,10 +1,15 @@
 import { Component, Input } from '@angular/core'
 import { Syndication } from './syndication.model'
+import { GlobalIconComponent } from '../../shared-icons/global-icon.component'
+import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
+import { NgIf, NgFor } from '@angular/common'
 
 @Component({
   selector: 'my-feed',
   styleUrls: [ './feed.component.scss' ],
-  templateUrl: './feed.component.html'
+  templateUrl: './feed.component.html',
+  standalone: true,
+  imports: [ NgIf, NgbPopover, GlobalIconComponent, NgFor ]
 })
 export class FeedComponent {
   @Input() syndicationItems: Syndication[]
diff --git a/client/src/app/shared/shared-main/index.ts b/client/src/app/shared/shared-main/index.ts
index 9faa28e32..456bf8ebf 100644
--- a/client/src/app/shared/shared-main/index.ts
+++ b/client/src/app/shared/shared-main/index.ts
@@ -2,6 +2,7 @@ export * from './account'
 export * from './angular'
 export * from './buttons'
 export * from './date'
+export * from './instance'
 export * from './feeds'
 export * from './loaders'
 export * from './misc'
@@ -12,5 +13,5 @@ export * from './users'
 export * from './video'
 export * from './video-caption'
 export * from './video-channel'
-export * from './shared-main.module'
+export * from './main-providers'
 export * from './video-channel-sync'
diff --git a/client/src/app/shared/shared-main/instance/index.ts b/client/src/app/shared/shared-main/instance/index.ts
new file mode 100644
index 000000000..851509953
--- /dev/null
+++ b/client/src/app/shared/shared-main/instance/index.ts
@@ -0,0 +1 @@
+export * from './instance.service'
diff --git a/client/src/app/shared/shared-instance/instance.service.ts b/client/src/app/shared/shared-main/instance/instance.service.ts
similarity index 98%
rename from client/src/app/shared/shared-instance/instance.service.ts
rename to client/src/app/shared/shared-main/instance/instance.service.ts
index 23b4e0866..054f04485 100644
--- a/client/src/app/shared/shared-instance/instance.service.ts
+++ b/client/src/app/shared/shared-main/instance/instance.service.ts
@@ -5,7 +5,7 @@ import { Injectable } from '@angular/core'
 import { MarkdownService, RestExtractor, ServerService } from '@app/core'
 import { objectKeysTyped, peertubeTranslate } from '@peertube/peertube-core-utils'
 import { About } from '@peertube/peertube-models'
-import { environment } from '../../../environments/environment'
+import { environment } from '../../../../environments/environment'
 import { logger } from '@root-helpers/logger'
 
 export type AboutHTML = Pick<About['instance'],
diff --git a/client/src/app/shared/shared-main/loaders/loader.component.ts b/client/src/app/shared/shared-main/loaders/loader.component.ts
index be9e130e7..e6c08a183 100644
--- a/client/src/app/shared/shared-main/loaders/loader.component.ts
+++ b/client/src/app/shared/shared-main/loaders/loader.component.ts
@@ -1,8 +1,11 @@
 import { Component, Input } from '@angular/core'
+import { NgIf, NgStyle } from '@angular/common'
 
 @Component({
   selector: 'my-loader',
-  template: `<div *ngIf="loading" class="spinner-border" [ngStyle]="getStyle()" role="status"></div>`
+  template: `<div *ngIf="loading" class="spinner-border" [ngStyle]="getStyle()" role="status"></div>`,
+  standalone: true,
+  imports: [ NgIf, NgStyle ]
 })
 export class LoaderComponent {
   @Input() loading: boolean
diff --git a/client/src/app/shared/shared-main/main-providers.ts b/client/src/app/shared/shared-main/main-providers.ts
new file mode 100644
index 000000000..48c10bcfa
--- /dev/null
+++ b/client/src/app/shared/shared-main/main-providers.ts
@@ -0,0 +1,44 @@
+import { DatePipe } from '@angular/common'
+import { AccountService } from './account'
+import { FromNowPipe } from './angular'
+import { CustomPageService } from './custom-page'
+import { ActorRedirectGuard } from './router'
+import { UserHistoryService, UserNotificationService } from './users'
+import {
+  RedundancyService,
+  VideoImportService,
+  VideoOwnershipService,
+  VideoService,
+  VideoFileTokenService,
+  VideoResolver,
+  VideoPasswordService,
+  VideoChapterService
+} from './video'
+import { VideoCaptionService } from './video-caption'
+import { VideoChannelService } from './video-channel'
+import { AUTH_INTERCEPTOR_PROVIDER } from './auth'
+import { InstanceService } from './instance'
+
+export function getMainProviders () {
+  return [
+    DatePipe,
+    FromNowPipe,
+    AUTH_INTERCEPTOR_PROVIDER,
+    AccountService,
+    UserHistoryService,
+    UserNotificationService,
+    RedundancyService,
+    VideoImportService,
+    VideoOwnershipService,
+    VideoService,
+    VideoFileTokenService,
+    VideoResolver,
+    VideoCaptionService,
+    VideoChannelService,
+    VideoPasswordService,
+    VideoChapterService,
+    CustomPageService,
+    ActorRedirectGuard,
+    InstanceService
+  ]
+}
diff --git a/client/src/app/shared/shared-main/misc/channels-setup-message.component.ts b/client/src/app/shared/shared-main/misc/channels-setup-message.component.ts
index 4f9cbc525..ef1d71360 100644
--- a/client/src/app/shared/shared-main/misc/channels-setup-message.component.ts
+++ b/client/src/app/shared/shared-main/misc/channels-setup-message.component.ts
@@ -1,11 +1,16 @@
 import { Component, Input, OnInit } from '@angular/core'
 import { AuthService, User } from '@app/core'
 import { VideoChannel } from '@app/shared/shared-main'
+import { RouterLink } from '@angular/router'
+import { GlobalIconComponent } from '../../shared-icons/global-icon.component'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-channels-setup-message',
   templateUrl: './channels-setup-message.component.html',
-  styleUrls: [ './channels-setup-message.component.scss' ]
+  styleUrls: [ './channels-setup-message.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, GlobalIconComponent, RouterLink ]
 })
 export class ChannelsSetupMessageComponent implements OnInit {
   @Input() hideLink = false
diff --git a/client/src/app/shared/shared-main/misc/help.component.ts b/client/src/app/shared/shared-main/misc/help.component.ts
index 53eafc74f..c6c1051ee 100644
--- a/client/src/app/shared/shared-main/misc/help.component.ts
+++ b/client/src/app/shared/shared-main/misc/help.component.ts
@@ -2,11 +2,16 @@ import { AfterContentInit, Component, ContentChildren, Input, OnChanges, OnInit,
 import { GlobalIconName } from '@app/shared/shared-icons'
 import { ENHANCED_RULES, TEXT_RULES } from '@peertube/peertube-core-utils'
 import { PeerTubeTemplateDirective } from '../angular'
+import { GlobalIconComponent } from '../../shared-icons/global-icon.component'
+import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
+import { NgIf, NgTemplateOutlet } from '@angular/common'
 
 @Component({
   selector: 'my-help',
   styleUrls: [ './help.component.scss' ],
-  templateUrl: './help.component.html'
+  templateUrl: './help.component.html',
+  standalone: true,
+  imports: [ NgIf, NgTemplateOutlet, NgbPopover, GlobalIconComponent ]
 })
 
 export class HelpComponent implements OnInit, OnChanges, AfterContentInit {
diff --git a/client/src/app/shared/shared-main/misc/list-overflow.component.ts b/client/src/app/shared/shared-main/misc/list-overflow.component.ts
index b6ce21641..00d778de3 100644
--- a/client/src/app/shared/shared-main/misc/list-overflow.component.ts
+++ b/client/src/app/shared/shared-main/misc/list-overflow.component.ts
@@ -14,8 +14,10 @@ import {
   ViewChildren
 } from '@angular/core'
 import { ScreenService } from '@app/core'
-import { NgbDropdown, NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { NgbDropdown, NgbModal, NgbDropdownAnchor, NgbDropdownMenu } from '@ng-bootstrap/ng-bootstrap'
 import * as debug from 'debug'
+import { RouterLinkActive, RouterLink } from '@angular/router'
+import { NgFor, NgTemplateOutlet, NgIf, NgClass, SlicePipe } from '@angular/common'
 
 const debugLogger = debug('peertube:main:ListOverflowItem')
 
@@ -28,7 +30,20 @@ export interface ListOverflowItem {
   selector: 'my-list-overflow',
   templateUrl: './list-overflow.component.html',
   styleUrls: [ './list-overflow.component.scss' ],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    NgFor,
+    NgTemplateOutlet,
+    NgIf,
+    NgbDropdown,
+    NgbDropdownAnchor,
+    NgClass,
+    NgbDropdownMenu,
+    RouterLinkActive,
+    RouterLink,
+    SlicePipe
+  ]
 })
 export class ListOverflowComponent<T extends ListOverflowItem> implements AfterViewInit {
   @Input() items: T[]
diff --git a/client/src/app/shared/shared-main/misc/simple-search-input.component.ts b/client/src/app/shared/shared-main/misc/simple-search-input.component.ts
index eae4f9a7f..ddad187c2 100644
--- a/client/src/app/shared/shared-main/misc/simple-search-input.component.ts
+++ b/client/src/app/shared/shared-main/misc/simple-search-input.component.ts
@@ -1,9 +1,14 @@
 import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
+import { NgIf } from '@angular/common'
+import { GlobalIconComponent } from '../../shared-icons/global-icon.component'
+import { FormsModule } from '@angular/forms'
 
 @Component({
   selector: 'my-simple-search-input',
   templateUrl: './simple-search-input.component.html',
-  styleUrls: [ './simple-search-input.component.scss' ]
+  styleUrls: [ './simple-search-input.component.scss' ],
+  standalone: true,
+  imports: [ FormsModule, GlobalIconComponent, NgIf ]
 })
 export class SimpleSearchInputComponent implements OnInit {
   @ViewChild('ref') input: ElementRef
diff --git a/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts b/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts
index 19f1f7d41..7ab7f9ed5 100644
--- a/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts
+++ b/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts
@@ -1,11 +1,13 @@
 import { Subscription } from 'rxjs'
 import { filter } from 'rxjs/operators'
 import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'
-import { NavigationEnd, Router } from '@angular/router'
+import { NavigationEnd, Router, RouterLinkActive, RouterLink } from '@angular/router'
 import { MenuService, ScreenService } from '@app/core'
 import { scrollToTop } from '@app/helpers'
 import { GlobalIconName } from '@app/shared/shared-icons'
-import { NgbDropdown, NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { NgbDropdown, NgbModal, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem } from '@ng-bootstrap/ng-bootstrap'
+import { GlobalIconComponent } from '../../shared-icons/global-icon.component'
+import { NgClass, NgFor, NgIf } from '@angular/common'
 
 export type TopMenuDropdownParam = {
   label: string
@@ -25,7 +27,20 @@ export type TopMenuDropdownParam = {
 @Component({
   selector: 'my-top-menu-dropdown',
   templateUrl: './top-menu-dropdown.component.html',
-  styleUrls: [ './top-menu-dropdown.component.scss' ]
+  styleUrls: [ './top-menu-dropdown.component.scss' ],
+  standalone: true,
+  imports: [
+    NgClass,
+    NgFor,
+    NgIf,
+    RouterLinkActive,
+    RouterLink,
+    NgbDropdown,
+    NgbDropdownToggle,
+    NgbDropdownMenu,
+    NgbDropdownItem,
+    GlobalIconComponent
+  ]
 })
 export class TopMenuDropdownComponent implements OnInit, OnDestroy {
   @Input() menuEntries: TopMenuDropdownParam[] = []
diff --git a/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
index 2064b9089..2005bf886 100644
--- a/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
+++ b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
@@ -4,7 +4,8 @@ import { PluginElementPlaceholder } from '@peertube/peertube-models'
 @Component({
   selector: 'my-plugin-placeholder',
   template: '<div [id]="getId()"></div>',
-  styleUrls: [ './plugin-placeholder.component.scss' ]
+  styleUrls: [ './plugin-placeholder.component.scss' ],
+  standalone: true
 })
 
 export class PluginPlaceholderComponent {
diff --git a/client/src/app/shared/shared-main/plugins/plugin-selector.directive.ts b/client/src/app/shared/shared-main/plugins/plugin-selector.directive.ts
index ddb431dec..52dfa8988 100644
--- a/client/src/app/shared/shared-main/plugins/plugin-selector.directive.ts
+++ b/client/src/app/shared/shared-main/plugins/plugin-selector.directive.ts
@@ -1,7 +1,10 @@
 import { Directive, ElementRef, Input, OnInit, Renderer2 } from '@angular/core'
 import { PluginSelectorId } from '@peertube/peertube-models'
 
-@Directive({ selector: '[myPluginSelector]' })
+@Directive({
+  selector: '[myPluginSelector]',
+  standalone: true
+})
 export class PluginSelectorDirective implements OnInit {
   @Input() pluginSelectorId: PluginSelectorId
 
diff --git a/client/src/app/shared/shared-main/shared-main.module.ts b/client/src/app/shared/shared-main/shared-main.module.ts
deleted file mode 100644
index 3d9bd9f6a..000000000
--- a/client/src/app/shared/shared-main/shared-main.module.ts
+++ /dev/null
@@ -1,227 +0,0 @@
-import { SharedModule as PrimeSharedModule } from 'primeng/api'
-import { ClipboardModule } from '@angular/cdk/clipboard'
-import { CommonModule, DatePipe } from '@angular/common'
-import { HttpClientModule } from '@angular/common/http'
-import { NgModule } from '@angular/core'
-import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { RouterModule } from '@angular/router'
-import {
-  NgbCollapseModule,
-  NgbDropdownModule,
-  NgbModalModule,
-  NgbNavModule,
-  NgbPopoverModule,
-  NgbTooltipModule
-} from '@ng-bootstrap/ng-bootstrap'
-import { LoadingBarModule } from '@ngx-loading-bar/core'
-import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { AccountService, SignupLabelComponent } from './account'
-import {
-  AutoColspanDirective,
-  AutofocusDirective,
-  BytesPipe,
-  DeferLoadingDirective,
-  TimeDurationFormatterPipe,
-  DaysDurationFormatterPipe,
-  FromNowPipe,
-  InfiniteScrollerDirective,
-  LinkComponent,
-  LoginLinkComponent,
-  NumberFormatterPipe,
-  PeerTubeTemplateDirective
-} from './angular'
-import { AUTH_INTERCEPTOR_PROVIDER } from './auth'
-import { ActionDropdownComponent, ButtonComponent, CopyButtonComponent, DeleteButtonComponent, EditButtonComponent } from './buttons'
-import { CustomPageService } from './custom-page'
-import { DateToggleComponent } from './date'
-import { FeedComponent } from './feeds'
-import { LoaderComponent } from './loaders'
-import {
-  ChannelsSetupMessageComponent,
-  HelpComponent,
-  ListOverflowComponent,
-  SimpleSearchInputComponent,
-  TopMenuDropdownComponent
-} from './misc'
-import { PluginPlaceholderComponent, PluginSelectorDirective } from './plugins'
-import { ActorRedirectGuard } from './router'
-import { UserHistoryService, UserNotificationService, UserQuotaComponent } from './users'
-import {
-  EmbedComponent,
-  RedundancyService,
-  VideoChapterService,
-  VideoFileTokenService,
-  VideoImportService,
-  VideoOwnershipService,
-  VideoPasswordService,
-  VideoResolver,
-  VideoService
-} from './video'
-import { VideoCaptionService } from './video-caption'
-import { VideoChannelService } from './video-channel'
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-    RouterModule,
-    HttpClientModule,
-
-    LoadingBarHttpClientModule,
-    LoadingBarModule,
-
-    NgbDropdownModule,
-    NgbModalModule,
-    NgbPopoverModule,
-    NgbNavModule,
-    NgbTooltipModule,
-    NgbCollapseModule,
-
-    ClipboardModule,
-
-    PrimeSharedModule,
-
-    SharedGlobalIconModule
-  ],
-
-  declarations: [
-    FromNowPipe,
-    NumberFormatterPipe,
-    BytesPipe,
-    TimeDurationFormatterPipe,
-    DaysDurationFormatterPipe,
-    AutofocusDirective,
-    DeferLoadingDirective,
-    AutoColspanDirective,
-
-    InfiniteScrollerDirective,
-    PeerTubeTemplateDirective,
-    LinkComponent,
-    LoginLinkComponent,
-
-    ActionDropdownComponent,
-    ButtonComponent,
-    CopyButtonComponent,
-    DeleteButtonComponent,
-    EditButtonComponent,
-
-    DateToggleComponent,
-
-    FeedComponent,
-
-    LoaderComponent,
-
-    ChannelsSetupMessageComponent,
-    HelpComponent,
-    ListOverflowComponent,
-    TopMenuDropdownComponent,
-    SimpleSearchInputComponent,
-
-    UserQuotaComponent,
-
-    SignupLabelComponent,
-
-    EmbedComponent,
-
-    PluginPlaceholderComponent,
-    PluginSelectorDirective
-  ],
-
-  exports: [
-    CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-    RouterModule,
-    HttpClientModule,
-
-    LoadingBarHttpClientModule,
-    LoadingBarModule,
-
-    NgbDropdownModule,
-    NgbModalModule,
-    NgbPopoverModule,
-    NgbNavModule,
-    NgbTooltipModule,
-    NgbCollapseModule,
-
-    ClipboardModule,
-
-    PrimeSharedModule,
-
-    FromNowPipe,
-    BytesPipe,
-    NumberFormatterPipe,
-    TimeDurationFormatterPipe,
-    DaysDurationFormatterPipe,
-    AutofocusDirective,
-    DeferLoadingDirective,
-    AutoColspanDirective,
-
-    InfiniteScrollerDirective,
-    PeerTubeTemplateDirective,
-    LinkComponent,
-    LoginLinkComponent,
-
-    ActionDropdownComponent,
-    ButtonComponent,
-    CopyButtonComponent,
-    DeleteButtonComponent,
-    EditButtonComponent,
-
-    DateToggleComponent,
-
-    FeedComponent,
-
-    LoaderComponent,
-
-    ChannelsSetupMessageComponent,
-    HelpComponent,
-    ListOverflowComponent,
-    TopMenuDropdownComponent,
-    SimpleSearchInputComponent,
-
-    UserQuotaComponent,
-
-    SignupLabelComponent,
-
-    EmbedComponent,
-
-    PluginPlaceholderComponent,
-    PluginSelectorDirective
-  ],
-
-  providers: [
-    DatePipe,
-
-    FromNowPipe,
-
-    AUTH_INTERCEPTOR_PROVIDER,
-
-    AccountService,
-
-    UserHistoryService,
-    UserNotificationService,
-
-    RedundancyService,
-    VideoImportService,
-    VideoOwnershipService,
-    VideoService,
-    VideoFileTokenService,
-    VideoResolver,
-
-    VideoCaptionService,
-
-    VideoChannelService,
-
-    VideoPasswordService,
-
-    VideoChapterService,
-
-    CustomPageService,
-
-    ActorRedirectGuard
-  ]
-})
-export class SharedMainModule { }
diff --git a/client/src/app/shared/shared-main/users/user-quota.component.ts b/client/src/app/shared/shared-main/users/user-quota.component.ts
index 5a95f1209..8c55635c9 100644
--- a/client/src/app/shared/shared-main/users/user-quota.component.ts
+++ b/client/src/app/shared/shared-main/users/user-quota.component.ts
@@ -2,11 +2,15 @@ import { Subject } from 'rxjs'
 import { Component, Input, OnInit } from '@angular/core'
 import { User, UserService } from '@app/core'
 import { BytesPipe } from '../angular'
+import { NgIf } from '@angular/common'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
   selector: 'my-user-quota',
   templateUrl: './user-quota.component.html',
-  styleUrls: [ './user-quota.component.scss' ]
+  styleUrls: [ './user-quota.component.scss' ],
+  standalone: true,
+  imports: [ NgbTooltip, NgIf, BytesPipe ]
 })
 
 export class UserQuotaComponent implements OnInit {
diff --git a/client/src/app/shared/shared-main/video-channel/video-channel.service.ts b/client/src/app/shared/shared-main/video-channel/video-channel.service.ts
index 68c53741f..261ade14e 100644
--- a/client/src/app/shared/shared-main/video-channel/video-channel.service.ts
+++ b/client/src/app/shared/shared-main/video-channel/video-channel.service.ts
@@ -16,7 +16,7 @@ import { Account } from '../account'
 import { AccountService } from '../account/account.service'
 import { VideoChannel } from './video-channel.model'
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class VideoChannelService {
   static BASE_VIDEO_CHANNEL_URL = environment.apiUrl + '/api/v1/video-channels/'
 
diff --git a/client/src/app/shared/shared-main/video/embed.component.ts b/client/src/app/shared/shared-main/video/embed.component.ts
index 426e2f57a..e5166e8ce 100644
--- a/client/src/app/shared/shared-main/video/embed.component.ts
+++ b/client/src/app/shared/shared-main/video/embed.component.ts
@@ -8,7 +8,8 @@ import { Video } from '@peertube/peertube-models'
 @Component({
   selector: 'my-embed',
   styleUrls: [ './embed.component.scss' ],
-  templateUrl: './embed.component.html'
+  templateUrl: './embed.component.html',
+  standalone: true
 })
 export class EmbedComponent implements OnInit {
   @Input({ required: true }) video: Pick<Video, 'name' | 'uuid'> & Partial<Pick<Video, 'aspectRatio'>>
diff --git a/client/src/app/shared/shared-moderation/account-block-badges.component.ts b/client/src/app/shared/shared-moderation/account-block-badges.component.ts
index a72601118..428caf0b0 100644
--- a/client/src/app/shared/shared-moderation/account-block-badges.component.ts
+++ b/client/src/app/shared/shared-moderation/account-block-badges.component.ts
@@ -1,10 +1,13 @@
 import { Component, Input } from '@angular/core'
 import { Account } from '../shared-main'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-account-block-badges',
   styleUrls: [ './account-block-badges.component.scss' ],
-  templateUrl: './account-block-badges.component.html'
+  templateUrl: './account-block-badges.component.html',
+  standalone: true,
+  imports: [ NgIf ]
 })
 export class AccountBlockBadgesComponent {
   @Input() account: Account
diff --git a/client/src/app/shared/shared-moderation/account-blocklist.component.ts b/client/src/app/shared/shared-moderation/account-blocklist.component.ts
index 38dbbff78..c22b94bde 100644
--- a/client/src/app/shared/shared-moderation/account-blocklist.component.ts
+++ b/client/src/app/shared/shared-moderation/account-blocklist.component.ts
@@ -4,7 +4,9 @@ import { Notifier, RestPagination, RestTable } from '@app/core'
 import { AccountBlock } from './account-block.model'
 import { BlocklistComponentType, BlocklistService } from './blocklist.service'
 
-@Directive()
+@Directive({
+  providers: [ BlocklistService ]
+})
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
 export class GenericAccountBlocklistComponent extends RestTable implements OnInit {
   // @ts-expect-error: "Abstract methods can only appear within an abstract class"
diff --git a/client/src/app/shared/shared-moderation/batch-domains-modal.component.ts b/client/src/app/shared/shared-moderation/batch-domains-modal.component.ts
index ec2fea528..b2a408097 100644
--- a/client/src/app/shared/shared-moderation/batch-domains-modal.component.ts
+++ b/client/src/app/shared/shared-moderation/batch-domains-modal.component.ts
@@ -3,11 +3,16 @@ import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
 import { splitAndGetNotEmpty, UNIQUE_HOSTS_VALIDATOR } from '../form-validators/host-validators'
+import { NgClass, NgIf } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-batch-domains-modal',
   templateUrl: './batch-domains-modal.component.html',
-  styleUrls: [ './batch-domains-modal.component.scss' ]
+  styleUrls: [ './batch-domains-modal.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent, FormsModule, ReactiveFormsModule, NgClass, NgIf ]
 })
 export class BatchDomainsModalComponent extends FormReactive implements OnInit {
   @ViewChild('modal', { static: true }) modal: NgbModal
diff --git a/client/src/app/shared/shared-moderation/index.ts b/client/src/app/shared/shared-moderation/index.ts
index da85b2299..fbd46bd13 100644
--- a/client/src/app/shared/shared-moderation/index.ts
+++ b/client/src/app/shared/shared-moderation/index.ts
@@ -12,4 +12,3 @@ export * from './user-ban-modal.component'
 export * from './user-moderation-dropdown.component'
 export * from './video-block.component'
 export * from './video-block.service'
-export * from './shared-moderation.module'
diff --git a/client/src/app/shared/shared-moderation/report-modals/account-report.component.ts b/client/src/app/shared/shared-moderation/report-modals/account-report.component.ts
index 042b57aa7..6110460df 100644
--- a/client/src/app/shared/shared-moderation/report-modals/account-report.component.ts
+++ b/client/src/app/shared/shared-moderation/report-modals/account-report.component.ts
@@ -9,11 +9,28 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
 import { abusePredefinedReasonsMap } from '@peertube/peertube-core-utils'
 import { AbusePredefinedReasonsString } from '@peertube/peertube-models'
 import { AbuseService } from '../abuse.service'
+import { PeerTubeTemplateDirective } from '../../shared-main/angular/peertube-template.directive'
+import { PeertubeCheckboxComponent } from '../../shared-forms/peertube-checkbox.component'
+import { NgFor, NgIf, NgClass } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../../shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-account-report',
   templateUrl: './report.component.html',
-  styleUrls: [ './report.component.scss' ]
+  styleUrls: [ './report.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    FormsModule,
+    ReactiveFormsModule,
+    NgFor,
+    PeertubeCheckboxComponent,
+    NgIf,
+    PeerTubeTemplateDirective,
+    NgClass
+  ],
+  providers: [ AbuseService ]
 })
 export class AccountReportComponent extends FormReactive implements OnInit {
   @ViewChild('modal', { static: true }) modal: NgbModal
diff --git a/client/src/app/shared/shared-moderation/report-modals/comment-report.component.ts b/client/src/app/shared/shared-moderation/report-modals/comment-report.component.ts
index fd50b745a..b657570df 100644
--- a/client/src/app/shared/shared-moderation/report-modals/comment-report.component.ts
+++ b/client/src/app/shared/shared-moderation/report-modals/comment-report.component.ts
@@ -9,11 +9,28 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
 import { abusePredefinedReasonsMap } from '@peertube/peertube-core-utils'
 import { AbusePredefinedReasonsString } from '@peertube/peertube-models'
 import { AbuseService } from '../abuse.service'
+import { PeerTubeTemplateDirective } from '../../shared-main/angular/peertube-template.directive'
+import { PeertubeCheckboxComponent } from '../../shared-forms/peertube-checkbox.component'
+import { NgFor, NgIf, NgClass } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../../shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-comment-report',
   templateUrl: './report.component.html',
-  styleUrls: [ './report.component.scss' ]
+  styleUrls: [ './report.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    FormsModule,
+    ReactiveFormsModule,
+    NgFor,
+    PeertubeCheckboxComponent,
+    NgIf,
+    PeerTubeTemplateDirective,
+    NgClass
+  ],
+  providers: [ AbuseService ]
 })
 export class CommentReportComponent extends FormReactive implements OnInit {
   @Input() comment: VideoComment = null
diff --git a/client/src/app/shared/shared-moderation/report-modals/video-report.component.ts b/client/src/app/shared/shared-moderation/report-modals/video-report.component.ts
index 479957d21..e4e71253b 100644
--- a/client/src/app/shared/shared-moderation/report-modals/video-report.component.ts
+++ b/client/src/app/shared/shared-moderation/report-modals/video-report.component.ts
@@ -1,6 +1,5 @@
 import { mapValues, pickBy } from 'lodash-es'
 import { Component, Input, OnInit, ViewChild } from '@angular/core'
-import { DomSanitizer } from '@angular/platform-browser'
 import { Notifier } from '@app/core'
 import { ABUSE_REASON_VALIDATOR } from '@app/shared/form-validators/abuse-validators'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
@@ -10,11 +9,32 @@ import { abusePredefinedReasonsMap } from '@peertube/peertube-core-utils'
 import { AbusePredefinedReasonsString } from '@peertube/peertube-models'
 import { Video } from '../../shared-main'
 import { AbuseService } from '../abuse.service'
+import { TimestampInputComponent } from '../../shared-forms/timestamp-input.component'
+import { EmbedComponent } from '../../shared-main/video/embed.component'
+import { PeerTubeTemplateDirective } from '../../shared-main/angular/peertube-template.directive'
+import { PeertubeCheckboxComponent } from '../../shared-forms/peertube-checkbox.component'
+import { NgFor, NgIf, NgClass } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../../shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-video-report',
   templateUrl: './video-report.component.html',
-  styleUrls: [ './report.component.scss' ]
+  styleUrls: [ './report.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    FormsModule,
+    ReactiveFormsModule,
+    NgFor,
+    PeertubeCheckboxComponent,
+    NgIf,
+    PeerTubeTemplateDirective,
+    EmbedComponent,
+    TimestampInputComponent,
+    NgClass
+  ],
+  providers: [ AbuseService ]
 })
 export class VideoReportComponent extends FormReactive implements OnInit {
   @Input() video: Video = null
@@ -30,8 +50,7 @@ export class VideoReportComponent extends FormReactive implements OnInit {
     protected formReactiveService: FormReactiveService,
     private modalService: NgbModal,
     private abuseService: AbuseService,
-    private notifier: Notifier,
-    private sanitizer: DomSanitizer
+    private notifier: Notifier
   ) {
     super()
   }
diff --git a/client/src/app/shared/shared-moderation/server-blocklist.component.ts b/client/src/app/shared/shared-moderation/server-blocklist.component.ts
index 4105645fa..b87519769 100644
--- a/client/src/app/shared/shared-moderation/server-blocklist.component.ts
+++ b/client/src/app/shared/shared-moderation/server-blocklist.component.ts
@@ -5,7 +5,9 @@ import { BatchDomainsModalComponent } from '@app/shared/shared-moderation/batch-
 import { ServerBlock } from '@peertube/peertube-models'
 import { BlocklistComponentType, BlocklistService } from './blocklist.service'
 
-@Directive()
+@Directive({
+  providers: [ BlocklistService ]
+})
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
 export class GenericServerBlocklistComponent extends RestTable implements OnInit {
   @ViewChild('batchDomainsModal') batchDomainsModal: BatchDomainsModalComponent
diff --git a/client/src/app/shared/shared-moderation/shared-moderation.module.ts b/client/src/app/shared/shared-moderation/shared-moderation.module.ts
deleted file mode 100644
index 8c5d8399c..000000000
--- a/client/src/app/shared/shared-moderation/shared-moderation.module.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedActorImageModule } from '../shared-actor-image/shared-actor-image.module'
-import { SharedFormModule } from '../shared-forms/shared-form.module'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { SharedUsersModule } from '../shared-users'
-import { SharedVideoCommentModule } from '../shared-video-comment'
-import { AbuseService } from './abuse.service'
-import { AccountBlockBadgesComponent } from './account-block-badges.component'
-import { BatchDomainsModalComponent } from './batch-domains-modal.component'
-import { BlocklistService } from './blocklist.service'
-import { BulkService } from './bulk.service'
-import { AccountReportComponent, CommentReportComponent, VideoReportComponent } from './report-modals'
-import { UserBanModalComponent } from './user-ban-modal.component'
-import { UserModerationDropdownComponent } from './user-moderation-dropdown.component'
-import { VideoBlockComponent } from './video-block.component'
-import { VideoBlockService } from './video-block.service'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    SharedFormModule,
-    SharedGlobalIconModule,
-    SharedVideoCommentModule,
-    SharedActorImageModule,
-    SharedUsersModule
-  ],
-
-  declarations: [
-    UserBanModalComponent,
-    UserModerationDropdownComponent,
-    VideoBlockComponent,
-    VideoReportComponent,
-    BatchDomainsModalComponent,
-    CommentReportComponent,
-    AccountReportComponent,
-    AccountBlockBadgesComponent
-  ],
-
-  exports: [
-    UserBanModalComponent,
-    UserModerationDropdownComponent,
-    VideoBlockComponent,
-    VideoReportComponent,
-    BatchDomainsModalComponent,
-    CommentReportComponent,
-    AccountReportComponent,
-    AccountBlockBadgesComponent
-  ],
-
-  providers: [
-    BlocklistService,
-    BulkService,
-    AbuseService,
-    VideoBlockService
-  ]
-})
-export class SharedModerationModule { }
diff --git a/client/src/app/shared/shared-moderation/user-ban-modal.component.ts b/client/src/app/shared/shared-moderation/user-ban-modal.component.ts
index fcada7acc..8cb25d614 100644
--- a/client/src/app/shared/shared-moderation/user-ban-modal.component.ts
+++ b/client/src/app/shared/shared-moderation/user-ban-modal.component.ts
@@ -10,11 +10,18 @@ import { USER_BAN_REASON_VALIDATOR } from '../form-validators/user-validators'
 import { Account } from '../shared-main'
 import { UserAdminService } from '../shared-users'
 import { BlocklistService } from './blocklist.service'
+import { PeertubeCheckboxComponent } from '../shared-forms/peertube-checkbox.component'
+import { NgClass, NgIf } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-user-ban-modal',
   templateUrl: './user-ban-modal.component.html',
-  styleUrls: [ './user-ban-modal.component.scss' ]
+  styleUrls: [ './user-ban-modal.component.scss' ],
+  standalone: true,
+  imports: [ GlobalIconComponent, FormsModule, ReactiveFormsModule, NgClass, NgIf, PeertubeCheckboxComponent ],
+  providers: [ UserAdminService, BlocklistService ]
 })
 export class UserBanModalComponent extends FormReactive implements OnInit {
   @ViewChild('modal', { static: true }) modal: NgbModal
diff --git a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
index 7de152e60..dba670ee4 100644
--- a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
+++ b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
@@ -6,6 +6,8 @@ import { UserAdminService } from '../shared-users'
 import { BlocklistService } from './blocklist.service'
 import { BulkService } from './bulk.service'
 import { UserBanModalComponent } from './user-ban-modal.component'
+import { ActionDropdownComponent } from '../shared-main/buttons/action-dropdown.component'
+import { NgIf } from '@angular/common'
 
 export type AccountMutedStatus =
   Pick<Account, 'id' | 'nameWithHost' | 'host' | 'userId' |
@@ -19,7 +21,10 @@ export type UserModerationDisplayType = {
 
 @Component({
   selector: 'my-user-moderation-dropdown',
-  templateUrl: './user-moderation-dropdown.component.html'
+  templateUrl: './user-moderation-dropdown.component.html',
+  standalone: true,
+  imports: [ NgIf, UserBanModalComponent, ActionDropdownComponent ],
+  providers: [ UserAdminService, BlocklistService, BulkService ]
 })
 export class UserModerationDropdownComponent implements OnInit, OnChanges {
   @ViewChild('userBanModal') userBanModal: UserBanModalComponent
diff --git a/client/src/app/shared/shared-moderation/video-block.component.ts b/client/src/app/shared/shared-moderation/video-block.component.ts
index 0137def89..588b1db50 100644
--- a/client/src/app/shared/shared-moderation/video-block.component.ts
+++ b/client/src/app/shared/shared-moderation/video-block.component.ts
@@ -7,11 +7,18 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
 import { VIDEO_BLOCK_REASON_VALIDATOR } from '../form-validators/video-block-validators'
 import { VideoBlockService } from './video-block.service'
+import { PeertubeCheckboxComponent } from '../shared-forms/peertube-checkbox.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { NgIf, NgClass } from '@angular/common'
 
 @Component({
   selector: 'my-video-block',
   templateUrl: './video-block.component.html',
-  styleUrls: [ './video-block.component.scss' ]
+  styleUrls: [ './video-block.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, GlobalIconComponent, FormsModule, ReactiveFormsModule, NgClass, PeertubeCheckboxComponent ],
+  providers: [ VideoBlockService ]
 })
 export class VideoBlockComponent extends FormReactive implements OnInit {
   @ViewChild('modal', { static: true }) modal: NgbModal
diff --git a/client/src/app/shared/shared-search/index.ts b/client/src/app/shared/shared-search/index.ts
index 0235893c4..ede7ab143 100644
--- a/client/src/app/shared/shared-search/index.ts
+++ b/client/src/app/shared/shared-search/index.ts
@@ -1,4 +1,3 @@
 export * from './advanced-search.model'
 export * from './find-in-bulk.service'
 export * from './search.service'
-export * from './shared-search.module'
diff --git a/client/src/app/shared/shared-search/shared-search.module.ts b/client/src/app/shared/shared-search/shared-search.module.ts
deleted file mode 100644
index 8b5492400..000000000
--- a/client/src/app/shared/shared-search/shared-search.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedMainModule } from '../shared-main'
-import { SharedVideoPlaylistModule } from '../shared-video-playlist'
-import { FindInBulkService } from './find-in-bulk.service'
-import { SearchService } from './search.service'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    SharedVideoPlaylistModule
-  ],
-
-  declarations: [
-  ],
-
-  exports: [
-  ],
-
-  providers: [
-    FindInBulkService,
-    SearchService
-  ]
-})
-export class SharedSearchModule { }
diff --git a/client/src/app/shared/shared-share-modal/index.ts b/client/src/app/shared/shared-share-modal/index.ts
index e13c08acc..adc188709 100644
--- a/client/src/app/shared/shared-share-modal/index.ts
+++ b/client/src/app/shared/shared-share-modal/index.ts
@@ -1,3 +1 @@
 export * from './video-share.component'
-
-export * from './shared-share-modal.module'
diff --git a/client/src/app/shared/shared-share-modal/shared-share-modal.module.ts b/client/src/app/shared/shared-share-modal/shared-share-modal.module.ts
deleted file mode 100644
index e269eecac..000000000
--- a/client/src/app/shared/shared-share-modal/shared-share-modal.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { QRCodeModule } from 'angularx-qrcode'
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '../shared-forms'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { VideoShareComponent } from './video-share.component'
-
-@NgModule({
-  imports: [
-    QRCodeModule,
-
-    SharedMainModule,
-    SharedFormModule,
-    SharedGlobalIconModule
-  ],
-
-  declarations: [
-    VideoShareComponent
-  ],
-
-  exports: [
-    VideoShareComponent
-  ],
-
-  providers: [ ]
-})
-export class SharedShareModal { }
diff --git a/client/src/app/shared/shared-share-modal/video-share.component.ts b/client/src/app/shared/shared-share-modal/video-share.component.ts
index ccc46676c..9546e4caf 100644
--- a/client/src/app/shared/shared-share-modal/video-share.component.ts
+++ b/client/src/app/shared/shared-share-modal/video-share.component.ts
@@ -3,10 +3,28 @@ import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
 import { HooksService, ServerService } from '@app/core'
 import { VideoDetails } from '@app/shared/shared-main'
 import { VideoPlaylist } from '@app/shared/shared-video-playlist'
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import {
+  NgbModal,
+  NgbNav,
+  NgbNavItem,
+  NgbNavLink,
+  NgbNavLinkBase,
+  NgbNavContent,
+  NgbNavOutlet,
+  NgbCollapse
+} from '@ng-bootstrap/ng-bootstrap'
 import { buildVideoOrPlaylistEmbed } from '@root-helpers/video'
 import { buildPlaylistLink, buildVideoLink, decoratePlaylistLink, decorateVideoLink } from '@peertube/peertube-core-utils'
 import { VideoCaption, VideoPlaylistPrivacy, VideoPrivacy } from '@peertube/peertube-models'
+import { TimestampInputComponent } from '../shared-forms/timestamp-input.component'
+import { PluginPlaceholderComponent } from '../shared-main/plugins/plugin-placeholder.component'
+import { FormsModule } from '@angular/forms'
+import { PeertubeCheckboxComponent } from '../shared-forms/peertube-checkbox.component'
+import { QRCodeModule } from 'angularx-qrcode'
+import { InputTextComponent } from '../shared-forms/input-text.component'
+import { RouterLink } from '@angular/router'
+import { NgIf, NgClass, NgFor } from '@angular/common'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
 
 type Customizations = {
   startAtCheckbox: boolean
@@ -39,7 +57,28 @@ type TabId = 'url' | 'qrcode' | 'embed'
 @Component({
   selector: 'my-video-share',
   templateUrl: './video-share.component.html',
-  styleUrls: [ './video-share.component.scss' ]
+  styleUrls: [ './video-share.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    NgIf,
+    RouterLink,
+    NgbNav,
+    NgbNavItem,
+    NgbNavLink,
+    NgbNavLinkBase,
+    NgbNavContent,
+    InputTextComponent,
+    QRCodeModule,
+    NgbNavOutlet,
+    PeertubeCheckboxComponent,
+    FormsModule,
+    PluginPlaceholderComponent,
+    TimestampInputComponent,
+    NgClass,
+    NgFor,
+    NgbCollapse
+  ]
 })
 export class VideoShareComponent {
   @ViewChild('modal', { static: true }) modal: ElementRef
diff --git a/client/src/app/shared/shared-support-modal/index.ts b/client/src/app/shared/shared-support-modal/index.ts
index f41bb4bc2..8ea66ae7a 100644
--- a/client/src/app/shared/shared-support-modal/index.ts
+++ b/client/src/app/shared/shared-support-modal/index.ts
@@ -1,3 +1 @@
 export * from './support-modal.component'
-
-export * from './shared-support-modal.module'
diff --git a/client/src/app/shared/shared-support-modal/shared-support-modal.module.ts b/client/src/app/shared/shared-support-modal/shared-support-modal.module.ts
deleted file mode 100644
index 1101d5535..000000000
--- a/client/src/app/shared/shared-support-modal/shared-support-modal.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '../shared-forms'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { SupportModalComponent } from './support-modal.component'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    SharedFormModule,
-    SharedGlobalIconModule
-  ],
-
-  declarations: [
-    SupportModalComponent
-  ],
-
-  exports: [
-    SupportModalComponent
-  ],
-
-  providers: [ ]
-})
-export class SharedSupportModal { }
diff --git a/client/src/app/shared/shared-support-modal/support-modal.component.ts b/client/src/app/shared/shared-support-modal/support-modal.component.ts
index d911b45d8..7c0303baa 100644
--- a/client/src/app/shared/shared-support-modal/support-modal.component.ts
+++ b/client/src/app/shared/shared-support-modal/support-modal.component.ts
@@ -3,10 +3,13 @@ import { MarkdownService } from '@app/core'
 import { VideoDetails } from '@app/shared/shared-main'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { VideoChannel } from '@peertube/peertube-models'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-support-modal',
-  templateUrl: './support-modal.component.html'
+  templateUrl: './support-modal.component.html',
+  standalone: true,
+  imports: [ GlobalIconComponent ]
 })
 export class SupportModalComponent {
   @Input() video: VideoDetails = null
diff --git a/client/src/app/shared/shared-tables/index.ts b/client/src/app/shared/shared-tables/index.ts
index e7b593257..82aa4a73b 100644
--- a/client/src/app/shared/shared-tables/index.ts
+++ b/client/src/app/shared/shared-tables/index.ts
@@ -1,3 +1,2 @@
 export * from './table-expander-icon.component'
 export * from './video-cell.component'
-export * from './shared-tables.module'
diff --git a/client/src/app/shared/shared-tables/shared-tables.module.ts b/client/src/app/shared/shared-tables/shared-tables.module.ts
deleted file mode 100644
index 1cb56fe7f..000000000
--- a/client/src/app/shared/shared-tables/shared-tables.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { TableExpanderIconComponent } from './table-expander-icon.component'
-import { VideoCellComponent } from './video-cell.component'
-
-@NgModule({
-  imports: [
-    SharedMainModule
-  ],
-
-  declarations: [
-    VideoCellComponent,
-    TableExpanderIconComponent
-  ],
-
-  exports: [
-    VideoCellComponent,
-    TableExpanderIconComponent
-  ],
-
-  providers: [
-  ]
-})
-export class SharedTablesModule { }
diff --git a/client/src/app/shared/shared-tables/table-expander-icon.component.ts b/client/src/app/shared/shared-tables/table-expander-icon.component.ts
index 9c3983be1..f06f89a60 100644
--- a/client/src/app/shared/shared-tables/table-expander-icon.component.ts
+++ b/client/src/app/shared/shared-tables/table-expander-icon.component.ts
@@ -1,11 +1,15 @@
 import { Component, Input } from '@angular/core'
+import { NgClass } from '@angular/common'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
   selector: 'my-table-expander-icon',
   template: `
 <button class="expander border-0 p-0" [ngbTooltip]="tooltip">
   <i [ngClass]="expanded ? 'chevron-down' : 'chevron-right'"></i>
-</button>`
+</button>`,
+  standalone: true,
+  imports: [ NgbTooltip, NgClass ]
 })
 export class TableExpanderIconComponent {
   @Input() expanded: boolean
diff --git a/client/src/app/shared/shared-tables/video-cell.component.ts b/client/src/app/shared/shared-tables/video-cell.component.ts
index 62984180d..2e701c44b 100644
--- a/client/src/app/shared/shared-tables/video-cell.component.ts
+++ b/client/src/app/shared/shared-tables/video-cell.component.ts
@@ -4,7 +4,8 @@ import { Video } from '@app/shared/shared-main'
 @Component({
   selector: 'my-video-cell',
   styleUrls: [ 'video-cell.component.scss' ],
-  templateUrl: 'video-cell.component.html'
+  templateUrl: 'video-cell.component.html',
+  standalone: true
 })
 export class VideoCellComponent {
   @Input() video: Video
diff --git a/client/src/app/shared/shared-thumbnail/index.ts b/client/src/app/shared/shared-thumbnail/index.ts
index e09692867..b77ce2de8 100644
--- a/client/src/app/shared/shared-thumbnail/index.ts
+++ b/client/src/app/shared/shared-thumbnail/index.ts
@@ -1,2 +1 @@
 export * from './video-thumbnail.component'
-export * from './shared-thumbnail.module'
diff --git a/client/src/app/shared/shared-thumbnail/shared-thumbnail.module.ts b/client/src/app/shared/shared-thumbnail/shared-thumbnail.module.ts
deleted file mode 100644
index 060e70c04..000000000
--- a/client/src/app/shared/shared-thumbnail/shared-thumbnail.module.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { VideoThumbnailComponent } from './video-thumbnail.component'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    SharedGlobalIconModule
-  ],
-
-  declarations: [
-    VideoThumbnailComponent
-  ],
-
-  exports: [
-    VideoThumbnailComponent
-  ],
-
-  providers: [ ]
-})
-export class SharedThumbnailModule { }
diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
index 9891d42ed..6daa9e22e 100644
--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
@@ -2,11 +2,17 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'
 import { ScreenService } from '@app/core'
 import { VideoState } from '@peertube/peertube-models'
 import { Video } from '../shared-main'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { RouterLink } from '@angular/router'
+import { NgIf, NgTemplateOutlet, NgClass, NgStyle } from '@angular/common'
 
 @Component({
   selector: 'my-video-thumbnail',
   styleUrls: [ './video-thumbnail.component.scss' ],
-  templateUrl: './video-thumbnail.component.html'
+  templateUrl: './video-thumbnail.component.html',
+  standalone: true,
+  imports: [ NgIf, RouterLink, NgTemplateOutlet, NgClass, NgbTooltip, GlobalIconComponent, NgStyle ]
 })
 export class VideoThumbnailComponent {
   @Input() video: Video
diff --git a/client/src/app/shared/shared-user-settings/index.ts b/client/src/app/shared/shared-user-settings/index.ts
index dcc08bdce..6f06c0954 100644
--- a/client/src/app/shared/shared-user-settings/index.ts
+++ b/client/src/app/shared/shared-user-settings/index.ts
@@ -1,4 +1,2 @@
 export * from './user-interface-settings.component'
 export * from './user-video-settings.component'
-
-export * from './shared-user-settings.module'
diff --git a/client/src/app/shared/shared-user-settings/shared-user-settings.module.ts b/client/src/app/shared/shared-user-settings/shared-user-settings.module.ts
deleted file mode 100644
index c010f3848..000000000
--- a/client/src/app/shared/shared-user-settings/shared-user-settings.module.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '../shared-forms'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { UserInterfaceSettingsComponent } from './user-interface-settings.component'
-import { UserVideoSettingsComponent } from './user-video-settings.component'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    SharedFormModule
-  ],
-
-  declarations: [
-    UserInterfaceSettingsComponent,
-    UserVideoSettingsComponent
-  ],
-
-  exports: [
-    UserInterfaceSettingsComponent,
-    UserVideoSettingsComponent
-  ],
-
-  providers: [ ]
-})
-export class SharedUserInterfaceSettingsModule { }
diff --git a/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts b/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts
index 08c6b6933..bdca0b0a8 100644
--- a/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts
+++ b/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts
@@ -4,11 +4,15 @@ import { AuthService, Notifier, ServerService, ThemeService, UserService } from
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { HTMLServerConfig, User, UserUpdateMe } from '@peertube/peertube-models'
 import { SelectOptionsItem } from 'src/types'
+import { NgFor, NgIf } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 
 @Component({
   selector: 'my-user-interface-settings',
   templateUrl: './user-interface-settings.component.html',
-  styleUrls: [ './user-interface-settings.component.scss' ]
+  styleUrls: [ './user-interface-settings.component.scss' ],
+  standalone: true,
+  imports: [ FormsModule, ReactiveFormsModule, NgFor, NgIf ]
 })
 export class UserInterfaceSettingsComponent extends FormReactive implements OnInit, OnDestroy {
   @Input() user: User = null
diff --git a/client/src/app/shared/shared-user-settings/user-video-settings.component.ts b/client/src/app/shared/shared-user-settings/user-video-settings.component.ts
index 234d5b217..075199360 100644
--- a/client/src/app/shared/shared-user-settings/user-video-settings.component.ts
+++ b/client/src/app/shared/shared-user-settings/user-video-settings.component.ts
@@ -5,11 +5,29 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'
 import { AuthService, Notifier, ServerService, User, UserService } from '@app/core'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { NSFWPolicyType, UserUpdateMe } from '@peertube/peertube-models'
+import { NgIf } from '@angular/common'
+import { RouterLink } from '@angular/router'
+import { PeertubeCheckboxComponent } from '../shared-forms/peertube-checkbox.component'
+import { SelectLanguagesComponent } from '../shared-forms/select/select-languages.component'
+import { PeerTubeTemplateDirective } from '../shared-main/angular/peertube-template.directive'
+import { HelpComponent } from '../shared-main/misc/help.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 
 @Component({
   selector: 'my-user-video-settings',
   templateUrl: './user-video-settings.component.html',
-  styleUrls: [ './user-video-settings.component.scss' ]
+  styleUrls: [ './user-video-settings.component.scss' ],
+  standalone: true,
+  imports: [
+    FormsModule,
+    ReactiveFormsModule,
+    HelpComponent,
+    PeerTubeTemplateDirective,
+    SelectLanguagesComponent,
+    PeertubeCheckboxComponent,
+    RouterLink,
+    NgIf
+  ]
 })
 export class UserVideoSettingsComponent extends FormReactive implements OnInit, OnDestroy {
   @Input() user: User = null
diff --git a/client/src/app/shared/shared-user-subscription/index.ts b/client/src/app/shared/shared-user-subscription/index.ts
index fd53d14b5..e76940f7b 100644
--- a/client/src/app/shared/shared-user-subscription/index.ts
+++ b/client/src/app/shared/shared-user-subscription/index.ts
@@ -1,5 +1,3 @@
 export * from './user-subscription.service'
 export * from './subscribe-button.component'
 export * from './remote-subscribe.component'
-
-export * from './shared-user-subscription.module'
diff --git a/client/src/app/shared/shared-user-subscription/remote-subscribe.component.ts b/client/src/app/shared/shared-user-subscription/remote-subscribe.component.ts
index 295b0812a..e466a8dbf 100644
--- a/client/src/app/shared/shared-user-subscription/remote-subscribe.component.ts
+++ b/client/src/app/shared/shared-user-subscription/remote-subscribe.component.ts
@@ -3,11 +3,17 @@ import { Notifier } from '@app/core'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
 import { logger } from '@root-helpers/logger'
 import { USER_HANDLE_VALIDATOR } from '../form-validators/user-validators'
+import { PeerTubeTemplateDirective } from '../shared-main/angular/peertube-template.directive'
+import { HelpComponent } from '../shared-main/misc/help.component'
+import { NgIf } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 
 @Component({
   selector: 'my-remote-subscribe',
   templateUrl: './remote-subscribe.component.html',
-  styleUrls: [ './remote-subscribe.component.scss' ]
+  styleUrls: [ './remote-subscribe.component.scss' ],
+  standalone: true,
+  imports: [ FormsModule, ReactiveFormsModule, NgIf, HelpComponent, PeerTubeTemplateDirective ]
 })
 export class RemoteSubscribeComponent extends FormReactive implements OnInit {
   @Input() uri: string
diff --git a/client/src/app/shared/shared-user-subscription/shared-user-subscription.module.ts b/client/src/app/shared/shared-user-subscription/shared-user-subscription.module.ts
deleted file mode 100644
index 9c4d1c70f..000000000
--- a/client/src/app/shared/shared-user-subscription/shared-user-subscription.module.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '../shared-forms'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { RemoteSubscribeComponent } from './remote-subscribe.component'
-import { SubscribeButtonComponent } from './subscribe-button.component'
-import { UserSubscriptionService } from './user-subscription.service'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    SharedFormModule
-  ],
-
-  declarations: [
-    RemoteSubscribeComponent,
-    SubscribeButtonComponent
-  ],
-
-  exports: [
-    RemoteSubscribeComponent,
-    SubscribeButtonComponent
-  ],
-
-  providers: [
-    UserSubscriptionService
-  ]
-})
-export class SharedUserSubscriptionModule { }
diff --git a/client/src/app/shared/shared-user-subscription/subscribe-button.component.ts b/client/src/app/shared/shared-user-subscription/subscribe-button.component.ts
index 4e15f7bc0..6f7d99ab5 100644
--- a/client/src/app/shared/shared-user-subscription/subscribe-button.component.ts
+++ b/client/src/app/shared/shared-user-subscription/subscribe-button.component.ts
@@ -4,11 +4,26 @@ import { AuthService, Notifier, RedirectService } from '@app/core'
 import { Account, VideoChannel, VideoService } from '@app/shared/shared-main'
 import { FeedFormat } from '@peertube/peertube-models'
 import { UserSubscriptionService } from './user-subscription.service'
+import { NumberFormatterPipe } from '../shared-main/angular/number-formatter.pipe'
+import { RemoteSubscribeComponent } from './remote-subscribe.component'
+import { NgbDropdown, NgbDropdownToggle, NgbDropdownMenu } from '@ng-bootstrap/ng-bootstrap'
+import { NgClass, NgIf, NgTemplateOutlet } from '@angular/common'
 
 @Component({
   selector: 'my-subscribe-button',
   templateUrl: './subscribe-button.component.html',
-  styleUrls: [ './subscribe-button.component.scss' ]
+  styleUrls: [ './subscribe-button.component.scss' ],
+  standalone: true,
+  imports: [
+    NgClass,
+    NgIf,
+    NgTemplateOutlet,
+    NgbDropdown,
+    NgbDropdownToggle,
+    NgbDropdownMenu,
+    RemoteSubscribeComponent,
+    NumberFormatterPipe
+  ]
 })
 export class SubscribeButtonComponent implements OnInit, OnChanges {
   /**
diff --git a/client/src/app/shared/shared-users/index.ts b/client/src/app/shared/shared-users/index.ts
index 95d90e49e..a491f321c 100644
--- a/client/src/app/shared/shared-users/index.ts
+++ b/client/src/app/shared/shared-users/index.ts
@@ -1,4 +1,2 @@
 export * from './user-admin.service'
 export * from './two-factor.service'
-
-export * from './shared-users.module'
diff --git a/client/src/app/shared/shared-users/shared-users.module.ts b/client/src/app/shared/shared-users/shared-users.module.ts
deleted file mode 100644
index efffc6026..000000000
--- a/client/src/app/shared/shared-users/shared-users.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { TwoFactorService } from './two-factor.service'
-import { UserAdminService } from './user-admin.service'
-
-@NgModule({
-  imports: [
-    SharedMainModule
-  ],
-
-  declarations: [ ],
-
-  exports: [],
-
-  providers: [
-    UserAdminService,
-    TwoFactorService
-  ]
-})
-export class SharedUsersModule { }
diff --git a/client/src/app/shared/shared-video-comment/index.ts b/client/src/app/shared/shared-video-comment/index.ts
index b1195f232..2fc2c5127 100644
--- a/client/src/app/shared/shared-video-comment/index.ts
+++ b/client/src/app/shared/shared-video-comment/index.ts
@@ -1,5 +1,3 @@
 export * from './video-comment.service'
 export * from './video-comment.model'
 export * from './video-comment-thread-tree.model'
-
-export * from './shared-video-comment.module'
diff --git a/client/src/app/shared/shared-video-comment/shared-video-comment.module.ts b/client/src/app/shared/shared-video-comment/shared-video-comment.module.ts
deleted file mode 100644
index c4c2a9bb1..000000000
--- a/client/src/app/shared/shared-video-comment/shared-video-comment.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { VideoCommentService } from './video-comment.service'
-
-@NgModule({
-  imports: [
-    SharedMainModule
-  ],
-
-  declarations: [ ],
-
-  exports: [ ],
-
-  providers: [
-    VideoCommentService
-  ]
-})
-export class SharedVideoCommentModule { }
diff --git a/client/src/app/shared/shared-video-live/index.ts b/client/src/app/shared/shared-video-live/index.ts
index c4048e7c5..b502f6fb1 100644
--- a/client/src/app/shared/shared-video-live/index.ts
+++ b/client/src/app/shared/shared-video-live/index.ts
@@ -1,4 +1,2 @@
 export * from './live-video.service'
 export * from './live-stream-information.component'
-
-export * from './shared-video-live.module'
diff --git a/client/src/app/shared/shared-video-live/live-documentation-link.component.ts b/client/src/app/shared/shared-video-live/live-documentation-link.component.ts
index be4006ce8..15bd56e21 100644
--- a/client/src/app/shared/shared-video-live/live-documentation-link.component.ts
+++ b/client/src/app/shared/shared-video-live/live-documentation-link.component.ts
@@ -3,7 +3,8 @@ import { Component } from '@angular/core'
 @Component({
   selector: 'my-live-documentation-link',
   templateUrl: './live-documentation-link.component.html',
-  styleUrls: [ ]
+  styleUrls: [],
+  standalone: true
 })
 export class LiveDocumentationLinkComponent {
 
diff --git a/client/src/app/shared/shared-video-live/live-stream-information.component.ts b/client/src/app/shared/shared-video-live/live-stream-information.component.ts
index eb0d84b0a..0a64181d3 100644
--- a/client/src/app/shared/shared-video-live/live-stream-information.component.ts
+++ b/client/src/app/shared/shared-video-live/live-stream-information.component.ts
@@ -3,11 +3,28 @@ import { Video } from '@app/shared/shared-main'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { LiveVideo, LiveVideoError, LiveVideoErrorType, LiveVideoSession } from '@peertube/peertube-models'
 import { LiveVideoService } from './live-video.service'
+import { EditButtonComponent } from '../shared-main/buttons/edit-button.component'
+import { RouterLink } from '@angular/router'
+import { InputTextComponent } from '../shared-forms/input-text.component'
+import { LiveDocumentationLinkComponent } from './live-documentation-link.component'
+import { NgIf, NgFor, DatePipe } from '@angular/common'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
 
 @Component({
   selector: 'my-live-stream-information',
   templateUrl: './live-stream-information.component.html',
-  styleUrls: [ './live-stream-information.component.scss' ]
+  styleUrls: [ './live-stream-information.component.scss' ],
+  standalone: true,
+  imports: [
+    GlobalIconComponent,
+    NgIf,
+    LiveDocumentationLinkComponent,
+    InputTextComponent,
+    NgFor,
+    RouterLink,
+    EditButtonComponent,
+    DatePipe
+  ]
 })
 export class LiveStreamInformationComponent {
   @ViewChild('modal', { static: true }) modal: ElementRef
diff --git a/client/src/app/shared/shared-video-live/shared-video-live.module.ts b/client/src/app/shared/shared-video-live/shared-video-live.module.ts
deleted file mode 100644
index 3e186f591..000000000
--- a/client/src/app/shared/shared-video-live/shared-video-live.module.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '../shared-forms'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { LiveDocumentationLinkComponent } from './live-documentation-link.component'
-import { LiveStreamInformationComponent } from './live-stream-information.component'
-import { LiveVideoService } from './live-video.service'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    SharedFormModule,
-    SharedGlobalIconModule
-  ],
-
-  declarations: [
-    LiveStreamInformationComponent,
-    LiveDocumentationLinkComponent
-  ],
-
-  exports: [
-    LiveStreamInformationComponent,
-    LiveDocumentationLinkComponent
-  ],
-
-  providers: [
-    LiveVideoService
-  ]
-})
-export class SharedVideoLiveModule { }
diff --git a/client/src/app/shared/shared-video-miniature/index.ts b/client/src/app/shared/shared-video-miniature/index.ts
index 0086d8e6a..9735d772a 100644
--- a/client/src/app/shared/shared-video-miniature/index.ts
+++ b/client/src/app/shared/shared-video-miniature/index.ts
@@ -5,4 +5,3 @@ export * from './video-filters.model'
 export * from './video-miniature.component'
 export * from './videos-list.component'
 export * from './videos-selection.component'
-export * from './shared-video-miniature.module'
diff --git a/client/src/app/shared/shared-video-miniature/shared-video-miniature.module.ts b/client/src/app/shared/shared-video-miniature/shared-video-miniature.module.ts
deleted file mode 100644
index d0cf355f1..000000000
--- a/client/src/app/shared/shared-video-miniature/shared-video-miniature.module.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedActorImageModule } from '../shared-actor-image/shared-actor-image.module'
-import { SharedFormModule } from '../shared-forms'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { SharedModerationModule } from '../shared-moderation'
-import { SharedThumbnailModule } from '../shared-thumbnail'
-import { SharedVideoModule } from '../shared-video'
-import { SharedVideoLiveModule } from '../shared-video-live'
-import { SharedVideoPlaylistModule } from '../shared-video-playlist/shared-video-playlist.module'
-import { VideoActionsDropdownComponent } from './video-actions-dropdown.component'
-import { VideoDownloadComponent } from './video-download.component'
-import { VideoFiltersHeaderComponent } from './video-filters-header.component'
-import { VideoMiniatureComponent } from './video-miniature.component'
-import { VideosListComponent } from './videos-list.component'
-import { VideosSelectionComponent } from './videos-selection.component'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    SharedFormModule,
-    SharedModerationModule,
-    SharedVideoPlaylistModule,
-    SharedThumbnailModule,
-    SharedGlobalIconModule,
-    SharedVideoLiveModule,
-    SharedVideoModule,
-    SharedActorImageModule
-  ],
-
-  declarations: [
-    VideoActionsDropdownComponent,
-    VideoDownloadComponent,
-    VideoMiniatureComponent,
-    VideosSelectionComponent,
-    VideoFiltersHeaderComponent,
-    VideosListComponent
-  ],
-
-  exports: [
-    VideoActionsDropdownComponent,
-    VideoDownloadComponent,
-    VideoMiniatureComponent,
-    VideosSelectionComponent,
-    VideoFiltersHeaderComponent,
-    VideosListComponent
-  ],
-
-  providers: [ ]
-})
-export class SharedVideoMiniatureModule { }
diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
index 806629601..f89dc50fb 100644
--- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@angular/core'
 import { AuthService, ConfirmService, Notifier, ScreenService, ServerService } from '@app/core'
 import { BlocklistService, VideoBlockComponent, VideoBlockService, VideoReportComponent } from '@app/shared/shared-moderation'
-import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
+import { NgbDropdown, NgbDropdownAnchor, NgbDropdownMenu } from '@ng-bootstrap/ng-bootstrap'
 import { VideoCaption } from '@peertube/peertube-models'
 import {
   Actor,
@@ -17,6 +17,8 @@ import { LiveStreamInformationComponent } from '../shared-video-live'
 import { VideoAddToPlaylistComponent } from '../shared-video-playlist'
 import { VideoDownloadComponent } from './video-download.component'
 import { of } from 'rxjs'
+import { ActionDropdownComponent } from '../shared-main/buttons/action-dropdown.component'
+import { NgIf } from '@angular/common'
 
 export type VideoActionsDisplayType = {
   playlist?: boolean
@@ -37,7 +39,20 @@ export type VideoActionsDisplayType = {
 @Component({
   selector: 'my-video-actions-dropdown',
   templateUrl: './video-actions-dropdown.component.html',
-  styleUrls: [ './video-actions-dropdown.component.scss' ]
+  styleUrls: [ './video-actions-dropdown.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    NgbDropdown,
+    NgbDropdownAnchor,
+    NgbDropdownMenu,
+    VideoAddToPlaylistComponent,
+    ActionDropdownComponent,
+    VideoDownloadComponent,
+    VideoReportComponent,
+    VideoBlockComponent,
+    LiveStreamInformationComponent
+  ]
 })
 export class VideoActionsDropdownComponent implements OnChanges {
   @ViewChild('playlistDropdown') playlistDropdown: NgbDropdown
diff --git a/client/src/app/shared/shared-video-miniature/video-download.component.ts b/client/src/app/shared/shared-video-miniature/video-download.component.ts
index 123f40b2f..1c6e288d5 100644
--- a/client/src/app/shared/shared-video-miniature/video-download.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-download.component.ts
@@ -3,12 +3,26 @@ import { firstValueFrom } from 'rxjs'
 import { tap } from 'rxjs/operators'
 import { Component, ElementRef, Inject, Input, LOCALE_ID, ViewChild } from '@angular/core'
 import { HooksService } from '@app/core'
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
+import {
+  NgbModal,
+  NgbModalRef,
+  NgbNav,
+  NgbNavItem,
+  NgbNavLink,
+  NgbNavLinkBase,
+  NgbNavContent,
+  NgbNavOutlet,
+  NgbCollapse
+} from '@ng-bootstrap/ng-bootstrap'
 import { logger } from '@root-helpers/logger'
 import { videoRequiresFileToken } from '@root-helpers/video'
 import { objectKeysTyped, pick } from '@peertube/peertube-core-utils'
 import { VideoCaption, VideoFile } from '@peertube/peertube-models'
 import { BytesPipe, NumberFormatterPipe, VideoDetails, VideoFileTokenService, VideoService } from '../shared-main'
+import { InputTextComponent } from '../shared-forms/input-text.component'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { FormsModule } from '@angular/forms'
+import { NgIf, NgFor, KeyValuePipe } from '@angular/common'
 
 type DownloadType = 'video' | 'subtitles'
 type FileMetadata = { [key: string]: { label: string, value: string | number } }
@@ -16,7 +30,23 @@ type FileMetadata = { [key: string]: { label: string, value: string | number } }
 @Component({
   selector: 'my-video-download',
   templateUrl: './video-download.component.html',
-  styleUrls: [ './video-download.component.scss' ]
+  styleUrls: [ './video-download.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    FormsModule,
+    GlobalIconComponent,
+    NgbNav,
+    NgFor,
+    NgbNavItem,
+    NgbNavLink,
+    NgbNavLinkBase,
+    NgbNavContent,
+    InputTextComponent,
+    NgbNavOutlet,
+    NgbCollapse,
+    KeyValuePipe
+  ]
 })
 export class VideoDownloadComponent {
   @ViewChild('modal', { static: true }) modal: ElementRef
diff --git a/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts b/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts
index 2826408e7..ebea3a2a5 100644
--- a/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts
@@ -1,19 +1,43 @@
 import * as debug from 'debug'
 import { Subscription } from 'rxjs'
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'
-import { FormBuilder, FormGroup } from '@angular/forms'
+import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { AuthService } from '@app/core'
 import { ServerService } from '@app/core/server/server.service'
 import { UserRight } from '@peertube/peertube-models'
 import { PeertubeModalService } from '../shared-main'
 import { VideoFilters } from './video-filters.model'
+import { PeertubeCheckboxComponent } from '../shared-forms/peertube-checkbox.component'
+import { SelectCategoriesComponent } from '../shared-forms/select/select-categories.component'
+import { SelectLanguagesComponent } from '../shared-forms/select/select-languages.component'
+import { NgbCollapse } from '@ng-bootstrap/ng-bootstrap'
+import { NgSelectModule } from '@ng-select/ng-select'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { NgClass, NgIf, NgFor, NgTemplateOutlet } from '@angular/common'
+import { RouterLink } from '@angular/router'
 
 const debugLogger = debug('peertube:videos:VideoFiltersHeaderComponent')
 
 @Component({
   selector: 'my-video-filters-header',
   styleUrls: [ './video-filters-header.component.scss' ],
-  templateUrl: './video-filters-header.component.html'
+  templateUrl: './video-filters-header.component.html',
+  standalone: true,
+  imports: [
+    RouterLink,
+    FormsModule,
+    ReactiveFormsModule,
+    NgClass,
+    NgIf,
+    GlobalIconComponent,
+    NgFor,
+    NgSelectModule,
+    NgbCollapse,
+    NgTemplateOutlet,
+    SelectLanguagesComponent,
+    SelectCategoriesComponent,
+    PeertubeCheckboxComponent
+  ]
 })
 export class VideoFiltersHeaderComponent implements OnInit, OnDestroy {
   @Input() filters: VideoFilters
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
index 325416156..ff47a6312 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
@@ -16,7 +16,14 @@ import { HTMLServerConfig, VideoExistInPlaylist, VideoPlaylistType, VideoPrivacy
 import { LinkType } from '../../../types/link.type'
 import { Video, VideoService } from '../shared-main'
 import { VideoPlaylistService } from '../shared-video-playlist'
-import { VideoActionsDisplayType } from './video-actions-dropdown.component'
+import { VideoActionsDisplayType, VideoActionsDropdownComponent } from './video-actions-dropdown.component'
+import { RouterLink } from '@angular/router'
+import { VideoViewsCounterComponent } from '../shared-video/video-views-counter.component'
+import { DateToggleComponent } from '../shared-main/date/date-toggle.component'
+import { LinkComponent } from '../shared-main/angular/link.component'
+import { ActorAvatarComponent } from '../shared-actor-image/actor-avatar.component'
+import { VideoThumbnailComponent } from '../shared-thumbnail/video-thumbnail.component'
+import { NgClass, NgIf, NgFor } from '@angular/common'
 
 export type MiniatureDisplayOptions = {
   date?: boolean
@@ -35,7 +42,20 @@ export type MiniatureDisplayOptions = {
   selector: 'my-video-miniature',
   styleUrls: [ './video-miniature.component.scss' ],
   templateUrl: './video-miniature.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    NgClass,
+    VideoThumbnailComponent,
+    NgIf,
+    ActorAvatarComponent,
+    LinkComponent,
+    DateToggleComponent,
+    VideoViewsCounterComponent,
+    RouterLink,
+    NgFor,
+    VideoActionsDropdownComponent
+  ]
 })
 export class VideoMiniatureComponent implements OnInit {
   @Input() user: User
diff --git a/client/src/app/shared/shared-video-miniature/videos-list.component.ts b/client/src/app/shared/shared-video-miniature/videos-list.component.ts
index 0b3304309..5bbe0a0e9 100644
--- a/client/src/app/shared/shared-video-miniature/videos-list.component.ts
+++ b/client/src/app/shared/shared-video-miniature/videos-list.component.ts
@@ -2,7 +2,7 @@ import * as debug from 'debug'
 import { fromEvent, Observable, Subject, Subscription } from 'rxjs'
 import { concatMap, debounceTime, map, switchMap } from 'rxjs/operators'
 import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
+import { ActivatedRoute, RouterLinkActive, RouterLink } from '@angular/router'
 import {
   AuthService,
   ComponentPaginationLight,
@@ -19,7 +19,13 @@ import { isLastMonth, isLastWeek, isThisMonth, isToday, isYesterday } from '@pee
 import { ResultList, UserRight, VideoSortField } from '@peertube/peertube-models'
 import { Syndication, Video } from '../shared-main'
 import { VideoFilters, VideoFilterScope } from './video-filters.model'
-import { MiniatureDisplayOptions } from './video-miniature.component'
+import { MiniatureDisplayOptions, VideoMiniatureComponent } from './video-miniature.component'
+import { InfiniteScrollerDirective } from '../shared-main/angular/infinite-scroller.directive'
+import { VideoFiltersHeaderComponent } from './video-filters-header.component'
+import { ButtonComponent } from '../shared-main/buttons/button.component'
+import { FeedComponent } from '../shared-main/feeds/feed.component'
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
+import { NgIf, NgClass, NgFor, NgTemplateOutlet } from '@angular/common'
 
 const debugLogger = debug('peertube:videos:VideosListComponent')
 
@@ -45,7 +51,22 @@ enum GroupDate {
 @Component({
   selector: 'my-videos-list',
   templateUrl: './videos-list.component.html',
-  styleUrls: [ './videos-list.component.scss' ]
+  styleUrls: [ './videos-list.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    NgbTooltip,
+    NgClass,
+    FeedComponent,
+    NgFor,
+    RouterLinkActive,
+    RouterLink,
+    NgTemplateOutlet,
+    ButtonComponent,
+    VideoFiltersHeaderComponent,
+    InfiniteScrollerDirective,
+    VideoMiniatureComponent
+  ]
 })
 export class VideosListComponent implements OnInit, OnChanges, OnDestroy {
   @Input() getVideosObservableFunction: (pagination: ComponentPaginationLight, filters: VideoFilters) => Observable<ResultList<Video>>
diff --git a/client/src/app/shared/shared-video-miniature/videos-selection.component.ts b/client/src/app/shared/shared-video-miniature/videos-selection.component.ts
index 286b33dd4..0b80a6b97 100644
--- a/client/src/app/shared/shared-video-miniature/videos-selection.component.ts
+++ b/client/src/app/shared/shared-video-miniature/videos-selection.component.ts
@@ -5,14 +5,20 @@ import { logger } from '@root-helpers/logger'
 import { objectKeysTyped } from '@peertube/peertube-core-utils'
 import { ResultList, VideosExistInPlaylists, VideoSortField } from '@peertube/peertube-models'
 import { PeerTubeTemplateDirective, Video } from '../shared-main'
-import { MiniatureDisplayOptions } from './video-miniature.component'
+import { MiniatureDisplayOptions, VideoMiniatureComponent } from './video-miniature.component'
+import { FormsModule } from '@angular/forms'
+import { PeertubeCheckboxComponent } from '../shared-forms/peertube-checkbox.component'
+import { InfiniteScrollerDirective } from '../shared-main/angular/infinite-scroller.directive'
+import { NgIf, NgFor, NgTemplateOutlet } from '@angular/common'
 
 export type SelectionType = { [ id: number ]: boolean }
 
 @Component({
   selector: 'my-videos-selection',
   templateUrl: './videos-selection.component.html',
-  styleUrls: [ './videos-selection.component.scss' ]
+  styleUrls: [ './videos-selection.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, InfiniteScrollerDirective, NgFor, PeertubeCheckboxComponent, FormsModule, VideoMiniatureComponent, NgTemplateOutlet ]
 })
 export class VideosSelectionComponent implements AfterContentInit {
   @Input() videosContainedInPlaylists: VideosExistInPlaylists
diff --git a/client/src/app/shared/shared-video-playlist/index.ts b/client/src/app/shared/shared-video-playlist/index.ts
index 63bb046c6..cacae6d0d 100644
--- a/client/src/app/shared/shared-video-playlist/index.ts
+++ b/client/src/app/shared/shared-video-playlist/index.ts
@@ -4,5 +4,3 @@ export * from './video-playlist-element.model'
 export * from './video-playlist-miniature.component'
 export * from './video-playlist.model'
 export * from './video-playlist.service'
-
-export * from './shared-video-playlist.module'
diff --git a/client/src/app/shared/shared-video-playlist/shared-video-playlist.module.ts b/client/src/app/shared/shared-video-playlist/shared-video-playlist.module.ts
deleted file mode 100644
index 9159eb711..000000000
--- a/client/src/app/shared/shared-video-playlist/shared-video-playlist.module.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedFormModule } from '../shared-forms'
-import { SharedGlobalIconModule } from '../shared-icons'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { SharedThumbnailModule } from '../shared-thumbnail'
-import { SharedVideoModule } from '../shared-video'
-import { VideoAddToPlaylistComponent } from './video-add-to-playlist.component'
-import { VideoPlaylistElementMiniatureComponent } from './video-playlist-element-miniature.component'
-import { VideoPlaylistMiniatureComponent } from './video-playlist-miniature.component'
-import { VideoPlaylistService } from './video-playlist.service'
-
-@NgModule({
-  imports: [
-    SharedMainModule,
-    SharedFormModule,
-    SharedThumbnailModule,
-    SharedGlobalIconModule,
-    SharedVideoModule
-  ],
-
-  declarations: [
-    VideoAddToPlaylistComponent,
-    VideoPlaylistElementMiniatureComponent,
-    VideoPlaylistMiniatureComponent
-  ],
-
-  exports: [
-    VideoAddToPlaylistComponent,
-    VideoPlaylistElementMiniatureComponent,
-    VideoPlaylistMiniatureComponent
-  ],
-
-  providers: [
-    VideoPlaylistService
-  ]
-})
-export class SharedVideoPlaylistModule { }
diff --git a/client/src/app/shared/shared-video-playlist/video-add-to-playlist.component.ts b/client/src/app/shared/shared-video-playlist/video-add-to-playlist.component.ts
index 84173ba69..ff974edd9 100644
--- a/client/src/app/shared/shared-video-playlist/video-add-to-playlist.component.ts
+++ b/client/src/app/shared/shared-video-playlist/video-add-to-playlist.component.ts
@@ -15,6 +15,11 @@ import {
 } from '@peertube/peertube-models'
 import { VIDEO_PLAYLIST_DISPLAY_NAME_VALIDATOR } from '../form-validators/video-playlist-validators'
 import { CachedPlaylist, VideoPlaylistService } from './video-playlist.service'
+import { TimestampInputComponent } from '../shared-forms/timestamp-input.component'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { PeertubeCheckboxComponent } from '../shared-forms/peertube-checkbox.component'
+import { NgFor, NgClass, NgIf } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 
 const debugLogger = debug('peertube:playlists:VideoAddToPlaylistComponent')
 
@@ -37,7 +42,18 @@ type PlaylistSummary = {
   selector: 'my-video-add-to-playlist',
   styleUrls: [ './video-add-to-playlist.component.scss' ],
   templateUrl: './video-add-to-playlist.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    FormsModule,
+    NgFor,
+    NgClass,
+    PeertubeCheckboxComponent,
+    GlobalIconComponent,
+    NgIf,
+    TimestampInputComponent,
+    ReactiveFormsModule
+  ]
 })
 export class VideoAddToPlaylistComponent extends FormReactive implements OnInit, OnChanges, OnDestroy, DisableForReuseHook {
   @Input() video: Video
diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.ts b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.ts
index d03e11e34..f76c87813 100644
--- a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.ts
+++ b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.ts
@@ -1,18 +1,47 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
 import { AuthService, Notifier, ServerService } from '@app/core'
 import { Video, VideoService } from '@app/shared/shared-main'
-import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
+import { NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownButtonItem, NgbDropdownItem } from '@ng-bootstrap/ng-bootstrap'
 import { secondsToTime } from '@peertube/peertube-core-utils'
 import { HTMLServerConfig, VideoPlaylistElementType, VideoPlaylistElementUpdate, VideoPrivacy } from '@peertube/peertube-models'
 import { VideoPlaylistElement } from './video-playlist-element.model'
 import { VideoPlaylist } from './video-playlist.model'
 import { VideoPlaylistService } from './video-playlist.service'
+import { TimestampInputComponent } from '../shared-forms/timestamp-input.component'
+import { FormsModule } from '@angular/forms'
+import { PeertubeCheckboxComponent } from '../shared-forms/peertube-checkbox.component'
+import { EditButtonComponent } from '../shared-main/buttons/edit-button.component'
+import { VideoViewsCounterComponent } from '../shared-video/video-views-counter.component'
+import { DateToggleComponent } from '../shared-main/date/date-toggle.component'
+import { VideoThumbnailComponent } from '../shared-thumbnail/video-thumbnail.component'
+import { GlobalIconComponent } from '../shared-icons/global-icon.component'
+import { RouterLink } from '@angular/router'
+import { NgClass, NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-video-playlist-element-miniature',
   styleUrls: [ './video-playlist-element-miniature.component.scss' ],
   templateUrl: './video-playlist-element-miniature.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    NgClass,
+    RouterLink,
+    NgIf,
+    GlobalIconComponent,
+    VideoThumbnailComponent,
+    DateToggleComponent,
+    VideoViewsCounterComponent,
+    EditButtonComponent,
+    NgbDropdown,
+    NgbDropdownToggle,
+    NgbDropdownMenu,
+    NgbDropdownButtonItem,
+    NgbDropdownItem,
+    PeertubeCheckboxComponent,
+    FormsModule,
+    TimestampInputComponent
+  ]
 })
 export class VideoPlaylistElementMiniatureComponent implements OnInit {
   @ViewChild('moreDropdown') moreDropdown: NgbDropdown
diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.ts b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.ts
index 225c4eb64..880bcb24a 100644
--- a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.ts
+++ b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.ts
@@ -2,11 +2,17 @@ import { LinkType } from 'src/types/link.type'
 import { Component, Input, OnInit } from '@angular/core'
 import { VideoPlaylist } from './video-playlist.model'
 import { MarkdownService } from '@app/core'
+import { FromNowPipe } from '../shared-main/angular/from-now.pipe'
+import { RouterLink } from '@angular/router'
+import { LinkComponent } from '../shared-main/angular/link.component'
+import { NgClass, NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-video-playlist-miniature',
   styleUrls: [ './video-playlist-miniature.component.scss' ],
-  templateUrl: './video-playlist-miniature.component.html'
+  templateUrl: './video-playlist-miniature.component.html',
+  standalone: true,
+  imports: [ NgClass, LinkComponent, NgIf, RouterLink, FromNowPipe ]
 })
 export class VideoPlaylistMiniatureComponent implements OnInit {
   @Input() playlist: VideoPlaylist
diff --git a/client/src/app/shared/shared-video/index.ts b/client/src/app/shared/shared-video/index.ts
index 33a8b560f..5f08b467d 100644
--- a/client/src/app/shared/shared-video/index.ts
+++ b/client/src/app/shared/shared-video/index.ts
@@ -1 +1 @@
-export * from './shared-video.module'
+export * from './video-views-counter.component'
diff --git a/client/src/app/shared/shared-video/shared-video.module.ts b/client/src/app/shared/shared-video/shared-video.module.ts
deleted file mode 100644
index cb6816576..000000000
--- a/client/src/app/shared/shared-video/shared-video.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedMainModule } from '../shared-main/shared-main.module'
-import { VideoViewsCounterComponent } from './video-views-counter.component'
-
-@NgModule({
-  imports: [
-    SharedMainModule
-  ],
-
-  declarations: [
-    VideoViewsCounterComponent
-  ],
-
-  exports: [
-    VideoViewsCounterComponent
-  ]
-})
-export class SharedVideoModule { }
diff --git a/client/src/app/shared/shared-video/video-views-counter.component.ts b/client/src/app/shared/shared-video/video-views-counter.component.ts
index 17e6e37b9..c70c24a5b 100644
--- a/client/src/app/shared/shared-video/video-views-counter.component.ts
+++ b/client/src/app/shared/shared-video/video-views-counter.component.ts
@@ -1,10 +1,14 @@
 import { Component, Input } from '@angular/core'
 import { Video } from '../shared-main'
+import { NumberFormatterPipe } from '../shared-main/angular/number-formatter.pipe'
+import { NgIf } from '@angular/common'
 
 @Component({
   selector: 'my-video-views-counter',
   styleUrls: [ './video-views-counter.component.scss' ],
-  templateUrl: './video-views-counter.component.html'
+  templateUrl: './video-views-counter.component.html',
+  standalone: true,
+  imports: [ NgIf, NumberFormatterPipe ]
 })
 export class VideoViewsCounterComponent {
   @Input() video: Video
diff --git a/client/src/app/shared/standalone-notifications/user-notifications.component.ts b/client/src/app/shared/standalone-notifications/user-notifications.component.ts
index bd1b89f00..d1cf583f3 100644
--- a/client/src/app/shared/standalone-notifications/user-notifications.component.ts
+++ b/client/src/app/shared/standalone-notifications/user-notifications.component.ts
@@ -2,16 +2,17 @@ import { Subject } from 'rxjs'
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { ComponentPagination, hasMoreItems, Notifier } from '@app/core'
 import { AbuseState } from '@peertube/peertube-models'
-import { SharedMainModule, UserNotification, UserNotificationService } from '../shared-main'
+import { FromNowPipe, InfiniteScrollerDirective, UserNotification, UserNotificationService } from '../shared-main'
 import { CommonModule } from '@angular/common'
-import { SharedGlobalIconModule } from '../shared-icons'
+import { GlobalIconComponent } from '../shared-icons'
+import { RouterLink } from '@angular/router'
 
 @Component({
   selector: 'my-user-notifications',
   templateUrl: 'user-notifications.component.html',
   styleUrls: [ 'user-notifications.component.scss' ],
   standalone: true,
-  imports: [ CommonModule, SharedMainModule, SharedGlobalIconModule ]
+  imports: [ CommonModule, GlobalIconComponent, RouterLink, FromNowPipe, InfiniteScrollerDirective ]
 })
 export class UserNotificationsComponent implements OnInit {
   @Input() ignoreLoadingBar = false
diff --git a/client/src/main.ts b/client/src/main.ts
index 159c47e86..5cd9b86b1 100644
--- a/client/src/main.ts
+++ b/client/src/main.ts
@@ -1,9 +1,47 @@
-import { ApplicationRef, enableProdMode } from '@angular/core'
-import { enableDebugTools } from '@angular/platform-browser'
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
-import { AppModule } from './app/app.module'
+import { ApplicationRef, enableProdMode, APP_INITIALIZER, importProvidersFrom } from '@angular/core'
+import { enableDebugTools, BrowserModule, bootstrapApplication } from '@angular/platform-browser'
 import { environment } from './environments/environment'
 import { logger } from './root-helpers'
+import { AppComponent } from './app/app.component'
+import routes from './app/app.routes'
+import { getFormProviders } from './app/shared/shared-forms'
+import { getMainProviders } from './app/shared/shared-main'
+import { ServiceWorkerModule } from '@angular/service-worker'
+import { polyfillICU } from './app/helpers'
+import { tap } from 'rxjs/operators'
+import {
+  ServerService,
+  PluginService,
+  RedirectService, PreloadSelectedModulesList,
+  MenuGuards,
+  CustomReuseStrategy,
+  getCoreProviders
+} from './app/core'
+import { APP_BASE_HREF, registerLocaleData } from '@angular/common'
+import localeOc from '@app/helpers/locales/oc'
+import { RouteReuseStrategy, provideRouter, withInMemoryScrolling, withPreloading } from '@angular/router'
+import { provideHttpClient } from '@angular/common/http'
+import { LoadingBarModule } from '@ngx-loading-bar/core'
+import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client'
+import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap'
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
+import { ToastModule } from 'primeng/toast'
+
+registerLocaleData(localeOc, 'oc')
+
+export function loadConfigFactory (server: ServerService, pluginService: PluginService, redirectService: RedirectService) {
+  const initializeServices = () => {
+    redirectService.init()
+    pluginService.initializePlugins()
+  }
+
+  return () => {
+    const result = server.loadHTMLConfig()
+    if (result) return result.pipe(tap(() => initializeServices()))
+
+    initializeServices()
+  }
+}
 
 if (environment.production) {
   enableProdMode()
@@ -11,8 +49,57 @@ if (environment.production) {
 
 logger.registerServerSending(environment.apiUrl)
 
-const bootstrap = () => platformBrowserDynamic()
-  .bootstrapModule(AppModule)
+const bootstrap = () => bootstrapApplication(AppComponent, {
+  providers: [
+    importProvidersFrom(
+      BrowserModule,
+      BrowserAnimationsModule,
+      ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production })
+    ),
+
+    provideHttpClient(),
+
+    importProvidersFrom(
+      LoadingBarHttpClientModule,
+      LoadingBarModule,
+      ToastModule,
+      NgbModalModule
+    ),
+
+    getCoreProviders(),
+    getMainProviders(),
+    getFormProviders(),
+
+    PreloadSelectedModulesList,
+    ...MenuGuards.guards,
+    { provide: RouteReuseStrategy, useClass: CustomReuseStrategy },
+
+    provideRouter(routes,
+      withPreloading(PreloadSelectedModulesList),
+      withInMemoryScrolling({
+        anchorScrolling: 'disabled',
+        // Redefined in app component
+        scrollPositionRestoration: 'disabled'
+      })
+    ),
+
+    {
+      provide: APP_BASE_HREF,
+      useValue: '/'
+    },
+    {
+      provide: APP_INITIALIZER,
+      useFactory: loadConfigFactory,
+      deps: [ ServerService, PluginService, RedirectService ],
+      multi: true
+    },
+    {
+      provide: APP_INITIALIZER,
+      useFactory: () => polyfillICU,
+      multi: true
+    }
+  ]
+})
   .then(bootstrapModule => {
     if (!environment.production) {
       const applicationRef = bootstrapModule.injector.get(ApplicationRef)